zl:

commit

ui/src/assets/styles/index.scss

@@ -1,3 +1,4 @@
+@import './element-variables';
 @import './variables.scss';
 @import './mixin.scss';
 @import './transition.scss';
@@ -446,3 +447,21 @@ aside {
   font-weight: normal;
   font-style: normal;
 }
+.hazardwork .el-collapse-item__wrap{
+  background-color: transparent;
+}
+.hazardwork .el-collapse-item__header{
+  background-color: #000000;
+  color: #FFFFFF;
+  height: 34px;
+  line-height: 34px;
+  padding-left: 10px;
+}
+.hazardwork .el-row table{
+  width: 100%;
+
+  .el-input__icon.el-icon-edit{
+    color: $--color-primary;
+    font-weight: bold;
+  }
+}

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

@@ -1,7 +1,7 @@
 <template>
   <el-form>
-    <div style="background-color: #5cd9e8">
-      <table style="background-color: #5cd9e8">
+    <div class="hazardwork" style="background-color: #C5E0B3;">
+      <table>
         <tr>
           <td></td>
           <td></td>
@@ -35,13 +35,11 @@
           </td>
         </tr>
       </table>
-      <el-row>
+      <el-row :gutter="30">
         <!-- 左侧栏 -->
-        <el-col :span="13">
-          <div>
+        <el-col :span="12">
             <el-collapse v-model="activeNames">
-              <el-collapse-item title="A 基本信息" name="1" style="width: 900px;">
-                <div>
+              <el-collapse-item name="1" title="A 基本信息">
                   <table>
                     <tr>
                       <td>1.</td>
@@ -125,11 +123,13 @@
                       </td>
                       <td align="right">
                         签名：
-                        <el-input style="width: 100px;" v-model="form.aSafeLiaisonSign"
-                                  :disabled="this.form.aIsNeedSafeLiaison==1?false:true"/>
-                        <el-button type="primary" slot="append" @click="signCard('aSafeLiaisonSign')"
-                                   icon="el-icon-edit"
-                                   :disabled="this.form.aIsNeedSafeLiaison==1?false:true"></el-button>
+                        <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>
+<!--                        <el-button type="primary" slot="append"-->
+<!--                                   icon="el-icon-edit"-->
+<!--                                   :disabled="this.form.aIsNeedSafeLiaison==1?false:true"></el-button>-->
                       </td>
                       <td>
                         <i class="el-icon-phone">：</i>
@@ -143,9 +143,8 @@
                       </td>
                     </tr>
                   </table>
-                </div>
               </el-collapse-item>
-              <el-collapse-item title="B 工作内容" name="2" style="width: 900px;">
+              <el-collapse-item title="B 工作内容" name="2">
                 <table>
                   <tr>
                     <td>1.</td>
@@ -161,9 +160,9 @@
                     </td>
                   </tr>
                   <tr>
-                    <td>2.</td>
-                    <td colspan="2">工作内容描述：
-                      <el-input type="textarea" style="width: 600px;" v-model="form.bWorkContent"/>
+                    <td style="vertical-align: top">2.</td>
+                    <td colspan="2" style="vertical-align: top">工作内容描述：
+                      <el-input type="textarea" style="width: 80%;vertical-align: top" v-model="form.bWorkContent"/>
                     </td>
                   </tr>
                   <tr>
@@ -177,7 +176,7 @@
                   </tr>
                 </table>
               </el-collapse-item>
-              <el-collapse-item title="C 危害识别" name="3" style="width: 900px;">
+              <el-collapse-item title="C 危害识别" name="3">
                 <table>
                   <tr>
                     <td>
@@ -374,7 +373,7 @@
                   </tr>
                 </table>
               </el-collapse-item>
-              <el-collapse-item title="D 施工前的安全措施" name="4" style="width: 900px;">
+              <el-collapse-item title="D 施工前的安全措施" name="4">
                 <table>
                   <tr>
                     <td>1.</td>
@@ -394,10 +393,12 @@
                       <el-checkbox v-model="form.dIsOpenSafe" true-label="0" @change="dIsOpenSafeChange"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-input style="width: 70px;" v-model="form.dSafeImplSign11" :disabled="this.form.dIsOpenSafe==1?false:true"/>
