diff --git a/src/views/emis/emisWaybill/centerWaybillList.vue b/src/views/emis/emisWaybill/centerWaybillList.vue index f94f365d..64f7448a 100644 --- a/src/views/emis/emisWaybill/centerWaybillList.vue +++ b/src/views/emis/emisWaybill/centerWaybillList.vue @@ -982,6 +982,7 @@ export default { if(selection!=null){ this.billCode=selection[0].billCode; } + this.selectionList=selection; this.ids = selection.map(item => item.id) this.single = selection.length!==1 this.multiple = !selection.length diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue index 14b78c8f..877279ab 100644 --- a/src/views/emis/emisWaybill/sendWaybillList.vue +++ b/src/views/emis/emisWaybill/sendWaybillList.vue @@ -42,7 +42,7 @@ - + @@ -649,6 +649,8 @@ export default { titleView:"", openView: false, + origBillCode:null, + // 时间搜索 dateRange:[], // 查询参数 @@ -806,15 +808,16 @@ export default { params:{ expireNotSign:null, problemQueryType:null, - queryTabType:"1" + queryTabType:"1", + querySendType:"1" } }, }; }, created() { - if(this.$store.getters.ownerSiteCode!='88888'){ - this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode; - } + // if(this.$store.getters.ownerSiteCode!='88888'){ + // this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode; + // } const end = new Date() const start = new Date() start.setHours(0,0,0,0) diff --git a/src/views/emis/emisWaybill/sendWaybillListNew.vue b/src/views/emis/emisWaybill/sendWaybillListNew.vue index 08637d45..944b7745 100644 --- a/src/views/emis/emisWaybill/sendWaybillListNew.vue +++ b/src/views/emis/emisWaybill/sendWaybillListNew.vue @@ -43,8 +43,10 @@ - + + + @@ -851,9 +853,9 @@ export default { }; }, created() { - if(this.$store.getters.ownerSiteCode!='88888'){ - this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode; - } + // if(this.$store.getters.ownerSiteCode!='88888'){ + // this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode; + // } const end = new Date() const start = new Date() start.setHours(0,0,0,0) diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue index 62e423cd..13ce925f 100644 --- a/src/views/emis/emisWaybill/waybillRecord.vue +++ b/src/views/emis/emisWaybill/waybillRecord.vue @@ -876,6 +876,8 @@ data() { openSelectAddress:false, printerStatus:0, + origBillCode:null, + // 可用面单数 totalAvailablePag:{ mainHasCnt:0, @@ -1275,8 +1277,51 @@ methods: { onDestCountryChange(item){ if(item){ this.form.reciever.country=item.code; + this.autoAjustBillCode(); } }, + // 如果目的国为孟加拉,自动调整运单号 + autoAjustBillCode(){ + if(this.action != "add"){ + return; + } + + if(!this.form.reciever.country){ + return + } + + if(this.form.reciever.country!='0880'){ + return; + } + + if(!this.form.billCode){ + return; + } + + if(this.form.billCode.length!=14){ + return; + } + + // 记住历史单号 + this.origBillCode=this.form.billCode; + + this.$confirm("注意:根据要求孟加拉单号自动调整为12位", "提示", { + confirmButtonText: "确定", + type: "warning", + distinguishCancelAndClose: true, + closeOnClickModal: false, + showCancelButton: false, + showClose: false + }).then(() => { + // 去除第7,8个字符 + // T7080300001796 + let str =this.form.billCode; + let prefix=str.substring(0,6); + let other = str.substring(8); + this.form.billCode=prefix+other; + }); + + }, onPaymentTypeChange(){ // 非月结清空月结客户选择 if(this.form.paymentType == '1' || @@ -2154,6 +2199,7 @@ methods: { this.form.billCode=response.data; this.initGetTotalAvailablePag(this.form.sendSiteCode); this.handleGenSubbill(); + this.autoAjustBillCode(); }); }else{ this.form.billCode=""