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 @@
- 是否为虚拟单
+ 是否为虚拟单
-
+
-
-
-
-
-
@@ -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;
+ }
}
}
};