-                      <el-button type="primary" slot="append" @click="signCard('dSafeImplSign11')"
-                                 icon="el-icon-edit"
-                                 :disabled="this.form.dIsOpenSafe==1?false:true"></el-button>
+                      <el-input style="width: 70px;" v-model="form.dSafeImplSign11" readonly :disabled="this.form.dIsOpenSafe==1?false:true" @focus="signCard('dSafeImplSign11')">
+                        <i slot="prefix" class="el-input__icon el-icon-edit"></i>
+                      </el-input>
+<!--                      <el-button type="primary" slot="append"-->
+<!--                                 icon="el-icon-edit"-->
+<!--                                 :disabled="this.form.dIsOpenSafe==1?false:true"></el-button>-->
                       <el-date-picker style="width: 80px" v-model="form.dSafeImplDate11" type="date"
                                       format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -424,10 +425,12 @@
                                    :disabled="form.dIsOpenSafe != null?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-input style="width: 70px;" v-model="form.dDkdyxImplSign" :disabled="this.form.dIsDkdyx==1?false:true"/>
-                      <el-button type="primary" slot="append" @click="signCard('dDkdyxImplSign')"
-                                 icon="el-icon-edit"
-                                 :disabled="this.form.dIsDkdyx==1?false:true"></el-button>
+                      <el-input style="width: 70px;" v-model="form.dDkdyxImplSign" readonly :disabled="this.form.dIsDkdyx==1?false:true" @focus="signCard('dDkdyxImplSign')">
+                        <i slot="prefix" class="el-input__icon el-icon-edit"></i>
+                      </el-input>
+<!--                      <el-button type="primary" slot="append"-->
+<!--                                 icon="el-icon-edit"-->
+<!--                                 :disabled="this.form.dIsDkdyx==1?false:true"></el-button>-->
                       <el-date-picker style="width: 80px" v-model="form.dDkdyxImplDate" type="date"
                                       format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -454,10 +457,12 @@
                                    :disabled="form.dIsDkdyx != null?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-input style="width: 70px;" v-model="form.dDisFeederImplSign" :disabled="this.form.dIsDisFeeder==1?false:true"/>
-                      <el-button type="primary" slot="append" @click="signCard('dDisFeederImplSign')"
-                                 icon="el-icon-edit"
-                                 :disabled="this.form.dIsDisFeeder==1?false:true"></el-button>
+                      <el-input style="width: 70px;" v-model="form.dDisFeederImplSign" readonly :disabled="this.form.dIsDisFeeder==1?false:true" @focus="signCard('dDisFeederImplSign')">
+                        <i slot="prefix" class="el-input__icon el-icon-edit"></i>
+                      </el-input>
+<!--                      <el-button type="primary" slot="append"-->
+<!--                                 icon="el-icon-edit"-->
+<!--                                 :disabled="this.form.dIsDisFeeder==1?false:true"></el-button>-->
                       <el-date-picker style="width: 80px" v-model="form.dDisFeederImplDate" type="date"
                                       format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -487,10 +492,12 @@
                                    :disabled="this.form.dIsDisFeeder!= null?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-input style="width: 70px;" v-model="form.dBreakInclImplSign" :disabled="this.form.dIsBreakIncl==1?false:true"/>
-                      <el-button type="primary" slot="append" @click="signCard('dBreakInclImplSign')"
-                                 icon="el-icon-edit"
-                                 :disabled="this.form.dIsBreakIncl==1?false:true"></el-button>
+                      <el-input style="width: 70px;" v-model="form.dBreakInclImplSign" readonly :disabled="this.form.dIsBreakIncl==1?false:true" @focus="signCard('dBreakInclImplSign')">
+                        <i slot="prefix" class="el-input__icon el-icon-edit"></i>
+                      </el-input>
+<!--                      <el-button type="primary" slot="append"-->
+<!--                                 icon="el-icon-edit"-->
+<!--                                 :disabled="this.form.dIsBreakIncl==1?false:true"></el-button>-->
                       <el-date-picker style="width: 80px" v-model="form.dBreakInclImplDate" type="date"
                                       format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -1310,14 +1317,13 @@
                 </table>
               </el-collapse-item>
             </el-collapse>
-          </div>
         </el-col>
 
         <!-- 右侧栏 -->
-        <el-col :span="11">
-          <div>
+        <el-col :span="12">
+
             <el-collapse v-model="activeNames">
-              <el-collapse-item title="E 施工时的安全措施" name="5" style="width: 800px;">
+              <el-collapse-item title="E 施工时的安全措施" name="5">
                 <el-row>
                   <el-col :span="12">
                     <table>
@@ -1601,7 +1607,7 @@
                   </el-col>
                 </el-row>
               </el-collapse-item>
