LY 作业票

master/src/main/java/com/ruoyi/project/ehs/domain/TJobticket.java

@@ -23,9 +23,9 @@ public class TJobticket extends BaseEntity
     private Long id;
 
     private List<TJobticket> children;
-
     private int tableType;
 
+
     /** 装置 */
 //    @Excel(name = "装置名称", dictType = "PLANT_DIVIDE")
     private String plantCode;
@@ -36,11 +36,9 @@ public class TJobticket extends BaseEntity
     private Date kprq;
 
     /** 签发时间 */
-    @Excel(name = "签发时间")
     private String qfsj;
 
     /** 签发班组 */
-    @Excel(name = "签发班组", dictType = "QFBZ")
     private String qfbz;
 
     /** 签发人 */
@@ -112,7 +110,6 @@ public class TJobticket extends BaseEntity
     private String zypzt;
 
     /** 检查/存档人 */
-    @Excel(name = "检查/存档人")
     private String jccdr;
 
     /** 未撤销项编号 */
@@ -176,6 +173,9 @@ public class TJobticket extends BaseEntity
     /** 用户单位 */
     private String userUnit;
 
+    /** 票号查询 */
+    private String allNo;
+
 
     public void setId(Long id)
     {
@@ -533,6 +533,14 @@ public class TJobticket extends BaseEntity
         this.tableType = tableType;
     }
 
