上岗证/作业证书一览表

master/src/main/resources/mybatis/training/TWorklicenseCertificateMapper.xml

@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTWorklicenseCertificateVo">
-        select d.id, d.name, d.employeeid, d.idnum, d.classes, d.post, d.idtype, d.worklicense_idnum, d.boiler, d.cracking, d.hotarea, d.coldarea, d.aromatic, d.recertificatedate, d.validity, d.container, d.pipe, d.reviewdate, d.pipevalidity, d.certificate_no, d.boilerid, d.boilvalidity, d.hydrogenation, d.hydvalidity, d.hydnextreview, d.crackingid, d.crackingvalidity, d.crackingreview, d.refrigeration, d.refrigerationvalidity, d.refrigerationview, d.foremantrain, d.foremanreview, d.foremannextreview, d.fire_protection, d.waterdate, d.energydate, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id ,s.dept_name from t_worklicense_certificate d
+        select d.id, d.name, d.employeeid, d.idnum, d.classes, d.post, d.idtype, d.worklicense_idnum, d.boiler, d.cracking, d.hotarea, d.coldarea, d.aromatic, d.recertificatedate, d.validity, d.container, d.pipe, d.reviewdate, d.pipevalidity, d.certificate_no, d.boilerid, d.boilvalidity, d.hydrogenation, d.hydvalidity, d.hydnextreview, d.crackingid, d.crackingvalidity, d.crackingreview, d.refrigeration, d.refrigerationvalidity, d.refrigerationview, d.foremantrain, d.foremanreview, d.foremannextreview, d.fire_protection, d.waterdate, d.energydate, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id from t_worklicense_certificate d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 

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

@@ -1,24 +1,24 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <!--<el-form-item label="姓名" prop="name">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.name"-->
-          <!--placeholder="请输入姓名"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="员工号" prop="employeeid">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.employeeid"-->
-          <!--placeholder="请输入员工号"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
+      <el-form-item label="姓名" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="员工号" prop="employeeid">
+        <el-input
+          v-model="queryParams.employeeid"
+          placeholder="请输入员工号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <!--<el-form-item label="身份证件号" prop="idnum">-->
         <!--<el-input-->
           <!--v-model="queryParams.idnum"-->
@@ -46,10 +46,14 @@
           <!--@keyup.enter.native="handleQuery"-->
         <!--/>-->
       <!--</el-form-item>-->
-      <!--<el-form-item label="证件类型" prop="idtype">-->
-        <!--<el-select v-model="queryParams.idtype" placeholder="请选择证件类型" clearable size="small">-->
-          <!--<el-option label="请选择字典生成" value="" />-->
-        <!--</el-select>-->
+      <!--<el-form-item label="证件类型" prop="post">-->
+        <!--<el-input-->
+          <!--v-model="queryParams.idtype"-->
+          <!--placeholder="请输入证件类型"-->
+          <!--clearable-->
+          <!--size="small"-->
+          <!--@keyup.enter.native="handleQuery"-->
+        <!--/>-->
       <!--</el-form-item>-->
       <!--<el-form-item label="证件号" prop="worklicenseIdnum">-->
         <!--<el-input-->
@@ -348,8 +352,8 @@
         <!--/>-->
       <!--</el-form-item>-->
       <el-form-item>
-        <!--<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>-->
-        <!--<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -415,11 +419,31 @@
       <el-table-column label="证件类型" align="center" prop="idtype" :show-overflow-tooltip="true"/>
       <el-table-column label="证件号" align="center" prop="worklicenseIdnum" :show-overflow-tooltip="true"/>
       <el-table-column label="岗位">
