Pārlūkot izejas kodu

fix(task): 优化审核流程并改进全屏按钮样式

- 移除原有的审批信息获取逻辑,直接使用默认审核人ID
- 添加提交审核确认弹窗,避免误操作
- 调用新的提交审核API接口处理审核流程
- 将全屏按钮改为图标按钮,使用radix-icons图标
- 移除全屏按钮的文字显示,保留返回按钮功能
- 统一锅炉和管道检验任务详情页的全屏按钮修改
xuzhancheng 1 dienu atpakaļ
vecāks
revīzija
b8584e756a

+ 20 - 8
yudao-ui-admin-vue3/src/views/pressure2/boilerchecker/components/StatusOperationPanel.vue

@@ -1857,15 +1857,27 @@ const handleSubmitAudit = async () => {
     approvalUserVisible.value = true
 
   } else {
-    let res = await UserApi.getApprovalDetail({}) // 判断是否有审批信息
+    // 确定审核人:使用当前用户,否则使用默认审核人
+    // const approveId = userStore.user.id
+    const approveId = 'b5369aeb73954430eef53a9c8b7586ee'
 
-    if (res && res.approveUser) {
-      form.value.recheckUser = res.approveUser
-    }
-    
-    schemaFlag.value = 'audit'
-    isShowAuditDialog.value = true
-    // isShowReportAuditDialog.value = true
+    ElMessageBox.confirm('确定提交审核吗?', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    }).then(async () => {
+      const submitResult = await BoilerTaskOrderApi.submitReportAudit({
+        id: templateParams.value?.id,
+        approveId
+      })
+      if (submitResult) {
+        ElMessage.success('提交审核成功!')
+        selectNextItem([props.selectedItem])
+        emit('template-confirm')
+      }
+    }).catch(() => {
+      console.log('用户取消提交审核')
+    })
   }
 }
 

+ 13 - 4
yudao-ui-admin-vue3/src/views/pressure2/boilerchecker/taskDetail.vue

@@ -13,10 +13,19 @@
       </div>
       <el-divider direction="vertical" class="mx-10px" />
       <div id="teleport-btn" ref="teleportBtnRef" class="teleport-btn"></div>
-      <el-button class="ml-10px" type="primary" size="small" plain @click="handleToggleFullscreen">
-        {{ isFullscreen ? '退出全屏' : '全屏' }}
-      </el-button>
-      <div class="detail-header-back"><el-button type="default" plain @click="() => handleBack()">返回</el-button></div>
+<!--      <el-button class="ml-10px" type="primary" size="small" plain @click="handleToggleFullscreen">-->
+<!--        {{ isFullscreen ? '退出全屏' : '全屏' }}-->
+<!--      </el-button>-->
+      <div class="detail-header-back">
+        <el-button circle type="default" plain @click="handleToggleFullscreen">
+          <Icon
+            :icon="isFullScreen ? 'radix-icons:exit-full-screen' : 'radix-icons:enter-full-screen'"
+            color="var(--el-color-info)"
+            hover-color="var(--el-color-primary)"
+          />
+        </el-button>
+        <el-button type="default" plain @click="() => handleBack()">返回</el-button>
+      </div>
     </div>
     <div class="task-detail-container flex">
       <!-- 左侧:检验项目列表 -->

+ 21 - 8
yudao-ui-admin-vue3/src/views/pressure2/pipechecker/components/StatusOperationPanel.vue

@@ -1826,15 +1826,28 @@ const handleSubmitAudit = async () => {
     approvalUserVisible.value = true
 
   }  else {
-    let res = await UserApi.getApprovalDetail({}) // 判断是否有审批信息
 
-    if (res && res.approveUser) {
-      form.value.recheckUser = res.approveUser
-    }
-    
-    schemaFlag.value = 'audit'
-    isShowAuditDialog.value = true
-    // isShowReportAuditDialog.value = true
+    // 确定审核人:使用当前用户,否则使用默认审核人
+    // const approveId = userStore.user.id
+    const approveId = 'b5369aeb73954430eef53a9c8b7586ee'
+
+    ElMessageBox.confirm('确定提交审核吗?', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    }).then(async () => {
+      const submitResult = await PipeTaskOrderApi.submitReportAudit({
+        id: templateParams.value?.id,
+        approveId
+      })
+      if (submitResult) {
+        ElMessage.success('提交审核成功!')
+        selectNextItem([props.selectedItem])
+        emit('template-confirm')
+      }
+    }).catch(() => {
+      console.log('用户取消提交审核')
+    })
   }
 }
 

+ 11 - 3
yudao-ui-admin-vue3/src/views/pressure2/pipechecker/taskDetail.vue

@@ -11,10 +11,18 @@
       </div>
       <el-divider direction="vertical" class="mx-10px" />
       <div id="teleport-btn" ref="teleportBtnRef" class="teleport-btn"></div>
-      <el-button class="ml-10px" type="primary" size="small" plain @click="handleToggleFullscreen">
-        {{ isFullscreen ? '退出全屏' : '全屏' }}
+<!--      <el-button class="ml-10px" type="primary" size="small" plain @click="handleToggleFullscreen">-->
+<!--        {{ isFullscreen ? '退出全屏' : '全屏' }}-->
+<!--      </el-button>-->
+      <div class="detail-header-back">
+        <el-button circle type="default" plain @click="handleToggleFullscreen">
+        <Icon
+          :icon="isFullScreen ? 'radix-icons:exit-full-screen' : 'radix-icons:enter-full-screen'"
+          color="var(--el-color-info)"
+          hover-color="var(--el-color-primary)"
+        />
       </el-button>
-      <div class="detail-header-back"><el-button type="default" plain @click="() => handleBack()">返回</el-button></div>
+        <el-button type="default" plain @click="() => handleBack()">返回</el-button></div>
     </div>
     <div class="task-detail-container flex">
       <!-- 左侧:检验项目列表 -->