Browse Source

优化1098line

test2 2 years ago
parent
commit
39db4e610e
1 changed files with 74 additions and 539 deletions
  1. 74 539
      ui/src/views/invoicing/firework/index.vue

+ 74 - 539
ui/src/views/invoicing/firework/index.vue

@@ -44,7 +44,7 @@
                 <el-collapse-item title="A 基本信息" name="1">
                   <el-form-item prop="ruleA1">
                     <div>
-                      <table>
+                      <table style="width: 100%;">
                         <tr>
                           <td>1. 装置/部门:
                             <el-input v-model="form.aEquipmentName" style="width: 180px;"></el-input></td>
@@ -57,10 +57,7 @@
                           <td width="90"><el-input v-model="form.aEquipmentOffice"/></td>
                         </tr>
                         <tr>
-                          <td>2.
-                          <!--                    <td>施工单位:<el-input style="width: 300px;" v-model="aConstructionName"/>-->
-                          <!--                    </td>-->
-                          施工单位:
+                          <td>2. 施工单位:
                             <el-select v-model="form.aConstructionName" filterable placeholder="请选择施工单位"
                                        @change="aConstructionChange(form.aConstructionName)" style="width: 183px;">
                               <el-option v-for="item in aConstructions" :key="item.deptId" :label="item.deptName"
@@ -75,10 +72,8 @@
                             <i class="el-icon-phone"></i>:
                             <el-input v-model="form.aConstructionTel" style="width: 110px"/>
                           </td>
-                          <td>
-                            办公室:</td>
-                           <td> <el-input v-model="form.aConstructionOffice"/>
-                          </td>
+                          <td>办公室:</td>
+                          <td> <el-input v-model="form.aConstructionOffice"/></td>
                         </tr>
                         <tr>
                           <td>3.
@@ -86,22 +81,20 @@
                             <el-input v-model="form.aContractorName" style="width: 90px"/>
                           </td>
                           <td style="text-align: right">用户主管:</td>
-                            <td><el-input v-model="form.aContractorLeader"/>
-                          </td>
+                          <td><el-input v-model="form.aContractorLeader"/></td>
                           <td style="white-space: nowrap;">
                             <i class="el-icon-phone"></i>:
                             <el-input v-model="form.aContractorTel" style="width: 110px"/>
                           </td>
-                          <td>
-                            办公室:</td>
-                            <td><el-input v-model="form.aContractorOffice"/>
-                          </td>
+                          <td>办公室:</td>
+                          <td><el-input v-model="form.aContractorOffice"/></td>
+                        </tr>
                         <tr>
                           <td>4. 需要安全联络员?
                             <el-radio v-model="form.aIsNeedSafeLiaison" label="1">是</el-radio>
                             <el-radio v-model="form.aIsNeedSafeLiaison" label="2">否</el-radio></td>
                           <td style="text-align: right">姓名:</td>
-                            <td><el-input v-model="form.aSafeLiaisonName"
+                          <td><el-input v-model="form.aSafeLiaisonName"
                                       :disabled="this.form.aIsNeedSafeLiaison==1?false:true"/>
                           </td>
 <!--                          <td>-->
@@ -116,9 +109,8 @@
                           </td>
                           <td>
                             办公室:</td>
-                            <td><el-input v-model="form.aSafeLiaisonOffice"
-                                      :disabled="this.form.aIsNeedSafeLiaison==1?false:true"/>
-                          </td>
+                          <td><el-input v-model="form.aSafeLiaisonOffice"
+                                      :disabled="this.form.aIsNeedSafeLiaison==1?false:true"/></td>
                         </tr>
                       </table>
                     </div>
@@ -126,7 +118,7 @@
                 </el-collapse-item>
                 <el-collapse-item title="B 工作内容" name="2">
                   <el-form-item prop="ruleB">
-                    <table>
+                    <table style="width: 100%;">
                       <tr>
                         <td style="white-space: nowrap">1.装置设备:
                           <el-input v-model="form.bDeviceName" style="width: 480px"/>
