Merge branch 'stable' of http://39.98.153.250:9080/yudao/yudao-admin-yiqun into stable

yudao-ui-admin-vue3/src/components/DynamicReport/SpreadViewer.vue

@@ -446,7 +446,7 @@ const openPdf = async () => {
      if (currentManualUrl){
       // 手动拼接pdf的url，适配检验方案
        formData.append('manualUrl', currentManualUrl)
-       response = await getPDFByInspectionLocal(formData)
+       response = await getPDFByInspection(formData)
      }else{
        response = await getPDF2(formData)
      }

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

@@ -180,6 +180,16 @@
             @click="handleAppointment(row)">{{ row.appointmentNo }}</el-button>
         </template>
         </el-table-column>
+        <el-table-column label="检验员" prop="appointmentNo" align="center" width="150">
+         <template #default="scope">
+          <div v-if="scope.row.members && scope.row.members.length > 0">
+            <div v-for="user in scope.row.members" :key="user.id">
+              {{ user.nickname }} ({{ user.employeeNo }})
+            </div>
+          </div>
+          <div v-else>-</div>
+        </template>
+        </el-table-column>
         <!-- 检验性质 -->
         <el-table-column label="检验性质" prop="checkType" align="center" width="100">
           <template #default="scope">

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

@@ -1020,9 +1020,15 @@ const canSubmitMainReportType = ()=>{
 
   // 获取审核人信息
   const getSchemeReviewerList = async () => {
+
+    let roleCode = "Boiler_Department_Head"
+    if (props.rowInfo.boilerType === "1"){
+      roleCode = "POWER_PLANT_BOILER_INSPECTION_PLAN_RATIFY"
+    }
+
     try {
       optionList.schemeApproveList = await BoilerTaskOrderApi.getAuditList({
-        roleCode: 'Boiler_Department_Head'
+        roleCode: roleCode
       })
 
       approvalUserVisible.value = true

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

@@ -153,6 +153,10 @@ const props = defineProps({
   editInspectionplanParams: {
     type: Object,
     default: () => ({})
+  },
+  boilerType: {
+    type: String,
+    default: ''
   }
 })
 
@@ -185,12 +189,18 @@ const getSchemeReviewerList = async () => {
     //   inspectionApproveId
     // }
 
+    let roleCode = "Boiler Director";
+    //电站锅炉使用其他角色审核
+    if (props.boilerType === "1"){
+      roleCode = "POWER_PLANT_BOILER_INSPECTION_PLAN_APPROVAL";
+    }
+
     optionList.schemeReviewerList = await BoilerTaskOrderApi.getAuditList({
-      roleCode: 'Boiler Director'
-    })
-    optionList.schemeApproveList = await BoilerTaskOrderApi.getAuditList({
-      roleCode: 'Boiler_Department_Head'
+      roleCode: roleCode
     })
+    // optionList.schemeApproveList = await BoilerTaskOrderApi.getAuditList({
+    //   roleCode: 'Boiler_Department_Head'
+    // })
 
     approvalUserVisible.value = true
   } catch (error) {}

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

@@ -896,6 +896,7 @@
     :inspectionplanDetail="inspectionplanDetail"
     :taskOrderDetail="taskOrderDetail"
     :isEdit="isEdit"
+    :boilerType="boilerType"
     @success="handleUpdateInspectionplanDetail"
     @refresh="handleRefreshInspectionplan"
   />
@@ -1160,6 +1161,7 @@ const serviceOrderDialogFormData = ref<Record<string,any>>({
   confirmStatus: ''
 })
 
+const boilerType = ref()
 const formRef = ref()
 // 选中的设备
 const selectedEquips = ref<BoilerTaskOrderItemVO[]>([])
@@ -2162,6 +2164,10 @@ const newHandleOperationReport = async (row, type: 'add' | 'edit' | 'view' | ''
       // editInspectionplanParams.value.prepareJson = templateInitJSON
     }
     isEdit.value = type ? type : !row.status ? 'add' : 'edit'
+
+    const firstOrderItem = unref(taskOrderDetail).orderItems[0] || {}
+    boilerType.value = firstOrderItem.type
+
     AddInspectionplanDetailVisible.value = true
     return
   }
@@ -2328,6 +2334,7 @@ const handleSuccessInspectionplan = async (info) => {
       isSelfType: info.isSelfType,
     }
     isEdit.value = 'add'
+    boilerType.value = firstOrderItem.type
     AddInspectionplanDetailVisible.value = true
   } catch (error) {
     ElMessage.error('获取模板失败')
@@ -2608,6 +2615,10 @@ const handleResubmitDocs = async (row) => {
     }
     inspectionplanDetail.value = row
     isEdit.value = 'edit'
+
+    const firstOrderItem = unref(taskOrderDetail).orderItems[0] || {}
+    boilerType.value = firstOrderItem.type
+
     AddInspectionplanDetailVisible.value = true
     return
   }