Merge remote-tracking branch 'origin/master'

master/src/main/java/com/ruoyi/project/ticket/controller/TPermitBlindPlateController.java

@@ -129,12 +129,6 @@ public class TPermitBlindPlateController extends BaseController
         String pdfPath = this.wordController.createPDF(fileDir, fileName, fileName2, params);
         tPermitBlindPlate.setPdfUrl(pdfPath);
         tPermitBlindPlateService.insertTPermitBlindPlate(tPermitBlindPlate);
-        //保存限制空间许可证关联数据
-        PermitRelation permitRelation = new PermitRelation();
-        permitRelation.setPermitId(tPermitBlindPlate.getBpId());
-        permitRelation.setPermitType("BP");
-        permitRelation.setPermitStatus(1L);
-        this.itPermitRelationService.add(permitRelation);
         //返回票号
         return AjaxResult.success(tPermitBlindPlate.getBpId());
     }

master/src/main/java/com/ruoyi/project/ticket/controller/TRestrictedSpacePermitController.java

@@ -129,12 +129,6 @@ public class TRestrictedSpacePermitController extends BaseController
         String pdfPath = this.wordController.createPDF(fileDir, fileName, fileName2, params);
         tRestrictedSpacePermit.setPdfUrl(pdfPath);
         tRestrictedSpacePermitService.insertTRestrictedSpacePermit(tRestrictedSpacePermit);
-        //保存限制空间许可证关联数据
-        PermitRelation permitRelation = new PermitRelation();
-        permitRelation.setPermitId(tRestrictedSpacePermit.getcId());
-        permitRelation.setPermitType("C");
-        permitRelation.setPermitStatus(1L);
-        this.itPermitRelationService.add(permitRelation);
         //返回票号
         return AjaxResult.success(tRestrictedSpacePermit.getcId());
     }

ui/src/views/ehs/jobticket/index.vue

@@ -266,9 +266,39 @@
       </u-table-column>
       <u-table-column :label="$t('火票级别')" align="center" sortable="custom" prop="hpjb" :formatter="hpjbFormat"/>
       <u-table-column :label="$t('限制空间许可证号')" align="center" sortable="custom" prop="xzkjxkzh" width="120"
-                       :show-overflow-tooltip="true"/>
-      <u-table-column label="盲板作业许可证号" align="center" sortable="custom" prop="mbzyxkzh" width="120" :show-overflow-tooltip="true"/>
-      <u-table-column label="高处作业许可证号" align="center" sortable="custom" prop="gczyxkzh" width="120" :show-overflow-tooltip="true"/>
+                       :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <el-button
+            v-if="scope.row.xzkjxkzh"
+            size="mini"
+            type="text"
+            @click="updateXzkjTicket(scope.row.xzkjxkzh)"
+          >{{ scope.row.xzkjxkzh }}
+          </el-button>
+        </template>
+      </u-table-column>
+      <u-table-column label="盲板作业许可证号" align="center" sortable="custom" prop="mbzyxkzh" width="120" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <el-button
+            v-if="scope.row.mbzyxkzh"
+            size="mini"
+            type="text"
+            @click="updateMbTicket(scope.row.mbzyxkzh)"
+          >{{ scope.row.mbzyxkzh }}
+          </el-button>
+        </template>
+      </u-table-column>
+      <u-table-column label="高处作业许可证号" align="center" sortable="custom" prop="gczyxkzh" width="120" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <el-button
+            v-if="scope.row.gczyxkzh"
+            size="mini"
+            type="text"
+            @click="updateGcTicket(scope.row.gczyxkzh)"
+          >{{ scope.row.gczyxkzh }}
+          </el-button>
+        </template>
+      </u-table-column>
       <u-table-column label="高处作业级别" align="center" sortable="custom" prop="gczyjb" :formatter="gczyjbFormat"/>
       <u-table-column :label="$t('工作内容')" align="center" prop="content" width="300" :show-overflow-tooltip="true"/>
       <u-table-column :label="$t('BYC负责单位/联系人')" align="center" prop="byclxr" width="100"
