-修改工作票统计查询条件

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

@@ -62,15 +62,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xpxp != null  and xpxp != ''"> and xpxp = #{xpxp}</if>
             <if test="hpjb != null  and hpjb != ''"> and hpjb = #{hpjb}</if>
             <if test="zypzt != null  and zypzt != ''"> and zypzt = #{zypzt}</if>
-            <if test="xzkjxkzh == 'true'"> and xzkjxkzh IS NOT NULL</if>
-            <if test="mbzyxkzh != null  and mbzyxkzh != ''"> and mbzyxkzh = #{mbzyxkzh}</if>
-            <if test="gczyxkzh != null  and gczyxkzh != ''"> and gczyxkzh = #{gczyxkzh}</if>
+            <if test="xzkjxkzh !=null and xzkjxkzh!=''"> and xzkjxkzh like concat(concat('%',#{xzkjxkzh}),'%')</if>
+            <if test="mbzyxkzh != null  and mbzyxkzh != ''"> and mbzyxkzh like concat(concat('%',#{mbzyxkzh}),'%')</if>
+            <if test="gczyxkzh != null  and gczyxkzh != ''"> and gczyxkzh like concat(concat('%',#{gczyxkzh}),'%')</if>
+            <if test="content != null  and content != ''"> and content like concat(concat('%',#{content}),'%')</if>
+            <if test="whgzxkzh != null  and whgzxkzh != ''"> and whgzxkzh like concat(concat('%',#{whgzxkzh}),'%')</if>
+            <if test="yqxkzh != null  and yqxkzh != ''"> and yqxkzh like concat(concat('%',#{yqxkzh}),'%')</if>
+            <if test="dhzyxkzh != null  and dhzyxkzh != ''"> and dhzyxkzh like concat(concat('%',#{dhzyxkzh}),'%')</if>
+            <if test="byclxr != null  and byclxr != ''"> and byclxr like concat(concat('%',#{byclxr}),'%')</if>
+            <if test="sgdw != null  and sgdw != ''"> and sgdw like concat(concat('%',#{sgdw}),'%')</if>
+            <if test="jccdr != null  and jccdr != ''"> and jccdr like concat(concat('%',#{jccdr}),'%')</if>
+            <if test="wcxxbh != null  and wcxxbh != ''"> and wcxxbh like concat(concat('%',#{wcxxbh}),'%')</if>
+            <if test="wcxzt != null  and wcxzt != ''"> and wcxzt like concat(concat('%',#{wcxzt}),'%')</if>
+            <if test="xpsj != null "> and xpsj <![CDATA[=]]> #{xpsj}</if>
+            <if test="cxsj != null "> and cxsj <![CDATA[=]]> #{cxsj}</if>
             <if test="gczyjb != null  and gczyjb != ''"> and gczyjb = #{gczyjb}</if>
             <if test="postponeNumber != null "> and postpone_number = #{postponeNumber}</if>
             <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>
-            and d.del_flag = 0 and xpxp = 10
+            and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}

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

@@ -1,11 +1,12 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('开票日期')" label-width="50" prop="kprq">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item :label="$t('开票日期')"  prop="kprq">
         <el-date-picker
           v-model="chooseDate"
           @change="handleQuery"
           type="daterange"
+          style="width: 508px"
           align="right"
           unlink-panels
           :range-separator="$t('至')"
@@ -15,7 +16,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item :label="$t('签发班组')" label-width="50" prop="qfbz">
+      <el-form-item :label="$t('签发班组')" prop="qfbz">
         <el-select v-model="queryParams.qfbz" :placeholder="$t('请选择') + $t('签发班组')" clearable size="small"
                    @change="handleQuery">
           <el-option
@@ -26,7 +27,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('新票/续票')" label-width="50" prop="xpxp">
+      <el-form-item :label="$t('新票/续票')" prop="xpxp">
         <el-select v-model="queryParams.xpxp" :placeholder="$t('请选择') + $t('新票/续票')" clearable size="small"
                    @change="handleQuery">
           <el-option
@@ -64,7 +65,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('火票级别')" label-width="50" prop="hpjb">
+      <el-form-item :label="$t('火票级别')" prop="hpjb">
         <el-select v-model="queryParams.hpjb" :placeholder="$t('请选择') + $t('火票级别')" clearable size="small"
                    @change="handleQuery">
           <el-option
@@ -102,17 +103,54 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="内容" prop="content">
+      <el-form-item label="高处作业级别" prop="gczyjb">
+        <el-select v-model="queryParams.gczyjb" :placeholder="$t('请选择') + $t('高处作业级别')" clearable size="small"
+                   @change="handleQuery">
+          <el-option
+            v-for="dict in gczyjbOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="工作内容" prop="content">
         <el-input
           v-model="queryParams.content"
-          placeholder="请输入内容"
+          placeholder="请输入工作内容"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
-      <el-form-item :label="$t('作业票状态')" label-width="50" prop="zypzt">
+      <el-form-item label="BYC负责单位/联系人" prop="byclxr">
+        <el-input
+          v-model="queryParams.byclxr"
+          placeholder="请输入BYC负责单位/联系人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="施工单位" prop="sgdw">
+        <el-input
+          v-model="queryParams.sgdw"
+          placeholder="请输入施工单位"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="销票时间" prop="xpsj">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.xpsj"
+                        type="date"
+                        @change="handleQuery"
+                        value-format="yyyy-MM-dd"
+                        :placeholder="$t('请选择') + $t('销票时间')">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item :label="$t('作业票状态')" prop="zypzt">
         <el-select v-model="queryParams.zypzt" :placeholder="$t('请选择') + $t('作业票状态')" clearable size="small"
                    @change="handleQuery">
           <el-option
@@ -123,7 +161,44 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('索引')" label-width="50" prop="tag">
+      <el-form-item label="检查/存档人" prop="jccdr">
+        <el-input
+          v-model="queryParams.jccdr"
+          placeholder="请输入检查/存档人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="未撤销项编号" prop="wcxxbh">
+        <el-input
+          v-model="queryParams.wcxxbh"
+          placeholder="请输入未撤销项编号"
+          clearable
+          size="small"
+          @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>
+          <el-option
+            v-for="dict in wcxztOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="撤销时间" prop="cxsj">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.cxsj"
+                        type="date"
+                        @change="handleQuery"
+                        value-format="yyyy-MM-dd"
+                        :placeholder="$t('请选择') + $t('撤销时间')">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item :label="$t('索引')"  prop="tag">
         <el-select v-model="queryParams.tag" :placeholder="$t('请选择') + $t('索引')" filterable clearable size="small"
                    @change="handleQuery">
           <el-option
@@ -1104,6 +1179,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      console.log(this.queryParams)
       this.queryParams.pageNum = 1
       if (this.chooseDate == null) {
         this.chooseDate = []