Преглед на файлове

fix(boilertaskorder): 修复任务订单详情对话框显示问题

- 将总金额字段从 payAmount 更改为 totalAmount
- 添加结算金额字段显示
- 扩展结算状态选项,支持部分结算状态
- 在管道任务订单中同步相同的修复更改
xuzhancheng преди 3 дни
родител
ревизия
aa3b467867

+ 5 - 2
yudao-ui-admin-vue3/src/views/pressure2/boilertaskorder/components/TaskOrderDetailDialog.vue

@@ -107,7 +107,7 @@
             {{ PressureFeeTypeMap[taskOrderDetail.feeType] || '-' }}
           </el-descriptions-item>
           <el-descriptions-item label="总金额">
-            {{ taskOrderDetail.payAmount || 0 }}
+            {{ taskOrderDetail.totalAmount || 0 }}
           </el-descriptions-item>
           <el-descriptions-item label="减免比例">
             {{ taskOrderDetail.reductionRadio ? Big(taskOrderDetail.reductionRadio).times(100).toString() : 0}}%
@@ -125,7 +125,10 @@
             {{ taskOrderDetail.reduceFee || 0 }}
           </el-descriptions-item>
           <el-descriptions-item label="结算状态">
-            {{ taskOrderDetail.paymentStatus === 1?'已结算':'未结算' }}
+            {{ taskOrderDetail.paymentStatus === 1 ? '已结算' : taskOrderDetail.paymentStatus === 2 ? '部分结算' : '未结算' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="结算金额">
+            {{ taskOrderDetail.payAmount || 0}}
           </el-descriptions-item>
           <el-descriptions-item label="非税状态">
             {{ taskOrderDetail.isPay === 1?'已缴费':'未缴费' }}

+ 5 - 2
yudao-ui-admin-vue3/src/views/pressure2/pipetaskorder/components/TaskOrderDetailDialog.vue

@@ -107,7 +107,10 @@
             {{ PressureFeeTypeMap[taskOrderDetail.feeType] || '-' }}
           </el-descriptions-item>
           <el-descriptions-item label="总金额">
-            {{ taskOrderDetail.payAmount || 0 }}
+            {{ taskOrderDetail.totalAmount || 0 }}
+          </el-descriptions-item>
+          <el-descriptions-item label="结算金额">
+            {{ taskOrderDetail.payAmount || 0}}
           </el-descriptions-item>
           <el-descriptions-item label="减免比例">
             {{ taskOrderDetail.reductionRadio ? Big(taskOrderDetail.reductionRadio).times(100).toString() : 0}}%
@@ -125,7 +128,7 @@
             {{ taskOrderDetail.reduceFee || 0 }}
           </el-descriptions-item>
           <el-descriptions-item label="结算状态">
-            {{ taskOrderDetail.paymentStatus === 1?'已结算':'未结算' }}
+            {{ taskOrderDetail.paymentStatus === 1 ? '已结算' : taskOrderDetail.paymentStatus === 2 ? '部分结算' : '未结算' }}
           </el-descriptions-item>
           <el-descriptions-item label="非税状态">
             {{ taskOrderDetail.isPay === 1?'已缴费':'未缴费' }}