feat(pressure): 更新压力设备管理功能

- 注释掉容器设备类型常量定义
- 修正压力设备类型映射中的标签显示
- 在任务订单表格中新增设备类型列
- 更新检验性质显示逻辑以支持不同设备类型的检查类型映射
- 添加锅炉和管道任务订单视图的路由跳转日志
- 修复状态操作面板中OA审核权限计算的字段缺失问题

yudao-ui-admin-vue3/src/utils/constants.ts

@@ -649,23 +649,23 @@ export const allCheckTypeMap = {
 
 // 设备类型
 export const PressureEquipType = {
-  CONTAINER: 100,
+  // CONTAINER: 100,
   PIPE: 200,
   BOILER: 300
 }
 export const PressureEquipTypeMap = {
-  [PressureEquipType.CONTAINER]: '容器',
+  // [PressureEquipType.CONTAINER]: '容器',
   [PressureEquipType.PIPE]: '管道',
-  [PressureEquipType.BOILER]: '压力容器'
+  [PressureEquipType.BOILER]: '压力管道'
 }
 
 export const PressureEquipMainType = {
-  CONTAINER: 100,
+  // CONTAINER: 100,
   BOILER: 200,
   PIPE: 300
 }
 export const PressureEquipMainTypeMap = {
-  [PressureEquipMainType.CONTAINER]: '容器',
+  // [PressureEquipMainType.CONTAINER]: '容器',
   [PressureEquipMainType.BOILER]: '锅炉',
   [PressureEquipMainType.PIPE]: '管道'
 }

yudao-ui-admin-vue3/src/views/pressure/taskorder/index.vue

@@ -199,9 +199,15 @@
             <div style="color: #015293; cursor: pointer; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;" @click="handleUnitCodeFn(row.unitCode)">{{row.unitName}}</div>
           </template>
       </el-table-column>
+      <el-table-column label="设备类型" align="center" prop="equipMainType" min-width="120px">
+        <template #default="scope">
+          {{ PressureEquipMainTypeMap[scope.row.equipMainType] }}
+        </template>
+      </el-table-column>
       <el-table-column label="检验性质" align="center" prop="checkType" min-width="120px">
         <template #default="scope">
-          {{ PressureCheckTypeMap[scope.row.checkType] }}
+          <!-- {{ PressureCheckTypeMap[scope.row.checkType] }} -->
+          {{ allCheckTypeMap[scope.row.equipMainType][scope.row.checkType] }}
         </template>
       </el-table-column>
       <el-table-column label="任务单状态" align="center" prop="taskStatus" min-width="150px">
@@ -549,6 +555,7 @@ const handleEdit = (row) => {
   console.log(row)
   switch (row.equipMainType){
       case 200:
+        console.log('BoilerTaskOrderView')
         router.push({
           name: 'BoilerTaskOrderView',
           query: {
@@ -557,6 +564,7 @@ const handleEdit = (row) => {
         })
         break;
       case 300:
+        console.log('PipeTaskOrderView')
         router.push({
           name: 'PipeTaskOrderView',
           query: {
@@ -566,6 +574,7 @@ const handleEdit = (row) => {
         break
       case 100:
       default:
+        console.log('TaskOrderView')
         router.push({
           name: 'TaskOrderView',
           query: {

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

@@ -1585,7 +1585,7 @@ const oaSummaryList = ref([])
 const isCanOAAudit = computed(() => {
   if (!props.selectedItem) return false
   // const { taskStatus, summaryId, approvalId, ratifyId } = props.selectedItem
-  const {summaryId} = props.selectedItem
+  const {summaryId,taskStatus} = props.selectedItem
   // const currentUserId = userStore?.user?.id
 
   // 审核阶段：只有审核人才能点击

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

@@ -1557,7 +1557,7 @@ const oaSummaryList = ref([])
 const isCanOAAudit = computed(() => {
   if (!props.selectedItem) return false
   // const { taskStatus, summaryId, approvalId, ratifyId } = props.selectedItem
-  const {summaryId} = props.selectedItem
+  const {summaryId,taskStatus} = props.selectedItem
   // const currentUserId = userStore?.user?.id
 
   // 审核阶段：只有审核人才能点击