From 478ce32e262eb2f0395294bfe13f8da7678e4b4e Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 27 Aug 2021 22:26:00 +0800
Subject: [PATCH] =?UTF-8?q?bug=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/analysis/item/difficult-Item-list.vue    | 12 +++++++++---
 .../modules/analysis/item/difficult-item-oversee.vue |  2 +-
 src/views/modules/sys/role-add-or-update.vue         |  3 ++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/analysis/item/difficult-Item-list.vue b/src/views/modules/analysis/item/difficult-Item-list.vue
index 2ab7b2e..8cea4e0 100644
--- a/src/views/modules/analysis/item/difficult-Item-list.vue
+++ b/src/views/modules/analysis/item/difficult-Item-list.vue
@@ -104,12 +104,18 @@
         <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
           <el-table-column prop="allDeptNames" label="所属组织" header-align="center" align="center"></el-table-column>
         <el-table-column prop="itemContent" label="事件标题" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="overseeName" label="督办" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="overseeName"  label="督办" header-align="center" align="center">
+            <template scope="scope">
+              <span v-if="scope.row.overseeName==='已督办'" style="color: red">已督办</span>
+              <span v-else-if="scope.row.overseeName==='未督办'">未督办</span>
+<!--              <span v-else style="color: red">未通过</span>-->
+            </template>
+          </el-table-column>
 <!--        <el-table-column prop="reportFlag" label="是否流转网格化平台" header-align="center" align="center" :formatter="showReportFlagFormatter"></el-table-column>-->
         <el-table-column prop="itemState" label="事件状态" header-align="center" align="center" :formatter="showItemStateNameFormatter"></el-table-column>
           <el-table-column prop="createdTime" label="提交日期" header-align="center" align="center"></el-table-column>
 <!--        <el-table-column prop="processedTime" label="处理完毕时间" header-align="center" align="center"></el-table-column>-->
-        <el-table-column prop="takeTime" label="耗时（h）" header-align="center" align="center" ></el-table-column>
+        <el-table-column prop="takeTime" label="耗时（小时）" header-align="center" align="center" ></el-table-column>
           <el-table-column prop="operatNum" label="处理次数" header-align="center" align="center"  ></el-table-column>
           <el-table-column prop="deptNum" label="涉及部门" header-align="center" align="center" ></el-table-column>
 
@@ -117,7 +123,7 @@
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="look(scope.row.id)">{{ $t('look') }}</el-button>
-              <el-button type="text" size="small" @click="openOversee(scope.row.id)">{{ $t('督办') }}</el-button>
+              <el-button v-if="scope.row.itemState==='0'" type="text" size="small" @click="openOversee(scope.row.id)">{{ $t('督办') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/modules/analysis/item/difficult-item-oversee.vue b/src/views/modules/analysis/item/difficult-item-oversee.vue
index 59ab76b..7a4811d 100644
--- a/src/views/modules/analysis/item/difficult-item-oversee.vue
+++ b/src/views/modules/analysis/item/difficult-item-oversee.vue
@@ -16,7 +16,7 @@
                 {{dataForm.deptNum}}
             </el-form-item>
             <el-form-item label="处理时长：" prop="takeTime" label-width="120px">
-                {{dataForm.takeTime}}
+                {{dataForm.takeTime}} 小时
             </el-form-item>
             <el-form-item label="提交日期：" prop="createdTime" label-width="120px">
                 {{dataForm.createdTime}}
diff --git a/src/views/modules/sys/role-add-or-update.vue b/src/views/modules/sys/role-add-or-update.vue
index 730623a..e938b66 100644
--- a/src/views/modules/sys/role-add-or-update.vue
+++ b/src/views/modules/sys/role-add-or-update.vue
@@ -122,7 +122,8 @@
                      node-key="id"
                      ref="overseeListTree"
                      accordion
-                     show-checkbox>
+                     show-checkbox
+                     :check-strictly="true">
             </el-tree>
           </el-form-item>
         </el-col>