@@ -161,7 +153,7 @@
                   </el-form-item>
                 </el-collapse-item>
                 <el-collapse-item title="C 危害识别" name="3">
-                  <table>
+                  <table style="width: 100%;">
                     <tr>
                       <td colspan="2" class="short-checkbox">
                         <el-checkbox v-model="form.isYesDanger" true-label="1" false-label="0"/>
@@ -348,7 +340,7 @@
                   </table>
                 </el-collapse-item>
                 <el-collapse-item title="D 施工前的安全措施" name="4">
-                  <table>
+                  <table style="width: 100%">
                     <tr>
                       <td></td>
                       <td width="30" style="text-align: center">是</td>
@@ -855,18 +847,23 @@
                     <tr>
                       <td>4.5 移开易燃物,并对作业范围附近的法兰和管件检漏 </td>
                       <td style="text-align: center">
-                        <el-checkbox  />
+                        <el-checkbox v-model="form.dIsRemoveCombustibles" :true-label="1" :false-label="0"
+                                     :disabled="this.form.dIsOverlayPipe!= null?false:true"/>
                       </td>
                       <td style="text-align: center">
-                        <el-checkbox />
+                        <el-checkbox v-model="form.dIsRemoveCombustibles" :true-label="0" :false-label="1"
+                                     :disabled="this.form.dIsOverlayPipe!= null?false:true"/>
                       </td>
-                      <td style="text-align: center;">
-                        <el-input style="width: 50%;" />
+                      <td>
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign16"
+                                  :disabled="this.form.dIsRemoveCombustibles==1?false:true"/>
                         <el-date-picker
-                          style="width: 50%;" >
+                          style="width: 50%;"
+                          v-model="form.dSafeImplDate16"
+                          type="date" :disabled="this.form.dIsRemoveCombustibles==1?false:true">
                         </el-date-picker>
                       </td>
-                      <td style="text-align: center;"></td>
+                      <td></td>
                     </tr>
                     <tr>
                       <td>4.6 动火点周围无可燃气体、液体排放、溶剂清洗、喷漆和粉尘清扫  </td>
@@ -884,12 +881,20 @@
                       </td>
                       <td style="text-align: center;"></td>
                     </tr>
+                  </table>
+                </el-collapse-item>
+              </el-collapse>
+            </el-col>
+            <el-col :span="12">
+              <el-collapse v-model="activeNames">
+                <el-collapse-item title="D" name="4" class="display-type">
+                  <table style="width: 100%">
                     <tr>
                       <td class="short-checkbox">4.7 通风方法: <el-checkbox /> 机械通风<el-input /> <el-checkbox /> 自然通风<el-input /></td>
-                      <td style="text-align: center">
+                      <td width="30" style="text-align: center">
                         <el-checkbox  />
                       </td>
-                      <td style="text-align: center">
+                      <td width="30" style="text-align: center">
                         <el-checkbox />
                       </td>
                       <td>
@@ -976,8 +981,7 @@
                       </td>
                     </tr>
                     <tr>
-                      <td>5.2 其它:<el-input /></td>
-                      <td>
+                      <td>5.2 其它:
                         <el-input style="width: 50%;" v-model="form.dOtherMeasureContent"
                                   :disabled="this.form.dIsOtherMeasure==1?false:true"/>
                       </td>
@@ -1008,538 +1012,57 @@
                         </el-date-picker>
                       </td>
                     </tr>
