zl:commit

ui/src/assets/styles/index.scss

@@ -457,6 +457,8 @@ aside {
   line-height: 34px;
   padding-left: 10px;
 }
+.hazardwork{
+}
 .hazardwork .el-row table{
   width: 100%;
 
@@ -464,4 +466,19 @@ aside {
     color: $--color-primary;
     font-weight: bold;
   }
+  .el-input__icon.el-icon-word{
+    font-style: inherit;
+    color: $--color-primary;
+    font-weight: bold;
+  }
+  .short-checkbox{
+    .el-checkbox{
+      margin-right: 4px;
+    }
+  }
+  .short-radio{
+    .el-radio{
+      margin-right: 20px;
+    }
+  }
 }

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

@@ -35,7 +35,7 @@
           </td>
         </tr>
       </table>
-      <el-row :gutter="30">
+      <el-row :gutter="20">
         <!-- 左侧栏 -->
         <el-col :span="12">
             <el-collapse v-model="activeNames">
@@ -44,76 +44,65 @@
                     <tr>
                       <td>1.</td>
                       <td>
-                        生产装置：
-                        <el-select v-model="form.aEquipmentName" filterable placeholder="请选择生产装置"
+                        生产装置：<el-select v-model="form.aEquipmentName" filterable placeholder="请选择生产装置"
                                    @change="aEquipmentChange(form.aEquipmentName)">
                           <el-option v-for="item in aEquipments" :key="item.value" :label="item.label"
                                      :value="item.value">
                           </el-option>
                         </el-select>
                       </td>
-                      <td>生产装置主管：
-                        <el-input style="width: 100px;" v-model="form.aEquipmentLeader"/>
+                      <td>生产装置主管：<el-input style="width: 100px;" v-model="form.aEquipmentLeader"/>
                       </td>
                       <td>
                         <i class="el-icon-phone">：</i>
                         <el-input style="width: 70px;" v-model="form.aEquipmentTel"/>
                       </td>
                       <td>
-                        办公室：
-                        <el-input style="width: 70px;" v-model="form.aEquipmentOffice"/>
+                        办公室：<el-input style="width: 70px;" v-model="form.aEquipmentOffice"/>
                       </td>
                     </tr>
                     <tr>
                       <td>2.</td>
-                      <td>施工单位：
-                        <el-select v-model="form.aConstructionName" filterable placeholder="请选择施工单位"
+                      <td>施工单位：<el-select v-model="form.aConstructionName" filterable placeholder="请选择施工单位"
                                    @change="aConstructionChange(form.aConstructionName)">
                           <el-option v-for="item in aConstructions" :key="item.deptId" :label="item.deptName"
                                      :value="item.deptId">
                           </el-option>
                         </el-select>
                       </td>
-                      <td>施工单位主管：
-                        <el-input style="width: 100px;" v-model="form.aConstructionLeader"/>
+                      <td>施工单位主管：<el-input style="width: 100px;" v-model="form.aConstructionLeader"/>
                       </td>
                       <td>
                         <i class="el-icon-phone">：</i>
                         <el-input style="width: 70px;" v-model="form.aConstructionTel"/>
                       </td>
                       <td>
-                        办公室：
-                        <el-input style="width: 70px;" v-model="form.aConstructionOffice"/>
+                        办公室：<el-input style="width: 70px;" v-model="form.aConstructionOffice"/>
                       </td>
                     </tr>
                     <tr>
                       <td>3.</td>
-                      <td>用户(涉及外部承包商时)：
-                        <el-select v-model="form.aContractorName" filterable placeholder="请选择用户"
+                      <td>用户(涉及外部承包商时)：<el-select v-model="form.aContractorName" filterable placeholder="请选择用户"
                                    @change="aContractorChange(form.aContractorName)">
                           <el-option v-for="item in aContractors" :key="item.value" :label="item.label"
                                      :value="item.value">
                           </el-option>
                         </el-select>
                       </td>
-                      <td align="right">用户主管：
-                        <el-input style="width: 100px;" v-model="form.aContractorLeader"/>
+                      <td align="right">用户主管：<el-input style="width: 100px;" v-model="form.aContractorLeader"/>
                       </td>
                       <td>
                         <i class="el-icon-phone">：</i>
                         <el-input style="width: 70px;" v-model="form.aContractorTel"/>
                       </td>
                       <td>
-                        办公室：
-                        <el-input style="width: 70px;" v-model="form.aContractorOffice"/>
+                        办公室：<el-input style="width: 70px;" v-model="form.aContractorOffice"/>
                       </td>
                     <tr>
                       <td>4.</td>
