消费券取值为totalAmount

src/views/elderly/fee/bill-pay/Form.vue

@@ -65,7 +65,7 @@
           <template #default="scope">
 
               <el-input-number  v-if="isEdit && scope.row.payStatus == 0" @blur="handlePrice(scope.row, 1)" v-model="scope.row.totalAmount" controls-position="right"/>
-              <span v-else>{{ scope.row.expenseSource == 'consumer_voucher' ? scope.row.payAmount : (scope.row.payStatus == 1 || scope.row.payStatus == 2) ? (formatTotalMonth(scope.row) - scope.row.payAmount).toFixed(2) : formatTotalMonth(scope.row) }}</span>
+              <span v-else>{{ scope.row.expenseSource == 'consumer_voucher' ? scope.row.totalAmount : (scope.row.payStatus == 1 || scope.row.payStatus == 2) ? (formatTotalMonth(scope.row) - scope.row.payAmount).toFixed(2) : formatTotalMonth(scope.row) }}</span>
 
           </template>
         </el-table-column>
@@ -124,7 +124,7 @@
           <el-table-column prop="totalAmount" label="应收金额(元)" align="center">
             <template #default="scope">
               <el-input-number  v-if="isEdit && scope.row.payStatus == 0" @blur="handlePrice(scope.row, 2)" v-model="scope.row.totalAmount" controls-position="right"/>
-              <span v-else>{{ scope.row.expenseSource == 'consumer_voucher' ? scope.row.payAmount : (scope.row.payStatus == 1 || scope.row.payStatus == 2) ? (tableRowPay(scope.row) - scope.row.payAmount).toFixed(2) : tableRowPay(scope.row) }}</span>
+              <span v-else>{{ scope.row.expenseSource == 'consumer_voucher' ? scope.row.totalAmount : (scope.row.payStatus == 1 || scope.row.payStatus == 2) ? (tableRowPay(scope.row) - scope.row.payAmount).toFixed(2) : tableRowPay(scope.row) }}</span>
 
           </template>
           </el-table-column>
@@ -208,7 +208,7 @@
           <el-table-column prop="totalAmount" label="应收金额(元)" align="center">
             <template #default="scope">
               <el-input-number  v-if="isEdit" @blur="handlePrice(scope.row, 3)" v-model="scope.row.totalAmount" controls-position="right"/>
-              <span v-else>{{ scope.row.expenseSource == 'consumer_voucher' ? scope.row.payAmount : (scope.row.payStatus == 1 || scope.row.payStatus == 2) ? (tableRowPay(scope.row) - scope.row.payAmount).toFixed(2) : tableRowPay(scope.row) }}</span>
+              <span v-else>{{ scope.row.expenseSource == 'consumer_voucher' ? scope.row.totalAmount : (scope.row.payStatus == 1 || scope.row.payStatus == 2) ? (tableRowPay(scope.row) - scope.row.payAmount).toFixed(2) : tableRowPay(scope.row) }}</span>
 
             </template>
           </el-table-column>
@@ -261,7 +261,7 @@
           <el-table-column prop="totalAmount" label="应收金额(元)" align="center">
             <template #default="scope">
               <el-input-number  v-if="isEdit && scope.row.payStatus == 0" @blur="handlePrice(scope.row, 5)" v-model="scope.row.totalAmount" controls-position="right"/>
-              <span v-else>{{ scope.row.expenseSource == 'consumer_voucher' ? scope.row.payAmount : (scope.row.payStatus == 1 || scope.row.payStatus == 2) ? (tableRowPay(scope.row) - scope.row.payAmount).toFixed(2) : tableRowPay(scope.row) }}</span>
+              <span v-else>{{ scope.row.expenseSource == 'consumer_voucher' ? scope.row.totalAmount : (scope.row.payStatus == 1 || scope.row.payStatus == 2) ? (tableRowPay(scope.row) - scope.row.payAmount).toFixed(2) : tableRowPay(scope.row) }}</span>
 
             </template>
           </el-table-column>
