检验情况告知表&调整

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

@@ -331,7 +331,7 @@ const getTitle = computed(() => {
   switch (props.businessType) {
     case 100:
       return '服务单/受理单'
-    case 200:
+    case 1000:
       return '检验结果告知'
     case 400:
       return '重大问题线索'
@@ -433,7 +433,7 @@ const handleClose = () => {
   serviceOrderDialogVisible.value = false
   serviceOrderDialogFormRef.value?.clearValidate()
 }
-type BusinessType = 100 | 200 | 400
+type BusinessType = 100 | 1000 | 400
 const getSignFilePath = async (type: BusinessType) => {
   const response = await BoilerTaskOrderApi.getTaskOrder(props.taskOrderDetail.id)
   const signFileRespVOList = response.signFileRespVOList || []
@@ -632,8 +632,8 @@ const fetchHisVersionPage = async (bool = false) => {
     handleGetCheckKeyInputs(templateParams.value.dataStr)
   }
   handleGetCheckKeyInputs(templateParams.value.dataStr)
-  // 重大问题线索新增直接打开葡萄城编辑
-  if (props.businessType === 400 && unref(isAddMainquestion) === 'add' && curReportId.value === '') {
+  // 重大问题线索和检验情况告知单新增直接打开葡萄城编辑
+  if ((props.businessType === 400 || props.businessType === 1000) && unref(isAddMainquestion) === 'add' && curReportId.value === '') {
 
     //先生成报表
     const addReportFn = async (paramsData) => {
@@ -657,7 +657,7 @@ const fetchHisVersionPage = async (bool = false) => {
     if (props.businessType === 400) {
       params.orderItemId = props.orderItemId
     }
-    if (props.businessType === 400 && !props.reportId) {
+    if ((props.businessType === 400 || props.businessType === 1000) && !props.reportId) {
       curReportId.value = await addReportFn(params)
     }
 

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

@@ -55,7 +55,7 @@
           <el-button
             type="primary"
             plain
-            @click="() => handleServiceOrder(200)"
+            @click="() => handleInspectionStatusAddReport(1000)"
             :disabled="isTaskCancelled"
           >检验情况告知</el-button
           >
@@ -1826,8 +1826,8 @@ const handleFileUploadSuccess = (fileInfo:{fileName: string, fileUrl: string}) =
 }
 /*****   异常信息 end  *****/
 
-// 获取服务单/受理单模板
-type BusinessType = 100 | 200 | 400
+// 获取服务单/受理单模板 1000-检验情况告知 400-重大问题线索
+type BusinessType = 100 | 1000 | 400
 const handleServiceOrder = (type: BusinessType) => {
   console.log(type)
   if (type == 100){
@@ -2168,6 +2168,44 @@ const handleMainquestionAddReport = async (reportType, type: 'add' | 'edit' | 'v
   handleServiceOrder(400)
 }
 
+/*
+* 添加检验情况告知单
+* */
+const handleInspectionStatusAddReport = async (reportType, type: 'add' | 'edit' | 'view') => {
+
+  if (!reportType) return ElMessage.error('未知的报告类型')
+
+  if (taskOrderDetail.value.notificationformReport != null){
+    isAddMainquestion.value = 'view'
+    mainReportId.value = taskOrderDetail.value.notificationformReport.id
+  }else{
+    isAddMainquestion.value = 'add'
+  }
+
+  // mainOrderItemId.value = row ? row.orderItemId : unref(selectedEquips)[0].mainID
+
+  // 校验审核列表是否已经存在
+  // const existingAudit = supportingDocsAuditDataList.value.find(item => item.reportType === reportType && item.orderItemId === curMainquestionEquipmentRow.value.mainID)
+  // if (existingAudit) {
+  //   ElMessage.error('该设备已存在该类型的报告')
+  //   return
+  // }
+
+  if (isAddMainquestion.value == 'add'){
+    const confirmed = await ElMessageBox.confirm('是否确定添加检验情况告知单？', '添加检验情况告知单提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    }).catch(() => false);
+
+    if (!confirmed) {
+      return;
+    }
+  }
+
+  handleServiceOrder(1000)
+}
+
 const handleSuccessInspectionplan = async (info) => {
   const firstOrderItem = unref(taskOrderDetail).orderItems[0] || {}
   const params: Recordable = {

yudao-ui-admin-vue3/src/views/pressure2/equipmentArchiving/indexPipe.vue

@@ -184,7 +184,7 @@ const columns = ref<SmartTableColumn[]>([
     }
   },
   {
-    label: '设备名称',
+    label: '工程名称',
     prop: 'equipName',
     fieldProps: {
       align: 'center',
@@ -193,12 +193,12 @@ const columns = ref<SmartTableColumn[]>([
     }
   },
   {
-    label: '设备注册代码',
+    label: '工程号',
     prop: 'equipCode',
     search: {
       type: 'input',
       fieldProps: {
-        placeholder: '请输入设备注册代码'
+        placeholder: '请输入工程号'
       },
       sort: 2
     },

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

@@ -284,7 +284,7 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="注册代码" align="center" prop="equipCode" min-width="120px" />
+      <el-table-column label="工程号" align="center" prop="equipCode" min-width="120px" />
       <el-table-column label="检验性质" align="center" prop="checkType" min-width="120px">
         <template #default="scope">
           {{ PressurePipeCheckTypeMap[scope.row.checkType] }}

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

@@ -66,7 +66,7 @@
                 <HighlightText :text="scope.row.orderNo" :keyword="searchKeyword" />
               </template>
             </el-table-column>
-           <el-table-column label="设备注册代码" prop="equipCode" min-width="150px" align="center">
+           <el-table-column label="工程号" prop="equipCode" min-width="150px" align="center">
               <template #default="scope">
                 <HighlightText :text="scope.row.equipCode" :keyword="searchKeyword" />
               </template>
@@ -76,7 +76,7 @@
                 <HighlightText :text="scope.row.useRegisterNo" :keyword="searchKeyword" />
               </template>
             </el-table-column>
-            <el-table-column label="设备名称" prop="equipName" min-width="120px" align="center">
+            <el-table-column label="工程名称" prop="equipName" min-width="120px" align="center">
               <template #default="scope">
                 <HighlightText :text="scope.row.equipName" :keyword="searchKeyword" />
               </template>

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

@@ -102,7 +102,7 @@
             @selection-change="handleSelectionChange"
           >
             <el-table-column type="selection" width="50" />
-            <el-table-column label="设备注册代码" prop="equipCode" min-width="150px" align="center">
+            <el-table-column label="工程号" prop="equipCode" min-width="150px" align="center">
               <template #default="scope">
                 <HighlightText :text="scope.row.equipCode" :keyword="searchKeyword" />
               </template>
@@ -112,7 +112,7 @@
                 <HighlightText :text="scope.row.useRegisterNo" :keyword="searchKeyword" />
               </template>
             </el-table-column>
-            <el-table-column label="设备名称" prop="equipName" min-width="120px" align="center">
+            <el-table-column label="工程名称" prop="equipName" min-width="120px" align="center">
               <template #default="scope">
                 <HighlightText :text="scope.row.equipName" :keyword="searchKeyword" />
               </template>

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

@@ -327,7 +327,7 @@ const getTitle = computed(() => {
   switch (props.businessType) {
     case 100:
       return '服务单/受理单'
-    case 200:
+    case 1000:
       return '检验结果告知'
     case 400:
       return '重大问题线索'
@@ -426,7 +426,7 @@ const handleClose = () => {
   serviceOrderDialogVisible.value = false
   serviceOrderDialogFormRef.value?.clearValidate()
 }
-type BusinessType = 100 | 200 | 400
+type BusinessType = 100 | 1000 | 400
 const getSignFilePath = async (type: BusinessType) => {
   const response = await PipeTaskOrderApi.getTaskOrder(props.taskOrderDetail.id)
   const signFileRespVOList = response.signFileRespVOList || []
@@ -615,7 +615,7 @@ const fetchHisVersionPage = async (bool = false) => {
   }
   handleGetCheckKeyInputs(templateParams.value.dataStr)
   // 重大问题线索新增直接打开葡萄城编辑
-  if (props.businessType === 400 && unref(isAddMainquestion) === 'add' && curReportId.value === '') {
+  if ((props.businessType === 400 || props.businessType === 1000) && unref(isAddMainquestion) === 'add' && curReportId.value === '') {
 
     //先生成报表
     const addReportFn = async (paramsData) => {
@@ -635,7 +635,7 @@ const fetchHisVersionPage = async (bool = false) => {
       businessType: props.businessType,
       modifiedReason: ""
     }
-    if (props.businessType === 400 && !props.reportId) {
+    if ((props.businessType === 400 || props.businessType === 1000) && !props.reportId) {
       curReportId.value = await addReportFn(params)
     }
 

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

@@ -55,7 +55,7 @@
           <el-button
             type="primary"
             plain
-            @click="() => handleServiceOrder(200)"
+            @click="() => handleInspectionStatusAddReport(1000)"
             :disabled="isTaskCancelled"
           >检验情况告知</el-button
           >
@@ -1924,8 +1924,8 @@ const handleFileUploadSuccess = (fileInfo:{fileName: string, fileUrl: string}) =
 }
 /*****   异常信息 end  *****/
 
-// 获取服务单/受理单模板
-type BusinessType = 100 | 200 | 400
+// 获取服务单/受理单模板 1000-检验情况告知 400-重大问题线索
+type BusinessType = 100 | 1000 | 400
 const handleServiceOrder = (type: BusinessType) => {
   console.log(type)
   if (type == 100){
@@ -2238,6 +2238,44 @@ const handleMainquestionAddReport = async (reportType, type: 'add' | 'edit' | 'v
   handleServiceOrder(400)
 }
 
+/*
+* 添加检验情况告知单
+* */
+const handleInspectionStatusAddReport = async (reportType, type: 'add' | 'edit' | 'view') => {
+
+  if (!reportType) return ElMessage.error('未知的报告类型')
+
+  if (taskOrderDetail.value.notificationformReport != null){
+    isAddMainquestion.value = 'view'
+    mainReportId.value = taskOrderDetail.value.notificationformReport.id
+  }else{
+    isAddMainquestion.value = 'add'
+  }
+
+  // mainOrderItemId.value = row ? row.orderItemId : unref(selectedEquips)[0].mainID
+
+  // 校验审核列表是否已经存在
+  // const existingAudit = supportingDocsAuditDataList.value.find(item => item.reportType === reportType && item.orderItemId === curMainquestionEquipmentRow.value.mainID)
+  // if (existingAudit) {
+  //   ElMessage.error('该设备已存在该类型的报告')
+  //   return
+  // }
+
+  if (isAddMainquestion.value == 'add'){
+    const confirmed = await ElMessageBox.confirm('是否确定添加检验情况告知单？', '添加检验情况告知单提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    }).catch(() => false);
+
+    if (!confirmed) {
+      return;
+    }
+  }
+
+  handleServiceOrder(1000)
+}
+
 const handleSuccessInspectionplan = async (info) => {
   const firstOrderItem = unref(taskOrderDetail).orderItems[0] || {}
   const params: Recordable = {

yudao-ui-admin-vue3/src/views/pressure2/reportArchivingPipe/index.vue

@@ -182,7 +182,7 @@ const columns = ref<SmartTableColumn[]>([
     }
   },
   {
-    label: '设备名称',
+    label: '工程名称',
     prop: 'equipName',
     fieldProps: {
       align: 'center',
@@ -191,12 +191,12 @@ const columns = ref<SmartTableColumn[]>([
     }
   },
   {
-    label: '设备注册代码',
+    label: '工程号',
     prop: 'equipCode',
     search: {
       type: 'input',
       fieldProps: {
-        placeholder: '请输入设备注册代码'
+        placeholder: '请输入工程号'
       },
       sort: 2
     },

yudao-ui-admin-vue3/src/views/pressure2/unqualifiedRecord/indexPipe.vue

@@ -26,10 +26,10 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="设备注册代码" prop="equipCode">
+      <el-form-item label="工程号" prop="equipCode">
         <el-input
           v-model="queryParams.equipCode"
-          placeholder="请输入设备注册代码"
+          placeholder="请输入工程号"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
@@ -90,7 +90,7 @@
     <el-table v-loading="loading" :data="list" :stripe="true">
       <el-table-column label="任务单号" align="center" prop="orderNo" min-width="150px" />
       <el-table-column label="主报告编号" align="center" prop="mainReportNo" min-width="150px" />
-      <el-table-column label="设备注册代码" align="center" prop="equipCode" min-width="150px" />
+      <el-table-column label="工程号" align="center" prop="equipCode" min-width="150px" />
       <el-table-column label="使用单位" align="center" prop="unitName" min-width="150px" />
       <el-table-column label="检验性质" align="center" prop="checkType" min-width="120px">
         <template #default="scope">