zl:commit危票

ui/src/assets/styles/index.scss

@@ -449,6 +449,7 @@ aside {
 }
 .hazardwork .el-collapse-item__wrap{
   background-color: transparent;
+  border-color: transparent;
 }
 .hazardwork .el-collapse-item__header{
   background-color: #000000;
@@ -458,6 +459,18 @@ aside {
   padding-left: 10px;
 }
 .hazardwork{
+  .last-table{
+    border-collapse: collapse;
+    tr td{
+      border: 1px solid #000;
+      padding: 5px;
+    }
+  }
+  .el-input__icon.el-icon-word{
+    font-style: inherit;
+    color: $--color-primary;
+    font-weight: bold;
+  }
 }
 .hazardwork .el-row table{
   width: 100%;
@@ -466,11 +479,7 @@ 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;

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

@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <table style="background-color: #5cd9e8">
+  <div class="hazardwork" style="background-color: #E6BCE0;">
+    <table>
       <tr>
         <td></td>
         <td></td>
@@ -14,8 +14,8 @@
         <td>日期：18-5-2018</td>
       </tr>
       <tr>
-        <td colspan="3"><b>H</b>
-          <el-input style="width: 200px;" v-model="hId"></el-input>
+        <td colspan="3">
+          <el-input style="width: 200px;" v-model="hId"><i slot="prefix" class="el-input__icon el-icon-word">H</i></el-input>
         </td>
         <td>
           <el-button @click="allExpand">全部展开</el-button>
@@ -25,90 +25,74 @@
         </td>
       </tr>
     </table>
-    <el-row>
+    <el-row :gutter="20">
       <!-- 左侧栏 -->
-      <el-col :span="13">
-        <div>
+      <el-col :span="12">
+
           <el-collapse v-model="activeNames">
-            <el-collapse-item title="A 基本信息" name="1" style="width: 900px;">
+            <el-collapse-item title="A 基本信息" name="1">
               <div>
                 <table>
                   <tr>
                     <td>1.</td>
-                    <td>生产装置：
-                      <el-input style="width: 300px;" v-model="aEquipmentName"></el-input>
+                    <td>生产装置：<el-input style="width: 300px;" v-model="aEquipmentName"></el-input>
                     </td>
-                    <td>生产装置主管：
-                      <el-input style="width: 100px;" v-model="aEquipmentLeader"/>
+                    <td>生产装置主管：<el-input style="width: 100px;" v-model="aEquipmentLeader"/>
                     </td>
                     <td>
-                      <i class="el-icon-phone">：</i>
-                      <el-input style="width: 70px;" v-model="aEquipmentTel"/>
+                      <i class="el-icon-phone">：</i><el-input style="width: 70px;" v-model="aEquipmentTel"/>
                     </td>
                     <td>
-                      办公室：
-                      <el-input style="width: 70px;" v-model="aEquipmentOffice"/>
+                      办公室：<el-input style="width: 70px;" v-model="aEquipmentOffice"/>
                     </td>
                   </tr>
                   <tr>
                     <td>2.</td>
-                    <td>施工单位：
-                      <el-input style="width: 300px;" v-model="aConstructionName"/>
+                    <td>施工单位：<el-input style="width: 300px;" v-model="aConstructionName"/>
                     </td>
-                    <td>施工单位主管：
-                      <el-input style="width: 100px;" v-model="aConstructionLeader"/>
+                    <td>施工单位主管：<el-input style="width: 100px;" v-model="aConstructionLeader"/>
                     </td>
                     <td>
-                      <i class="el-icon-phone">：</i>
-                      <el-input style="width: 70px;" v-model="aConstructionTel"/>
+                      <i class="el-icon-phone">：</i><el-input style="width: 70px;" v-model="aConstructionTel"/>
                     </td>
                     <td>
-                      办公室：
-                      <el-input style="width: 70px;" v-model="aConstructionOffice"/>
+                      办公室：<el-input style="width: 70px;" v-model="aConstructionOffice"/>
                     </td>
                   </tr>
                   <tr>
                     <td>3.</td>
-                    <td>用户(涉及外部承包商时)：
-                      <el-input style="width: 300px;" v-model="aContractorName"/>
+                    <td>用户(涉及外部承包商时)：<el-input style="width: 300px;" v-model="aContractorName"/>
                     </td>
-                    <td align="right">用户主管：
-                      <el-input style="width: 100px;" v-model="aContractorLeader"/>
+                    <td align="right">用户主管：<el-input style="width: 100px;" v-model="aContractorLeader"/>
                     </td>
                     <td>
-                      <i class="el-icon-phone">：</i>
-                      <el-input style="width: 70px;" v-model="aContractorTel"/>
+                      <i class="el-icon-phone">：</i><el-input style="width: 70px;" v-model="aContractorTel"/>
                     </td>
                     <td>
-                      办公室：
-                      <el-input style="width: 70px;" v-model="aContractorOffice"/>
+                      办公室：<el-input style="width: 70px;" v-model="aContractorOffice"/>
                     </td>
                   <tr>
                     <td>4.</td>
                     <td>需要安全联络员？
                       <el-radio v-model="aIsNeedSafeLiaison" label="1">是</el-radio>
                       <el-radio v-model="aIsNeedSafeLiaison" label="2">否</el-radio>
-                      姓名：
-                      <el-input style="width: 100px;" v-model="aSafeLiaisonName" :disabled="this.radio1==1?false:true"/>
+                      姓名：<el-input style="width: 100px;" v-model="aSafeLiaisonName" :disabled="this.radio1==1?false:true"/>
                     </td>
                     <td align="right">
-                      签名：
-                      <el-input style="width: 100px;" v-model="aSafeLiaisonSign" :disabled="this.radio1==1?false:true"/>
+                      签名：<el-input style="width: 100px;" v-model="aSafeLiaisonSign" :disabled="this.radio1==1?false:true"/>
                     </td>
                     <td>
-                      <i class="el-icon-phone">：</i>
-                      <el-input style="width: 70px;" v-model="aSafeLiaisonTel" :disabled="this.radio1==1?false:true"/>
+                      <i class="el-icon-phone">：</i><el-input style="width: 70px;" v-model="aSafeLiaisonTel" :disabled="this.radio1==1?false:true"/>
                     </td>
                     <td>
-                      办公室：
-                      <el-input style="width: 70px;" v-model="aSafeLiaisonOffice"
+                      办公室：<el-input style="width: 70px;" v-model="aSafeLiaisonOffice"
                                 :disabled="this.radio1==1?false:true"/>
                     </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>
@@ -146,7 +130,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 style="width: 20px"></td>
@@ -191,7 +175,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>
@@ -952,14 +936,14 @@
               </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>
@@ -1195,7 +1179,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>
@@ -1213,7 +1197,7 @@
                 </tr>
               </table>
             </el-collapse-item>
-            <el-collapse-item title="G 核实危害评估和安全措施界定" name="7" style="width: 800px;">
+            <el-collapse-item title="G 核实危害评估和安全措施界定" name="7">
               <table>
                 <th></th>
                 <th align="right">由专门部门人员评估的项目：</th>
@@ -1258,7 +1242,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>签名：
@@ -1285,7 +1269,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>
@@ -1319,7 +1303,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 style="width: 200px;">
@@ -1364,7 +1348,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="kConfirmSign"/>
               <el-date-picker
@@ -1373,7 +1357,7 @@
                 placeholder="选择日期时间">
               </el-date-picker>
             </el-collapse-item>
-            <el-collapse-item title="L 授权的维修工人通知生产装置施工完成" name="13" style="width: 800px;">
+            <el-collapse-item title="L 授权的维修工人通知生产装置施工完成" name="13">
               如有需要，通过安全联络员
               <br>
               签名，日期/时间
@@ -1384,7 +1368,7 @@
                 placeholder="选择日期时间">
               </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">
@@ -1419,8 +1403,8 @@
                 </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>
@@ -1550,7 +1534,7 @@
               </table>
             </el-collapse-item>
           </el-collapse>
-        </div>
+
       </el-col>
     </el-row>
   </div>
@@ -1809,7 +1793,7 @@ export default {
         new Date(new Date().getFullYear(), new Date().getMonth() + 1, new Date().getDate(), 0, 0),
       ],
       //新增修改窗口内容是否展开
-      activeNames: [],
+      activeNames: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13'],
     }
   },
   /* 页面渲染前执行的方法*/

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

