diff --git a/src/views/emis/emisWaybill/waybillIsPrinted.vue b/src/views/emis/emisWaybill/waybillIsPrinted.vue
index 1e40213b..8a96d15d 100644
--- a/src/views/emis/emisWaybill/waybillIsPrinted.vue
+++ b/src/views/emis/emisWaybill/waybillIsPrinted.vue
@@ -162,7 +162,7 @@
-
+
@@ -293,11 +293,13 @@ import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue'
import TanexPrinterPanel from '@/views/emis/EmisBaseTools/TanexPrinterPanel.vue';
import { formatSearchStr,deepClone } from '@/utils/index'
import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
+import TanexPrinterBatchPanel from "../EmisBaseTools/TanexPrinterBatchPanel.vue";
export default {
name: "WaybillIsPrinted",
components: {
TanexPrinterPanel,
+ TanexPrinterBatchPanel,
elDateAdvPicker,
emisWaybillForm,
CountryPicker1,
@@ -577,11 +579,9 @@ export default {
// batchPrint(orderList,tplCode,orderDetailList)
if(printCnt){
- console.log("====printCnt==>",printCnt)
for(let i=0; i
-
+
-
+
diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index cfb16f77..63ec01dd 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -114,7 +114,7 @@
-
+
@@ -243,7 +243,7 @@
@@ -307,7 +307,7 @@
@@ -941,6 +941,32 @@ data() {
callback();
}
}
+ //校验寄件国家地区国家和省份是否匹配
+ var checkSenderCountryProvince = (rule, value, callback) => {
+ console.log('value',value, this.form.sender.country , this.senderCountryCode)
+ if (this.form.sender.country && this.senderCountryCode) {
+ if (this.form.sender.country != this.senderCountryCode) {
+ callback(new Error('国家和省份不一致'));
+ } else {
+ callback();
+ }
+ } else {
+ callback();
+ }
+ }
+ //校验收件国家地区国家和省份是否匹配
+ var checkRecieverCountryProvince = (rule, value, callback) => {
+ console.log('value',value, this.form.reciever.country , this.recieverCountryCode)
+ if (this.form.reciever.country && this.recieverCountryCode) {
+ if (this.form.reciever.country != this.recieverCountryCode) {
+ callback(new Error('国家和省份不一致'));
+ } else {
+ callback();
+ }
+ } else {
+ callback();
+ }
+ }
return {
activeNames:['1','2','3','4'],
exchangeRate:null,
@@ -971,7 +997,9 @@ data() {
mainHasCnt:0,
subHasCnt:0
},
-
+ //寄件人省份的国家
+ senderCountryCode:null,
+ recieverCountryCode:null,
// 表单校验
rules: {
billCode: [
@@ -991,7 +1019,9 @@ data() {
{ required: true, message: "收货人国家不能为空", trigger: ["blur",'change'] }
],
province: [
- { required: true, message: "收货省不能为空", trigger: ["blur",'change'] }
+ { required: true, message: "收货省不能为空", trigger: ["blur", 'change'] }, {
+ validator: checkRecieverCountryProvince, trigger: ['blur', 'change']
+ }
],
company: [
{ required: true, message: "收货公司不能为空", trigger: ["blur",'change'] }
@@ -1017,7 +1047,10 @@ data() {
{ required: true, message: "寄件人国家不能为空", trigger: ["blur",'change'] }
],
province: [
- { required: true, message: "寄件省不能为空", trigger: ["blur",'change'] }
+ { required: true, message: "寄件省不能为空", trigger: ["blur",'change'] },{
+ validator: checkSenderCountryProvince, trigger: ['blur', 'change']
+
+ }
],
company: [
{ required: true, message: "寄件公司不能为空", trigger: ["blur",'change'] }
@@ -1992,7 +2025,6 @@ methods: {
},
// 计算目的站点
handleCalcDestSite(){
-
if(this.form.reciever.country != this.form.destinationCountry){
this.$confirm('收件国和目的国不一致,请调整！', '提示', {
confirmButtonText: '确认',
@@ -2474,6 +2506,19 @@ methods: {
this.form.remark = this.form.remark.replace(/该单为虚拟单：对应主单为[\da-zA-Z]+/g, '');
}
}
+ },
+ //寄件省份变化
+ onChangeSenderProvince(val){
+ if(val){
+ this.senderCountryCode = val.countryCode;
+ }
+ },
+ //收件省份变化
+ onChangeRecieverProvince(val){
+ if(val){
+ this.recieverCountryCode = val.countryCode;
+ }
+ this.handleCalcDestSite();
}
}
};
diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
index 0d86d282..2ff2800e 100644
--- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
+++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
@@ -234,7 +234,7 @@
-
+
@@ -251,7 +251,7 @@
-
+