-                      <td>需要安全联络员？
-                        <el-radio v-model="form.aIsNeedSafeLiaison" label="1">是</el-radio>
+                      <td class="short-radio">需要安全联络员？<el-radio v-model="form.aIsNeedSafeLiaison" label="1">是</el-radio>
                         <el-radio v-model="form.aIsNeedSafeLiaison" label="2" @change="cleanSafeLiaison">否</el-radio>
-                        姓名：
-                        <el-select v-model="form.aSafeLiaisonName" filterable placeholder="请选择安全联络员"
+                        姓名：<el-select v-model="form.aSafeLiaisonName" filterable placeholder="请选择安全联络员"
                                    @change="aSafeLiaisonChange(form.aSafeLiaisonName)"
                                    :disabled="this.form.aIsNeedSafeLiaison==1?false:true" style="width: 150px">
                           <el-option v-for="item in aSafeLiaisons" :key="item.value" :label="item.label"
@@ -122,8 +111,7 @@
                         </el-select>
                       </td>
                       <td align="right">
-                        签名：
-                        <el-input style="width: 100px;" v-model="form.aSafeLiaisonSign" readonly @focus="signCard('aSafeLiaisonSign')"
+                        签名：<el-input style="width: 100px;" v-model="form.aSafeLiaisonSign" readonly @focus="signCard('aSafeLiaisonSign')"
                                   :disabled="this.form.aIsNeedSafeLiaison==1?false:true">
                           <i slot="prefix" class="el-input__icon el-icon-edit"></i>
                         </el-input>
@@ -137,8 +125,7 @@
                                   :disabled="this.form.aIsNeedSafeLiaison==1?false:true"/>
                       </td>
                       <td>
-                        办公室：
-                        <el-input style="width: 70px;" v-model="form.aSafeLiaisonOffice"
+                        办公室：<el-input style="width: 70px;" v-model="form.aSafeLiaisonOffice"
                                   :disabled="this.form.aIsNeedSafeLiaison==1?false:true"/>
                       </td>
                     </tr>
@@ -277,28 +264,23 @@
                       <el-checkbox v-model="isEquipmentHazards" true-label="1" false-label="0"
                                    @change="eHazardsChange"/>
                     </td>
-                    <td colspan="5"><small>
+                    <td colspan="5" class="short-checkbox">
                       设备内物质处于危险状态
                       （
                       <el-checkbox v-model="form.cIsHighTemp" true-label="1" false-label="0"
-                                   :disabled="this.isEquipmentHazards==true?false:true" @change="highTempChange"/>
-                      高温
+                                   :disabled="this.isEquipmentHazards==true?false:true" @change="highTempChange"/>高温
                       /
                       <el-checkbox v-model="form.cIsLowTemp" true-label="1" false-label="0"
                                    :disabled="this.isEquipmentHazards==true?false:true"
-                                   @change="lowTempChange"/>
-                      低温；
+                                   @change="lowTempChange"/>低温；
                       <el-checkbox v-model="form.cIsPosPressure" true-label="1" false-label="0"
                                    :disabled="this.isEquipmentHazards==true?false:true"
-                                   @change="posPressureChange"/>
-                      正压
+                                   @change="posPressureChange"/>正压
                       /
                       <el-checkbox v-model="form.cIsNegPressure" true-label="1" false-label="0"
                                    :disabled="this.isEquipmentHazards==true?false:true"
-                                   @change="negPressureChange"/>
-                      负压
+                                   @change="negPressureChange"/>负压
                       ）
-                    </small>
                     </td>
                     <td>
                       <el-checkbox v-model="form.cIsHazardsProd" true-label="1" false-label="0"
@@ -313,28 +295,26 @@
                     <td>
                       <el-checkbox v-model="isFacilityHazards" true-label="1" false-label="0" @change="facilityChange"/>
                     </td>
-                    <td colspan="5">
+                    <td colspan="5" class="short-checkbox">
                       来自设备/设施的危害（
                       <el-checkbox v-model="form.cIsMovingParts" true-label="1" false-label="0"
-                                   :disabled="this.isFacilityHazards==true?false:true"/>
-                      移动部件，
+                                   :disabled="this.isFacilityHazards==true?false:true"/>移动部件，
                       <el-checkbox v-model="form.cIsHotSurfaces" true-label="1" false-label="0"
                                    :disabled="this.isFacilityHazards==true?false:true"
-                                   @change="hotSurfacesChange"/>
-                      热表面/
+                                   @change="hotSurfacesChange"/>热表面/
                       <el-checkbox v-model="form.cIsColdSurfaces" true-label="1" false-label="0"
                                    :disabled="this.isFacilityHazards==true?false:true"