-                    <tr>
-                      <td colspan="5"><b>确保邻近的危险区域安全</b></td>
-                    </tr>
-                    <tr>
-                      <td>1.5</td>
-                      <td>
-                        覆盖管线、设备,穿过墙壁/天花板的管线及电缆的缝隙,<br/>栅栏,轻质墙,下水道孔,墙壁和天花板的开口处
-                      </td>
-                      <td style="text-align: center">
-                        <el-checkbox v-model="form.dIsOverlayPipe" :true-label="1" :false-label="0"
-                                     :disabled="this.form.dIsLeakFlanges!= null?false:true"/>
-                      </td>
-                      <td style="text-align: center">
-                        <el-checkbox v-model="form.dIsOverlayPipe" :true-label="0" :false-label="1"
-                                     :disabled="this.form.dIsLeakFlanges!= null?false:true"/>
-                      </td>
-                      <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign15"
-                                  :disabled="this.form.dIsOverlayPipe==1?false:true"/>
-                        <el-date-picker
-                          style="width: 50%;"
-                          v-model="form.dSafeImplDate15"
-                          type="date" :disabled="this.form.dIsOverlayPipe==1?false:true">
-                        </el-date-picker>
-                      </td>
-                      <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeLiftedSign15"
-                                  :disabled="this.form.dIsOverlayPipe==0?false:true"/>
-                        <el-date-picker
-                          style="width: 50%;"
-                          v-model="form.dSafeLiftedDate15"
-                          type="date" :disabled="this.form.dIsOverlayPipe==0?false:true">
-                        </el-date-picker>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td>1.6</td>
-                      <td>移开易燃物</td>
-                      <td style="text-align: center">
-                        <el-checkbox v-model="form.dIsRemoveCombustibles" :true-label="1" :false-label="0"
-                                     :disabled="this.form.dIsOverlayPipe!= null?false:true"/>
-                      </td>
-                      <td style="text-align: center">
-                        <el-checkbox v-model="form.dIsRemoveCombustibles" :true-label="0" :false-label="1"
-                                     :disabled="this.form.dIsOverlayPipe!= null?false:true"/>
-                      </td>
-                      <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign16"
-                                  :disabled="this.form.dIsRemoveCombustibles==1?false:true"/>
-                        <el-date-picker
-                          style="width: 50%;"
-                          v-model="form.dSafeImplDate16"
-                          type="date" :disabled="this.form.dIsRemoveCombustibles==1?false:true">
-                        </el-date-picker>
-                      </td>
-                      <td></td>
-                    </tr>
-                    <tr>
-                      <td>1.7</td>
-                      <td>按E栏要求提供灭火器</td>
-                      <td style="text-align: center">
-                        <el-checkbox v-model="form.dIsProvideFireExt" :true-label="1" :false-label="0"
-                                     :disabled="this.form.dIsRemoveCombustibles!= null?false:true"/>
-                      </td>
-                      <td style="text-align: center">
-                        <el-checkbox v-model="form.dIsProvideFireExt" :true-label="0" :false-label="1"
-                                     :disabled="this.form.dIsRemoveCombustibles!= null?false:true"/>
-                      </td>
-                      <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign17"
-                                  :disabled="this.form.dIsProvideFireExt==1?false:true"/>
-                        <el-date-picker
-                          style="width: 50%;"
-                          v-model="form.dSafeImplDate17"
-                          type="date" :disabled="this.form.dIsProvideFireExt==1?false:true">
-                        </el-date-picker>
-                      </td>
-                      <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign17"
-                                  :disabled="this.form.dIsProvideFireExt==1?false:true"/>
-                        <el-date-picker
-                          style="width: 50%;"
-                          v-model="form.dSafeImplDate17"
-                          type="date" :disabled="this.form.dIsProvideFireExt==1?false:true">
-                        </el-date-picker>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td>1.8</td>
-                      <td>附动火/切割作业表(图)</td>
-                      <td style="text-align: center">
-                        <el-checkbox v-model="form.dIsFireConfirmForm" :true-label="1" :false-label="0"
-                                     :disabled="this.form.dIsProvideFireExt!= null?false:true"/>
-                      </td>
-                      <td style="text-align: center">
-                        <el-checkbox v-model="form.dIsRemoveCombustibles" :true-label="0" :false-label="1"
-                                     :disabled="this.form.dIsOverlayPipe!= null?false:true"/>
-                      </td>
-                      <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign16"
-                                  :disabled="this.form.dIsRemoveCombustibles==1?false:true"/>
-                        <el-date-picker
-                          style="width: 50%;"
-                          v-model="form.dSafeImplDate16"
-                          type="date" :disabled="this.form.dIsRemoveCombustibles==1?false:true">
-                        </el-date-picker>
-                      </td>
-                      <td></td>
-                    </tr>
-                    <tr>
-                      <td><b>2.</b></td>
-                      <td><b>工作区域的通风措施</b></td>
-                      <td></td>
-                      <td></td>
-                      <td></td>
-                      <td></td>
-                    </tr>
-                    <tr>
-                      <td>
-                        2.1
-                      </td>
-                      <td>自然通风:
-                        <el-input style="width: 150px" v-model="form.dNaturalVenContent"
-                                  :disabled="this.form.dIsDoubleBlock==1?false:true"/>
-                      </td>
-                      <td style="text-align: center">
-                        <el-checkbox v-model="form.dIsNaturalVen" :true-label="1" :false-label="0"
-                                     :disabled="this.form.dIsFireConfirmForm!= null?false:true"/>
-                      </td>
-                      <td style="text-align: center">
-                        <el-checkbox v-model="form.dIsNaturalVen" :true-label="0" :false-label="1"
-                                     :disabled="this.form.dIsFireConfirmForm!= null?false:true"/>
-                      </td>
-                      <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign21"
-                                  :disabled="this.form.dIsNaturalVen==1?false:true"/>
-                        <el-date-picker
-                          style="width: 50%;"
-                          v-model="form.dSafeImplDate21"
-                          type="date" :disabled="this.form.dIsNaturalVen==1?false:true">
-                        </el-date-picker>
-                      </td>
-                      <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeLiftedSign21"
-                                  :disabled="this.form.dIsDoubleBlock==1?false:true"/>
-                        <el-date-picker
-                          style="width: 50%;"
-                          v-model="form.dSafeLiftedDate21"
-                          type="date" :disabled="this.form.dIsDoubleBlock==1?false:true">
-                        </el-date-picker>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td>
-                        2.2
-                      </td>
-                      <td>机械通风使用:
-                        <el-input style="width: 150px" v-model="form.dMecVenContent"
-                                  :disabled="this.form.dIsMecVen==1?false:true"/>
-                      </td>
-                      <td style="text-align: center">
-                        <el-checkbox v-model="form.dIsMecVen" :true-label="1" :false-label="0"
-                                     :disabled="this.form.dIsNaturalVen!= null?false:true"/>
-                      </td>
-                      <td style="text-align: center">
-                        <el-checkbox v-model="form.dIsMecVen" :true-label="0" :false-label="1"
-                                     :disabled="this.form.dIsNaturalVen!= null?false:true"/>
-                      </td>
-                      <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign23"
-                                  :disabled="this.form.dIsMecVen==1?false:true"/>
-                        <el-date-picker
-                          style="width: 50%;"
-                          v-model="form.dSafeImplDate22"
-                          type="date" :disabled="this.form.dIsMecVen==1?false:true">
-                        </el-date-picker>
-                      </td>
-                      <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeLiftedSign22"
-                                  :disabled="this.form.dIsMecVen==1?false:true"/>
-                        <el-date-picker
-                          style="width: 50%;"
-                          v-model="form.dSafeLiftedDate22"
-                          type="date" :disabled="this.form.dIsMecVen==1?false:true">
-                        </el-date-picker>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td>2.3</td>
-                      <td>
-                        空气分析内容:
-                        <el-input style="width: 150px;" v-model="form.dLockoutUsingContent"
-                                  :disabled="this.form.dIsMecVen!= null?false:true"/>
-                      </td>
-                      <td style="text-align: center">
-                        <el-checkbox v-model="form.dIsLockoutUsing" :true-label="1" :false-label="0"
-                                     :disabled="this.form.dIsMecVen!= null?false:true"/>
-                      </td>
-                      <td style="text-align: center">
-                        <el-checkbox v-model="form.dIsLockoutUsing" :true-label="0" :false-label="1"
-                                     :disabled="this.form.dIsMecVen!= null?false:true"/>
-                      </td>
-                      <td style="text-align: center;"></td>
-                      <td style="text-align: center;"></td>
-                    </tr>
-                    <tr>
-                      <td><b>3.</b></td>
-                      <td><b>确保装置设备、储罐、容器和管线内部的安全</b></td>
-                      <td></td>
-                      <td></td>
-                      <td></td>
-                      <td></td>
-                    </tr>
-                    <tr>
-                      <td>3.1</td>
-                      <td>注满水</td>
-                      <td style="text-align: center">
-                        <el-checkbox v-model="form.dIsFloodWater" :true-label="1" :false-label="0"
-                                     :disabled="this.form.dIsLockoutUsing!= null?false:true"/>
-                      </td>
-                      <td style="text-align: center">
-                        <el-checkbox v-model="form.dIsFloodWater" :true-label="0" :false-label="1"
-                                     :disabled="this.form.dIsLockoutUsing!= null?false:true"/>
-                      </td>
-                      <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign31"
-                                  :disabled="this.form.dIsFloodWater==1?false:true"/>
-                        <el-date-picker
-                          style="width: 50%;"
-                          v-model="form.dSafeImplDate31"
-                          type="date" :disabled="this.form.dIsFloodWater==1?false:true">
-                        </el-date-picker>
-                      </td>
-                      <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeLiftedSign31"
-                                  :disabled="this.form.dIsFloodWater==1?false:true"/>
-                        <el-date-picker
-                          style="width: 50%;"
-                          v-model="form.dSafeLiftedDate31"
-                          type="date" :disabled="this.form.dIsFloodWater==1?false:true">
-                        </el-date-picker>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td>3.3</td>
-                      <td>冲洗置换:
-                        <el-input style="width: 150px;" v-model="form.dCleanFlushContent"
-                                  :disabled="this.form.dIsCleanFlush!= null?false:true"/>
-                      </td>
-                      <td style="text-align: center">
-                        <el-checkbox v-model="form.dIsCleanFlush" :true-label="1" :false-label="0"
-                                     :disabled="this.form.dIsProInertGas!= null?false:true"/>
-                      </td>
-                      <td style="text-align: center">
-                        <el-checkbox v-model="form.dIsCleanFlush" :true-label="0" :false-label="1"
-                                     :disabled="this.form.dIsProInertGas!= null?false:true"/>
-                      </td>
-                      <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign33"
-                                  :disabled="this.form.dIsCleanFlush==1?false:true"/>
-                        <el-date-picker
-                          style="width: 50%;"
-                          v-model="form.dSafeImplDate33"
-                          type="date" :disabled="this.form.dIsCleanFlush==1?false:true">
-                        </el-date-picker>
-                      </td>
-                      <td style="text-align: center;"></td>
-                    </tr>
-                    <tr>
-                      <td>3.4</td>
-                      <td>气体分析内容:
-
-                      </td>
-                      <td style="text-align: center">
-                        <el-checkbox v-model="form.dIsGasAnalysis" :true-label="1" :false-label="0"
-                                     :disabled="this.form.dIsCleanFlush!= null?false:true"/>
-                      </td>
-                      <td style="text-align: center">
-                        <el-checkbox v-model="form.dIsMecSecure" :true-label="0" :false-label="1"
-                                     :disabled="this.form.dIsCleanFlush!= null?false:true"/>
-                      </td>
-                      <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign34"
-                                  :disabled="this.form.dIsGasAnalysis==1?false:true"/>
-                        <el-date-picker
-                          style="width: 50%;"
-                          v-model="form.dSafeImplDate34"
-                          type="date" :disabled="this.form.dIsGasAnalysis==1?false:true">
-                        </el-date-picker>
-                      </td>
-                      <td style="text-align: center;"></td>
-                    </tr>
-                    <tr>
-                      <td><b>4.</b></td>
-                      <td><b>额外的组织措施</b></td>
-                      <td></td>
-                      <td></td>
-                      <td></td>
-                      <td></td>
-                    </tr>
-                    <tr>
-                      <td>4.1</td>
-                      <td>关闭消防/报警系统</td>
-                      <td style="text-align: center">
-                        <el-checkbox v-model="form.dIsCloseFireControl" :true-label="1" :false-label="0"
-                                     :disabled="this.form.dIsGasAnalysis!= null?false:true"></el-checkbox>
-                      </td>
-                      <td style="text-align: center">
-                        <el-checkbox v-model="form.dIsCloseFireControl" :true-label="0" :false-label="1"
-                                     :disabled="this.form.dIsGasAnalysis!= null?false:true"/>
-                      </td>
-                      <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign41"
-                                  :disabled="this.form.dIsCloseFireControl==1?false:true"/>
-                        <el-date-picker
-                          style="width: 50%;"
-                          v-model="form.dSafeImplDate41"
-                          type="date" :disabled="this.form.dIsCloseFireControl==1?false:true">
-                        </el-date-picker>
-                      </td>
-                      <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeLiftedSign41"
-                                  :disabled="this.form.dIsCloseFireControl==1?false:true"/>
-                        <el-date-picker
-                          style="width: 50%;"
-                          v-model="form.dSafeLiftedDate41"
-                          type="date" :disabled="this.form.dIsCloseFireControl==1?false:true">
-                        </el-date-picker>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td>4.2</td>
-                      <td>
-                        <el-input style="width: 50%;" v-model="form.dOtherMeasureContent"
-                                  :disabled="this.form.dIsOtherMeasure==1?false:true"/>
-                      </td>
-                      <td style="text-align: center">
-                        <el-checkbox v-model="form.dIsOtherMeasure" :true-label="1" :false-label="0"
-                                     :disabled="this.form.dIsCloseFireControl!= null?false:true"></el-checkbox>
-                      </td>
-                      <td style="text-align: center">
-                        <el-checkbox v-model="form.dIsOtherMeasure" :true-label="0" :false-label="1"
-                                     :disabled="this.form.dIsCloseFireControl!= null?false:true"/>
-                      </td>
-                      <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign42"
-                                  :disabled="this.form.dIsOtherMeasure==1?false:true"/>
-                        <el-date-picker
-                          style="width: 50%;"
-                          v-model="form.dSafeImplDate42"
-                          type="date" :disabled="this.form.dIsOtherMeasure==1?false:true">
-                        </el-date-picker>
-                      </td>
-                      <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeLiftedSign42"
-                                  :disabled="this.form.dIsOtherMeasure==0?false:true"/>
-                        <el-date-picker
-                          style="width: 50%;"
-                          v-model="form.dSafeLiftedDate42"
-                          type="date" :disabled="this.form.dIsOtherMeasure==0?false:true">
-                        </el-date-picker>
-                      </td>
-                    </tr>
                   </table>
