From df85d03b5719cf99d5e60dd3f1ce32ae01cd957f Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Thu, 19 Jun 2025 10:49:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E5=8D=95=E5=BD=95=E5=85=A5=E8=99=9A?=
 =?UTF-8?q?=E6=8B=9F=E5=8D=95=E8=81=94=E5=8A=A8=E8=A7=84=E5=88=99=E5=92=8C?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PdfViewer/xdpdf/vuePdfNoSss.vue           |  2 +-
 src/views/emis/emisWaybill/waybillRecord.vue  | 21 ++++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/components/PdfViewer/xdpdf/vuePdfNoSss.vue b/src/components/PdfViewer/xdpdf/vuePdfNoSss.vue
index f14c2e39..2ef83703 100644
--- a/src/components/PdfViewer/xdpdf/vuePdfNoSss.vue
+++ b/src/components/PdfViewer/xdpdf/vuePdfNoSss.vue
@@ -11,7 +11,7 @@
 		if ( typeof window !== 'undefined' && 'Worker' in window && navigator.appVersion.indexOf('MSIE 10') === -1 ) {
 
 			var PdfjsWorker = require('worker-loader!pdfjs-dist/es5/build/pdf.worker.js');
-			PDFJS.GlobalWorkerOptions.workerPort =  PdfjsWorker;
+			PDFJS.GlobalWorkerOptions.workerPort = new PdfjsWorker();
 		}
 
 		var component = componentFactory(pdfjsWrapper(PDFJS));
diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index 604c3ef0..73ff3cdf 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -525,19 +525,14 @@
                       </el-col>
                       <el-col :span="12" v-if="form.transLine==='012' || form.transLine=='002' || form.transLine === '014'">
                         <el-form-item label="" prop="blVirtual">
-                          <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blVirtual"  :true-label="'1'" :false-label="'0'" ><span style="font-size:10px">是否为虚拟单</span></el-checkbox>
+                          <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blVirtual"  :true-label="'1'" :false-label="'0'" @change="handleVirtualChange"><span style="font-size:10px">是否为虚拟单</span></el-checkbox>
                         </el-form-item>
                       </el-col>
-                      <el-col :span="12" v-if="form.transLine==='012' || form.transLine=='002' || form.transLine === '014'">
+                      <el-col :span="12" v-if="(form.transLine==='012' || form.transLine=='002' || form.transLine === '014') && form.blVirtual === '1'">
                         <el-form-item :label="$t('关联主单')" prop="masterBillCode" label-width="70px">
                           <MasterBillCodePicker v-model="form.masterBillCode" :transLineType="form.transLine" @onMasterBillCodeChange="onMasterBillCodeChange"></MasterBillCodePicker>
                         </el-form-item>
                       </el-col>
-                      <el-col :span="24" v-if="form.transLine==='012' || form.transLine=='002' || form.transLine === '014'">
-                        <el-form-item :label="$t('虚拟单备注')" prop="virtualRemark" label-width="70px">
-                          <el-input type="textarea" v-model="form.virtualRemark"></el-input>
-                        </el-form-item>
-                      </el-col>
                       <el-col :span="24" v-if="form.blGenSubbill==1">
                         <el-form-item  :label="$t('子单号')" prop="billCodeSub" label-width="70px">
                           <el-input v-model="form.billCodeSub" rows="5" type="textarea" placeholder="" disabled />
@@ -1790,7 +1785,7 @@ methods: {
   onProductChange(item,transType){
     //非缅甸快递/缅甸快递进口/柬埔寨快递进口 重置虚拟单
     if(item !==null && item[0]!=='012' && item[0]!=='002' && item[0] !== '014'){
-      this.form.virtualRemark=null;
+      this.form.remark=null;
       this.form.masterBillCode=null;
       this.form.blVirtual=null;
     }
@@ -2407,11 +2402,21 @@ methods: {
       this.form.masterBillCode = val.value;
       this.masterBillProductType = val.productType;
       // this.masterBillProductType = '242011';
+      //生成备注
+      this.form.remark = `该单为虚拟单：对应主单为${this.form.masterBillCode}`;
     } else {
       //清空 
       this.form.masterBillCode = null;
       this.masterBillProductType = null;
+      this.form.remark = null;
     } 
+  },
+  //虚拟单变化
+  handleVirtualChange(){
+    if(this.form.blVirtual!=='1'){
+      this.form.remark = null;
+      this.form.masterBillCode =null;
+    }
   }
 }
 };