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

src/api/modular/main/BookingLedger.js

@@ -1247,4 +1247,13 @@ export function listYardBwCarrier(parameter) {
     method: 'get',
     params: parameter
   })
-}
+}
+
+export function SendTruckAfterDispatch(parameter) {
+  return axios({
+    url: '/TaskManageTruck/SendTruckAfterDispatch',
+    method: 'post',
+    data: parameter
+  })
+}
+

src/views/main/SendCar/addForm.vue

@@ -515,6 +515,7 @@
                 <vxe-button @click="removeCheckboxRow()">删除选中</vxe-button>
                 <vxe-button v-if="BookingId" @click="introduce()">引入</vxe-button>
                 <vxe-button @click="introduceData()">引入场站数据</vxe-button>
+                <vxe-button v-if="taskPKId" @click="synchronous">同步东胜</vxe-button>
               </template>
             </vxe-toolbar>
             <vxe-table
@@ -688,7 +689,7 @@ import {
   BookingTruckGetYardData,
   TaskManageTruckGetYardData
 } from '@/api/modular/main/SendCar'
-import { GetCtn, GetSysUserPage } from '@/api/modular/main/BookingLedger'
+import { GetCtn, GetSysUserPage,SendTruckAfterDispatch } from '@/api/modular/main/BookingLedger'
 
 import { merge, values } from 'xe-utils'
 export default {
@@ -946,6 +947,34 @@ export default {
         })
       }
     },
+    synchronous() {
+      const {
+        form: { validateFields }
+      } = this
+      this.confirmLoading = true
+      validateFields((errors, values) => {
+        if (!errors) {
+          values.contaList = this.ContactsData
+          values = this.FnCompleteName(values)
+          values.pK_ID = this.WebData.pK_ID
+          values.bookingId = this.BookingId
+          SendTruckAfterDispatch({ ...values })
+            .then((res) => {
+              if (res.data.succ) {
+                this.$message.success('同步成功')
+              } else {
+                this.$message.error(`同步失败,${res.data.msg}`)
+              }
+              this.confirmLoading = false
+            })
+            .catch(() => {
+              this.confirmLoading = false
+            })
+        } else {
+          this.confirmLoading = false
+        }
+      })
+    },
     // 打印
     FnCilckTemplateType(templateId) {
       this.$message.success(`搜索文件中...`)
@@ -1176,14 +1205,14 @@ export default {
                 this.$message.success('提交成功')
                 const type = this.type
                 if (this.type == 'Add' && !this.BookingId) {
-                    this.type = 'Edit'
-                    this.id = res.data.ext
-                  } else if (this.type == 'Add' && this.BookingId) {
-                    this.type = 'Edit'
-                  }
-                  if (type == 'Add') {
-                    this.init()
-                  }
+                  this.type = 'Edit'
+                  this.id = res.data.ext
+                } else if (this.type == 'Add' && this.BookingId) {
+                  this.type = 'Edit'
+                }
+                if (type == 'Add') {
+                  this.init()
+                }
               } else {
                 this.$message.error(`提交失败,${res.data.msg}`)
               }