From 9e26344c27f899068d473f76b215c460b9dd7201 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Wed, 18 Jun 2025 17:42:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E5=8D=95=E5=BD=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/emis/emisWaybill.js | 9 ++
.../PdfViewer/xdpdf/vuePdfNoSss.vue | 2 +-
.../EmisBaseTools/MasterBillCodePicker.vue | 111 ++++++++++++++++++
src/views/emis/emisWaybill/waybillRecord.vue | 61 ++++++++--
4 files changed, 175 insertions(+), 8 deletions(-)
create mode 100644 src/views/emis/EmisBaseTools/MasterBillCodePicker.vue
diff --git a/src/api/emis/emisWaybill.js b/src/api/emis/emisWaybill.js
index e5558d2e..bfcb5dec 100644
--- a/src/api/emis/emisWaybill.js
+++ b/src/api/emis/emisWaybill.js
@@ -242,3 +242,12 @@ export function delEmisWaybill(id) {
method: 'delete'
})
}
+
+//获取关联主单列表
+export function getMasterEmisWaybills(query) {
+ return request({
+ url: '/emis/emisWaybill/getMasterEmisWaybills',
+ method: 'get',
+ params: query
+ })
+}
\ No newline at end of file
diff --git a/src/components/PdfViewer/xdpdf/vuePdfNoSss.vue b/src/components/PdfViewer/xdpdf/vuePdfNoSss.vue
index 2ef83703..f14c2e39 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 = new PdfjsWorker();
+ PDFJS.GlobalWorkerOptions.workerPort = PdfjsWorker;
}
var component = componentFactory(pdfjsWrapper(PDFJS));
diff --git a/src/views/emis/EmisBaseTools/MasterBillCodePicker.vue b/src/views/emis/EmisBaseTools/MasterBillCodePicker.vue
new file mode 100644
index 00000000..9d1d0ce8
--- /dev/null
+++ b/src/views/emis/EmisBaseTools/MasterBillCodePicker.vue
@@ -0,0 +1,111 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index ab01f529..604c3ef0 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -508,7 +508,7 @@
是否超重
-
+
@@ -523,12 +523,26 @@
+
+
+ 是否为虚拟单
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -867,7 +881,7 @@ import ExchangeRatePanel from '@/views/emis/EmisBaseTools/ExchangeRatePanel.vue'
import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue';
// import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue';
-
+import MasterBillCodePicker from '@/views/emis/EmisBaseTools/MasterBillCodePicker.vue';
import feeItemForm from './feeItemForm.vue';
import TanexPrinterPanel from '@/views/emis/EmisBaseTools/TanexPrinterPanel.vue';
@@ -911,12 +925,21 @@ components: {
DistrictPicker2,
ExchangeRatePanel,
SeaSiteSimplePicker0,
- SeaSiteSimplePicker1
+ SeaSiteSimplePicker1,
+ MasterBillCodePicker,
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
'emis_calc_fee_type','emis_print_type','sys_currency_type'],
data() {
+ //校验关联主单线路
+ var checkmasterProductType = (rule, value, callback) => {
+ if (this.masterBillProductType && this.masterBillProductType != this.form.productType) {
+ callback(new Error('输入单号不正确'));// 关联主单和运单线路不一致
+ } else {
+ callback();
+ }
+ }
return {
activeNames:['1','2','3','4'],
exchangeRate:null,
@@ -939,8 +962,8 @@ data() {
printerStatus:0,
origBillCode:null,
-
-
+ //关联主单 产品类型
+ masterBillProductType:null,
// 可用面单数
totalAvailablePag:{
@@ -1030,6 +1053,10 @@ data() {
packType: [
{ required: true, message: "包装类型不能为空",trigger: ["blur",'change'] }
],
+ //自定义校验
+ masterBillCode:[
+ {validator: checkmasterProductType, trigger: ['blur', 'change']}
+ ],
dispatchMethod: [
{ required: true, message: "派件方式不能为空", trigger: ["blur",'change'] }
],
@@ -1754,11 +1781,19 @@ methods: {
departurePort:null,
destinationPort:null,
boxQuantity:null,
- carryType:null
+ carryType:null,
+ blVirtual:null,
+ masterBillCode:null
};
this.resetForm("form");
},
onProductChange(item,transType){
+ //非缅甸快递/缅甸快递进口/柬埔寨快递进口 重置虚拟单
+ if(item !==null && item[0]!=='012' && item[0]!=='002' && item[0] !== '014'){
+ this.form.virtualRemark=null;
+ this.form.masterBillCode=null;
+ this.form.blVirtual=null;
+ }
if(item!=null && item.length==2){
this.form.transLine=item[0];
this.form.productType=item[1];
@@ -2366,6 +2401,18 @@ methods: {
this.form.billCode=""
}
},
+ //获取虚拟运单关联主单
+ onMasterBillCodeChange(val) {
+ if (val) {
+ this.form.masterBillCode = val.value;
+ this.masterBillProductType = val.productType;
+ // this.masterBillProductType = '242011';
+ } else {
+ //清空
+ this.form.masterBillCode = null;
+ this.masterBillProductType = null;
+ }
+ }
}
};