-                  <table cellspacing="10">
+                  <table style="width: 100%">
                     <tr>
-                      <td><b>5.确保邻近的危险区域安全</b></td>
-                      <td colspan="4"></td>
+                      <td colspan="4"><b>6.确保邻近的危险区域安全</b></td>
                     </tr>
                     <tr>
                       <td style="text-align: center">危险区域</td>
-                      <td style="text-align: center">负责人</td>
-                      <td style="text-align: center;width: 11%">办公室</td>
-                      <td style="text-align: center;width: 11%">电话</td>
+                      <td style="text-align: center" width="180">负责人签名/日期</td>
+                      <td style="text-align: center">办公室 / <i class="el-icon-phone"></i></td>
                       <td style="text-align: center">额外的安全措施</td>
                     </tr>
                     <tr>
-                      <td>5.1
+                      <td>6.1
                         <el-input v-model="form.dDangerSpaceOne" style="width: calc(100% - 25px);"></el-input>
                       </td>
                       <td>
-                        <el-input v-model="form.dDangerSpaceOneLeader"></el-input>
-                      </td>
-                      <td>
-                        <el-input v-model="form.dDangerSpaceOneOffice"></el-input>
+                        <el-input style="width: 50%;" prefix-icon="el-icon-edit" />
+                        <el-date-picker
+                          style="width: 50%;">
+                        </el-date-picker>
                       </td>
                       <td>
