Merge remote-tracking branch 'origin/stable' into stable

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

@@ -345,7 +345,7 @@ const getColumnsByReportType = computed(() => {
       const columnsProp = ['orderNo', 'checkDate', 'status', 'currentNode', 'returnReason', 'submitUser', 'currentAuditor', 'submitTime', 'operation']
       return columns.value.filter((col) => columnsProp.includes(col.prop as string)) as SmartTableColumn[]
     case PressureReportType['INSPECTIONPLAN']:
-      const columnsPropIns = ['orderNo', 'checkDate', 'status', 'currentNode', 'returnReason', 'submitUser', 'currentAuditor','ratifyUser', 'submitTime', 'operation']
+      const columnsPropIns = ['orderNo', 'checkDate','unitName','status', 'currentNode', 'returnReason', 'submitUser', 'currentAuditor','ratifyUser', 'submitTime', 'operation']
       return columns.value.filter((col) => columnsPropIns.includes(col.prop as string)) as SmartTableColumn[]
     default:
       return [] as SmartTableColumn[]

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

@@ -142,7 +142,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-button type="primary" @click="handleBatchConfirmationFn" :disabled="selectedRows.length === 0">批量办结确认</el-button>
+<!--    <el-button type="primary" @click="handleBatchConfirmationFn" :disabled="selectedRows.length === 0">批量办结确认</el-button>-->
     <el-table ref="tableRef" v-loading="loading" :data="list" :stripe="true" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="40" />
       <el-table-column label="任务单号" align="center" prop="orderNo" min-width="150px" />

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

@@ -361,6 +361,7 @@ const getColumnsByReportType = computed(() => {
     case PressureReportType['INSPECTIONPLAN']:
       const columnsPropIns = [
         'orderNo',
+        'unitName',
         'checkDate',
         'status',
         'currentNode',

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

@@ -143,12 +143,12 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-button
-      type="primary"
-      @click="handleBatchConfirmationFn"
-      :disabled="selectedRows.length === 0"
-      >批量办结确认</el-button
-    >
+<!--    <el-button-->
+<!--      type="primary"-->
+<!--      @click="handleBatchConfirmationFn"-->
+<!--      :disabled="selectedRows.length === 0"-->
+<!--      >批量办结确认</el-button-->
+<!--    >-->
     <el-table
       ref="tableRef"
       v-loading="loading"