abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复日常收费翻页的异常

Browse Source
This commit is contained in:
czx 2021-02-09 12:07:24 +08:00
parent 43e075ad7d
commit fd0cea9af8
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ruoyi-ui/src/views/fantang/settle/index.vue
View File

@ -218,8 +218,8 @@
<el-table-column label="报餐总价" align="center" prop="totalPrice"/> <el-table-column label="报餐总价" align="center" prop="totalPrice"/>
</el-table> </el-table>
<pagination <pagination
v-show="totalDetails > 0" v-show="formAddNewSettlement.total > 0"
:total="totalDetails" :total="formAddNewSettlement.total"
:page.sync="formAddNewSettlement.pageNum" :page.sync="formAddNewSettlement.pageNum"
:limit.sync="formAddNewSettlement.pageSize" :limit.sync="formAddNewSettlement.pageSize"
@pagination="popupShowMealsWithSelect" @pagination="popupShowMealsWithSelect"
@ -422,6 +422,7 @@ export default {
payType: null, payType: null,
pageNum: 1, pageNum: 1,
pageSize: 7, pageSize: 7,
total: 0,
}, },
// 结算类型字典 // 结算类型字典
@ -537,7 +538,7 @@ export default {
console.log('this.formAddNewSettlement:',this.formAddNewSettlement); console.log('this.formAddNewSettlement:',this.formAddNewSettlement);
showMealsWithSelect(this.formAddNewSettlement).then(response => { showMealsWithSelect(this.formAddNewSettlement).then(response => {
this.mealsList = response.data.reportMealsList.records; this.mealsList = response.data.reportMealsList.records;
this.totalDetails = response.data.reportMealsList.total; this.formAddNewSettlement.total = response.data.reportMealsList.total;
if (response.data.reportMealsPrice == null) { if (response.data.reportMealsPrice == null) {
this.dinnerTotalPrice = 0; this.dinnerTotalPrice = 0;
@ -572,7 +573,9 @@ export default {
} }
if (this.formAddNewSettlement.selectBillingDate != null) { if (this.formAddNewSettlement.selectBillingDate != null) {
this.formAddNewSettlement.pageNum = 1;
this.formAddNewSettlement.pageSize = 7;
this.formAddNewSettlement.total = 0;
this.popupShowMealsWithSelect(); this.popupShowMealsWithSelect();
} else { } else {
this.mealsList = null; this.mealsList = null;
@ -598,8 +601,13 @@ export default {
this.sumTotalPrice = 0; this.sumTotalPrice = 0;
this.dinnerTotalPrice = 0; this.dinnerTotalPrice = 0;
this.nutritionTotalPrice = 0; this.nutritionTotalPrice = 0;
this.formAddNewSettlement.selectBillingDate = null;
getLastSettlementDate(row.patientId).then(response => { getLastSettlementDate(row.patientId).then(response => {
this.formAddNewSettlement.pageNum = 1;
this.formAddNewSettlement.pageSize = 7;
this.formAddNewSettlement.total = 0;
console.log("getLastBillingDateByPatientId-->", response); console.log("getLastBillingDateByPatientId-->", response);
if (response.reportMeals.settlementAt === null) { if (response.reportMeals.settlementAt === null) {
this.lastBillFlag = false; this.lastBillFlag = false;
@ -627,6 +635,9 @@ export default {
this.formAddNewSettlement.price = row.price; this.formAddNewSettlement.price = row.price;
this.formAddNewSettlement.netPeceipt = null; this.formAddNewSettlement.netPeceipt = null;
this.formAddNewSettlement.userName = this.userName; this.formAddNewSettlement.userName = this.userName;
this.formAddNewSettlement.pageNum = 1;
this.formAddNewSettlement.pageSize = 7;
this.formAddNewSettlement.total = 0;
}); });
}, },