@@ -358,7 +358,7 @@
           <el-table-column prop="totalAmount" width="180" label="应收金额(元)" align="center">
             <template #default="scope">
               <el-input-number  v-if="isEdit && scope.row.payStatus == 0" @blur="handlePrice(scope.row, 5)" v-model="scope.row.totalAmount" controls-position="right"/>
-              <span v-else>{{ (scope.row.payStatus == 1 || scope.row.payStatus == 2) ? (tableRowPay(scope.row) - scope.row.payAmount).toFixed(2) : tableRowPay(scope.row) }}</span>
+              <span v-else>{{ scope.row.expenseSource == 'consumer_voucher' ? scope.row.totalAmount : (scope.row.payStatus == 1 || scope.row.payStatus == 2) ? (tableRowPay(scope.row) - scope.row.payAmount).toFixed(2) : tableRowPay(scope.row) }}</span>
             </template>
           </el-table-column>
           <el-table-column prop="payAmount" label="已缴费用" width="100" align="center" />
@@ -442,7 +442,7 @@
           <el-table-column prop="totalAmount" label="应收金额(元)" align="center">
             <template #default="scope">
               <el-input-number  v-if="isEdit && scope.row.payStatus == 0" @blur="handlePrice(scope.row, 3)" v-model="scope.row.totalAmount" controls-position="right"/>
-              <span v-else>{{ scope.row.expenseSource == 'consumer_voucher' ? scope.row.payAmount : (scope.row.payStatus == 1 || scope.row.payStatus == 2) ? (tableRowPay(scope.row) - scope.row.payAmount).toFixed(2) : tableRowPay(scope.row) }}</span>
+              <span v-else>{{ scope.row.expenseSource == 'consumer_voucher' ? scope.row.totalAmount : (scope.row.payStatus == 1 || scope.row.payStatus == 2) ? (tableRowPay(scope.row) - scope.row.payAmount).toFixed(2) : tableRowPay(scope.row) }}</span>
               <!-- <span class="underline" v-if="!settingStore.getRceivable||settingStore.getAdmissionBillRoundUp">{{ formatNum(scope.row.totalAmount) }}</span> -->
             </template>
           </el-table-column>
