徐明浩 3 anni fa
parent
commit
94fee5a12c
1 ha cambiato i file con 201 aggiunte e 54 eliminazioni
  1. 201 54
      ui/src/views/invoicing/hazardwork/index.vue

+ 201 - 54
ui/src/views/invoicing/hazardwork/index.vue

@@ -152,7 +152,6 @@
                         <el-option v-for="item in bDevices" :key="item.id" :label="item.devName" :value="item.id">
                         </el-option>
                       </el-select>
-                      <el-input style="width: 350px;" v-model="form.bDeviceWork" placeholder="请输入后续"/>
                     </td>
                     <td>位置/区域号:
                       <el-input style="width: 200px;" v-model="form.bAreaNo"/>
@@ -183,7 +182,7 @@
                     </td>
                     <td colspan="10">危害物质(正常运行时存在于设备中的物料名称):
                       <!-- 物料数据源绑定 -->
-                      <el-select v-model="form.cHarmMatterName" placeholder="请选择物料名称"
+                      <el-select v-model="form.cHarmMatterName" clearable placeholder="请选择物料名称"
                                  @change="selectChange(form.cHarmMatterName)">
                         <el-option v-for="item in matterNames" :key="item.id" :label="item.matterName" :value="item.id">
                         </el-option>
@@ -301,7 +300,7 @@
                     <td>
                       <el-checkbox v-model="form.cIsHazardsProd" true-label="1" false-label="0"/>
                     </td>
-                    <td colspan="4">施工生产单位的危害:
+                    <td colspan="4">施工生产单位的危害:
                       <el-input style="width: 150px;" v-model="form.cIsHazardsProdContent"
                                 :disabled="this.form.cIsHazardsProd==true?false:true"/>
                     </td>
@@ -352,11 +351,15 @@
                   </tr>
                   <tr>
                     <td>
-                      <el-checkbox v-model="form.cIsOtherDanger" true-label="1" false-label="0"/>
+                      <el-checkbox v-model="form.cIsOtherDanger" true-label="1" false-label="0"
+                                   @change="otherDangerChange"/>
                     </td>
                     <td colspan="5">其他危害:
-                      <el-input style="width: 150px;" v-model="form.cOtherDangerContent"
-                                :disabled="this.form.cIsOtherDanger==true?false:true"/>
+                      <el-select style="width: 400px;" multiple 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"
@@ -385,7 +388,7 @@
                       <el-checkbox v-model="form.dIsOpenSafe" true-label="0"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-select style="width: 100px;" v-model="form.dSafeImplSign11" filterable
+                      <el-select style="width: 100px;" clearable v-model="form.dSafeImplSign11" filterable
                                  :disabled="this.form.dIsOpenSafe==1?false:true">
                         <el-option v-for="item in users" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
@@ -407,6 +410,22 @@
                   <tr>
                     <td rowspan="5" style="width: 50px;">1.2</td>
                     <td>断开电源通过:</td>
+                    <td style="width: 30px; text-align: center;">
+                      <el-checkbox v-model="form.dIsDisFeeder" true-label="1" false-label="0"
+                                   :disabled="form.dIsOpenSafe != null?false:true"/>
+                    </td>
+                    <td style="width: 30px; text-align: center;">
+                      <el-checkbox v-model="form.dIsDisFeeder" true-label="0" false-label="1"
+                                   :disabled="form.dIsOpenSafe != null?false:true"/>
+                    </td>
+                    <td style="text-align: center;">
+                      <el-input style="width: 70px;"/>
+                      <el-time-picker style="width: 80px;"/>
+                    </td>
+                    <td style="text-align: center;">
+                      <el-input style="width: 70px;"/>
+                      <el-time-picker style="width: 80px;"/>
+                    </td>
                   </tr>
                   <tr>
                     <td>断开电源线</td>
@@ -418,6 +437,14 @@
                       <el-checkbox v-model="form.dIsDisFeeder" true-label="0" false-label="1"
                                    :disabled="form.dIsOpenSafe != null?false:true"/>
                     </td>
