Merge branch 'dev' into 1122-动火台账

src/views/corpInfo/user/components/edit.vue

@@ -63,6 +63,9 @@
                   <el-button v-if="form.PERSON_TYPE == '主要负责人' || form.PERSON_TYPE == '安全管理人员' || form.PERSON_TYPE == '特种作业人员'" plain type="success" @click="changePersonType">补充证照信息</el-button>
                 </div>
               </el-form-item>
+              <el-form-item label="定位卡号" prop="CARDNO">
+                <el-input v-model="form.CARDNO" placeholder="这里输入定位卡号..."/>
+              </el-form-item>
               <el-form-item label="是否为隐患确认人" prop="IS_HAZARDCONFIRMER">
                 <el-radio-group v-model="form.IS_HAZARDCONFIRMER">
                   <el-radio :label="0" value="0">否</el-radio>
@@ -814,6 +817,7 @@ export default {
       form: {
         IS_HAZARDCONFIRMER: 0,
         INFORPOST: '',
+        CARDNO: '',
         INFORTITLE: '',
         INFORTITLEValue: '',
         infortitleType: 'select',

src/views/firefighting/record/components/recordInfo.vue

@@ -76,7 +76,7 @@
             <th>消防设备编号</th>
             <th>检查情况</th>
             <th>点位检查照片</th>
-            <th>点位合格照片</th>
+            <!--            <th>点位合格照片</th>-->
           </tr>
           <template v-if="varList.length !== 0">
             <tr v-for="(data,index) in varList" :key="index">
@@ -108,11 +108,11 @@
                   <a style="text-decoration: underline" @click="qualified(data.EQUIPMENT_POINT_ID,14)">点位检查照片</a>
                 </td>
               </template>
-              <template>
-                <td v-if="data.INDEX_F == '1'" :rowspan="data.ROWSPAN" class="text-center">
-                  <a style="text-decoration: underline" @click="qualified(data.QUALIFIED_PHOTOS_ID,115)">点位合格照片</a>
-                </td>
-              </template>
+              <!--              <template>-->
+              <!--                <td v-if="data.INDEX_F == '1'" :rowspan="data.ROWSPAN" class="text-center">-->
+              <!--                  <a style="text-decoration: underline" @click="qualified(data.QUALIFIED_PHOTOS_ID,115)">点位合格照片</a>-->
+              <!--                </td>-->
+              <!--              </template>-->
             </tr>
           </template>
           <template v-else>

static/qrcode/views/bsbw/point_list.html

@@ -96,7 +96,8 @@
         </div>
       </div>
   </div>
-    <div class="dy-card-content">
+    <!--点位检查合格标准照片-->
+    <div class="dy-card-content" v-if="false">
       <div v-if="images.length > 0 " class="dy-card-content-item">
         <div class="title">
           <span class="l"></span>