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

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

@@ -15,7 +15,7 @@
   >
     <div class="designer-inner" ref="wrapperContainerRef" v-if="['add', 'edit'].includes(isEdit)">
 <!--      <SpreadViewer :initData="initData" ref="spreadRef" />-->
-      <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord"/>
+      <SpreadViewer :initData="editData" ref="editSpreadRecordRef" isFullscreen @saveSuccess="saveSuccessRecord"/>
     </div>
     <div class="designer-inner" ref="wrapperContainerRef" v-else>
        <SpreadViewer :initData="initData" ref="spreadRef" />

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

@@ -3,7 +3,7 @@
   <ContentWrap :title="title" class="check-record-wrapper" v-loading="pageLoading">
     <!-- 作业指导书自定义附件，显示pdf预览 -->
     <div class="designer-inner">
-      <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord"/>
+      <SpreadViewer :initData="editData" ref="editSpreadRecordRef" isFullscreen @saveSuccess="saveSuccessRecord"/>
     </div>
     <div class="operation-inner">
       <div class="btn-list">
@@ -43,7 +43,7 @@
       <el-form-item label="批准人" prop="workInstructionAuditId">
         <el-select v-model="formValueData.workInstructionAuditId" clearable placeholder="请选择">
           <el-option
-            v-for="item in optionList.guidebookApproveList"
+            v-for="item in optionList.guidebookApproveList.list"
             :key="item.id"
             :label="item.nickname"
             :value="item.id"
@@ -87,6 +87,7 @@ import {editReport} from "@/utils/reportUtil";
 import {DynamicTbColApi} from "@/api/pressure2/dynamictbcol";
 import {SpreadViewer} from "@/components/DynamicReport";
 import {InitParams} from "@/components/DynamicReport/SpreadInterface";
+import {PipeTaskOrderApi} from "@/api/pressure2/pipetaskorder";
 
 const { submitOpinionNoticeApproval } = BoilerTaskOrderApi
 const userStore = useUserStore()
@@ -339,14 +340,19 @@ const approvalUserVisible = ref(false)
 // 获取审核人信息
 const getGuidebookApproveList = async () => {
   try {
-    const { workInstructionAuditId } = await UserApi.getApprovalDetail({})
-    formValueData.value = {
-      workInstructionAuditId
-    }
-    optionList.guidebookApproveList = await UserGroupApi.getUserGroupUserList({
-      category: 500,
-      status: 0
+    // const { workInstructionAuditId } = await UserApi.getApprovalDetail({})
+    // formValueData.value = {
+    //   workInstructionAuditId
+    // }
+    // optionList.guidebookApproveList = await UserGroupApi.getUserGroupUserList({
+    //   category: 500,
+    //   status: 0
+    // })
+
+    optionList.guidebookApproveList = await BoilerTaskOrderApi.getAuditList({
+      roleCode: 'WorkBookApprover'
     })
+
     approvalUserVisible.value = true
   } catch (error) {}
 }

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

@@ -8,7 +8,7 @@
   >
     <div class="designer-inner">
 <!--      <SpreadViewer :initData="initData" ref="spreadRef" />-->
-      <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord"/>
+      <SpreadViewer :initData="editData" ref="editSpreadRecordRef" isFullscreen @saveSuccess="saveSuccessRecord"/>
     </div>
     <div class="operation-inner">
       <div class="btn-list">

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

@@ -11,7 +11,7 @@
     <ContentWrap :title="getTitle" class="check-record-wrapper">
       <div class="designer-inner" v-if="['add', 'edit'].includes(isAddMainquestion)">
 <!--        <SpreadViewer :initData="initData" ref="spreadRef" />-->
-        <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord"/>
+        <SpreadViewer :initData="editData" ref="editSpreadRecordRef" isFullscreen @saveSuccess="saveSuccessRecord"/>
       </div>
       <div class="designer-inner" v-else>
         <SpreadViewer :initData="initData" ref="spreadRef" />

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

@@ -15,7 +15,7 @@
   >
     <div class="designer-inner" ref="wrapperContainerRef" v-if="['add', 'edit'].includes(isEdit)">
       <!--      <SpreadViewer :initData="initData" ref="spreadRef" />-->
-      <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord"/>
+      <SpreadViewer :initData="editData" ref="editSpreadRecordRef" isFullscreen @saveSuccess="saveSuccessRecord"/>
     </div>
     <div class="designer-inner" ref="wrapperContainerRef" v-else>
       <SpreadViewer :initData="initData" ref="spreadRef" />

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

@@ -3,7 +3,7 @@
   <ContentWrap :title="title" class="check-record-wrapper" v-loading="pageLoading">
     <!-- 作业指导书自定义附件，显示pdf预览 -->
     <div class="designer-inner">
-      <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord"/>
+      <SpreadViewer :initData="editData" ref="editSpreadRecordRef" isFullscreen @saveSuccess="saveSuccessRecord"/>
     </div>
     <div class="operation-inner">
       <div class="btn-list">
@@ -43,7 +43,7 @@
       <el-form-item label="批准人" prop="workInstructionAuditId">
         <el-select v-model="formValueData.workInstructionAuditId" clearable placeholder="请选择">
           <el-option
-            v-for="item in optionList.guidebookApproveList"
+            v-for="item in optionList.guidebookApproveList.list"
             :key="item.id"
             :label="item.nickname"
             :value="item.id"
@@ -335,14 +335,19 @@ const approvalUserVisible = ref(false)
 // 获取审核人信息
 const getGuidebookApproveList = async () => {
   try {
-    const { workInstructionAuditId } = await UserApi.getApprovalDetail({})
-    formValueData.value = {
-      workInstructionAuditId
-    }
-    optionList.guidebookApproveList = await UserGroupApi.getUserGroupUserList({
-      category: 500,
-      status: 0
+    // const { workInstructionAuditId } = await UserApi.getApprovalDetail({})
+    // formValueData.value = {
+    //   workInstructionAuditId
+    // }
+    // optionList.guidebookApproveList = await UserGroupApi.getUserGroupUserList({
+    //   category: 500,
+    //   status: 0
+    // })
+
+    optionList.guidebookApproveList = await PipeTaskOrderApi.getAuditList({
+      roleCode: 'WorkBookApprover'
     })
+
     approvalUserVisible.value = true
   } catch (error) {}
 }

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

@@ -8,7 +8,7 @@
   >
     <div class="designer-inner">
 <!--      <SpreadViewer :initData="initData" ref="spreadRef" />-->
-      <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord"/>
+      <SpreadViewer :initData="editData" ref="editSpreadRecordRef" isFullscreen @saveSuccess="saveSuccessRecord"/>
     </div>
     <div class="operation-inner">
       <div class="btn-list">

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

@@ -11,7 +11,7 @@
     <ContentWrap :title="getTitle" class="check-record-wrapper">
       <div class="designer-inner" v-if="['add', 'edit'].includes(isAddMainquestion)">
         <!--        <SpreadViewer :initData="initData" ref="spreadRef" />-->
-        <SpreadViewer :initData="editData" ref="editSpreadRecordRef" @saveSuccess="saveSuccessRecord"/>
+        <SpreadViewer :initData="editData" ref="editSpreadRecordRef" isFullscreen @saveSuccess="saveSuccessRecord"/>
       </div>
       <div class="designer-inner" v-else>
         <SpreadViewer :initData="initData" ref="spreadRef" />