scorpio 2 年之前
父節點
當前提交
58b8a1934d
共有 2 個文件被更改,包括 24 次插入24 次删除
  1. 9 9
      src/views/task/component/task-table.vue
  2. 15 15
      src/views/task/component/task.vue

+ 9 - 9
src/views/task/component/task-table.vue

@@ -172,31 +172,31 @@ export default {
       status: [
         {
           title: '待确认',
-          value: 0,
+          value: 1,
           color: '#D7D7D7',
           checked: true
         },
         {
           title: '进行中',
-          value: 1,
+          value: 2,
           color: '#47A6EA',
           checked: false
         },
         {
           title: '已提交',
-          value: 2,
+          value: 3,
           color: '#ECAB56',
           checked: false
         },
         {
           title: '已完成',
-          value: 3,
+          value: 4,
           color: '#80B336',
           checked: false
         },
         {
           title: '已取消',
-          value: 4,
+          value: 5,
           color: '#C72A29',
           checked: false
         }
@@ -204,25 +204,25 @@ export default {
       level: [
         {
           title: 'P1',
-          value: 0,
+          value: 1,
           color: '#C72A29',
           checked: true
         },
         {
           title: 'P2',
-          value: 1,
+          value: 2,
           color: '#E89D42',
           checked: false
         },
         {
           title: 'P3',
-          value: 2,
+          value: 3,
           color: '#47A6EA',
           checked: false
         },
         {
           title: 'P4',
-          value: 3,
+          value: 4,
           color: '#A0A0A0',
           checked: false
         }

+ 15 - 15
src/views/task/component/task.vue

@@ -241,31 +241,31 @@ export default {
       status: [
         {
           title: '待确认',
-          value: 0,
+          value: 1,
           color: '#D7D7D7',
           checked: true
         },
         {
           title: '进行中',
-          value: 1,
+          value: 2,
           color: '#47A6EA',
           checked: false
         },
         {
           title: '已提交',
-          value: 2,
+          value: 3,
           color: '#ECAB56',
           checked: false
         },
         {
           title: '已完成',
-          value: 3,
+          value: 4,
           color: '#80B336',
           checked: false
         },
         {
           title: '已取消',
-          value: 4,
+          value: 5,
           color: '#C72A29',
           checked: false
         }
@@ -273,25 +273,25 @@ export default {
       level: [
         {
           title: 'P1',
-          value: 0,
+          value: 1,
           color: '#C72A29',
           checked: true
         },
         {
           title: 'P2',
-          value: 1,
+          value: 2,
           color: '#E89D42',
           checked: false
         },
         {
           title: 'P3',
-          value: 2,
+          value: 3,
           color: '#47A6EA',
           checked: false
         },
         {
           title: 'P4',
-          value: 3,
+          value: 4,
           color: '#A0A0A0',
           checked: false
         }
@@ -306,7 +306,7 @@ export default {
         this.executeUser = [...this.task.users]
       }
       this.canEdit = this.form.createUser === this.user.info.userId
-      if (this.task.taskStatus > 1) {
+      if (this.task.taskStatus > 2) {
         this.canEdit = false
       }
       if (this.task.files !== undefined && this.task.files.length > 0) {
@@ -333,13 +333,13 @@ export default {
     show(type) {
       if (type !== 1) {
         this.form = this.task
-        if (this.task.taskStatus === 3 || this.task.taskStatus === 4) {
+        if (this.task.taskStatus === 4 || this.task.taskStatus === 5) {
           this.isFinish = true
         }
         this.init(this.task)
       } else {
-        this.form.taskStatus = 0
-        this.form.level = 0
+        this.form.taskStatus = 1
+        this.form.level = 1
         this.canEdit = true
       }
       this.showDialog = true
@@ -364,7 +364,7 @@ export default {
       }
     },
     submit() {
-      if (this.form.taskStatus === 2 && this.resultFiles.length === 0) {
+      if (this.form.taskStatus === 3 && this.resultFiles.length === 0) {
         this.$message.error('请上传成果文件')
         return
       } else {
@@ -372,7 +372,7 @@ export default {
       }
 
       if (
-        this.form.taskStatus === 3 &&
+        this.form.taskStatus === 4 &&
         this.isMove === false &&
         this.isFinish === false
       ) {