财务管理费用显示调整

yudao-ui-admin-vue3/src/views/pressure2/NonTaxBilling/detail.vue

@@ -88,7 +88,7 @@
             label-class-name="w-135px"
             class-name="w-380px"
             label="收费总额"
-            >{{ isEmpty(item.serviceAmount) ? '-' : item.serviceAmount }}</el-descriptions-item
+            >{{ isEmpty(item.shouldAmount) ? '-' : item.shouldAmount }}</el-descriptions-item
           >
         </el-descriptions>
       </template>
@@ -211,8 +211,8 @@ const init = () => {
         formData.value.contactPhone = firstItem.recipientPhone
         formData.value.email = firstItem.recipientEmail
         const total = res.list
-          .filter((item) => !isEmpty(item.serviceAmount))
-          .reduce((pre, cur) => new Decimal(pre).add(new Decimal(cur.serviceAmount)), new Decimal(0)).toString()
+          .filter((item) => !isEmpty(item.shouldAmount))
+          .reduce((pre, cur) => new Decimal(pre).add(new Decimal(cur.shouldAmount)), new Decimal(0)).toString()
           console.log('total:', total)
         formData.value.totalAmount = total
         formData.value.actualAmount = total

yudao-ui-admin-vue3/src/views/pressure2/NonTaxBilling/index.vue

@@ -142,9 +142,9 @@
           {{ row.creatorUser ? row.creatorUser?.nickname : '-' }}
         </template>
       </el-table-column>
-       <el-table-column label="收费金额 （元）" align="center" prop="serviceAmount" min-width="150px">
+       <el-table-column label="收费金额 （元）" align="center" prop="shouldAmount" min-width="150px">
         <template #default="{ row }">
-          {{ row.serviceAmount ? row.serviceAmount : '-' }}
+          {{ row.shouldAmount ? row.shouldAmount : '-' }}
         </template>
       </el-table-column>
       <el-table-column label="已拆单金额 （元）" align="center" prop="splitAmount" min-width="150px">

yudao-ui-admin-vue3/src/views/pressure2/expenseReminderManagement/index.vue

@@ -498,14 +498,15 @@ const columns = ref<SmartTableColumn[]>([
   // },
   {
     label: '法定费用',
-    prop: 'serviceAmount', //actualAmount
+    prop: 'shouldAmount',
     fieldProps: {
       align: 'center',
       minWidth: 150,
       showOverflowTooltip: true
     },
     render: (row, value) => {
-      return `${row.checkType === 100 ? value || 0 : 0}`
+      // return `${row.checkType === 100 ? value || 0 : 0}`
+      return value || 0
     }
   },
   {
@@ -517,7 +518,8 @@ const columns = ref<SmartTableColumn[]>([
       showOverflowTooltip: true
     },
     render: (row, value) => {
-      return `${row.checkType !== 100 ? value || 0 : 0}`
+      // return `${row.checkType !== 100 ? value || 0 : 0}`
+      return value || 0
     }
   },
   {
@@ -569,7 +571,8 @@ const columns = ref<SmartTableColumn[]>([
       showOverflowTooltip: true
     },
     render: (row, value) => {
-      return `${value || 0}(${row.checkType === 100 ? '法定' : '服务'})`
+      // return `${value || 0}(${row.checkType === 100 ? '法定' : '服务'})`
+      return value || 0
     }
   },
   {

yudao-ui-admin-vue3/src/views/pressure2/financialFees/detail.vue

@@ -328,14 +328,15 @@ const columns = ref<SmartTableColumn[]>([
   },
   {
     label: '法定费用',
-    prop: 'serviceAmount', //actualAmount
+    prop: 'shouldAmount',
     fieldProps: {
       align: 'center',
       minWidth: 150,
       showOverflowTooltip: true
     },
     render: (row, value) => {
-      return `${row.checkType === 100 ? value || 0 : 0}`
+      // return `${row.checkType === 100 ? value || 0 : 0}`
+      return value || 0
     }
   },
   {
@@ -347,7 +348,8 @@ const columns = ref<SmartTableColumn[]>([
       showOverflowTooltip: true
     },
     render: (row, value) => {
-      return `${row.checkType !== 100 ? value || 0 : 0}`
+      // return `${row.checkType !== 100 ? value || 0 : 0}`
+      return value || 0
     }
   },
   {
@@ -359,15 +361,8 @@ const columns = ref<SmartTableColumn[]>([
       showOverflowTooltip: true
     },
     render: (row, value) => {
-      return `${value || 0}(${row.checkType === 100 ? '法定' : '服务'})`
-      // return (
-      //   <div class="flex items-center justify-center gap-[8px]">
-      //     <div>{value || 0}</div>
-      //     <el-tag type={row.checkType === 100 ? 'primary' : 'warning'} effect="dark">
-      //       {row.checkType === 100 ? '法定' : '服务'}
-      //     </el-tag>
-      //   </div>
-      // )
+      // return `${value || 0}(${row.checkType === 100 ? '法定' : '服务'})`
+      return value || 0
     }
   },
   {