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

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

@@ -98,7 +98,7 @@ const getReportType = computed(() => {
 
 // 检验性质  pressure_inspection_nature
 const getPressureInspectionNature = computed(
-  () => dictStore.getDictMap['pressure_inspection_nature']
+  () => dictStore.getDictMap['pressure_inspection_nature_boiler']
 )
 const columns = ref<SmartTableColumn[]>([
   {

yudao-ui-admin-vue3/src/views/pressure2/inspectionOpinion/indexBoilerTab.vue

@@ -868,7 +868,7 @@ const handleRePush = async (row) => {
 
 }
 const fiePreviewEmitFn = async (row) => {
-  const result = await BoilerTaskOrderApi.exportCheckBookDetail({id: row.id})
+  const result = await BoilerTaskOrderApi.exportCheckBookDetail({id: row.reportId})
   if (result) {
 
     recipientRow.value = row

yudao-ui-admin-vue3/src/views/pressure2/inspectionOpinion/indexPipeTab.vue

@@ -868,7 +868,7 @@ const handleRePush = async (row) => {
 
 }
 const fiePreviewEmitFn = async (row) => {
-  const result = await PipeTaskOrderApi.exportCheckBookDetail({id: row.id})
+  const result = await PipeTaskOrderApi.exportCheckBookDetail({id: row.reportId})
   if (result) {
 
     recipientRow.value = row

yudao-ui-admin-vue3/src/views/pressure2/inspectionOpinion/reportIndexBoilerTab.vue

@@ -568,13 +568,13 @@
         </template>
       </el-table-column>
       <!-- 主检人 -->
-      <el-table-column label="主检人" align="center" prop="mainInspector" min-width="200">
+      <el-table-column label="主检人" align="center" prop="mainCheckerUser" min-width="200">
         <template #default="scope">
           {{
-            scope.row.mainCheckerUser
-              ? scope.row.mainCheckerUser.nickname +
+            scope.row.manager
+              ? scope.row.manager.nickname +
                 ' (' +
-                scope.row.mainCheckerUser.employeeNo +
+                scope.row.manager.employeeNo +
                 ')'
               : '-'
           }}

yudao-ui-admin-vue3/src/views/pressure2/inspectionOpinion/reportIndexPipeTab.vue

@@ -571,10 +571,10 @@
       <el-table-column label="主检人" align="center" prop="mainInspector" min-width="200">
         <template #default="scope">
           {{
-            scope.row.mainCheckerUser
-              ? scope.row.mainCheckerUser.nickname +
+            scope.row.manager
+              ? scope.row.manager.nickname +
                 ' (' +
-                scope.row.mainCheckerUser.employeeNo +
+                scope.row.manager.employeeNo +
                 ')'
               : '-'
           }}

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

@@ -98,7 +98,7 @@ const getReportType = computed(() => {
 
 // 检验性质  pressure_inspection_nature
 const getPressureInspectionNature = computed(
-  () => dictStore.getDictMap['pressure_inspection_nature']
+  () => dictStore.getDictMap['pressure_inspection_nature_pipe']
 )
 const columns = ref<SmartTableColumn[]>([
   {