LY bug fix

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevCcController.java

@@ -117,6 +117,7 @@ public class TSpecdevCcController extends BaseController
             tc.setNextWarnDate(tSpecdevCc.getNextWarnDate());
             tc.setReportNo(tSpecdevCc.getReportNo());
             tc.setWarnDate(tSpecdevCc.getWarnDate());
+            tc.setCheckConclusion(tSpecdevCc.getPerTestConclusion());
             tSpecCheckService.insertTSpecCheck(tc);
         }
         return toAjax(tSpecdevCcService.updateTSpecdevCc(tSpecdevCc));
@@ -137,6 +138,7 @@ public class TSpecdevCcController extends BaseController
      * 去重
      */
     @PreAuthorize("@ss.hasPermi('sems:plant:remove')")
+    @Log(title = "特种设备叉车台账去重", businessType = BusinessType.OTHER)
     @GetMapping("/duplicate")
     public AjaxResult duplicate()
     {
@@ -384,6 +386,7 @@ public class TSpecdevCcController extends BaseController
             tc.setNextWarnDate(t.getNextWarnDate());
             tc.setReportNo(t.getReportNo());
             tc.setWarnDate(t.getWarnDate());
+            tc.setCheckConclusion(t.getPerTestConclusion());
             tSpecCheckService.insertTSpecCheck(tc);
         }
         logger.info("list:" + JSON.toJSONString(list));

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevDtController.java

@@ -114,6 +114,7 @@ public class TSpecdevDtController extends BaseController
             tc.setNextWarnDate(tSpecdevDt.getNextWarnDate());
             tc.setReportNo(tSpecdevDt.getReportNo());
             tc.setWarnDate(tSpecdevDt.getWarnDate());
+            tc.setCheckConclusion(tSpecdevDt.getPerTestConclusion());
             tSpecCheckService.insertTSpecCheck(tc);
         }
         return toAjax(tSpecdevDtService.updateTSpecdevDt(tSpecdevDt));
@@ -134,6 +135,7 @@ public class TSpecdevDtController extends BaseController
      * 去重
      */
     @PreAuthorize("@ss.hasPermi('sems:plant:remove')")
+    @Log(title = "特种设备电梯台账去重", businessType = BusinessType.OTHER)
     @GetMapping("/duplicate")
     public AjaxResult duplicate()
     {
@@ -366,6 +368,7 @@ public class TSpecdevDtController extends BaseController
             tc.setNextWarnDate(t.getNextWarnDate());
             tc.setReportNo(t.getReportNo());
             tc.setWarnDate(t.getWarnDate());
+            tc.setCheckConclusion(t.getPerTestConclusion());
             tSpecCheckService.insertTSpecCheck(tc);
         }
         logger.info("list:" + JSON.toJSONString(list));

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevDzsbController.java

@@ -115,6 +115,7 @@ public class TSpecdevDzsbController extends BaseController
             tc.setNextWarnDate(tSpecdevDzsb.getNextWarnDate());
             tc.setReportNo(tSpecdevDzsb.getReportNo());
             tc.setWarnDate(tSpecdevDzsb.getWarnDate());
+            tc.setCheckConclusion(tSpecdevDzsb.getPerTestConclusion());
             tSpecCheckService.insertTSpecCheck(tc);
         }
         return toAjax(tSpecdevDzsbService.updateTSpecdevDzsb(tSpecdevDzsb));
@@ -135,6 +136,7 @@ public class TSpecdevDzsbController extends BaseController
      * 去重
      */
     @PreAuthorize("@ss.hasPermi('sems:plant:remove')")
+    @Log(title = "特种设备起重机械台账去重", businessType = BusinessType.OTHER)
     @GetMapping("/duplicate")
     public AjaxResult duplicate()
     {
@@ -377,6 +379,7 @@ public class TSpecdevDzsbController extends BaseController
             tc.setNextWarnDate(t.getNextWarnDate());
             tc.setReportNo(t.getReportNo());
             tc.setWarnDate(t.getWarnDate());
+            tc.setCheckConclusion(t.getPerTestConclusion());
             tSpecCheckService.insertTSpecCheck(tc);
         }
         logger.info("list:" + JSON.toJSONString(list));

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevGlController.java

@@ -112,6 +112,7 @@ public class TSpecdevGlController extends BaseController
             tc.setNextWarnDate(tSpecdevGl.getNextWarnDate());
             tc.setReportNo(tSpecdevGl.getReportNo());
             tc.setWarnDate(tSpecdevGl.getWarnDate());
+            tc.setCheckConclusion(tSpecdevGl.getCheckConclusion());
             tc.setOutWarnDate(tSpecdevGl.getOutWarnDate());
             tc.setOutReportNo(tSpecdevGl.getOutReportNo());
             tc.setOutCheckConclusion(tSpecdevGl.getOutCheckConclusion());
@@ -136,6 +137,7 @@ public class TSpecdevGlController extends BaseController
      * 去重
      */
     @PreAuthorize("@ss.hasPermi('sems:plant:remove')")
