浏览代码

完善巡检

408249787 2 年之前
父节点
当前提交
0283b6c0c5

+ 9 - 5
src/views/fill/gather/FillGather.vue

@@ -51,11 +51,11 @@
             v-if="$auth('fill-gathers-edit')"
             v-if="$auth('fill-gathers-edit')"
             @click="handleEdit(record)"
             @click="handleEdit(record)"
           >修改</operation-button>
           >修改</operation-button>
-          <operation-button
+          <!-- <operation-button
             v-if="$auth('fill-gathers-del')"
             v-if="$auth('fill-gathers-del')"
             :type="2"
             :type="2"
             title="是否要删除该条数据?"
             title="是否要删除该条数据?"
-            @confirm="batchDelete(record.id)">删除</operation-button>
+            @confirm="batchDelete(record.id)">删除</operation-button> -->
           <operation-button
           <operation-button
             v-if="$auth('fill-gathers-edit')"
             v-if="$auth('fill-gathers-edit')"
             @click="handleConfigEdit(record)"
             @click="handleConfigEdit(record)"
@@ -124,17 +124,21 @@ export default {
           dataIndex: 'period'
           dataIndex: 'period'
         },
         },
         {
         {
-          title: '备注',
-          dataIndex: 'remark'
+          title: '巡检项(个)',
+          dataIndex: 'countNum'
         },
         },
         {
         {
-          title: '创建人名称',
+          title: '创建人',
           dataIndex: 'createdUserName'
           dataIndex: 'createdUserName'
         },
         },
         {
         {
           title: '创建日期',
           title: '创建日期',
           dataIndex: 'createdTime'
           dataIndex: 'createdTime'
         },
         },
+        {
+          title: '备注',
+          dataIndex: 'remark'
+        },
         {
         {
           title: '操作',
           title: '操作',
           key: 'action',
           key: 'action',

+ 6 - 4
src/views/fill/task/FillGatherTask.vue

@@ -77,11 +77,13 @@
             >填报</operation-button>
             >填报</operation-button>
             <operation-button
             <operation-button
               :type="2"
               :type="2"
+              v-if="$auth('fill-tasks-dispatch')"
               v-show="record.status!== 2"
               v-show="record.status!== 2"
               title="是否要转派该任务"
               title="是否要转派该任务"
               @confirm="handleDispatch(record)"
               @confirm="handleDispatch(record)"
             >转派</operation-button>
             >转派</operation-button>
             <operation-button
             <operation-button
+              v-if="$auth('fill-tasks-overtime')"
               v-show="record.status!== 2"
               v-show="record.status!== 2"
               :type="2"
               :type="2"
               title="是否要延时该任务"
               title="是否要延时该任务"
@@ -89,15 +91,15 @@
             >延时</operation-button>
             >延时</operation-button>
 
 
             <operation-button
             <operation-button
-              v-if="record.status===5"
-              v-show="record.status!== 2"
+              v-if="$auth('fill-tasks-pause')"
+              v-show="record.status!== 2 && record.status===5"
               :type="2"
               :type="2"
               title="是否取消暂停要该任务"
               title="是否取消暂停要该任务"
               @confirm="handlePause(record)"
               @confirm="handlePause(record)"
             >取消暂停</operation-button>
             >取消暂停</operation-button>
             <operation-button
             <operation-button
-              v-else
-              v-show="record.status!== 2"
+              v-if="$auth('fill-tasks-pause')"
+              v-show="record.status!== 2 && record.status!==5"
               :type="2"
               :type="2"
               title="是否暂停要该任务"
               title="是否暂停要该任务"
               @confirm="handlePause(record)"
               @confirm="handlePause(record)"

+ 2 - 0
src/views/workplace/backlog/WorkplaceBacklog.vue

@@ -385,6 +385,8 @@ export default {
           }
           }
           this.$refs.detailScrapModal.base(param)
           this.$refs.detailScrapModal.base(param)
         }
         }
+      } else if (record.type === this.DictCache.getValueByCode(this.DictCache.TYPE.WORKPLACE_BACKLOG_TYPE, 'FILL_TASK')) {
+        this.$router.push('/sb/inspection/fill/task')
       } else {
       } else {
         this.$message.info('该类型的通知正在开发中,请稍后...')
         this.$message.info('该类型的通知正在开发中,请稍后...')
       }
       }