From 0fe17af568c47599a452646ed96413d3714e9ebb Mon Sep 17 00:00:00 2001
From: xuyuanqing <392009588@qq.com>
Date: Fri, 1 Dec 2023 15:08:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83?=
 =?UTF-8?q?=E6=9F=A5=E7=AD=BE=E5=AD=97=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/add4.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/homesteadSurvey/add4.vue b/src/views/homesteadSurvey/add4.vue
index 6070ff26..e4e9dc61 100644
--- a/src/views/homesteadSurvey/add4.vue
+++ b/src/views/homesteadSurvey/add4.vue
@@ -126,13 +126,13 @@
           :lineWidth="signature.lineWidth"
           :lineColor="signature.lineColor"
           :bgColor.sync="signature.bgColor"
-          v-if="zjdzdxx.surveyStatus == '4' || zjdzdxx.surveyStatus == '2' || !signature.resultImg"
+          v-if="zjdzdxx.surveyStatus != '3' && zjdzdxx.surveyStatus != '5' || !signature.resultImg && permission == 'true'"
         />
       </div>
-        <img src="../../assets/images/sunVillage_info/signature_icon_10.png" id="canvasTT"  v-if="zjdzdxx.surveyStatus == '4' || zjdzdxx.surveyStatus == '2' ||!signature.resultImg"
+        <img src="../../assets/images/sunVillage_info/signature_icon_10.png" id="canvasTT"  v-if="zjdzdxx.surveyStatus != '3' && zjdzdxx.surveyStatus != '5' || !signature.resultImg && permission == 'true'"
              style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%)" alt="">
-        <img :src="signature.resultImg" alt="" width="100%" v-if="signature.resultImg && zjdzdxx.surveyStatus != '4' && zjdzdxx.surveyStatus != '2'"/>
-      <div class="signature-footer"  v-if="zjdzdxx.surveyStatus == '4' || zjdzdxx.surveyStatus == '2' || !signature.resultImg && permission == 'true'">
+        <img :src="signature.resultImg" alt="" width="100%" v-if="signature.resultImg && zjdzdxx.surveyStatus == '3' || zjdzdxx.surveyStatus == '5'"/>
+      <div class="signature-footer"  v-if="zjdzdxx.surveyStatus != '3' && zjdzdxx.surveyStatus != '5' || !signature.resultImg && permission == 'true'">
           <van-button type="primary" round size="small" @click="handleReset">清空画板</van-button>
           <van-button type="primary" round size="small" @click="handleGenerate">保存提交</van-button>
       </div>

From 2f8b221cc8e38cd6a153e36bfb0fb92f49ecc8b5 Mon Sep 17 00:00:00 2001
From: xuyuanqing <392009588@qq.com>
Date: Fri, 1 Dec 2023 15:38:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83?=
 =?UTF-8?q?=E6=9F=A5=E5=85=B3=E8=81=94=E5=86=9C=E6=88=B7=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/shyqrAdd.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/homesteadSurvey/shyqrAdd.vue b/src/views/homesteadSurvey/shyqrAdd.vue
index 828202bf..a959b234 100644
--- a/src/views/homesteadSurvey/shyqrAdd.vue
+++ b/src/views/homesteadSurvey/shyqrAdd.vue
@@ -348,6 +348,7 @@ export default {
       deptId:JSON.parse(localStorage.getItem("surveyItem")).deptId,
       nhdmDictionaries:[],
       newList:[],
+      newListTwo:[],
       nmfwDictionaries:[],
       mapShow: false,
       form:{}
@@ -402,6 +403,7 @@ export default {
           };
         });
         this.newList = this.nhdmDictionaries;
+        this.newListTwo = this.nhdmDictionaries;
       });
     },
     checkNhdmQx(){
@@ -534,7 +536,7 @@ export default {
         }
       }
       if(val==""){
-        this.getList()
+        this.newList = this.newListTwo;
       }
     },
     /** 查找地图中宅基地 */