+    @Log(title = "特种设备锅炉台账去重", businessType = BusinessType.OTHER)
     @GetMapping("/duplicate")
     public AjaxResult duplicate()
     {
@@ -410,6 +412,7 @@ public class TSpecdevGlController extends BaseController
             tc.setNextWarnDate(t.getNextWarnDate());
             tc.setReportNo(t.getReportNo());
             tc.setWarnDate(t.getWarnDate());
+            tc.setCheckConclusion(t.getCheckConclusion());
             tc.setOutWarnDate(t.getOutWarnDate());
             tc.setOutReportNo(t.getOutReportNo());
             tc.setOutCheckConclusion(t.getOutCheckConclusion());

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevYlgdController.java

@@ -115,6 +115,7 @@ public class TSpecdevYlgdController extends BaseController {
             tc.setYearWarnDate(tSpecdevYlgd.getYearWarnDate());
             tc.setYearReportNo(tSpecdevYlgd.getReportNo());
             tc.setSafeClass(tSpecdevYlgd.getSafeClass());
+            tc.setCheckConclusion(tSpecdevYlgd.getCheckConclusion());
             tSpecCheckService.insertTSpecCheck(tc);
         }
 
@@ -135,6 +136,7 @@ public class TSpecdevYlgdController extends BaseController {
      * 去重
      */
     @PreAuthorize("@ss.hasPermi('sems:plant:remove')")
+    @Log(title = "特种设备压力管道台账去重", businessType = BusinessType.OTHER)
     @GetMapping("/duplicate")
     public AjaxResult duplicate()
     {
@@ -448,6 +450,7 @@ public class TSpecdevYlgdController extends BaseController {
             tc.setYearWarnDate(t.getYearWarnDate());
             tc.setYearReportNo(t.getReportNo());
             tc.setSafeClass(t.getSafeClass());
+            tc.setCheckConclusion(t.getCheckConclusion());
             tSpecCheckService.insertTSpecCheck(tc);
         }
         logger.info("list:" + JSON.toJSONString(list));

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevYlrqController.java

@@ -128,6 +128,7 @@ public class TSpecdevYlrqController extends BaseController
             tc.setYearWarnDate(tSpecdevYlrq.getYearWarnDate());
             tc.setYearReportNo(tSpecdevYlrq.getReportNo());
             tc.setSafeClass(tSpecdevYlrq.getSafeClass());
+            tc.setCheckConclusion(tSpecdevYlrq.getCheckConclusion());
             tSpecCheckService.insertTSpecCheck(tc);
         }
         return toAjax(tSpecdevYlrqService.updateTSpecdevYlrq(tSpecdevYlrq));
@@ -159,6 +160,7 @@ public class TSpecdevYlrqController extends BaseController
      * 去重
      */
     @PreAuthorize("@ss.hasPermi('sems:plant:remove')")
+    @Log(title = "特种设备压力容器台账去重", businessType = BusinessType.OTHER)
     @GetMapping("/duplicate")
     public AjaxResult duplicate()
     {
@@ -456,6 +458,7 @@ public class TSpecdevYlrqController extends BaseController
                 tc.setYearWarnDate(t.getYearWarnDate());
                 tc.setYearReportNo(t.getReportNo());
                 tc.setSafeClass(t.getSafeClass());
+                tc.setCheckConclusion(t.getCheckConclusion());
                 tSpecCheckService.insertTSpecCheck(tc);
 //            }
         }

master/src/main/java/com/ruoyi/project/training/controller/TWorklicenseController.java

@@ -19,6 +19,7 @@ import com.ruoyi.project.training.domain.TByxWorklicense;
 import com.ruoyi.project.training.domain.TTrainingWorklicense;
 import com.ruoyi.project.training.domain.TWorklicense;
 import com.ruoyi.project.training.mapper.TWorklicenseMapper;
+import com.ruoyi.project.training.service.ITByxWorklicenseService;
 import com.ruoyi.project.training.service.ITWorklicenseService;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
@@ -46,6 +47,8 @@ public class TWorklicenseController extends BaseController
 {
     @Autowired
     private ITWorklicenseService tWorklicenseService;
+    @Autowired
+    private ITByxWorklicenseService tByxWorklicenseService;
 
     @Autowired
     private ISysDeptService iSysDeptService;
@@ -80,37 +83,76 @@ public class TWorklicenseController extends BaseController
     {
         List<TWorklicense> list = tWorklicenseService.selectTWorklicenseList(tWorklicense);
         List<TTrainingWorklicense> tTrainingWorklicenses = new ArrayList<TTrainingWorklicense>();
-        if ("1".equals(list.get(0).getBoiler())) {
-            TTrainingWorklicense tTrainingWorklicense = new TTrainingWorklicense();
-            tTrainingWorklicense.setWorklicenseId(list.get(0).getId());
-            tTrainingWorklicense.setId(list.get(0).getId());
-            tTrainingWorklicense.setWorklicenseType("裂解");
-            tTrainingWorklicense.setWorklicenseIdnum(list.get(0).getCrackingIdnum());
-            tTrainingWorklicenses.add(tTrainingWorklicense);
-        }
-        if ("1".equals(list.get(0).getCracking())) {
-            TTrainingWorklicense tTrainingWorklicense = new TTrainingWorklicense();
-            tTrainingWorklicense.setId(list.get(0).getId());
-            tTrainingWorklicense.setWorklicenseId(list.get(0).getId());
-            tTrainingWorklicense.setWorklicenseType("压缩");
-            tTrainingWorklicense.setWorklicenseIdnum(list.get(0).getCrackingIdnum());
-            tTrainingWorklicenses.add(tTrainingWorklicense);
-        }
-        if ("1".equals(list.get(0).getHotarea())) {
-            TTrainingWorklicense tTrainingWorklicense = new TTrainingWorklicense();
-            tTrainingWorklicense.setWorklicenseId(list.get(0).getId());
-            tTrainingWorklicense.setId(list.get(0).getId());
-            tTrainingWorklicense.setWorklicenseType("分离");
-            tTrainingWorklicense.setWorklicenseIdnum(list.get(0).getCrackingIdnum());
-            tTrainingWorklicenses.add(tTrainingWorklicense);
+        if (list.size() > 0) {
+            if ("1".equals(list.get(0).getBoiler())) {
+                TTrainingWorklicense tTrainingWorklicense = new TTrainingWorklicense();
+                tTrainingWorklicense.setWorklicenseId(list.get(0).getId());
+                tTrainingWorklicense.setId(list.get(0).getId());
+                tTrainingWorklicense.setWorklicenseType("裂解");
+                tTrainingWorklicense.setWorklicenseIdnum(list.get(0).getCrackingIdnum());
+                tTrainingWorklicenses.add(tTrainingWorklicense);
+            }
+            if ("1".equals(list.get(0).getCracking())) {
+                TTrainingWorklicense tTrainingWorklicense = new TTrainingWorklicense();
+                tTrainingWorklicense.setId(list.get(0).getId());
+                tTrainingWorklicense.setWorklicenseId(list.get(0).getId());
+                tTrainingWorklicense.setWorklicenseType("压缩");
+                tTrainingWorklicense.setWorklicenseIdnum(list.get(0).getCrackingIdnum());
+                tTrainingWorklicenses.add(tTrainingWorklicense);
+            }
+            if ("1".equals(list.get(0).getHotarea())) {
+                TTrainingWorklicense tTrainingWorklicense = new TTrainingWorklicense();
+                tTrainingWorklicense.setWorklicenseId(list.get(0).getId());
+                tTrainingWorklicense.setId(list.get(0).getId());
+                tTrainingWorklicense.setWorklicenseType("分离");
+                tTrainingWorklicense.setWorklicenseIdnum(list.get(0).getCrackingIdnum());
+                tTrainingWorklicenses.add(tTrainingWorklicense);
+            }
+            if ("1".equals(list.get(0).getColdarea())) {
+                TTrainingWorklicense tTrainingWorklicense = new TTrainingWorklicense();
+                tTrainingWorklicense.setWorklicenseId(list.get(0).getId());
+                tTrainingWorklicense.setId(list.get(0).getId());
+                tTrainingWorklicense.setWorklicenseType("PGU/AEU");
+                tTrainingWorklicense.setWorklicenseIdnum(list.get(0).getCrackingIdnum());
+                tTrainingWorklicenses.add(tTrainingWorklicense);
+            }
         }
-        if ("1".equals(list.get(0).getColdarea())) {
-            TTrainingWorklicense tTrainingWorklicense = new TTrainingWorklicense();
-            tTrainingWorklicense.setWorklicenseId(list.get(0).getId());
-            tTrainingWorklicense.setId(list.get(0).getId());
-            tTrainingWorklicense.setWorklicenseType("PGU/AEU");
-            tTrainingWorklicense.setWorklicenseIdnum(list.get(0).getCrackingIdnum());
-            tTrainingWorklicenses.add(tTrainingWorklicense);
+        TByxWorklicense byxWorklicense = new TByxWorklicense();
+        byxWorklicense.setEmployeeid(tWorklicense.getEmployeeid());
+        List<TByxWorklicense> byxList = tByxWorklicenseService.selectTByxWorklicenseList(byxWorklicense);
+        if (byxList.size() > 0) {
+            if ("1".equals(byxList.get(0).getContainer())) {
+                TTrainingWorklicense tTrainingWorklicense = new TTrainingWorklicense();
+                tTrainingWorklicense.setWorklicenseId(byxList.get(0).getId());
+                tTrainingWorklicense.setId(byxList.get(0).getId());
+                tTrainingWorklicense.setWorklicenseType("压力容器");
+                tTrainingWorklicense.setWorklicenseIdnum(byxList.get(0).getContainerIdnum());
+                tTrainingWorklicenses.add(tTrainingWorklicense);
+            }
+            if ("1".equals(byxList.get(0).getPipe())) {
+                TTrainingWorklicense tTrainingWorklicense = new TTrainingWorklicense();
+                tTrainingWorklicense.setWorklicenseId(byxList.get(0).getId());
+                tTrainingWorklicense.setId(byxList.get(0).getId());
+                tTrainingWorklicense.setWorklicenseType("压力管道");
+                tTrainingWorklicense.setWorklicenseIdnum(byxList.get(0).getPipeIdnum());
+                tTrainingWorklicenses.add(tTrainingWorklicense);
+            }
+            if ("1".equals(byxList.get(0).getBoiler())) {
+                TTrainingWorklicense tTrainingWorklicense = new TTrainingWorklicense();
+                tTrainingWorklicense.setWorklicenseId(byxList.get(0).getId());
+                tTrainingWorklicense.setId(byxList.get(0).getId());
+                tTrainingWorklicense.setWorklicenseType("裂解");
+                tTrainingWorklicense.setWorklicenseIdnum(byxList.get(0).getBoilerIdnum());
+                tTrainingWorklicenses.add(tTrainingWorklicense);
+            }
+            if ("1".equals(byxList.get(0).getAlkylation())) {
+                TTrainingWorklicense tTrainingWorklicense = new TTrainingWorklicense();
+                tTrainingWorklicense.setWorklicenseId(byxList.get(0).getId());
+                tTrainingWorklicense.setId(byxList.get(0).getId());
+                tTrainingWorklicense.setWorklicenseType("烷基化");
+                tTrainingWorklicense.setWorklicenseIdnum(byxList.get(0).getAlkylationIdnum());
+                tTrainingWorklicenses.add(tTrainingWorklicense);
+            }
         }
         return tTrainingWorklicenses;
     }

master/src/main/resources/freeMaker/yearYlgdFMaker.ftl

@@ -499,7 +499,7 @@
 					<p style="margin:0pt; text-align:center">
 						<#--<img src='${inspectorOne}' style="height: 30pt"/>-->
 						<span style="font-family:SimSun; font-size:11pt">
-							<#if inspectorOneName??>${inspectorOneName}</#if>
+							<#if inspectorOne??>${inspectorOne}</#if>
 						</span>
 					</p>
 				</td>

ui/src/views/approve/myapprove/index.vue

@@ -20,11 +20,11 @@
       </el-table-column>
       <el-table-column :label="$t('操作')" align="center" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            @click="cancelProcess(scope.row)"
-          >{{ $t('查看') }}</el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            @click="cancelProcess(scope.row)"-->
+<!--          >{{ $t('查看') }}</el-button>-->
           <el-button
             size="mini"
             type="text"

ui/src/views/ehs/safetyapproval/index.vue

@@ -104,7 +104,6 @@
       <el-table-column :label="$t('排放/监控要求')" align="center" prop="requirements" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('主要内容')" align="center" width="250" prop="content">
         <template slot-scope="scope">
-          <span v-if="scope.row.conPic === 'false'">{{ scope.row.content }}</span>
           <span v-if="scope.row.conPic === 'true'">
             <el-image
               style="width: 100px; height: 100px"
@@ -113,6 +112,7 @@
               >
             </el-image>
           </span>
+          <span v-else>{{ scope.row.content }}</span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('负责人')" align="center" prop="owner" :show-overflow-tooltip="true"/>

ui/src/views/sems/specCc/index.vue

@@ -501,8 +501,8 @@
       </div>
     </el-dialog>
     <el-dialog v-dialogDrag :title="modifyTitle" :visible.sync="modifyVisible" width="550px" append-to-body>
-      <el-form>
-        <el-form-item ref="modifyForm" :model="modifyForm" :label="$t('确认人')" prop="plantMaint">
+      <el-form ref="modifyForm" :model="modifyForm" :rules="modifyRules">
+        <el-form-item :label="$t('确认人')" prop="wxjl">
           <el-select v-model="modifyForm.wxjl" :placeholder="$t('请选择')+ $t('装置维修经理')" filterable clearable size="small">
             <el-option
               v-for="dict in wxjlList"
@@ -523,7 +523,7 @@
 </template>
 
 <script>
-  import {addSpecCc, exportSpecCc, getSpecCc, listSpecCc, updateSpecCcPre,exportSpecList, duplicate} from "@/api/sems/specCc";
+  import {addSpecCc, exportSpecCc, getSpecCc, listSpecCc,updateSpecCc, updateSpecCcPre,exportSpecList, duplicate} from "@/api/sems/specCc";
   import {treeselect} from "@/api/system/dept";
   import {getToken} from "@/utils/auth";
   import Treeselect from "@riophae/vue-treeselect";
@@ -624,6 +624,11 @@
         plantCode: [
           { required: true, message: this.$t('装置名称')+this.$t('不能为空'), trigger: "blur" }
         ],
+      },
+      modifyRules: {
+        wxjl: [
+          { required: true, message: this.$t('维修经理')+this.$t('不能为空'), trigger: "blur" }
+        ],
       }
     };
   },
@@ -651,7 +656,7 @@
             text:'',
             value:''
           };
-          
+
       items.value = response.data[i].dictValue;
           items.text = response.data[i].dictLabel;
           this.filterList.push(items);
@@ -810,12 +815,12 @@
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            /*updateSpecCc(this.form).then(response => {
+            updateSpecCc(this.form).then(response => {
               this.msgSuccess(this.$t('修改成功'));
               this.open = false;
               this.getList();
-            });*/
-            updateSpecCcPre(this.form).then(response => {
+            });
+           /* updateSpecCcPre(this.form).then(response => {
               this.open = false;
               this.getList();
               this.modifyForm.hisId = response.data
@@ -828,7 +833,7 @@
               listPostUser(this.queryParams).then(response => {
                 this.wxjlList = response;
               });
-            });
+            });*/
           } else {
             addSpecCc(this.form).then(response => {
               this.msgSuccess(this.$t('新增成功'));
@@ -861,7 +866,6 @@
         }
       }
       this.open = false;
-      this.getList();
       this.modifyForm.hisId = 2
       this.modifyForm.devType = this.devType
       this.modifyForm.approveType = 2
@@ -1028,11 +1032,15 @@
       return process.env.VUE_APP_BASE_API + "/sems/specCc/updateData"
     },
     submitModofyForm () {
-      addModify(this.modifyForm).then(response => {
-        this.msgSuccess(this.$t('提交成功'));
-        this.modifyVisible = false
-        this.getList();
-      });
+      this.$refs["modifyForm"].validate(valid => {
+        if (valid) {
+          addModify(this.modifyForm).then(response => {
+            this.msgSuccess(this.$t('提交成功'));
+            this.modifyVisible = false
+            this.getList();
+          });
+        }
+      })
     },
     //位号颜色变换
     tableCellStyle({ row, column, rowIndex, columnIndex }) {

ui/src/views/sems/specDt/index.vue

@@ -453,8 +453,8 @@
       </div>
     </el-dialog>
     <el-dialog v-dialogDrag :title="modifyTitle" :visible.sync="modifyVisible" width="550px" append-to-body>
-      <el-form>
-        <el-form-item ref="modifyForm" :model="modifyForm" :label="$t('确认人')" prop="plantMaint">
+      <el-form ref="modifyForm" :model="modifyForm" :rules="modifyRules">
+        <el-form-item  :label="$t('确认人')" prop="wxjl">
           <el-select v-model="modifyForm.wxjl" :placeholder="$t('请选择')+ $t('装置维修经理')" filterable clearable size="small">
             <el-option
               v-for="dict in wxjlList"
@@ -477,7 +477,7 @@
 </template>
 
 <script>
-  import {addSpecDt, duplicate, exportSpecDt, getSpecDt, listSpecDt, updateSpecDtPre,exportSpecList} from "@/api/sems/specDt";
+  import {addSpecDt, duplicate, exportSpecDt, getSpecDt, listSpecDt, updateSpecDt,exportSpecList} from "@/api/sems/specDt";
   import {treeselect} from "@/api/system/dept";
   import {getToken} from "@/utils/auth";
   import Treeselect from "@riophae/vue-treeselect";
@@ -576,6 +576,11 @@
         plantCode: [
           { required: true, message: this.$t('装置名称') + this.$t('不能为空'), trigger: "blur" }
         ],
+      },
+      modifyRules: {
+        wxjl: [
+          { required: true, message: this.$t('维修经理')+this.$t('不能为空'), trigger: "blur" }
+        ],
       }
     };
   },
