From dbcf2c9f014e6857bf1c66ac770210f33a36a6e1 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Wed, 26 Feb 2025 11:38:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/DealOrderPre.vue | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/views/collect/DealOrderPre.vue b/src/views/collect/DealOrderPre.vue
index df804186..8fe53e7c 100644
--- a/src/views/collect/DealOrderPre.vue
+++ b/src/views/collect/DealOrderPre.vue
@@ -37,7 +37,7 @@
 <!--              </el-button>-->
               <el-button
                 type="primary"
-                :disabled="!formData.billNo"
+                :disabled="!formData.billNo || formData.preInBillNo"
                 @click.native="selectPreorder()"
               >选预验收入库单
               </el-button>
@@ -254,6 +254,7 @@
           </el-descriptions-item>
           <el-descriptions-item label="发货方">{{ formData.shipperName }}</el-descriptions-item>
           <el-descriptions-item label="收货方">{{ formData.fromCorpName }}</el-descriptions-item>
+          <el-descriptions-item label="预验收入库单号">{{ formData.preInBillNo }}</el-descriptions-item>
           <el-descriptions-item label="单据类型">{{ formData.busTypeName }}</el-descriptions-item>
           <el-descriptions-item label="来源系统">{{ formData.fromType }}</el-descriptions-item>
           <el-descriptions-item label="单据时间">{{ formData.billTime }}</el-descriptions-item>
@@ -473,6 +474,7 @@ export default {
   },
   data() {
     return {
+      checkPreInArray:[],
       tabsName: [
         'prescribeOriginPanel',
         'prescribeCodePanel1',
@@ -515,6 +517,7 @@ export default {
         busType: null,
         workPlaceCode: null,
         fromCorp: null,
+        preInBillNo: null,
         confirmFinish: false,
       },
       selectPrescriptionVisible: false,
@@ -592,6 +595,13 @@ export default {
     }
   },
   methods: {
+    //接收预验单传值
+    giveselectbox(val) {
+      this.checkPreInArray = JSON.parse(JSON.stringify(val));
+      if (this.checkPreInArray != null) {
+        this.formData.preInBillNo = this.checkPreInArray.join(",");
+      }
+    },
     //关闭预选单弹框
     closeDialogtwo() {
       this.selectorder = false;
@@ -1110,6 +1120,7 @@ export default {
         code: this.filterQuery.code.trim(),
         insert: this.formData.insert,
         busType: this.formData.busType,
+        preInBillNo: this.formData.preInBillNo,
       };
       tagCode(tagQuery).then(res => {
         this.loading = false
@@ -1544,6 +1555,7 @@ export default {
         shipper: null,
         fromCorp: null,
       };
+      this.checkPreInArray = []
       this.selectSysParam()
       this.curRow = null
       this.formData.confirmFinish = false;