-              <el-collapse-item title="F 施工后的安全措施" name="6" style="width: 800px;">
+              <el-collapse-item title="F 施工后的安全措施" name="6">
                 <table>
                   <th></th>
                   <th style="width: 30px; text-align: center;">是</th>
@@ -1621,7 +1627,7 @@
                   </tr>
                 </table>
               </el-collapse-item>
-              <el-collapse-item title="G 核实危害评估和安全措施界定" name="7" style="width: 900px;">
+              <el-collapse-item title="G 核实危害评估和安全措施界定" name="7">
                 <table>
                   <tr>
                     <td></td>
@@ -1673,7 +1679,7 @@
                   </tr>
                 </table>
               </el-collapse-item>
-              <el-collapse-item title="H 安全措施检查和许可证批准" name="8" style="width: 800px;">
+              <el-collapse-item title="H 安全措施检查和许可证批准" name="8">
                 <table>
                   <tr>
                     <td>签名：
@@ -1702,7 +1708,7 @@
                   </tr>
                 </table>
               </el-collapse-item>
-              <el-collapse-item title="I 施工单位接受许可证" name="9" style="width: 800px;">
+              <el-collapse-item title="I 施工单位接受许可证" name="9">
                 <table>
                   <tr>
                     <td>
@@ -1738,7 +1744,7 @@
                   </tr>
                 </table>
               </el-collapse-item>
-              <el-collapse-item title="J1 中途的E&I功能测试      J2 中途测试后,再次停用装置设备" name="10" style="width: 800px;">
+              <el-collapse-item title="J1 中途的E&I功能测试      J2 中途测试后,再次停用装置设备" name="10">
                 <table>
                   <tr>
                     <td>
@@ -1786,7 +1792,7 @@
                   </tr>
                 </table>
               </el-collapse-item>
-              <el-collapse-item title="K 确认F栏的安全措施完成" name="12" style="width: 800px;">
+              <el-collapse-item title="K 确认F栏的安全措施完成" name="12">
                 签名，日期/时间
                 <el-input style="width: 80px;" v-model="form.kConfirmSign"></el-input>
                 <el-button type="primary" @click="signCard('kConfirmSign')"
@@ -1795,7 +1801,7 @@
                                 value-format="yyyy-MM-dd HH:mm:ss" v-model="form.kConfirmDate" type="datetime">
                 </el-date-picker>
               </el-collapse-item>
-              <el-collapse-item title="L 授权的维修工人通知生产装置施工完成" name="13" style="width: 800px;">
+              <el-collapse-item title="L 授权的维修工人通知生产装置施工完成" name="13">
                 如有需要，通过安全联络员
                 <br>
                 签名，日期/时间
@@ -1806,7 +1812,7 @@
                                 value-format="yyyy-MM-dd HH:mm:ss" v-model="form.lNoticeDate" type="datetime">
                 </el-date-picker>
               </el-collapse-item>
-              <el-collapse-item title="M 评估/批准撤销D栏的施工前安全措施" name="14" style="width: 800px;">
+              <el-collapse-item title="M 评估/批准撤销D栏的施工前安全措施" name="14">
                 <table>
                   <tr>
                     <td colspan="3">
@@ -1841,138 +1847,137 @@
                   </tr>
                 </table>
               </el-collapse-item>
-              <el-collapse-item title="N 空气检测记录" name="15" style="width: 800px;">
-                <table border="1">
+              <el-collapse-item title="N 空气检测记录" name="15">
+                <table cellpadding="0" cellspacing="0" class="last-table">
                   <tr>
                     <td>检测位置</td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                   </tr>
                   <tr>
                     <td>检测日期/时间（时/分）</td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                   </tr>
                   <tr>
                     <td>检测物质</td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                   </tr>
                   <tr>
                     <td>检测结果</td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                   </tr>
                   <tr>
                     <td>检测人签名</td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                   </tr>
                   <tr>
                     <td>便携式检测仪编号</td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                     <td>
-                      <el-input style="width: 80px;"/>
+                      <el-input style="width: 100%;"/>
                     </td>
                   </tr>
                 </table>
               </el-collapse-item>
             </el-collapse>
-          </div>
         </el-col>
       </el-row>
     </div>
@@ -3455,4 +3460,11 @@ export default {
     }
   }
 }
+.last-table{
+  border-collapse: collapse;
+  tr td{
+    border: 1px solid #000;
+    padding: 5px;
+  }
+}
 </style>