@@ -763,12 +768,12 @@
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            /*updateSpecDt(this.form).then(response => {
+            updateSpecDt(this.form).then(response => {
               this.msgSuccess(this.$t('修改成功'));
               this.open = false;
               this.getList();
-            });*/
-            updateSpecDtPre(this.form).then(response => {
+            });
+            /*updateSpecDtPre(this.form).then(response => {
               this.open = false;
               this.getList();
               this.modifyForm.hisId = response.data
@@ -781,7 +786,7 @@
               listPostUser(this.queryParams).then(response => {
                 this.wxjlList = response;
               });
-            });
+            });*/
           } else {
             addSpecDt(this.form).then(response => {
               this.msgSuccess(this.$t('新增成功'));
@@ -949,11 +954,15 @@
       return process.env.VUE_APP_BASE_API + "/sems/specDt/updateData"
     },
     submitModofyForm () {
-      addModify(this.modifyForm).then(response => {
-        this.msgSuccess(this.$t('提交成功'));
-        this.modifyVisible = false
-        this.getList();
-      });
+      this.$refs["modifyForm"].validate(valid => {
+        if (valid) {
+          addModify(this.modifyForm).then(response => {
+            this.msgSuccess(this.$t('提交成功'));
+            this.modifyVisible = false
+            this.getList();
+          });
+        }
+      })
     },
     //位号颜色变换
     tableCellStyle({ row, column, rowIndex, columnIndex }) {

ui/src/views/sems/specDzsb/index.vue

@@ -475,8 +475,8 @@
       </div>
     </el-dialog>
     <el-dialog v-dialogDrag :title="modifyTitle" :visible.sync="modifyVisible" width="550px" append-to-body>
-      <el-form>
-        <el-form-item ref="modifyForm" :model="modifyForm" :label="$t('确认人')" prop="plantMaint">
+      <el-form ref="modifyForm" :model="modifyForm" :rules="modifyRules">
+        <el-form-item  :label="$t('确认人')" prop="wxjl">
           <el-select v-model="modifyForm.wxjl" :placeholder="$t('请选择')+ $t('装置维修经理')" filterable clearable size="small">
             <el-option
               v-for="dict in wxjlList"
@@ -503,7 +503,7 @@
     exportSpecDzsb,
     getSpecDzsb,
     listSpecDzsb,
-    updateSpecDzsbPre, duplicate
+    updateSpecDzsb, duplicate
   } from "@/api/sems/specDzsb";
   import {treeselect} from "@/api/system/dept";
   import {getToken} from "@/utils/auth";
@@ -615,12 +615,14 @@
       modifyForm: {},
       // 表单校验
       rules: {
-        id: [
-          { required: true, message: this.$t('唯一标识ID')+this.$t('不能为空'), trigger: "blur" }
-        ],
         plantCode: [
           { required: true, message: this.$t('装置名称')+this.$t('不能为空'), trigger: "blur" }
         ],
+      },
+      modifyRules: {
+        wxjl: [
+          { required: true, message: this.$t('维修经理')+this.$t('不能为空'), trigger: "blur" }
+        ],
       }
     };
   },
