408249787 2 rokov pred
rodič
commit
cf81a9dd1a

+ 13 - 3
src/views/fill/gather/modules/CreateTaskForm.vue

@@ -208,9 +208,19 @@ export default {
         values.sbIds = this.sbIds
         console.log(values)
         addFillTasks(values).then(res => {
-          this.$message.success('创建成功!')
-          this.$router.push('/sb/inspection/fill/task')
-          this.handleCancel()
+          // this.$message.success('创建成功!')
+          const that = this
+          this.$confirm({
+            title: '创建成功!',
+            content: '是否前往任务页?',
+            onOk () {
+              that.$router.push('/sb/inspection/fill/task')
+            },
+            onCancel () {
+              that.handleCancel()
+            }
+          })
+          // this.$router.push('/sb/inspection/fill/task')
         })
       })
     },

+ 15 - 14
src/views/fill/task/FillGatherTask.vue

@@ -157,7 +157,7 @@ export default {
       columns: [
         {
           title: '序号',
-          width: 70,
+          width: 65,
           dataIndex: 'index',
           customRender: (text, record, index) => {
             return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
@@ -180,46 +180,47 @@ export default {
         },
         {
           title: '巡检开始时间',
-          width: 150,
+          width: 120,
           dataIndex: 'createdTime'
         },
         {
           title: '任务创建人',
-          width: 100,
+          width: 120,
           dataIndex: 'createdUserName'
         },
         {
           title: '待完成数量',
-          width: 100,
+          width: 120,
           dataIndex: 'waitNum'
         },
         {
           title: '巡检总数量',
-          width: 100,
+          width: 110,
           dataIndex: 'totalNum'
         },
-        {
-          title: '任务状态',
-          width: 100,
-          fixed: 'right',
-          dataIndex: 'status',
-          scopedSlots: { customRender: 'status' }
-        },
+
         {
           title: '要求时间',
           width: 100,
           dataIndex: 'requireHour'
         },
         {
-          title: '超时预警时间',
+          title: '超时预警时间(小时)',
           width: 100,
           dataIndex: 'warningHour'
         },
         {
-          title: '累计延时时间',
+          title: '累计延时时间(小时)',
           width: 100,
           dataIndex: 'lateHistoryHours'
         },
+        {
+          title: '任务状态',
+          width: 100,
+          fixed: 'right',
+          dataIndex: 'status',
+          scopedSlots: { customRender: 'status' }
+        },
         {
           title: '操作',
           key: 'action',