张丁 新票续票排序

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

@@ -196,6 +196,7 @@ public class TJobticketController extends BaseController
             tJobticket.setZypzt("10");
             tJobticket.setQfsj("8:30");
             tJobticket.setKprq(tInvoiceWorkcontent.getBookingworkticket().getWorkStartTime());
+            //tJobticket.set
             //先查询是否重复
             int same=  tJobticketService.selectTJobticketSameData(tJobticket);
             if(same>0){

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

@@ -54,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTJobticketList" parameterType="TJobticket" resultMap="TJobticketResult">
         <include refid="selectTJobticketVo"/>
+       where  d.id in (SELECT MAX(id) FROM t_jobticket u
         <where>
             <if test="startDate != null ">and kprq <![CDATA[>=]]> #{startDate}</if>
             <if test="endDate != null">and kprq <![CDATA[<=]]>#{endDate}</if>
@@ -68,11 +69,12 @@ 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>
-            and d.del_flag = 0
+            and u.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
-        order by d.kprq  desc,d.createdate desc
+        GROUP BY u.xzkjxkzh,u.mbzyxkzh,u.gczyxkzh,u.whgzxkzh,u.dhzyxkzh,u.yqxkzh)
+        order by d.kprq  desc,d.yqxkzh asc
     </select>
 
     <select id="selectTJobticketById" parameterType="Long" resultMap="TJobticketResult">

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

@@ -425,7 +425,7 @@
       </el-row>
     </el-drawer>
      <el-dialog title="延期作业许可" :visible.sync="guanlianVisible" width="30%"  center>
-   <el-form ref="form" :model="postponeform" :rules="rules" label-width="80px">
+   <el-form ref="form" :model="postponeform" :rules="rules1" label-width="80px">
         <el-form-item :label="$t('开票日期')" prop="kprq">
           <el-date-picker clearable size="small" style="width: 200px"
             v-model="postponeform.kprq"
@@ -615,12 +615,16 @@ export default {
         deptId: [
           { required: true, message: this.$t('部门编号') + this.$t('不能为空'), trigger: "blur" }
         ],
-        yqxkzh: [
-          { required: true, message: this.$t('当前续票必填'), trigger: "blur" }
-        ],
         xpxp: [
           { required: true, message: this.$t('手动新增只能为新票'), trigger: "blur" },
            {validator: this.xpxp, trigger: 'blur'}
+        ],    yqxkzh: [
+          { required: true, message: this.$t('当前续票必填'), trigger: "blur" }
+        ],
+      },
+      rules1: {
+          yqxkzh: [
+          { required: true, message: this.$t('当前续票必填'), trigger: "blur" }
         ],
       }
     };