diff --git a/public/static/tpl/batch_import_order.xls b/public/static/tpl/batch_import_order.xls index 0e8f868a..a45eb41a 100644 Binary files a/public/static/tpl/batch_import_order.xls and b/public/static/tpl/batch_import_order.xls differ diff --git a/src/views/emis/emisWaybill/batchWaybillRecord.vue b/src/views/emis/emisWaybill/batchWaybillRecord.vue index 82f143af..01f75442 100644 --- a/src/views/emis/emisWaybill/batchWaybillRecord.vue +++ b/src/views/emis/emisWaybill/batchWaybillRecord.vue @@ -112,6 +112,7 @@ + @@ -510,6 +511,7 @@ export default { extInfo: element['附加信息'], blVirtual: element['是否虚拟单'], masterBillCode: element['关联主单'], + startSiteCode: element['始发网点'], uploadStatus: 0, errorInfo:'', } diff --git a/src/views/emis/emisWaybill/centerWaybillList.vue b/src/views/emis/emisWaybill/centerWaybillList.vue index b81600a1..e7afcabf 100644 --- a/src/views/emis/emisWaybill/centerWaybillList.vue +++ b/src/views/emis/emisWaybill/centerWaybillList.vue @@ -582,6 +582,7 @@ + diff --git a/src/views/emis/emisWaybill/dispatchWaybillList.vue b/src/views/emis/emisWaybill/dispatchWaybillList.vue index b5411210..c203d57d 100644 --- a/src/views/emis/emisWaybill/dispatchWaybillList.vue +++ b/src/views/emis/emisWaybill/dispatchWaybillList.vue @@ -582,6 +582,7 @@ + diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue index d5ef0451..e8ccc53f 100644 --- a/src/views/emis/emisWaybill/sendWaybillList.vue +++ b/src/views/emis/emisWaybill/sendWaybillList.vue @@ -548,6 +548,7 @@ + diff --git a/src/views/emis/emisWaybill/sendWaybillListNew.vue b/src/views/emis/emisWaybill/sendWaybillListNew.vue index dd1a425b..4d275d4b 100644 --- a/src/views/emis/emisWaybill/sendWaybillListNew.vue +++ b/src/views/emis/emisWaybill/sendWaybillListNew.vue @@ -554,6 +554,7 @@ + diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue index 90d78fbc..f7dfc99a 100644 --- a/src/views/emis/emisWaybill/waybillModify.vue +++ b/src/views/emis/emisWaybill/waybillModify.vue @@ -170,6 +170,12 @@ {{ $t('寄件网点') }}: + + + + {{ $t('始发网点') }}: + +
@@ -1078,6 +1084,10 @@ data() { sendSiteCode: [ { required: true, message: "发件网点代码不能为空", trigger: ["blur",'change'] } ], + //始发网点 + startSiteCode: [ + { required: true, message: "始发网点代码不能为空", trigger: ["blur",'change'] } + ], // sendDate: [ // { required: true, message: "发货时间不能为空", trigger: "blur" } // ], @@ -1622,6 +1632,8 @@ methods: { // this.form.sendDate = parseTime(new Date()); this.form.sendSiteCode=this.$store.getters.ownerSiteCode; this.form.sendSiteName=this.$store.getters.ownerSiteName; + this.form.startSiteCode = this.$store.getters.ownerSiteCode; + this.form.startSiteName = this.$store.getters.ownerSiteName; this.form.customsEclaration='1'; @@ -1800,14 +1812,26 @@ methods: { if(!item){ this.form.sendSiteCode = null; this.form.sendSiteName = null; + this.form.startSiteCode = null; + this.form.startSiteName = null; return; } this.form.sendSiteCode=item.siteCode; this.form.sendSiteName=item.siteName; - + this.form.startSiteCode=item.siteCode; + this.form.startSiteName=item.siteName; this.initGetTotalAvailablePag(this.form.sendSiteCode); // this.calcBillFee(); }, + onStartSiteSelect(item){ + if(!item){ + this.form.startSiteCode = null; + this.form.startSiteName = null; + return; + } + this.form.startSiteCode=item.siteCode; + this.form.startSiteName=item.siteName; + }, /** 提交按钮 */ submitForm() { this.form.sendDate =this.sendDate; diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue index e78d9d31..ab1e15db 100644 --- a/src/views/emis/emisWaybill/waybillRecord.vue +++ b/src/views/emis/emisWaybill/waybillRecord.vue @@ -1813,8 +1813,8 @@ methods: { if(!item){ this.form.sendSiteCode = null; this.form.sendSiteName = null; - this.form.startSiteCode = ''; - this.form.startSiteName = ''; + this.form.startSiteCode = null; + this.form.startSiteName = null; return; } this.form.sendSiteCode=item.siteCode;