Merge remote-tracking branch 'origin/stable' into stable

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

@@ -111,7 +111,7 @@ const open = (params: Record<string, any>, titleText: string) => {
   title.value = titleText
   options.value = params.options || []
   const firstOptionValue = options.value[0]?.value
-  const reportName = options.value[0]?.label
+  const reportName = options.value[0]?.reportName
   formData.value = {
     ...params.formData,
     templateId: firstOptionValue,

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

@@ -14,13 +14,14 @@
     v-loading="pdfLoading"
   >
     <div class="designer-inner" ref="wrapperContainerRef">
-      <SpreadViewer :initData="initData" ref="spreadRef" />
+<!--      <SpreadViewer :initData="initData" ref="spreadRef" />-->
+      <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord"/>
     </div>
     <div class="operation-inner relative">
       <div class="btn-list">
         <template v-if="['add', 'edit'].includes(isEdit)">
           <el-button type="primary" @click="handleSubmitBefore">提交审核</el-button>
-          <el-button type="primary" plain @click="handleEditSpreadRecord">编辑封面</el-button>
+<!--          <el-button type="primary" plain @click="handleEditSpreadRecord">编辑封面</el-button>-->
         </template>
         <el-button type="default" plain @click="handleCloseModal">取 消</el-button>
       </div>
@@ -67,7 +68,7 @@
 
   <!-- 检验录入-模板 -->
   <CustomDialog v-model="showInlineEditRecord" title="检验录入" :show-footer="false" fullscreen>
-    <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord"/>
+<!--    <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord"/>-->
   </CustomDialog>
 
   <CustomDialog
@@ -314,7 +315,16 @@ const handleSubmitConfirm = () => {
   // }
   fileList.value[0]?.url ? handleSubmitOperationReport(fileList.value[0].url) : uploadRef.value.submit()
 }
-const handleSubmitBefore = () => {
+const handleSubmitBefore = async () => {
+
+  try {
+    await editSpreadRecordRef.value?.handleSave()
+  } catch (error) {
+    console.error('保存数据失败:', error)
+    ElMessage.error('保存数据失败，请重试')
+    return
+  }
+
   // console.log(props.editInspectionplanParams, 'props.editInspectionplanParams')
   // if (props.isEdit === 'add' && !fileList.value.length) return ElMessage.error('请先上传方案文件')
   if (!fileList.value.length) return ElMessage.error('请先上传方案文件')
@@ -390,7 +400,8 @@ onMounted(()=>{
   handleWindowResize()
   // console.log('wrapperContainerHeight.value ', wrapperContainerHeight.value)
   window.addEventListener('resize', handleWindowResize)
-  initPreview()
+  // initPreview()
+  editPreview()
 })
 onUnmounted(() => {
   window.removeEventListener('resize', handleWindowResize)

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

@@ -7,7 +7,8 @@
     v-loading="pageLoading"
   >
     <div class="designer-inner">
-      <SpreadViewer :initData="initData" ref="spreadRef" />
+<!--      <SpreadViewer :initData="initData" ref="spreadRef" />-->
+      <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord"/>
     </div>
     <div class="operation-inner">
       <div class="btn-list">
@@ -26,7 +27,7 @@
             </el-dropdown-menu>
           </template>
         </el-dropdown>
-        <el-button plain @click="handleUpdate">更新</el-button>
+<!--        <el-button plain @click="handleUpdate">更新</el-button>-->
         <el-button plain @click="handleCloseModal">取 消</el-button>
       </div>
       <div class="version-box" v-if="currentVersionNo">当前展示版本是：{{ currentVersionNo }}</div>
@@ -75,7 +76,7 @@
 
   <!-- 检验录入-模板 -->
   <CustomDialog v-model="showSpreadDesigner" title="检验录入" :show-footer="false" fullscreen>
-    <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord"/>
+<!--    <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord"/>-->
   </CustomDialog>
 
   <!-- 服务单/受理单 弹窗 -->
@@ -199,7 +200,8 @@ const handleGetTemplate = async () => {
         //handleClose(checkId)
         curCheckId.value = checkId;
         //showSpreadDesigner.value = true;
-        initPreview()
+        // initPreview()
+        editPreview()
       })
       .finally(() => {
 
@@ -428,7 +430,8 @@ const saveSuccessRecord = async (data)=>{
   //   prepareJson: dataJson,
   // })
   await handleRefresh()
-  initPreview()
+  // initPreview()
+  editPreview()
   showSpreadDesigner.value = false
 }
 const editPreview=()=>{
@@ -458,7 +461,8 @@ const initPreview=()=>{
 
 onMounted(async () => {
   await handleRefresh()
-  initPreview()
+  // initPreview()
+  editPreview()
 })
 </script>
 

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

@@ -10,7 +10,9 @@
   <section v-loading="pageLoading">
     <ContentWrap :title="getTitle" class="check-record-wrapper">
       <div class="designer-inner">
-        <SpreadViewer :initData="initData" ref="spreadRef" />
+<!--        <SpreadViewer :initData="initData" ref="spreadRef" />-->
+        <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord"/>
+
       </div>
       <div class="operation-inner">
         <div class="btn-list">
@@ -42,14 +44,14 @@
             </template>
           </el-dropdown>
           <el-button v-if="props.businessType === 400 ? isAddMainquestion !== 'view' : true" type="warning" plain @click="getSchemeReviewerList">提交审核</el-button>
-          <el-button
-            v-if="props.businessType === 400 ? isAddMainquestion !== 'view' : true"
-            :disabled="wxPushDisabled"
-            type="default"
-            plain
-            @click="handleUpdate"
-            >更新</el-button
-          >
+<!--          <el-button-->
+<!--            v-if="props.businessType === 400 ? isAddMainquestion !== 'view' : true"-->
+<!--            :disabled="wxPushDisabled"-->
+<!--            type="default"-->
+<!--            plain-->
+<!--            @click="handleUpdate"-->
+<!--            >更新</el-button-->
+<!--          >-->
           <el-button type="default" plain @click="handleCloseModal">取 消</el-button>
         </div>
         <div class="version-box" v-if="currentVersionNo !== null">
@@ -99,7 +101,7 @@
 
   <!-- 检验录入-模板 -->
   <CustomDialog v-model="showInlineEditRecord" title="检验录入" :show-footer="false" fullscreen>
-    <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord" @close="showInlineEditRecord = false"/>
+<!--    <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord" @close="showInlineEditRecord = false"/>-->
   </CustomDialog>
 
   <!-- 查看版本详情的弹窗 -->
@@ -294,6 +296,15 @@ const handleSubmitUser = () => {
 }
 const getSchemeReviewerList = async () => {
   try {
+
+    try {
+      await editSpreadRecordRef.value?.handleSave()
+    } catch (error) {
+      console.error('保存数据失败:', error)
+      ElMessage.error('保存数据失败，请重试')
+      return
+    }
+
     const { inspectionAuditId, inspectionApproveId } = await UserApi.getApprovalDetail({})
     formData.value = {
       inspectionAuditId,
@@ -521,7 +532,8 @@ const handleRefresh = async () => {
   await handleGetTemplate()
   historyVersionParams.value.pageNo = 1
   await fetchHisVersionPage(true)
-  initPreview()
+  // initPreview()
+  editPreview()
 }
 
 // 历史记录版本查询参数

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

@@ -1990,10 +1990,15 @@ const handleAddInspectionplanReport = async () => {
     const params = { type: '6',reportType : 600 }
     const response = await getPressureReportTemplateListNoLimit({...params, pageNo: 1, pageSize: 100, status: 200})
     options.value = response?.data?.list || response?.list || response || []
+
+    const equipType = taskOrderDetail.value.orderItems[0]?.typeName;
+    const checkType = PressureBoilerCheckTypeMap[taskOrderDetail.value?.checkType] || '-'
+
     const newParams = {
       options: options.value.map(item => ({
         ...item,
         label: item.tbName,
+        reportName: equipType + checkType + "-" + item.tbName,
         value: item.id
       })),
       formData: {

yudao-ui-admin-vue3/src/views/pressure2/pipechecker/components/InspectionItemList.vue

@@ -78,6 +78,7 @@
                   <span v-else>{{ item.checkUsers.length ? item.checkUsers[0]?.nickname : '' }}</span>
                   <el-icon v-if="item?.recheckStatus === 300"
                            class="warning-icon"
+                           style="{ color: red }"
                   >
                     <Warning />
                   </el-icon>
@@ -908,17 +909,6 @@ const isDisabledBtn = (item) => {
                 // align-items: center;
               }
 
-              .warning-icon {
-                color: lightcoral;
-                display: inline-flex;
-                align-items: flex-end;
-                vertical-align: baseline;
-                margin-left: 4px;
-                font-size: 16px;
-                line-height: 1;
-                transform: translateY(3px);
-              }
-
               .el-button {
                 padding: 0 4px;
                 height: auto;
@@ -1050,4 +1040,11 @@ const isDisabledBtn = (item) => {
   background-color: #e4e7ed;
   margin: 6px 0;
 }
+
+.warning-icon {
+  display: inline-block;
+  vertical-align: middle;
+  margin-left: 4px;
+  font-size: 16px;
+}
 </style>

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

@@ -111,7 +111,7 @@ const open = (params: Record<string, any>, titleText: string) => {
   title.value = titleText
   options.value = params.options || []
   const firstOptionValue = options.value[0]?.value
-  const reportName = options.value[0]?.label
+  const reportName = options.value[0]?.reportName
   formData.value = {
     ...params.formData,
     templateId: firstOptionValue,

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

@@ -14,13 +14,14 @@
     v-loading="pdfLoading"
   >
     <div class="designer-inner" ref="wrapperContainerRef">
-      <SpreadViewer :initData="initData" ref="spreadRef" />
+<!--      <SpreadViewer :initData="initData" ref="spreadRef" />-->
+      <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord"/>
     </div>
     <div class="operation-inner relative">
       <div class="btn-list">
         <template v-if="['add', 'edit'].includes(isEdit)">
           <el-button type="primary" @click="handleSubmitBefore">提交审核</el-button>
-          <el-button type="primary" plain @click="handleEditSpreadRecord">编辑封面</el-button>
+<!--          <el-button type="primary" plain @click="handleEditSpreadRecord">编辑封面</el-button>-->
         </template>
         <el-button type="default" plain @click="handleCloseModal">取 消</el-button>
       </div>
@@ -67,9 +68,9 @@
 
   <!-- 检验录入-模板 -->
   <CustomDialog v-model="showInlineEditRecord" title="检验录入" :show-footer="false" fullscreen>
-    <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord" @close="()=>{
-      showInlineEditRecord = false
-    }"/>
+<!--    <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord" @close="()=>{-->
+<!--      showInlineEditRecord = false-->
+<!--    }"/>-->
   </CustomDialog>
 
   <CustomDialog
@@ -325,7 +326,16 @@ const handleSubmitConfirm = () => {
   // }
   fileList.value[0]?.url ? handleSubmitOperationReport(fileList.value[0].url) : uploadRef.value.submit()
 }
-const handleSubmitBefore = () => {
+const handleSubmitBefore = async () => {
+
+  try {
+    await editSpreadRecordRef.value?.handleSave()
+  } catch (error) {
+    console.error('保存数据失败:', error)
+    ElMessage.error('保存数据失败，请重试')
+    return
+  }
+
   // console.log(props.editInspectionplanParams, 'props.editInspectionplanParams')
   // if (props.isEdit === 'add' && !fileList.value.length) return ElMessage.error('请先上传方案文件')
   if (!fileList.value.length) return ElMessage.error('请先上传方案文件')
@@ -398,7 +408,8 @@ onMounted(()=>{
   handleWindowResize()
   // console.log('wrapperContainerHeight.value ', wrapperContainerHeight.value)
   window.addEventListener('resize', handleWindowResize)
-  initPreview()
+  // initPreview()
+  editPreview()
 })
 onUnmounted(() => {
   window.removeEventListener('resize', handleWindowResize)

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

@@ -7,7 +7,8 @@
     v-loading="pageLoading"
   >
     <div class="designer-inner">
-      <SpreadViewer :initData="initData" ref="spreadRef" />
+<!--      <SpreadViewer :initData="initData" ref="spreadRef" />-->
+      <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord"/>
     </div>
     <div class="operation-inner">
       <div class="btn-list">
@@ -26,7 +27,7 @@
             </el-dropdown-menu>
           </template>
         </el-dropdown>
-        <el-button plain @click="handleUpdate">更新</el-button>
+<!--        <el-button plain @click="handleUpdate">更新</el-button>-->
         <el-button plain @click="handleCloseModal">取 消</el-button>
       </div>
       <div class="version-box" v-if="currentVersionNo">当前展示版本是：{{ currentVersionNo }}</div>
@@ -75,7 +76,7 @@
 
   <!-- 检验录入-模板 -->
   <CustomDialog v-model="showSpreadDesigner" title="检验录入" :show-footer="false" fullscreen>
-    <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord"/>
+<!--    <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord"/>-->
   </CustomDialog>
 
   <!-- 服务单/受理单 弹窗 -->
@@ -197,7 +198,8 @@ const handleGetTemplate = async () => {
         //handleClose(checkId)
         curCheckId.value = checkId;
         //showSpreadDesigner.value = true;
-        initPreview()
+        // initPreview()
+        editPreview()
       })
       .finally(() => {
 
@@ -418,7 +420,8 @@ const saveSuccessRecord = async (data)=>{
   //   prepareJson: dataJson,
   // })
   await handleRefresh()
-  initPreview()
+  // initPreview()
+  editPreview()
   showSpreadDesigner.value = false
 }
 const editPreview=()=>{
@@ -448,7 +451,8 @@ const initPreview=()=>{
 
 onMounted(async () => {
   await handleRefresh()
-  initPreview()
+  // initPreview()
+  editPreview()
 })
 </script>
 

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

@@ -10,7 +10,8 @@
   <section v-loading="pageLoading">
     <ContentWrap :title="getTitle" class="check-record-wrapper">
       <div class="designer-inner">
-        <SpreadViewer :initData="initData" ref="spreadRef" />
+<!--        <SpreadViewer :initData="initData" ref="spreadRef" />-->
+        <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord"/>
       </div>
       <div class="operation-inner">
         <div class="btn-list">
@@ -42,14 +43,14 @@
             </template>
           </el-dropdown>
           <el-button v-if="props.businessType === 400 ? isAddMainquestion !== 'view' : true" type="warning" plain @click="getSchemeReviewerList">提交审核</el-button>
-          <el-button
-            v-if="props.businessType === 400 ? isAddMainquestion !== 'view' : true"
-            :disabled="wxPushDisabled"
-            type="default"
-            plain
-            @click="handleUpdate"
-            >更新</el-button
-          >
+<!--          <el-button-->
+<!--            v-if="props.businessType === 400 ? isAddMainquestion !== 'view' : true"-->
+<!--            :disabled="wxPushDisabled"-->
+<!--            type="default"-->
+<!--            plain-->
+<!--            @click="handleUpdate"-->
+<!--            >更新</el-button-->
+<!--          >-->
           <el-button type="default" plain @click="handleCloseModal">取 消</el-button>
         </div>
         <div class="version-box" v-if="currentVersionNo !== null">
@@ -99,7 +100,7 @@
 
   <!-- 检验录入-模板 -->
   <CustomDialog v-model="showInlineEditRecord" title="检验录入" :show-footer="false" fullscreen>
-    <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord" @close="showInlineEditRecord = false"/>
+<!--    <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord" @close="showInlineEditRecord = false"/>-->
   </CustomDialog>
 
   <!-- 查看版本详情的弹窗 -->
@@ -290,6 +291,15 @@ const handleSubmitUser = () => {
 }
 const getSchemeReviewerList = async () => {
   try {
+
+    try {
+      await editSpreadRecordRef.value?.handleSave()
+    } catch (error) {
+      console.error('保存数据失败:', error)
+      ElMessage.error('保存数据失败，请重试')
+      return
+    }
+
     const { inspectionAuditId, inspectionApproveId } = await UserApi.getApprovalDetail({})
     formData.value = {
       inspectionAuditId,
@@ -506,7 +516,8 @@ const handleRefresh = async () => {
   await handleGetTemplate()
   historyVersionParams.value.pageNo = 1
   await fetchHisVersionPage(true)
-  initPreview()
+  // initPreview()
+  editPreview()
 }
 
 // 历史记录版本查询参数

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

@@ -951,7 +951,8 @@ import {
   PressureReportType,
   PressureReportTypeMap,
   PressureTaskOrderStatus,
-  PressureTaskOrderStatusMap, PressureCheckerMyTaskStatusMap, PressureTaskOrderTaskStatusMap
+  PressureTaskOrderStatusMap, PressureCheckerMyTaskStatusMap, PressureTaskOrderTaskStatusMap,
+  PressureBoilerCheckTypeMap
 } from '@/utils/constants'
 import { formatArrayDate } from '@/utils/formatTime'
 import {
@@ -2042,10 +2043,15 @@ const handleAddInspectionplanReport = async () => {
     const params = { type: '6',reportType : 600 }
     const response = await getPressureReportTemplateListNoLimit({...params, pageNo: 1, pageSize: 100, status: 200})
     options.value = response?.data?.list || response?.list || response || []
+
+    const equipType = taskOrderDetail.value.orderItems[0]?.pipeCategoryName;
+    const checkType = PressureBoilerCheckTypeMap[taskOrderDetail.value?.checkType] || '-'
+
     const newParams = {
       options: options.value.map(item => ({
         ...item,
         label: item.tbName,
+        reportName: equipType + checkType + "-" + item.tbName,
         value: item.id
       })),
       formData: {