费用修复

yudao-ui-admin-vue3/src/views/pressure2/boilertaskorder/components/AddOrEditCheckItemForEquipment.vue

@@ -76,9 +76,7 @@
                       <span>{{ item.name }}</span>
                     </div>
                     <template
-                      v-if="
-                        true
-                      "
+                      v-if="item.isFee === '1'"
                     >
                       (
                       <el-button link type="primary" @click="() => handleInputCalcField(item)"

yudao-ui-admin-vue3/src/views/pressure2/pipetaskorder/components/calcCheckItemFee.vue

@@ -66,8 +66,7 @@
           {{ isManualInput ? '项目未设置计算规则，请手动填入实际费用' : feeForm.totalCost }}
         </el-form-item>
         <el-form-item label="历史收费：" prop="">
-          <!-- {{ templateInfo.fee || 0 }} -->
-          {{ 0 }}
+           {{ templateInfo.fee || 0 }}
         </el-form-item>
         <el-form-item label="实际费用：" prop="actualFee">
           <el-input-number v-model="feeForm.actualFee" :controls="false" :precision="2" :min="0" :step="0.01" style="width: 220px;"/>
@@ -85,6 +84,7 @@
   </Teleport>
 </template>
 <script setup>
+  import { nextTick } from 'vue'
   import SpreadDesigner from '@/components/SpreadDesigner/index.vue'
   import CustomDialog from '@/components/CustomDialog/index.vue'
   import { PipeTaskOrderApi } from '@/api/pressure2/pipetaskorder'
@@ -145,6 +145,16 @@
     await handleGetPressureReportTemplateInfo()
     // 加载费用计算模板
     await handleRenderFormulaTemplate()
+    // 获取费用计算字段
+    if (props.equipmentId) {
+      await handleQueryCheckItemCalcPreFillField()
+    }
+
+    // 优先从已保存的 feeCalculateJson 中回显实际费用
+    feeForm.value = {
+      actualFee: feeCalculateJson.value['actualFee'] || combineTemplateInfo.value.fee || 0,
+      totalCost: feeCalculateJson.value['totalCost'] || combineTemplateInfo.value.fee || 0
+    }
   }
   
   // 获取费用模板信息
@@ -216,8 +226,6 @@
 
     }
   }
-  props.equipmentId && handleQueryCheckItemCalcPreFillField()
-
   // 自动计算费用
   const handleCalcFee = () => {
     const spread = designer?.getWorkbook()