Ver Fonte

当前节点为部长审批时按钮名称改为审批

liyuhui_ex há 3 dias atrás
pai
commit
7261e37dca

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

@@ -317,7 +317,7 @@ const columns = ref<SmartTableColumn[]>([
               type="primary"
               onClick={() => handleOpenAuditDetailOrInfo(row, 'check')}
             >
-              {auditText.value}
+              {row.currentNode == '部长审批'?'审批':auditText.value}
             </el-button>
           )}
           {PressureTaskOrderStatus['AUDITING'] !== row.status && (

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

@@ -10,10 +10,12 @@
     :buttons="buttons"
     @on-page-no-change="() => getAuditListByReportType()"
     @on-page-size-change="() => getAuditListByReportType()"
-    @on-reset="() => {
-      filterStatus = '100'
-      handleStatusFilter()
-    }"
+    @on-reset="
+      () => {
+        filterStatus = '100'
+        handleStatusFilter()
+      }
+    "
     @on-search="() => getAuditListByReportType()"
     @refresh="() => getAuditListByReportType()"
   >
@@ -27,7 +29,7 @@
         <el-radio-button label="已通过" value="200" />
         <el-radio-button label="审核中" value="100" />
         <el-radio-button label="已拒绝" value="300" />
-<!--        <el-radio-button label="已作废" value="400" />-->
+        <!--        <el-radio-button label="已作废" value="400" />-->
       </el-radio-group>
     </template>
   </SmartTable>
@@ -66,7 +68,7 @@ import { useRoute } from 'vue-router'
 import _, { get } from 'lodash'
 import { SmartInstanceExpose, SmartTableColumn } from '@/types/table'
 import { buildFileUrl } from '@/utils'
-import {PipeTaskOrderApi} from "@/api/pressure2/pipetaskorder";
+import { PipeTaskOrderApi } from '@/api/pressure2/pipetaskorder'
 const route = useRoute()
 
 const {
@@ -76,7 +78,7 @@ const {
   getOpinionNoticeApprovalRecordList // 没有分页
 } = PipeTaskOrderApi
 
-const useType = "checkNotice"
+const useType = 'checkNotice'
 const dictStore = useDictStore()
 const auditText = ref('审核')
 const getReportType = computed(() => {
@@ -147,7 +149,7 @@ const columns = ref<SmartTableColumn[]>([
     fieldProps: {
       showOverflowTooltip: true,
       align: 'center'
-    },
+    }
   },
   {
     label: '使用单位',
@@ -158,7 +160,7 @@ const columns = ref<SmartTableColumn[]>([
     fieldProps: {
       showOverflowTooltip: true,
       align: 'center'
-    },
+    }
   },
   {
     label: '检验性质',
@@ -180,7 +182,7 @@ const columns = ref<SmartTableColumn[]>([
     fieldProps: {
       showOverflowTooltip: true,
       align: 'center'
-    },
+    }
   },
   {
     label: '检验时间',
@@ -317,7 +319,7 @@ const columns = ref<SmartTableColumn[]>([
               type="primary"
               onClick={() => handleOpenAuditDetailOrInfo(row, 'check')}
             >
-              {auditText.value}
+              {row.currentNode == '部长审批'?'审批':auditText.value}
             </el-button>
           )}
           {PressureTaskOrderStatus['AUDITING'] !== row.status && (
@@ -342,11 +344,36 @@ const getColumnsByReportType = computed(() => {
     case PressureReportType['MAINQUESTION']:
       // const columnsTitle = [ '任务单号', '检验时间', '状态', '当前流程', '退回原因', '提交人', '审核人', '提交时间', '操作' ]
       // return columns.value.filter((col) => columnsTitle.includes(col.label)) as SmartTableColumn[]
-      const columnsProp = ['orderNo', 'checkDate', 'status', 'currentNode', 'returnReason', 'submitUser', 'currentAuditor','submitTime', 'operation']
-      return columns.value.filter((col) => columnsProp.includes(col.prop as string)) as SmartTableColumn[]
+      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']
-      return columns.value.filter((col) => columnsPropIns.includes(col.prop as string)) as SmartTableColumn[]
+      const columnsPropIns = [
+        'orderNo',
+        'checkDate',
+        '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[]
   }