+                    <td style="text-align: center;">
+                      <el-input style="width: 70px;"/>
+                      <el-time-picker style="width: 80px;"/>
+                    </td>
+                    <td style="text-align: center;">
+                      <el-input style="width: 70px;"/>
+                      <el-time-picker style="width: 80px;"/>
+                    </td>
                   </tr>
                   <tr>
                     <td>断开回路开关并上锁和运转测试
@@ -432,22 +459,52 @@
                       <el-checkbox v-model="form.dIsBreakIncl" true-label="0" false-label="1"
                                    :disabled="this.form.dIsDisFeeder!= null?false:true"/>
                     </td>
+                    <td style="text-align: center;">
+                      <el-input style="width: 70px;"/>
+                      <el-time-picker style="width: 80px;"/>
+                    </td>
+                    <td style="text-align: center;">
+                      <el-input style="width: 70px;"/>
+                      <el-time-picker style="width: 80px;"/>
+                    </td>
                   </tr>
                   <tr>
                     <td>电气回路编号:
                       <el-input style="width: 150px;" v-model="form.dEleCircuitNo"
                                 :disabled="this.form.dIsDisFeeder!= null?false:true"/>
                     </td>
+                    <td style="width: 30px; text-align: center;">
+                      <el-checkbox v-model="form.dIsDisFeeder" true-label="1" false-label="0"
+                                   :disabled="form.dIsOpenSafe != null?false:true"/>
+                    </td>
+                    <td style="width: 30px; text-align: center;">
+                      <el-checkbox v-model="form.dIsDisFeeder" true-label="0" false-label="1"
+                                   :disabled="form.dIsOpenSafe != null?false:true"/>
+                    </td>
+                    <td style="text-align: center;">
+                      <el-input style="width: 70px;"/>
+                      <el-time-picker style="width: 80px;"/>
+                    </td>
+                    <td style="text-align: center;">
+                      <el-input style="width: 70px;"/>
+                      <el-time-picker style="width: 80px;"/>
+                    </td>
                   </tr>
                   <tr>
                     <td>仪表号/测点编号:
                       <el-input style="width: 150px;" v-model="form.dInsTagNo"
                                 :disabled="this.form.dIsDisFeeder!= null?false:true"/>
                     </td>
-                    <td></td>
-                    <td></td>
+                    <td style="width: 30px; text-align: center;">
+                      <el-checkbox v-model="form.dIsDisFeeder" true-label="1" false-label="0"
+                                   :disabled="form.dIsOpenSafe != null?false:true"/>
+                    </td>
+                    <td style="width: 30px; text-align: center;">
+                      <el-checkbox v-model="form.dIsDisFeeder" true-label="0" false-label="1"
+                                   :disabled="form.dIsOpenSafe != null?false:true"/>
+                    </td>
                     <td style="text-align: center;">
-                      <el-select style="width: 100px;" v-model="form.dSafeImplSign12" filterable
+                      <el-select style="width: 100px;" clearable v-model="form.dSafeImplSign12" filterable
                                  :disabled="this.form.dIsBreakIncl==1?false:true">
                         <el-option v-for="item in users" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
@@ -478,7 +535,7 @@
                                    :disabled="this.form.dIsBreakIncl!= null?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-select style="width: 100px;" v-model="form.dSafeImplSign13" filterable
+                      <el-select style="width: 100px;" clearable v-model="form.dSafeImplSign13" filterable
                                  :disabled="this.form.dIsRadioactiveSources==1?false:true">
                         <el-option v-for="item in users" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
@@ -512,7 +569,7 @@
                                    :disabled="this.form.dIsRadioactiveSources!= null?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-select style="width: 100px;" v-model="form.dSafeImplSign14" filterable
+                      <el-select style="width: 100px;" clearable v-model="form.dSafeImplSign14" filterable
                                  :disabled="this.form.dIsOtherEquSafe==1?false:true">
                         <el-option v-for="item in users" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
@@ -547,7 +604,7 @@
                                    :disabled="this.form.dIsOtherEquSafe!= null?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-select style="width: 100px;" v-model="form.dSafeImplSign21" filterable
+                      <el-select style="width: 100px;" clearable v-model="form.dSafeImplSign21" filterable
                                  :disabled="this.form.dIsDepress==1?false:true">
                         <el-option v-for="item in users" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
