Prechádzať zdrojové kódy

修复 房态联房全部账单bug

覃浩 2 rokov pred
rodič
commit
4cfb1159bb

+ 3 - 0
src/views/room/modules/checkIn/BillRoomInfo.vue

@@ -1560,6 +1560,7 @@ export default {
         this.paymentList = this.oldpaymentList.filter((t) => t.roomId === e)
         this.paidList = this.oldpaidList.filter((t) => t.roomId === e)
         this.strikeList = this.oldStrikeList.filter((t) => t.roomId === e)
+        this.entiretyList = this.entiretyAmount.filter((t) => t.roomId === e)
         let find = this.model.livingRoomIds.find((t) => t.roomId === this.selectRoomId)
         this.chooseLivingRoom = find
         console.log(this.model)
@@ -1745,6 +1746,8 @@ export default {
                 this.oldpaidList = JSON.parse(JSON.stringify(this.paidList))
                 // 全部账单
                 this.entiretyList = this.feesList.concat(this.paidList)
+                console.log(this.selectRoomId);
+                this.entiretyList = this.entiretyList.filter((t) => t.roomId === this.selectRoomId)
                 this.entiretyAmount = this.feesList.concat(this.paidList)
                 console.log(this.entiretyList,'全部账单');
                 console.log(this.entiretyAmount,'全部账单');

+ 9 - 4
src/views/settings/components/roomModules/modules/housePriceSchemeLayout/housePriceSchemeLayoutForm.vue

@@ -75,7 +75,7 @@
           queryList: "/business/busSchemeLayoutDailyPrice/queryList",
           editDailyPrice: "/business/busSchemeLayoutDailyPrice/editDailyPrice",
           batchUpdatePrice: "/business/busSchemeLayoutDailyPrice/batchUpdatePrice",
-          list: "/business/busHousePriceSchemeLayout/layoutPricePage",
+          // list: "/business/busHousePriceSchemeLayout/layoutPricePage",
           queryListByCond: "/business/busSchemeLayoutDailyPrice/queryListByCond",
         },
         curDate :moment(new Date()).format('YYYY-MM-DD'),
@@ -137,11 +137,16 @@
       // 获取数据
       getDateList() {
         console.log(this.dataSource);
-        // getAction('/business/busHousePriceSchemeLayout/layoutPricePage').then(res => {
-        //   console.log(res);
-        // })
+        getAction('/business/busHousePriceSchemeLayout/layoutPricePage', {
+          pageNo: 1,
+          pageSize: 10,
+          schemeId: this.model.schemeId
+        }).then(res => {
+          console.log(res);
+        })
       },
       edit (record) {
+        console.log(record);
         this.model = Object.assign({}, record);
         this.visible = true;
         this.schemeLayoutId = record.id