From d83942efb6e97df4a43ccdf919c54b285488fbd6 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Wed, 27 Aug 2025 15:54:36 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=9C=88=E7=BB=93=E5=AE=A2=E6=88=B7?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BC=81=E4=B8=9A=E7=A8=8E=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../emis/emisCustomerUser/monthUserForm.vue | 22 ++++++++++++++++---
.../emis/emisCustomerUser/monthUserList.vue | 19 ++++++++++++++--
2 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/src/views/emis/emisCustomerUser/monthUserForm.vue b/src/views/emis/emisCustomerUser/monthUserForm.vue
index 44ba0576..b36d678e 100644
--- a/src/views/emis/emisCustomerUser/monthUserForm.vue
+++ b/src/views/emis/emisCustomerUser/monthUserForm.vue
@@ -93,13 +93,13 @@
-
+
-
+
@@ -113,6 +113,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -482,7 +492,13 @@ export default {
}
});
},
-
+ handleCountryChange(val){
+ console.log('handleCountryChange',val);
+ if(val.code !== '0086'){
+ this.form.enterpriseName = null;
+ this.form.enterpriseTaxId = null;
+ }
+ }
}
};
diff --git a/src/views/emis/emisCustomerUser/monthUserList.vue b/src/views/emis/emisCustomerUser/monthUserList.vue
index 39a4f97b..503f7acb 100644
--- a/src/views/emis/emisCustomerUser/monthUserList.vue
+++ b/src/views/emis/emisCustomerUser/monthUserList.vue
@@ -85,7 +85,20 @@
@input="handleQuery"
/>
-
+
+
+
+
+
+
@@ -217,7 +230,9 @@
-
+
+
+
From 9c366d95f87a387a36943867433ddf5b256ef36d Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Wed, 27 Aug 2025 17:56:56 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=BD=95=E5=85=A5=E3=80=81=E6=8E=A5?=
=?UTF-8?q?=E5=8D=95=E3=80=81=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3?=
=?UTF-8?q?=E8=AF=B7=E3=80=81=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A=E7=A8=8E?=
=?UTF-8?q?=E5=8F=B7=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/emis/emisWaybill/waybillGot.vue | 37 ++++++++++++++++---
src/views/emis/emisWaybill/waybillModify.vue | 28 +++++++++++---
src/views/emis/emisWaybill/waybillRecord.vue | 26 +++++++++++--
.../emisWaybillAjustApply/adjustPanel.vue | 23 ++++++++++--
4 files changed, 95 insertions(+), 19 deletions(-)
diff --git a/src/views/emis/emisWaybill/waybillGot.vue b/src/views/emis/emisWaybill/waybillGot.vue
index 0c117dd6..27577d0a 100644
--- a/src/views/emis/emisWaybill/waybillGot.vue
+++ b/src/views/emis/emisWaybill/waybillGot.vue
@@ -257,12 +257,12 @@
{{ $t('寄件/签收短信') }}
-
+
-
+
@@ -976,7 +976,10 @@ data() {
mainHasCnt:0,
subHasCnt:0
},
-
+ // 选中的寄件人企业名称
+ selectedSenderEnterpriseName:null,
+ // 选中的寄件人企业税号
+ selectedSenderEnterpriseTaxId:null,
// 表单校验
rules: {
billCode: [
@@ -1505,6 +1508,9 @@ methods: {
){
this.form.custNo=null;
this.form.customerCode=null;
+ //企业税号重新赋值
+ this.form.sender.enterpriseName=this.selectedSenderEnterpriseName;
+ this.form.sender.enterpriseTaxId=this.selectedSenderEnterpriseTaxId;
this.calcBillFee();
}
@@ -1522,6 +1528,10 @@ methods: {
this.form.payee=item.payee;
this.form.salesmen=item.salesmen;
this.form.paymentType= '2';
+ // 企业名称
+ this.form.sender.enterpriseName=item.enterpriseName;
+ // 企业税号
+ this.form.sender.enterpriseTaxId=item.enterpriseTaxId;
}else{
this.form.paymentType= '1';
this.form.payee=null;
@@ -2009,6 +2019,15 @@ methods: {
// this.form.receiveTown=value.town;
this.form.sender.address=value.address;
this.form.sender.company=value.company;
+ // 选中的寄件人企业名称
+ this.selectedSenderEnterpriseName=value.enterpriseName;
+ // 选中的寄件人企业税号
+ this.selectedSenderEnterpriseTaxId=value.enterpriseTaxId;
+ //企业税号
+ if(!['2','4','5'].includes(this.form.paymentType) && this.form.sender.country=='0086' ){
+ this.form.sender.enterpriseName=value.enterpriseName;
+ this.form.sender.enterpriseTaxId=value.enterpriseTaxId;
+ }
},
onChangeSelectReceiver(value){
this.form.reciever.name=value.name;
@@ -2020,10 +2039,16 @@ 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.selectedSenderEnterpriseName=value.enterpriseName;
+ // 选中的寄件人企业税号
+ this.selectedSenderEnterpriseTaxId=value.enterpriseTaxId;
+ //企业税号
+ if(!['2','4','5'].includes(this.form.paymentType) && this.form.sender.country=='0086' ){
+ this.form.sender.enterpriseName=value.enterpriseName;
+ this.form.sender.enterpriseTaxId=value.enterpriseTaxId;
+ }
this.handleCalcDestSite();
},
diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue
index 1bc36964..7340145a 100644
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@@ -259,12 +259,12 @@
{{ $t('寄件/签收短信') }}
-
+
-
+
@@ -962,7 +962,6 @@ data() {
}
//校验收件国家地区国家和省份是否匹配
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('收件国家和省份不一致'));
@@ -1005,6 +1004,10 @@ data() {
//寄件人省份的国家
senderCountryCode:null,
recieverCountryCode:null,
+ // 选中的寄件人企业名称
+ selectedSenderEnterpriseName:null,
+ // 选中的寄件人企业税号
+ selectedSenderEnterpriseTaxId:null,
// 表单校验
rules: {
billCode: [
@@ -1521,6 +1524,9 @@ methods: {
){
this.form.custNo=null;
this.form.customerCode=null;
+ //企业税号重新赋值
+ this.form.sender.enterpriseName=this.selectedSenderEnterpriseName;
+ this.form.sender.enterpriseTaxId=this.selectedSenderEnterpriseTaxId;
this.calcBillFee();
}
@@ -1541,6 +1547,10 @@ methods: {
this.form.payee=item.payee;
this.form.salesmen=item.salesmen;
this.form.paymentType= '2';
+ // 企业名称
+ this.form.sender.enterpriseName=item.enterpriseName;
+ // 企业税号
+ this.form.sender.enterpriseTaxId=item.enterpriseTaxId;
}else{
this.form.paymentType= '1';
this.form.payee=null;
@@ -2037,10 +2047,16 @@ 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;
-
+ // 选中的寄件人企业名称
+ this.selectedSenderEnterpriseName=value.enterpriseName;
+ // 选中的寄件人企业税号
+ this.selectedSenderEnterpriseTaxId=value.enterpriseTaxId;
+ //企业税号
+ if(!['2','4','5'].includes(this.form.paymentType) && this.form.sender.country=='0086' ){
+ this.form.sender.enterpriseName=value.enterpriseName;
+ this.form.sender.enterpriseTaxId=value.enterpriseTaxId;
+ }
},
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 12cf8802..6f3c5e13 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -260,12 +260,12 @@
{{ $t('寄件/签收短信') }}
-
+
-
+
@@ -1007,6 +1007,10 @@ data() {
//寄件人省份的国家
senderCountryCode:null,
recieverCountryCode:null,
+ // 选中的寄件人企业名称
+ selectedSenderEnterpriseName:null,
+ // 选中的寄件人企业税号
+ selectedSenderEnterpriseTaxId:null,
// 表单校验
rules: {
billCode: [
@@ -1521,6 +1525,9 @@ methods: {
){
this.form.custNo=null;
this.form.customerCode=null;
+ //企业税号重新赋值
+ this.form.sender.enterpriseName=this.selectedSenderEnterpriseName;
+ this.form.sender.enterpriseTaxId=this.selectedSenderEnterpriseTaxId;
this.calcBillFee();
}
@@ -1538,6 +1545,10 @@ methods: {
this.form.payee=item.payee;
this.form.salesmen=item.salesmen;
this.form.paymentType= '2';
+ // 企业名称
+ this.form.sender.enterpriseName=item.enterpriseName;
+ // 企业税号
+ this.form.sender.enterpriseTaxId=item.enterpriseTaxId;
}else{
this.form.paymentType= '1';
this.form.payee=null;
@@ -2029,11 +2040,18 @@ 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;
+ // 选中的寄件人企业名称
+ this.selectedSenderEnterpriseName=value.enterpriseName;
+ // 选中的寄件人企业税号
+ this.selectedSenderEnterpriseTaxId=value.enterpriseTaxId;
+ //企业税号
+ if(!['2','4','5'].includes(this.form.paymentType) && this.form.sender.country=='0086' ){
+ this.form.sender.enterpriseName=value.enterpriseName;
+ this.form.sender.enterpriseTaxId=value.enterpriseTaxId;
+ }
},
onChangeSelectReceiver(value){
this.form.reciever.name=value.name;
diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
index e079f211..a9bc7077 100644
--- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
+++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
@@ -1355,6 +1355,10 @@ export default {
//寄件人省份的国家
senderCountryCode:null,
recieverCountryCode:null,
+ // 选中的寄件人企业名称
+ selectedSenderEnterpriseName:null,
+ // 选中的寄件人企业税号
+ selectedSenderEnterpriseTaxId:null,
// 表单校验
rules: {
billCode: [
@@ -1613,6 +1617,10 @@ export default {
if(item!=null){
this.form.payee=item.payee;
this.form.salesmen=item.salesmen;
+ // 企业名称
+ this.form.sender.enterpriseName=item.enterpriseName;
+ // 企业税号
+ this.form.sender.enterpriseTaxId=item.enterpriseTaxId;
}
this.calcBillFee()
},
@@ -1771,10 +1779,16 @@ 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;
-
+ // 选中的寄件人企业名称
+ this.selectedSenderEnterpriseName=value.enterpriseName;
+ // 选中的寄件人企业税号
+ this.selectedSenderEnterpriseTaxId=value.enterpriseTaxId;
+ //企业税号
+ if(!['2','4','5'].includes(this.form.paymentType) && this.form.sender.country=='0086' ){
+ this.form.sender.enterpriseName=value.enterpriseName;
+ this.form.sender.enterpriseTaxId=value.enterpriseTaxId;
+ }
},
onChangeSelectReceiver(value){
this.form.reciever.name=value.name;
@@ -2223,6 +2237,9 @@ export default {
) {
this.form.custNo = null;
this.form.customerCode = null;
+ //企业税号重新赋值
+ this.form.sender.enterpriseName=this.selectedSenderEnterpriseName;
+ this.form.sender.enterpriseTaxId=this.selectedSenderEnterpriseTaxId;
this.calcBillFee();
}
From 0dc3f18bf7b4a3c1a35ce5275c857772e9daf4dd Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Thu, 28 Aug 2025 11:49:01 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=9C=88=E7=BB=93=E5=AE=A2=E6=88=B7?=
=?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BC=81=E4=B8=9A=E7=A8=8E=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/static/tpl/imp_month_user.xlsx | Bin 13262 -> 13674 bytes
.../tpl/imp_month_user_enterpriseTaxId.xlsx | Bin 0 -> 10653 bytes
.../emis/emisCustomerUser/monthUserList.vue | 34 +++++++++++++++---
3 files changed, 30 insertions(+), 4 deletions(-)
create mode 100644 public/static/tpl/imp_month_user_enterpriseTaxId.xlsx
diff --git a/public/static/tpl/imp_month_user.xlsx b/public/static/tpl/imp_month_user.xlsx
index e3fc6554b7a89457b092aae388221acb73838f19..095ea73c3d7312b6e0986b6af02e714155c2a37a 100644
GIT binary patch
delta 5963
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½mnm)2%i$gVrC%NEArXa-bt$}
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
- 导入
+ 导入
下载导入模版
@@ -200,6 +200,19 @@
月结网点维护
+
+
+ 导入企业税号
+
+ 下载导入模版
+
+
@@ -420,6 +433,7 @@ export default {
// 修改站点代码时间范围
daterangeUpdateTime: [],
selectionList:[],
+ blImport:1,
// 查询参数
queryParams: {
pageNum: 1,
@@ -594,8 +608,9 @@ export default {
for (let index = 0; index < results.length; index++) {
const element = results[index]
// 客户名称 英文简称 月结编号 联系人 手机号码 主归属网点 回款联系人 销售联系人 销售主管 销售支持 结算类型 国家 省份 城市 区县 联系地址 E-Mail 是否启用 是否开启OMS账号 首次签约时间 备注
-
- const postData= {
+ let postData={}
+ if(this.blImport==1){
+ postData= {
customerName: element['客户名称'],
customerNameEn: element['客户英文简称'],
contact: element['联系人'],
@@ -610,6 +625,8 @@ export default {
city:element['城市'],
county: element['区县'],
address: element['联系地址'],
+ enterpriseName: element['企业名称'],
+ enterpriseTaxId: element['企业税号'],
creditPeriod: element['账期(天)'],
settleDay: element['账单日'],
email: element['E-Mail'],
@@ -624,8 +641,17 @@ export default {
blOpenOms: element['是否开启OMS账号'],
blSms: element['是否短信'],
remark: element['备注'],
- blImport: 1,
+ blImport: this.blImport,
};
+ }else {
+ postData= {
+ customerName: element['客户名称'],
+ monthlyPayCode: element['月结编号'],
+ enterpriseName: element['企业名称'],
+ enterpriseTaxId: element['企业税号'],
+ blImport: this.blImport,
+ }
+ }
// postData.cosignee= element['']
// postData.cosigneeAddress= element['收件地址']
// postData.cosigneeTelephone= element['收件电话']
From da156b824dd1b3f2132df3254f7235b43c4276a2 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Thu, 28 Aug 2025 14:59:17 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=9C=88=E7=BB=93=E5=AE=A2=E6=88=B7?=
=?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BC=81=E4=B8=9A=E7=A8=8E=E5=8F=B7=E5=8D=95?=
=?UTF-8?q?=E7=8B=AC=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/emis/emisCustomerUser.js | 9 +++++++++
src/views/emis/emisCustomerUser/monthUserList.vue | 14 ++++++++++----
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/api/emis/emisCustomerUser.js b/src/api/emis/emisCustomerUser.js
index 57d7e37e..2dcafc38 100644
--- a/src/api/emis/emisCustomerUser.js
+++ b/src/api/emis/emisCustomerUser.js
@@ -84,3 +84,12 @@ export function delEmisCustomerUser(id) {
method: 'delete'
})
}
+
+//导入企业税号
+export function batchImportEnterprise(data) {
+ return request({
+ url: '/emis/emisCustomerUser/batchImportEnterprise',
+ method: 'post',
+ data: data
+ })
+}
diff --git a/src/views/emis/emisCustomerUser/monthUserList.vue b/src/views/emis/emisCustomerUser/monthUserList.vue
index bc20f539..6b51f470 100644
--- a/src/views/emis/emisCustomerUser/monthUserList.vue
+++ b/src/views/emis/emisCustomerUser/monthUserList.vue
@@ -359,7 +359,7 @@