+    public String getAllNo() {
+        return allNo;
+    }
+
+    public void setAllNo(String allNo) {
+        this.allNo = allNo;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

master/src/main/resources/mybatis/ehs/TJobticketMapper.xml

@@ -118,6 +118,16 @@
             <if test="userMg != null ">and user_mg = #{userMg}</if>
             <if test="userUnit != null ">and user_unit = #{userUnit}</if>
             <if test="tag != null and tag != '' ">and tag = #{tag}</if>
+            <if test="allNo != null  and allNo != ''">
+                and
+                (whgzxkzh like concat(concat('%', #{allNo}), '%')
+                or dhzyxkzh like concat(concat('%', #{allNo}), '%')
+                or xzkjxkzh like concat(concat('%', #{allNo}), '%')
+                or mbzyxkzh like concat(concat('%', #{allNo}), '%')
+                or gczyxkzh like concat(concat('%', #{allNo}), '%')
+                or yqxkzh like concat(concat('%', #{allNo}), '%')
+                )
+            </if>
             <if test="tableType == 1 ">
                 <choose>
                     <when test="xpxp == '12'">
@@ -315,7 +325,7 @@
     <update id="updateTJobticketStatus" parameterType="TJobticket">
         update t_jobticket
         <trim prefix="SET" suffixOverrides=",">
-            zypzt = #{zypzt},
+            zypzt = #{zypzt},xpsj = sysdate
         </trim>
             <where>
                 <if test="whgzxkzh != null  and whgzxkzh != ''">and whgzxkzh = #{whgzxkzh}</if>

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

@@ -27,34 +27,16 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="延期许可证号" prop="yqxkzh">
+      <el-form-item label="票号" prop="allNo">
         <el-input
-          v-model="queryParams.yqxkzh"
-          placeholder="请输入延期许可证号"
+          v-model="queryParams.allNo"
+          placeholder="请输入联系人"
           clearable
           size="small"
           @input="handleQuery"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="危害工作许可证号" prop="whgzxkzh">
-        <el-input
-          v-model="queryParams.whgzxkzh"
-          placeholder="请输入危害工作许可证号"
-          clearable
-          size="small" @input="handleQuery"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="动火作业许可证号" prop="dhzyxkzh">
-        <el-input
-          v-model="queryParams.dhzyxkzh"
-          placeholder="请输入动火作业许可证号"
-          clearable
-          size="small" @input="handleQuery"
-          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
       <el-form-item :label="$t('火票级别')" prop="hpjb">
         <el-select v-model="queryParams.hpjb" :placeholder="$t('请选择') + $t('火票级别')" clearable size="small"
                    @change="handleQuery">
@@ -66,33 +48,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="限制空间许可证号" prop="xzkjxkzh">
-        <el-input
-          v-model="queryParams.xzkjxkzh"
-          placeholder="请输入限制空间许可证号"
-          clearable
-          size="small" @input="handleQuery"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="盲板作业许可证号" prop="mbzyxkzh">
-        <el-input
-          v-model="queryParams.mbzyxkzh"
-          placeholder="请输入盲板作业许可证号"
-          clearable
-          size="small" @input="handleQuery"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="高处作业许可证号" prop="gczyxkzh">
-        <el-input
-          v-model="queryParams.gczyxkzh"
-          placeholder="请输入高处作业许可证号"
-          clearable
-          size="small" @input="handleQuery"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+
       <el-form-item label="高处作业级别" prop="gczyjb">
         <el-select v-model="queryParams.gczyjb" :placeholder="$t('请选择') + $t('高处作业级别')" clearable size="small"
                    @change="handleQuery">
@@ -113,7 +69,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="BYC负责单位/联系人" prop="byclxr">
+      <el-form-item label="BYC负责单位/联系人" label-width="150"  prop="byclxr">
         <el-input
           v-model="queryParams.byclxr"
           placeholder="请输入BYC负责单位/联系人"
@@ -152,15 +108,15 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="未撤销项编号" prop="wcxxbh">
-        <el-input
-          v-model="queryParams.wcxxbh"
-          placeholder="请输入未撤销项编号"
-          clearable
-          size="small" @input="handleQuery"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="未撤销项编号" prop="wcxxbh">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.wcxxbh"-->
+<!--          placeholder="请输入未撤销项编号"-->
+<!--          clearable-->
+<!--          size="small" @input="handleQuery"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item label="未撤销状态" prop="wcxzt">
         <el-select v-model="queryParams.wcxzt" style="width: 200px" :placeholder="$t('请选择') + $t('未撤销状态')"
                    @change="handleQuery" clearable>
@@ -317,7 +273,6 @@
           </el-dropdown>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('检查/存档人')" align="center" prop="jccdr" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('未撤销项编号')" align="center" prop="wcxxbh" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('未撤销状态')" align="center" prop="wcxzt" :formatter="wcxztFormat">
         <template slot-scope="scope" v-if="scope.row.wcxzt != null">
@@ -424,7 +379,6 @@
           </el-dropdown>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('检查/存档人')" align="center" prop="jccdr" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('未撤销项编号')" align="center" prop="wcxxbh" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('未撤销状态')" align="center" prop="wcxzt" :formatter="wcxztFormat">
         <template slot-scope="scope" v-if="scope.row.wcxzt != null">
@@ -513,8 +467,8 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('新票/续票')" prop="xpxp" v-if="isxp">
-          <el-select v-model="form.xpxp" :placeholder="$t('请选择') + $t('新票/续票')">
+        <el-form-item :label="$t('新票/续票')" prop="xpxp" v-if="isxp" >
+          <el-select v-model="form.xpxp" :placeholder="$t('请选择') + $t('新票/续票')" :disabled="isxp">
             <el-option
               v-for="dict in xpxpOptions"
               :key="dict.dictValue"
@@ -533,7 +487,7 @@
           <el-input v-model="form.dhzyxkzh" :placeholder="$t('请输入') + $t('动火作业许可证号')"/>
         </el-form-item>
         <el-form-item :label="$t('火票级别')" prop="hpjb">
-          <el-select v-model="form.hpjb" :placeholder="$t('请选择') + $t('火票级别')">
+          <el-select v-model="form.hpjb" :placeholder="$t('请选择') + $t('火票级别')" clearable>
             <el-option
               v-for="dict in hpjbOptions"
               :key="dict.dictValue"
@@ -552,7 +506,7 @@
           <el-input v-model="form.gczyxkzh" :placeholder="$t('请输入') + $t('高处作业许可证号')"/>
         </el-form-item>
         <el-form-item :label="$t('高处作业级别')" prop="hpjb">
-          <el-select v-model="form.gczyjb" :placeholder="$t('请选择') + $t('高处作业级别')">
+          <el-select v-model="form.gczyjb" :placeholder="$t('请选择') + $t('高处作业级别')" clearable>
             <el-option
               v-for="dict in gczyjbOptions"
               :key="dict.dictValue"
@@ -619,14 +573,11 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('检查/存档人')" prop="jccdr">
-          <el-input v-model="form.jccdr" :placeholder="$t('请输入') + $t('检查/存档人')"/>
-        </el-form-item>
         <el-form-item :label="$t('未撤销项编号')" prop="wcxxbh">
           <el-input v-model="form.wcxxbh" :placeholder="$t('请输入') + $t('未撤销项编号')"/>
         </el-form-item>
         <el-form-item :label="$t('未撤销状态')" prop="wcxzt">
-          <el-select v-model="form.wcxzt" :placeholder="$t('请选择') + $t('未撤销状态')">
+          <el-select v-model="form.wcxzt" :placeholder="$t('请选择') + $t('未撤销状态')" clearable>
             <el-option
               v-for="dict in wcxztOptions"
               :key="dict.dictValue"
@@ -644,7 +595,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="索引" prop="tag">
-          <el-select v-model="form.tag" clearable filterable clearable placeholder="请选择索引">
+          <el-select v-model="form.tag"  filterable clearable placeholder="请选择索引">
             <el-option-group
               v-for="group in tagOptions"
               :key="group.tag"
@@ -904,7 +855,8 @@ export default {
         cxsj: null,
         tag: null,
         orderByColumn: null,
-        isAsc: null
+        isAsc: null,
+        allNo: null
       },
       //日期快速选择
       pickerOptions: {
@@ -1238,9 +1190,8 @@ export default {
 
     wcxztWU(index, row) {
       this.form = row;
-
       this.form.wcxzt = 12;
-
+      this.form.cxsj = this.getNowFormatDate()
       updateJobticket(this.form).then(response => {
         this.msgSuccess(this.$t('修改成功'));
         this.open = false;
@@ -1289,7 +1240,6 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       console.log(this.queryParams)
-      this.queryParams.pageNum = 1
       if (this.chooseDate == null) {
         this.chooseDate = []
       }