Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuanFront

src/views/main/SendCar/addForm.vue

@@ -951,13 +951,17 @@ export default {
       this.form = this.$form.createForm(this)
       if (this.BookingId) {
         BookingTruckInitFromBookingOrder({ bookingId: this.BookingId }).then(res => {
-          console.log(res, 'BookingTruckInitFromBookingOrder')
+          if (res.data.succ) {
-          this.form.setFieldsValue({ ...res.data.ext })
+            console.log(res, 'BookingTruckInitFromBookingOrder')
-          if (res.data.ext.contaList) {
+            this.form.setFieldsValue({ ...res.data.ext })
-            res.data.ext.contaList.forEach((item, index) => {
+            if (res.data.ext.contaList) {
-              item.WebKey = index + 1
+              res.data.ext.contaList.forEach((item, index) => {
-            })
+                item.WebKey = index + 1
-            this.ContactsData = res.data.ext.contaList
+              })
+              this.ContactsData = res.data.ext.contaList
+            }
+          } else {
+            this.$message.error(`${res.data.msg}`)
           }
         })
       }
@@ -1273,23 +1277,20 @@ export default {
      */
 
     handleSubmit() {
-      console.log(1)
       const {
         form: { validateFields }
       } = this
       this.confirmLoading = true
-      console.log(2)
+
       validateFields((errors, values) => {
         if (!errors) {
-          console.log(3)
           values.contaList = this.ContactsData
           values = this.FnCompleteName(values)
-          console.log(this.taskPKId)
+
           if (this.taskPKId) {
             values.pK_ID = this.WebData.pK_ID
             TaskManageTruckSave({ ...values })
               .then(res => {
-                console.log(res.data)
                 if (res.data.succ) {
                   this.$message.success('保存成功')
                   // if (this.type == 'Add' && !this.BookingId) {
@@ -1298,7 +1299,9 @@ export default {
                   // } else if (this.type == 'Add' && this.BookingId) {
                   //   this.type = 'Edit'
                   // }
-                  this.init()
+                  if (this.type == 'Add') {
+                    this.init()
+                  }
                 } else {
                   this.$message.error(`保存失败,${res.data.msg}`)
                 }
@@ -1319,6 +1322,8 @@ export default {
             }
             BookingTruckSave({ ...values })
               .then(res => {
+                let type = this.type
+                console.log(type)
                 if (res.data.succ) {
                   this.$message.success('保存成功')
                   if (this.type == 'Add' && !this.BookingId) {
@@ -1327,7 +1332,10 @@ export default {
                   } else if (this.type == 'Add' && this.BookingId) {
                     this.type = 'Edit'
                   }
-                  this.init()
+                  console.log(type)
+                  if (type == 'Add') {
+                    this.init()
+                  }
                 } else {
                   this.$message.error(`保存失败,${res.data.msg}`)
                 }

src/views/main/Taskmanage/TaskmanageList/index.vue

@@ -1145,9 +1145,7 @@ export default {
         this.$message.error('请选择数据')
         return false
       }
-      CancelTask({
+      CancelTask(pkIdArr)
-        PKIds: pkIdArr
-      })
         .then(res => {
           if (res.success) {
             this.$message.success('取消任务成功')
@@ -1170,9 +1168,7 @@ export default {
         this.$message.error('请选择数据')
         return false
       }
-      CompleteTask({
+      CompleteTask(pkIdArr)
-        PKIds: pkIdArr
-      })
         .then(res => {
           if (res.success) {
             this.$message.success('已完成任务')