From 366023b39473f18d41658c0ab6ce9160abc56159 Mon Sep 17 00:00:00 2001
From: dearlin <1261008090@qq.com>
Date: Thu, 16 Nov 2023 08:57:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=82=B9=E4=BD=8D=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E6=A0=BC=E7=85=A7=E7=89=87=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../firefighting/record/components/recordInfo.vue    | 12 ++++++------
 static/qrcode/views/bsbw/point_list.html             |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/firefighting/record/components/recordInfo.vue b/src/views/firefighting/record/components/recordInfo.vue
index 8ce375e..d87f668 100644
--- a/src/views/firefighting/record/components/recordInfo.vue
+++ b/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>
diff --git a/static/qrcode/views/bsbw/point_list.html b/static/qrcode/views/bsbw/point_list.html
index ac0f952..43e16c2 100644
--- a/static/qrcode/views/bsbw/point_list.html
+++ b/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>

From 5c20be35f61cb3c3531c5436aa0f5fa8fb54623f Mon Sep 17 00:00:00 2001
From: dearlin <1261008090@qq.com>
Date: Tue, 28 Nov 2023 16:57:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?add:=20=E5=AE=9A=E4=BD=8D=E5=8D=A1=E5=8F=B7?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/corpInfo/user/components/edit.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/corpInfo/user/components/edit.vue b/src/views/corpInfo/user/components/edit.vue
index a36ad46..51862ca 100644
--- a/src/views/corpInfo/user/components/edit.vue
+++ b/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',