From 16adbba38acd6cd67ffa29d859ac2c05d731946f Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Mon, 17 Feb 2020 14:55:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=8A=E8=AE=AE=E9=A2=98=E6=9D=A5=E6=BA=90?=
 =?UTF-8?q?=20=E6=94=BE=E5=88=B0=E2=80=9C=E5=BE=85=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E2=80=9D=E3=80=81=E2=80=9C=E5=B7=B2=E9=A9=B3=E5=9B=9E=E2=80=9D?=
 =?UTF-8?q?=E3=80=81=E2=80=9C=E5=B7=B2=E5=85=B3=E9=97=AD=E2=80=9D=E3=80=81?=
 =?UTF-8?q?=E2=80=9C=E5=B7=B2=E8=BD=AC=E9=A1=B9=E7=9B=AE=E2=80=9D=20?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E4=B8=AD=E6=94=BE=E5=88=B0=E2=80=9C?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=E2=80=9D=E5=88=97=E5=90=8E=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/events/issue-change-list.vue      | 21 ++++++++++++++++-
 .../events/issue-close-detail-view.vue        | 23 +++++++++++--------
 src/views/modules/events/issue-close-list.vue | 21 ++++++++++++++++-
 .../events/issue-process-detail-view.vue      |  3 +++
 .../modules/events/issue-process-list.vue     | 21 ++++++++++++++++-
 .../events/issue-reject-detail-view.vue       |  3 +++
 .../modules/events/issue-reject-list.vue      | 21 ++++++++++++++++-
 .../events/issue-review-detail-view.vue       |  3 +++
 8 files changed, 102 insertions(+), 14 deletions(-)

diff --git a/src/views/modules/events/issue-change-list.vue b/src/views/modules/events/issue-change-list.vue
index d1fad8ce..3511c387 100644
--- a/src/views/modules/events/issue-change-list.vue
+++ b/src/views/modules/events/issue-change-list.vue
@@ -44,6 +44,16 @@
           >
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="来源">
+          <el-select v-model="dataForm.source" placeholder="全部" clearable >
+            <el-option
+              v-for="item in sourceOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
@@ -90,6 +100,7 @@
           width="120"
           align="center"
         ></el-table-column>
+        <el-table-column prop="groupName" label="来源" header-align="center" align="center"></el-table-column>
         <el-table-column
           prop="participateNum"
           label="参与人数"
@@ -178,8 +189,16 @@ export default {
         communityId: '',
         gridId: '',
         state: '4',
-        issueCode: ''
+        issueCode: '',
+        source: ''
       },
