Browse Source

2023.10.31

bulusiLuo 1 year ago
parent
commit
fdf3f31ab0

+ 3 - 3
src/views/zhpt/projectManager/IndoorRenovation/components/printPdfSell.vue

@@ -177,9 +177,9 @@ export default {
     this.registerForm.jf = jf
     this.registerForm.yf = yf
     this.registerForm.dx = dx
-    this.listData[0].je = az
-    this.listData[1].je = sj
-    this.listData[2].je = jl
+    this.listData[0].je = az || 0
+    this.listData[1].je = sj || 0
+    this.listData[2].je = jl || 0
     this.zz = zz
     this.totalAll = Number(az + sj + jl).toFixed(2)
   },

+ 12 - 0
src/views/zhpt/projectManager/newInstall/proSettlement/userSettle/inputPage.vue

@@ -112,6 +112,7 @@ export default {
   inject: ['updateTable'],
   data() {
     return {
+      oldZz: '',
       isOld: false, //旧流程
       daxie: '',
       dataList: {
@@ -829,7 +830,15 @@ export default {
                   val.dataMap.tfBillWService.forEach((item) => {
                     allPrice += item.amountMoney
                   })
+                  this.dataList.disTableList.az = val.dataMap.tfBillWService[0].amountMoney
+                  this.dataList.disTableList.sj = val.dataMap.tfBillWService[1].amountMoney
+                  this.dataList.disTableList.jl = val.dataMap.tfBillWService[2].amountMoney
                   this.moneyObj.receivable = allPrice.toFixed(2)
+                  this.oldZz = (
+                    val.dataMap.tfBillWService[0].amountMoney +
+                    val.dataMap.tfBillWService[1].amountMoney +
+                    val.dataMap.tfBillWService[2].amountMoney
+                  ).toFixed(2)
                 }
                 if (val.dataMap && val.dataMap.tfChargeWService) {
                   this.isOld = false
@@ -867,6 +876,9 @@ export default {
               this.dataList.disTableList.dx = this.daxie
               this.dataList.disTableList.zz = price
             } else {
+              if (this.isOld) {
+                this.dataList.disTableList.zz = this.oldZz
+              }
               this.moneyObj.receivable = (this.moneyObj.receivable - this.moneyObj.waterElectricity).toFixed(2)
               price = this.moneyObj.receivable
             }