LY

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

@@ -173,10 +173,35 @@ public class THazardWorkPermitController extends BaseController {
         TTicketId tTicketId = new TTicketId();
         tTicketId.setId(2l);
         Long ticketId = tTicketIdController.createId(tTicketId);
-        logger.info("ticketId:" + ticketId);
+        logger.info("生成的ticketId:" + ticketId);
+        tHazardWorkPermit.setcHId(ticketId);
         tHazardWorkPermitService.updateTHazardWorkPermit(tHazardWorkPermit);
-
+        //生成火票信息
         TFireWorkPermit tFireWorkPermit = new TFireWorkPermit();
+        tFireWorkPermit.setaId(tHazardWorkPermit.getaId());
+        tFireWorkPermit.sethId(ticketId);
+        tFireWorkPermit.setaEquipmentName(tHazardWorkPermit.getaEquipmentName());
+        tFireWorkPermit.setaEquipmentLeader(tHazardWorkPermit.getaEquipmentLeader());
+        tFireWorkPermit.setaEquipmentTel(tHazardWorkPermit.getaEquipmentTel());
+        tFireWorkPermit.setaEquipmentOffice(tHazardWorkPermit.getaEquipmentOffice());
+        tFireWorkPermit.setaConstructionName(tHazardWorkPermit.getaConstructionName());
+        tFireWorkPermit.setaConstructionLeader(tHazardWorkPermit.getaConstructionLeader());
+        tFireWorkPermit.setaConstructionTel(tHazardWorkPermit.getaConstructionTel());
+        tFireWorkPermit.setaConstructionOffice(tHazardWorkPermit.getaConstructionOffice());
+        tFireWorkPermit.setaContractorName(tHazardWorkPermit.getaContractorName());
+        tFireWorkPermit.setaContractorLeader(tHazardWorkPermit.getaContractorLeader());
+        tFireWorkPermit.setaContractorTel(tHazardWorkPermit.getaContractorTel());
+        tFireWorkPermit.setaContractorOffice(tHazardWorkPermit.getaContractorOffice());
+        tFireWorkPermit.setaIsNeedSafeLiaison(tHazardWorkPermit.getaIsNeedSafeLiaison());
+        tFireWorkPermit.setaSafeLiaisonName(tHazardWorkPermit.getaSafeLiaisonName());
+        tFireWorkPermit.setaSafeLiaisonSign(tHazardWorkPermit.getaSafeLiaisonSign());
+        tFireWorkPermit.setaSafeLiaisonTel(tHazardWorkPermit.getaSafeLiaisonTel());
+        tFireWorkPermit.setaSafeLiaisonOffice(tHazardWorkPermit.getaSafeLiaisonOffice());
+        tFireWorkPermit.setbDeviceName(tHazardWorkPermit.getbDeviceName());
+        tFireWorkPermit.setbAreaNo(tHazardWorkPermit.getbAreaNo());
+        tFireWorkPermit.setbWorkContent(tHazardWorkPermit.getbWorkContent());
+        tFireWorkPermit.setbValidityStartTime(tHazardWorkPermit.getbValidityStartTime());
+        tFireWorkPermit.setbValidityEndTime(tHazardWorkPermit.getbValidityEndTime());
         tFireWorkPermitService.insertTFireWorkPermit(tFireWorkPermit);
         //保存危害工作许可证关联数据
         PermitRelation permitRelation = new PermitRelation();
@@ -237,7 +262,7 @@ public class THazardWorkPermitController extends BaseController {
         params.put("aContractorTel" , Texts.of(tHazardWorkPermit.getaContractorTel()).fontSize(7).bold().create());
         params.put("aContractorOffice" , Texts.of(tHazardWorkPermit.getaContractorOffice()).fontSize(7).bold().create());
 
-        getCheck(params,tHazardWorkPermit.getaIsNeedSafeLiaison() ,"aIsNSL1" ,"aIsNSL2"  );
+        getCheck(params,tHazardWorkPermit.getaIsNeedSafeLiaison().toString() ,"aIsNSL1" ,"aIsNSL2"  );
         params.put("aSafeLiaisonName" , Texts.of(tHazardWorkPermit.getaSafeLiaisonName()).fontSize(7).bold().create());
         params.put("aSafeLiaisonSign" , Texts.of(tHazardWorkPermit.getaSafeLiaisonSign()).fontSize(7).bold().create());
         params.put("aSafeLiaisonTel" , Texts.of(tHazardWorkPermit.getaSafeLiaisonTel()).fontSize(7).bold().create());

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

@@ -102,7 +102,7 @@ public class THazardWorkPermit extends BaseEntity {
      * 是否需要安全联络员
      */
     @Excel(name = "是否需要安全联络员")
-    private String aIsNeedSafeLiaison;
+    private Long aIsNeedSafeLiaison;
     /**
      * 安全联络员姓名
      */
@@ -1435,11 +1435,11 @@ public class THazardWorkPermit extends BaseEntity {
         return aContractorOffice;
     }
 
-    public void setaIsNeedSafeLiaison(String aIsNeedSafeLiaison) {
+    public void setaIsNeedSafeLiaison(Long aIsNeedSafeLiaison) {
         this.aIsNeedSafeLiaison = aIsNeedSafeLiaison;
     }
 
-    public String getaIsNeedSafeLiaison() {
+    public Long getaIsNeedSafeLiaison() {
         return aIsNeedSafeLiaison;
     }
 

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

@@ -449,9 +449,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <insert id="insertTFireWorkPermit" parameterType="TFireWorkPermit">
-        <selectKey keyProperty="hId" resultType="long" order="BEFORE">
+     <!--<selectKey keyProperty="hId" resultType="long" order="BEFORE">
             SELECT seq_t_fire_work_permit.NEXTVAL as hId FROM DUAL
-        </selectKey>
+        </selectKey>-->
         insert into t_fire_work_permit
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="hId != null">h_id,</if>

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

@@ -1652,6 +1652,7 @@ export default {
       getInfo(id).then(response => {
         // this.form = response.data
           this.aId = id
+          this.hId = response.data.hId,
           this.aEquipmentName = response.data.aEquipmentName,
           this.aEquipmentLeader= response.data.aEquipmentLeader,
           this.aEquipmentTel= response.data.aEquipmentTel,
@@ -1669,7 +1670,13 @@ export default {
           this.aSafeLiaisonSign= response.data.aSafeLiaisonSign,
           this.aSafeLiaisonTel= response.data.aSafeLiaisonTel,
           this.aSafeLiaisonOffice= response.data.aSafeLiaisonOffice,
-        this.msgSuccess(this.$t('数据加载成功'));
+          this.bDeviceName= response.data.bDeviceName,
+          this.bAreaNo= response.data.bAreaNo,
+          this.bWorkContent= response.data.bWorkContent,
+          this.bDeviceName= response.data.bDeviceName,
+          this.$set(this.value1, 0, response.data.bValidityStartTime);
+          this.$set(this.value1, 1, response.data.bValidityEndTime);
+          this.msgSuccess(this.$t('数据加载成功'));
       });
       this.aIdDisabled = true;
     }

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

@@ -177,7 +177,7 @@
                 <table>
                   <tr>
                     <td>
-                      <el-checkbox v-model="isYesDanger" true-label="1" false-label="0"/>
+                      <el-checkbox v-model="form.isYesDanger" true-label="1" false-label="0"/>
                     </td>
                     <td colspan="10">危害物质（正常运行时存在于设备中的物料名称）：
                       <!-- 物料数据源绑定 -->
@@ -1799,56 +1799,56 @@
                   </tr>
                 </table>
               </el-collapse-item>
-<!--              <el-collapse-item title="J1 中途的E&I功能测试       J2 中途测试后,再次停用装置设备" name="10">-->
-<!--                <table>-->
-<!--                  <tr>-->
-<!--                    <td>-->
-<!--                      <el-input style="width: 85px;" v-model="form.jOneBSign" readonly @focus="signCard('jOneBSign')">-->
-<!--                        <i slot="prefix" class="el-input__icon el-icon-edit"></i>-->
-<!--                      </el-input>-->
-<!--                      &lt;!&ndash;<el-button type="primary" slot="append" @click="signCard('jOneBSign')"-->
-<!--                                 icon="el-icon-edit"></el-button>&ndash;&gt;-->
-<!--                      <el-date-picker format="yyyy-MM-dd HH:mm:ss"-->
-<!--                                      value-format="yyyy-MM-dd HH:mm:ss" style="width: 180px" v-model="form.jOneBDate"-->
-<!--                                      type="datetime">-->
-<!--                      </el-date-picker>-->
-<!--                    </td>-->
-<!--                    <td>-->
-<!--                      <el-input style="width: 85px;" v-model="form.jResMemberSign" readonly @focus="signCard('jResMemberSign')">-->
-<!--                        <i slot="prefix" class="el-input__icon el-icon-edit"></i>-->
-<!--                      </el-input>-->
-<!--                      &lt;!&ndash;<el-button type="primary" slot="append" @click="signCard('jResMemberSign')"-->
-<!--                                 icon="el-icon-edit"></el-button>&ndash;&gt;-->
-<!--                      <el-date-picker format="yyyy-MM-dd HH:mm:ss"-->
-<!--                                      value-format="yyyy-MM-dd HH:mm:ss" style="width: 180px"-->
-<!--                                      v-model="form.jResMemberDate" type="datetime">-->
-<!--                      </el-date-picker>-->
-<!--                    </td>-->
-<!--                    <td>-->
-<!--                      <el-input style="width: 85px;" v-model="form.jEISign" readonly @focus="signCard('jEISign')">-->
-<!--                        <i slot="prefix" class="el-input__icon el-icon-edit"></i>-->
-<!--                      </el-input>-->
-<!--                      &lt;!&ndash;<el-button type="primary" slot="append" @click="signCard('jEISign')"-->
-<!--                                 icon="el-icon-edit"></el-button>&ndash;&gt;-->
-<!--                      <el-date-picker format="yyyy-MM-dd HH:mm:ss"-->
-<!--                                      value-format="yyyy-MM-dd HH:mm:ss" style="width: 180px" v-model="form.jEIDate"-->
-<!--                                      type="datetime">-->
-<!--                      </el-date-picker>-->
-<!--                    </td>-->
-<!--                  </tr>-->
-<!--                  <tr>-->
-<!--                    <td>-->
-<!--                      <small>授权的维修工人签名(l1b)，日期</small>-->
-<!--                    </td>-->
-<!--                    <td>-->
-<!--                      <small>生产装置授权人签名(G)，日期</small>-->
-<!--                    </td>-->
-<!--                    <td>-->
-<!--                      <small>E&I人员签名确认已安全停电，日期</small>-->
-<!--                    </td>-->
-<!--                  </tr>-->
-<!--                </table>-->
-<!--              </el-collapse-item>-->
+              <el-collapse-item title="J1 中途的E&I功能测试       J2 中途测试后,再次停用装置设备" name="10">
+                <table>
+                  <tr>
+                    <td>
+                      <el-input style="width: 85px;" v-model="form.jOneBSign" readonly @focus="signCard('jOneBSign')">
+                        <i slot="prefix" class="el-input__icon el-icon-edit"></i>
+                      </el-input>
+                      <!--<el-button type="primary" slot="append" @click="signCard('jOneBSign')"
+                                 icon="el-icon-edit"></el-button>-->
+                      <el-date-picker format="yyyy-MM-dd HH:mm:ss"
+                                      value-format="yyyy-MM-dd HH:mm:ss" style="width: 180px" v-model="form.jOneBDate"
+                                      type="datetime">
+                      </el-date-picker>
+                    </td>
+                    <td>
+                      <el-input style="width: 85px;" v-model="form.jResMemberSign" readonly @focus="signCard('jResMemberSign')">
+                        <i slot="prefix" class="el-input__icon el-icon-edit"></i>
+                      </el-input>
+                      <!--<el-button type="primary" slot="append" @click="signCard('jResMemberSign')"
+                                 icon="el-icon-edit"></el-button>-->
+                      <el-date-picker format="yyyy-MM-dd HH:mm:ss"
+                                      value-format="yyyy-MM-dd HH:mm:ss" style="width: 180px"
+                                      v-model="form.jResMemberDate" type="datetime">
+                      </el-date-picker>
+                    </td>
+                    <td>
+                      <el-input style="width: 85px;" v-model="form.jEISign" readonly @focus="signCard('jEISign')">
+                        <i slot="prefix" class="el-input__icon el-icon-edit"></i>
+                      </el-input>
+                      <!--<el-button type="primary" slot="append" @click="signCard('jEISign')"
+                                 icon="el-icon-edit"></el-button>-->
+                      <el-date-picker format="yyyy-MM-dd HH:mm:ss"
+                                      value-format="yyyy-MM-dd HH:mm:ss" style="width: 180px" v-model="form.jEIDate"
+                                      type="datetime">
+                      </el-date-picker>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td>
+                      <small>授权的维修工人签名(l1b)，日期</small>
+                    </td>
+                    <td>
+                      <small>生产装置授权人签名(G)，日期</small>
+                    </td>
+                    <td>
+                      <small>E&I人员签名确认已安全停电，日期</small>
+                    </td>
+                  </tr>
+                </table>
+              </el-collapse-item>
               <el-row :gutter="20">
                 <el-col :span="12">
                   <el-collapse-item title="K 确认F栏的安全措施已完成" name="12">
@@ -2050,6 +2050,7 @@ import {
 } from "@/api/ehs/throughcleanbcc";
 import {
   addTicket,
+  addFireTicket,
   updateTicket,
   getInfo
 } from "@/api/invoicing/hazardwork";
@@ -2097,7 +2098,15 @@ export default {
         callback(this.$message.error('工作内容描述不能为空'))
       }else if(!this.form.bAreaNo){
         callback(this.$message.error('位置/区域号不能为空'))
-      }else {
+      }else if(this.value1==null || this.value1.length < 2){
+        callback(this.$message.error('有效期不能为空'))
+      }
+      /*else if(!this.form.bValidityStartTime){
+        callback(this.$message.error('有效期不能为空'))
+      }else if(!this.form.bValidityEndTime){
+        callback(this.$message.error('有效期不能为空'))
+      }*/
+      else {
         callback();
       }
     };
@@ -2590,7 +2599,7 @@ export default {
   created() {
     this.queryMatters();
     this.queryDevices();
-
+    console.log(this.value1)
     getForType(this.safeGogglesParams).then(response => {
       this.safeGoggles = response.data;
     });
@@ -2746,13 +2755,16 @@ export default {
           if (valid) {
               addTicket(this.form).then(response => {
                 this.form.aId = response.data;
-                this.$nextTick(() => {
-                  let routeData = this.$router.resolve({
-                    path: "/firework",
-                    query:{aId: this.form.aId}
-                  });
-                  window.open(routeData.href, '_blank');
-                })
+                addFireTicket(this.form).then(response => {
+                  this.form.aId = response.data;
+                  this.$nextTick(() => {
+                    let routeData = this.$router.resolve({
+                      path: "/firework",
+                      query:{aId: this.form.aId}
+                    });
+                    window.open(routeData.href, '_blank');
+                  })
+                });
               });
               this.aIdDisabled = true;
           }