aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'master-dev' (#94) from master-dev into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/94
This commit is contained in:
wuteng 2025-09-12 16:41:10 +08:00
commit 54a26e91e8
3 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue
View File

@ -335,7 +335,7 @@ export default {
this.form.countryCode=item.code;
},
onScanSiteSelect(item){
this.queryParams.createSite=item && item.siteName;
// this.queryParams.createSite=item && item.siteName;
// this.queryParams.createSiteCode=item && item.siteCode;
},
onPreOrNextSiteSelect(item){

32
src/views/emis/emisWaybill/waybillGot.vue
View File

@ -1528,9 +1528,9 @@ methods: {
}
}
//企业税号重新赋值
this.form.sender.enterpriseName=this.selectedSenderEnterpriseName;
this.form.sender.enterpriseTaxId=this.selectedSenderEnterpriseTaxId;
this.calcBillFee();
this.form.sender.enterpriseName=this.selectedSenderEnterpriseName;
this.form.sender.enterpriseTaxId=this.selectedSenderEnterpriseTaxId;
this.calcBillFee();
}
},
@ -1705,17 +1705,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;
}
// 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;
// }
// });
// 获取企业税号
if(['2', '4', '5'].includes(this.form.paymentType) || this.form.customerType == 2 || this.form.mainUserId){ // 月结单 或者 月结客户现金单 或者 月结客户子账户现金单
@ -1736,6 +1736,8 @@ methods: {
if(res.rows.length > 0){
this.form.sender.enterpriseName = res.rows[0].enterpriseName;
this.form.sender.enterpriseTaxId = res.rows[0].enterpriseTaxId;
this.selectedMonthUserEnterpriseName = this.form.sender.enterpriseName;
this.selectedMonthUserEnterpriseTaxId = this.form.sender.enterpriseTaxId;
}
}else{ // 非月结客户下的非月结单
if (this.form.sender.id) {
@ -1743,6 +1745,8 @@ methods: {
if (res.data) {
this.form.sender.enterpriseName = res.data.enterpriseName;
this.form.sender.enterpriseTaxId = res.data.enterpriseTaxId;
this.selectedSenderEnterpriseName = this.form.sender.enterpriseName;
this.selectedSenderEnterpriseTaxId = this.form.sender.enterpriseTaxId;
}
}
}

17
src/views/emis/emisWaybillAjustApply/adjustPanel.vue
View File

@ -1523,6 +1523,19 @@ export default {
oldValue: {
handler (newValue, oldValue) {
this.billDetail = this.oldValue;
if (['2', '4', '5'].includes(this.billDetail.paymentType)) { //月结
this.selectedMonthUserEnterpriseName = this.billDetail.sender.enterpriseName;
this.selectedMonthUserEnterpriseTaxId = this.billDetail.sender.enterpriseTaxId;
this.selectedSenderEnterpriseName = '';
this.selectedSenderEnterpriseTaxId = '';
} else {
this.selectedMonthUserEnterpriseName = '';
this.selectedMonthUserEnterpriseTaxId = '';
this.selectedSenderEnterpriseName = this.billDetail.sender.enterpriseName;
this.selectedSenderEnterpriseTaxId = this.billDetail.sender.enterpriseTaxId;
}
this.senderCountryCode = this.billDetail.sender.country;
this.recieverCountryCode = this.billDetail.reciever.country;
},
deep: true
},
@ -1541,7 +1554,7 @@ export default {
this.form.blSpecialQuote='0';
}
},
deep: true
deep: true
},
applyType: {
handler (newVa, oldValue) {
@ -1667,8 +1680,6 @@ export default {
console.log("====>this.oldValue==>",this.oldValue);
console.log("====>this.form==>",this.form);
this.billDetail=this.oldValue;
this.senderCountryCode = this.form.sender.country;
this.recieverCountryCode = this.form.reciever.country;
},
getJsonData(){
if(this.form.packType&&this.form.packType.length>0){