-                        <el-input v-model="form.dDangerSpaceOneTel"></el-input>
+                        <el-input v-model="form.dDangerSpaceOneOffice" style="width: 50%"></el-input>
+                        <el-input v-model="form.dDangerSpaceOneTel" style="width:50%"></el-input>
                       </td>
                       <td>分项号:
                         <el-input v-model="form.dDangerSpaceOneItem" style="width: calc(100% - 55px);"></el-input>
                       </td>
                     </tr>
                     <tr>
-                      <td>5.2
+                      <td>6.2
                         <el-input v-model="form.dDangerSpaceTwo" style="width: calc(100% - 25px);"></el-input>
                       </td>
                       <td>
                         <el-input v-model="form.dDangerSpaceTwoLeader"></el-input>
                       </td>
                       <td>
-                        <el-input v-model="form.dDangerSpaceTwoOffice"></el-input>
-                      </td>
-                      <td>
-                        <el-input v-model="form.dDangerSpaceTwoTel"></el-input>
+                        <el-input style="width: 50%" v-model="form.dDangerSpaceTwoOffice"></el-input>
+                        <el-input style="width: 50%" v-model="form.dDangerSpaceTwoTel"></el-input>
                       </td>
                       <td>分项号:
                         <el-input v-model="form.dDangerSpaceTwoItem" style="width: calc(100% - 55px);"></el-input>
                       </td>
                     </tr>
                     <tr>