+      sourceOptions: [{
+        value: '1',
+        label: '党群议事'
+      }, {
+        value: '2',
+        label: '邻里党群'
+      }],
       ids: [],
       options: [],
       pickerBeginDateBefore: {
diff --git a/src/views/modules/events/issue-close-detail-view.vue b/src/views/modules/events/issue-close-detail-view.vue
index 09b33c22..1a709fd4 100644
--- a/src/views/modules/events/issue-close-detail-view.vue
+++ b/src/views/modules/events/issue-close-detail-view.vue
@@ -20,6 +20,9 @@
                     <el-form-item v-if="dataForm.groupName && dataForm.groupName.length > 0" label="议题来源:" prop="ownGrid">
                         <div>{{dataForm.groupName}}</div>
                     </el-form-item>
+                    <el-form-item v-if="!dataForm.groupName || dataForm.groupName.length == 0" label="议题来源:" prop="ownGrid">
+                        <div>党群议事</div>
+                    </el-form-item>
                     <el-form-item label="上报时间:">
                         <div>{{dataForm.distributeTime}}</div>
                     </el-form-item>
@@ -169,25 +172,25 @@ export default {
         } else if (item.state === 10) {
           return '结案'
         } else if (item.state === 15) {
-            return '上报网格化平台'
+          return '上报网格化平台'
         } else if (item.state === 20) {
-            return '网格化平台-受理'
+          return '网格化平台-受理'
         } else if (item.state === 25) {
-            return '网格化平台-立案'
+          return '网格化平台-立案'
         } else if (item.state === 30) {
-            return '网格化平台-派遣'
+          return '网格化平台-派遣'
         } else if (item.state === 35) {
-            return '网格化平台-中间再派'
+          return '网格化平台-中间再派'
         } else if (item.state === 40) {
-            return '网格化平台-接单'
+          return '网格化平台-接单'
         } else if (item.state === 45) {
-            return '网格化平台-处理'
+          return '网格化平台-处理'
         } else if (item.state === 50) {
-            return '网格化平台-中间督办'
+          return '网格化平台-中间督办'
         } else if (item.state === 55) {
-            return '网格化平台-催办'
+          return '网格化平台-催办'
         } else if (item.state === 60) {
-            return '网格化平台-结案'
+          return '网格化平台-结案'
         }
       } else if (item.type === 'issue' || item.type === 'init') {
         if (item.state === 0) {
diff --git a/src/views/modules/events/issue-close-list.vue b/src/views/modules/events/issue-close-list.vue
index 7e5d88b5..1cec909f 100644
--- a/src/views/modules/events/issue-close-list.vue
+++ b/src/views/modules/events/issue-close-list.vue
@@ -44,6 +44,16 @@
           >
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="来源">
+          <el-select v-model="dataForm.source" placeholder="全部" clearable >
+            <el-option
+              v-for="item in sourceOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
@@ -90,6 +100,7 @@
           width="120"
           align="center"
         ></el-table-column>
+        <el-table-column prop="groupName" label="来源" header-align="center" align="center"></el-table-column>
         <el-table-column
           prop="participateNum"
           label="参与人数"
@@ -179,8 +190,16 @@ export default {
         communityId: '',
         gridId: '',
         state: '2',
-        issueCode: ''
+        issueCode: '',
+        source: ''
       },
+      sourceOptions: [{
+        value: '1',
+        label: '党群议事'
+      }, {
+        value: '2',
+        label: '邻里党群'
+      }],
       ids: [],
       options: [],
       pickerBeginDateBefore: {
diff --git a/src/views/modules/events/issue-process-detail-view.vue b/src/views/modules/events/issue-process-detail-view.vue
index 5cbd4c28..1e57669a 100644
--- a/src/views/modules/events/issue-process-detail-view.vue
+++ b/src/views/modules/events/issue-process-detail-view.vue
@@ -24,6 +24,9 @@
                       prop="ownGrid">
           <div>{{dataForm.groupName}}</div>
         </el-form-item>
+        <el-form-item v-if="!dataForm.groupName || dataForm.groupName.length == 0" label="议题来源:" prop="ownGrid">
+                        <div>党群议事</div>
+                    </el-form-item>
         <el-form-item label="上报时间:"
                       prop="distributeTime">
           <div>
diff --git a/src/views/modules/events/issue-process-list.vue b/src/views/modules/events/issue-process-list.vue
index 8d851ca8..cd883a70 100644
--- a/src/views/modules/events/issue-process-list.vue
+++ b/src/views/modules/events/issue-process-list.vue
@@ -44,6 +44,16 @@
           >
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="来源">
+          <el-select v-model="dataForm.source" placeholder="全部" clearable >
+            <el-option
+              v-for="item in sourceOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
@@ -90,6 +100,7 @@
           width="120"
           align="center"
         ></el-table-column>
+        <el-table-column prop="groupName" label="来源" header-align="center" align="center"></el-table-column>
         <el-table-column
           prop="participateNum"
           label="参与人数"
@@ -193,8 +204,16 @@ export default {
         communityId: '',
         gridId: '',
         state: '0',
-        issueCode: ''
+        issueCode: '',
+        source: ''
       },
+      sourceOptions: [{
+        value: '1',
+        label: '党群议事'
+      }, {
+        value: '2',
+        label: '邻里党群'
+      }],
       ids: [],
       options: [],
       pickerBeginDateBefore: {
diff --git a/src/views/modules/events/issue-reject-detail-view.vue b/src/views/modules/events/issue-reject-detail-view.vue
index 6d77a415..f7a0baa1 100644
--- a/src/views/modules/events/issue-reject-detail-view.vue
+++ b/src/views/modules/events/issue-reject-detail-view.vue
@@ -20,6 +20,9 @@
                     <el-form-item v-if="dataForm.groupName && dataForm.groupName.length > 0" label="议题来源:" prop="ownGrid">
                         <div>{{dataForm.groupName}}</div>
                     </el-form-item>
+                    <el-form-item v-if="!dataForm.groupName || dataForm.groupName.length == 0" label="议题来源:" prop="ownGrid">
+                        <div>党群议事</div>
+                    </el-form-item>
                     <el-form-item label="上报时间:" prop="createdTime">
                         <div>{{dataForm.createdTime}}</div>
                     </el-form-item>
diff --git a/src/views/modules/events/issue-reject-list.vue b/src/views/modules/events/issue-reject-list.vue
index 7657bd6a..4c35e660 100644
--- a/src/views/modules/events/issue-reject-list.vue
+++ b/src/views/modules/events/issue-reject-list.vue
@@ -30,6 +30,16 @@
                           placeholder="选择日期时间">
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="来源">
+          <el-select v-model="dataForm.source" placeholder="全部" clearable >
+            <el-option
+              v-for="item in sourceOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
@@ -57,6 +67,7 @@
                          label="提交人"
                          header-align="center"
                          align="center"></el-table-column>
+        <el-table-column prop="groupName" label="来源" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')"
                          fixed="right"
                          header-align="center"
@@ -106,8 +117,16 @@ export default {
         endTime: '',
         streetId: '',
         communityId: '',
-        gridId: ''
+        gridId: '',
+        source: ''
       },
+      sourceOptions: [{
+        value: '1',
+        label: '党群议事'
+      }, {
+        value: '2',
+        label: '邻里党群'
+      }],
       ids: [],
       options: [],
       pickerBeginDateBefore: {
diff --git a/src/views/modules/events/issue-review-detail-view.vue b/src/views/modules/events/issue-review-detail-view.vue
index 3145c916..1982230d 100644
--- a/src/views/modules/events/issue-review-detail-view.vue
+++ b/src/views/modules/events/issue-review-detail-view.vue
@@ -19,6 +19,9 @@
                     <el-form-item v-if="dataForm.groupName && dataForm.groupName.length > 0" label="议题来源:" prop="ownGrid">
                         <div>{{dataForm.groupName}}</div>
                     </el-form-item>
+                    <el-form-item v-if="!dataForm.groupName || dataForm.groupName.length == 0" label="议题来源:" prop="ownGrid">
+                        <div>党群议事</div>
+                    </el-form-item>
                     <el-form-item label="上报时间:" prop="createdTime">
                         <div>{{dataForm.createdTime}}</div>
                     </el-form-item>