-                                   @change="coldSurfacesChange"/>
-                      冷表面，
+                                   @change="coldSurfacesChange"/>冷表面，
                       <el-checkbox v-model="form.cIsVoltages" true-label="1" false-label="0"
-                                   :disabled="this.isFacilityHazards==true?false:true"/>
-                      电压
+                                   :disabled="this.isFacilityHazards==true?false:true"/>电压
                       ）
                     </td>
                     <td>
                       <el-checkbox v-model="form.cIsFire" true-label="1" false-label="0"/>
                     </td>
                     <td>火灾或爆炸性危害，参考动火许可证：
+                      <el-input style="width: 140px;" v-model="form.cHId"
+                                :disabled="this.form.cIsFire==true?false:true"><i slot="prefix" class="el-input__icon el-icon-word">H</i></el-input>
                     </td>
                   </tr>
                   <tr>
@@ -342,16 +322,13 @@
                       <el-checkbox v-model="form.cIsWorkProtective" true-label="1" false-label="0"
                                    @change="workProChange"/>
                     </td>
-                    <td colspan="5">安全保护设备的施工(
+                    <td colspan="5" class="short-checkbox">安全保护设备的施工(
                       <el-checkbox v-model="form.cIsDy" true-label="1" false-label="0"
-                                   :disabled="form.cIsWorkProtective==1?false:true"/>
-                      电仪安全保护设备
+                                   :disabled="form.cIsWorkProtective==1?false:true"/>电仪安全保护设备
                       <el-checkbox v-model="form.cIsAqf" true-label="1" false-label="0"
-                                   :disabled="form.cIsWorkProtective==1?false:true"/>
-                      安全阀
+                                   :disabled="form.cIsWorkProtective==1?false:true"/>安全阀
                       <el-checkbox v-model="form.cIsLq" true-label="1" false-label="0"
-                                   :disabled="form.cIsWorkProtective==1?false:true"/>
-                      冷却系统)
+                                   :disabled="form.cIsWorkProtective==1?false:true"/>冷却系统)
                     </td>
                   </tr>
                   <tr>
@@ -360,15 +337,15 @@
                                    @change="otherDangerChange"/>
                     </td>
                     <td colspan="5">其他危害：
-                      <el-select style="width: 400px;" v-model="form.cOtherDangerContent" filterable
+                      <el-select style="width: 365px;" v-model="form.cOtherDangerContent" filterable
                                  :disabled="this.form.cIsOtherDanger==true?false:true">
                         <el-option v-for="item in otherDangers" :key="item.id" :label="item.name" :value="item.id">
                         </el-option>
                       </el-select>
                     </td>
-                    <td colspan="5" rowspan="2" align="right">H
-                      <el-input style="width: 150px;" v-model="form.cHId"
-                                :disabled="this.form.cIsFire==true?false:true"/>
+                    <td colspan="5" rowspan="2">
+<!--                      <el-input style="width: 150px;" v-model="form.cHId"-->
+<!--                                :disabled="this.form.cIsFire==true?false:true"/>-->
                     </td>
                   </tr>
                 </table>
@@ -1677,51 +1654,50 @@
                 <table>
                   <tr>
                     <td></td>
-                    <td align="right">由专门部门人员评估的项目：是</td>
+                    <td align="right">由专门部门人员评估的项目：</td>
+                    <td>是</td>
                     <td>否</td>
                   </tr>
                   <tr>
-                    <td><small>第一签名（装置/部门授权人员）：</small>
-                      <el-input style="width: 85px;" v-model="form.gFirstSign" readonly @focus="signCard('gFirstSign')">
+                    <td>第一签名<small>(装置/部门授权人员)</small>：<el-input style="width: 85px;" v-model="form.gFirstSign" readonly @focus="signCard('gFirstSign')">
                         <i slot="prefix" class="el-input__icon el-icon-edit"></i>
                       </el-input>
                       <!--<el-button type="primary" slot="append" @click="signCard('gFirstSign')"
                                  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.gFirstDate"
+                                      value-format="yyyy-MM-dd HH:mm:ss" style="width: 175px" v-model="form.gFirstDate"
                                       type="datetime">
                       </el-date-picker>
                     </td>
                     <td align="right">
                       <el-input style="width: 360px;" v-model="form.gSpecialAssessment"
                                 :disabled="form.gIsSpecialAssessment == 1?false:true"/>
-                      <el-checkbox v-model="form.gIsSpecialAssessment" true-label="1" false-label="0"/>
                     </td>
