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

Merge pull request '月结出账、现金出账导出调整' (#97) from master-dev into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/97
This commit is contained in:
wuteng 2025-09-17 18:06:04 +08:00
commit ffb75d2552
2 changed files with 143 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
View File

@ -1412,9 +1412,42 @@ export default {
}
}
if (j === 'paymentStatus') {
if(v['paymentStatus'] == 0){
return '未收款';
}
else if(v['paymentStatus'] == 1){
return '已收款';
}
else if(v['paymentStatus'] == 2){
return '部分收款';
}
}
if (j === 'openBillStatus') {
if(v['openBillStatus'] == 0){
return '未开票';
}
else if(v['openBillStatus'] == 1){
return '已开票';
}
else if(v['openBillStatus'] == 2){
return '部分开票';
}
else if(v['openBillStatus'] == 3){
return '不开票';
}
else if(v['openBillStatus'] == 4){
return '已完成';
}
}
if (j === 'waybillDetail.blIsQuestion') {
if(v['waybillDetail']['blIsQuestion'] == 1){
return '是';
}else{
return '否';
}
}
if (j === 'waybillDetail.blMessage') {
if(v['waybillDetail']['blMessage'] == 1){
@ -1455,6 +1488,42 @@ export default {
return '是';
}
}
if (j === 'blMerge') {
if(v['blMerge'] == 0){
return '否';
}
else if(v['blMerge'] == 1){
return '是';
}
}
if (j === 'blConfirmCenter') {
if(v['blConfirmCenter'] == 0){
return '未确认';
}
else if(v['blConfirmCenter'] == 1){
return '已确认';
}
else if(v['blConfirmCenter'] == 2){
return '确认不出账';
}
else if(v['blConfirmCenter'] == 3){
return '账单异常';
}
}
if (j === 'blConfirmSite') {
if(v['blConfirmSite'] == 0){
return '未确认';
}
else if(v['blConfirmSite'] == 1){
return '已确认';
}
else if(v['blConfirmSite'] == 2){
return '确认不出账';
}
else if(v['blConfirmSite'] == 3){
return '账单异常';
}
}
return v[j]
}))
},

76
src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
View File

@ -1531,10 +1531,42 @@ export default {
}
}
if (j === 'paymentStatus') {
if(v['paymentStatus'] == 0){
return '未收款';
}
else if(v['paymentStatus'] == 1){
return '已收款';
}
else if(v['paymentStatus'] == 2){
return '部分收款';
}
}
if (j === 'openBillStatus') {
if(v['openBillStatus'] == 0){
return '未开票';
}
else if(v['openBillStatus'] == 1){
return '已开票';
}
else if(v['openBillStatus'] == 2){
return '部分开票';
}
else if(v['openBillStatus'] == 3){
return '不开票';
}
else if(v['openBillStatus'] == 4){
return '已完成';
}
}
if (j === 'waybillDetail.blIsQuestion') {
if(v['waybillDetail']['blIsQuestion'] == 1){
return '是';
}else{
return '否';
}
}
if (j === 'waybillDetail.blMessage') {
if(v['waybillDetail']['blMessage'] == 1){
return '发送';
@ -1547,7 +1579,7 @@ export default {
return '发送';
}else{
return '不发送';
}
}
}
if (j === 'waybillDetail.blSign') {
if(v['waybillDetail']['blSign'] == 1){
@ -1574,6 +1606,42 @@ export default {
return '是';
}
}
if (j === 'blMerge') {
if(v['blMerge'] == 0){
return '否';
}
else if(v['blMerge'] == 1){
return '是';
}
}
if (j === 'blConfirmCenter') {
if(v['blConfirmCenter'] == 0){
return '未确认';
}
else if(v['blConfirmCenter'] == 1){
return '已确认';
}
else if(v['blConfirmCenter'] == 2){
return '确认不出账';
}
else if(v['blConfirmCenter'] == 3){
return '账单异常';
}
}
if (j === 'blConfirmSite') {
if(v['blConfirmSite'] == 0){
return '未确认';
}
else if(v['blConfirmSite'] == 1){
return '已确认';
}
else if(v['blConfirmSite'] == 2){
return '确认不出账';
}
else if(v['blConfirmSite'] == 3){
return '账单异常';
}
}
return v[j]
}))
},