徐明浩

master/src/main/java/com/ruoyi/project/ticket/controller/TPermitRelationController.java

@@ -6,6 +6,7 @@ import com.ruoyi.project.ticket.domain.PermitRelation;
 import com.ruoyi.project.ticket.domain.TDelayPermit;
 import com.ruoyi.project.ticket.domain.THazardWorkPermit;
 import com.ruoyi.project.ticket.service.ITDelayPermitService;
+import com.ruoyi.project.ticket.service.ITHazardWorkPermitService;
 import com.ruoyi.project.ticket.service.ITPermitRelationService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +33,9 @@ public class TPermitRelationController extends BaseController {
     @Autowired
     private ITDelayPermitService itDelayPermitService;
 
+    @Autowired
+    private ITHazardWorkPermitService itHazardWorkPermitService;
+
     /**
      * 查询票据列表
      */
@@ -51,6 +55,31 @@ public class TPermitRelationController extends BaseController {
             if (relation.getcId() != null) {
                 handle(relation, 1);
             }
+            if (relation.getChildren() != null && relation.getChildren().size() > 0) {
+                for (int i = 0; i < relation.getChildren().size(); i++) {
+                    if (i == 0) {
+                        PermitRelation created = relation.getChildren().get(i);
+                        THazardWorkPermit t = new THazardWorkPermit();
+                        t.setaId(created.getaId());
+                        t.sethVNoOne(Long.parseLong(created.getDelayNo()));
+                        this.itHazardWorkPermitService.updateTHazardWorkPermit(t);
+                    }
+                    if (i == 1) {
+                        PermitRelation created = relation.getChildren().get(i);
+                        THazardWorkPermit t = new THazardWorkPermit();
+                        t.setaId(created.getaId());
+                        t.sethVNoTwo(Long.parseLong(created.getDelayNo()));
+                        this.itHazardWorkPermitService.updateTHazardWorkPermit(t);
+                    }
+                    if (i == 2) {
+                        PermitRelation created = relation.getChildren().get(i);
+                        THazardWorkPermit t = new THazardWorkPermit();
+                        t.setaId(created.getaId());
+                        t.sethVNoThree(Long.parseLong(created.getDelayNo()));
+                        this.itHazardWorkPermitService.updateTHazardWorkPermit(t);
+                    }
+                }
+            }
         }
         return getDataTable(list);
     }
@@ -65,22 +94,52 @@ public class TPermitRelationController extends BaseController {
         List<TDelayPermit> tDelayPermits = this.itDelayPermitService.selectDelayCount(tDelayPermit);
         if (tDelayPermits.size() > 0) {
             p.setDelayCount(tDelayPermits.size() + "");
-            int i = 1;
             List<PermitRelation> children = new ArrayList<>();
-            for (TDelayPermit t : tDelayPermits) {
+            if (tDelayPermits.size() > 10) {
+                TDelayPermit t = tDelayPermits.get(0);
+                PermitRelation tt1 = new PermitRelation();
+                BeanUtils.copyProperties(p, tt1);
+                tt1.setDelayCount(t.getvId() + "-5");
+                tt1.setDelayNo(t.getvId() + "");
+                children.add(tt1);
+                TDelayPermit t2 = tDelayPermits.get(5);
                 PermitRelation tt2 = new PermitRelation();
                 BeanUtils.copyProperties(p, tt2);
-                tt2.setDelayCount(t.getvId() + "-" + i++);
+                tt2.setDelayCount(t2.getvId() + "-5");
+                tt2.setDelayNo(t2.getvId() + "");
+                children.add(tt2);
+                TDelayPermit t3 = tDelayPermits.get(10);
+                PermitRelation tt3 = new PermitRelation();
+                BeanUtils.copyProperties(p, tt3);
+                tt3.setDelayCount(t3.getvId() + "-" + (tDelayPermits.size() - 10));
+                tt3.setDelayNo(t3.getvId() + "");
+                children.add(tt3);
+            }
+            if (tDelayPermits.size() > 5 && tDelayPermits.size() <= 10) {
+                TDelayPermit t = tDelayPermits.get(0);
+                PermitRelation tt1 = new PermitRelation();
+                BeanUtils.copyProperties(p, tt1);
+                tt1.setDelayCount(t.getvId() + "-5");
+                tt1.setDelayNo(t.getvId() + "");
+                children.add(tt1);
+                TDelayPermit t2 = tDelayPermits.get(5);
+                PermitRelation tt3 = new PermitRelation();
+                BeanUtils.copyProperties(p, tt3);
+                tt3.setDelayCount(t2.getvId() + "-" + (tDelayPermits.size() - 5));
+                tt3.setDelayNo(t2.getvId() + "");
+                children.add(tt3);
+            }
+            if (tDelayPermits.size() <= 5) {
+                TDelayPermit t = tDelayPermits.get(0);
+                PermitRelation tt2 = new PermitRelation();
+                BeanUtils.copyProperties(p, tt2);
+                tt2.setDelayCount(t.getvId() + "-" + tDelayPermits.size());
                 tt2.setDelayNo(t.getvId() + "");
                 children.add(tt2);
-                if (i == 6) {
-                    i = 1;
-                }
             }
             p.setChildren(children);
         } else {
             p.setDelayCount("0");
         }
-
     }
 }