@@ -571,7 +628,7 @@
                                    :disabled="this.form.dIsDepress!= null?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-select style="width: 100px;" v-model="form.dSafeImplSign22" filterable
+                      <el-select style="width: 100px;" clearable v-model="form.dSafeImplSign22" filterable
                                  :disabled="this.form.dIsSingleBlocking==1?false:true">
                         <el-option v-for="item in users" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
@@ -604,7 +661,7 @@
                                    :disabled="this.form.dIsSingleBlocking!= null?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-select style="width: 100px;" v-model="form.dSafeImplSign23" filterable
+                      <el-select style="width: 100px;" clearable v-model="form.dSafeImplSign23" filterable
                                  :disabled="this.form.dIsDoubleBlock==1?false:true">
                         <el-option v-for="item in users" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
@@ -640,7 +697,7 @@
                                    :disabled="this.form.dIsDoubleBlock!= null?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-select style="width: 100px;" v-model="form.dSafeImplSign24" filterable
+                      <el-select style="width: 100px;" clearable v-model="form.dSafeImplSign24" filterable
                                  :disabled="this.form.dIsLockoutUsing==1?false:true">
                         <el-option v-for="item in users" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
@@ -671,7 +728,7 @@
                                    :disabled="this.form.dIsLockoutUsing!= null?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-select style="width: 100px;" v-model="form.dSafeImplSign25" filterable
+                      <el-select style="width: 100px;" clearable v-model="form.dSafeImplSign25" filterable
                                  :disabled="this.form.dIsRemovePipe==1?false:true">
                         <el-option v-for="item in users" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
@@ -702,7 +759,7 @@
                                    :disabled="this.form.dIsRemovePipe!= null?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-select style="width: 100px;" v-model="form.dSafeImplSign26" filterable
+                      <el-select style="width: 100px;" clearable v-model="form.dSafeImplSign26" filterable
                                  :disabled="this.form.dIsDisPipes==1?false:true">
                         <el-option v-for="item in users" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
@@ -733,7 +790,7 @@
                                    :disabled="this.form.dIsDisPipes!= null?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-select style="width: 100px;" v-model="form.dSafeImplSign27" filterable
+                      <el-select style="width: 100px;" clearable v-model="form.dSafeImplSign27" filterable
                                  :disabled="this.form.dIsInsertBlindPlage==1?false:true">
                         <el-option v-for="item in users" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
@@ -767,7 +824,7 @@
                                    :disabled="this.form.dIsInsertBlindPlage!= null?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-select style="width: 100px;" v-model="form.dSafeImplSign28" filterable
+                      <el-select style="width: 100px;" clearable v-model="form.dSafeImplSign28" filterable
                                  :disabled="this.form.dIsMecSecure==1?false:true">
                         <el-option v-for="item in users" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
@@ -798,7 +855,7 @@
                                    :disabled="this.form.dIsMecSecure!= null?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-select style="width: 100px;" v-model="form.dSafeImplSign29" filterable
+                      <el-select style="width: 100px;" clearable v-model="form.dSafeImplSign29" filterable
                                  :disabled="this.form.dIsIsolationDiagram==1?false:true">
                         <el-option v-for="item in users" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
@@ -825,7 +882,7 @@
                                    :disabled="this.form.dIsIsolationDiagram!= null?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-select style="width: 100px;" v-model="form.dSafeImplSign210" filterable
+                      <el-select style="width: 100px;" clearable v-model="form.dSafeImplSign210" filterable
                                  :disabled="this.form.dIsOtherSafePlant==1?false:true">
                         <el-option v-for="item in users" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
@@ -860,7 +917,7 @@
                                    :disabled="this.form.dIsOtherSafePlant!= null?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-select style="width: 100px;" v-model="form.dSafeImplSign31" filterable
+                      <el-select style="width: 100px;" clearable v-model="form.dSafeImplSign31" filterable
                                  :disabled="this.form.dIsDrain==1?false:true">
                         <el-option v-for="item in users" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
@@ -875,8 +932,11 @@
                   <tr>
                     <td>3.2</td>
                     <td>用