@@ -796,12 +798,12 @@
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            /*updateSpecDzsb(this.form).then(response => {
+            updateSpecDzsb(this.form).then(response => {
               this.msgSuccess(this.$t('修改成功'));
               this.open = false;
               this.getList();
-            });*/
-            updateSpecDzsbPre(this.form).then(response => {
+            });
+           /* updateSpecDzsbPre(this.form).then(response => {
               this.open = false;
               this.getList();
               this.modifyForm.hisId = response.data
@@ -814,7 +816,7 @@
               listPostUser(this.queryParams).then(response => {
                 this.wxjlList = response;
               });
-            });
+            });*/
           } else {
             addSpecDzsb(this.form).then(response => {
               this.msgSuccess(this.$t('新增成功'));
@@ -995,11 +997,15 @@
       return process.env.VUE_APP_BASE_API + "/sems/specDzsb/updateData"
     },
     submitModofyForm () {
-      addModify(this.modifyForm).then(response => {
-        this.msgSuccess(this.$t('提交成功'));
-        this.modifyVisible = false
-        this.getList();
-      });
+      this.$refs["modifyForm"].validate(valid => {
+        if (valid) {
+          addModify(this.modifyForm).then(response => {
+            this.msgSuccess(this.$t('提交成功'));
+            this.modifyVisible = false
+            this.getList();
+          });
+        }
+      })
     },
     //位号颜色变换
     tableCellStyle({ row, column, rowIndex, columnIndex }) {

ui/src/views/sems/specGl/index.vue

@@ -62,12 +62,12 @@
       :key="item.value"
       :label="item.text"
       :value="item.value">
-      <div>  
-        <span v-if="item.value==1" style="width:45px;height:30px; float: left;background-color:#ffff00"> </span> 
+      <div>
+        <span v-if="item.value==1" style="width:45px;height:30px; float: left;background-color:#ffff00"> </span>
  <span v-if="item.value==1" style=" float: right; color: #121010 ; font-size: 16px">{{item.text }}</span>
-        <span v-if="item.value==2" style="width:45px;height:30px; float: left;background-color:#ff9900 "></span> 
+        <span v-if="item.value==2" style="width:45px;height:30px; float: left;background-color:#ff9900 "></span>
  <span v-if="item.value==2" style=" float: right; color: #121010 ; font-size: 16px">{{item.text}}</span>
-        <span v-if="item.value==3" style="width:45px;height:30px; float: left;background-color:#FF4500;"> </span> 
+        <span v-if="item.value==3" style="width:45px;height:30px; float: left;background-color:#FF4500;"> </span>
  <span v-if="item.value==3" style=" float: right; color: #121010 ; font-size: 16px">{{item.text }}</span>
         </div>
     </el-option>
@@ -551,9 +551,9 @@
       </div>
     </el-dialog>
     <el-dialog v-dialogDrag :title="modifyTitle" :visible.sync="modifyVisible" width="550px" append-to-body>
-      <el-form>
-        <el-form-item ref="modifyForm" :model="modifyForm" :label="$t('确认人')" prop="plantMaint">
-          <el-select v-model="modifyForm.wxjl" :placeholder="$t('请选择')+ $t('装置维修经理')" filterable clearable size="small">
+      <el-form :rules="modifyRules" :model="modifyForm" ref="modifyForm">
+        <el-form-item  prop="wxjl" :label="$t('确认人')">
+          <el-select v-model="modifyForm.wxjl"  :placeholder="$t('请选择')+ $t('装置维修经理')" filterable clearable size="small">
             <el-option
               v-for="dict in wxjlList"
               :key="dict.userId"
@@ -574,7 +574,7 @@
 </template>
 
 <script>
-  import {addSpecGl, exportSpecList, exportSpecGl, getSpecGl, listSpecGl, updateSpecGlPre, duplicate} from "@/api/sems/specGl";
+  import {addSpecGl, exportSpecList, exportSpecGl, getSpecGl, listSpecGl,updateSpecGl, updateSpecGlPre, duplicate} from "@/api/sems/specGl";
   import {treeselect} from "@/api/system/dept";
   import {getToken} from "@/utils/auth";
   import Treeselect from "@riophae/vue-treeselect";
@@ -694,6 +694,11 @@
         plantCode: [
           { required: true, message: this.$t('装置名称')+this.$t('不能为空'), trigger: "blur" }
         ],
+      },
+      modifyRules: {
+        wxjl: [
+          { required: true, message: this.$t('维修经理')+this.$t('不能为空'), trigger: "blur" }
+        ],
       }
     };
   },
