徐明浩

master/src/main/resources/mybatis/ticket/TPermitRelationMapper.xml

@@ -24,7 +24,8 @@
                a.B_WORK_CONTENT AS bWorkContent,
                c.B_WORK_CONTENT AS cbWorkContent,
                a.H_V_NO_ONE     AS hVNoOne,
-               c.H_V_NO_ONE     AS chVNoOne
+               c.H_V_NO_ONE     AS chVNoOne,
+               t.permit_status    AS permitStatus
         FROM T_PERMIT_RELATION t
                  LEFT JOIN T_HAZARD_WORK_PERMIT a ON t.PERMIT_ID = a.A_ID
             AND t.PERMIT_TYPE = 'A'

ui/src/views/invoicing/ticketList/index.vue

@@ -2,21 +2,38 @@
   <div class="app-container">
     <el-table v-loading="loading" :data="ticketList" border row-key="aId"
               :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-      <el-table-column label="日期" align="center" prop="plantCode" :show-overflow-tooltip="true"/>
-      <el-table-column label="时间" align="center" prop="year" :show-overflow-tooltip="true"/>
-      <el-table-column label="班组" align="center" prop="fileName" :show-overflow-tooltip="true"/>
-      <el-table-column label="签发人" align="center" prop="filePath" :show-overflow-tooltip="true"/>
       <el-table-column label="延期次数" align="center" prop="delayCount" :show-overflow-tooltip="true">
         <template slot-scope="{row}">
           {{ row.delayCount || '-' }}
         </template>
       </el-table-column>
-      <el-table-column label="续票状态" align="center" prop="filePath" :show-overflow-tooltip="true"/>
-      <el-table-column label="危害工作许可证票号" align="center" prop="aId" :show-overflow-tooltip="true"/>
-      <el-table-column label="动火工作许可证票号" align="center" prop="hId" :show-overflow-tooltip="true"/>
-      <el-table-column label="动火作业等级" align="center" prop="hId" :show-overflow-tooltip="true"/>
-      <el-table-column label="限制性空间进入许可证票号" align="center" prop="cId" :show-overflow-tooltip="true"/>
+      <el-table-column label="续票状态" align="center" prop="permitStatus" :show-overflow-tooltip="true"
+                       :formatter="permitStatusFormat"/>
+      <el-table-column label="危害工作许可证票号" align="center" prop="aId" :show-overflow-tooltip="true">
+        <template slot-scope="{row}">
+          {{ row.aId || '-' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="动火工作许可证票号" align="center" prop="hId" :show-overflow-tooltip="true">
+        <template slot-scope="{row}">
+          {{ row.hId || '-' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="动火作业等级" align="center" prop="hId" :show-overflow-tooltip="true">
+        <template slot-scope="{row}">
+          {{ row.hId || '-' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="限制性空间进入许可证票号" align="center" prop="cId" :show-overflow-tooltip="true">
+        <template slot-scope="{row}">
+          {{ row.cId || '-' }}
+        </template>
+      </el-table-column>
       <el-table-column label="工作内容" align="center" prop="bWorkContent" :show-overflow-tooltip="true"/>
+      <el-table-column label="日期" align="center" prop="plantCode" :show-overflow-tooltip="true"/>
+      <el-table-column label="时间" align="center" prop="year" :show-overflow-tooltip="true"/>
+      <el-table-column label="班组" align="center" prop="fileName" :show-overflow-tooltip="true"/>
+      <el-table-column label="签发人" align="center" prop="filePath" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="160" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -33,12 +50,12 @@
             @click="delay(scope.row)"
           >延期
           </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-          >废弃
-          </el-button>
+          <!--          <el-button
+                      size="mini"
+                      type="text"
+                      icon="el-icon-delete"
+                    >废弃
+                    </el-button>-->
         </template>
       </el-table-column>
     </el-table>
@@ -69,11 +86,15 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 20,
-      }
+      },
+      permitStatusOptions: []
     };
   },
   created() {
     this.getList();
+    this.getDicts("permit_type").then(response => {
+      this.permitStatusOptions = response.data;
+    });
   },
   methods: {
     getList() {
@@ -120,7 +141,11 @@ export default {
           }
         });
       }
-    }
+    },
+    // 设备类型：字典翻译
+    permitStatusFormat(row, column) {
+      return this.selectDictLabel(this.permitStatusOptions, row.permitStatus);
+    },
   },
 }
 </script>