Parcourir la source

fix(checkjob): 修复负责人显示逻辑并优化请求错误处理

- 在CheckJob.vue中为负责人列添加customRender以显示actualUser
- 在CheckJobTable.vue中为负责人列添加customRender以显示actualUser
- 在CheckJobTableWaitDo.vue中为负责人列添加customRender以显示actualUser
- 在Detail.vue中修改执行人显示逻辑为actualUser优先
- 在DetailSbCheckJob.vue中为负责人列添加customRender以显示actualUser
- 在DetailStandardCheckJob.vue中为负责人列添加customRender以显示actualUser
- 在RepairWorkHour.vue中为表格添加key属性
- 在request.js中优化403错误的描述信息显示
dazhaxie il y a 3 heures
Parent
commit
891a95e491

+ 1 - 1
src/utils/request.js

@@ -30,7 +30,7 @@ const err = (error) => {
     if (error.response.status === 403) {
       notification.error({
         message: '禁止',
-        description: '没有权限,禁止访问'
+        description: data.message || '没有权限,禁止访问'
       })
       return Promise.reject(error)
     }

+ 4 - 1
src/views/check/checkjob/CheckJob.vue

@@ -331,7 +331,10 @@ export default {
           title: '负责人',
           dataIndex: 'checkUserName',
           checked: true,
-          width: '150px'
+          width: '150px',
+          customRender: (text, record) => {
+            return record.actualUser || text || '-'
+          }
         },
 
         // {

+ 4 - 1
src/views/check/checkjob/modules/CheckJobTable.vue

@@ -179,7 +179,10 @@ export default {
           title: '负责人',
           dataIndex: 'checkUserName',
           checked: true,
-          width: '100px'
+          width: '100px',
+          customRender: (text, record) => {
+            return record.actualUser || text || '-'
+          }
         },
         {
           title: '设备',

+ 4 - 1
src/views/check/checkjob/modules/CheckJobTableWaitDo.vue

@@ -186,7 +186,10 @@ export default {
         {
           title: '负责人',
           dataIndex: 'checkUserName',
-          checked: true
+          checked: true,
+          customRender: (text, record) => {
+            return record.actualUser || text || '-'
+          }
         },
         {
           title: '设备',

+ 1 - 1
src/views/check/checkjob/modules/Detail.vue

@@ -57,7 +57,7 @@
     </detail-list>
     <title-divider title="任务信息" width="90px"></title-divider>
     <detail-list title="" :col="3">
-      <detail-list-item term="执行人">{{ model.checkUserName }}</detail-list-item>
+      <detail-list-item term="执行人">{{ model.actualUser || model.checkUserName || '-' }}</detail-list-item>
       <detail-list-item term="实际工时">{{ model.realHours }}</detail-list-item>
       <detail-list-item term="预计执行日期">{{ model.startTime }}</detail-list-item>
       <detail-list-item term="预计下次执行">{{ model.nextDate }}</detail-list-item>

+ 3 - 0
src/views/check/checkjob/modules/DetailSbCheckJob.vue

@@ -147,6 +147,9 @@ export default {
           dataIndex: 'checkUserName',
           checked: true,
           width: '100px',
+          customRender: (text, record) => {
+            return record.actualUser || text || '-'
+          },
         },
         {
           title: '设备',

+ 3 - 0
src/views/check/checkjob/modules/DetailStandardCheckJob.vue

@@ -137,6 +137,9 @@ export default {
           dataIndex: 'checkUserName',
           checked: true,
           width: '100px',
+          customRender: (text, record) => {
+            return record.actualUser || text || '-'
+          },
         },
         {
           title: '设备',

+ 1 - 0
src/views/report/repairworkhour/RepairWorkHour.vue

@@ -55,6 +55,7 @@
 
       <s-table
         ref="table"
+        :key="activeTab"
         size="default"
         :rowKey="rowKey"
         :columns="columns"