From ddb236079b2196594e58d7eca936eee69f956636 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Thu, 31 Jul 2025 17:57:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E8=BF=9B=E4=BB=93=E5=8D=95-=E5=88=97=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue b/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
index a9ba661e..5ae8d8f4 100644
--- a/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
+++ b/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
@@ -136,7 +136,7 @@
            border
            size="mini"
 
-           storageName="emisWarehouseInList_main"
+           storageName="emisWarehouseInList_main1"
 
            ref="refTable"
 

From bbfdd41f6c25dcea71eec1c626c0f4dd508224b5 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Thu, 31 Jul 2025 19:03:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emisWaybillAjustApply/adjustPanel.vue     | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
index 81e8c248..189676ef 100644
--- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
+++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
@@ -347,7 +347,7 @@
                     </el-col>
                     <el-col :span="14">
                       <el-form-item  :label="$t('支付方式')" prop="paymentType" >
-                          <el-select v-model="form.paymentType" placeholder="" @change="calcBillFee">
+                          <el-select v-model="form.paymentType" placeholder="" @change="onPaymentTypeChange()">
                             <el-option
                               v-for="dict in dict.type.emis_payment_type"
                               :key="dict.value"
@@ -1505,7 +1505,7 @@ export default {
       newValue: {
         handler (newVa, oldValue) {
           this.form=this.newValue;
-          this.form.blSpecialQuote = Number(this.newValue.blSpecialQuote);
+          // this.form.blSpecialQuote = Number(this.newValue.blSpecialQuote);
           console.log("====>newValue this.form==>",this.form);
 
           console.log("====>newValue this.form.packType==>",this.form.packType);
@@ -2195,7 +2195,20 @@ export default {
       if(this.form.reciever){
         this.recieverCountryCode = this.form.reciever.country;
       }
-    }
+    },
+    onPaymentTypeChange() {
+      //console.log("==onPaymentTypeChange==>")
+      // 非月结清空月结客户选择
+      if (this.form.paymentType == '1' ||
+        this.form.paymentType == '3' ||
+        this.form.paymentType == '6'
+      ) {
+        this.form.custNo = null;
+        this.form.customerCode = null;
+        this.calcBillFee();
+      }
+
+    },
   }
 };
 </script>