@@ -955,6 +985,36 @@ export default {
     });
   },
   methods: {
+    updateMbTicket(bpId) {
+      if (bpId != null) {
+        this.$router.push({
+          path: '/ticket/blind',
+          query: {
+            bpId: bpId
+          }
+        });
+      }
+    },
+    updateGcTicket(whId) {
+      if (whId != null) {
+        this.$router.push({
+          path: '/ticket/highwork',
+          query: {
+            whId: whId
+          }
+        });
+      }
+    },
+    updateXzkjTicket(cId) {
+      if (cId != null) {
+        this.$router.push({
+          path: '/ticket/restrictedspace',
+          query: {
+            cId: cId
+          }
+        });
+      }
+    },
     updateWhTicket(aId) {
       if (aId != null) {
         this.$router.push({

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

@@ -352,9 +352,7 @@
                       <td class="short-checkbox">
                         <el-checkbox v-model="form.cIsOtherId" :true-label="1"/>
                         涉及的其它作业，相关许可证：
-                        <el-input style="width: 158px;" v-model="form.cOtherId"><i slot="prefix"
-                                                                                   class="el-input__icon el-icon-word">A</i>
-                        </el-input>
+                        <el-input style="width: 158px;" v-model="form.cOtherId"></el-input>
                       </td>
                     </tr>
                   </table>

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

@@ -173,7 +173,8 @@
                                                            @change="bDeviceChange(form.bDeviceName)" style="width: 150px">-->
                           <el-select v-model="form.bDeviceName" filterable placeholder="请选择装置设备"
                                      style="width: 150px">
-                            <el-option v-for="item in bDevices" :key="item.devName" :label="item.devName" :value="item.devName">
+                            <el-option v-for="item in bDevices" :key="item.devName" :label="item.devName"
+                                       :value="item.devName">
                             </el-option>
                           </el-select>
                         </td>
@@ -206,10 +207,9 @@
                 <el-collapse-item title="C 危害识别" name="3">
                   <table>
                     <tr>
-                      <td>
+                      <td colspan="11">
                         <el-checkbox v-model="form.isYesDanger" true-label="1" false-label="0"/>
-                      </td>
-                      <td colspan="10">危害物质（正常运行时存在于设备中的物料名称）：
+                        危害物质（正常运行时存在于设备中的物料名称）：
                         <!-- 物料数据源绑定 -->
                         <el-select v-model="form.cHarmMatterName" clearable placeholder="请选择物料名称"
                                    @change="selectChange(form.cHarmMatterName)">
@@ -220,11 +220,13 @@
                       </td>
                     </tr>
                     <!-- 图标及物料特性根据物料进行动态展示 -->
-                    <tr style="text-align: center;">
-                      <td style="width: 20px;">
-                        <el-checkbox v-model="form.cIsDanger" true-label="1" false-label="0"/>
+                    <tr style="text-align: center;"  class="short-checkbox">
+                      <td rowspan="2">是否有GHS标识<br>
+                          <el-checkbox v-model="form.cIsGhs" true-label="1"/>
+                          是
+                          <el-checkbox v-model="form.cIsGhs" true-label="2"/>
+                          否
                       </td>
-                      <td>危险</td>
                       <td style="width: 80px;">
                         <el-image style="width: 70px;height: 70px;" :src="require('@/assets/image/toxicIcon.png')">
                         </el-image>
@@ -267,10 +269,6 @@
                       </td>
                     </tr>
                     <tr style="text-align: center;">
-                      <td>
-                        <el-checkbox v-model="form.cIsAttention" true-label="1" false-label="0"/>
-                      </td>
-                      <td>注意</td>
                       <td style="width: 50px;">毒性<br>
                         <el-checkbox v-model="cIsToxic" true-label="1" false-label="0"/>
                       </td>
@@ -426,7 +424,8 @@
                         <el-checkbox v-model="form.dIsOpenSafe" true-label="0" @change="dIsOpenSafeChange"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 85px;" v-model="form.dSafeImplSign11" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 85px;" v-model="form.dSafeImplSign11" readonly
+                                  prefix-icon="el-icon-edit"
                                   :disabled="form.dIsOpenSafe==1?false:true" @focus="signCard('dSafeImplSign11')">
                         </el-input>
                         <!--                      <el-button type="primary" slot="append"-->
@@ -490,7 +489,8 @@
                                      :disabled="form.dIsDkdyx !== null?false:true"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 85px;" v-model="form.dDisFeederImplSign" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 85px;" v-model="form.dDisFeederImplSign" readonly
+                                  prefix-icon="el-icon-edit"
                                   :disabled="form.dIsDisFeeder==1?false:true"
                                   @focus="signCard('dDisFeederImplSign')">
                         </el-input>
@@ -526,7 +526,8 @@
                                      :disabled="form.dIsDisFeeder!== null?false:true"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 85px;" v-model="form.dBreakInclImplSign" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 85px;" v-model="form.dBreakInclImplSign" readonly
+                                  prefix-icon="el-icon-edit"
                                   :disabled="form.dIsBreakIncl==1?false:true"
                                   @focus="signCard('dBreakInclImplSign')">
                         </el-input>
@@ -595,7 +596,8 @@
                                      :disabled="dIsDqhl !== null?false:true"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 85px;" v-model="form.dSafeImplSign12" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 85px;" v-model="form.dSafeImplSign12" readonly
+                                  prefix-icon="el-icon-edit"
                                   :disabled="form.dIsYbh==1?false:true" @focus="signCard('dSafeImplSign12')">
                         </el-input>
                         <!--<el-button type="primary" slot="append" @click="signCard('dSafeImplSign12')"
@@ -628,7 +630,8 @@
                                      :disabled="form.dIsYbh!= null?false:true"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 85px;" v-model="form.dSafeImplSign13" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 85px;" v-model="form.dSafeImplSign13" readonly
+                                  prefix-icon="el-icon-edit"
                                   :disabled="form.dIsRadioactiveSources==1?false:true"
                                   @focus="signCard('dSafeImplSign13')">
                         </el-input>
@@ -665,7 +668,8 @@
                                      :disabled="form.dIsRadioactiveSources!= null?false:true"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 85px;" v-model="form.dSafeImplSign14" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 85px;" v-model="form.dSafeImplSign14" readonly
+                                  prefix-icon="el-icon-edit"
                                   :disabled="form.dIsOtherEquSafe==1?false:true"
                                   @focus="signCard('dSafeImplSign14')">
                         </el-input>
@@ -702,7 +706,8 @@
                                      :disabled="form.dIsOtherEquSafe!= null?false:true"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 85px;" v-model="form.dSafeImplSign21" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 85px;" v-model="form.dSafeImplSign21" readonly
+                                  prefix-icon="el-icon-edit"
                                   :disabled="form.dIsDepress==1?false:true" @focus="signCard('dSafeImplSign21')">
                         </el-input>
                         <!--<el-button type="primary" slot="append" @click="signCard('dSafeImplSign21')"
@@ -728,7 +733,8 @@
                                      :disabled="form.dIsDepress!= null?false:true"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 85px;" v-model="form.dSafeImplSign22" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 85px;" v-model="form.dSafeImplSign22" readonly
+                                  prefix-icon="el-icon-edit"
                                   :disabled="form.dIsSingleBlocking==1?false:true"
                                   @focus="signCard('dSafeImplSign22')">
                         </el-input>
@@ -764,7 +770,8 @@
                                      :disabled="form.dIsSingleBlocking!= null?false:true"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 85px;" v-model="form.dSafeImplSign23" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 85px;" v-model="form.dSafeImplSign23" readonly
+                                  prefix-icon="el-icon-edit"
                                   :disabled="form.dIsDoubleBlock==1?false:true"
                                   @focus="signCard('dSafeImplSign23')">
                         </el-input>
@@ -803,7 +810,8 @@
                                      :disabled="form.dIsDoubleBlock!= null?false:true"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 85px;" v-model="form.dSafeImplSign24" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 85px;" v-model="form.dSafeImplSign24" readonly
+                                  prefix-icon="el-icon-edit"
                                   :disabled="form.dIsLockoutUsing==1?false:true"
                                   @focus="signCard('dSafeImplSign24')">
                         </el-input>
@@ -837,7 +845,8 @@
                                      :disabled="form.dIsLockoutUsing!= null?false:true"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 85px;" v-model="form.dSafeImplSign25" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 85px;" v-model="form.dSafeImplSign25" readonly
+                                  prefix-icon="el-icon-edit"
                                   :disabled="form.dIsRemovePipe==1?false:true"
                                   @focus="signCard('dSafeImplSign25')">
                         </el-input>
@@ -871,7 +880,8 @@
                                      :disabled="form.dIsRemovePipe!= null?false:true"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 85px;" v-model="form.dSafeImplSign26" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 85px;" v-model="form.dSafeImplSign26" readonly
+                                  prefix-icon="el-icon-edit"
                                   :disabled="form.dIsDisPipes==1?false:true" @focus="signCard('dSafeImplSign26')">
                         </el-input>
                         <!--<el-button type="primary" slot="append" @click="signCard('dSafeImplSign26')"
@@ -904,7 +914,8 @@
                                      :disabled="form.dIsDisPipes!= null?false:true"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 85px;" v-model="form.dSafeImplSign27" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 85px;" v-model="form.dSafeImplSign27" readonly
+                                  prefix-icon="el-icon-edit"
                                   :disabled="form.dIsInsertBlindPlage==1?false:true"
                                   @focus="signCard('dSafeImplSign27')">
                         </el-input>
@@ -941,7 +952,8 @@
                                      :disabled="form.dIsInsertBlindPlage!= null?false:true"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 85px;" v-model="form.dSafeImplSign28" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 85px;" v-model="form.dSafeImplSign28" readonly
+                                  prefix-icon="el-icon-edit"
                                   :disabled="form.dIsMecSecure==1?false:true" @focus="signCard('dSafeImplSign28')">
                         </el-input>
                         <!--<el-button type="primary" slot="append" @click="signCard('dSafeImplSign28')"
@@ -974,7 +986,8 @@
                                      :disabled="form.dIsMecSecure!= null?false:true"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 85px;" v-model="form.dSafeImplSign29" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 85px;" v-model="form.dSafeImplSign29" readonly
+                                  prefix-icon="el-icon-edit"
                                   :disabled="form.dIsIsolationDiagram==1?false:true"
                                   @focus="signCard('dSafeImplSign29')">
                         </el-input>
@@ -1004,7 +1017,8 @@
                                      :disabled="form.dIsIsolationDiagram!= null?false:true"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 85px;" v-model="form.dSafeImplSign210" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 85px;" v-model="form.dSafeImplSign210" readonly
+                                  prefix-icon="el-icon-edit"
                                   :disabled="form.dIsOtherSafePlant==1?false:true"
                                   @focus="signCard('dSafeImplSign210')">
                         </el-input>
@@ -1038,7 +1052,8 @@
                                      :disabled="form.dIsOtherSafePlant!= null?false:true"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 85px;" v-model="form.dSafeImplSign31" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 85px;" v-model="form.dSafeImplSign31" readonly
+                                  prefix-icon="el-icon-edit"
                                   :disabled="form.dIsDrain==1?false:true" @focus="signCard('dSafeImplSign31')">
                         </el-input>
                         <!--<el-button type="primary" slot="append" @click="signCard('dSafeImplSign31')"
@@ -1070,7 +1085,8 @@
                                      :disabled="form.dIsDrain!= null?false:true"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 85px;" v-model="form.dSafeImplSign32" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 85px;" v-model="form.dSafeImplSign32" readonly
+                                  prefix-icon="el-icon-edit"
                                   :disabled="form.dIsClean==1?false:true" @focus="signCard('dSafeImplSign32')">
                         </el-input>
                         <!--<el-button type="primary" slot="append" @click="signCard('dSafeImplSign32')"
@@ -1102,7 +1118,8 @@
                                      :disabled="form.dIsClean!= null?false:true"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 85px;" v-model="form.dSafeImplSign33" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 85px;" v-model="form.dSafeImplSign33" readonly
+                                  prefix-icon="el-icon-edit"
                                   :disabled="form.dIsFlush==1?false:true" @focus="signCard('dSafeImplSign33')">
                         </el-input>
                         <!--<el-button type="primary" slot="append" @click="signCard('dSafeImplSign33')"
@@ -1131,7 +1148,8 @@
                                      :disabled="form.dIsFlush!= null?false:true"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 85px;" v-model="form.dSafeImplSign34" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 85px;" v-model="form.dSafeImplSign34" readonly
+                                  prefix-icon="el-icon-edit"
                                   :disabled="form.dIsOhterClean==1?false:true"
                                   @focus="signCard('dSafeImplSign34')">
                         </el-input>
@@ -1184,7 +1202,8 @@
                                      :disabled="form.dIsOhterClean!= null?false:true"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 85px;" v-model="form.dSafeImplSign41" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 85px;" v-model="form.dSafeImplSign41" readonly
+                                  prefix-icon="el-icon-edit"
                                   :disabled="form.dIsSiteDemarcation==1?false:true"
                                   @focus="signCard('dSafeImplSign41')">
                         </el-input>
@@ -1221,7 +1240,8 @@
                                      :disabled="form.dIsSiteDemarcation!= null?false:true"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 85px;" v-model="form.dSafeImplSign42" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 85px;" v-model="form.dSafeImplSign42" readonly
+                                  prefix-icon="el-icon-edit"
                                   :disabled="form.dIsAreaCover==1?false:true" @focus="signCard('dSafeImplSign42')">
                         </el-input>
                         <!--<el-button type="primary" slot="append" @click="signCard('dSafeImplSign42')"
@@ -1254,7 +1274,8 @@
                                      :disabled="form.dIsAreaCover!= null?false:true"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 85px;" v-model="form.dSafeImplSign43" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 85px;" v-model="form.dSafeImplSign43" readonly
+                                  prefix-icon="el-icon-edit"
                                   :disabled="form.dIsCloseTrucks==1?false:true"
                                   @focus="signCard('dSafeImplSign43')">
                         </el-input>
@@ -1288,7 +1309,8 @@
                                      :disabled="form.dIsCloseTrucks!= null?false:true"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 85px;" v-model="form.dSafeImplSign44" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 85px;" v-model="form.dSafeImplSign44" readonly
+                                  prefix-icon="el-icon-edit"
                                   :disabled="form.dIsLeakFlanges==1?false:true"
                                   @focus="signCard('dSafeImplSign44')">
                         </el-input>
@@ -1325,7 +1347,8 @@
                                      :disabled="form.dIsLeakFlanges!= null?false:true"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 85px;" v-model="form.dSafeImplSign45" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 85px;" v-model="form.dSafeImplSign45" readonly
+                                  prefix-icon="el-icon-edit"
                                   :disabled="form.dIsOtherWorkSafe==1?false:true"
                                   @focus="signCard('dSafeImplSign45')">
                         </el-input>
@@ -1366,7 +1389,8 @@
                                      :disabled="form.dIsOtherWorkSafe!= null?false:true"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 85px;" v-model="form.dSafeImplSign51" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 85px;" v-model="form.dSafeImplSign51" readonly
+                                  prefix-icon="el-icon-edit"
                                   :disabled="form.dIsOtherMeasure==1?false:true"
                                   @focus="signCard('dSafeImplSign51')">
                         </el-input>
@@ -1622,7 +1646,8 @@
                             <el-input style="width: 70px;" v-model="form.eSafeAttendant"
                                       :disabled="form.eIsContinueMonitoring==1?false:true"/>
                             /
-                            <el-input style="width: 85px;" v-model="form.eSafeAttendantSign" readonly prefix-icon="el-icon-edit"
+                            <el-input style="width: 85px;" v-model="form.eSafeAttendantSign" readonly
+                                      prefix-icon="el-icon-edit"
                                       :disabled="form.eIsContinueMonitoring==1?false:true"
                                       @focus="signCard('eSafeAttendantSign')">
                             </el-input>
@@ -1810,7 +1835,8 @@
                   <table>
                     <tr>
                       <td>签名：
-                        <el-input v-model="form.hSafeMesSign" readonly @focus="signCard('hSafeMesSign')" prefix-icon="el-icon-edit">
+                        <el-input v-model="form.hSafeMesSign" readonly @focus="signCard('hSafeMesSign')"
+                                  prefix-icon="el-icon-edit">
                         </el-input>
                         <!--<el-button type="primary" slot="append" @click="signCard('hSafeMesSign')"
                                    icon="el-icon-edit"></el-button>-->
@@ -1845,7 +1871,8 @@
                     <tr>
                       <td>
                         1a 签名（授权的维修主管）
-                        <el-input style="width: 85px;" v-model="form.iOneASign" readonly @focus="signCard('iOneASign')" prefix-icon="el-icon-edit">
+                        <el-input style="width: 85px;" v-model="form.iOneASign" readonly @focus="signCard('iOneASign')"
+                                  prefix-icon="el-icon-edit">
                         </el-input>
                         <!--<el-button type="primary" slot="append" @click="signCard('iOneASign')"
                                    icon="el-icon-edit"></el-button>-->
@@ -1857,7 +1884,8 @@
                       </td>
                       <td>
                         1b 签名（授权的维修工人）
-                        <el-input style="width: 85px;" v-model="form.iOneBSign" readonly @focus="signCard('iOneBSign')" prefix-icon="el-icon-edit">
+                        <el-input style="width: 85px;" v-model="form.iOneBSign" readonly @focus="signCard('iOneBSign')"
+                                  prefix-icon="el-icon-edit">
                         </el-input>
                         <!--<el-button type="primary" slot="append" @click="signCard('iOneBSign')"
                                    icon="el-icon-edit"></el-button>-->
@@ -1874,7 +1902,8 @@
                   <table>
                     <tr>
                       <td>
-                        <el-input style="width: 85px;" v-model="form.jOneBSign" readonly @focus="signCard('jOneBSign')" prefix-icon="el-icon-edit">
+                        <el-input style="width: 85px;" v-model="form.jOneBSign" readonly @focus="signCard('jOneBSign')"
+                                  prefix-icon="el-icon-edit">
                         </el-input>
                         <!--<el-button type="primary" slot="append" @click="signCard('jOneBSign')"
                                    icon="el-icon-edit"></el-button>-->
@@ -1895,7 +1924,8 @@
                         </el-date-picker>
                       </td>
                       <td>
-                        <el-input style="width: 85px;" v-model="form.jEISign" readonly @focus="signCard('jEISign')" prefix-icon="el-icon-edit">
+                        <el-input style="width: 85px;" v-model="form.jEISign" readonly @focus="signCard('jEISign')"
+                                  prefix-icon="el-icon-edit">
                         </el-input>
                         <!--<el-button type="primary" slot="append" @click="signCard('jEISign')"
                                    icon="el-icon-edit"></el-button>-->
@@ -2127,7 +2157,8 @@
           <el-button size="mini" type="text" @click="openPdf">新页面预览</el-button>
         </div>
         <div style="margin-top: -30px">
-          <iframe id="iFrame" class="iframe-html" :src="pdf.pdfUrl" frameborder="0" width="100%" height="700px"></iframe>
+          <iframe id="iFrame" class="iframe-html" :src="pdf.pdfUrl" frameborder="0" width="100%"
+                  height="700px"></iframe>
         </div>
       </el-dialog>
     </div>
@@ -2764,7 +2795,9 @@ export default {
     openPdf() {
       window.open(this.pdf.pdfUrl)
     },
-    handleDownload(){window.open(process.env.VUE_APP_BASE_API + this.form.wordUrl)},
+    handleDownload() {
+      window.open(process.env.VUE_APP_BASE_API + this.form.wordUrl)
+    },
     /* 动态改变勾选 */
     selectChange(id) {
       //清空取消数据选中时清除选中的危害及防护用品

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

@@ -276,7 +276,7 @@
                         <el-checkbox v-model="form.cIsLowTemp" true-label="1"
 
                                      @change="lowTempChange"/>
-                        低温；
+                        低温
                         <el-checkbox v-model="form.cIsPosPressure" true-label="1"
 
                                      @change="posPressureChange"/>
@@ -360,9 +360,7 @@
                       <td class="short-checkbox" colspan="2">
                         <el-checkbox v-model="form.cIsOtherId" true-label="1"/>
                         涉及的其它作业，相关工作许可证：
-                        <el-input style="width: calc(100% - 235px);" v-model="form.cOtherId"><i slot="prefix"
-                                                                                                class="el-input__icon el-icon-word">A</i>
-                        </el-input>
+                        <el-input style="width: calc(100% - 235px);" v-model="form.cOtherId"></el-input>
                       </td>
                     </tr>
                   </table>