EOEG SAI

master/src/main/java/com/ruoyi/project/production/controller/TEoegSaiApplyController.java

@@ -309,6 +309,7 @@ public class TEoegSaiApplyController extends BaseController
             // 复制属性
             EoegSaiApplyExportVO vo = new EoegSaiApplyExportVO();
             vo.setNo(no + "");
+            vo.setSaiType(entity.getSaiType());
             vo.setPlantName(entity.getApplicantDeptName());
             vo.setStaffName(entity.getApplicantName());
             vo.setStaffId(staffIdMap.get(Long.parseLong(entity.getApplicant())));

ui/src/views/production/eoegapply/all/index.vue

@@ -254,12 +254,7 @@
           <span v-if="scope.row.saiType=='SAI'">{{scope.row.saiLevel}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="SAI类别" align="center" prop="category" :show-overflow-tooltip="true" :formatter="saiCategoryFormat">
-        <template slot-scope="scope">
-          <span v-if="scope.row.saiType=='TPM'">/</span>
-          <span v-if="scope.row.saiType=='SAI'">{{scope.row.category}}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="SAI类别" align="center" prop="category" :show-overflow-tooltip="true" :formatter="saiCategoryFormat"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <!-- 申请状态为待评估/进行中/待验收 -->
@@ -1175,7 +1170,7 @@ export default {
     // 加载登记人部门列表
     this.getApplicantDeptOptions();
     // 加载登记人列表
-    this.listStaffmgrByDeptAndTeam(null, null);
+    this.listStaffmgrByDeptAndTeam('38', null);
     // 加载不安全状态字典
     this.getDicts("SAI_UNSAFE_STATUS").then(response => {
       this.unsafeStatusOptions = response.data;
@@ -1369,7 +1364,11 @@ export default {
     },
     // SAI类别字典翻译
     saiCategoryFormat(row, column) {
-      return this.selectDictLabel(this.saiCategoryOptions, row.category);
+      if (row.category == null || row.category == '') {
+        return "/";
+      } else {
+        return this.selectDictLabel(this.saiCategoryOptions, row.category);
+      }
     },
     /** 获取SAI类别列表数据 */
     getCategoryList() {

ui/src/views/production/eoegapply/mine/index.vue

@@ -247,12 +247,7 @@
           <span v-if="scope.row.saiType=='SAI'">{{scope.row.saiLevel}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="SAI类别" align="center" prop="category" :show-overflow-tooltip="true" :formatter="saiCategoryFormat">
-        <template slot-scope="scope">
-          <span v-if="scope.row.saiType=='TPM'">/</span>
-          <span v-if="scope.row.saiType=='SAI'">{{scope.row.category}}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="SAI类别" align="center" prop="category" :show-overflow-tooltip="true" :formatter="saiCategoryFormat"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <!-- 申请状态为待评估/进行中/待验收 -->
@@ -1061,7 +1056,7 @@
       // 加载登记人部门列表
       this.getApplicantDeptOptions();
       // 加载登记人列表
-      this.listStaffmgrByDeptAndTeam(null, null);
+      this.listStaffmgrByDeptAndTeam('38', null);
       // 加载不安全状态字典
       this.getDicts("SAI_UNSAFE_STATUS").then(response => {
         this.unsafeStatusOptions = response.data;
@@ -1159,7 +1154,11 @@
       },
       // SAI类别字典翻译
       saiCategoryFormat(row, column) {
-        return this.selectDictLabel(this.saiCategoryOptions, row.category);
+        if (row.category == null || row.category == '') {
+          return "/";
+        } else {
+          return this.selectDictLabel(this.saiCategoryOptions, row.category);
+        }
       },
       /** 获取SAI类别列表数据 */
       getCategoryList() {

ui/src/views/production/eoegapply/pending/index.vue

@@ -247,12 +247,7 @@
           <span v-if="scope.row.saiType=='SAI'">{{scope.row.saiLevel}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="SAI类别" align="center" prop="category" :show-overflow-tooltip="true" :formatter="saiCategoryFormat">
-        <template slot-scope="scope">
-          <span v-if="scope.row.saiType=='TPM'">/</span>
-          <span v-if="scope.row.saiType=='SAI'">{{scope.row.category}}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="SAI类别" align="center" prop="category" :show-overflow-tooltip="true" :formatter="saiCategoryFormat"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <!-- 申请状态为待评估/进行中/待验收 -->
@@ -1061,7 +1056,7 @@
       // 加载登记人部门列表
       this.getApplicantDeptOptions();
       // 加载登记人列表
-      this.listStaffmgrByDeptAndTeam(null, null);
+      this.listStaffmgrByDeptAndTeam('38', null);
       // 加载不安全状态字典
       this.getDicts("SAI_UNSAFE_STATUS").then(response => {
         this.unsafeStatusOptions = response.data;
@@ -1159,7 +1154,11 @@
       },
       // SAI类别字典翻译
       saiCategoryFormat(row, column) {
-        return this.selectDictLabel(this.saiCategoryOptions, row.category);
+        if (row.category == null || row.category == '') {
+          return "/";
+        } else {
+          return this.selectDictLabel(this.saiCategoryOptions, row.category);
+        }
       },
       /** 获取SAI类别列表数据 */
       getCategoryList() {