diff --git a/src/views/emis/emisBaseInvoiceInfo/emisBaseInvoiceInfoForm.vue b/src/views/emis/emisBaseInvoiceInfo/emisBaseInvoiceInfoForm.vue
index c8bf6a3d..5d4481f8 100644
--- a/src/views/emis/emisBaseInvoiceInfo/emisBaseInvoiceInfoForm.vue
+++ b/src/views/emis/emisBaseInvoiceInfo/emisBaseInvoiceInfoForm.vue
@@ -37,6 +37,12 @@
+
+
+
+
+
+
+
diff --git a/src/views/emis/emisSettleBill/CustSettleBillQueryList.vue b/src/views/emis/emisSettleBill/CustSettleBillQueryList.vue
index 8870d934..a265c4e9 100644
--- a/src/views/emis/emisSettleBill/CustSettleBillQueryList.vue
+++ b/src/views/emis/emisSettleBill/CustSettleBillQueryList.vue
@@ -42,7 +42,7 @@
-->
-
+
@@ -64,6 +64,12 @@
+
+
+
+
+
+
@@ -233,7 +239,11 @@
-
+
+
+ {{ (scope.row.recMoney-scope.row.recedMoney+scope.row.refundMoney-scope.row.satisfyMoney-scope.row.allowanceMoney-scope.row.deductionMoney-scope.row.otherMoney ).toFixed(2) }}
+
+
@@ -353,6 +363,8 @@ export default {
daterangeCreateTime: [],
// 更新站点时间范围
daterangeUpdateTime: [],
+ paymentStatus:[],
+ settleType:null,
// 查询参数
queryParams: {
pageNum: 1,
@@ -410,7 +422,7 @@ export default {
params:{
billCode:null,
}
- },
+ }
};
},
watch: {
@@ -447,6 +459,11 @@ export default {
this.queryParams.params.billCode=null;
this.queryParams.settleBillNo=this.queryParams.queryCode;
}
+ if(this.paymentStatus.length>0){
+ this.queryParams.paymentStatus=this.paymentStatus.join(',');
+ }else{
+ this.queryParams.paymentStatus=null;
+ }
},
@@ -825,6 +842,21 @@ export default {
if (j === 'paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
}
+ if (j === 'recUnPaid') {
+ return v['recMoney'] - v['recedMoney'] + v['refundMoney'] - v['satisfyMoney'] - v['allowanceMoney'] - v['deductionMoney'] - v['otherMoney'];
+ }
+ if (j ==='blConfirmSite') {
+ if(v[j] == 0){
+ return '未确认';
+ }else if(v[j] == 1){
+ return '已确认';
+ }else if(v[j] == 2){
+ return '确认不出账';
+ }else if(v[j] == 3){
+ return '账单异常';
+ }
+ }
+
return v[j]
}))
},