diff --git a/public/static/tpl/batch_import_order.xls b/public/static/tpl/batch_import_order.xls index 05376fc..06e9300 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/oms/emisWaybill/BatchOrderRecord.vue b/src/views/oms/emisWaybill/BatchOrderRecord.vue index 400dbc5..135d9dd 100644 --- a/src/views/oms/emisWaybill/BatchOrderRecord.vue +++ b/src/views/oms/emisWaybill/BatchOrderRecord.vue @@ -502,6 +502,8 @@ export default { // blMessage: element['寄件/签收短信'], realValue: element['货值'], extInfo: element['附加信息'], + pickStartDate: element['预约发货时间'], + uploadStatus: 0, errorInfo:'', diff --git a/src/views/oms/emisWaybill/OrderRecord.vue b/src/views/oms/emisWaybill/OrderRecord.vue index e91e978..31c260c 100644 --- a/src/views/oms/emisWaybill/OrderRecord.vue +++ b/src/views/oms/emisWaybill/OrderRecord.vue @@ -1199,8 +1199,15 @@ methods: { onSelectProduct(item){ this.form.productType=item.productType; this.form.freight=item.estFee; - }, + handleReCalcFee(){ + this.productFeeList.forEach(item=>{ + if(item.productType==this.form.productType){ + this.form.freight=item.estFee; + } + }); + }, + onComplete(){ if(this.action!='add'){ @@ -1259,7 +1266,6 @@ methods: { this.preCalcFee(); }, onTransLineChange(item){ - console.log("==xxx==>",item); this.transType=item.transType; this.preCalcFee() }, @@ -1660,8 +1666,10 @@ methods: { this.productFeeList = response.data; if(!this.productFeeList || this.productFeeList.length==0){ this.$message.error(`无报价`); + }else{ + // 费用发生变更后重新赋值总运费 + this.handleReCalcFee(); } - // loadingInstance.close(); }); } },