-                      <el-input style="width: 150px;" v-model="form.dCleanContent"
-                                :disabled="this.form.dIsOtherSafePlant!= null?false:true"/>
+                      <el-select style="width: 150px;" clearable v-model="form.dCleanContent" filterable
+                                 :disabled="this.form.dIsOtherSafePlant==true?false:true">
+                        <el-option v-for="item in dClears" :key="item.id" :label="item.name" :value="item.id">
+                        </el-option>
+                      </el-select>
                       清洗
                     </td>
                     <td style="width: 30px; text-align: center;">
@@ -888,7 +948,7 @@
                                    :disabled="this.form.dIsDrain!= null?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-select style="width: 100px;" v-model="form.dSafeImplSign32" filterable
+                      <el-select style="width: 100px;" clearable v-model="form.dSafeImplSign32" filterable
                                  :disabled="this.form.dIsClean==1?false:true">
                         <el-option v-for="item in users" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
@@ -903,8 +963,11 @@
                   <tr>
                     <td>3.3</td>
                     <td>用
-                      <el-input style="width: 150px;" v-model="form.dFlushContent"
-                                :disabled="this.form.dIsClean!= null?false:true"/>
+                      <el-select style="width: 150px;" clearable v-model="form.dFlushContent" filterable
+                                 :disabled="this.form.dIsClean==true?false:true">
+                        <el-option v-for="item in dFlushs" :key="item.id" :label="item.name" :value="item.id">
+                        </el-option>
+                      </el-select>
                       置换
                     </td>
                     <td style="width: 30px; text-align: center;">
@@ -916,7 +979,7 @@
                                    :disabled="this.form.dIsClean!= null?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-select style="width: 100px;" v-model="form.dSafeImplSign33" filterable
+                      <el-select style="width: 100px;" clearable v-model="form.dSafeImplSign33" filterable
                                  :disabled="this.form.dIsFlush==1?false:true">
                         <el-option v-for="item in users" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
@@ -943,7 +1006,7 @@
                                    :disabled="this.form.dIsFlush!= null?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-select style="width: 100px;" v-model="form.dSafeImplSign34" filterable
+                      <el-select style="width: 100px;" clearable v-model="form.dSafeImplSign34" filterable
                                  :disabled="this.form.dIsOhterClean==1?false:true">
                         <el-option v-for="item in users" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
@@ -962,8 +1025,11 @@
                   <tr>
                     <td>4.1</td>
                     <td>现场隔离使用:
-                      <el-input style="width: 150px;" v-model="form.dSiteDemarcationContent"
-                                :disabled="this.form.dIsOhterClean!= null?false:true"/>
+                      <el-select style="width: 150px;" clearable v-model="form.dSiteDemarcationContent" filterable
+                                 :disabled="this.form.dIsOhterClean==true?false:true">
+                        <el-option v-for="item in dSiteDemarcations" :key="item.id" :label="item.name" :value="item.id">
+                        </el-option>
+                      </el-select>
                     </td>
                     <td style="width: 30px; text-align: center;">
                       <el-checkbox v-model="form.dIsSiteDemarcation" true-label="1" false-label="0"
@@ -974,7 +1040,7 @@
                                    :disabled="this.form.dIsOhterClean!= null?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-select style="width: 100px;" v-model="form.dSafeImplSign41" filterable
+                      <el-select style="width: 100px;" clearable v-model="form.dSafeImplSign41" filterable
                                  :disabled="this.form.dIsSiteDemarcation==1?false:true">
                         <el-option v-for="item in users" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
@@ -1008,7 +1074,7 @@
                                    :disabled="this.form.dIsSiteDemarcation!= null?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-select style="width: 100px;" v-model="form.dSafeImplSign42" filterable
+                      <el-select style="width: 100px;" clearable v-model="form.dSafeImplSign42" filterable
                                  :disabled="this.form.dIsAreaCover==1?false:true">
                         <el-option v-for="item in users" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
@@ -1039,7 +1105,7 @@
                                    :disabled="this.form.dIsAreaCover!= null?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-select style="width: 100px;" v-model="form.dSafeImplSign43" filterable
+                      <el-select style="width: 100px;" clearable v-model="form.dSafeImplSign43" filterable
                                  :disabled="this.form.dIsCloseTrucks==1?false:true">
                         <el-option v-for="item in users" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
