From 85b4a581b229fcd864145e9ffea521cfcebffc9a Mon Sep 17 00:00:00 2001
From: xuyuanqing <392009588@qq.com>
Date: Wed, 29 Nov 2023 16:54:26 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83?=
 =?UTF-8?q?=E6=9F=A5=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/add4.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/homesteadSurvey/add4.vue b/src/views/homesteadSurvey/add4.vue
index e98e163a..695eba35 100644
--- a/src/views/homesteadSurvey/add4.vue
+++ b/src/views/homesteadSurvey/add4.vue
@@ -372,7 +372,6 @@ export default {
           let param = new FormData()  // 创建form对象
           param.append('file', wj)  // 通过append向form对象添加数据
           param.append('id', surveyItem.id)
-          param.append('date', this.format(new Date(), 'yyyy-MM-dd'))  // 通过append向form对象添加数据
           zjddcSign(param, this.zjdzdxx.zjddm,surveyItem.id).then(response => {
             this.$notify({type: 'success', message: '签字成功'});
             getZjdzd(this.zjdzdxx.id).then((response) => {

From 8affb2a6aa58956bae6bd4aba75badbd7b591eba Mon Sep 17 00:00:00 2001
From: xuyuanqing <392009588@qq.com>
Date: Wed, 29 Nov 2023 17:54:53 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83?=
 =?UTF-8?q?=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/add4.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/homesteadSurvey/add4.vue b/src/views/homesteadSurvey/add4.vue
index 695eba35..6070ff26 100644
--- a/src/views/homesteadSurvey/add4.vue
+++ b/src/views/homesteadSurvey/add4.vue
@@ -303,7 +303,7 @@ export default {
     },
     onBeforeCloseSh(action, done){
       if (action === 'confirm') {
-        if(this.zjddcsh.surveyStatus === '4') {
+        if(this.zjddcsh.surveyStatus === '4' || this.zjddcsh.surveyStatus === '5') {
           let surveyItem = JSON.parse(localStorage.getItem("surveyItem"));
           this.$set(this.zjddcsh, 'surveyId', surveyItem.id);
         }

From 578ebccfa5da2b99b33bf01f0158dee339e0d5d0 Mon Sep 17 00:00:00 2001
From: xuyuanqing <392009588@qq.com>
Date: Wed, 29 Nov 2023 18:09:50 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83?=
 =?UTF-8?q?=E6=9F=A5=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/add2.vue        |  6 +++---
 src/views/homesteadSurvey/hncyDetails.vue |  4 ++--
 src/views/homesteadSurvey/list.vue        |  2 +-
 src/views/homesteadSurvey/list4.vue       |  4 ++--
 src/views/homesteadSurvey/nhAdd.vue       |  4 ++--
 src/views/homesteadSurvey/nhDetails.vue   |  4 ++--
 src/views/homesteadSurvey/nhcyAdd.vue     |  4 ++--
 src/views/homesteadSurvey/shyqrAdd.vue    | 10 +++++-----
 8 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/views/homesteadSurvey/add2.vue b/src/views/homesteadSurvey/add2.vue
index 003acb2e..35d4438c 100644
--- a/src/views/homesteadSurvey/add2.vue
+++ b/src/views/homesteadSurvey/add2.vue
@@ -50,7 +50,7 @@
       </div>
     </van-sticky>
     <div style="margin:1.6rem auto 0;width: 95%;">
-      <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-bottom: 5px;">权利人</p>
+      <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-bottom: 5px;">使用权人</p>
     </div>
     <van-list
       v-model:loading="loading"
@@ -80,7 +80,7 @@
           </p>
           <p style="width:32%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupsyqr(item)">
             <img src="../../assets/images/housesteadSurvey/add02.png" alt="">
-            <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;">权利人</span>
+            <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;">使用权人</span>
           </p>
           <p style="width:32%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopuphncylist(item)">
             <img src="../../assets/images/housesteadSurvey/add02.png" alt="">
@@ -95,7 +95,7 @@
     </van-list>
     <div  v-if="permission == 'true'" style=" width:95%;margin:20px auto;display: flex;justify-content: space-between;">
       <div style="width:49%;text-align:center;overflow:auto;border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);padding: 15px 0px;background: #ffffff;color: #22B7F2;">
-        <p style="font-size: 16px;" @click="showPopupsyqr('')">+ 添加权利人</p>
+        <p style="font-size: 16px;" @click="showPopupsyqr('')">+ 添加使用权人</p>
       </div>
       <div style="width:49%;text-align:center;overflow:auto;border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);padding: 15px 0px;background: #ffffff;color: #22B7F2;">
         <p style="font-size: 16px;" @click="showPopupnhcy()">+ 添加农户信息</p>
diff --git a/src/views/homesteadSurvey/hncyDetails.vue b/src/views/homesteadSurvey/hncyDetails.vue
index 666e5e64..76bd7331 100644
--- a/src/views/homesteadSurvey/hncyDetails.vue
+++ b/src/views/homesteadSurvey/hncyDetails.vue
@@ -107,7 +107,7 @@
           label="证件类型"
           value-key="dictLabel"
           data-key="dictValue"
-          placeholder="请输入权利人证件类型"
+          placeholder="请输入使用权人证件类型"
           remote-url="/open/zdzh/list/zjlx"
           :on-remote-response="'data'"
           :rules="[{ required: true }]"
@@ -118,7 +118,7 @@
           v-model="form.zjhm"
           name="证件号码"
           label="证件号码"
-          placeholder="请输入权利人证件号码"
+          placeholder="请输入使用权人证件号码"
           maxlength="50"
           autocomplete="off"
           :rules="[{ required: true }]"
diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 7752c39d..c243014c 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -43,7 +43,7 @@
         <div style="text-align:center;background: rgba(122,201,67,0.2);width: 49%;font-size: 14px;border-radius: 8px;display: flex;align-items: center;justify-content: center;padding: 2px 0;">
           <img src="../../assets/images/housesteadSurvey/list02.png" alt="">
           <p style="margin-left: 10px;">
-            <span style="color:#60B722;line-height:.8rem">权利人数：</span>
+            <span style="color:#60B722;line-height:.8rem">使用权人数：</span>
             <span style="color:#60B722;line-height:.8rem"><span style="font-size:16px;color: #448815;">{{totalR}}</span> 人</span>
           </p>
         </div>
diff --git a/src/views/homesteadSurvey/list4.vue b/src/views/homesteadSurvey/list4.vue
index 01db2b79..5d6a5207 100644
--- a/src/views/homesteadSurvey/list4.vue
+++ b/src/views/homesteadSurvey/list4.vue
@@ -44,7 +44,7 @@
         <div style="text-align:center;background: rgba(122,201,67,0.2);width: 49%;font-size: 14px;border-radius: 8px;display: flex;align-items: center;justify-content: center;padding: 2px 0;">
           <img src="../../assets/images/housesteadSurvey/list02.png" alt="">
           <p style="margin-left: 10px;">
-            <span style="color:#60B722;line-height:.8rem">权利人数：</span>
+            <span style="color:#60B722;line-height:.8rem">使用权人数：</span>
             <span style="color:#60B722;line-height:.8rem"><span style="font-size:16px;color: #448815;">{{totalR}}</span> 人</span>
           </p>
         </div>
@@ -495,7 +495,7 @@
         <van-search
           v-model="seachText"
           show-action
-          placeholder="请输入权利人信息"
+          placeholder="请输入使用权人信息"
         >
           <template #action>
             <van-icon :name="require('../../assets/images/housesteadSurvey/add02.png')"  color="rgba(122,201,67,1)"  id="query" style="vertical-align:middle;"/>
diff --git a/src/views/homesteadSurvey/nhAdd.vue b/src/views/homesteadSurvey/nhAdd.vue
index 6c401dae..6b2cc9a3 100644
--- a/src/views/homesteadSurvey/nhAdd.vue
+++ b/src/views/homesteadSurvey/nhAdd.vue
@@ -70,7 +70,7 @@
           label="证件类型"
           value-key="dictLabel"
           data-key="dictValue"
-          placeholder="请输入权利人证件类型"
+          placeholder="请输入使用权人证件类型"
           remote-url="/open/zdzh/list/zjlx"
           :on-remote-response="'data'"
           :rules="[{ required: true }]"
@@ -81,7 +81,7 @@
           v-model="form.zjhm"
           name="证件号码"
           label="证件号码"
-          placeholder="请输入权利人证件号码"
+          placeholder="请输入使用权人证件号码"
           maxlength="50"
           autocomplete="off"
           :rules="[{ required: true }]"
diff --git a/src/views/homesteadSurvey/nhDetails.vue b/src/views/homesteadSurvey/nhDetails.vue
index 7a8926c5..f94f2145 100644
--- a/src/views/homesteadSurvey/nhDetails.vue
+++ b/src/views/homesteadSurvey/nhDetails.vue
@@ -83,7 +83,7 @@
           label="证件类型"
           value-key="dictLabel"
           data-key="dictValue"
-          placeholder="请输入权利人证件类型"
+          placeholder="请输入使用权人证件类型"
           remote-url="/open/zdzh/list/zjlx"
           :on-remote-response="'data'"
           :rules="[{ required: true }]"
@@ -94,7 +94,7 @@
           v-model="form.zjhm"
           name="证件号码"
           label="证件号码"
-          placeholder="请输入权利人证件号码"
+          placeholder="请输入使用权人证件号码"
           maxlength="50"
           autocomplete="off"
           :rules="[{ required: true }]"
diff --git a/src/views/homesteadSurvey/nhcyAdd.vue b/src/views/homesteadSurvey/nhcyAdd.vue
index 17bc95f6..36f7de00 100644
--- a/src/views/homesteadSurvey/nhcyAdd.vue
+++ b/src/views/homesteadSurvey/nhcyAdd.vue
@@ -96,7 +96,7 @@
           label="证件类型"
           value-key="dictLabel"
           data-key="dictValue"
-          placeholder="请输入权利人证件类型"
+          placeholder="请输入使用权人证件类型"
           remote-url="/open/zdzh/list/zjlx"
           :on-remote-response="'data'"
           :rules="[{ required: true }]"
@@ -107,7 +107,7 @@
           v-model="form.zjhm"
           name="证件号码"
           label="证件号码"
-          placeholder="请输入权利人证件号码"
+          placeholder="请输入使用权人证件号码"
           maxlength="50"
           autocomplete="off"
           :rules="[{ required: true }]"
diff --git a/src/views/homesteadSurvey/shyqrAdd.vue b/src/views/homesteadSurvey/shyqrAdd.vue
index 62e34737..828202bf 100644
--- a/src/views/homesteadSurvey/shyqrAdd.vue
+++ b/src/views/homesteadSurvey/shyqrAdd.vue
@@ -46,7 +46,7 @@
     </van-sticky>
     <van-form ref = "form" label-width="auto">
       <div style="margin:1.6rem auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
-        <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">权利人信息</p>
+        <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">使用权人信息</p>
         <!--<van-field
           v-model="form.deptId"
           name="行政区划名称"
@@ -142,7 +142,7 @@
           v-model="form.shyqrdbxm"
           name="代表姓名"
           label="代表姓名"
-          placeholder="请输入权利人代表姓名"
+          placeholder="请输入使用权人代表姓名"
           maxlength="50"
           autocomplete="off"
           :rules="[{ required: true }]"
@@ -153,7 +153,7 @@
           label="证件类型"
           value-key="dictLabel"
           data-key="dictValue"
-          placeholder="请输入权利人证件类型"
+          placeholder="请输入使用权人证件类型"
           remote-url="/open/zdzh/list/zjlx"
           :on-remote-response="'data'"
           :rules="[{ required: true }]"
@@ -219,10 +219,10 @@
         />
         <field-select
           v-model="form.qlrlx"
-          label="权利人类型"
+          label="使用权人类型"
           value-key="dictLabel"
           data-key="dictValue"
-          placeholder="选择权利人类型"
+          placeholder="选择使用权人类型"
           remote-url="/open/zdzh/list/obligee_type"
           :on-remote-response="'data'"
           :rules="[{ required: true }]"