2 次代码提交 1bd59d64eb ... 2127d9881d

作者 SHA1 备注 提交日期
  xuzhancheng 2127d9881d Merge branch 'stable' of http://39.98.153.250:9080/yudao/yudao-admin-yiqun into stable 1 周之前
  xuzhancheng e7b9f1efcc 增加费用字段 1 周之前

+ 10 - 1
yudao-ui-admin-vue3/src/views/pressure2/boilertaskorder/components/TaskOrderDetailDialog.vue

@@ -107,7 +107,16 @@
             {{ PressureFeeTypeMap[taskOrderDetail.feeType] || '-' }}
           </el-descriptions-item>
           <el-descriptions-item label="收费金额">
-            {{ taskOrderDetail.payAmount || '-'  }}
+            {{ taskOrderDetail.payAmount || 0 }}
+          </el-descriptions-item>
+          <el-descriptions-item label="应收法定金额">
+           {{ taskOrderDetail.shouldAmount || 0 }}
+          </el-descriptions-item>
+          <el-descriptions-item label="服务收费金额">
+            {{ taskOrderDetail.serviceAmount || 0 }}
+          </el-descriptions-item>
+          <el-descriptions-item label="免征费用">
+            {{ taskOrderDetail.reduceFee || 0 }}
           </el-descriptions-item>
           <el-descriptions-item label="是否已交费">
             {{ taskOrderDetail.isPay === 1?'是':'否' }}

+ 12 - 0
yudao-ui-admin-vue3/src/views/pressure2/pipetaskorder/components/TaskOrderDetailDialog.vue

@@ -106,8 +106,20 @@
           <el-descriptions-item label="收费形式">
             {{ PressureFeeTypeMap[taskOrderDetail.feeType] || '-' }}
           </el-descriptions-item>
+          <!-- <el-descriptions-item label="收费金额">
+            {{ taskOrderDetail.payAmount || '-'  }}
+          </el-descriptions-item> -->
           <el-descriptions-item label="收费金额">
             {{ taskOrderDetail.payAmount || '-'  }}
+          </el-descriptions-item> 
+          <el-descriptions-item label="应收法定金额">
+           {{ taskOrderDetail.shouldAmount || 0 }}
+          </el-descriptions-item>
+          <el-descriptions-item label="服务收费金额">
+            {{ taskOrderDetail.serviceAmount || 0 }}
+          </el-descriptions-item>
+          <el-descriptions-item label="免征费用">
+            {{ taskOrderDetail.reduceFee || 0 }}
           </el-descriptions-item>
 <!--          <el-descriptions-item label="是否已交费">-->
 <!--            {{ taskOrderDetail.isPay === 1?'是':'否' }}-->