-                      <td>5.3
-                        <el-input v-model="form.dDangerSpaceThree" style="width: calc(100% - 25px);"></el-input>
-                      </td>
-                      <td>
-                        <el-input v-model="form.dDangerSpaceThreeLeader"></el-input>
-                      </td>
-                      <td>
-                        <el-input v-model="form.dDangerSpaceThreeOffice"></el-input>
-                      </td>
-                      <td>
-                        <el-input v-model="form.dDangerSpaceThreeTel"></el-input>
-                      </td>
-                      <td>分项号:
-                        <el-input v-model="form.dDangerSpaceThreeItem" style="width: calc(100% - 55px);"></el-input>
-                      </td>
+                      <td colspan="4"><b>现场安全说明/交底</b></td>
                     </tr>
                     <tr>
-                      <td>5.4
-                        <el-input v-model="form.dDangerSpaceFour" style="width: calc(100% - 25px);"></el-input>
-                      </td>
-                      <td>
-                        <el-input v-model="form.dDangerSpaceFourLeader"></el-input>
-                      </td>
-                      <td>
-                        <el-input v-model="form.dDangerSpaceFourOffice"></el-input>
-                      </td>
-                      <td>
-                        <el-input v-model="form.dDangerSpaceFourTel"></el-input>
-                      </td>
-                      <td>分项号:
-                        <el-input v-model="form.dDangerSpaceFourItem" style="width: calc(100% - 55px);"></el-input>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td style="padding-left: 25px;">邻近区域负责人的认可:</td>
-                      <td></td>
-                      <td></td>
-                      <td></td>
-                      <td></td>
-                    </tr>
-                    <tr>
-                      <td style="padding-left: 25px;">
-                        <el-date-picker
-                          style="width: 100%;"
-                          v-model="form.dDangerApproveDateOne"
-                          type="date">
-                        </el-date-picker>
-                      </td>
-                      <td>
-                        <el-date-picker
-                          style="width: 100%;"
-                          v-model="form.dDangerApproveDateTwo"
-                          type="date">
-                        </el-date-picker>
-                      </td>
-                      <td colspan="2">
-                        <el-date-picker
-                          style="width: 100%;"
-                          v-model="form.dDangerApproveDateThree"
-                          type="date">
-                        </el-date-picker>
-                      </td>
-                      <td>
-                        <el-date-picker
-                          style="width: 100%;"
-                          v-model="form.dDangerApproveDateFour"
-                          type="date">
-                        </el-date-picker>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td style="padding-left: 25px;">5.1
-                        <div style="width: calc(100% - 25px);display: inline-block">
-                          <!--                    <el-date-picker-->
-                          <!--                    style="width: 50%;"-->
-                          <!--                    v-model="form.dSafeLiftedDate210"-->
-                          <!--                    type="date" :disabled="this.form.dIsOtherSafePlant==0?false:true">-->
-                          <!--                  </el-date-picker>-->
-                          <el-input style="width: 80%" placeholder="签名"
-                                    v-model="form.dDangerApproveSignOne"></el-input>
-                        </div>
-                      </td>
-                      <td>5.2
-                        <div style="width: calc(100% - 25px);display: inline-block">
-                          <el-input style="width: 80%" placeholder="签名"
-                                    v-model="form.dDangerApproveSignTwo"></el-input>
-                        </div>
-                      </td>
-                      <td colspan="2">5.3
-                        <div style="width: calc(100% - 25px);display: inline-block">
-                          <el-input style="width: 80%" placeholder="签名"
-                                    v-model="form.dDangerApproveSignThree"></el-input>
-                        </div>
-                      </td>
-                      <td>5.4
-                        <div style="width: calc(100% - 25px);display: inline-block">
-                          <el-input style="width: 80%" placeholder="签名"
-                                    v-model="form.dDangerApproveSignFour"></el-input>
-                        </div>
-                      </td>
-                    </tr>
-                  </table>
-                </el-collapse-item>
-              </el-collapse>
-
-            </el-col>
-
-            <!-- 右侧栏 -->
-            <el-col :span="12">
-
-              <el-collapse v-model="activeNames">
-                <el-collapse-item title="D" name="4" class="display-type">
-                  <table>
-                    <tr>
-                      <td colspan="2"><b>6.现场安全说明</b></td>
-                    </tr>
-                    <tr>
-                      <td class="short-checkbox" width="60">
-                        <el-checkbox v-model="form.dIsSafeBriefing" true-label="1" false-label="0">是</el-checkbox>
-                      </td>
-                      <td>参与交底人签名/日期:
+                      <td colspan="4">
+                        <el-checkbox v-model="form.dIsSafeBriefing" true-label="1" false-label="0" checked>是</el-checkbox>
+                        参与交底人签名/日期:
                         <div style="width: calc(100% - 135px);display: inline-block">
                           <el-input style="width: 50%" placeholder="签名"></el-input>
                           <el-date-picker