+                    <td>
+                      <el-checkbox v-model="form.gIsSpecialAssessment" true-label="1" false-label="0"/></td>
                     <td>
                       <el-checkbox v-model="form.gIsSpecialAssessment" true-label="0" false-label="1"
                                    @change="gIsSpecialAssessmentChange"/>
                     </td>
                   </tr>
                   <tr>
-                    <td><small>第二签名（装置/部门授权人员）：</small>
-                      <el-input style="width: 85px;" v-model="form.gSecondSign" readonly @focus="signCard('gSecondSign')">
+                    <td>第二签名<small>(装置/部门授权人员)</small>：<el-input style="width: 85px;" v-model="form.gSecondSign" readonly @focus="signCard('gSecondSign')">
                         <i slot="prefix" class="el-input__icon el-icon-edit"></i>
                       </el-input>
                       <!--<el-button type="primary" slot="append" @click="signCard('gSecondSign')"
                                  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.gSecondDate"
+                                      value-format="yyyy-MM-dd HH:mm:ss" style="width: 175px" v-model="form.gSecondDate"
                                       type="datetime">
                       </el-date-picker>
                     </td>
-                    <td><small>第三签名（相应部门人员及部门名称）：</small>
-                      <el-input style="width: 85px;" v-model="form.gThirdSign" readonly @focus="signCard('gThirdSign')">
+                    <td colspan="3" align="right">第三签名<small>(相应部门人员及部门名称)</small>：<el-input style="width: 85px;" v-model="form.gThirdSign" readonly @focus="signCard('gThirdSign')">
                         <i slot="prefix" class="el-input__icon el-icon-edit"></i>
                       </el-input>
                       <!--<el-button type="primary" slot="append" @click="signCard('gThirdSign')"
                                  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.gThirdDate"
+                                      value-format="yyyy-MM-dd HH:mm:ss" style="width: 175px" v-model="form.gThirdDate"
                                       type="datetime">
                       </el-date-picker>
                     </td>
@@ -1743,17 +1719,23 @@
                       </el-date-picker>
                     </td>
                     <td align="right">相应延期许可证号码：</td>
-                    <td>V
-                      <el-input style="width: 150px;" v-model="form.hVNoOne" disabled/>
+                    <td>
+                      <el-input style="width: 150px;" v-model="form.hVNoOne" disabled>
+                        <i slot="prefix" class="el-input__icon el-icon-word">V</i>
+                      </el-input>
                     </td>
                   </tr>
                   <tr>
                     <td><small>(生产装置授权人员，D栏的安全措施已实施和检查，G栏的签名已完成)</small></td>
-                    <td>V
-                      <el-input style="width: 150px;" v-model="form.hVNoTwo" disabled/>
+                    <td>
+                      <el-input style="width: 150px;" v-model="form.hVNoTwo" disabled>
+                        <i slot="prefix" class="el-input__icon el-icon-word">V</i>
+                      </el-input>
                     </td>
-                    <td>V
-                      <el-input style="width: 150px;" v-model="form.hVNoThree" disabled/>
+                    <td>
+                      <el-input style="width: 150px;" v-model="form.hVNoThree" disabled>
+                        <i slot="prefix" class="el-input__icon el-icon-word">V</i>
+                      </el-input>
                     </td>
                   </tr>
                 </table>
@@ -1788,9 +1770,7 @@
                   </tr>
                   <tr>
                     <td>
-                      <small>
-                        (E栏的安全措施已实施和D6的现场安全说明已完成)
-                      </small>
+                      <small>(E栏的安全措施已实施和D6的现场安全说明已完成)</small>
                     </td>
                     <td>
                       <small>(E栏的安全措施已实施和D6的现场安全说明已完成)</small>
@@ -1840,14 +1820,10 @@
                       <small>授权的维修工人签名(l1b)，日期</small>
                     </td>
                     <td>
-                      <small>
-                        生产装置授权人签名(G)，日期
-                      </small>
+                      <small>生产装置授权人签名(G)，日期</small>
                     </td>
                     <td>
-                      <small>
-                        E&I人员签名确认已安全停电，日期
-                      </small>
+                      <small>E&I人员签名确认已安全停电，日期</small>
                     </td>
                   </tr>
                 </table>
@@ -1895,9 +1871,9 @@
                   </tr>
                   <tr>
                     <td colspan="3">
-                      <small>如需要，列出撤销安全措施的次序</small>
+                      如需要，列出撤销安全措施的次序
                     </td>
-                    <td><small>签名(生产装置授权人员)</small></td>
+                    <td>签名(生产装置授权人员)</td>
                   </tr>
                   <tr>
                     <td>其他相关许可证</td>