From 42d8ea2de8bab602a624ef557f3c405fdee970a0 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Mon, 23 Jun 2025 11:33:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E4=B8=BB=E5=8D=95=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E6=96=87=E6=9C=AC=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/emis/emisWaybill/waybillModify.vue      | 15 +++++++++------
 src/views/emis/emisWaybill/waybillRecord.vue      |  2 +-
 .../emis/emisWaybillAjustApply/adjustPanel.vue    |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue
index f7dfc99a..238409e4 100644
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@@ -161,7 +161,7 @@
 
               </el-row>
               <!-- v-if="action=='add' || action=='preAdd'" -->
-              <div  style="position: absolute;right: 80px;top: 60px;z-index: 100;">
+              <div  style="position: absolute;right: 80px;top: 40px;z-index: 100;">
                 <!--  -->
                     <div style="display:inline-flex;font-size: 15px;font-weight: 700;">
 
@@ -934,7 +934,7 @@ data() {
     //校验关联主单线路
   var checkmasterProductType = (rule, value, callback) => {
     if (this.masterBillProductType && this.masterBillProductType != this.form.productType) {
-      callback(new Error('输入单号不正确'));// 关联主单和运单线路不一致
+      callback(new Error('主单和虚拟单线路不一致'));// 关联主单和运单线路不一致
     } else {
       callback();
     }
@@ -967,7 +967,7 @@ data() {
       mainHasCnt:0,
       subHasCnt:0
     },
-
+    sendSiteSelectCount:0,//寄件网点变化次数
     // 表单校验
     rules: {
       billCode: [
@@ -1563,7 +1563,7 @@ methods: {
 
       this.reset();
       this.form.productTypeSelArr=null;
-
+      this.sendSiteSelectCount =0;
       if(this.billCode && this.billCode!=undefined) {
         this.loading = true;
         getWaybillDetail(this.billCode).then(response => {
@@ -1806,6 +1806,7 @@ methods: {
     }
   },
   onSendSiteSelect(item){
+    this.sendSiteSelectCount ++ ;
     ////console.log("==onSendSiteSelect==>",item)
     ////console.log("==onSendSiteSelect==this.form=>",this.form)
 
@@ -1818,8 +1819,10 @@ methods: {
     }
     this.form.sendSiteCode=item.siteCode;
     this.form.sendSiteName=item.siteName;
-    this.form.startSiteCode=item.siteCode;
-    this.form.startSiteName=item.siteName;
+    if(this.sendSiteSelectCount > 2){
+      this.form.startSiteCode = item.siteCode;
+      this.form.startSiteName = item.siteName;
+    }
     this.initGetTotalAvailablePag(this.form.sendSiteCode);
     // this.calcBillFee();
   },
diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index ab1e15db..bb76795a 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -936,7 +936,7 @@ data() {
   //校验关联主单线路
   var checkmasterProductType = (rule, value, callback) => {
     if (this.masterBillProductType && this.masterBillProductType != this.form.productType) {
-      callback(new Error('输入单号不正确'));// 关联主单和运单线路不一致
+      callback(new Error('主单和虚拟单线路不一致'));// 关联主单和运单线路不一致
     } else {
       callback();
     }
diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
index 034569e0..b839e104 100644
--- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
+++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
@@ -1292,7 +1292,7 @@ export default {
     //校验关联主单线路
     var checkmasterProductType = (rule, value, callback) => {
       if (this.masterBillProductType && this.masterBillProductType != this.form.productType) {
-        callback(new Error('输入单号不正确'));// 关联主单和运单线路不一致
+        callback(new Error('主单和虚拟单线路不一致'));// 关联主单和运单线路不一致
       } else {
         callback();
       }