@@ -874,25 +879,25 @@
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            /*updateSpecGl(this.form).then(response => {
+            updateSpecGl(this.form).then(response => {
               this.msgSuccess(this.$t('修改成功'));
               this.open = false;
               this.getList();
-            });*/
-            updateSpecGlPre(this.form).then(response => {
-              this.open = false;
-              this.getList();
-              this.modifyForm.hisId = response.data
-              this.modifyForm.devId = this.form.id
-              this.modifyForm.devType = this.devType
-              this.modifyForm.approveType = 1
-              this.modifyVisible = true
-              this.modifyTitle = this.$t('设备修改申请')
-              this.queryParams.postCode = 'wxjl'
-              listPostUser(this.queryParams).then(response => {
-                this.wxjlList = response;
-              });
             });
+            // updateSpecGlPre(this.form).then(response => {
+            //   this.open = false;
+            //   this.getList();
+            //   this.modifyForm.hisId = response.data
+            //   this.modifyForm.devId = this.form.id
+            //   this.modifyForm.devType = this.devType
+            //   this.modifyForm.approveType = 1
+            //   this.modifyVisible = true
+            //   this.modifyTitle = this.$t('设备修改申请')
+            //   this.queryParams.postCode = 'wxjl'
+            //   listPostUser(this.queryParams).then(response => {
+            //     this.wxjlList = response;
+            //   });
+            // });
           } else {
             addSpecGl(this.form).then(response => {
               this.msgSuccess(this.$t('新增成功'));
@@ -925,7 +930,6 @@
         }
       }
       this.open = false;
-      this.getList();
       this.modifyForm.hisId = 2
       this.modifyForm.devType = this.devType
       this.modifyForm.approveType = 2
@@ -1073,11 +1077,16 @@
       return process.env.VUE_APP_BASE_API + "/sems/specGl/updateData"
     },
     submitModofyForm () {
-      addModify(this.modifyForm).then(response => {
-        this.msgSuccess(this.$t('提交成功'));
-        this.modifyVisible = false
-        this.getList();
-      });
+      this.$refs["modifyForm"].validate(valid => {
+        if (valid) {
+          addModify(this.modifyForm).then(response => {
+            this.msgSuccess(this.$t('提交成功'));
+            this.modifyVisible = false
+            this.getList();
+          });
+        }
+      })
+
     },
     //位号颜色变换
     tableCellStyle({ row, column, rowIndex, columnIndex }) {

ui/src/views/sems/specYlgd/index.vue

@@ -683,8 +683,8 @@
       </div>
     </el-dialog>
     <el-dialog v-dialogDrag :title="modifyTitle" :visible.sync="modifyVisible" width="550px" append-to-body>
-      <el-form>
-        <el-form-item ref="modifyForm" :model="modifyForm" :label="$t('确认人')" prop="plantMaint">
+      <el-form ref="modifyForm" :model="modifyForm" :rules="modifyRules">
+        <el-form-item :label="$t('确认人')" prop="wxjl">
           <el-select v-model="modifyForm.wxjl" :placeholder="$t('请选择')+ $t('装置维修经理')" filterable clearable size="small">
             <el-option
               v-for="dict in wxjlList"
@@ -832,6 +832,14 @@ export default {
       modifyForm: {},
       // 表单校验
       rules: {
+        plantCode: [
+          { required: true, message: this.$t('装置名称')+this.$t('不能为空'), trigger: "blur" }
+        ],
+      },
+      modifyRules: {
+        wxjl: [
+          { required: true, message: this.$t('维修经理')+this.$t('不能为空'), trigger: "blur" }
+        ],
       }
     };
   },
