LY 工作票 索引

master/src/main/java/com/ruoyi/project/ehs/controller/TJobticketController.java

@@ -201,6 +201,7 @@ public class TJobticketController extends BaseController
             tJobticket.setDhzyxkzh(tInvoiceWorkcontent.getDhzyxkzh());
             tJobticket.setUserMg(tInvoiceWorkcontent.getBookingworkticket().getUserMg());
             tJobticket.setUserUnit(tInvoiceWorkcontent.getBookingworkticket().getUserUnit());
+            tJobticket.setTag(tInvoiceWorkcontent.getTag());
             tJobticket.setZypzt("10");
             tJobticket.setQfsj("8:30");
             tJobticket.setKprq(tInvoiceWorkcontent.getBookingworkticket().getWorkStartTime());

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

@@ -69,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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 = #{tag}</if>
             and d.del_flag = 0 and xpxp = 10
         </where>
         <!-- 数据范围过滤 -->

master/src/main/resources/mybatis/invoice/TInvoiceBookingworkticketMapper.xml

@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectTInvoiceWorkcontentVo">
         select d.id, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.work_type, d.risk_level, d.work_description, d.work_people_number, d.hpjb, d.estimate_worktime, d.bookingticket_id, d.dept_id ,d.reservation_number,s.dept_name,
-            d.whgzxkzh,d.dhzyxkzh,d.xzkjxkzh,d.mbzyxkzh,d.gczyxkzh,d.gczyjb from t_invoice_workcontent d
+            d.whgzxkzh,d.dhzyxkzh,d.xzkjxkzh,d.mbzyxkzh,d.gczyxkzh,d.gczyjb,d.tag from t_invoice_workcontent d
        left join sys_dept s on s.dept_id = d.dept_id  left join t_invoice_bookingworkticket b on d.bookingticket_id =b.id
     </sql>
 

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

@@ -58,6 +58,16 @@
       <el-form-item :label="$t('限制空间许可证号')" label-width="50" prop="xzkjxkzh">
         <el-checkbox v-model="queryParams.xzkjxkzh" @change="handleQuery"></el-checkbox>
       </el-form-item>
+      <el-form-item :label="$t('索引')" label-width="50" prop="tag">
+        <el-select v-model="queryParams.tag" :placeholder="$t('请选择') + $t('索引')" filterable clearable size="small" @change="handleQuery">
+          <el-option
+            v-for="dict in tagOptions"
+            :key="dict.tag"
+            :label="dict.tag"
+            :value="dict.tag"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('搜索') }}</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('重置') }}</el-button>
@@ -586,6 +596,7 @@ export default {
         wcxxbh: null,
         wcxzt: null,
         cxsj: null,
+        tag: null
       },
       //日期快速选择
       pickerOptions: {