master/src/main/java/com/ruoyi/project/ticket/domain/TDelayPermitOther.java

@@ -1,8 +1,5 @@
 package com.ruoyi.project.ticket.domain;
 
-import java.sql.Date;
-import java.sql.Timestamp;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
@@ -10,6 +7,8 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.util.Date;
+
 /**
  * 延期票附属对象对象 t_delay_permit_other
  *
@@ -29,13 +28,14 @@ public class TDelayPermitOther extends BaseEntity {
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date startTime;
+    private Date valiStartTime;
 
     /**
      * 结束时间
      */
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date endTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date valiEndTime;
 
     /**
      * 危害不变G签名
@@ -307,16 +307,20 @@ public class TDelayPermitOther extends BaseEntity {
         return id;
     }
 
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
+    public Date getValiStartTime() {
+        return valiStartTime;
+    }
+
+    public void setValiStartTime(Date valiStartTime) {
+        this.valiStartTime = valiStartTime;
     }
 
-    public Date getStartTime() {
-        return startTime;
+    public Date getValiEndTime() {
+        return valiEndTime;
     }
 
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
+    public void setValiEndTime(Date valiEndTime) {
+        this.valiEndTime = valiEndTime;
     }
 
     public void setaGSign(String aGSign) {
@@ -531,8 +535,8 @@ public class TDelayPermitOther extends BaseEntity {
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("id", getId())
-                .append("startTime", getStartTime())
-                .append("endTime", getEndTime())
+                .append("valiStartTime", getValiStartTime())
+                .append("valiStartTime", getValiEndTime())
                 .append("aGSign", getaGSign())
                 .append("aGDate", getaGDate())
                 .append("aHSign", getaHSign())

master/src/main/java/com/ruoyi/project/ticket/domain/TDelayPermitVo.java

@@ -42,13 +42,14 @@ public class TDelayPermitVo {
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
+    private Date valiStartTime;
 
     /**
      * 结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date endTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date valiEndTime;
 
     /**
      * 危害不变G签名
@@ -58,7 +59,8 @@ public class TDelayPermitVo {
     /**
      * 危害不变G签名时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date aGDate;
 
     /**
@@ -69,7 +71,8 @@ public class TDelayPermitVo {
     /**
      * D栏的安全措施已重新检查及重新批准签名时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date aHDate;
 
     /**
@@ -81,7 +84,8 @@ public class TDelayPermitVo {
     /**
      * 授权的维修主管签名时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date aI1aDate;
 
     /**
@@ -93,7 +97,8 @@ public class TDelayPermitVo {
     /**
      * 安全协调员签名时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date aA4Date;
 
     /**
@@ -105,7 +110,8 @@ public class TDelayPermitVo {
     /**
      * 授权的装置维修工人签名时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date aI1bDate;
 
     /**
@@ -117,19 +123,22 @@ public class TDelayPermitVo {
     /**
      * F栏安全措施已实施签名时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date aKDate;
 
     /**
      * 安全监护人签名时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date aE3StartTime;
 
     /**
      * 安全监护人签名时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date aE3EndTime;
 
     /**
@@ -141,20 +150,23 @@ public class TDelayPermitVo {
     /**
      * 安全监护人签名时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date aE3Date;
 
 
     /**
      * 安全监护人签名时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date hE3StartTime;
 
     /**
      * 安全监护人签名时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date hE3EndTime;
 
     /**
@@ -166,7 +178,8 @@ public class TDelayPermitVo {
     /**
      * 动火监护人签名时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date hE3Date;
 
     /**
@@ -178,7 +191,8 @@ public class TDelayPermitVo {
     /**
      * D5.1签名时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date h51Date;
 
     /**
@@ -190,20 +204,23 @@ public class TDelayPermitVo {
     /**
      * D5.2签名时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date h52Date;
 
 
     /**
      * 安全监护人签名时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date cI2StartTime1;
 
     /**
      * 安全监护人签名时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date cI2EndTime1;
 
     /**
@@ -215,19 +232,22 @@ public class TDelayPermitVo {
     /**
      * 安全监护人/观察员1签名时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date cI2Date1;
 
     /**
      * 安全监护人签名时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date cI2StartTime2;
 
     /**
      * 安全监护人签名时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date cI2EndTime2;
 
     /**
@@ -238,6 +258,8 @@ public class TDelayPermitVo {
     /**
      * 安全监护人/观察员2签名时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date cI2Date2;
 
     public Long getId() {
@@ -288,20 +310,20 @@ public class TDelayPermitVo {
         this.otherId = otherId;
     }
 
-    public Date getStartTime() {
-        return startTime;
+    public Date getValiStartTime() {
+        return valiStartTime;
     }
 
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
+    public void setValiStartTime(Date valiStartTime) {
+        this.valiStartTime = valiStartTime;
     }
 
-    public Date getEndTime() {
-        return endTime;
+    public Date getValiEndTime() {
+        return valiEndTime;
     }
 
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
+    public void setValiEndTime(Date valiEndTime) {
+        this.valiEndTime = valiEndTime;
     }
 
     public String getaGSign() {

master/src/main/resources/mybatis/ticket/TDelayPermitOtherMapper.xml

@@ -6,8 +6,8 @@
 
     <resultMap type="TDelayPermitOther" id="TDelayPermitOtherResult">
         <result property="id" column="id"/>
-        <result property="startTime" column="start_time"/>
-        <result property="endTime" column="end_time"/>
+        <result property="valiStartTime" column="start_time"/>
+        <result property="valiEndTime" column="end_time"/>
         <result property="aGSign" column="a_g_sign"/>
         <result property="aGDate" column="a_g_date"/>
         <result property="aHSign" column="a_h_sign"/>
@@ -84,8 +84,8 @@
     <select id="selectTDelayPermitOtherList" parameterType="TDelayPermitOther" resultMap="TDelayPermitOtherResult">
         <include refid="selectTDelayPermitOtherVo"/>
         <where>
-            <if test="startTime != null ">and start_time = #{startTime}</if>
-            <if test="endTime != null ">and end_time = #{endTime}</if>
+            <if test="valiStartTime != null ">and start_time = #{valiStartTime}</if>
+            <if test="valiEndTime != null ">and end_time = #{valiEndTime}</if>
             <if test="aGSign != null  and aGSign != ''">and a_g_sign = #{aGSign}</if>
             <if test="aGDate != null ">and a_g_date = #{aGDate}</if>
             <if test="aHSign != null  and aHSign != ''">and a_h_sign = #{aHSign}</if>
@@ -131,8 +131,8 @@
         insert into t_delay_permit_other
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
-            <if test="startTime != null">start_time,</if>
-            <if test="endTime != null">end_time,</if>
+            <if test="valiStartTime != null">start_time,</if>
+            <if test="valiEndTime != null">end_time,</if>
             <if test="aGSign != null">a_g_sign,</if>
             <if test="aGDate != null">a_g_date,</if>
             <if test="aHSign != null">a_h_sign,</if>
@@ -168,8 +168,8 @@
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
-            <if test="startTime != null">#{startTime},</if>
-            <if test="endTime != null">#{endTime},</if>
+            <if test="valiStartTime != null">#{valiStartTime},</if>
+            <if test="valiEndTime != null">#{valiEndTime},</if>
             <if test="aGSign != null">#{aGSign},</if>
             <if test="aGDate != null">#{aGDate},</if>
             <if test="aHSign != null">#{aHSign},</if>
@@ -208,8 +208,8 @@
     <update id="updateTDelayPermitOther" parameterType="TDelayPermitOther">
         update t_delay_permit_other
         <trim prefix="SET" suffixOverrides=",">
-            <if test="startTime != null">start_time = #{startTime},</if>
-            <if test="endTime != null">end_time = #{endTime},</if>
+            <if test="valiStartTime != null">start_time = #{valiStartTime},</if>
+            <if test="valiEndTime != null">end_time = #{valiEndTime},</if>
             <if test="aGSign != null">a_g_sign = #{aGSign},</if>
             <if test="aGDate != null">a_g_date = #{aGDate},</if>
             <if test="aHSign != null">a_h_sign = #{aHSign},</if>

master/src/main/resources/mybatis/ticket/TPermitRelationMapper.xml

@@ -25,7 +25,8 @@
                c.B_WORK_CONTENT AS cbWorkContent,
                a.H_V_NO_ONE     AS hVNoOne,
                c.H_V_NO_ONE     AS chVNoOne,
-               t.permit_status    AS permitStatus
+               t.PERMIT_TYPE,
+               t.PERMIT_STATUS
         FROM T_PERMIT_RELATION t
                  LEFT JOIN T_HAZARD_WORK_PERMIT a ON t.PERMIT_ID = a.A_ID
             AND t.PERMIT_TYPE = 'A'

ui/src/views/invoicing/delaypermit/index.vue

@@ -894,8 +894,8 @@ export default {
   data() {
     return {
       delayData: {
-        startTime: null,
-        endTime: null,
+        valiStartTime: null,
+        valiEndTime: null,
         aGSign: null,
         aGDate: null,
         aHSign: null,
@@ -934,8 +934,8 @@ export default {
         aId: null,
         hId: null,
         cId: null,
-        startTime: null,
-        endTime: null,
+        valiStartTime: null,
+        valiEndTime: null,
         startTime1: null,
         endTime1: null,
         startTime2: null,
@@ -1175,6 +1175,7 @@ export default {
   methods: {
     onSubmit() {
       this.dataSplit(this.split + 1)
+      console.log(this.form);
       addDelayPermit(this.form).then(response => {
         this.form.vId = response.data;
         this.msgSuccess(this.$t('延期票数据提交成功'));
@@ -1182,8 +1183,8 @@ export default {
     },
     dataSplit(splitStr) {
       if (splitStr == 1) {
-        this.form.startTime = this.form.startTime1;
-        this.form.endTime = this.form.endTime1;
+        this.form.valiStartTime = this.form.startTime1;
+        this.form.valiEndTime = this.form.endTime1;
         this.form.aGSign = this.form.aGSign1;
         this.form.aGDate = this.form.aGDate1;
         this.form.aHSign = this.form.aHSign1;
@@ -1216,8 +1217,8 @@ export default {
         this.form.cI2EndTime2 = this.form.cI2EndTime21;
       }
       if (splitStr == 2) {
-        this.form.startTime = this.form.startTime2;
-        this.form.endTime = this.form.endTime2;
+        this.form.valiStartTime = this.form.startTime2;
+        this.form.valiEndTime = this.form.endTime2;
         this.form.aGSign = this.form.aGSign2;
         this.form.aGDate = this.form.aGDate2;
         this.form.aHSign = this.form.aHSign2;
@@ -1250,8 +1251,8 @@ export default {
         this.form.cI2EndTime2 = this.form.cI2EndTime22;
       }
       if (splitStr == 3) {
-        this.form.startTime = this.form.startTime3;
-        this.form.endTime = this.form.endTime3;
+        this.form.valiStartTime = this.form.startTime3;
+        this.form.valiEndTime = this.form.endTime3;
         this.form.aGSign = this.form.aGSign3;
         this.form.aGDate = this.form.aGDate3;
         this.form.aHSign = this.form.aHSign3;
@@ -1284,8 +1285,8 @@ export default {
         this.form.cI2EndTime2 = this.form.cI2EndTime23;
       }
       if (splitStr == 4) {
-        this.form.startTime = this.form.startTime4;
-        this.form.endTime = this.form.endTime4;
+        this.form.valiStartTime = this.form.startTime4;
+        this.form.valiEndTime = this.form.endTime4;
         this.form.aGSign = this.form.aGSign4;
         this.form.aGDate = this.form.aGDate4;
         this.form.aHSign = this.form.aHSign4;
@@ -1318,8 +1319,8 @@ export default {
         this.form.cI2EndTime2 = this.form.cI2EndTime24;
       }
       if (splitStr == 5) {
-        this.form.startTime = this.form.startTime5;
-        this.form.endTime = this.form.endTime5;
+        this.form.valiStartTime = this.form.startTime5;
+        this.form.valiEndTime = this.form.endTime5;
         this.form.aGSign = this.form.aGSign5;
         this.form.aGDate = this.form.aGDate5;
         this.form.aHSign = this.form.aHSign5;
@@ -1371,8 +1372,8 @@ export default {
       }
     },
     dataOneView() {
-      this.form.startTime1 = this.delayData.startTime;
-      this.form.endTime1 = this.delayData.endTime;
+      this.form.startTime1 = this.delayData.valiStartTime;
+      this.form.endTime1 = this.delayData.valiEndTime;
       this.form.aGSign1 = this.delayData.aGSign;
       this.form.aGDate1 = this.delayData.aGDate;
       this.form.aHSign1 = this.delayData.aHSign;
@@ -1405,8 +1406,8 @@ export default {
       this.form.cI2EndTime21 = this.delayData.cI2EndTime2;
     },
     dataTwoView() {
-      this.form.startTime2 = this.delayData.startTime;
-      this.form.endTime2 = this.delayData.endTime;
+      this.form.startTime2 = this.delayData.valiStartTime;
+      this.form.endTime2 = this.delayData.valiEndTime;
       this.form.aGSign2 = this.delayData.aGSign;
       this.form.aGDate2 = this.delayData.aGDate;
       this.form.aHSign2 = this.delayData.aHSign;
@@ -1439,8 +1440,8 @@ export default {
       this.form.cI2EndTime22 = this.delayData.cI2EndTime2;
     },
     dataThreeView() {
-      this.form.startTime3 = this.delayData.startTime;
-      this.form.endTime3 = this.delayData.endTime;
+      this.form.startTime3 = this.delayData.valiStartTime;
+      this.form.endTime3 = this.delayData.valiEndTime;
       this.form.aGSign3 = this.delayData.aGSign;
       this.form.aGDate3 = this.delayData.aGDate;
       this.form.aHSign3 = this.delayData.aHSign;
@@ -1473,8 +1474,8 @@ export default {
       this.form.cI2EndTime23 = this.delayData.cI2EndTime2;
     },
     dataFourView() {
-      this.form.startTime4 = this.delayData.startTime;
-      this.form.endTime4 = this.delayData.endTime;
+      this.form.startTime4 = this.delayData.valiStartTime;
+      this.form.endTime4 = this.delayData.valiEndTime;
       this.form.aGSign4 = this.delayData.aGSign;
       this.form.aGDate4 = this.delayData.aGDate;
       this.form.aHSign4 = this.delayData.aHSign;
@@ -1507,8 +1508,8 @@ export default {
       this.form.cI2EndTime24 = this.delayData.cI2EndTime2;
     },
     dataFiveView() {
-      this.form.startTime5 = this.delayData.startTime;
-      this.form.endTime5 = this.delayData.endTime;
+      this.form.startTime5 = this.delayData.valiStartTime;
+      this.form.endTime5 = this.delayData.valiEndTime;
       this.form.aGSign5 = this.delayData.aGSign;
       this.form.aGDate5 = this.delayData.aGDate;
       this.form.aHSign5 = this.delayData.aHSign;

ui/src/views/invoicing/hazardwork/index.vue

@@ -149,7 +149,7 @@
                     <td>装置设备：
                       <el-select v-model="form.bDeviceName" filterable placeholder="请选择装置设备"
                                  @change="bDeviceChange(form.bDeviceName)" style="width: 150px">
-                        <el-option v-for="item in bDevices" :key="item.value" :label="item.label" :value="item.value">
+                        <el-option v-for="item in bDevices" :key="item.id" :label="item.devName" :value="item.id">
                         </el-option>
                       </el-select>
                       <el-input style="width: 350px;" v-model="form.bDeviceWork" placeholder="请输入后续"/>
@@ -1513,27 +1513,27 @@
                 <table>
                   <tr>
                     <td>签名：
-                      <el-input style="width: 60px;" v-model="form.hSafeMesSign">
+                      <el-input style="width: 100px;" v-model="form.hSafeMesSign">
                       </el-input>
                       <el-button type="primary" slot="append" @click="signCard('hSafeMesSign')"
                                  icon="el-icon-edit"></el-button>
-
-                      <el-date-picker format="yyyy-MM-dd HH:mm:ss"
+                      <el-date-picker style="width: 180px"
+                                      format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" v-model="form.hSafeMesDate" type="datetime">
                       </el-date-picker>
                     </td>
                     <td align="right">相应延期许可证号码：</td>
                     <td>V
-                      <el-input style="width: 150px;" v-model="form.hVNoOne"/>
+                      <el-input style="width: 150px;" v-model="form.hVNoOne" disabled/>
                     </td>
                   </tr>
                   <tr>
                     <td><small>(生产装置授权人员，D栏的安全措施已实施和检查，G栏的签名已完成)</small></td>
                     <td>V
-                      <el-input style="width: 150px;" v-model="form.hVNoTwo"/>
+                      <el-input style="width: 150px;" v-model="form.hVNoTwo" disabled/>
                     </td>
                     <td>V
-                      <el-input style="width: 150px;" v-model="form.hVNoThree"/>
+                      <el-input style="width: 150px;" v-model="form.hVNoThree" disabled/>
                     </td>
                   </tr>
                 </table>
@@ -1808,8 +1808,9 @@ import {
   updateTicket,
   getInfo
 } from "@/api/invoicing/hazardwork";
-import {listDept} from "@/api/system/dept"
-import SignCard from "../signcard/index"
+import {listDept} from "@/api/system/dept";
+import {listDevice} from "@/api/configuration/device"
+import SignCard from "../signcard/index";
 
 export default {
   components: {SignCard},
@@ -1842,13 +1843,8 @@ export default {
         value: '2',
         label: '李杨'
       }],
-      bDevices: [{
-        value: '1',
-        label: '常压储罐'
-      }, {
-        value: '2',
-        label: '液压管'
-      }],
+      bDevices: [],
+      bDeviceParams: {},
       users: [{
         value: '1',
         label: '徐明浩1'
@@ -2168,6 +2164,7 @@ export default {
   /* 页面渲染前执行的方法*/
   created() {
     this.queryMatters();
+    this.queryDevices();
 
     var id = this.$route.query.aId;
     if (id != null) {
@@ -2234,6 +2231,11 @@ export default {
       this.cIsCompressedGas = null;
       this.cIsEnvironmentalHazard = null;
     },
+    queryDevices() {
+      listDevice(this.bDeviceParams).then(response => {
+        this.bDevices = response.rows;
+      })
+    },
     queryMatters() {
       listMatters().then(response => {
         this.matterNames = response.data;
@@ -2352,12 +2354,11 @@ export default {
     },
     //TODO 装置设备后台数据联动
     bDeviceChange(val) {
-      if (val == 1) {
-        this.form.bAreaNo = 'D100';
-      }
-      if (val == 2) {
-        this.form.bAreaNo = 'D200';
-      }
+      this.bDevices.forEach(t => {
+        if (t.id == val) {
+          this.form.bAreaNo = t.area;
+        }
+      })
     },
     highTempChange() {
       this.form.cIsLowTemp = "0";
@@ -2464,7 +2465,7 @@ export default {
       console.log(res)
       if (res.signType == 'hSafeMesSign') {
         this.form.hSafeMesSign = res.cardId
-        this.form.hSafeMesDate = new Date()
+        this.form.hSafeMesDate = new Date();
         console.log('chuanguolai' + this.form.hSafeMesSign)
       }
     }

ui/src/views/invoicing/signcard/index.vue

@@ -2,7 +2,9 @@
 
   <el-dialog title="签名" :destroy-on-close="destroy" :visible.sync="visible" width="1200px" append-to-body>
 
-  <p align="center"><textarea rows="20" :value="this.cardId" cols="111"></textarea></p>
+    <p align="center">
+      <textarea rows="20" :value="this.cardId" cols="111"></textarea>
+    </p>
     <div slot="footer" class="dialog-footer">
       <el-button type="primary" @click="submitForm">{{ $t('提交') }}</el-button>
       <el-button @click="cancel">{{ $t('取 消') }}</el-button>
@@ -12,7 +14,7 @@
 
 <script>
 export default {
-  name : 'test',
+  name: 'test',
   data() {
     return {
       destroy: true,
@@ -31,17 +33,16 @@ export default {
     this.websock.close() //离开路由之后断开websocket连接
   },
   methods: {
-    init(type){
+    init(type) {
       this.visible = true
       this.signType = type
       this.initWebSocket();
     },
-    initWebSocket(){ //初始化websocket
+    initWebSocket() { //初始化websocket
       const wsuri = "ws://localhost:81/webReaderServer";
-      if ("WebSocket" in window){
+      if ("WebSocket" in window) {
         this.websock = new WebSocket(wsuri);
-      }
-      else if("MozWebSocket" in window){
+      } else if ("MozWebSocket" in window) {
         this.websock = new MozWebSocket(wsuri);
       }
       this.websock.onmessage = this.websocketonmessage;
@@ -49,17 +50,17 @@ export default {
       this.websock.onerror = this.websocketonerror;
       this.websock.onclose = this.websocketclose;
     },
-    websocketonopen(){ //连接建立之后执行send方法发送数据
+    websocketonopen() { //连接建立之后执行send方法发送数据
       console.log("连接建立之后执行send方法发送数据")
       this.cardId = "服务运行"
       this.websocketsend("0webReader");
       this.websocketsend("10|adaptReader|1");
     },
-    websocketonerror(){//连接建立失败重连
+    websocketonerror() {//连接建立失败重连
       this.cardId = "服务未运行"
       // this.initWebSocket();
     },
-    websocketonmessage(e){ //数据接收
+    websocketonmessage(e) { //数据接收
       console.log(e.data);
       var str = "";
       str = e.data;
@@ -79,28 +80,28 @@ export default {
         RePara_Int: parseInt(this._getCmdResult(arg1)),
         RePara_Str: this._getResultPara(arg1)
       };
-      if(resultData.FunctionID == "0"){
+      if (resultData.FunctionID == "0") {
         //连接上websocket，连接读卡器
         this.cardConnect()
-      }else if(resultData.FunctionID == "1"){
+      } else if (resultData.FunctionID == "1") {
         //配置参数
         this.paramStr = resultData.RePara_Str
-        this.websocketsend("1399|config_card|" + this.paramStr +"65");
-      }else if (resultData.FunctionID == "399") {
+        this.websocketsend("1399|config_card|" + this.paramStr + "65");
+      } else if (resultData.FunctionID == "399") {
         //寻找卡片
         this.findCard()
 
-      }else if (resultData.FunctionID == "32") {
-        if (resultData.RePara_Str!= "") {
-          this.cardId = resultData.RePara_Str
-          this.websocketsend("145|halt|" + this.paramStr +"");
-        }else {
+      } else if (resultData.FunctionID == "32") {
+        if (resultData.RePara_Str != "") {
+          this.cardId = resultData.RePara_Str;
+          this.websocketsend("145|halt|" + this.paramStr + "");
+        } else {
           this.cardId = this.cardId + "..."
           this.findCard()
         }
-      }else if (resultData.FunctionID == "45") {
-        this.websocketsend("13|beep|" + this.paramStr +"10");
-      }else if (resultData.FunctionID == "3") {
+      } else if (resultData.FunctionID == "45") {
+        this.websocketsend("13|beep|" + this.paramStr + "10");
+      } else if (resultData.FunctionID == "3") {
         this.disconnect()
         console.log("找到卡片之后断开websocket连接")
         this.websock.close()
@@ -112,29 +113,31 @@ export default {
       }
       // console.log(resultData);
     },
-    websocketsend(Data){//数据发送
+    websocketsend(Data) {//数据发送
       this.websock.send(Data);
     },
-    websocketclose(e){  //关闭
-      console.log('断开连接',e);
+    websocketclose(e) {  //关闭
+      console.log('断开连接', e);
     },
     cardConnect() {
-      try{
-        if(this.isComOpen==false)          //if reader link failed
+      try {
+        if (this.isComOpen == false)          //if reader link failed
         {
           // alert("initialcom");
           this.websocketsend("11|initialcom|100,115200");
         }
-      }catch(e){alert(e.message);}
+      } catch (e) {
+        alert(e.message);
+      }
       return;
     },
     disconnect() {
-       this.websocketsend("12|exit|"+ this.paramStr);
+      this.websocketsend("12|exit|" + this.paramStr);
     },
     findCard() {
-      this.websocketsend("132|findcardStr|" + this.paramStr +"0");
+      this.websocketsend("132|findcardStr|" + this.paramStr + "0");
     },
-     _getCmdResult(relPara) {
+    _getCmdResult(relPara) {
       var iRel;
       var separator = relPara.indexOf(",");
       if (separator != -1) {

ui/src/views/invoicing/ticketList/index.vue

@@ -8,7 +8,8 @@
         </template>
       </el-table-column>
       <el-table-column label="续票状态" align="center" prop="permitStatus" :show-overflow-tooltip="true"
-                       :formatter="permitStatusFormat"/>
+                       :formatter="permitStatusFormat">
+      </el-table-column>
       <el-table-column label="危害工作许可证票号" align="center" prop="aId" :show-overflow-tooltip="true">
         <template slot-scope="{row}">
           {{ row.aId || '-' }}
@@ -30,8 +31,8 @@
         </template>
       </el-table-column>
       <el-table-column label="工作内容" align="center" prop="bWorkContent" :show-overflow-tooltip="true"/>
-      <el-table-column label="日期" align="center" prop="plantCode" :show-overflow-tooltip="true"/>
-      <el-table-column label="时间" align="center" prop="year" :show-overflow-tooltip="true"/>
+      <el-table-column label="开始时间" align="center" prop="plantCode" :show-overflow-tooltip="true"/>
+      <el-table-column label="结束时间" align="center" prop="year" :show-overflow-tooltip="true"/>
       <el-table-column label="班组" align="center" prop="fileName" :show-overflow-tooltip="true"/>
       <el-table-column label="签发人" align="center" prop="filePath" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="160" class-name="small-padding fixed-width">
@@ -144,6 +145,7 @@ export default {
     },
     // 票据状态类型：字典翻译
     permitStatusFormat(row, column) {
+      console.log(row.permitStatus);
       return this.selectDictLabel(this.permitStatusOptions, row.permitStatus);
     },
   },