-        <el-table-column label="开工锅炉" align="center" prop="boiler" :show-overflow-tooltip="true"/>
-        <el-table-column label="裂解" align="center" prop="cracking" :show-overflow-tooltip="true"/>
-        <el-table-column label="热区" align="center" prop="hotarea" :show-overflow-tooltip="true"/>
-        <el-table-column label="冷区" align="center" prop="coldarea" :show-overflow-tooltip="true"/>
-        <el-table-column label="芳烃" align="center" prop="aromatic" :show-overflow-tooltip="true"/>
+        <el-table-column label="开工锅炉" align="center" prop="boiler" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{ scope.row.boiler == 1 ? "YES" : "NO" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="裂解" align="center" prop="cracking" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{ scope.row.cracking == 1 ? "YES" : "NO" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="热区" align="center" prop="hotarea" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{ scope.row.hotarea == 1 ? "YES" : "NO" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="冷区" align="center" prop="coldarea" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{ scope.row.coldarea == 1 ? "YES" : "NO" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="芳烃" align="center" prop="aromatic" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{ scope.row.aromatic == 1 ? "YES" : "NO" }}</span>
+          </template>
+        </el-table-column>
       </el-table-column>
       <el-table-column label="取复证日期" align="center" prop="recertificatedate" width="100">
         <template slot-scope="scope">
@@ -599,27 +623,27 @@
             </el-form-item>
             <el-col :span="4">
               <el-form-item :label="$t('开工锅炉')" prop="boiler">
-                <el-checkbox v-model="form.boiler" @change="changeBoiler()"></el-checkbox>
+                <el-checkbox v-model="form.boiler"></el-checkbox>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="$t('裂解')" prop="cracking">
-                <el-checkbox v-model="form.cracking" @change="changeCracking()"></el-checkbox>
+                <el-checkbox v-model="form.cracking"></el-checkbox>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="$t('压缩')" prop="hotarea">
-                <el-checkbox v-model="form.hotarea" @change="changeHotarea()"></el-checkbox>
+                <el-checkbox v-model="form.hotarea"></el-checkbox>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="$t('分离')" prop="coldarea">
-                <el-checkbox v-model="form.coldarea" @change="changeColdarea()"></el-checkbox>
+                <el-checkbox v-model="form.coldarea"></el-checkbox>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="$t('芳烃')" prop="aromatic">
-                <el-checkbox v-model="form.aromatic" @change="changeAromatic()"></el-checkbox>
+                <el-checkbox v-model="form.aromatic"></el-checkbox>
               </el-form-item>
             </el-col>
             <!--<el-form-item label="开工锅炉" prop="boiler">-->
@@ -969,6 +993,21 @@ export default {
         id: [
           { required: true, message: "唯一标识ID不能为空", trigger: "blur" }
         ],
+        name: [
+          { required: true, message: "姓名不能为空", trigger: "blur" }
+        ],
+        employeeid: [
+          { required: true, message: "员工号不能为空", trigger: "blur" }
+        ],
+        idnum: [
+          { required: true, message: "身份证件号不能为空", trigger: "blur" }
+        ],
+        classes: [
+          { required: true, message: "班组不能为空", trigger: "blur" }
+        ],
+        post: [
+          { required: true, message: "职务不能为空", trigger: "blur" }
+        ],
         deptId: [
           { required: true, message: "部门编号不能为空", trigger: "blur" }
         ]
@@ -1087,14 +1126,65 @@ export default {
       const id = row.id || this.ids
       getWorklicensecertificate(id).then(response => {
         this.form = response.data;
+        if (this.form.boiler == 1) {
+          this.form.boiler = true;
+        } else {
+          this.form.boiler = false;
+        }
+        if (this.form.cracking == 1) {
+          this.form.cracking = true;
+        } else {
+          this.form.cracking = false;
+        }
+        if (this.form.hotarea == 1) {
+          this.form.hotarea = true;
+        } else {
+          this.form.hotarea = false;
+        }
+        if (this.form.coldarea == 1) {
+          this.form.coldarea = true;
+        } else {
+          this.form.coldarea = false;
+        }
+        if (this.form.aromatic == 1) {
+          this.form.aromatic = true;
+        } else {
+          this.form.aromatic = false;
+        }
         this.open = true;
         this.title = "修改上岗证/作业证书一览";
       });
     },
     /** 提交按钮 */
     submitForm() {
+      console.log(this.form)
       this.$refs["form"].validate(valid => {
         if (valid) {
+          if (this.form.boiler == true) {
+            this.form.boiler = 1;
+          } else {
+            this.form.boiler = 0;
+          }
+          if (this.form.cracking == true) {
+            this.form.cracking = 1;
+          } else {
+            this.form.cracking = 0;
+          }
+          if (this.form.hotarea == true) {
+            this.form.hotarea = 1;
+          } else {
+            this.form.hotarea = 0;
+          }
+          if (this.form.coldarea == true) {
+            this.form.coldarea = 1;
+          } else {
+            this.form.coldarea = 0;
+          }
+          if (this.form.aromatic == true) {
+            this.form.aromatic = 1;
+          } else {
+            this.form.aromatic = 0;
+          }
           if (this.form.id != null) {
             updateWorklicensecertificate(this.form).then(response => {
               this.msgSuccess("修改成功");