中间计量

public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20231225103815"
+  "value": "20231225114202"
 }

src/views/debit-pay/admin/components/middlepay/addModal.vue

@@ -249,12 +249,7 @@ const getDataDetail = async () => {
     res.pictureName = res.pictureName ?? ''
     nodeId.value = res.contractUnitId ?? ''
     baseForm.value = res
-    const formList = getArrValue(res.formList)
-    for (let i = 0; i < formList.length; i++) {
-        formList[i].webAllMeterTotal = deepClone(formList[i].allMeterTotal)
-        formList[i].webCurrentMeterTotal = deepClone(formList[i].currentMeterTotal)
-    }
-    addTableData.value = formList
+    addTableData.value = getArrValue(res.formList)
 }
 
 //数据格式
@@ -351,6 +346,7 @@ const addTableColumn = ref([
     { key: 'containChangeTotal', name: '含变更数量', width: '100' },
     { key: 'currentMeterMoney', name: '本期计量金额', width: '120' },
     { key: 'allMeterTotal', name: '累计计量量', width: '100' },
+    { key: 'otherMeterTotal', name: '基数', width: '80' },
     { key: 'action', name: '操作', fixed: 'right', width: 80, align: 'center' },
 ])
 const addTableData = ref([])
@@ -367,12 +363,11 @@ const currentMeterTotalBlur = (row) => {
     nextTick(() => {
         row.currentMeterTotal = currentMeterTotal
         row.currentMeterMoney = (BigNumber(currentMeterTotal).multipliedBy(row.currentPrice)).toString()
-        row.allMeterTotal = (BigNumber(currentMeterTotal).plus(row.webCurrentMeterTotal)).toString()
-
+        row.allMeterTotal = (BigNumber(currentMeterTotal).plus(row.otherMeterTotal)).toString()
         //计算总计量金额
-        let meterMoney = 0
-        for (let i = 0; i < addTableData.value.length; i++) {
-            meterMoney = (BigNumber(meterMoney).plus(addTableData.value[i].currentMeterMoney)).toString()
+        let meterMoney = 0, table = addTableData.value
+        for (let i = 0; i < table.length; i++) {
+            meterMoney = (BigNumber(meterMoney).plus(table[i].currentMeterMoney)).toString()
         }
         baseForm.value.meterMoney = meterMoney
     })
@@ -420,8 +415,6 @@ const addBillBaseModalClick = () => {
 //添加完成
 const finishChange = (data) => {
     for (let i = 0; i < data.length; i++) {
-        data[i].webAllMeterTotal = deepClone(data[i].allMeterTotal)
-        data[i].webCurrentMeterTotal = deepClone(data[i].currentMeterTotal)
         addTableData.value.push(data[i])
     }
 }