档案库

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

@@ -167,14 +167,6 @@
         </el-row>
         <div class="check-info-label-title">检验收费</div>
         <el-row class="form-group" :gutter="24">
-          <el-col :span="24">
-            <!-- 收费性质 feeNature -->
-            <el-form-item label="收费性质" prop="feeNature" v-if="orderDetail?.checkType != 200">
-              <el-radio-group v-model="formData.feeNature">
-                <el-radio v-for="(item, key) in PressureFeeNatureMap" :key="key" :value="key" :label="item"/>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
           <el-col :span="24">
             <!-- 定期检查&超年限检查 -->
             <el-form-item label="检验性质" prop="checkType" label-width="120px" v-if="orderDetail?.checkType">

yudao-ui-admin-vue3/src/views/pressure2/pipeequipment/PipeEquipmentForm.vue

@@ -27,15 +27,15 @@
           <el-form-item label="使用单位地址" prop="unitAddress">
             <el-input v-model="formData.unitAddress" placeholder="请输入使用单位地址" />
           </el-form-item>
+          <el-form-item label="安全管理部门" prop="department">
+            <el-input v-model="formData.department" placeholder="请输入安全管理部门" />
+          </el-form-item>
           <el-form-item label="安全管理人" prop="securityMan">
             <el-input v-model="formData.securityMan" placeholder="请输入安全管理人" />
           </el-form-item>
           <el-form-item label="安全管理人电话" prop="securityManPhone">
             <el-input v-model="formData.securityManPhone" placeholder="请输入安全管理人电话" />
           </el-form-item>
-          <el-form-item label="安全管理部门" prop="securityDept">
-            <el-input v-model="formData.securityDept" placeholder="请输入安全管理部门" />
-          </el-form-item>
           <el-form-item label="约检联系人" prop="contact">
             <el-input v-model="formData.contact" placeholder="请输入约检联系人" />
           </el-form-item>
@@ -146,6 +146,12 @@
           <el-form-item label="管道总长度" prop="pipeLengthTotal">
             <el-input controls-position="right" v-model="formData.pipeLengthTotal" placeholder="请输入总长度" />
           </el-form-item>
+          <el-form-item label="是否存在埋地管道" prop="hasUndergroundPipe">
+            <el-input v-model="hasUndergroundPipeText" placeholder="由子表汇总" disabled />
+          </el-form-item>
+          <el-form-item label="埋地管道总长度" prop="undergroundLengthTotal">
+            <el-input controls-position="right" v-model="undergroundLengthTotal" placeholder="由子表汇总" disabled />
+          </el-form-item>
           <el-form-item label="责任部门" prop="relationDept">
             <DeptSelect
               v-model="formData.relationDept"
@@ -190,9 +196,6 @@
           <el-form-item label="腐蚀裕量" prop="cautery">
             <el-input v-model="formData.cautery" placeholder="请输入腐蚀裕量" />
           </el-form-item>
-          <el-form-item label="安全管理部门" prop="department">
-            <el-input v-model="formData.department" placeholder="请输入安全管理部门" />
-          </el-form-item>
           <el-form-item label="设计日期" prop="designdate">
             <el-date-picker v-model="formData.designdate" type="date" value-format="YYYY-MM-DD" placeholder="请选择设计日期" />
           </el-form-item>
@@ -442,6 +445,9 @@ const pageTitle = ref('')
 const formLoading = ref(false)
 const formRef = ref()
 const formData = ref<EquipPipeVO>({} as EquipPipeVO)
+// 由子表计算的字段
+const hasUndergroundPipeText = ref('否')
+const undergroundLengthTotal = ref(0)
 const pipeEquipmentDetailFormRef = ref()
 const pipeDetailFormRef = ref()
 const historyRef = ref()
@@ -592,6 +598,15 @@ watch(
     // 计算管道总长度
     if (newVal.detailSaveReqVOS){
       formData.value.pipeLengthTotal = formData.value.detailSaveReqVOS.reduce((total, item) => total + item.pipeLength, 0)
+
+    // 计算是否存在埋地管道（任一条为是则为是，全否则为否）
+      undergroundLengthTotal.value = newVal.detailSaveReqVOS.reduce((total, item) => total + (item.undergroundLength || 0), 0)
+    }
+    if (newVal.detailSaveReqVOS && newVal.detailSaveReqVOS.length > 0) {
+      hasUndergroundPipeText.value = newVal.detailSaveReqVOS.some(item => item.isUnderground === true) ? '是' : '否'
+      // 计算埋地管道总长度
+    } else {
+      hasUndergroundPipeText.value = '否'
     }
   },
   { deep: true, immediate: true }
@@ -610,10 +625,6 @@ const handleDetailSuccess = (detail: EquipPipeDetailVO,formType) => {
       // 如果是新增，直接追加
       formData.value.detailSaveReqVOS.push(detail)
   }
-
-  // 计算管道总长度
-  formData.value.pipeLengthTotal = formData.value.detailSaveReqVOS.reduce((total, item) => total + item.pipeLength, 0)
-  // console.log('formData.value.detailRespVOS', formData.value.detailRespVOS)
 }
 
 // 打开管道明细表单