diff --git a/public/static/tpl/batch_import_order.xls b/public/static/tpl/batch_import_order.xls index 0c91af16..dab07786 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/EmisBaseTools/CustomerAddressSimplePicker.vue b/src/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue index 2ffbe65f..0bcd5d58 100644 --- a/src/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue +++ b/src/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue @@ -26,6 +26,8 @@ + + { - console.log('response',response.rows); this.loading = false; this.bakOptionItems = response.rows; this.optionItems =this.bakOptionItems; diff --git a/src/views/emis/emisCustomerAddress/senderAddress.vue b/src/views/emis/emisCustomerAddress/senderAddress.vue index 6bfae3a6..4a4d0f06 100644 --- a/src/views/emis/emisCustomerAddress/senderAddress.vue +++ b/src/views/emis/emisCustomerAddress/senderAddress.vue @@ -32,7 +32,22 @@ - + + + + + + + + @@ -40,17 +55,17 @@ slot="pageContent" slot-scope="slotProps" :height="(slotProps.contentHeight)+'px'" - - v-loading="loading" - border - size="small" - :data="emisCustomerAddressList" - :showSearch.sync="showSearch" - :queryParams="queryParams" - :total="total" - @queryTable="getList" - @selection-change="handleSelectionChange" - @sort-change="handleSortChange" + storageName="senderAddress_main_250825" + v-loading="loading" + border + size="small" + :data="emisCustomerAddressList" + :showSearch.sync="showSearch" + :queryParams="queryParams" + :total="total" + @queryTable="getList" + @selection-change="handleSelectionChange" + @sort-change="handleSortChange" >
@@ -139,6 +154,9 @@ + + + diff --git a/src/views/emis/emisCustomerAddress/senderAddressForm.vue b/src/views/emis/emisCustomerAddress/senderAddressForm.vue index 2b916194..1f36b47a 100644 --- a/src/views/emis/emisCustomerAddress/senderAddressForm.vue +++ b/src/views/emis/emisCustomerAddress/senderAddressForm.vue @@ -29,7 +29,7 @@ - + @@ -47,6 +47,16 @@ + + + + + + + + + + @@ -215,6 +225,9 @@ export default { updateTime: null, remark: null, parseAddress:null, + enterpriseName: null, + enterpriseTaxId: null, + }; this.resetForm("form"); }, @@ -236,6 +249,13 @@ export default { } }); }, + handleCountryChange(val){ + if(val !== '0086'){ + this.form.enterpriseName = null; + this.form.enterpriseTaxId = null; + } + } + } }; diff --git a/src/views/emis/emisWaybill/batchWaybillRecord.vue b/src/views/emis/emisWaybill/batchWaybillRecord.vue index 4930e2dd..a9249585 100644 --- a/src/views/emis/emisWaybill/batchWaybillRecord.vue +++ b/src/views/emis/emisWaybill/batchWaybillRecord.vue @@ -94,6 +94,8 @@ + + @@ -240,6 +242,8 @@ export default { sendCounty: null, sendTown: null, sendAddress: null, + enterpriseName: null, + enterpriseTaxId: null, sendPostcode: null, sendPcd: null, paymentType: null, @@ -487,6 +491,8 @@ export default { sendCity:element['寄件市'], sendCounty:element['寄件区'], sendAddress: element['寄件地址'], + enterpriseName: element['企业名称'], + enterpriseTaxId: element['企业税号'], paymentType: element['支付方式'], calcFeeType: element['计费方式'], transLineType: element['线路'], diff --git a/src/views/emis/emisWaybill/centerWaybillList.vue b/src/views/emis/emisWaybill/centerWaybillList.vue index 1d9bd6b2..4a615a00 100644 --- a/src/views/emis/emisWaybill/centerWaybillList.vue +++ b/src/views/emis/emisWaybill/centerWaybillList.vue @@ -114,6 +114,22 @@ + + + + + + 不发送
 - + + @@ -767,6 +784,8 @@ export default { sendAddress: null, sendPostcode: null, sendPcd: null, + enterpriseName: null, + enterpriseTaxId: null, paymentType: null, calcFeeType: null, custNo: null, diff --git a/src/views/emis/emisWaybill/dispatchWaybillList.vue b/src/views/emis/emisWaybill/dispatchWaybillList.vue index 09708d82..9b766ce7 100644 --- a/src/views/emis/emisWaybill/dispatchWaybillList.vue +++ b/src/views/emis/emisWaybill/dispatchWaybillList.vue @@ -485,7 +485,6 @@ - diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue index e46716b9..33ae18c5 100644 --- a/src/views/emis/emisWaybill/sendWaybillList.vue +++ b/src/views/emis/emisWaybill/sendWaybillList.vue @@ -107,6 +107,23 @@ + + + + + + + 不发送 - + + @@ -723,6 +741,8 @@ export default { sendAddress: null, sendPostcode: null, sendPcd: null, + enterpriseName: null, + enterpriseTaxId: null, paymentType: null, blVirtual: null, calcFeeType: null, diff --git a/src/views/emis/emisWaybill/sendWaybillListNew.vue b/src/views/emis/emisWaybill/sendWaybillListNew.vue index c07fb849..317823e8 100644 --- a/src/views/emis/emisWaybill/sendWaybillListNew.vue +++ b/src/views/emis/emisWaybill/sendWaybillListNew.vue @@ -110,6 +110,23 @@ + + + + + + + 不发送 - + + @@ -741,6 +760,8 @@ export default { sendAddress: null, sendPostcode: null, sendPcd: null, + enterpriseName: null, + enterpriseTaxId: null, paymentType: null, blVirtual:null, calcFeeType: null, diff --git a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue index eac4c130..23eb8e2c 100644 --- a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue +++ b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue @@ -50,6 +50,9 @@ {{ form.sender.company }} {{ form.sender.countryName }} {{ form.sender.provinceName }} {{ form.sender.cityName }} {{ form.sender.countyName }} {{ form.sender.address }} + {{ form.sender.enterpriseName }} + {{ form.sender.enterpriseTaxId }} + {{ form.reciever.name }} {{ form.reciever.phone }} diff --git a/src/views/emis/emisWaybill/waybillGot.vue b/src/views/emis/emisWaybill/waybillGot.vue index db5f41b2..0c117dd6 100644 --- a/src/views/emis/emisWaybill/waybillGot.vue +++ b/src/views/emis/emisWaybill/waybillGot.vue @@ -257,7 +257,16 @@ {{ $t('寄件/签收短信') }} - + + + + + + + + + + @@ -2011,6 +2020,9 @@ methods: { // this.form.receiveTown=value.town; this.form.reciever.address=value.address; this.form.reciever.company=value.company; + this.form.sender.enterpriseName=value.enterpriseName; + this.form.sender.enterpriseTaxId=value.enterpriseTaxId; + this.form.sender.id = value.id; this.handleCalcDestSite(); diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue index 3ab5d4d3..1bc36964 100644 --- a/src/views/emis/emisWaybill/waybillModify.vue +++ b/src/views/emis/emisWaybill/waybillModify.vue @@ -259,7 +259,16 @@ {{ $t('寄件/签收短信') }} - + + + + + + + + + + @@ -2028,6 +2037,10 @@ methods: { this.form.sender.address=value.address; this.form.sender.company=value.company; this.senderCountryCode=value.country; + this.form.sender.enterpriseName=value.enterpriseName; + this.form.sender.enterpriseTaxId=value.enterpriseTaxId; + this.form.sender.id = value.id; + }, onChangeSelectReceiver(value){ this.form.reciever.name=value.name; diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue index b589f1f4..12cf8802 100644 --- a/src/views/emis/emisWaybill/waybillRecord.vue +++ b/src/views/emis/emisWaybill/waybillRecord.vue @@ -260,7 +260,16 @@ {{ $t('寄件/签收短信') }} - + + + + + + + + + + @@ -1995,7 +2004,7 @@ methods: { }, // 弹出地址簿选择 - handleSelectCustomerAddress(addressType){ + handleSelectCustomerAddress(addressType){ this.addressType = addressType; this.titleSelectAddress = this.addressType==1? this.$t('选择寄件人'):this.$t('选择收件人'); this.openSelectAddress = true; @@ -2020,6 +2029,9 @@ methods: { // this.form.receiveTown=value.town; this.form.sender.address=value.address; this.form.sender.company=value.company; + this.form.sender.enterpriseName=value.enterpriseName; + this.form.sender.enterpriseTaxId=value.enterpriseTaxId; + this.form.sender.id = value.id; //校验数据初始化 this.senderCountryCode=value.country; }, diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue index f8411c80..e079f211 100644 --- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue +++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue @@ -608,6 +608,9 @@ {{ billDetail.sender.cityName }} {{ billDetail.sender.countyName }} {{ billDetail.sender.address }} + {{ billDetail.sender.enterpriseName }} + {{ billDetail.sender.enterpriseTaxId }} + @@ -645,6 +648,17 @@ + + + + + + + + + + + @@ -1757,6 +1771,10 @@ export default { // this.form.receiveTown=value.town; this.form.sender.address=value.address; this.form.sender.company=value.company; + this.form.sender.enterpriseName=value.enterpriseName; + this.form.sender.enterpriseTaxId=value.enterpriseTaxId; + this.form.sender.id = value.id; + }, onChangeSelectReceiver(value){ this.form.reciever.name=value.name;