@@ -624,7 +624,7 @@ const stageExpandSubtotalAmount = stageSubtotalAmount
 
 const getReceivableAmount = (item) => {
   if (item?.expenseSource == 'consumer_voucher') {
-    return Number(item.payAmount || 0)
+    return Number(item.totalAmount || 0)
   }
   if (item?.expenseSource == 'long_term_care_insurance') {
     return Number(item.totalAmount || 0)
@@ -679,7 +679,7 @@ const billTotalAmount = computed(() => {
 // 固定费用
 const formatTotalMonth = (item) => {
   if (item?.expenseSource == 'consumer_voucher') {
-    return item.payAmount
+    return item.totalAmount
   }
   return formatNum(getReceivableAmount(item))
 }
@@ -719,7 +719,7 @@ const tableRowPay = (row) => {
   if(row.expenseSource == 'long_term_care_insurance'){
     return formatNum(row.totalAmount)
   }else if(row.expenseSource == 'consumer_voucher'){
-    return row.payAmount
+    return row.totalAmount
   }else if(rounding.value){
     return formatNum(row.roundAmount)
   }else if(fixed2Num.value){

src/views/elderly/fee/bill-pay/preview.vue

@@ -298,26 +298,26 @@ const handleClick = (val) => {
       if (item.isMonthlyExpense == 1) {
         if (rounding.value) {
           // 取整
-          monthNum += Number(item.expenseSource == 'consumer_voucher' ? item.payAmount : item.roundAmount)
+          monthNum += Number(item.expenseSource == 'consumer_voucher' ? item.totalAmount : item.roundAmount)
         } else if (fixed2Num.value) {
           // 四舍五入
-          monthNum += Number(item.expenseSource == 'consumer_voucher' ? item.payAmount : item.roundTwoDecimalAmount)
+          monthNum += Number(item.expenseSource == 'consumer_voucher' ? item.totalAmount : item.roundTwoDecimalAmount)
         } else {
           // 应收
-          monthNum += Number(item.expenseSource == 'consumer_voucher' ? item.payAmount : formatNum(item.totalAmount))
+          monthNum += Number(item.expenseSource == 'consumer_voucher' ? item.totalAmount : formatNum(item.totalAmount))
         }
       } else {
         if (item.itemName != '长护险护理补贴费用') {
           otherName += item.itemName + ';'
           if (rounding.value) {
             // 取整
-            otherNum += Number(item.expenseSource == 'consumer_voucher' ? item.payAmount : item.roundAmount)
+            otherNum += Number(item.expenseSource == 'consumer_voucher' ? item.totalAmount : item.roundAmount)
           } else if (fixed2Num.value) {
             // 四舍五入
-            otherNum += Number(item.expenseSource == 'consumer_voucher' ? item.payAmount : item.roundTwoDecimalAmount)
+            otherNum += Number(item.expenseSource == 'consumer_voucher' ? item.totalAmount : item.roundTwoDecimalAmount)
           } else {
             // 应收
-            otherNum += Number(item.expenseSource == 'consumer_voucher' ? item.payAmount : formatNum(item.totalAmount))
+            otherNum += Number(item.expenseSource == 'consumer_voucher' ? item.totalAmount : formatNum(item.totalAmount))
           }
         }
       }
@@ -353,28 +353,28 @@ const totalPayAmount = computed(() => {
   // 遍历里面的所有数据得到数据
   dataForm.value.items.map((item) => {
     if (item.itemName != '长护险护理补贴费用') {
-      num1 += Number(item.expenseSource == 'consumer_voucher' ? item.payAmount : item.roundAmount)
-      num2 += Number(item.expenseSource == 'consumer_voucher' ? item.payAmount : item.roundTwoDecimalAmount)
+      num1 += Number(item.expenseSource == 'consumer_voucher' ? item.totalAmount : item.roundAmount)
+      num2 += Number(item.expenseSource == 'consumer_voucher' ? item.totalAmount : item.roundTwoDecimalAmount)
       if (item.isMonthlyExpense == 1 && dataForm.value.type == 1) {
         if (settingStore.getAdmissionBill == 2) {
           // 向上取整
-          num3 += Number(item.expenseSource == 'consumer_voucher' ? item.payAmount : formatCeil(item.totalAmount))
+          num3 += Number(item.expenseSource == 'consumer_voucher' ? item.totalAmount : formatCeil(item.totalAmount))
         } else if (settingStore.getAdmissionBill == 3) {
           // 四舍五入保留两位
-          num3 += Number(item.expenseSource == 'consumer_voucher' ? item.payAmount : item.roundTwoDecimalAmount)
+          num3 += Number(item.expenseSource == 'consumer_voucher' ? item.totalAmount : item.roundTwoDecimalAmount)
         } else if (settingStore.getAdmissionBill == 4) {
           // 四舍五入取整
-          num3 += Number(item.expenseSource == 'consumer_voucher' ? item.payAmount : item.roundAmount)
+          num3 += Number(item.expenseSource == 'consumer_voucher' ? item.totalAmount : item.roundAmount)
         } else {
-          num3 += Number(item.expenseSource == 'consumer_voucher' ? item.payAmount : item.totalAmount)
+          num3 += Number(item.expenseSource == 'consumer_voucher' ? item.totalAmount : item.totalAmount)
         }
       } else {
         if (rounding.value) {
-          num3 += Number(item.expenseSource == 'consumer_voucher' ? item.payAmount : item.roundAmount)
+          num3 += Number(item.expenseSource == 'consumer_voucher' ? item.totalAmount : item.roundAmount)
         } else if (fixed2Num.value) {
-          num3 += Number(item.expenseSource == 'consumer_voucher' ? item.payAmount : item.roundTwoDecimalAmount)
+          num3 += Number(item.expenseSource == 'consumer_voucher' ? item.totalAmount : item.roundTwoDecimalAmount)
         } else {
-          num3 += Number(item.expenseSource == 'consumer_voucher' ? item.payAmount : item.totalAmount)
+          num3 += Number(item.expenseSource == 'consumer_voucher' ? item.totalAmount : item.totalAmount)
         }
       }
     }
@@ -414,28 +414,28 @@ const tableRowPay = (row) => {
   if (dataForm.value.type == '1' && row.isMonthlyExpense == 1) {
     if (settingStore.getAdmissionBill == 2) {
       // 向上取整
-      return formatNum(row.expenseSource == 'consumer_voucher' ? row.payAmount : formatCeil(row.totalAmount))
+      return formatNum(row.expenseSource == 'consumer_voucher' ? row.totalAmount : formatCeil(row.totalAmount))
     } else if (settingStore.getAdmissionBill == 3) {
       // 四舍五入保留两位
-      return formatNum(row.expenseSource == 'consumer_voucher' ? row.payAmount : row.roundTwoDecimalAmount)
+      return formatNum(row.expenseSource == 'consumer_voucher' ? row.totalAmount : row.roundTwoDecimalAmount)
     } else if (settingStore.getAdmissionBill == 4) {
       // 四舍五入取整
-      return formatNum(row.expenseSource == 'consumer_voucher' ? row.payAmount : row.roundAmount)
+      return formatNum(row.expenseSource == 'consumer_voucher' ? row.totalAmount : row.roundAmount)
     } else {
-      return formatNum(row.expenseSource == 'consumer_voucher' ? row.payAmount : row.totalAmount)
+      return formatNum(row.expenseSource == 'consumer_voucher' ? row.totalAmount : row.totalAmount)
     }
   } else {
     if (rounding.value) {
       return row.expenseSource == 'consumer_voucher'
-        ? formatNum(row.payAmount)
+        ? formatNum(row.totalAmount)
         : formatNum(row.roundAmount)
     } else if (fixed2Num.value) {
       return row.expenseSource == 'consumer_voucher'
-        ? formatNum(row.payAmount)
+        ? formatNum(row.totalAmount)
         : formatNum(row.roundTwoDecimalAmount)
     } else {
       return row.expenseSource == 'consumer_voucher'
-        ? formatNum(row.payAmount)
+        ? formatNum(row.totalAmount)
         : formatNum(row.totalAmount)
     }
   }
@@ -448,24 +448,24 @@ const tableSubtotal = computed(() => {
     if (dataForm.value.type == '1' && item.isMonthlyExpense == 1) {
       if (settingStore.getAdmissionBill == 2) {
         // 向上取整
-        num += Number(item.expenseSource == 'consumer_voucher' ? item.payAmount : formatCeil(item.totalAmount))
+        num += Number(item.expenseSource == 'consumer_voucher' ? item.totalAmount : formatCeil(item.totalAmount))
       } else if (settingStore.getAdmissionBill == 3) {
         // 四舍五入保留两位
-        num += Number(item.expenseSource == 'consumer_voucher' ? item.payAmount : item.roundTwoDecimalAmount)
+        num += Number(item.expenseSource == 'consumer_voucher' ? item.totalAmount : item.roundTwoDecimalAmount)
       } else if (settingStore.getAdmissionBill == 4) {
         // 四舍五入取整
-        num += Number(item.expenseSource == 'consumer_voucher' ? item.payAmount : item.roundAmount)
+        num += Number(item.expenseSource == 'consumer_voucher' ? item.totalAmount : item.roundAmount)
       } else {
         // 应收
-        num += Number(item.expenseSource == 'consumer_voucher' ? item.payAmount : item.totalAmount)
+        num += Number(item.expenseSource == 'consumer_voucher' ? item.totalAmount : item.totalAmount)
       }
     } else {
       if (rounding.value) {
-        num += Number(item.expenseSource == 'consumer_voucher' ? item.payAmount : item.roundAmount)
+        num += Number(item.expenseSource == 'consumer_voucher' ? item.totalAmount : item.roundAmount)
       } else if (fixed2Num.value) {
-        num += Number(item.expenseSource == 'consumer_voucher' ? item.payAmount : item.roundTwoDecimalAmount)
+        num += Number(item.expenseSource == 'consumer_voucher' ? item.totalAmount : item.roundTwoDecimalAmount)
       } else {
-        num += Number(item.expenseSource == 'consumer_voucher' ? item.payAmount : item.totalAmount)
+        num += Number(item.expenseSource == 'consumer_voucher' ? item.totalAmount : item.totalAmount)
       }
     }
   })