xy 3 недель назад
Родитель
Сommit
6165fa3734

+ 31 - 32
yudao-ui-admin-vue3/src/views/pressure2/pipeuseregistrationreport/index.vue

@@ -99,53 +99,52 @@
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" border>
 
       <el-table-column type="index" label="序号" align="center" width="60" />
-      <el-table-column label="工程号" align="center" prop="projectNo" min-width="150px"/>
-      <el-table-column label="报告编号" align="center" prop="reportNo" min-width="150px"/>
-      <el-table-column label="使用单位名称" align="center" prop="unitName" min-width="250px"/>
-      <el-table-column label="使用登记证编号" align="center" prop="certificateNo" min-width="200px"/>
-      <el-table-column label="部门" align="center" prop="deptName" min-width="150px"/>
-      <el-table-column label="审核状态" align="center" prop="status" min-width="100px">
-        <template #default="{ row }">
-          <el-tag v-if="row.status === 100" type="warning">审核中</el-tag>
-          <el-tag v-else-if="row.status === 200" type="success">已通过</el-tag>
-          <el-tag v-else-if="row.status === 300" type="danger">已拒绝</el-tag>
-          <div v-else>{{ '-' }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="审核人" align="center" prop="approvalName" min-width="100px">
-        <template #default="{ row }">
-          <div>{{ row.approvalName || '-' }}</div>
-        </template>
-      </el-table-column>
+      <el-table-column label="工程号" align="center" prop="projectNo" min-width="180px"/>
+      <el-table-column label="使用单位名称" align="center" prop="unitName" min-width="270px"/>
+      <el-table-column label="报告编号" align="center" prop="reportNo" min-width="180px"/>
+<!--      <el-table-column label="使用登记证编号" align="center" prop="certificateNo" min-width="200px"/>-->
       <el-table-column
-        label="审核时间"
+        label="申请日期"
         align="center"
-        prop="approvalTime"
+        prop="submitTime"
         :formatter="dateFormatter"
-        width="180px"
+        width="160px"
       >
         <template #default="{ row }">
-          {{ formatDate(row.approvalTime) }}
-        </template>
-      </el-table-column>
-      <el-table-column label="提交人" align="center" prop="submitName" min-width="100px">
-        <template #default="{ row }">
-          <div>{{ row.submitName || '-' }}</div>
+          <div>{{ formatDate(row.submitTime) }}</div>
         </template>
       </el-table-column>
       <el-table-column
-        label="提交时间"
+        label="审核日期"
         align="center"
-        prop="submitTime"
+        prop="approvalTime"
         :formatter="dateFormatter"
-        width="180px"
+        width="160px"
       >
         <template #default="{ row }">
-          <div>{{ formatDate(row.submitTime) }}</div>
+          {{ formatDate(row.approvalTime) }}
         </template>
       </el-table-column>
+<!--      <el-table-column label="审核人" align="center" prop="approvalName" min-width="100px">-->
+<!--        <template #default="{ row }">-->
+<!--          <div>{{ row.approvalName || '-' }}</div>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="提交人" align="center" prop="submitName" min-width="100px">-->
+<!--        <template #default="{ row }">-->
+<!--          <div>{{ row.submitName || '-' }}</div>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="备注" align="center" prop="remark" min-width="150px"/>
-
+      <el-table-column label="部门" align="center" prop="deptName" min-width="150px"/>
+      <el-table-column label="审核状态" align="center" prop="status" min-width="100px">
+        <template #default="{ row }">
+          <el-tag v-if="row.status === 100" type="warning">审核中</el-tag>
+          <el-tag v-else-if="row.status === 200" type="success">已通过</el-tag>
+          <el-tag v-else-if="row.status === 300" type="danger">已拒绝</el-tag>
+          <div v-else>{{ '-' }}</div>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" min-width="240px" fixed="right">
         <template #default="scope">
           <el-button link type="primary" @click="handleViewPdf(scope.row)">查看</el-button>