From ec75fda7de6f72b3b3f788d29bee98ef39c03cc5 Mon Sep 17 00:00:00 2001
From: xuyuanqing <392009588@qq.com>
Date: Fri, 24 Nov 2023 12:10:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83=E6=9F=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/list.vue     | 2 +-
 src/views/homesteadSurvey/shyqrAdd.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 3a7ac3f0..48f68e0d 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -104,7 +104,7 @@
                   <van-button square  type="info" class="delete-button" @click="showUploadList(item.id)"><van-icon  name="photo-o" size=".4rem" style="bottom: -3px;" color="#000000" @click="showUploadList(item.id)"/> 附件</van-button>
                 </van-col>
                 <van-col>
-                  <van-button square  type="danger" class="delete-button" @click="deleteZjd(item)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt="">  删除</van-button>
+                  <van-button square v-if="item.surveyStatus != '5' && item.surveyStatus != '3'" type="danger" class="delete-button" @click="deleteZjd(item)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt="">  删除</van-button>
                 </van-col>
               </van-row>
             </template>
diff --git a/src/views/homesteadSurvey/shyqrAdd.vue b/src/views/homesteadSurvey/shyqrAdd.vue
index 1e47ba1e..5ffe7672 100644
--- a/src/views/homesteadSurvey/shyqrAdd.vue
+++ b/src/views/homesteadSurvey/shyqrAdd.vue
@@ -204,7 +204,7 @@
           label="户口类型"
           value-key="dictLabel"
           data-key="dictValue"
-          placeholder="选择性别"
+          placeholder="选择户口类型"
           remote-url="/open/zdzh/list/account_type"
           :on-remote-response="'data'"
         />
@@ -462,7 +462,7 @@ export default {
           this.$set(this.form, "xb", data.xb);
           this.$set(this.form, "dh", data.lxdh);
           this.$set(this.form, "sfbncjtjjzzcy",data.sfbjtjjzzcy);
-          this.$set(this.form, "hklx", data.sfbjtjjzzcy);
+          this.$set(this.form, "hklx", data.hklx);
           this.$set(this.form, "dz", data.txdz);
         }
       });