@@ -1023,12 +1031,12 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            /*updateSpecYlgd(this.form).then(response => {
+            updateSpecYlgd(this.form).then(response => {
               this.msgSuccess(this.$t('修改成功'));
               this.open = false;
               this.getList();
-            });*/
-            updateSpecYlgdPre(this.form).then(response => {
+            });
+            /*updateSpecYlgdPre(this.form).then(response => {
               this.open = false;
               this.getList();
               this.modifyForm.hisId = response.data
@@ -1041,7 +1049,7 @@ export default {
               listPostUser(this.queryParams).then(response => {
                 this.wxjlList = response;
               });
-            });
+            });*/
           } else {
             addSpecYlgd(this.form).then(response => {
               this.msgSuccess(this.$t('新增成功'));
@@ -1223,11 +1231,15 @@ export default {
       return process.env.VUE_APP_BASE_API + "/sems/specYlgd/updateData"
     },
     submitModofyForm () {
-      addModify(this.modifyForm).then(response => {
-        this.msgSuccess(this.$t('提交成功'));
-        this.modifyVisible = false
-        this.getList();
-      });
+      this.$refs["modifyForm"].validate(valid => {
+        if (valid) {
+          addModify(this.modifyForm).then(response => {
+            this.msgSuccess(this.$t('提交成功'));
+            this.modifyVisible = false
+            this.getList();
+          });
+        }
+      })
     },
     //位号颜色变换
     tableCellStyle({ row, column, rowIndex, columnIndex }) {

ui/src/views/sems/specYlrq/index.vue

@@ -638,8 +638,8 @@
       </div>
     </el-dialog>
     <el-dialog v-dialogDrag :title="modifyTitle" :visible.sync="modifyVisible" width="550px" append-to-body>
-      <el-form>
-        <el-form-item ref="modifyForm" :model="modifyForm" :label="$t('确认人')" prop="plantMaint">
+      <el-form ref="modifyForm" :model="modifyForm" :rules="modifyRules">
+        <el-form-item  :label="$t('确认人')" prop="wxjl">
           <el-select v-model="modifyForm.wxjl" :placeholder="$t('请选择')+ $t('装置维修经理')" filterable clearable size="small">
             <el-option
               v-for="dict in wxjlList"
@@ -666,6 +666,7 @@ import {
   getSpecYlrq,
   listSpecYlrq,
   updateSpecYlrqPre,
+  updateSpecYlrq,
   exportSpecList,
   duplicate
 } from "@/api/sems/specYlrq";
@@ -769,6 +770,11 @@ export default {
         plantCode: [
           {required: true, message: this.$t('装置名称') + this.$t('不能为空'), trigger: "blur"}
         ],
+      },
+      modifyRules: {
+        wxjl: [
+          { required: true, message: this.$t('维修经理')+this.$t('不能为空'), trigger: "blur" }
+        ],
       }
     };
   },
@@ -959,12 +965,12 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            // updateSpecYlrq(this.form).then(response => {
-            //   this.msgSuccess("修改成功");
-            //   this.open = false;
-            //   this.getList();
-            // });
-            updateSpecYlrqPre(this.form).then(response => {
+            updateSpecYlrq(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+            /*updateSpecYlrqPre(this.form).then(response => {
               this.open = false;
               this.getList();
               this.modifyForm.hisId = response.data
@@ -977,7 +983,7 @@ export default {
               listPostUser(this.queryParams).then(response => {
                 this.wxjlList = response;
               });
-            });
+            });*/
           } else {
             addSpecYlrq(this.form).then(response => {
               this.msgSuccess(this.$t('新增成功'));
@@ -1159,11 +1165,15 @@ export default {
       return process.env.VUE_APP_BASE_API + "/sems/specYlrq/updateData"
     },
     submitModofyForm() {
-      addModify(this.modifyForm).then(response => {
-        this.msgSuccess(this.$t('提交成功'));
-        this.modifyVisible = false
-        this.getList();
-      });
+      this.$refs["modifyForm"].validate(valid => {
+        if (valid) {
+          addModify(this.modifyForm).then(response => {
+            this.msgSuccess(this.$t('提交成功'));
+            this.modifyVisible = false
+            this.getList();
+          });
+        }
+      })
     },
     /*tableRowClassName(row){
       if (row.devno != 0){

ui/src/views/training/byxWorkcertificate/index.vue

@@ -561,6 +561,9 @@ import {
         if (columnIndex === 10||columnIndex === 11||columnIndex === 12) {
           return "background:#DDFFFF;";
         }
+        if (columnIndex === 13||columnIndex === 14||columnIndex === 15) {
+          return "background:rgb(229, 249, 175);";
+        }
       },
       /** 查询作业证书一览列表 */
       getList() {