From d12a8a8289f805544d793953cd1d5c539d76285a Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Wed, 27 Nov 2019 10:42:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E7=BE=A4=E8=AE=AE=E4=BA=8B=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=B7=BB=E5=8A=A0=E6=9D=A5=E6=BA=90=E5=8F=8B=E9=82=BB?=
 =?UTF-8?q?=E7=A4=BE=E7=BE=A4=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/events/issue-close-detail-view.vue   | 5 ++++-
 src/views/modules/events/issue-process-detail-view.vue | 5 ++++-
 src/views/modules/events/issue-reject-detail-view.vue  | 5 ++++-
 src/views/modules/events/issue-review-detail-view.vue  | 5 ++++-
 src/views/modules/events/item-close-detail-view.vue    | 3 +++
 src/views/modules/events/item-deal-detail-view.vue     | 3 +++
 6 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/events/issue-close-detail-view.vue b/src/views/modules/events/issue-close-detail-view.vue
index e31b6c56..5f81e829 100644
--- a/src/views/modules/events/issue-close-detail-view.vue
+++ b/src/views/modules/events/issue-close-detail-view.vue
@@ -15,7 +15,10 @@
                         </el-image>
                     </el-form-item>
                     <el-form-item label="所属网格:" prop="ownGrid">
-                        <div>{{dataForm.ownGrid}}</div>
+                        <div>{{dataForm.allDeptNames}}</div>
+                    </el-form-item>
+                    <el-form-item v-if="dataForm.groupName !== null && dataForm.groupName.length > 0" label="议题来源:" prop="ownGrid">
+                        <div>{{dataForm.groupName}}</div>
                     </el-form-item>
                     <el-form-item label="上报时间:">
                         <div>{{dataForm.distributeTime}}</div>
diff --git a/src/views/modules/events/issue-process-detail-view.vue b/src/views/modules/events/issue-process-detail-view.vue
index e72f8d98..3b6968f0 100644
--- a/src/views/modules/events/issue-process-detail-view.vue
+++ b/src/views/modules/events/issue-process-detail-view.vue
@@ -14,7 +14,10 @@
                         </el-image>
                     </el-form-item>
                     <el-form-item label="所属网格:" prop="ownGrid">
-                        <div>{{dataForm.ownGrid}}</div>
+                        <div>{{dataForm.allDeptNames}}</div>
+                    </el-form-item>
+                    <el-form-item v-if="dataForm.groupName !== null && dataForm.groupName.length > 0" label="议题来源:" prop="ownGrid">
+                        <div>{{dataForm.groupName}}</div>
                     </el-form-item>
                     <el-form-item label="上报时间:" prop="distributeTime">
                         <div>
diff --git a/src/views/modules/events/issue-reject-detail-view.vue b/src/views/modules/events/issue-reject-detail-view.vue
index 6844a89b..d4c39b4a 100644
--- a/src/views/modules/events/issue-reject-detail-view.vue
+++ b/src/views/modules/events/issue-reject-detail-view.vue
@@ -15,7 +15,10 @@
                         </el-image>
                     </el-form-item>
                     <el-form-item label="所属网格:" prop="ownGrid">
-                        <div>{{dataForm.ownGrid}}</div>
+                        <div>{{dataForm.allDeptNames}}</div>
+                    </el-form-item>
+                    <el-form-item v-if="dataForm.groupName !== null && dataForm.groupName.length > 0" label="议题来源:" prop="ownGrid">
+                        <div>{{dataForm.groupName}}</div>
                     </el-form-item>
                     <el-form-item label="上报时间:" prop="createdTime">
                         <div>{{dataForm.createdTime}}</div>
diff --git a/src/views/modules/events/issue-review-detail-view.vue b/src/views/modules/events/issue-review-detail-view.vue
index 8b9ad648..bd31376b 100644
--- a/src/views/modules/events/issue-review-detail-view.vue
+++ b/src/views/modules/events/issue-review-detail-view.vue
@@ -14,7 +14,10 @@
                         </el-image>
                     </el-form-item>
                     <el-form-item label="所属网格:" prop="ownGrid">
-                        <div>{{dataForm.ownGrid}}</div>
+                        <div>{{dataForm.allDeptNames}}</div>
+                    </el-form-item>
+                    <el-form-item v-if="dataForm.groupName !== null && dataForm.groupName.length > 0" label="议题来源:" prop="ownGrid">
+                        <div>{{dataForm.groupName}}</div>
                     </el-form-item>
                     <el-form-item label="上报时间:" prop="createdTime">
                         <div>{{dataForm.createdTime}}</div>
diff --git a/src/views/modules/events/item-close-detail-view.vue b/src/views/modules/events/item-close-detail-view.vue
index 34a8f8ac..bd7a1537 100644
--- a/src/views/modules/events/item-close-detail-view.vue
+++ b/src/views/modules/events/item-close-detail-view.vue
@@ -14,6 +14,9 @@
                           @click="clickImg(url)">
                 </el-image>
             </el-form-item>
+              <el-form-item v-if="dataForm.groupName !== null && dataForm.groupName.length > 0" label="项目来源:" prop="ownGrid">
+                  <div>{{dataForm.groupName}}</div>
+              </el-form-item>
             <el-form-item label="上报时间:">
               <div>{{dataForm.distributeTime}}</div>
             </el-form-item>
diff --git a/src/views/modules/events/item-deal-detail-view.vue b/src/views/modules/events/item-deal-detail-view.vue
index 2738c23d..4706ba1f 100644
--- a/src/views/modules/events/item-deal-detail-view.vue
+++ b/src/views/modules/events/item-deal-detail-view.vue
@@ -14,6 +14,9 @@
                       @click="clickImg(url)">
             </el-image>
           </el-form-item>
+          <el-form-item v-if="dataForm.groupName !== null && dataForm.groupName.length > 0" label="项目来源:" prop="ownGrid">
+            <div>{{dataForm.groupName}}</div>
+          </el-form-item>
           <el-form-item label="上报时间:" prop="distributeTime">
             <div>{{dataForm.distributeTime}}</div>
           </el-form-item>