xuzhancheng 1 月之前
父节点
当前提交
feae36cda3

+ 19 - 0
yudao-ui-admin-vue3/src/views/pressure2/boilerconnectrecordreport/BoilerConnectRecordReportForm.vue

@@ -343,6 +343,25 @@ const handleEditFeeFile = async () => {
     message.error('请先保存项目信息')
     return
   }
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = {
+      ...formData.value,
+      feeTypes: Array.isArray(formData.value.feeTypes) ? formData.value.feeTypes.join(',') : formData.value.feeTypes,
+    } as unknown as BoilerConnectRecordReportVO
+    if (formType.value === 'create') {
+      await BoilerConnectRecordReportApi.createBoilerConnectRecordReport(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await BoilerConnectRecordReportApi.updateBoilerConnectRecordReport(data)
+      message.success(t('common.updateSuccess'))
+    }
+  } finally {
+    formLoading.value = false
+  }
   showFeeCalculator.value = true
   // 等待组件渲染完成后再初始化
   await nextTick()

+ 3 - 4
yudao-ui-admin-vue3/src/views/pressure2/boilerconnectrecordreport/FeeCalculator.vue

@@ -497,10 +497,9 @@ const saveReport = async () => {
         }
       })
       if (result) {
-        let data = {
-          id: currentProjectId.value,
-          feeFileUrl: result
-        }
+        let data = await BoilerConnectRecordReportApi.getBoilerConnectRecordReport(currentProjectId.value)
+        data.feeFileUrl= result
+        data.fee = 0
         await BoilerConnectRecordReportApi.updateBoilerConnectRecordReport(data)
         message.success('保存成功')
         handleBack()

+ 1 - 1
yudao-ui-admin-vue3/src/views/pressure2/schedule/detail.vue

@@ -169,7 +169,7 @@
 
           <!-- 容器相关查询条件 -->
           <div class="">
-            <el-form-item label="容器归类" prop="typeList" class="mb-2">
+            <el-form-item label="锅炉归类" prop="typeList" class="mb-2">
               <div class="flex items-center flex-1">
                 <el-checkbox-group 
                   v-model="equipQueryParams.typeList" 

+ 1 - 1
yudao-ui-admin-vue3/src/views/pressure2/schedule/pipedetail.vue

@@ -169,7 +169,7 @@
 
           <!-- 容器相关查询条件 -->
           <div class="">
-            <el-form-item label="容器归类" prop="typeList" class="mb-2">
+            <el-form-item label="管道归类" prop="typeList" class="mb-2">
               <div class="flex items-center flex-1">
                 <el-checkbox-group 
                   v-model="equipQueryParams.typeList"