@@ -1550,19 +1073,31 @@
                         </div>
                       </td>
                     </tr>
-                    <tr>
-                      <td class="short-checkbox">
-                        <el-checkbox v-model="form.dIsSafeBriefing" true-label="0" false-label="1">没有</el-checkbox>
-                      </td>
-                      <td>原因:
-                        <el-input style="width: calc(100% - 40px)" placeholder="原因"></el-input>
-                      </td>
-                    </tr>
                   </table>
                 </el-collapse-item>
+
                 <el-collapse-item title="E 施工时的安全措施" name="5">
                   <el-row :gutter="20">
                     <el-col :span="12">
+                      <table style="width: 100%">
+                        <tr><td></td><td style="width: 30px;text-align: center">是</td><td style="width: 30px;text-align: center">否</td></tr>
+                        <tr>
+                          <td><b>1. 可能有残留物料</b></td>
+                          <td style="text-align: center"><el-checkbox /></td>
+                          <td style="text-align: center"><el-checkbox /></td>
+                        </tr>
+                        <tr>
+                          <td colspan="3"><b>2. 个人防护用品 (不包含区域 PPE)</b></td>
+                        </tr>
+                        <tr>
+                          <td>仅限定时间内佩戴的 PPE,项目:<el-input /></td>
+                          <td style="text-align: center"><el-checkbox /></td>
+                          <td style="text-align: center"><el-checkbox /></td>
+                        </tr>
+                        <tr>
+                          <td></td>
+                        </tr>
+                      </table>
                       <table>
                         <th></th>
                         <th></th>