@@ -1070,7 +1136,7 @@
                                    :disabled="this.form.dIsCloseTrucks!= null?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-select style="width: 100px;" v-model="form.dSafeImplSign44" filterable
+                      <el-select style="width: 100px;" clearable v-model="form.dSafeImplSign44" filterable
                                  :disabled="this.form.dIsLeakFlanges==1?false:true">
                         <el-option v-for="item in users" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
@@ -1104,7 +1170,7 @@
                                    :disabled="this.form.dIsLeakFlanges!= null?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-select style="width: 100px;" v-model="form.dSafeImplSign45" filterable
+                      <el-select style="width: 100px;" clearable v-model="form.dSafeImplSign45" filterable
                                  :disabled="this.form.dIsOtherWorkSafe==1?false:true">
                         <el-option v-for="item in users" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
@@ -1142,7 +1208,7 @@
                                    :disabled="this.form.dIsOtherWorkSafe!= null?false:true"/>
                     </td>
                     <td style="text-align: center;">
-                      <el-select style="width: 100px;" v-model="form.dSafeImplSign51" filterable
+                      <el-select style="width: 100px;" clearable v-model="form.dSafeImplSign51" filterable
                                  :disabled="this.form.dIsOtherMeasure==1?false:true">
                         <el-option v-for="item in users" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
@@ -1171,10 +1237,13 @@
                                    :disabled="this.form.dIsOtherMeasure!= null?false:true">是
                       </el-checkbox>
                     </td>
-                    <td>
+                    <td colspan="6">
                       参与交底人签名/日期
-                      <el-input style="width: 70px;" v-model="form.dPartakeBriefingSign"
-                                :disabled="this.form.dIsSafeBriefing==1?false:true"/>
+                      <el-select style="width: 600px;" multiple v-model="form.dPartakeBriefingSign" filterable
+                                 :disabled="this.form.dIsSafeBriefing==1?false:true">
+                        <el-option v-for="item in users" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
+                      </el-select>
                       <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                       value-format="yyyy-MM-dd HH:mm:ss" style="width: 80px"
                                       v-model="form.dPartakeBriefingDate" type="date"
@@ -1614,7 +1683,9 @@
               </el-collapse-item>
               <el-collapse-item title="K 确认F栏的安全措施完成" name="12" style="width: 800px;">
                 签名,日期/时间
-                <el-input style="width: 80px;" v-model="form.kConfirmSign"/>
+                <el-input style="width: 80px;" v-model="form.kConfirmSign"></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" v-model="form.kConfirmDate" type="datetime">
                 </el-date-picker>
@@ -1864,6 +1935,66 @@ export default {
         value: '6',
         label: '徐明浩6'
       }],
+      otherDangers: [
+        {
+          id: '1',
+          name: '坠落'
+        },
+        {
+          id: '2',
+          name: '高空坠物'
+        },
+        {
+          id: '3',
+          name: '灰尘'
+        }
+      ],
+      dClears: [
+        {
+          id: '1',
+          name: '水'
+        },
+        {
+          id: '2',
+          name: '空气'
+        },
+        {
+          id: '3',
+          name: '氮气'
+        },
+        {
+          id: '4',
+          name: '蒸汽'
+        }
+      ],
+      dFlushs: [
+        {
+          id: '1',
+          name: '水'
+        },
+        {
+          id: '2',
+          name: '空气'
+        },
+        {
+          id: '3',
+          name: '氮气'
+        },
+        {
+          id: '4',
+          name: '蒸汽'
+        }
+      ],
+      dSiteDemarcations: [
+        {
+          id: '1',
+          name: '警戒绳'
+        },
+        {
+          id: '2',
+          name: '警戒锥桶'
+        }
+      ],
       aIdDisabled: false,
       matterNames: [],
       item: "",
@@ -1915,7 +2046,6 @@ export default {
         aSafeLiaisonOffice: null,
         //B 工作内容
         bDeviceName: null,
-        bDeviceWork: null,
         bWorkContent: null,
         bAreaNo: null,
         bValidityStartTime: null,
@@ -2150,12 +2280,12 @@ export default {
       /* value1: [
                 new Date(2000, 10, 10, 10, 10),
                 new Date(2000, 10, 11, 10, 10),
-              ], */
-      value1: [
-        new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate(), new Date().getHours(),
+              ],
+              new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate(), new Date().getHours(),
           new Date().getMinutes()),
         new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate(), 17, 0),
