Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/vcs.xml

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

@@ -18,7 +18,7 @@ public class TDelayPermit extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 主键ID */
-    private Long id;
+    private Long dpId;
 
     /** 延期票ID */
     @Excel(name = "延期票ID")
@@ -50,15 +50,14 @@ public class TDelayPermit extends BaseEntity
         this.others = others;
     }
 
-    public void setId(Long id)
-    {
-        this.id = id;
+    public Long getDpId() {
+        return dpId;
     }
 
-    public Long getId()
-    {
-        return id;
+    public void setDpId(Long dpId) {
+        this.dpId = dpId;
     }
+
     public void setvId(Long vId)
     {
         this.vId = vId;
@@ -108,7 +107,7 @@ public class TDelayPermit extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
+            .append("dpId", getDpId())
             .append("vId", getvId())
             .append("aId", getaId())
             .append("hId", gethId())

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

@@ -5,27 +5,22 @@
 <mapper namespace="com.ruoyi.project.ticket.mapper.TDelayPermitMapper">
 
     <resultMap type="TDelayPermit" id="TDelayPermitResult">
-        <result property="id" column="id"/>
+        <result property="dpId" column="dp_id"/>
         <result property="vId" column="v_id"/>
         <result property="aId" column="a_id"/>
-        <result property="hId" column="h_id"/>
-        <result property="cId" column="c_id"/>
-        <result property="otherId" column="other_id"/>
     </resultMap>
 
     <sql id="selectTDelayPermitVo">
-        select d.id, d.v_id, d.a_id, d.h_id, d.c_id, d.other_id
+        select d.dp_id, d.v_id, d.a_id
         from t_delay_permit d
     </sql>
 
     <select id="selectDelayCount" parameterType="TDelayPermit" resultMap="TDelayPermitResult">
         <include refid="selectTDelayPermitVo"/>
         <where>
+            <if test="dpId != null ">and v_id = #{dpId}</if>
             <if test="vId != null ">and v_id = #{vId}</if>
             <if test="aId != null ">and a_id = #{aId}</if>
-            <if test="hId != null ">and h_id = #{hId}</if>
-            <if test="cId != null ">and c_id = #{cId}</if>
-            <if test="otherId != null ">and other_id = #{otherId}</if>
         </where>
         order by v_id
     </select>

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

@@ -26,7 +26,6 @@
                a.B_WORK_CONTENT AS bWorkContent,
                c.B_WORK_CONTENT AS cbWorkContent,
                a.H_V_NO_ONE     AS hVNoOne,
-               c.H_V_NO_ONE     AS chVNoOne,
                t.PERMIT_TYPE,
                t.PERMIT_STATUS
         FROM T_PERMIT_RELATION t

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

@@ -160,7 +160,7 @@
                     <td colspan="2" class="short-checkbox">
                       <el-row>
                         <el-col :span="3">是否有GHS标识
-                          <el-checkbox v-model="form.cIsDanger" true-label="1" false-label="0"/></el-col>
+                          <el-checkbox v-model="form.cIsGhs" true-label="1" false-label="0"/></el-col>
                         <el-col :span="2.5" style="text-align: center">
                           <el-image style="width: 70px;height: 70px;" :src="require('@/assets/image/toxicIcon.png')">
                           </el-image>
@@ -280,15 +280,15 @@
                     <td class="short-checkbox">
                       <el-checkbox v-model="form.cIsOtherA" :true-label="1" :false-label="0"/>
                       涉及的其它作业，相关许可证：
-                      <el-input style="width: 158px;" v-model="form.aId"><i slot="prefix" class="el-input__icon el-icon-word">A</i>
+                      <el-input style="width: 158px;" v-model="form.cOtherId"><i slot="prefix" class="el-input__icon el-icon-word">A</i>
                       </el-input>
                     </td>
                   </tr>
                   <tr>
                     <td class="short-checkbox" colspan="2">
-                      <el-checkbox v-model="form.cIsOtherFire" true-label="1" :false-label="0"/>
+                      <el-checkbox v-model="form.cIsOtherDanger" true-label="1" :false-label="0"/>
                       其它危害：
-                      <el-input v-model="form.cOtherFireContent" style="width: calc(100% - 104px)"/>
+                      <el-input v-model="form.cOtherDangerContent" style="width: calc(100% - 104px)"/>
                     </td>
 
                   </tr>
@@ -324,9 +324,9 @@
                       </el-date-picker>
                     </td>
                     <td>
-                      <el-input style="width: 50%;" prefix-icon="el-icon-edit" />
+                      <el-input v-model="form.dSafeLiftedSign11" style="width: 50%;" prefix-icon="el-icon-edit" />
                       <el-date-picker style="width: 50%;"
-                                      type="date">
+                                      type="date" v-model="form.dSafeLiftedDate11">
                       </el-date-picker>
                     </td>
                   </tr>
@@ -345,21 +345,21 @@
                                                                  @change="dIsDisFeederChange"
                                                                  :disabled="form.dIsDkdyx !== null?false:true"/></td>
                     <td rowspan="4">
-                      <el-input style="width: 50%;" v-model="form.dDisFeederImplSign" readonly
+                      <el-input style="width: 50%;" v-model="form.dDisFeederImplSign12" readonly
                                 :disabled="form.dIsDisFeeder==1?false:true" prefix-icon="el-icon-edit"
                                 @focus="signCard('dDisFeederImplSign')">
                       </el-input>
-                      <el-date-picker style="width: 50%" v-model="form.dDisFeederImplDate" type="date"
+                      <el-date-picker style="width: 50%" v-model="form.dDisFeederImplDate12" type="date"
                                       format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss"
                                       :disabled="form.dIsDisFeeder==1?false:true">
                       </el-date-picker>
                     </td>
                     <td rowspan="4">
-                      <el-input style="width: 50%" v-model="form.dDisFeederLiftedSign" prefix-icon="el-icon-edit" disabled/>
+                      <el-input style="width: 50%" v-model="form.dDisFeederLiftedSign12" prefix-icon="el-icon-edit" disabled/>
                       <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
-                                      v-model="form.dDisFeederLiftedDate" type="date" disabled>
+                                      v-model="form.dDisFeederLiftedDate12" type="date" disabled>
                       </el-date-picker>
                     </td>
                   </tr>
@@ -472,21 +472,21 @@
                                                                  @change="dIsDoubleBlockChange"
                                                                  :disabled="form.dIsSingleBlocking!= null?false:true"/></td>
                     <td>
-                      <el-input style="width: 50%;" v-model="form.dSafeImplSign23" readonly
+                      <el-input style="width: 50%;" v-model="form.dSafeImplSign22" readonly
                                 :disabled="form.dIsDoubleBlock==1?false:true" prefix-icon="el-icon-edit"
                                 @focus="signCard('dSafeImplSign23')">
                       </el-input>
                       <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
-                                      v-model="form.dSafeImplDate23" type="date"
+                                      v-model="form.dSafeImplDate22" type="date"
                                       :disabled="form.dIsDoubleBlock==1?false:true">
                       </el-date-picker>
                     </td>
                     <td>
-                      <el-input style="width: 50%;" v-model="form.dSafeLiftedSign23" prefix-icon="el-icon-edit" disabled/>
+                      <el-input style="width: 50%;" v-model="form.dSafeLiftedSign22" prefix-icon="el-icon-edit" disabled/>
                       <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
-                                      v-model="form.dSafeLiftedDate23" type="date" disabled>
+                                      v-model="form.dSafeLiftedDate22" type="date" disabled>
                       </el-date-picker>
                     </td>
                   </tr>
@@ -499,21 +499,21 @@
                                                                  @change="dIsLockoutUsingChange"
                                                                  :disabled="form.dIsDoubleBlock!= null?false:true"/></td>
                     <td>
-                      <el-input style="width: 50%;" v-model="form.dSafeImplSign24" readonly prefix-icon="el-icon-edit"
+                      <el-input style="width: 50%;" v-model="form.dSafeImplSign23" readonly prefix-icon="el-icon-edit"
                                 :disabled="form.dIsLockoutUsing==1?false:true"
                                 @focus="signCard('dSafeImplSign24')">
                       </el-input>
                       <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
-                                      v-model="form.dSafeImplDate24" type="date"
+                                      v-model="form.dSafeImplDate23" type="date"
                                       :disabled="form.dIsLockoutUsing==1?false:true">
                       </el-date-picker>
                     </td>
                     <td>
-                      <el-input style="width: 50%;" v-model="form.dSafeLiftedSign24" prefix-icon="el-icon-edit" disabled/>
+                      <el-input style="width: 50%;" v-model="form.dSafeLiftedSign23" prefix-icon="el-icon-edit" disabled/>
                       <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
-                                      v-model="form.dSafeLiftedDate24" type="date" disabled>
+                                      v-model="form.dSafeLiftedDate23" type="date" disabled>
                       </el-date-picker>
                     </td>
                   </tr>
@@ -525,21 +525,21 @@
                                                                  @change="dIsRemovePipeChange"
                                                                  :disabled="form.dIsLockoutUsing!= null?false:true"/></td>
                     <td>
-                      <el-input style="width: 50%;" v-model="form.dSafeImplSign25" readonly prefix-icon="el-icon-edit"
+                      <el-input style="width: 50%;" v-model="form.dSafeImplSign24" readonly prefix-icon="el-icon-edit"
                                 :disabled="form.dIsRemovePipe==1?false:true"
                                 @focus="signCard('dSafeImplSign25')">
                       </el-input>
                       <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
-                                      v-model="form.dSafeImplDate25" type="date"
+                                      v-model="form.dSafeImplDate24" type="date"
                                       :disabled="form.dIsRemovePipe==1?false:true">
                       </el-date-picker>
                     </td>
                     <td>
-                      <el-input style="width: 50%" v-model="form.dSafeLiftedSign25" prefix-icon="el-icon-edit" disabled/>
+                      <el-input style="width: 50%" v-model="form.dSafeLiftedSign24" prefix-icon="el-icon-edit" disabled/>
                       <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
-                                      v-model="form.dSafeLiftedDate25" type="date" disabled>
+                                      v-model="form.dSafeLiftedDate24" type="date" disabled>
                       </el-date-picker>
                     </td>
                   </tr>
@@ -551,20 +551,20 @@
                                                                  @change="dIsDisPipesChange"
                                                                  :disabled="form.dIsRemovePipe!= null?false:true"/></td>
                     <td>
-                      <el-input style="width: 50%;" v-model="form.dSafeImplSign26" readonly prefix-icon="el-icon-edit"
+                      <el-input style="width: 50%;" v-model="form.dSafeImplSign25" readonly prefix-icon="el-icon-edit"
                                 :disabled="form.dIsDisPipes==1?false:true" @focus="signCard('dSafeImplSign26')">
                       </el-input>
                       <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
-                                      v-model="form.dSafeImplDate26" type="date"
+                                      v-model="form.dSafeImplDate25" type="date"
                                       :disabled="form.dIsDisPipes==1?false:true">
                       </el-date-picker>
                     </td>
                     <td>
-                      <el-input style="width: 50%" v-model="form.dSafeLiftedSign26" prefix-icon="el-icon-edit" disabled/>
+                      <el-input style="width: 50%" v-model="form.dSafeLiftedSign25" prefix-icon="el-icon-edit" disabled/>
                       <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
-                                      v-model="form.dSafeLiftedDate26" type="date" disabled>
+                                      v-model="form.dSafeLiftedDate25" type="date" disabled>
                       </el-date-picker>
                     </td>
                   </tr>
@@ -576,21 +576,21 @@
                                                                  @change="dIsInsertBlindPlageChange"
                                                                  :disabled="form.dIsDisPipes!= null?false:true"/></td>
                     <td style="text-align: center;">
-                      <el-input style="width: 50%;" v-model="form.dSafeImplSign27" readonly prefix-icon="el-icon-edit"
+                      <el-input style="width: 50%;" v-model="form.dSafeImplSign26" readonly prefix-icon="el-icon-edit"
                                 :disabled="form.dIsInsertBlindPlage==1?false:true"
                                 @focus="signCard('dSafeImplSign27')">
                       </el-input>
                       <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
-                                      v-model="form.dSafeImplDate27" type="date"
+                                      v-model="form.dSafeImplDate26" type="date"
                                       :disabled="form.dIsInsertBlindPlage==1?false:true">
                       </el-date-picker>
                     </td>
                     <td style="text-align: center;">
-                      <el-input style="width: 50%;" v-model="form.dSafeLiftedSign27" prefix-icon="el-icon-edit" disabled/>
+                      <el-input style="width: 50%;" v-model="form.dSafeLiftedSign26" prefix-icon="el-icon-edit" disabled/>
                       <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%;"
-                                      v-model="form.dSafeLiftedDate27" type="date" disabled>
+                                      v-model="form.dSafeLiftedDate26" type="date" disabled>
                       </el-date-picker>
                     </td>
                   </tr>
@@ -607,20 +607,20 @@
                                    :disabled="form.dIsInsertBlindPlage!= null?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-input style="width: 50%;" v-model="form.dSafeImplSign28" readonly prefix-icon="el-icon-edit"
+                      <el-input style="width: 50%;" v-model="form.dSafeImplSign27" readonly prefix-icon="el-icon-edit"
                                 :disabled="form.dIsMecSecure==1?false:true" @focus="signCard('dSafeImplSign28')">
                       </el-input>
                       <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
-                                      v-model="form.dSafeImplDate28" type="date"
+                                      v-model="form.dSafeImplDate27" type="date"
                                       :disabled="form.dIsMecSecure==1?false:true">
                       </el-date-picker>
                     </td>
                     <td style="text-align: center;">
-                      <el-input style="width: 50%;" v-model="form.dSafeLiftedSign28" prefix-icon="el-icon-edit" disabled/>
+                      <el-input style="width: 50%;" v-model="form.dSafeLiftedSign27" prefix-icon="el-icon-edit" disabled/>
                       <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%;"
-                                      v-model="form.dSafeLiftedDate28" type="date" disabled>
+                                      v-model="form.dSafeLiftedDate27" type="date" disabled>
                       </el-date-picker>
                     </td>
                   </tr>
@@ -638,11 +638,11 @@
                     <td style="text-align: center;">
                       <el-input style="width: 50%;" v-model="form.dSafeImplSign29" readonly prefix-icon="el-icon-edit"
                                 :disabled="form.dIsIsolationDiagram==1?false:true"
-                                @focus="signCard('dSafeImplSign29')">
+                                @focus="signCard('dSafeImplSign28')">
                       </el-input>
                       <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
-                                      v-model="form.dSafeImplDate29" type="date"
+                                      v-model="form.dSafeImplDate28" type="date"
                                       :disabled="form.dIsIsolationDiagram==1?false:true">
                       </el-date-picker>
                     </td>
@@ -657,21 +657,21 @@
                                                                 @change="dIsOtherSafePlantChange"
                                                                 :disabled="form.dIsIsolationDiagram!= null?false:true"/></td>
                     <td style="text-align: center;">
-                      <el-input style="width: 50%;" v-model="form.dSafeImplSign210" readonly prefix-icon="el-icon-edit"
+                      <el-input style="width: 50%;" v-model="form.dSafeImplSign29" readonly prefix-icon="el-icon-edit"
                                 :disabled="form.dIsOtherSafePlant==1?false:true"
                                 @focus="signCard('dSafeImplSign210')">
                       </el-input>
                       <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
-                                      v-model="form.dSafeImplDate210" type="date"
+                                      v-model="form.dSafeImplDate29" type="date"
                                       :disabled="form.dIsOtherSafePlant==1?false:true">
                       </el-date-picker>
                     </td>
                     <td style="text-align: center;">
-                      <el-input style="width: 50%" v-model="form.dSafeLiftedSign210" disabled/>
+                      <el-input style="width: 50%" v-model="form.dSafeLiftedSign29" disabled/>
                       <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
-                                      v-model="form.dSafeLiftedDate210" type="date" disabled>
+                                      v-model="form.dSafeLiftedDate29" type="date" disabled>
                       </el-date-picker>
                     </td>
                   </tr>
@@ -791,20 +791,20 @@
                       <el-checkbox v-model="form.dIsSiteDemarcation" :true-label="0" :false-label="1"/>
                     </td>
                     <td>
-                      <el-input style="width: 50%;" v-model="form.dSafeImplSign11" prefix-icon="el-icon-edit"
+                      <el-input style="width: 50%;" v-model="form.dSafeImplSign41" prefix-icon="el-icon-edit"
                                 :disabled="form.dIsSiteDemarcation==1?false:true"/>
                       <el-date-picker
                         style="width: 50%;"
-                        v-model="form.dSafeImplDate11"
+                        v-model="form.dSafeImplDate41"
                         type="date" :disabled="form.dIsSiteDemarcation==1?false:true">
                       </el-date-picker>
                     </td>
                     <td>
-                      <el-input style="width: 50%;" v-model="form.dSafeLiftedSign11" prefix-icon="el-icon-edit"
+                      <el-input style="width: 50%;" v-model="form.dSafeLiftedSign41" prefix-icon="el-icon-edit"
                                 :disabled="form.dIsSiteDemarcation==0?false:true"/>
                       <el-date-picker
                         style="width: 50%;"
-                        v-model="form.dSafeLiftedDate11"
+                        v-model="form.dSafeLiftedDate41"
                         type="date" :disabled="form.dIsSiteDemarcation==0?false:true">
                       </el-date-picker>
                     </td>
@@ -851,20 +851,20 @@
                                    :disabled="form.dIsSiteDemarcation != null?false:true"/>
                     </td>
                     <td>
-                      <el-input style="width: 50%;" v-model="form.dSafeImplSign12" prefix-icon="el-icon-edit"
+                      <el-input style="width: 50%;" v-model="form.dSafeImplSign43" prefix-icon="el-icon-edit"
                                 :disabled="form.dIsCloseTrucks == 1?false:true"/>
                       <el-date-picker
                         style="width: 50%;"
-                        v-model="form.dSafeImplDate12"
+                        v-model="form.dSafeImplDate43"
                         type="date" :disabled="form.dIsCloseTrucks == 1?false:true">
                       </el-date-picker>
                     </td>
                     <td>
-                      <el-input style="width: 50%;" v-model="form.dSafeLiftedSign12" prefix-icon="el-icon-edit"
+                      <el-input style="width: 50%;" v-model="form.dSafeLiftedSign43" prefix-icon="el-icon-edit"
                                 :disabled="form.dIsCloseTrucks == 0?false:true"/>
                       <el-date-picker
                         style="width: 50%;"
-                        v-model="form.dSafeLiftedDate12"
+                        v-model="form.dSafeLiftedDate43"
                         type="date" :disabled="form.dIsCloseTrucks == 0?false:true">
                       </el-date-picker>
                     </td>
@@ -896,27 +896,27 @@
                   </tr>
                   <tr>
                     <td>4.5
-                      <el-input style="width: calc(100% - 25px);" v-model="form.dOtherWorkSafeContent"
-                                :disabled="form.dIsOtherWorkSafe==1?false:true"/>
+                      <el-input style="width: calc(100% - 25px);" v-model="form.dOtherSafeContent"
+                                :disabled="form.dIsOtherSafe==1?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-checkbox v-model="form.dIsOtherWorkSafe" true-label="1" false-label="0"
+                      <el-checkbox v-model="form.dIsOtherSafe" true-label="1" false-label="0"
                                    :disabled="form.dIsLeakFlanges!= null?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-checkbox v-model="form.dIsOtherWorkSafe" true-label="0" false-label="1"
+                      <el-checkbox v-model="form.dIsOtherSafe" true-label="0" false-label="1"
                                    @change="dIsOtherWorkSafeChange"
                                    :disabled="form.dIsLeakFlanges!= null?false:true"/>
                     </td>
                     <td style="text-align: center;">
                       <el-input style="width: 50%;" v-model="form.dSafeImplSign45" readonly prefix-icon="el-icon-edit"
-                                :disabled="form.dIsOtherWorkSafe==1?false:true"
+                                :disabled="form.dIsOtherSafe==1?false:true"
                                 @focus="signCard('dSafeImplSign45')">
                       </el-input>
                       <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
                                       v-model="form.dSafeImplDate45" type="date"
-                                      :disabled="form.dIsOtherWorkSafe==1?false:true">
+                                      :disabled="form.dIsOtherSafe==1?false:true">
                       </el-date-picker>
                     </td>
                     <td style="text-align: center;">
@@ -932,22 +932,26 @@
                   </tr>
                   <tr>
                     <td>5.1 自然通风：
-                      <el-input style="width:calc(100% - 92px)" />
+                      <el-input v-model="form.dVentilateContent" style="width:calc(100% - 92px)" />
                     </td>
                     <td style="text-align: center;">
-                      <el-checkbox true-label="1" false-label="0"/>
+                      <el-checkbox v-model="form.dIsVentilate" true-label="1" false-label="0"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-checkbox true-label="0" false-label="1" />
+                      <el-checkbox v-model="form.dIsVentilate" true-label="0" false-label="1" />
                     </td>
-                    <td><el-input prefix-icon="el-icon-edit" style="width: 50%"></el-input>
-                      <el-date-picker format="yyyy-MM-dd HH:mm:ss"
+                    <td>
+                      <el-input v-model="form.dSafeImplSign51" prefix-icon="el-icon-edit" style="width: 50%"></el-input>
+                      <el-date-picker v-model="form.dSafeImplDate51" format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%" type="date" disabled>
-                      </el-date-picker></td>
-                    <td><el-input prefix-icon="el-icon-edit" style="width: 50%"></el-input>
-                      <el-date-picker format="yyyy-MM-dd HH:mm:ss"
+                      </el-date-picker>
+                    </td>
+                    <td>
+                      <el-input v-model="form.dSafeLiftedSign51" prefix-icon="el-icon-edit" style="width: 50%"></el-input>
+                      <el-date-picker v-model="form.dSafeLiftedDate51" format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%" type="date" disabled>
-                      </el-date-picker></td>
+                      </el-date-picker>
+                    </td>
                   </tr>
                 </table>
               </el-collapse-item>
@@ -966,32 +970,32 @@
                   </tr>
                   <tr>
                     <td>5.2 机械通风使用：
-                      <el-input style="width: calc(100% - 117px)" :disabled="form.eIsMecVen==1?false:true"/>
+                      <el-input v-model="form.dVentilateUseContent" style="width: calc(100% - 117px)" :disabled="form.eIsMecVen==1?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-checkbox true-label="1" false-label="0"/>
+                      <el-checkbox v-model="form.dIsVentilateUse" true-label="1" false-label="0"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-checkbox true-label="0" false-label="1" />
+                      <el-checkbox v-model="form.dIsVentilateUse" true-label="0" false-label="1" />
                     </td>
-                    <td><el-input prefix-icon="el-icon-edit" style="width: 50%"></el-input>
-                      <el-date-picker format="yyyy-MM-dd HH:mm:ss"
+                    <td><el-input v-model="form.dSafeImplSign52" prefix-icon="el-icon-edit" style="width: 50%"></el-input>
+                      <el-date-picker v-model="form.dSafeImplDate52" format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%" type="date" disabled>
                       </el-date-picker></td>
-                    <td><el-input prefix-icon="el-icon-edit" style="width: 50%"></el-input>
-                      <el-date-picker format="yyyy-MM-dd HH:mm:ss"
+                    <td><el-input v-model="form.dSafeLiftedSign52" prefix-icon="el-icon-edit" style="width: 50%"></el-input>
+                      <el-date-picker v-model="form.dSafeLiftedDate52" format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%" type="date" disabled>
                       </el-date-picker></td>
                   </tr>
                   <tr>
                     <td> 通风时间：
-                      <el-input style="width: calc(100% - 91px)" />
+                      <el-input v-model="form.dVentilateDateContent" style="width: calc(100% - 91px)" />
                     </td>
                     <td style="text-align: center;">
-                      <el-checkbox true-label="1" false-label="0"/>
+                      <el-checkbox v-model="form.dIsVentilateDate" true-label="1" false-label="0"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-checkbox true-label="0" false-label="1" />
+                      <el-checkbox v-model="form.dIsVentilateDate" true-label="0" false-label="1" />
                     </td>
                     <td><el-input prefix-icon="el-icon-edit" style="width: 50%"></el-input>
                       <el-date-picker format="yyyy-MM-dd HH:mm:ss"
@@ -1004,16 +1008,16 @@
                   </tr>
                   <tr>
                     <td>5.3 空气分析内容：
-                      <el-input style="width: calc(100% - 117px)" />
+                      <el-input v-model="form.dAnalysisContent" style="width: calc(100% - 117px)" />
                     </td>
                     <td style="text-align: center;">
-                      <el-checkbox ></el-checkbox>
+                      <el-checkbox v-model="form.dIsAnalysis" ></el-checkbox>
                     </td>
                     <td style="text-align: center;">
-                      <el-checkbox ></el-checkbox>
+                      <el-checkbox v-model="form.dIsAnalysis" ></el-checkbox>
                     </td>
-                    <td><el-input prefix-icon="el-icon-edit" style="width: 50%"></el-input>
-                      <el-date-picker format="yyyy-MM-dd HH:mm:ss"
+                    <td><el-input v-model="form.dSafeImplSign53" prefix-icon="el-icon-edit" style="width: 50%"></el-input>
+                      <el-date-picker v-model="form.dSafeImplDate53" format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%" type="date" disabled>
                       </el-date-picker></td>
                     <td><el-input prefix-icon="el-icon-edit" style="width: 50%"></el-input>
@@ -1025,15 +1029,15 @@
                     <td colspan="5"><b>6. 额外的组织措施</b></td>
                   </tr>
                   <tr>
-                    <td>6.1 <el-input prefix-icon="el-icon-edit" style="width: calc(100% - 25px)" /></td>
-                    <td style="text-align: center"><el-checkbox /></td>
-                    <td style="text-align: center"><el-checkbox /></td>
-                    <td><el-input prefix-icon="el-icon-edit" style="width: 50%"></el-input>
-                      <el-date-picker format="yyyy-MM-dd HH:mm:ss"
+                    <td>6.1 <el-input v-model="form.dOtherMeasureContent" prefix-icon="el-icon-edit" style="width: calc(100% - 25px)" /></td>
+                    <td style="text-align: center"><el-checkbox v-model="form.dIsOtherMeasure"/></td>
+                    <td style="text-align: center"><el-checkbox v-model="form.dIsOtherMeasure"/></td>
+                    <td><el-input v-model="form.dSafeImplSign61" prefix-icon="el-icon-edit" style="width: 50%"></el-input>
+                      <el-date-picker v-model="form.dSafeImplDate61" format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%" type="date" disabled>
                       </el-date-picker></td>
-                    <td><el-input prefix-icon="el-icon-edit" style="width: 50%"></el-input>
-                      <el-date-picker format="yyyy-MM-dd HH:mm:ss"
+                    <td><el-input v-model="form.dSafeLiftedSign61" prefix-icon="el-icon-edit" style="width: 50%"></el-input>
+                      <el-date-picker v-model="form.dSafeLiftedDate61" format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%" type="date" disabled>
                       </el-date-picker></td>
                   </tr>
@@ -1113,25 +1117,25 @@
                       <tr>
                         <td>2.1 安全护目镜</td>
                         <td style="text-align: center;">
-                          <el-checkbox v-model="eIsSafeGoggles" true-label="1" false-label="0"/>
+                          <el-checkbox v-model="form.eIsSafeGoggles" true-label="1" false-label="0"/>
                         </td>
                         <td style="text-align: center;">
-                          <el-checkbox v-model="eIsSafeGoggles" true-label="0" false-label="1"/>
+                          <el-checkbox v-model="form.eIsSafeGoggles" true-label="0" false-label="1"/>
                         </td>
                       </tr>
                       <tr>
                         <td>2.2 防护面罩</td>
                         <td style="text-align: center;">
-                          <el-checkbox v-model="eIsFaceShield" true-label="1" false-label="0"/>
+                          <el-checkbox v-model="form.eIsFaceShield" true-label="1" false-label="0"/>
                         </td>
                         <td style="text-align: center;">
-                          <el-checkbox v-model="eIsFaceShield" true-label="0" false-label="1"/>
+                          <el-checkbox v-model="form.eIsFaceShield" true-label="0" false-label="1"/>
                         </td>
                       </tr>
                       <tr>
                         <td>2.3 防护手套，类型：
                           <el-select :disabled="eIsProtectGloves==1?false:true" style="width: calc(100% - 130px)"
-                                     v-model="eProtectGlovesContent" placeholder="请选择防护手套">
+                                     v-model="form.eProtectGlovesContent" placeholder="请选择防护手套">
                             <el-option v-for="dict in safeGoggles" :key="dict.id"
                                        :label="dict.conservatoryMeasureName"
                                        :value="dict.id">
@@ -1139,35 +1143,35 @@
                           </el-select>
                         </td>
                         <td style="text-align: center;">
-                          <el-checkbox v-model="eIsProtectGloves" true-label="1" false-label="0"/>
+                          <el-checkbox v-model="form.eIsProtectGloves" true-label="1" false-label="0"/>
                         </td>
                         <td style="text-align: center;">
-                          <el-checkbox v-model="eIsProtectGloves" true-label="0" false-label="1"
+                          <el-checkbox v-model="form.eIsProtectGloves" true-label="0" false-label="1"
                                        @change="eIsProtectGlovesChange"/>
                         </td>
                       </tr>
                       <tr>
                         <td>2.4 橡胶长靴</td>
                         <td style="text-align: center;">
-                          <el-checkbox v-model="eIsRubberBoots" true-label="1" false-label="0"/>
+                          <el-checkbox v-model="form.eIsRubberBoots" true-label="1" false-label="0"/>
                         </td>
                         <td style="text-align: center;">
-                          <el-checkbox v-model="eIsRubberBoots" true-label="0" false-label="1"/>
+                          <el-checkbox v-model="form.eIsRubberBoots" true-label="0" false-label="1"/>
                         </td>
                       </tr>
                       <tr>
                         <td>2.5 橡胶围裙</td>
                         <td style="text-align: center;">
-                          <el-checkbox v-model="eIsRubberApron" true-label="1" false-label="0"/>
+                          <el-checkbox v-model="form.eIsRubberApron" true-label="1" false-label="0"/>
                         </td>
                         <td style="text-align: center;">
-                          <el-checkbox v-model="eIsRubberApron" true-label="0" false-label="1"/>
+                          <el-checkbox v-model="form.eIsRubberApron" true-label="0" false-label="1"/>
                         </td>
                       </tr>
                       <tr>
                         <td>2.6 防护服，类型：
                           <el-select :disabled="eIsProtectSuit==1?false:true" style="width: calc(100% - 118px)"
-                                     v-model="eProtectSuitContent" placeholder="请选择防护服">
+                                     v-model="form.eProtectSuitContent" placeholder="请选择防护服">
                             <el-option v-for="dict in protectSuits" :key="dict.id"
                                        :label="dict.conservatoryMeasureName"
                                        :value="dict.id">
@@ -1175,17 +1179,17 @@
                           </el-select>
                         </td>
                         <td style="text-align: center;">
-                          <el-checkbox v-model="eIsProtectSuit" true-label="1" false-label="0"/>
+                          <el-checkbox v-model="form.eIsProtectSuit" true-label="1" false-label="0"/>
                         </td>
                         <td style="text-align: center;">
-                          <el-checkbox v-model="eIsProtectSuit" true-label="0" false-label="1"
+                          <el-checkbox v-model="form.eIsProtectSuit" true-label="0" false-label="1"
                                        @change="eIsProtectSuitChange"/>
                         </td>
                       </tr>
                       <tr>
                         <td>2.7 呼吸保护用品，类型：
                           <el-select :disabled="eIsResProtect==1?false:true" style="width: calc(100% - 157px)"
-                                     v-model="eResProtectContent" placeholder="请选择防护面罩">
+                                     v-model="form.eResProtectContent" placeholder="请选择防护面罩">
                             <el-option v-for="dict in resProtects" :key="dict.id"
                                        :label="dict.conservatoryMeasureName"
                                        :value="dict.id">
@@ -1193,10 +1197,10 @@
                           </el-select>
                         </td>
                         <td style="text-align: center;">
-                          <el-checkbox v-model="eIsResProtect" true-label="1" false-label="0"/>
+                          <el-checkbox v-model="form.eIsResProtect" true-label="1" false-label="0"/>
                         </td>
                         <td style="text-align: center;">
-                          <el-checkbox v-model="eIsResProtect" true-label="0" false-label="1"
+                          <el-checkbox v-model="form.eIsResProtect" true-label="0" false-label="1"
                                        @change="eIsResProtectChange"/>
                         </td>
                       </tr>
@@ -1210,10 +1214,10 @@
                           </el-select>
                         </td>
                         <td style="text-align: center;">
-                          <el-checkbox v-model="eIsFallArrest" true-label="1" false-label="0"/>
+                          <el-checkbox v-model="form.eIsFallArrest" true-label="1" false-label="0"/>
                         </td>
                         <td style="text-align: center;">
-                          <el-checkbox v-model="eIsFallArrest" true-label="0" false-label="1"
+                          <el-checkbox v-model="form.eIsFallArrest" true-label="0" false-label="1"
                                        @change="eIsFallArrestChange"/>
                         </td>
                       </tr>
@@ -1247,7 +1251,7 @@
                       </tr>
                       <tr>
                         <td>安全监护人，提供单位：
-                          <el-input style="width: calc(100% - 148px)" />
+                          <el-input v-model="form.eSafeAttendant" style="width: calc(100% - 148px)" />
                         </td>
                         <td style="text-align: center;">
                           <el-checkbox v-model="form.eIsContinueMonitoring" true-label="1" false-label="0"/>
@@ -1426,8 +1430,8 @@
                       </el-date-picker>
                     </td>
                     <td>A4栏安全联络员签名：
-                      <el-input style="width: 130px;" prefix-icon="el-icon-edit" />
-                      <el-date-picker
+                      <el-input v-model="form.hSafeMesA4Sign" style="width: 130px;" prefix-icon="el-icon-edit" />
+                      <el-date-picker v-model="form.hSafeMesA4Date"
                         style="width: calc(100% - 272px)"
                         type="datetime"
                         placeholder="选择日期时间">