Merge branch 'dev'

src/views/taskManage/index.vue

@@ -536,11 +536,11 @@
       width='500px'
       :close-on-click-modal='false'
     >
-      <el-form size='mini'>
-        <el-form-item label='预计完成时间'>
+      <el-form size='mini' :rules='addRules' :model='ruleForm' ref='ruleForm'>
+        <el-form-item label='预计完成时间' prop='estimateCompleteTime'>
           <el-date-picker
             style='width: 100%'
-            v-model='estimateCompleteTime'
+            v-model='ruleForm.estimateCompleteTime'
             value-format='yyyy-MM-dd HH:mm:ss'
             type='datetime'
             default-time='23:59:59'
@@ -734,10 +734,28 @@ export default {
   },
   data() {
     const userInfo = localStorage.getItem('user')
+    var validatePass2 = (rule, value, callback) => {
+      const start = new Date(value)
+      if (!value) {
+        callback(new Error('请选择预计完成时间'))
+      } else if (start < Date.now()) {
+        callback(new Error('预计完成时间要大于当前时间!'))
+      } else {
+        callback()
+      }
+    }
     return {
+      addRules: {
+        estimateCompleteTime: [
+          {
+            validator: validatePass2,
+            trigger: 'blur',
+          },
+        ],
+      },
       pickerOptions: {
         disabledDate(time) {
-          return time.getTime() < Date.now()
+          return time.getTime() < Date.now() - 8.64e7
         },
       },
       assignFormRules: {
@@ -817,7 +835,9 @@ export default {
       cloneForm: {},
       editDialog: false,
       completeVisible: false,
-      estimateCompleteTime: '',
+      ruleForm: {
+        estimateCompleteTime: '',
+      },
       currentItem: null,
       acceptVisible: false,
       acceptFormRules: {
@@ -1354,7 +1374,7 @@ export default {
     },
     // 开始工单
     async startWorkOrder(item) {
-      this.estimateCompleteTime = ''
+      this.ruleForm.estimateCompleteTime = ''
       this.completeVisible = true
       this.rowId = item.id
       this.currentItem = item
@@ -1449,6 +1469,17 @@ export default {
           'participator',
           this.userInfo.id,
         )
+      } else {
+        this.$set(
+          this.searchForm,
+          'leaders',
+          '',
+        )
+        this.$set(
+          this.searchForm,
+          'participator',
+          '',
+        )
       }
       this.statusCode = data.statusCode
       this.getlist()
@@ -1586,22 +1617,20 @@ export default {
       }
     },
     async submitTime() {
-      if (!this.estimateCompleteTime) {
-        return this.$message.warning('请选择预计完成时间')
-      }
-      try {
-        const res = await startWorder(
-          this.rowId,
-          this.estimateCompleteTime,
-        )
-        if (res.code === 200) {
-          this.getlist()
-          this.getOrderTree()
-          this.completeVisible = false
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          startWorder(
+            this.rowId,
+            this.ruleForm.estimateCompleteTime,
+          ).then(res => {
+            if (res.code === 200) {
+              this.getlist()
+              this.getOrderTree()
+              this.completeVisible = false
+            }
+          })
         }
-      } catch (e) {
-        console.error(e)
-      }
+      })
     },
     async reply() {
       if (!this.textarea) {