Merge branch '20240912_adapter' of http://116.204.71.86:3000/UDI/udiwms-vue-frame into 20240912_adapter

src/api/collect/splitCreateOrder.js

@@ -37,6 +37,15 @@ export function finishOrder(query) {
   });
 }
 
+export function finishCheckOrder(query) {
+  return axios({
+    url: "/udiwms/basic/collect/order/finishCheckOrder",
+    method: "post",
+    data: query
+  });
+}
+
+
 export function vailOrderFinish(query) {
   return axios({
     url: "/udiwms/basic/collect/order/vailFinish",

src/views/collect/DealOrder.vue

@@ -1425,7 +1425,9 @@ export default {
       this.formData = {
         tagStatus: -1,
         workPlaceCode: this.formData.workPlaceCode,
-        busType: this.formData.busType
+        busType: this.formData.busType,
+        shipper : null,
+        fromCorp : null,
       };
       this.curRow = null
       this.formData.confirmFinish = false;

src/views/collect/IocCollectOrderCheckCode.vue

@@ -166,7 +166,7 @@ import { isBlank } from '@/utils/strUtil'
 import { getCodeEndList } from '@/api/collect/IoCollectCodeSelect'
 import { enterCodeBillNo } from '@/api/inout/order'
 import { autoCodeResult, findByBill, manualCodeDetail, orderDetail } from '@/api/collect/collectOrder'
-import { cancelOrder, checkCollectOrderManCode } from '@/api/collect/splitCreateOrder'
+import {  checkCollectOrderManCode, finishCheckOrder } from '@/api/collect/splitCreateOrder'
 
 export default {
   name: 'IocCollectOrderCheckCode',
@@ -267,7 +267,7 @@ export default {
         if (response.code == 601) {
           this.placeholder = '已选入单据，请扫描追溯码进行审核'
           this.orderData.billNo = response.data.billNo
-          this.getBillNo(this.filterQuery.billNo)
+          this.getBillNo(this.orderData.billNo)
           this.$refs.inputRef.focus()
           this.$refs.inputRef.select()
           this.scanCode = ''
@@ -527,9 +527,20 @@ export default {
       })
     },
     commitCheckOrder() {
+      this.finishOrder()
       this.init()
       this.$message.success('单据审核完成')
     },
+    finishOrder() {
+      finishCheckOrder(this.orderData).then(res => {
+        if (res.code == 20000) {
+        }else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+
+      })
+    },
     cancelOrder() {
       this.$confirm('此操作将取消当前正在审核单据，是否继续?', '提示', {
         confirmButtonText: '确定',