-      ],
+        */
+      value1: [],
       timeValue: [],
       //新增修改窗口内容是否展开
       activeNames: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15'],
@@ -2185,6 +2315,11 @@ export default {
   methods: {
     /* 动态改变勾选 */
     selectChange(id) {
+      //清空取消数据选中时清除选中的危害及防护用品
+      if (this.form.cHarmMatterName == null || this.form.cHarmMatterName == '') {
+        this.form.cIsDanger = "0";
+        this.isYesDanger = "0";
+      }
       /* 取消所有危害选中框 */
       this.falseCheckbox();
       // 取消所有防护用品选中
@@ -2198,12 +2333,12 @@ export default {
             if (ff != null && ff.length > 0) {
               this.trueCheckbox(ff);
               this.form.cIsDanger = "1";
-              this.form.cIsAttention = "1";
               this.isYesDanger = "1";
             } else {
               console.log("没有需要选中的多选框");
             }
-            if (pro != null && pro.length > 0) {
+            //2022年1月5日取消防护用品自动选中
+            /*if (pro != null && pro.length > 0) {
               this.form.isYesResidue = true;
               pro.forEach(p => {
                 this[p.conservatoryMeasureCode] = "1";
@@ -2213,7 +2348,7 @@ export default {
                   this[p.conservatoryMeasureContent] = p.conservatoryMeasureName;
                 }
               })
-            }
+            }*/
           }
         })
         /*var idd = this.matterNames[id];
@@ -2302,12 +2437,12 @@ export default {
       if (val == 1) {
         this.form.aEquipmentLeader = 'xmh';
         this.form.aEquipmentTel = '10086';
-        this.form.aEquipmentOffice = 'D700';
+        this.form.aEquipmentOffice = 'D700-A楼';
       }
       if (val == 2) {
         this.form.aEquipmentLeader = 'wj';
         this.form.aEquipmentTel = '12315';
-        this.form.aEquipmentOffice = 'D600';
+        this.form.aEquipmentOffice = 'D600-B楼';
       }
     },
     //TODO 施工单位后台数据联动
@@ -2317,7 +2452,7 @@ export default {
         if (val == t.deptId) {
           this.form.aConstructionLeader = t.leader;
           this.form.aConstructionTel = t.phone;
-          this.form.aConstructionOffice = 'D700';
+          this.form.aConstructionOffice = '/';
         }
       })
     },
@@ -2342,7 +2477,7 @@ export default {
       }
       if (val == 2) {
         this.form.aSafeLiaisonTel = '12315';
-        this.form.aSafeLiaisonOffice = 'D600';
+        this.form.aSafeLiaisonOffice = '/';
       }
     },
     //重置A栏是否需要安全联络员数据
@@ -2357,6 +2492,7 @@ export default {
       this.bDevices.forEach(t => {
         if (t.id == val) {
           this.form.bAreaNo = t.area;
+          this.form.bWorkContent = t.devName;
         }
       })
     },
@@ -2452,6 +2588,11 @@ export default {
       this.form.eResProtectContent = this.eResProtectContent;
       this.form.eProtectSuitContent = this.eProtectSuitContent;
     },
+    otherDangerChange() {
+      if (this.form.cIsOtherDanger == '0') {
+        this.form.cOtherDangerContent = null;
+      }
+    },
     //IC卡签名
     signCard(type) {
       console.log('签名类型:' + type)
@@ -2468,6 +2609,12 @@ export default {
         this.form.hSafeMesDate = new Date();
         console.log('chuanguolai' + this.form.hSafeMesSign)
       }
+      if (res.signType == 'kConfirmSign') {
+        this.form.kConfirmSign = res.cardId
+        this.form.kConfirmDate = new Date();
+        this.$set(this.value1, 0, this.form.kConfirmDate);
+        console.log('chuanguolai' + this.form.kConfirmSign)
+      }
     }
   }
 };