@@ -17,9 +17,10 @@
         <tr>
           <td colspan="3">
             <div>
-              <small><b>A</b></small>
               <el-input style="width: 200px;" v-model="form.aId" placeholder="点击生成票据ID" @focus="aIdClick"
-                        :disabled="aIdDisabled"/>
+                        :disabled="aIdDisabled">
+                <i slot="prefix" class="el-input__icon el-icon-word">A</i>
+              </el-input>
             </div>
           </td>
           <td>
@@ -1828,30 +1829,36 @@
                   </tr>
                 </table>
               </el-collapse-item>
-              <el-collapse-item title="K 确认F栏的安全措施完成" name="12">
-                签名，日期/时间
-                <el-input style="width: 85px;" v-model="form.kConfirmSign" readonly @focus="signCard('kConfirmSign')">
-                  <i slot="prefix" class="el-input__icon el-icon-edit"></i>
-                </el-input>
-                <!--<el-button type="primary" @click="signCard('kConfirmSign')"
-                           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.kConfirmDate" type="datetime">
-                </el-date-picker>
-              </el-collapse-item>
-              <el-collapse-item title="L 授权的维修工人通知生产装置施工完成" name="13">
-                如有需要，通过安全联络员
-                <br>
-                签名，日期/时间
-                <el-input style="width: 85px;" v-model="form.lNoticeSign" readonly @focus="signCard('lNoticeSign')">
-                  <i slot="prefix" class="el-input__icon el-icon-edit"></i>
-                </el-input>
-                <!--<el-button type="primary" @click="signCard('lNoticeSign')"
-                           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.lNoticeDate" type="datetime">
-                </el-date-picker>
-              </el-collapse-item>
+              <el-row :gutter="20">
+                <el-col :span="12">
+                  <el-collapse-item title="K 确认F栏的安全措施完成" name="12">
+                    签名，日期/时间
+                    <el-input style="width: 85px;" v-model="form.kConfirmSign" readonly @focus="signCard('kConfirmSign')">
+                      <i slot="prefix" class="el-input__icon el-icon-edit"></i>
+                    </el-input>
+                    <!--<el-button type="primary" @click="signCard('kConfirmSign')"
+                               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.kConfirmDate" type="datetime">
+                    </el-date-picker>
+                  </el-collapse-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-collapse-item title="L 授权的维修工人通知生产装置施工完成" name="13">
+                   <small>如有需要，通过安全联络员</small>
+                    <br>
+                    签名，日期/时间
+                    <el-input style="width: 85px;" v-model="form.lNoticeSign" readonly @focus="signCard('lNoticeSign')">
+                      <i slot="prefix" class="el-input__icon el-icon-edit"></i>
+                    </el-input>
+                    <!--<el-button type="primary" @click="signCard('lNoticeSign')"
+                               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.lNoticeDate" type="datetime">
+                    </el-date-picker>
+                  </el-collapse-item>
+                </el-col>
+              </el-row>
               <el-collapse-item title="M 评估/批准撤销D栏的施工前安全措施" name="14">
                 <table>
                   <tr>
@@ -3502,11 +3509,5 @@ export default {
     }
   }
 }
-.last-table{
-  border-collapse: collapse;
-  tr td{
-    border: 1px solid #000;
-    padding: 5px;
-  }
-}
+
 </style>