Переглянути джерело

zl:commit火票,完成H-N

Administrator 3 роки тому
батько
коміт
53df7bfcbc
1 змінених файлів з 67 додано та 83 видалено
  1. 67 83
      ui/src/views/invoicing/hazardwork/index.vue

+ 67 - 83
ui/src/views/invoicing/hazardwork/index.vue

@@ -1723,7 +1723,7 @@
                 <table>
                   <tr>
                     <td>签名:
-                      <el-input style="width: 85px;" v-model="form.hSafeMesSign" readonly @focus="signCard('hSafeMesSign')">
+                      <el-input v-model="form.hSafeMesSign" readonly @focus="signCard('hSafeMesSign')">
                         <i slot="prefix" class="el-input__icon el-icon-edit"></i>
                       </el-input>
                       <!--<el-button type="primary" slot="append" @click="signCard('hSafeMesSign')"
@@ -1733,22 +1733,21 @@
                                       value-format="yyyy-MM-dd HH:mm:ss" v-model="form.hSafeMesDate" type="datetime">
                       </el-date-picker>
                     </td>
-                    <td align="right">相应延期许可证号码:</td>
-                    <td>
-                      <el-input style="width: 150px;" v-model="form.hVNoOne" disabled>
+                    <td align="right">
+                      相应延期许可证号码:
+                      <el-input style="width: 50%;" v-model="form.hVNoOne" disabled>
                         <i slot="prefix" class="el-input__icon el-icon-word">V</i>
                       </el-input>
+                      <small>(生产装置授权人员,D栏的安全措施已实施和检查,G栏的签名已完成)</small>
                     </td>
                   </tr>
                   <tr>
-                    <td><small>(生产装置授权人员,D栏的安全措施已实施和检查,G栏的签名已完成)</small></td>
+                    <td></td>
                     <td>
-                      <el-input style="width: 150px;" v-model="form.hVNoTwo" disabled>
+                      <el-input style="width: 50%;" v-model="form.hVNoTwo" disabled>
                         <i slot="prefix" class="el-input__icon el-icon-word">V</i>
                       </el-input>
-                    </td>
-                    <td>
-                      <el-input style="width: 150px;" v-model="form.hVNoThree" disabled>
+                      <el-input style="width: 50%;" v-model="form.hVNoThree" disabled>
                         <i slot="prefix" class="el-input__icon el-icon-word">V</i>
                       </el-input>
                     </td>
@@ -1759,7 +1758,7 @@
                 <table>
                   <tr>
                     <td>
-                      1a 签名(授权维修主管)
+                      1a 签名(授权维修主管)
                       <el-input style="width: 85px;" v-model="form.iOneASign" readonly @focus="signCard('iOneASign')">
                         <i slot="prefix" class="el-input__icon el-icon-edit"></i>
                       </el-input>
@@ -1769,9 +1768,10 @@
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 180px" v-model="form.iOneADate"
                                       type="datetime">
                       </el-date-picker>
+                      <small>(E栏的安全措施已实施和D6的现场安全说明已完成)</small>
                     </td>
                     <td>
-                      1b 签名(授权维修工人)
+                      1b 签名(授权维修工人)
                       <el-input style="width: 85px;" v-model="form.iOneBSign" readonly @focus="signCard('iOneBSign')">
                         <i slot="prefix" class="el-input__icon el-icon-edit"></i>
                       </el-input>
@@ -1781,71 +1781,64 @@
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 180px" v-model="form.iOneBDate"
                                       type="datetime">
                       </el-date-picker>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td>
                       <small>(E栏的安全措施已实施和D6的现场安全说明已完成)</small>
                     </td>
-                    <td>
-                      <small>(E栏的安全措施已实施和D6的现场安全说明已完成)</small>
-                    </td>
-                  </tr>
-                </table>
-              </el-collapse-item>
-              <el-collapse-item title="J1 中途的E&I功能测试       J2 中途测试后,再次停用装置设备" name="10">
-                <table>
-                  <tr>
-                    <td>
-                      <el-input style="width: 85px;" v-model="form.jOneBSign" readonly @focus="signCard('jOneBSign')">
-                        <i slot="prefix" class="el-input__icon el-icon-edit"></i>
-                      </el-input>
-                      <!--<el-button type="primary" slot="append" @click="signCard('jOneBSign')"
-                                 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.jOneBDate"
-                                      type="datetime">
-                      </el-date-picker>
-                    </td>
-                    <td>
-                      <el-input style="width: 85px;" v-model="form.jResMemberSign" readonly @focus="signCard('jResMemberSign')">
-                        <i slot="prefix" class="el-input__icon el-icon-edit"></i>
-                      </el-input>
-                      <!--<el-button type="primary" slot="append" @click="signCard('jResMemberSign')"
-                                 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.jResMemberDate" type="datetime">
-                      </el-date-picker>
-                    </td>
-                    <td>
-                      <el-input style="width: 85px;" v-model="form.jEISign" readonly @focus="signCard('jEISign')">
-                        <i slot="prefix" class="el-input__icon el-icon-edit"></i>
-                      </el-input>
-                      <!--<el-button type="primary" slot="append" @click="signCard('jEISign')"
-                                 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.jEIDate"
-                                      type="datetime">
-                      </el-date-picker>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td>
-                      <small>授权的维修工人签名(l1b),日期</small>
-                    </td>
-                    <td>
-                      <small>生产装置授权人签名(G),日期</small>
-                    </td>
-                    <td>
-                      <small>E&I人员签名确认已安全停电,日期</small>
-                    </td>
                   </tr>
                 </table>
               </el-collapse-item>
