检验部件

yudao-ui-admin-vue3/src/views/pressure2/boilerReportPreparationList/BoilerReportList.vue

@@ -53,16 +53,16 @@ const props = defineProps<{
 
 const PartTypeList = getStrDictOptions(DICT_TYPE.PRESSURE2_BOILER_PART_TYPE)
 
-const getTypeName = (type: string) => {
-  const item = PartTypeList.find(item => item.value === type)
-  return item ? item.label : ''
+const getTypeName = (item) => {
+  const type = props?.row?.idToPartName?.[item?.itemPartId]
+  return type ? type : ''
 }
 
 const getReportName = (item: ReportItem) => {
   if (!item.itemPartId || item.itemPartId === '0') {
     return item.reportName
   }
-  return `${item.reportName}(${getTypeName(item.itemPartId)})`
+  return `${item.reportName}(${getTypeName(item)})`
 }
 
 const getStatusColor = (status: number): string => {

yudao-ui-admin-vue3/src/views/pressure2/dynamictbcol/index.vue

@@ -8,7 +8,7 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="表单ID" prop="tbId">
+      <el-form-item label="表单ID" prop="tbId" v-if="queryParams.tbId">
         <el-input
           v-model="queryParams.tbId"
           placeholder="请输入表单ID"
@@ -123,7 +123,7 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" :border="true">
-      <el-table-column label="表单ID" align="center" prop="tbId" />
+<!--      <el-table-column label="表单ID" align="center" prop="tbId" />-->
       <el-table-column label="字段名称" align="center" prop="colName" />
       <el-table-column label="字段范围" align="center" prop="colRound">
         <template #default="scope">
@@ -289,7 +289,7 @@ const queryParams = reactive({
   pageSize: 10,
   tbId: undefined,
   colName: undefined,
-  colRound: undefined,
+  colRound: 3,
   colCode: undefined,
   colValType: undefined,
   isEdit: true,
@@ -363,7 +363,7 @@ const batchDialogVisible = ref(false)
 const batchForm = reactive({
   tbId: queryParams.tbId,
   colName: '',
-  colRound: 1,
+  colRound: 3,
   colCode: '',
   colValType: 1,
   isEdit: true,