From d9c3a5a833dea2a55b26c2b68cb7b2ddc030b615 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 12 Aug 2022 11:09:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shequzhili/xiangmu/cpts/project-info.vue  | 30 +++++++++++++++++--
 .../shequzhili/xiangmu/xiangmu-ling.vue       |  4 +--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
index 28e4ffcfc..5784231f5 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
@@ -26,9 +26,17 @@
             </div>
 
             <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]"
-                 v-if="projectInfo.departmentNameList.length > 0">
+                 v-if="projectInfo.departmentList.length > 0">
               <span class="info-title-2">当前处理部门：</span>
-              <span>{{ projectInfo.departmentNameList.join("、") }}</span>
+              <div class="div_depart">
+                <div v-for="(item,index) in  projectInfo.departmentList"
+                     :key="index"
+                     class="div_depart">
+                  <span>{{item.departmentName+'（'+ item.staffList.join("、")+'）' }}</span>
+
+                </div>
+              </div>
+
             </div>
 
             <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]"
@@ -967,6 +975,17 @@ export default {
 
       if (code === 0) {
         this.projectInfo = data;
+        // this.projectInfo.departmentList = [
+        //   {
+        //     departmentName: "市北区",
+        //     staffList: ["薛松", "刘建军"]
+        //   }, {
+        //     departmentName: "市北区",
+        //     staffList: ["薛松", "刘建军"]
+        //   }
+        // ]
+
+
         if (data.projectStatus == "pending") {
           this.getMyDepartmentList();
           this.getAssistanceUnitList();
@@ -1254,3 +1273,10 @@ export default {
   src="@/assets/scss/modules/shequzhili/project-info.scss"
   scoped
 ></style>
+
+<style lang="scss" scoped>
+.div_depart {
+  display: flex;
+  flex-direction: column;
+}
+</style>
diff --git a/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue b/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue
index 00f16d600..b208eda98 100644
--- a/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue
+++ b/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue
@@ -282,7 +282,7 @@
 
           <el-table-column prop="address"
                            align="center"
-                           label="地址	"
+                           label="地址"
                            :show-overflow-tooltip="true" />
           <el-table-column prop="status"
                            align="center"
@@ -290,7 +290,7 @@
                            width="70" />
           <el-table-column prop="closedStatus"
                            align="center"
-                           label="解决状态	"
+                           label="解决状态"
                            width="90" />
           <!-- <template slot-scope="scope">
               {{ scope.row.status == 'pending' ? '处理中' : '已结案' }}