+<!--              <el-collapse-item title="J1 中途的E&I功能测试       J2 中途测试后,再次停用装置设备" name="10">-->
+<!--                <table>-->
+<!--                  <tr>-->
+<!--                    <td>-->
+<!--                      <el-input style="width: 85px;" v-model="form.jOneBSign" readonly @focus="signCard('jOneBSign')">-->
+<!--                        <i slot="prefix" class="el-input__icon el-icon-edit"></i>-->
+<!--                      </el-input>-->
+<!--                      &lt;!&ndash;<el-button type="primary" slot="append" @click="signCard('jOneBSign')"-->
+<!--                                 icon="el-icon-edit"></el-button>&ndash;&gt;-->
+<!--                      <el-date-picker format="yyyy-MM-dd HH:mm:ss"-->
+<!--                                      value-format="yyyy-MM-dd HH:mm:ss" style="width: 180px" v-model="form.jOneBDate"-->
+<!--                                      type="datetime">-->
+<!--                      </el-date-picker>-->
+<!--                    </td>-->
+<!--                    <td>-->
+<!--                      <el-input style="width: 85px;" v-model="form.jResMemberSign" readonly @focus="signCard('jResMemberSign')">-->
+<!--                        <i slot="prefix" class="el-input__icon el-icon-edit"></i>-->
+<!--                      </el-input>-->
+<!--                      &lt;!&ndash;<el-button type="primary" slot="append" @click="signCard('jResMemberSign')"-->
+<!--                                 icon="el-icon-edit"></el-button>&ndash;&gt;-->
+<!--                      <el-date-picker format="yyyy-MM-dd HH:mm:ss"-->
+<!--                                      value-format="yyyy-MM-dd HH:mm:ss" style="width: 180px"-->
+<!--                                      v-model="form.jResMemberDate" type="datetime">-->
+<!--                      </el-date-picker>-->
+<!--                    </td>-->
+<!--                    <td>-->
+<!--                      <el-input style="width: 85px;" v-model="form.jEISign" readonly @focus="signCard('jEISign')">-->
+<!--                        <i slot="prefix" class="el-input__icon el-icon-edit"></i>-->
+<!--                      </el-input>-->
+<!--                      &lt;!&ndash;<el-button type="primary" slot="append" @click="signCard('jEISign')"-->
+<!--                                 icon="el-icon-edit"></el-button>&ndash;&gt;-->
+<!--                      <el-date-picker format="yyyy-MM-dd HH:mm:ss"-->
+<!--                                      value-format="yyyy-MM-dd HH:mm:ss" style="width: 180px" v-model="form.jEIDate"-->
+<!--                                      type="datetime">-->
+<!--                      </el-date-picker>-->
+<!--                    </td>-->
+<!--                  </tr>-->
+<!--                  <tr>-->
+<!--                    <td>-->
+<!--                      <small>授权的维修工人签名(l1b),日期</small>-->
+<!--                    </td>-->
+<!--                    <td>-->
+<!--                      <small>生产装置授权人签名(G),日期</small>-->
+<!--                    </td>-->
+<!--                    <td>-->
+<!--                      <small>E&I人员签名确认已安全停电,日期</small>-->
+<!--                    </td>-->
+<!--                  </tr>-->
+<!--                </table>-->
+<!--              </el-collapse-item>-->
               <el-row :gutter="20">
                 <el-col :span="12">
-                  <el-collapse-item title="K 确认F栏的安全措施完成" name="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>
@@ -1874,10 +1867,11 @@
                 </el-col>
               </el-row>
               <el-collapse-item title="M 评估/批准撤销D栏的施工前安全措施" name="14">
-                <table>
+                <table style="table-layout: fixed">
                   <tr>
-                    <td colspan="3">
+                    <td colspan="2">
                       <el-input style="width: 380px;" v-model="form.mAssessDContent"/>
+                      <span>如需要,列出撤销安全措施的次序</span>
                     </td>
                     <td>
                       <el-input style="width: 85px;" v-model="form.mAssessDSign" readonly @focus="signCard('mAssessDSign')">
@@ -1888,23 +1882,13 @@
                       <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 180px" v-model="form.mAssessDDate" type="datetime">
                       </el-date-picker>
+                      <p style="text-align: right">签名(生产装置授权人员)</p>
                     </td>
                   </tr>
                   <tr>
-                    <td colspan="3">
-                      如需要,列出撤销安全措施的次序
-                    </td>
-                    <td>签名(生产装置授权人员)</td>
-                  </tr>
-                  <tr>
-                    <td>其他相关许可证</td>
-                    <td>
+                    <td colspan="3" style="text-align: center">其他相关许可证:
                       <el-input style="width: 80px;" v-model="form.mOtherLicenceOne"/>
-                    </td>
-                    <td>
                       <el-input style="width: 80px;" v-model="form.mOtherLicenceTwo"/>
-                    </td>
-                    <td>
                       <el-input style="width: 80px;" v-model="form.mOtherLicenceThree"/>
                     </td>
                   </tr>