Pārlūkot izejas kodu

优化长护险取值

xiongxing 1 nedēļu atpakaļ
vecāks
revīzija
718b34fe96

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

@@ -642,7 +642,7 @@ const getReceivableAmount = (item) => {
     if (longCareRuleValue.value == 2 || longCareRuleValue.value == '2') {
       return Number(formatRound(item.totalAmount || 0))
     }
-    return Number(formatNum(item.totalAmount || 0))
+    return Number(item.totalAmount || 0)
   }
   if (dataForm.value.type == 1 && item?.isMonthlyExpense == 1) {
     if (settingStore.getAdmissionBill == 2) {

+ 13 - 3
src/views/elderly/fee/bill-pay/preview.vue

@@ -461,7 +461,7 @@ const formatLongCareAmount = (amount) => {
   if (ruleValue == 2 || ruleValue == '2') {
     return Number(formatRound(amount || 0))
   }
-  return Number(formatNum(amount || 0))
+  return Number(amount || 0)
 }
 
 /** 消费券/长护险都按各自的抹零配置单独取数 */
@@ -481,7 +481,12 @@ const getSourceAmountNumber = (item) => {
   if (ruleValue == 2 || ruleValue == '2') {
     return Number(formatRound(rawAmount))
   }
-  return Number(formatNum(rawAmount))
+  if(item.expenseSource == 'consumer_voucher'){
+    return Number(formatNum(rawAmount))
+  }
+  if(item.expenseSource == 'long_term_care_insurance'){
+    return Number(rawAmount)
+  }
 }
 
 /** 按来源规则取金额(展示用字符串) */
@@ -491,7 +496,12 @@ const getSourceAmountText = (item) => {
   if (ruleValue == 2 || ruleValue == '2') {
     return formatRound(rawAmount)
   }
-  return formatNum(rawAmount)
+  if(item.expenseSource == 'consumer_voucher'){
+    return formatNum(rawAmount)
+  }
+  if(item.expenseSource == 'long_term_care_insurance'){
+    return Number(rawAmount)
+  }
 }
 
 // 账单总额

+ 3 - 3
src/views/elderly/fee/bill-pay/unpay-preview.vue

@@ -186,7 +186,7 @@ const getLongCareAmountNumber = (item) => {
   if (longCareRuleValue.value == 2 || longCareRuleValue.value == '2') {
     return Number(formatRound(rawAmount))
   }
-  return Number(formatNum(rawAmount))
+  return Number(rawAmount)
 }
 
 /** 长护险金额:展示用字符串 */
@@ -194,7 +194,7 @@ const getLongCareAmountText = (item) => {
   if (longCareRuleValue.value == 2 || longCareRuleValue.value == '2') {
     return formatRound(item?.totalAmount ?? 0)
   }
-  return formatNum(item?.totalAmount ?? 0)
+  return Number(item?.totalAmount ?? 0)
 }
 
 /** 按长护险规则处理后的补贴金额 */
@@ -202,7 +202,7 @@ const formatLongCareAmount = (amount) => {
   if (longCareRuleValue.value == 2 || longCareRuleValue.value == '2') {
     return Number(formatRound(amount || 0))
   }
-  return Number(formatNum(amount || 0))
+  return Number(amount || 0)
 }
 
 const tempResValue = ref({})