Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

src/views/homesteadSurvey/add.vue

@@ -27,7 +27,7 @@
           </van-col>
           <van-col span="4"  style="text-align:center;" @click="checkTz('/homesteadSurvey/add2')" >
             <van-icon :name="require('../../assets/images/housesteadSurvey/nhxx'+(active==2?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
-            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">使用权人</p>
+            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">权利人</p>
           </van-col>
           <van-col span="2">
             <div style="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>

src/views/homesteadSurvey/add2.vue

@@ -30,7 +30,7 @@
           </van-col>
           <van-col span="4"  style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add2'})" >
             <van-icon :name="require('../../assets/images/housesteadSurvey/nhxx'+(active==2?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
-            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">使用权人</p>
+            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">权利人</p>
           </van-col>
           <van-col span="2">
             <div style="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>

src/views/homesteadSurvey/add3.vue

@@ -30,7 +30,7 @@
           </van-col>
           <van-col span="4"  style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add2'})" >
             <van-icon :name="require('../../assets/images/housesteadSurvey/nhxx'+(active==2?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
-            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">使用权人</p>
+            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">权利人</p>
           </van-col>
           <van-col span="2">
             <div style="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>

src/views/homesteadSurvey/add4.vue

@@ -30,7 +30,7 @@
           </van-col>
           <van-col span="4"  style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add2'})" >
             <van-icon :name="require('../../assets/images/housesteadSurvey/nhxx'+(active==2?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
-            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">使用权人</p>
+            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">权利人</p>
           </van-col>
           <van-col span="2">
             <div style="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>
@@ -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);
         }
@@ -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) => {

src/views/homesteadSurvey/list4.vue

@@ -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;"/>

src/views/homesteadSurvey/nhAdd.vue

@@ -25,7 +25,7 @@
           </van-col>
           <van-col span="4"  style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add2'})" >
             <van-icon :name="require('../../assets/images/housesteadSurvey/nhxx'+(active==2?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
-            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">农户</p>
+            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">权利人</p>
           </van-col>
           <van-col span="2">
             <div style="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>

src/views/homesteadSurvey/nhcyAdd.vue

@@ -25,7 +25,7 @@
           </van-col>
           <van-col span="4"  style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add2'})" >
             <van-icon :name="require('../../assets/images/housesteadSurvey/nhxx'+(active==2?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
-            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">农户</p>
+            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">权利人</p>
           </van-col>
           <van-col span="2">
             <div style="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>

src/views/homesteadSurvey/nhcyList.vue

@@ -28,7 +28,7 @@
           </van-col>
           <van-col span="4"  style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add2'})" >
             <van-icon :name="require('../../assets/images/housesteadSurvey/nhxx'+(active==2?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
-            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">农户</p>
+            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">权利人</p>
           </van-col>
           <van-col span="2">
             <div style="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>

src/views/homesteadSurvey/nmfwAdd.vue

@@ -25,7 +25,7 @@
           </van-col>
           <van-col span="4"  style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add2'})" >
             <van-icon :name="require('../../assets/images/housesteadSurvey/nhxx'+(active==2?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
-            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">农户</p>
+            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">权利人</p>
           </van-col>
           <van-col span="2">
             <div style="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>

src/views/homesteadSurvey/nmfwList.vue

@@ -28,7 +28,7 @@
           </van-col>
           <van-col span="4"  style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add2'})" >
             <van-icon :name="require('../../assets/images/housesteadSurvey/nhxx'+(active==2?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
-            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">农户</p>
+            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">权利人</p>
           </van-col>
           <van-col span="2">
             <div style="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>

src/views/homesteadSurvey/shyqrAdd.vue

@@ -25,7 +25,7 @@
           </van-col>
           <van-col span="4"  style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add2'})" >
             <van-icon :name="require('../../assets/images/housesteadSurvey/nhxx'+(active==2?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
-            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">农户</p>
+            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">权利人</p>
           </van-col>
           <van-col span="2">
             <div style="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>
@@ -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 }]"

src/views/homesteadSurvey/zrzAdd.vue

@@ -25,7 +25,7 @@
           </van-col>
           <van-col span="4"  style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add2'})" >
             <van-icon :name="require('../../assets/images/housesteadSurvey/nhxx'+(active==2?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
-            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">农户</p>
+            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">权利人</p>
           </van-col>
           <van-col span="2">
             <div style="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>