Jelajahi Sumber

Merge remote-tracking branch 'origin/master'

徐明浩 3 tahun lalu
induk
melakukan
33a74c1a27

+ 1 - 0
master/src/main/java/com/ruoyi/project/listener/yearSemsApprove/YearEndSucessListener.java

@@ -60,6 +60,7 @@ public class YearEndSucessListener implements Serializable, ExecutionListener {
                     reportYlrqEntity.setBuildDate(new Date());
                     reportYlrqEntity.setApproveId(approveEntity.getProcessId());
                     reportYlrqEntity.setReportId(Long.parseLong(i));
+                    reportYlrqEntity.setYearReportNo(i);
                     tReportHiYlrqService.insertTReportHiYlrq(reportYlrqEntity);
                 }
                 break;

+ 10 - 10
master/src/main/java/com/ruoyi/project/sems/controller/TReportHiYlgdController.java

@@ -175,15 +175,15 @@ public class TReportHiYlgdController extends BaseController {
             logger.info("历史任务:" + JSON.toJSONString(htiLists));
             if (htiLists != null) {
                 SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                map.put("inspectorOneName", htiLists.get(0).getName());
+                map.put("inspectorOne", iSysUserService.selectUserById(Long.parseLong(htiLists.get(0).getAssignee())).getNickName());
                 map.put("inspectorOneEndTime", sdf2.format(htiLists.get(0).getEndTime()));
-                map.put("inspectorTwo", htiLists.get(1).getName());
+                map.put("inspectorTwo", iSysUserService.selectUserById(Long.parseLong(htiLists.get(1).getAssignee())).getNickName());
                 map.put("inspectorTwoEndTime", sdf2.format(htiLists.get(1).getEndTime()));
-                map.put("inspectorThree", htiLists.get(2).getName());
+                map.put("inspectorThree", iSysUserService.selectUserById(Long.parseLong(htiLists.get(2).getAssignee())).getNickName());
                 map.put("inspectorThreeEndTime", sdf2.format(htiLists.get(2).getEndTime()));
-                map.put("auditor", htiLists.get(3).getName());
+                map.put("auditor",iSysUserService.selectUserById(Long.parseLong(htiLists.get(3).getAssignee())).getNickName());
                 map.put("auditorEndTime", sdf2.format(htiLists.get(3).getEndTime()));
-                map.put("approveUser", htiLists.get(4).getName());
+                map.put("approveUser", iSysUserService.selectUserById(Long.parseLong(htiLists.get(4).getAssignee())).getNickName());
                 map.put("approveEndTime", sdf2.format(htiLists.get(4).getEndTime()));
             }
             String pdfName = reportHiYlgd.getPlantCode()
@@ -270,15 +270,15 @@ public class TReportHiYlgdController extends BaseController {
                 logger.info("报告数据:" + JSON.toJSONString(htiLists));
                 if (htiLists != null) {
                     SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                    map.put("inspectorOne", htiLists.get(0).getName());
+                    map.put("inspectorOne", iSysUserService.selectUserById(Long.parseLong(htiLists.get(0).getAssignee())).getNickName());
                     map.put("inspectorOneEndTime", sdf2.format(htiLists.get(0).getEndTime()));
-                    map.put("inspectorTwo", htiLists.get(1).getName());
+                    map.put("inspectorTwo", iSysUserService.selectUserById(Long.parseLong(htiLists.get(1).getAssignee())).getNickName());
                     map.put("inspectorTwoEndTime", sdf2.format(htiLists.get(1).getEndTime()));
-                    map.put("inspectorThree", htiLists.get(2).getName());
+                    map.put("inspectorThree", iSysUserService.selectUserById(Long.parseLong(htiLists.get(2).getAssignee())).getNickName());
                     map.put("inspectorThreeEndTime", sdf2.format(htiLists.get(2).getEndTime()));
-                    map.put("auditor", htiLists.get(3).getName());
+                    map.put("auditor",iSysUserService.selectUserById(Long.parseLong(htiLists.get(3).getAssignee())).getNickName());
                     map.put("auditorEndTime", sdf2.format(htiLists.get(3).getEndTime()));
-                    map.put("approveUser", htiLists.get(4).getName());
+                    map.put("approveUser", iSysUserService.selectUserById(Long.parseLong(htiLists.get(4).getAssignee())).getNickName());
                     map.put("approveEndTime", sdf2.format(htiLists.get(4).getEndTime()));
                 }
                 //多个文件区分文件名

+ 10 - 10
master/src/main/java/com/ruoyi/project/sems/controller/TReportHiYlrqController.java

@@ -176,15 +176,15 @@ public class TReportHiYlrqController extends BaseController {
             logger.info("历史任务:" + JSON.toJSONString(htiLists));
             if (htiLists != null) {
                 SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                map.put("inspectorOne", htiLists.get(0).getName());
+                map.put("inspectorOne", iSysUserService.selectUserById(Long.parseLong(htiLists.get(0).getAssignee())).getNickName());
                 map.put("inspectorOneEndTime", sdf2.format(htiLists.get(0).getEndTime()));
-                map.put("inspectorTwo", htiLists.get(1).getName());
+                map.put("inspectorTwo", iSysUserService.selectUserById(Long.parseLong(htiLists.get(1).getAssignee())).getNickName());
                 map.put("inspectorTwoEndTime", sdf2.format(htiLists.get(1).getEndTime()));
-                map.put("inspectorThree", htiLists.get(2).getName());
+                map.put("inspectorThree", iSysUserService.selectUserById(Long.parseLong(htiLists.get(2).getAssignee())).getNickName());
                 map.put("inspectorThreeEndTime", sdf2.format(htiLists.get(2).getEndTime()));
-                map.put("auditor", htiLists.get(3).getName());
+                map.put("auditor",iSysUserService.selectUserById(Long.parseLong(htiLists.get(3).getAssignee())).getNickName());
                 map.put("auditorEndTime", sdf2.format(htiLists.get(3).getEndTime()));
-                map.put("approveUser", htiLists.get(4).getName());
+                map.put("approveUser", iSysUserService.selectUserById(Long.parseLong(htiLists.get(4).getAssignee())).getNickName());
                 map.put("approveEndTime", sdf2.format(htiLists.get(4).getEndTime()));
             }
             String pdfName = reportYlrq.getPlantCode()
@@ -271,15 +271,15 @@ public class TReportHiYlrqController extends BaseController {
                 logger.info("报告数据:" + JSON.toJSONString(htiLists));
                 if (htiLists != null) {
                     SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                    map.put("inspectorOne", htiLists.get(0).getName());
+                    map.put("inspectorOne", iSysUserService.selectUserById(Long.parseLong(htiLists.get(0).getAssignee())).getNickName());
                     map.put("inspectorOneEndTime", sdf2.format(htiLists.get(0).getEndTime()));
-                    map.put("inspectorTwo", htiLists.get(1).getName());
+                    map.put("inspectorTwo", iSysUserService.selectUserById(Long.parseLong(htiLists.get(1).getAssignee())).getNickName());
                     map.put("inspectorTwoEndTime", sdf2.format(htiLists.get(1).getEndTime()));
-                    map.put("inspectorThree", htiLists.get(2).getName());
+                    map.put("inspectorThree", iSysUserService.selectUserById(Long.parseLong(htiLists.get(2).getAssignee())).getNickName());
                     map.put("inspectorThreeEndTime", sdf2.format(htiLists.get(2).getEndTime()));
-                    map.put("auditor", htiLists.get(3).getName());
+                    map.put("auditor",iSysUserService.selectUserById(Long.parseLong(htiLists.get(3).getAssignee())).getNickName());
                     map.put("auditorEndTime", sdf2.format(htiLists.get(3).getEndTime()));
-                    map.put("approveUser", htiLists.get(4).getName());
+                    map.put("approveUser", iSysUserService.selectUserById(Long.parseLong(htiLists.get(4).getAssignee())).getNickName());
                     map.put("approveEndTime", sdf2.format(htiLists.get(4).getEndTime()));
                 }
                 //多个文件区分文件名

+ 188 - 24
ui/src/views/approve/approveDetail/spec-detail.vue

@@ -10,29 +10,40 @@
           :data="devList"
           border
           style="width: 100%;">
-          <el-table-column
-            prop="plantCode"
-            header-align="center"
-            align="center"
-            :label="$t('装置名称')">
-          </el-table-column>
-          <el-table-column
-            prop="devname"
-            header-align="center"
-            align="center"
-            :label="$t('设备名称')">
-          </el-table-column>
-          <el-table-column
-            prop="devno"
-            header-align="center"
-            align="center"
-            :label="$t('设备位号')">
-          </el-table-column>
-          <el-table-column
-            prop="remarks"
-            header-align="center"
-            align="center"
-            :label="$t('备注')">
+          <el-table-column :label="$t('装置名称')" align="center" prop="plantCode" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('检查年月')" align="center" prop="checkMonth" width="100">
+          </el-table-column>
+          <el-table-column header-align="center" align="center" :label="$t('压力容器')">
+            <el-table-column :label="$t('容器单元')" align="center" prop="rqUnit" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('容器本体')" align="center" prop="rqSelf" :formatter="rqSelfFormat" />
+            <el-table-column :label="$t('安全附件')" align="center" prop="rqSafe" :formatter="rqSafeFormat" />
+            <el-table-column :label="$t('安全保护装置')" align="center" prop="rqProtect" :formatter="rqProtectFormat" />
+            <el-table-column :label="$t('测量调控装置,紧急切断阀')" align="center" prop="rqControl" :formatter="rqControlFormat" />
+            <el-table-column :label="$t('附属仪器仪表')" align="center" prop="rqIns" :formatter="rqInsFormat" />
+            <el-table-column :label="$t('有无泄漏')" align="center" prop="rqOut" :formatter="rqOutFormat" />
+            <el-table-column :label="$t('其它情况描述')" align="center" prop="rqOther" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('容器备注')" align="center" prop="rqRemark" :show-overflow-tooltip="true"/>
+          </el-table-column>
+          <el-table-column header-align="center" align="center" :label="$t('压力管道')">
+            <el-table-column :label="$t('管道区域/单元')" align="center" prop="gdUnit" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('管道宏观')" align="center" prop="gdSelf" :formatter="gdSelfFormat" />
+            <el-table-column :label="$t('安全附件')" align="center" prop="gdSafe" :formatter="gdSafeFormat" />
+            <el-table-column :label="$t('测量调控装置')" align="center" prop="gdControl" :formatter="gdControlFormat" />
+            <el-table-column :label="$t('附属仪器仪表')" align="center" prop="gdIns" :formatter="gdInsFormat" />
+            <el-table-column :label="$t('有无泄漏')" align="center" prop="gdOut" :formatter="gdOutFormat" />
+            <el-table-column :label="$t('其它情况描述')" align="center" prop="gdOther" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('管道备注')" align="center" prop="gdRemark" :show-overflow-tooltip="true"/>
+          </el-table-column>
+          <el-table-column header-align="center" align="center" :label="$t('锅炉')">
+            <el-table-column :label="$t('锅炉区域/单元')" align="center" prop="glUnit" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('承压部件')" align="center" prop="glPressure" :formatter="glPressureFormat" />
+            <el-table-column :label="$t('安全附件')" align="center" prop="glSafe" :formatter="glSafeFormat" />
+            <el-table-column :label="$t('仪表及联锁保护装置')" align="center" prop="glIns" :formatter="glInsFormat" />
+            <el-table-column :label="$t('燃烧器')" align="center" prop="glBurn" :formatter="glBurnFormat" />
+            <el-table-column :label="$t('人员')+$t('证书')" align="center" prop="glCer" :formatter="glCerFormat" />
+            <el-table-column :label="$t('水质化验')" align="center" prop="glWater" :formatter="glWaterFormat" />
+            <el-table-column :label="$t('其它情况描述')" align="center" prop="glOther" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('锅炉')+$t('备注')" align="center" prop="glRemark" :show-overflow-tooltip="true"/>
           </el-table-column>
         </el-table>
         <el-table
@@ -1235,7 +1246,7 @@
           <a style="margin-right: 40px" class='download' :href='getUrl(item.fileUrl)' download="" target="_blank" :title="$t('download')">{{item.fileName}}</a>
         </template>
       </el-form-item >
-      <el-form-item :label="$t('回执日期')" prop="govDate">
+      <el-form-item :label="$t('回执日期')" v-if="[-1,1,2,3,4,5,6].includes(dataForm.approveType)" prop="govDate">
         <el-input v-model="dataForm.govDate" disabled></el-input>
       </el-form-item>
     </el-form>
@@ -1347,6 +1358,40 @@
       },
       dataRule: {
       },
+      // 容器本体字典
+      rqSelfOptions: [],
+      // 安全附件字典
+      rqSafeOptions: [],
+      // 安全保护装置字典
+      rqProtectOptions: [],
+      // 测量调控装置,紧急切断阀字典
+      rqControlOptions: [],
+      // 附属仪器仪表字典
+      rqInsOptions: [],
+      // 有无泄漏字典
+      rqOutOptions: [],
+      // 管道宏观字典
+      gdSelfOptions: [],
+      // 安全附件字典
+      gdSafeOptions: [],
+      // 测量调控装置字典
+      gdControlOptions: [],
+      // 附属仪器仪表字典
+      gdInsOptions: [],
+      // 有无泄漏字典
+      gdOutOptions: [],
+      // 承压部件字典
+      glPressureOptions: [],
+      // 安全附件字典
+      glSafeOptions: [],
+      // 仪表及联锁保护装置字典
+      glInsOptions: [],
+      // 燃烧器字典
+      glBurnOptions: [],
+      // 人员证书字典
+      glCerOptions: [],
+      // 水质化验字典
+      glWaterOptions: [],
       approveOption: [],
       devTypeOption: [],
       conOptions: [],
@@ -1364,6 +1409,57 @@
     this.getDicts("REPORT_CON").then(response => {
       this.conOptions = response.data;
     });
+    this.getDicts("ABNORMALITY").then(response => {
+      this.rqSelfOptions = response.data;
+    });
+    this.getDicts("CONFORM").then(response => {
+      this.rqSafeOptions = response.data;
+    });
+    this.getDicts("CONFORM").then(response => {
+      this.rqProtectOptions = response.data;
+    });
+    this.getDicts("INTACT").then(response => {
+      this.rqControlOptions = response.data;
+    });
+    this.getDicts("INTACT").then(response => {
+      this.rqInsOptions = response.data;
+    });
+    this.getDicts("WITH_WITHOUT").then(response => {
+      this.rqOutOptions = response.data;
+    });
+    this.getDicts("ABNORMALITY").then(response => {
+      this.gdSelfOptions = response.data;
+    });
+    this.getDicts("CONFORM").then(response => {
+      this.gdSafeOptions = response.data;
+    });
+    this.getDicts("CONFORM").then(response => {
+      this.gdControlOptions = response.data;
+    });
+    this.getDicts("INTACT").then(response => {
+      this.gdInsOptions = response.data;
+    });
+    this.getDicts("WITH_WITHOUT").then(response => {
+      this.gdOutOptions = response.data;
+    });
+    this.getDicts("ABNORMALITY").then(response => {
+      this.glPressureOptions = response.data;
+    });
+    this.getDicts("CONFORM").then(response => {
+      this.glSafeOptions = response.data;
+    });
+    this.getDicts("CONFORM").then(response => {
+      this.glInsOptions = response.data;
+    });
+    this.getDicts("INTACT").then(response => {
+      this.glBurnOptions = response.data;
+    });
+    this.getDicts("CONFORM").then(response => {
+      this.glCerOptions = response.data;
+    });
+    this.getDicts("CONFORM").then(response => {
+      this.glWaterOptions = response.data;
+    });
   },
   methods: {
     init (id, taskId, processId,taskName) {
@@ -1421,6 +1517,74 @@
     conFormat(row, column) {
       return this.selectDictLabel(this.conOptions, row.con);
     },
+    // 容器本体字典翻译
+    rqSelfFormat(row, column) {
+      return this.selectDictLabel(this.rqSelfOptions, row.rqSelf);
+    },
+    // 安全附件字典翻译
+    rqSafeFormat(row, column) {
+      return this.selectDictLabel(this.rqSafeOptions, row.rqSafe);
+    },
+    // 安全保护装置字典翻译
+    rqProtectFormat(row, column) {
+      return this.selectDictLabel(this.rqProtectOptions, row.rqProtect);
+    },
+    // 测量调控装置,紧急切断阀字典翻译
+    rqControlFormat(row, column) {
+      return this.selectDictLabel(this.rqControlOptions, row.rqControl);
+    },
+    // 附属仪器仪表字典翻译
+    rqInsFormat(row, column) {
+      return this.selectDictLabel(this.rqInsOptions, row.rqIns);
+    },
+    // 有无泄漏字典翻译
+    rqOutFormat(row, column) {
+      return this.selectDictLabel(this.rqOutOptions, row.rqOut);
+    },
+    // 管道宏观字典翻译
+    gdSelfFormat(row, column) {
+      return this.selectDictLabel(this.gdSelfOptions, row.gdSelf);
+    },
+    // 安全附件字典翻译
+    gdSafeFormat(row, column) {
+      return this.selectDictLabel(this.gdSafeOptions, row.gdSafe);
+    },
+    // 测量调控装置字典翻译
+    gdControlFormat(row, column) {
+      return this.selectDictLabel(this.gdControlOptions, row.gdControl);
+    },
+    // 附属仪器仪表字典翻译
+    gdInsFormat(row, column) {
+      return this.selectDictLabel(this.gdInsOptions, row.gdIns);
+    },
+    // 有无泄漏字典翻译
+    gdOutFormat(row, column) {
+      return this.selectDictLabel(this.gdOutOptions, row.gdOut);
+    },
+    // 承压部件字典翻译
+    glPressureFormat(row, column) {
+      return this.selectDictLabel(this.glPressureOptions, row.glPressure);
+    },
+    // 安全附件字典翻译
+    glSafeFormat(row, column) {
+      return this.selectDictLabel(this.glSafeOptions, row.glSafe);
+    },
+    // 仪表及联锁保护装置字典翻译
+    glInsFormat(row, column) {
+      return this.selectDictLabel(this.glInsOptions, row.glIns);
+    },
+    // 燃烧器字典翻译
+    glBurnFormat(row, column) {
+      return this.selectDictLabel(this.glBurnOptions, row.glBurn);
+    },
+    // 人员证书字典翻译
+    glCerFormat(row, column) {
+      return this.selectDictLabel(this.glCerOptions, row.glCer);
+    },
+    // 水质化验字典翻译
+    glWaterFormat(row, column) {
+      return this.selectDictLabel(this.glWaterOptions, row.glWater);
+    },
     // 取消按钮
     cancel() {
       this.visible = false;

+ 187 - 23
ui/src/views/approve/pending/spec-detail.vue

@@ -10,29 +10,40 @@
           :data="devList"
           border
           style="width: 100%;">
-          <el-table-column
-            prop="plantCode"
-            header-align="center"
-            align="center"
-            :label="$t('装置名称')">
-          </el-table-column>
-          <el-table-column
-            prop="devname"
-            header-align="center"
-            align="center"
-            :label="$t('设备名称')">
-          </el-table-column>
-          <el-table-column
-            prop="devno"
-            header-align="center"
-            align="center"
-            :label="$t('设备位号')">
-          </el-table-column>
-          <el-table-column
-            prop="remarks"
-            header-align="center"
-            align="center"
-            :label="$t('备注')">
+          <el-table-column :label="$t('装置名称')" align="center" prop="plantCode" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('检查年月')" align="center" prop="checkMonth" width="100">
+          </el-table-column>
+          <el-table-column header-align="center" align="center" :label="$t('压力容器')">
+            <el-table-column :label="$t('容器单元')" align="center" prop="rqUnit" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('容器本体')" align="center" prop="rqSelf" :formatter="rqSelfFormat" />
+            <el-table-column :label="$t('安全附件')" align="center" prop="rqSafe" :formatter="rqSafeFormat" />
+            <el-table-column :label="$t('安全保护装置')" align="center" prop="rqProtect" :formatter="rqProtectFormat" />
+            <el-table-column :label="$t('测量调控装置,紧急切断阀')" align="center" prop="rqControl" :formatter="rqControlFormat" />
+            <el-table-column :label="$t('附属仪器仪表')" align="center" prop="rqIns" :formatter="rqInsFormat" />
+            <el-table-column :label="$t('有无泄漏')" align="center" prop="rqOut" :formatter="rqOutFormat" />
+            <el-table-column :label="$t('其它情况描述')" align="center" prop="rqOther" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('容器备注')" align="center" prop="rqRemark" :show-overflow-tooltip="true"/>
+          </el-table-column>
+          <el-table-column header-align="center" align="center" :label="$t('压力管道')">
+            <el-table-column :label="$t('管道区域/单元')" align="center" prop="gdUnit" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('管道宏观')" align="center" prop="gdSelf" :formatter="gdSelfFormat" />
+            <el-table-column :label="$t('安全附件')" align="center" prop="gdSafe" :formatter="gdSafeFormat" />
+            <el-table-column :label="$t('测量调控装置')" align="center" prop="gdControl" :formatter="gdControlFormat" />
+            <el-table-column :label="$t('附属仪器仪表')" align="center" prop="gdIns" :formatter="gdInsFormat" />
+            <el-table-column :label="$t('有无泄漏')" align="center" prop="gdOut" :formatter="gdOutFormat" />
+            <el-table-column :label="$t('其它情况描述')" align="center" prop="gdOther" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('管道备注')" align="center" prop="gdRemark" :show-overflow-tooltip="true"/>
+          </el-table-column>
+          <el-table-column header-align="center" align="center" :label="$t('锅炉')">
+            <el-table-column :label="$t('锅炉区域/单元')" align="center" prop="glUnit" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('承压部件')" align="center" prop="glPressure" :formatter="glPressureFormat" />
+            <el-table-column :label="$t('安全附件')" align="center" prop="glSafe" :formatter="glSafeFormat" />
+            <el-table-column :label="$t('仪表及联锁保护装置')" align="center" prop="glIns" :formatter="glInsFormat" />
+            <el-table-column :label="$t('燃烧器')" align="center" prop="glBurn" :formatter="glBurnFormat" />
+            <el-table-column :label="$t('人员')+$t('证书')" align="center" prop="glCer" :formatter="glCerFormat" />
+            <el-table-column :label="$t('水质化验')" align="center" prop="glWater" :formatter="glWaterFormat" />
+            <el-table-column :label="$t('其它情况描述')" align="center" prop="glOther" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('锅炉')+$t('备注')" align="center" prop="glRemark" :show-overflow-tooltip="true"/>
           </el-table-column>
         </el-table>
         <el-table
@@ -1385,6 +1396,40 @@
       conOptions: [],
       belong: '',
       fileList: [],
+      // 容器本体字典
+      rqSelfOptions: [],
+      // 安全附件字典
+      rqSafeOptions: [],
+      // 安全保护装置字典
+      rqProtectOptions: [],
+      // 测量调控装置,紧急切断阀字典
+      rqControlOptions: [],
+      // 附属仪器仪表字典
+      rqInsOptions: [],
+      // 有无泄漏字典
+      rqOutOptions: [],
+      // 管道宏观字典
+      gdSelfOptions: [],
+      // 安全附件字典
+      gdSafeOptions: [],
+      // 测量调控装置字典
+      gdControlOptions: [],
+      // 附属仪器仪表字典
+      gdInsOptions: [],
+      // 有无泄漏字典
+      gdOutOptions: [],
+      // 承压部件字典
+      glPressureOptions: [],
+      // 安全附件字典
+      glSafeOptions: [],
+      // 仪表及联锁保护装置字典
+      glInsOptions: [],
+      // 燃烧器字典
+      glBurnOptions: [],
+      // 人员证书字典
+      glCerOptions: [],
+      // 水质化验字典
+      glWaterOptions: [],
     };
   },
   watch: {
@@ -1397,6 +1442,57 @@
     this.getDicts("REPORT_CON").then(response => {
       this.conOptions = response.data;
     });
+    this.getDicts("ABNORMALITY").then(response => {
+      this.rqSelfOptions = response.data;
+    });
+    this.getDicts("CONFORM").then(response => {
+      this.rqSafeOptions = response.data;
+    });
+    this.getDicts("CONFORM").then(response => {
+      this.rqProtectOptions = response.data;
+    });
+    this.getDicts("INTACT").then(response => {
+      this.rqControlOptions = response.data;
+    });
+    this.getDicts("INTACT").then(response => {
+      this.rqInsOptions = response.data;
+    });
+    this.getDicts("WITH_WITHOUT").then(response => {
+      this.rqOutOptions = response.data;
+    });
+    this.getDicts("ABNORMALITY").then(response => {
+      this.gdSelfOptions = response.data;
+    });
+    this.getDicts("CONFORM").then(response => {
+      this.gdSafeOptions = response.data;
+    });
+    this.getDicts("CONFORM").then(response => {
+      this.gdControlOptions = response.data;
+    });
+    this.getDicts("INTACT").then(response => {
+      this.gdInsOptions = response.data;
+    });
+    this.getDicts("WITH_WITHOUT").then(response => {
+      this.gdOutOptions = response.data;
+    });
+    this.getDicts("ABNORMALITY").then(response => {
+      this.glPressureOptions = response.data;
+    });
+    this.getDicts("CONFORM").then(response => {
+      this.glSafeOptions = response.data;
+    });
+    this.getDicts("CONFORM").then(response => {
+      this.glInsOptions = response.data;
+    });
+    this.getDicts("INTACT").then(response => {
+      this.glBurnOptions = response.data;
+    });
+    this.getDicts("CONFORM").then(response => {
+      this.glCerOptions = response.data;
+    });
+    this.getDicts("CONFORM").then(response => {
+      this.glWaterOptions = response.data;
+    });
   },
   methods: {
     init (id, taskId, processId,taskName) {
@@ -1451,6 +1547,74 @@
     conFormat(row, column) {
       return this.selectDictLabel(this.conOptions, row.con);
     },
+    // 容器本体字典翻译
+    rqSelfFormat(row, column) {
+      return this.selectDictLabel(this.rqSelfOptions, row.rqSelf);
+    },
+    // 安全附件字典翻译
+    rqSafeFormat(row, column) {
+      return this.selectDictLabel(this.rqSafeOptions, row.rqSafe);
+    },
+    // 安全保护装置字典翻译
+    rqProtectFormat(row, column) {
+      return this.selectDictLabel(this.rqProtectOptions, row.rqProtect);
+    },
+    // 测量调控装置,紧急切断阀字典翻译
+    rqControlFormat(row, column) {
+      return this.selectDictLabel(this.rqControlOptions, row.rqControl);
+    },
+    // 附属仪器仪表字典翻译
+    rqInsFormat(row, column) {
+      return this.selectDictLabel(this.rqInsOptions, row.rqIns);
+    },
+    // 有无泄漏字典翻译
+    rqOutFormat(row, column) {
+      return this.selectDictLabel(this.rqOutOptions, row.rqOut);
+    },
+    // 管道宏观字典翻译
+    gdSelfFormat(row, column) {
+      return this.selectDictLabel(this.gdSelfOptions, row.gdSelf);
+    },
+    // 安全附件字典翻译
+    gdSafeFormat(row, column) {
+      return this.selectDictLabel(this.gdSafeOptions, row.gdSafe);
+    },
+    // 测量调控装置字典翻译
+    gdControlFormat(row, column) {
+      return this.selectDictLabel(this.gdControlOptions, row.gdControl);
+    },
+    // 附属仪器仪表字典翻译
+    gdInsFormat(row, column) {
+      return this.selectDictLabel(this.gdInsOptions, row.gdIns);
+    },
+    // 有无泄漏字典翻译
+    gdOutFormat(row, column) {
+      return this.selectDictLabel(this.gdOutOptions, row.gdOut);
+    },
+    // 承压部件字典翻译
+    glPressureFormat(row, column) {
+      return this.selectDictLabel(this.glPressureOptions, row.glPressure);
+    },
+    // 安全附件字典翻译
+    glSafeFormat(row, column) {
+      return this.selectDictLabel(this.glSafeOptions, row.glSafe);
+    },
+    // 仪表及联锁保护装置字典翻译
+    glInsFormat(row, column) {
+      return this.selectDictLabel(this.glInsOptions, row.glIns);
+    },
+    // 燃烧器字典翻译
+    glBurnFormat(row, column) {
+      return this.selectDictLabel(this.glBurnOptions, row.glBurn);
+    },
+    // 人员证书字典翻译
+    glCerFormat(row, column) {
+      return this.selectDictLabel(this.glCerOptions, row.glCer);
+    },
+    // 水质化验字典翻译
+    glWaterFormat(row, column) {
+      return this.selectDictLabel(this.glWaterOptions, row.glWater);
+    },
     // 取消按钮
     cancel() {
       this.visible = false;

+ 0 - 5
ui/src/views/sems/month/monthapprove.vue

@@ -8,13 +8,8 @@
           border
           style="width: 100%">
           <el-table-column :label="$t('装置名称')" align="center" prop="plantCode" :show-overflow-tooltip="true"/>
-          <el-table-column :label="$t('申请状态')" align="center" prop="approveStatus" :show-overflow-tooltip="true"/>
           <el-table-column :label="$t('检查年月')" align="center" prop="checkMonth" width="100">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.checkMonth, '{y}-{m}') }}</span>
-            </template>
           </el-table-column>
-          <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
           <el-table-column header-align="center" align="center" :label="$t('压力容器')">
             <el-table-column :label="$t('容器单元')" align="center" prop="rqUnit" :show-overflow-tooltip="true"/>
             <el-table-column :label="$t('容器本体')" align="center" prop="rqSelf" :formatter="rqSelfFormat" />