@@ -50,7 +50,7 @@ | |||||
</div> | </div> | ||||
</van-sticky> | </van-sticky> | ||||
<div style="margin:1.6rem auto 0;width: 95%;"> | <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> | </div> | ||||
<van-list | <van-list | ||||
v-model:loading="loading" | v-model:loading="loading" | ||||
@@ -80,7 +80,7 @@ | |||||
</p> | </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)"> | <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=""> | <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> | ||||
<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)"> | <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=""> | <img src="../../assets/images/housesteadSurvey/add02.png" alt=""> | ||||
@@ -95,7 +95,7 @@ | |||||
</van-list> | </van-list> | ||||
<div v-if="permission == 'true'" style=" width:95%;margin:20px auto;display: flex;justify-content: space-between;"> | <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;"> | <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> | ||||
<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;"> | <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> | <p style="font-size: 16px;" @click="showPopupnhcy()">+ 添加农户信息</p> | ||||
@@ -303,7 +303,7 @@ export default { | |||||
}, | }, | ||||
onBeforeCloseSh(action, done){ | onBeforeCloseSh(action, done){ | ||||
if (action === 'confirm') { | if (action === 'confirm') { | ||||
if(this.zjddcsh.surveyStatus === '4') { | |||||
if(this.zjddcsh.surveyStatus === '4' || this.zjddcsh.surveyStatus === '5') { | |||||
let surveyItem = JSON.parse(localStorage.getItem("surveyItem")); | let surveyItem = JSON.parse(localStorage.getItem("surveyItem")); | ||||
this.$set(this.zjddcsh, 'surveyId', surveyItem.id); | this.$set(this.zjddcsh, 'surveyId', surveyItem.id); | ||||
} | } | ||||
@@ -372,7 +372,6 @@ export default { | |||||
let param = new FormData() // 创建form对象 | let param = new FormData() // 创建form对象 | ||||
param.append('file', wj) // 通过append向form对象添加数据 | param.append('file', wj) // 通过append向form对象添加数据 | ||||
param.append('id', surveyItem.id) | 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 => { | zjddcSign(param, this.zjdzdxx.zjddm,surveyItem.id).then(response => { | ||||
this.$notify({type: 'success', message: '签字成功'}); | this.$notify({type: 'success', message: '签字成功'}); | ||||
getZjdzd(this.zjdzdxx.id).then((response) => { | getZjdzd(this.zjdzdxx.id).then((response) => { | ||||
@@ -107,7 +107,7 @@ | |||||
label="证件类型" | label="证件类型" | ||||
value-key="dictLabel" | value-key="dictLabel" | ||||
data-key="dictValue" | data-key="dictValue" | ||||
placeholder="请输入权利人证件类型" | |||||
placeholder="请输入使用权人证件类型" | |||||
remote-url="/open/zdzh/list/zjlx" | remote-url="/open/zdzh/list/zjlx" | ||||
:on-remote-response="'data'" | :on-remote-response="'data'" | ||||
:rules="[{ required: true }]" | :rules="[{ required: true }]" | ||||
@@ -118,7 +118,7 @@ | |||||
v-model="form.zjhm" | v-model="form.zjhm" | ||||
name="证件号码" | name="证件号码" | ||||
label="证件号码" | label="证件号码" | ||||
placeholder="请输入权利人证件号码" | |||||
placeholder="请输入使用权人证件号码" | |||||
maxlength="50" | maxlength="50" | ||||
autocomplete="off" | autocomplete="off" | ||||
:rules="[{ required: true }]" | :rules="[{ required: true }]" | ||||
@@ -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;"> | <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=""> | <img src="../../assets/images/housesteadSurvey/list02.png" alt=""> | ||||
<p style="margin-left: 10px;"> | <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> | <span style="color:#60B722;line-height:.8rem"><span style="font-size:16px;color: #448815;">{{totalR}}</span> 人</span> | ||||
</p> | </p> | ||||
</div> | </div> | ||||
@@ -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;"> | <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=""> | <img src="../../assets/images/housesteadSurvey/list02.png" alt=""> | ||||
<p style="margin-left: 10px;"> | <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> | <span style="color:#60B722;line-height:.8rem"><span style="font-size:16px;color: #448815;">{{totalR}}</span> 人</span> | ||||
</p> | </p> | ||||
</div> | </div> | ||||
@@ -495,7 +495,7 @@ | |||||
<van-search | <van-search | ||||
v-model="seachText" | v-model="seachText" | ||||
show-action | show-action | ||||
placeholder="请输入权利人信息" | |||||
placeholder="请输入使用权人信息" | |||||
> | > | ||||
<template #action> | <template #action> | ||||
<van-icon :name="require('../../assets/images/housesteadSurvey/add02.png')" color="rgba(122,201,67,1)" id="query" style="vertical-align:middle;"/> | <van-icon :name="require('../../assets/images/housesteadSurvey/add02.png')" color="rgba(122,201,67,1)" id="query" style="vertical-align:middle;"/> | ||||
@@ -70,7 +70,7 @@ | |||||
label="证件类型" | label="证件类型" | ||||
value-key="dictLabel" | value-key="dictLabel" | ||||
data-key="dictValue" | data-key="dictValue" | ||||
placeholder="请输入权利人证件类型" | |||||
placeholder="请输入使用权人证件类型" | |||||
remote-url="/open/zdzh/list/zjlx" | remote-url="/open/zdzh/list/zjlx" | ||||
:on-remote-response="'data'" | :on-remote-response="'data'" | ||||
:rules="[{ required: true }]" | :rules="[{ required: true }]" | ||||
@@ -81,7 +81,7 @@ | |||||
v-model="form.zjhm" | v-model="form.zjhm" | ||||
name="证件号码" | name="证件号码" | ||||
label="证件号码" | label="证件号码" | ||||
placeholder="请输入权利人证件号码" | |||||
placeholder="请输入使用权人证件号码" | |||||
maxlength="50" | maxlength="50" | ||||
autocomplete="off" | autocomplete="off" | ||||
:rules="[{ required: true }]" | :rules="[{ required: true }]" | ||||
@@ -83,7 +83,7 @@ | |||||
label="证件类型" | label="证件类型" | ||||
value-key="dictLabel" | value-key="dictLabel" | ||||
data-key="dictValue" | data-key="dictValue" | ||||
placeholder="请输入权利人证件类型" | |||||
placeholder="请输入使用权人证件类型" | |||||
remote-url="/open/zdzh/list/zjlx" | remote-url="/open/zdzh/list/zjlx" | ||||
:on-remote-response="'data'" | :on-remote-response="'data'" | ||||
:rules="[{ required: true }]" | :rules="[{ required: true }]" | ||||
@@ -94,7 +94,7 @@ | |||||
v-model="form.zjhm" | v-model="form.zjhm" | ||||
name="证件号码" | name="证件号码" | ||||
label="证件号码" | label="证件号码" | ||||
placeholder="请输入权利人证件号码" | |||||
placeholder="请输入使用权人证件号码" | |||||
maxlength="50" | maxlength="50" | ||||
autocomplete="off" | autocomplete="off" | ||||
:rules="[{ required: true }]" | :rules="[{ required: true }]" | ||||
@@ -96,7 +96,7 @@ | |||||
label="证件类型" | label="证件类型" | ||||
value-key="dictLabel" | value-key="dictLabel" | ||||
data-key="dictValue" | data-key="dictValue" | ||||
placeholder="请输入权利人证件类型" | |||||
placeholder="请输入使用权人证件类型" | |||||
remote-url="/open/zdzh/list/zjlx" | remote-url="/open/zdzh/list/zjlx" | ||||
:on-remote-response="'data'" | :on-remote-response="'data'" | ||||
:rules="[{ required: true }]" | :rules="[{ required: true }]" | ||||
@@ -107,7 +107,7 @@ | |||||
v-model="form.zjhm" | v-model="form.zjhm" | ||||
name="证件号码" | name="证件号码" | ||||
label="证件号码" | label="证件号码" | ||||
placeholder="请输入权利人证件号码" | |||||
placeholder="请输入使用权人证件号码" | |||||
maxlength="50" | maxlength="50" | ||||
autocomplete="off" | autocomplete="off" | ||||
:rules="[{ required: true }]" | :rules="[{ required: true }]" | ||||
@@ -46,7 +46,7 @@ | |||||
</van-sticky> | </van-sticky> | ||||
<van-form ref = "form" label-width="auto"> | <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;"> | <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 | <!--<van-field | ||||
v-model="form.deptId" | v-model="form.deptId" | ||||
name="行政区划名称" | name="行政区划名称" | ||||
@@ -142,7 +142,7 @@ | |||||
v-model="form.shyqrdbxm" | v-model="form.shyqrdbxm" | ||||
name="代表姓名" | name="代表姓名" | ||||
label="代表姓名" | label="代表姓名" | ||||
placeholder="请输入权利人代表姓名" | |||||
placeholder="请输入使用权人代表姓名" | |||||
maxlength="50" | maxlength="50" | ||||
autocomplete="off" | autocomplete="off" | ||||
:rules="[{ required: true }]" | :rules="[{ required: true }]" | ||||
@@ -153,7 +153,7 @@ | |||||
label="证件类型" | label="证件类型" | ||||
value-key="dictLabel" | value-key="dictLabel" | ||||
data-key="dictValue" | data-key="dictValue" | ||||
placeholder="请输入权利人证件类型" | |||||
placeholder="请输入使用权人证件类型" | |||||
remote-url="/open/zdzh/list/zjlx" | remote-url="/open/zdzh/list/zjlx" | ||||
:on-remote-response="'data'" | :on-remote-response="'data'" | ||||
:rules="[{ required: true }]" | :rules="[{ required: true }]" | ||||
@@ -219,10 +219,10 @@ | |||||
/> | /> | ||||
<field-select | <field-select | ||||
v-model="form.qlrlx" | v-model="form.qlrlx" | ||||
label="权利人类型" | |||||
label="使用权人类型" | |||||
value-key="dictLabel" | value-key="dictLabel" | ||||
data-key="dictValue" | data-key="dictValue" | ||||
placeholder="选择权利人类型" | |||||
placeholder="选择使用权人类型" | |||||
remote-url="/open/zdzh/list/obligee_type" | remote-url="/open/zdzh/list/obligee_type" | ||||
:on-remote-response="'data'" | :on-remote-response="'data'" | ||||
:rules="[{ required: true }]" | :rules="[{ required: true }]" | ||||