Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter

src/api/collect/splitCreateOrder.js

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

src/views/collect/DealOrder.vue

@@ -15,13 +15,13 @@
             <el-button-group>
               <el-button
                 type="primary"
-                :disabled="formData.billNo"
+                :disabled="formData.billNo  || (this.formDataVisible != null &&  this.formDataVisible.scanType == 1)"
                 @click.native="nextCollectOrder()"
               >下一单
               </el-button>
               <el-button
                 type="primary"
-                :disabled="formData.billNo"
+                :disabled="formData.billNo ||(this.formDataVisible != null &&  this.formDataVisible.scanType == 1)"
                 @click.native="selectPrescribe()"
               >选单
               </el-button>
@@ -113,8 +113,8 @@
           <!--          </el-col>-->
           <el-col :span="6">
             <el-form-item prop="locInvCode" label="发货方:">
-              <el-select v-model="formData.invCode" placeholder="请选择发货方" clearable
-                         disabled
+              <el-select v-model="formData.shipper" placeholder="请选择发货方" clearable
+                         :disabled="formData.billNo"
                          style="width: 90%"
               >
                 <el-option
@@ -132,6 +132,7 @@
             <el-form-item class="query-form-item" label="收货方">
               <el-select v-model="formData.fromCorp"
                          filterable
+                         :disabled="formData.billNo"
                          remote
                          reserve-keyword
                          @change="changeCorp"
@@ -178,9 +179,9 @@
                   style="margin-left: 15px"
                 >
                 </el-button>
-
+                <!-- :disabled="!formData.billNo ||  (this.formDataVisible != null &&  this.formDataVisible.scanType == 1)"-->
                 <el-button type="primary"
-                           :disabled="!formData.billNo" @click="addGs">ALT+29
+                           @click="addGs">ALT+29
                 </el-button>
                 <el-button
                   type="primary"
@@ -379,7 +380,15 @@ import prescribeCodePanel from "./PanelOrderTagCode";
 import PannelOrderBiz from "./PannelOrderBiz";
 import {listPage} from "@/api/basic/workPlace/sysWorkplaceManage";
 import {enterCodeWeb, batchVailCode, enterCodeBillNo} from "@/api/inout/order";
-import {cancelOrder, draftOrder, finishOrder, startSplit, tagCode, updateOrder} from "@/api/collect/splitCreateOrder";
+import {
+  cancelOrder,
+  draftOrder,
+  finishOrder,
+  startSplit,
+  tagCode,
+  updateOrder,
+  vailOrderFinish
+} from "@/api/collect/splitCreateOrder";
 import {selectCorpList} from "@/api/basic/basicUnitMaintain";
 import {getCurOrder, getNextOrder, findByBill, findFromCorp} from "@/api/collect/collectOrder";
 import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
@@ -656,12 +665,11 @@ export default {
 
     getInputFocus(event) {
       event.currentTarget.select();
-      ``
     },
 
 
     enterKey() {
-      if (this.formData.billNo == null) {
+      if (this.formData.billNo == null && (this.formDataVisible === null || this.formDataVisible.scanType != 1)) {
         this.enterBillNoKey()
         return;
       }
@@ -840,12 +848,11 @@ export default {
       if (this.$isBlank(this.filterQuery.code) && this.$isBlank(this.scanCode)) {
         return;
       }
-      // if (this.$isNotBlank(this.scanCode)) {
-      //   this.filterQuery.code = this.scanCode.trim();
-      // }
       let tagQuery = {
         workPlaceCode: this.formData.workPlaceCode,
         fromCorp: this.formData.fromCorp,
+        fromCorpName: this.formData.fromCorpName,
+        shipper: this.formData.invCode,
         billNo: this.formData.billNo,
         code: this.filterQuery.code.trim(),
         insert: this.formData.insert,
@@ -918,7 +925,6 @@ export default {
       });
     },
 
-
     confirmFinishOrder() {
       this.$confirm('是否确定完成此单据?', '提示', {
         confirmButtonText: '确定',
@@ -959,7 +965,6 @@ export default {
       })
     },
 
-
     updateOrder() {
       this.formData.workPlaceCode = this.workplaceId;
       updateOrder(this.formData).then(res => {
@@ -997,7 +1002,6 @@ export default {
       })
     },
 
-
     findCurOrder() {
       let nextQuery = {
         workPlaceCode: this.formData.workPlaceCode,
@@ -1126,6 +1130,29 @@ export default {
     },
 
 
+    vailOrderFinish() {
+      vailOrderFinish(this.formData).then(res => {
+        this.loading = false
+        if (res.code == 20000) {
+          if (res.data) {
+            this.$confirm("单据已赋码或可自动赋码，是否立即完成单据？", '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              this.finishOrder();
+            }).catch(() => {
+            });
+          }
+        } else {
+
+        }
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+
+
     async printMutiCodeResult(vailCodeResultResponses) {
       this.warnResult = "";
       this.errResult = "";
@@ -1194,7 +1221,7 @@ export default {
         })
     },
     changeCorp() {
-      let corp = this.fromInvOptions.find(item => item.erpId === this.formData.fromCorp);
+      let corp = this.fromInvOptions.find(item => item.code === this.formData.fromCorp);
       this.formData.fromCorpName = corp.name
     },
     //处理事件
@@ -1232,6 +1259,8 @@ export default {
               billNo: this.formData.billNo,
               insert: this.formData.insert,
               busType: this.formData.busType,
+              fromCorpName: this.formData.fromCorpName,
+              invCode: this.formData.invCode,
             }
             orderbatchAddCode(params2).then((res) => {
               if (res.code === 20000) {