From b99111659b1343ec5f1c829acd18603944f1faf4 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Thu, 28 Aug 2025 17:05:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BC=81=E4=B8=9A=E5=90=8D?=
=?UTF-8?q?=E7=A7=B0=E3=80=81=E7=A8=8E=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 | 42 +++++++++++++++---
src/views/emis/emisWaybill/waybillModify.vue | 44 ++++++++++++++++---
src/views/emis/emisWaybill/waybillRecord.vue | 41 ++++++++++++++---
.../emisWaybillAjustApply/adjustPanel.vue | 30 ++++++++++---
4 files changed, 135 insertions(+), 22 deletions(-)
diff --git a/src/views/emis/emisWaybill/waybillGot.vue b/src/views/emis/emisWaybill/waybillGot.vue
index 27577d0a..7c3b68c1 100644
--- a/src/views/emis/emisWaybill/waybillGot.vue
+++ b/src/views/emis/emisWaybill/waybillGot.vue
@@ -257,14 +257,16 @@
{{ $t('寄件/签收短信') }}
-
+
-
+
+
-
+
-
+
+
@@ -980,6 +982,10 @@ data() {
selectedSenderEnterpriseName:null,
// 选中的寄件人企业税号
selectedSenderEnterpriseTaxId:null,
+ //选中的月结客户企业号
+ selectedMonthUserEnterpriseName: null,
+ //选中的月结客户企业税号
+ selectedMonthUserEnterpriseTaxId: null,
// 表单校验
rules: {
billCode: [
@@ -1532,6 +1538,10 @@ methods: {
this.form.sender.enterpriseName=item.enterpriseName;
// 企业税号
this.form.sender.enterpriseTaxId=item.enterpriseTaxId;
+ // 选中的月结客户企业号
+ this.selectedMonthUserEnterpriseName = item.enterpriseName;
+ // 选中的月结客户企业税号
+ this.selectedMonthUserEnterpriseTaxId = item.enterpriseTaxId;
}else{
this.form.paymentType= '1';
this.form.payee=null;
@@ -1682,7 +1692,17 @@ methods: {
this.startTimer();
}
-
+ if (['2', '4', '5'].includes(this.form.paymentType)) { //月结
+ this.selectedMonthUserEnterpriseName = this.form.sender.enterpriseName;
+ this.selectedMonthUserEnterpriseTaxId = this.form.sender.enterpriseTaxId;
+ this.selectedSenderEnterpriseName = '';
+ this.selectedSenderEnterpriseTaxId = '';
+ } else {
+ this.selectedMonthUserEnterpriseName = '';
+ this.selectedMonthUserEnterpriseTaxId = '';
+ this.selectedSenderEnterpriseName = this.form.sender.enterpriseName;
+ this.selectedSenderEnterpriseTaxId = this.form.sender.enterpriseTaxId;
+ }
});
}else{
@@ -2023,11 +2043,21 @@ methods: {
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;
}
+ //非月结且地址是非中国 企业号置空
+ if(this.form.sender.country!='0086' ){
+ this.form.sender.enterpriseName='';
+ this.form.sender.enterpriseTaxId='';
+ }
+ // 月结且中国 企业号取值月结客户企业号
+ if (['2', '4', '5'].includes(this.form.paymentType) && this.form.sender.country == '0086') {
+ this.form.sender.enterpriseName = this.selectedMonthUserEnterpriseName;
+ this.form.sender.enterpriseTaxId = this.selectedMonthUserEnterpriseTaxId;
+ }
},
onChangeSelectReceiver(value){
this.form.reciever.name=value.name;
diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue
index 7340145a..550a9786 100644
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@@ -259,14 +259,16 @@
{{ $t('寄件/签收短信') }}
-
+
-
+
+
-
+
-
+
+
@@ -1008,6 +1010,10 @@ data() {
selectedSenderEnterpriseName:null,
// 选中的寄件人企业税号
selectedSenderEnterpriseTaxId:null,
+ //选中的月结客户企业号
+ selectedMonthUserEnterpriseName: null,
+ //选中的月结客户企业税号
+ selectedMonthUserEnterpriseTaxId: null,
// 表单校验
rules: {
billCode: [
@@ -1551,6 +1557,11 @@ methods: {
this.form.sender.enterpriseName=item.enterpriseName;
// 企业税号
this.form.sender.enterpriseTaxId=item.enterpriseTaxId;
+ // 选中的月结客户企业号
+ this.selectedMonthUserEnterpriseName = item.enterpriseName;
+ // 选中的月结客户企业税号
+ this.selectedMonthUserEnterpriseTaxId = item.enterpriseTaxId;
+
}else{
this.form.paymentType= '1';
this.form.payee=null;
@@ -1632,6 +1643,8 @@ methods: {
},
initData() {
+ console.log('----initData----')
+
//console.log("====>this.action=2222=>",this.action);
//console.log("====>this.billCode=2222=>",this.billCode);
@@ -1704,6 +1717,17 @@ methods: {
}
this.senderCountryCode = this.form.sender.country;
this.recieverCountryCode = this.form.reciever.country;
+ if(['2','4','5'].includes(this.form.paymentType)){ //月结
+ this.selectedMonthUserEnterpriseName = this.form.sender.enterpriseName;
+ this.selectedMonthUserEnterpriseTaxId = this.form.sender.enterpriseTaxId;
+ this.selectedSenderEnterpriseName ='';
+ this.selectedSenderEnterpriseTaxId ='';
+ }else{
+ this.selectedMonthUserEnterpriseName = '';
+ this.selectedMonthUserEnterpriseTaxId = '';
+ this.selectedSenderEnterpriseName = this.form.sender.enterpriseName;
+ this.selectedSenderEnterpriseTaxId = this.form.sender.enterpriseTaxId;
+ }
});
}
else{
@@ -2052,11 +2076,21 @@ methods: {
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;
}
+ //非月结且地址是非中国 企业号置空
+ if(this.form.sender.country!='0086' ){
+ this.form.sender.enterpriseName='';
+ this.form.sender.enterpriseTaxId='';
+ }
+ // 月结且中国 企业号取值月结客户企业号
+ if (['2', '4', '5'].includes(this.form.paymentType) && this.form.sender.country == '0086') {
+ this.form.sender.enterpriseName = this.selectedMonthUserEnterpriseName;
+ this.form.sender.enterpriseTaxId = this.selectedMonthUserEnterpriseTaxId;
+ }
},
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 6f3c5e13..393cc403 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -260,14 +260,14 @@
{{ $t('寄件/签收短信') }}
-
+
-
+
-
+
-
+
@@ -1011,6 +1011,10 @@ data() {
selectedSenderEnterpriseName:null,
// 选中的寄件人企业税号
selectedSenderEnterpriseTaxId:null,
+ //选中的月结客户企业号
+ selectedMonthUserEnterpriseName:null,
+ //选中的月结客户企业税号
+ selectedMonthUserEnterpriseTaxId:null,
// 表单校验
rules: {
billCode: [
@@ -1549,6 +1553,11 @@ methods: {
this.form.sender.enterpriseName=item.enterpriseName;
// 企业税号
this.form.sender.enterpriseTaxId=item.enterpriseTaxId;
+ // 选中的月结客户企业号
+ this.selectedMonthUserEnterpriseName=item.enterpriseName;
+ // 选中的月结客户企业税号
+ this.selectedMonthUserEnterpriseTaxId=item.enterpriseTaxId;
+
}else{
this.form.paymentType= '1';
this.form.payee=null;
@@ -1701,7 +1710,17 @@ methods: {
this.startTimer();
}
-
+ // if (['2', '4', '5'].includes(this.form.paymentType)) { //月结
+ // this.selectedMonthUserEnterpriseName = this.form.sender.enterpriseName;
+ // this.selectedMonthUserEnterpriseTaxId = this.form.sender.enterpriseTaxId;
+ // this.selectedSenderEnterpriseName = '';
+ // this.selectedSenderEnterpriseTaxId = '';
+ // } else {
+ // this.selectedMonthUserEnterpriseName = '';
+ // this.selectedMonthUserEnterpriseTaxId = '';
+ // this.selectedSenderEnterpriseName = this.form.sender.enterpriseName;
+ // this.selectedSenderEnterpriseTaxId = this.form.sender.enterpriseTaxId;
+ // }
});
}else{
@@ -2047,11 +2066,21 @@ methods: {
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;
}
+ //非月结且地址是非中国 企业号置空
+ if(this.form.sender.country!='0086' ){
+ this.form.sender.enterpriseName='';
+ this.form.sender.enterpriseTaxId='';
+ }
+ // 月结且中国 企业号取值月结客户企业号
+ if (['2', '4', '5'].includes(this.form.paymentType) && this.form.sender.country == '0086') {
+ this.form.sender.enterpriseName = this.selectedMonthUserEnterpriseName;
+ this.form.sender.enterpriseTaxId = this.selectedMonthUserEnterpriseTaxId;
+ }
},
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 a9bc7077..e58e9af6 100644
--- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
+++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
@@ -648,14 +648,15 @@
-
+
-
+
+
-
+
-
+
@@ -1359,6 +1360,11 @@ export default {
selectedSenderEnterpriseName:null,
// 选中的寄件人企业税号
selectedSenderEnterpriseTaxId:null,
+ //选中的月结客户企业号
+ selectedMonthUserEnterpriseName:null,
+ //选中的月结客户企业税号
+ selectedMonthUserEnterpriseTaxId:null,
+
// 表单校验
rules: {
billCode: [
@@ -1621,6 +1627,10 @@ export default {
this.form.sender.enterpriseName=item.enterpriseName;
// 企业税号
this.form.sender.enterpriseTaxId=item.enterpriseTaxId;
+ // 选中的月结客户企业号
+ this.selectedMonthUserEnterpriseName=item.enterpriseName;
+ // 选中的月结客户企业税号
+ this.selectedMonthUserEnterpriseTaxId=item.enterpriseTaxId;
}
this.calcBillFee()
},
@@ -1784,11 +1794,21 @@ export default {
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;
}
+ //非月结且地址是非中国 企业号置空
+ if(this.form.sender.country!='0086' ){
+ this.form.sender.enterpriseName='';
+ this.form.sender.enterpriseTaxId='';
+ }
+ // 月结且中国 企业号取值月结客户企业号
+ if(['2','4','5'].includes(this.form.paymentType) && this.form.sender.country=='0086' ){
+ this.form.sender.enterpriseName=this.selectedMonthUserEnterpriseName;
+ this.form.sender.enterpriseTaxId=this.selectedMonthUserEnterpriseTaxId;
+ }
},
onChangeSelectReceiver(value){
this.form.reciever.name=value.name;