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

Merge pull request '寄件运单查询导出缺少现金客户字段' (#189) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/189
This commit is contained in:
wuteng 2026-01-12 09:55:36 +08:00
commit ed410b72fc
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/emis/emisWaybill/centerWaybillList.vue
View File

@ -1225,11 +1225,11 @@ export default {
if (j === 'paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
}
if(j === 'waybillOther?.salesSupport'){
return v['waybillOther']['salesSupport'];
if(j === 'waybillOther.salesSupport'){
return v['waybillOther']?.['salesSupport'] || '';
}
if(j === 'waybillOther?.moneyCompany'){
return v['waybillOther']['moneyCompany'];
if(j === 'waybillOther.moneyCompany'){
return v['waybillOther']?.['moneyCompany'] || '';
}
if(j=== 'blIsQuestion'){
if(v[j] == 1){

8
src/views/emis/emisWaybill/dispatchWaybillList.vue
View File

@ -1189,11 +1189,11 @@ export default {
if (j === 'paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
}
if(j === 'waybillOther?.salesSupport'){
return v['waybillOther']['salesSupport'];
if(j === 'waybillOther.salesSupport'){
return v['waybillOther']?.['salesSupport'] || '';
}
if(j === 'waybillOther?.moneyCompany'){
return v['waybillOther']['moneyCompany'];
if(j === 'waybillOther.moneyCompany'){
return v['waybillOther']?.['moneyCompany'] || '';
}
if(j=== 'blIsQuestion'){
if(v[j] == 1){

8
src/views/emis/emisWaybill/sendWaybillList.vue
View File

@ -1268,11 +1268,11 @@ export default {
if (j === 'paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
}
if(j === 'waybillOther?.salesSupport'){
return v['waybillOther']['salesSupport'];
if(j === 'waybillOther.salesSupport'){
return v['waybillOther']?.['salesSupport'] || '';
}
if(j === 'waybillOther?.moneyCompany'){
return v['waybillOther']['moneyCompany'];
if(j === 'waybillOther.moneyCompany'){
return v['waybillOther']?.['moneyCompany'] || '';
}
if(j=== 'blIsQuestion'){
if(v[j] == 1){

8
src/views/emis/emisWaybill/sendWaybillListNew.vue
View File

@ -1218,11 +1218,11 @@ export default {
if (j === 'paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
}
if(j === 'waybillOther?.salesSupport'){
return v['waybillOther']['salesSupport'];
if(j === 'waybillOther.salesSupport'){
return v['waybillOther']?.['salesSupport'] || '';
}
if(j === 'waybillOther?.moneyCompany'){
return v['waybillOther']['moneyCompany'];
if(j === 'waybillOther.moneyCompany'){
return v['waybillOther']?.['moneyCompany'] || '';
}
if(j=== 'blIsQuestion'){
if(v[j] == 1){