From 74e7576604c4af6e029f366480f56302013ce487 Mon Sep 17 00:00:00 2001
From: xyq <392009588@qq.com>
Date: Thu, 3 Nov 2022 18:18:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E7=9B=98=E6=B4=BB?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E3=80=81=E5=AE=85=E5=9F=BA=E5=9C=B0=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/onlineHome/homestead/application.js   |  14 ++-
 src/components/Map/MapGisObtain.vue           |   4 +-
 .../homeApplication/proposerLite.vue          |  32 ++++-
 src/views/onlineHome/phfs/czjy/czjyAdd.vue    |  87 +++++++++++--
 .../onlineHome/phfs/czjy/czjyDetails.vue      |   5 +-
 src/views/onlineHome/phfs/czjy/czjyModify.vue |  10 +-
 src/views/onlineHome/phfs/hzjy/hzjyAdd.vue    | 115 ++++++++++++++----
 .../onlineHome/phfs/hzjy/hzjyDetails.vue      |   5 +-
 src/views/onlineHome/phfs/hzjy/hzjyModify.vue |  10 +-
 src/views/onlineHome/phfs/rgjy/rgjyAdd.vue    | 115 ++++++++++++++----
 .../onlineHome/phfs/rgjy/rgjyDetails.vue      |   5 +-
 src/views/onlineHome/phfs/rgjy/rgjyModify.vue |  10 +-
 src/views/onlineHome/phfs/zzjy/zzjyAdd.vue    | 115 ++++++++++++++----
 .../onlineHome/phfs/zzjy/zzjyDetails.vue      |   5 +-
 src/views/onlineHome/phfs/zzjy/zzjyModify.vue |  10 +-
 src/views/onlineHome/phfs/zzly/zzlyAdd.vue    | 115 ++++++++++++++----
 .../onlineHome/phfs/zzly/zzlyDetails.vue      |   5 +-
 src/views/onlineHome/phfs/zzly/zzlyModify.vue |  11 +-
 18 files changed, 541 insertions(+), 132 deletions(-)

diff --git a/src/api/onlineHome/homestead/application.js b/src/api/onlineHome/homestead/application.js
index 53ce431c..52d19ffd 100644
--- a/src/api/onlineHome/homestead/application.js
+++ b/src/api/onlineHome/homestead/application.js
@@ -115,10 +115,11 @@ export function removeFile(id){
 }
 
 //获取户主信息
-export function getHouseMembers(id){
+export function getHouseMembers(data){
   return request({
     url:'/house/mobile/getHouseMembers',
-    method:'get'
+    method:'get',
+    params:data
   })
 }
 
@@ -222,7 +223,14 @@ export function getWorkflow() {
     method: 'get'
   })
 }
-
+// 查询农户信息
+export function selectProposerNh(data) {
+  return request({
+    url: '/house/lz/queryHouserBaseNh' ,
+    method: 'get',
+    params: data
+  })
+}
 //驳回提交清空历史审批记录
 export function updateOpretion(id) {
   return request({
diff --git a/src/components/Map/MapGisObtain.vue b/src/components/Map/MapGisObtain.vue
index 0ecab3f7..b5244b03 100644
--- a/src/components/Map/MapGisObtain.vue
+++ b/src/components/Map/MapGisObtain.vue
@@ -26,7 +26,7 @@ export default {
       closeMoule: null,
     };
   },
-  props: ['theGeom','shqrxm'],
+  props: ['theGeom','shqrxm',"shyqrStatus"],
   methods: {
     //地图加载
     guidProduct(){
@@ -41,7 +41,7 @@ export default {
       //加载地图编辑
       var that = this;
       console.info(this.shqrxm);
-      selectTHouseBaseObligeeMapList({shyqrdbxm:this.shqrxm}).then((response) => {
+      selectTHouseBaseObligeeMapList({shyqrdbxm:this.shqrxm,status:this.shyqrStatus}).then((response) => {
         if (response.code == 200) {
 
           document.getElementById(that.uuidMap).innerHTML = '';
diff --git a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
index 0021288a..c4000dd7 100644
--- a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
+++ b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
@@ -38,7 +38,16 @@
                 <div>
                   <p class="main_title">申请户主信息</p>
                   <div class="main_box">
-                    <van-field :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyProposer.memberName" label="姓名" placeholder="姓名" input-align="right" required :rules="[{ required: true }]"/>
+                    <van-field :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyProposer.memberName" label="姓名" placeholder="姓名" input-align="right"    @input="remoteTransfereeMethod" required :rules="[{ required: true }]"/>
+                    <van-popup v-model="showNhxx" position="bottom">
+                      <van-picker
+                        show-toolbar
+                        :columns="nhxxList"
+                        @confirm="getApplyerDetail"
+                        value-key="hzxm"
+                        @cancel="showNhxx = false"
+                      />
+                    </van-popup>
                     <field-select
                       v-model="applicationDetail.tHouseApplyProposer.sex"
                       label="性别"
@@ -1551,7 +1560,7 @@ import HouseApplyUploadComp from "@/components/house/HouseApplyUploadComp";
 import HouseLocationPlanComp from "@/components/house/HouseLocationPlanComp";
 
 import FieldSelect from "@/components/form/FieldSelect";
-import { getQueryLand, saveHouseBaseInfo , houseList , getHouseMembers , allInformationWLHT, checkDuplicateBuilding, checkDuplicateBuildingQuery, customSubmitWLHT, submitStartWLHT, updateStart, updateEnd, submitEndWLHT, getWorkflow } from "@/api/onlineHome/homestead/application";
+import { getQueryLand, saveHouseBaseInfo , houseList , getHouseMembers , allInformationWLHT, checkDuplicateBuilding, checkDuplicateBuildingQuery, customSubmitWLHT, submitStartWLHT, updateStart, updateEnd, submitEndWLHT, getWorkflow ,selectProposerNh} from "@/api/onlineHome/homestead/application";
 import $ from "jquery";
 import CommonMap from "@/components/house/CommonMap";
 import FieldDatePicker from "@/components/form/FieldDatePicker";
@@ -1598,6 +1607,9 @@ export default {
       applicationDetail: {},
       // 当前家庭成员展开
       activeNames:['1'],
+      showNhxx:false,
+      //农户信息集合
+      nhxxList:[],
       // 当前显示流程
       selectedTabName: 0,
       processKeyField: null,
@@ -1850,7 +1862,7 @@ export default {
       else
       {
         this.init();
-        this.getApplyerDetail();
+        // this.getApplyerDetail();
       }
     },
     // 绘制申请地图
@@ -1935,6 +1947,7 @@ export default {
       const role = this.$store.getters.roles;
       this.currentUserRole = role[0];
       console.log("当前用户角色: " + role);
+      console.info(value);
       // 局部变量
       let houseApplyStatus = value ? value.tHouseApplyProposer.houseApplyStatus : -1;
       let proposerId = value ? value.tHouseApplyProposer.id : null;
@@ -2762,6 +2775,13 @@ export default {
         this.$refs.memberTabs.scrollTo(Math.max(index - 1, 0));
       });
     },
+    remoteTransfereeMethod(val){
+      selectProposerNh({hzxm:val}).then(res => {
+        this.nhxxList = res.rows;
+        this.showNhxx = true;
+      });
+
+    },
     // 获取户型配置
     getHouseList() {
       return houseList();
@@ -2834,8 +2854,8 @@ export default {
       this.$set(this.applicationDetail, "fileList", fileIdList);
     },
     // 获取申请人信息
-    getApplyerDetail(){
-      getHouseMembers().then(res => {
+    getApplyerDetail(val){
+      getHouseMembers({memberName:val.hzxm}).then(res => {
         if(res.data)
         {
           this.applicationDetail.tHouseApplyProposer = res.data.tHouseApplyProposer;
@@ -2854,6 +2874,7 @@ export default {
           }
         }
       });
+      this.showNhxx = false;
     },
     // 检查字符串, 不符合返回true
     checkString(value, regexp) {
@@ -2868,6 +2889,7 @@ export default {
     saveProposerApply(submit) {
       this.$refs.form.validate().then(() => {
         let msg = this.validateBaseApplyFormBase();
+        console.info(msg)
         if(msg)
         {
           this.notify(msg, 'danger');
diff --git a/src/views/onlineHome/phfs/czjy/czjyAdd.vue b/src/views/onlineHome/phfs/czjy/czjyAdd.vue
index b2c71a36..f94fd571 100644
--- a/src/views/onlineHome/phfs/czjy/czjyAdd.vue
+++ b/src/views/onlineHome/phfs/czjy/czjyAdd.vue
@@ -12,8 +12,29 @@
     </van-nav-bar>
     <van-form ref="_Form">
     <div class="main_box">
-
+      <van-field
+        readonly
+        clickable
+        name="picker"
+        v-model="phrqType"
+        label="盘活人群"
+        placeholder="请选择"
+        @click="showPhrq = true"
+        input-align="right"
+        right-icon="arrow-down"
+        label-width="auto" :rules="[{ required: true }]" required
+      />
+      <van-popup v-model="showPhrq" position="bottom">
+        <van-picker
+          show-toolbar
+          :columns="phrqOptions"
+          value-key="dictLabel"
+          @confirm="onPhrqChange"
+          @cancel="showPhrq = false"
+        />
+      </van-popup>
                   <van-field
+                    v-if="!zcfmcShow"
                      v-model="circulation.zcfmc"
                      label="申请人姓名"
                     placeholder="请输入申请人姓名"
@@ -29,6 +50,13 @@
                        {{item.shyqrdbxm}}
                      </van-cell>
 
+                <van-field
+                  v-if="zcfmcShow"
+                  v-model="circulation.zcfmc"
+                  label="申请人姓名"
+                  :rules="[{ required: true }]" required
+                />
+
       <van-popup v-model="showshyqrdm" position="bottom">
         <van-picker
           show-toolbar
@@ -57,14 +85,15 @@
       </van-popup>
       <van-field
         disabled
+        v-if="zcfxbShow"
         v-model="xb"
         label="性别"
         input-align="right"
         label-width="auto"
       />
-      <van-field v-model="circulation.zcfdh" label="联系电话" placeholder="请输入联系电话" input-align="right" label-width="auto" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]" required/>
-      <van-field disabled v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
-      <van-cell title="是否本集体经济组织成员" >
+      <van-field  v-model="circulation.zcfdh" :disabled="phoneShow" label="联系电话" placeholder="请输入联系电话" input-align="right" label-width="auto" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]" required/>
+      <van-field  v-if="zcfzjhmShow" disabled v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
+      <van-cell v-if="zcfzzShow" title="是否本集体经济组织成员" >
         <template #right-icon>
           <van-radio-group v-model="circulation.zcfzz" direction="horizontal" >
             <van-radio name="1">是</van-radio>
@@ -150,7 +179,7 @@
       <van-field  v-model="circulation.zrfzjhm" label="经营方证件号" placeholder="请输入经营方证件号" input-align="right" label-width="auto"  :rules="[{ required: true }]" required/>
       <van-field v-model="circulation.zrfdh" label="经营方电话" placeholder="请输入经营方电话" input-align="right" label-width="auto" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]" required/>
     <van-dialog v-model:show="mapShow" show-cancel-button>
-        <MapGisObtain ref="zjdProductResh" :shqrxm="circulation.zcfmc" @closeMoule="closeMoule"></MapGisObtain>
+        <MapGisObtain ref="zjdProductResh" :shyqrStatus = "shyqrStatus" :shqrxm="circulation.zcfmc" @closeMoule="closeMoule"></MapGisObtain>
     </van-dialog>
 
     </div>
@@ -174,6 +203,7 @@
   import { zjdzd, obligeeList } from "@/api/onlineHome/homestead/circulation";
   import { addPhxxb,updatePhxxb,queryGeoZjdzd } from "@/api/onlineHome/phfs/phfs";
   import { ycsyAdd , listByDeptId } from "@/api/onlineHome/homestead/paidUtilize";
+  import {getInfo} from "@/api/login";
   import MapGisObtain from "@/components/Map/MapGisObtain";
   import {Notify} from "vant";
   export default {
@@ -222,6 +252,7 @@
         xb:'',
         bcfs:'',
         zjddm:'',
+        phrqType:'',
         showzcfmc:false,
         showtcqllx: false,
         showtclx: false,
@@ -235,8 +266,17 @@
         showjsrq: false,
         showycsydqsj: false,
         columnsData: [],
-        circulation:{phfs:"02"},
+        circulation:{phfs:"02",phrqType:"1"},
         mapShow: false,
+        showPhrq:false,
+        phoneShow:true,
+        zcfmcShow:false,
+        deptName:"",
+        zcfzjhmShow:true,
+        zcfxbShow:true,
+        zcfzzShow:true,
+        shyqrStatus:"1",
+        phrqOptions:[],
       };
     },
     created() {
@@ -250,6 +290,11 @@
               this.tcqllxDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
             }
           });
+          //盘活人群
+        this.houseGetDicts("sqph_type").then(res => {
+          this.phrqOptions = res.data;
+          this.phrqType = this.selectDictLabel(res.data, this.circulation.phrqType);
+        });
           //退出类型
           this.houseGetDicts("tclx").then((res) => {
             for (var i = 0; i < res.data.length; i++) {
@@ -286,6 +331,9 @@
               this.shyqrdmDictionaries.push(zjdRes.rows[i].shyqrdm);
             }
           });
+        getInfo().then(response => {
+          this.deptName = response.user.deptName;
+        });
       },
       plusOrMinus(values) {
         let newValue
@@ -365,6 +413,31 @@
           this.$refs.zjdProductResh.drawingLyPaceCountryDarw();
         },1000)
       },
+      onPhrqChange(val){
+        this.circulation.zjddm = null;
+        this.circulation.zcfzjhm = null;
+        this.circulation.zcfxb = null;
+        this.circulation.zcfdh = null;
+        this.phrqType = val.dictLabel
+        if(val.dictValue === "1"){
+          this.circulation.zcfmc = null;
+          this.zcfmcShow = false;
+          this.phoneShow = true;
+          this.zcfzjhmShow = true;
+          this.zcfxbShow = true;
+          this.zcfzzShow = true;
+          this.shyqrStatus = "1";
+        }else{
+          this.zcfmcShow = true;
+          this.phoneShow = false;
+          this.zcfzjhmShow = false;
+          this.zcfxbShow = false;
+          this.zcfzzShow = false;
+          this.circulation.zcfmc = this.deptName+"村集体";
+          this.shyqrStatus = "2";
+        }
+        this.showPhrq = false;
+      },
       /** 查找地图中宅基地 */
       closeMoule: function (data) {
         this.circulation.zjddm = data;
@@ -382,7 +455,7 @@
             hzxm : query,
           };
           this.searchLoading = true;
-          obligeeList({shyqrdbxm:query,status:2}).then((response) => {
+          obligeeList({shyqrdbxm:query,status:this.shyqrStatus}).then((response) => {
             this.searchLoading = false;
             if (response.code == 200) {
               this.getObligeeOptions = response.rows.map((item) => {
diff --git a/src/views/onlineHome/phfs/czjy/czjyDetails.vue b/src/views/onlineHome/phfs/czjy/czjyDetails.vue
index 7ae8a8e6..743d179d 100644
--- a/src/views/onlineHome/phfs/czjy/czjyDetails.vue
+++ b/src/views/onlineHome/phfs/czjy/czjyDetails.vue
@@ -56,6 +56,7 @@
         />
       </van-popup>
       <van-field
+        v-if="circulation.phrqType == 1"
         readonly
         v-model="circulation.zcfxb"
         label="性别"
@@ -63,8 +64,8 @@
         label-width="auto"
       />
       <van-field readonly v-model="circulation.zcfdh" label="联系电话" placeholder="请输入联系电话" input-align="right" label-width="auto" />
-      <van-field readonly v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
-      <van-cell title="是否本集体经济组织成员" >
+      <van-field  v-if="circulation.phrqType == 1" readonly v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
+      <van-cell  v-if="circulation.phrqType == 1" title="是否本集体经济组织成员" >
         <template #right-icon>
           <van-radio-group disabled v-model="circulation.zcfzz" direction="horizontal" >
             <van-radio name="1">是</van-radio>
diff --git a/src/views/onlineHome/phfs/czjy/czjyModify.vue b/src/views/onlineHome/phfs/czjy/czjyModify.vue
index 04e296e9..b37eb667 100644
--- a/src/views/onlineHome/phfs/czjy/czjyModify.vue
+++ b/src/views/onlineHome/phfs/czjy/czjyModify.vue
@@ -14,6 +14,7 @@
     <div class="main_box">
 
                   <van-field
+                    :disabled="circulation.phfsType == 2"
                      v-model="circulation.zcfmc"
                      label="申请人姓名"
                     placeholder="请输入申请人姓名"
@@ -56,6 +57,7 @@
         />
       </van-popup>
       <van-field
+        v-if="circulation.phrqType == 1"
         disabled
         v-model="xb"
         label="性别"
@@ -63,8 +65,8 @@
         label-width="auto"
       />
       <van-field v-model="circulation.zcfdh" label="联系电话" placeholder="请输入联系电话" input-align="right" label-width="auto" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]" required/>
-      <van-field disabled v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
-      <van-cell title="是否本集体经济组织成员" >
+      <van-field v-if="circulation.phrqType == 1" disabled v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
+      <van-cell v-if="circulation.phrqType == 1" title="是否本集体经济组织成员" >
         <template #right-icon>
           <van-radio-group v-model="circulation.zcfzz" direction="horizontal" >
             <van-radio name="1">是</van-radio>
@@ -142,7 +144,7 @@
       <van-field v-model="circulation.zrfdh" label="经营方电话" placeholder="请输入经营方电话" input-align="right" label-width="auto" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]" required/>
 
     <van-dialog v-model:show="mapShow" show-cancel-button>
-        <MapGisObtain ref="zjdProductResh" :shqrxm="circulation.zcfmc" @closeMoule="closeMoule"></MapGisObtain>
+        <MapGisObtain ref="zjdProductResh" :shqrxm="circulation.zcfmc" :shyqrStatus = "circulation.phfsType" @closeMoule="closeMoule"></MapGisObtain>
     </van-dialog>
 
     </div>
@@ -404,7 +406,7 @@
             hzxm : query,
           };
           this.searchLoading = true;
-          obligeeList({shyqrdbxm:query,status:2}).then((response) => {
+          obligeeList({shyqrdbxm:query,status:this.circulation.phfsType}).then((response) => {
             this.searchLoading = false;
             if (response.code == 200) {
               this.getObligeeOptions = response.rows.map((item) => {
diff --git a/src/views/onlineHome/phfs/hzjy/hzjyAdd.vue b/src/views/onlineHome/phfs/hzjy/hzjyAdd.vue
index ba7c4662..b1f04444 100644
--- a/src/views/onlineHome/phfs/hzjy/hzjyAdd.vue
+++ b/src/views/onlineHome/phfs/hzjy/hzjyAdd.vue
@@ -13,21 +13,50 @@
     <van-form ref="_Form">
     <div class="main_box">
 
-                  <van-field
-                     v-model="circulation.zcfmc"
-                     label="申请人姓名"
-                    placeholder="请输入申请人姓名"
-                     @input="remoteTransfereeMethod"
-                     :rules="[{ required: true }]" required
-                  />
+      <van-field
+        readonly
+        clickable
+        name="picker"
+        v-model="phrqType"
+        label="盘活人群"
+        placeholder="请选择"
+        @click="showPhrq = true"
+        input-align="right"
+        right-icon="arrow-down"
+        label-width="auto" :rules="[{ required: true }]" required
+      />
+      <van-popup v-model="showPhrq" position="bottom">
+        <van-picker
+          show-toolbar
+          :columns="phrqOptions"
+          value-key="dictLabel"
+          @confirm="onPhrqChange"
+          @cancel="showPhrq = false"
+        />
+      </van-popup>
+      <van-field
+        v-if="!zcfmcShow"
+        v-model="circulation.zcfmc"
+        label="申请人姓名"
+        placeholder="请输入申请人姓名"
+        @input="remoteTransfereeMethod"
+        :rules="[{ required: true }]" required
+      />
 
 
-                     <van-cell  v-for="item in getObligeeOptions"
-                       :key="item.shyqrdbxm"
-                      @click="shyqrdmxmChange(item)"
-                    >
-                       {{item.shyqrdbxm}}
-                     </van-cell>
+      <van-cell  v-for="item in getObligeeOptions"
+                 :key="item.shyqrdbxm"
+                 @click="shyqrdmxmChange(item)"
+      >
+        {{item.shyqrdbxm}}
+      </van-cell>
+
+      <van-field
+        v-if="zcfmcShow"
+        v-model="circulation.zcfmc"
+        label="申请人姓名"
+        :rules="[{ required: true }]" required
+      />
 
       <van-popup v-model="showshyqrdm" position="bottom">
         <van-picker
@@ -57,14 +86,15 @@
       </van-popup>
       <van-field
         disabled
+        v-if="zcfxbShow"
         v-model="xb"
         label="性别"
         input-align="right"
         label-width="auto"
       />
-      <van-field v-model="circulation.zcfdh" label="联系电话" placeholder="请输入联系电话" input-align="right" label-width="auto" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]" required/>
-      <van-field disabled v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
-      <van-cell title="是否本集体经济组织成员" >
+      <van-field  v-model="circulation.zcfdh" :disabled="phoneShow" label="联系电话" placeholder="请输入联系电话" input-align="right" label-width="auto" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]" required/>
+      <van-field  v-if="zcfzjhmShow" disabled v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
+      <van-cell v-if="zcfzzShow" title="是否本集体经济组织成员" >
         <template #right-icon>
           <van-radio-group v-model="circulation.zcfzz" direction="horizontal" >
             <van-radio name="1">是</van-radio>
@@ -149,9 +179,9 @@
       <van-field  v-model="circulation.zrfmc" label="合作方姓名" placeholder="请输入经营方姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required />
       <van-field  v-model="circulation.zrfzjhm" label="合作方证件号" placeholder="请输入经营方证件号" input-align="right" label-width="auto"  :rules="[{ required: true }]" required/>
       <van-field v-model="circulation.zrfdh" label="合作方电话" placeholder="请输入经营方电话" input-align="right" label-width="auto" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]" required/>
-    <van-dialog v-model:show="mapShow" show-cancel-button>
-        <MapGisObtain ref="zjdProductResh" :shqrxm="circulation.zcfmc" @closeMoule="closeMoule"></MapGisObtain>
-    </van-dialog>
+      <van-dialog v-model:show="mapShow" show-cancel-button>
+        <MapGisObtain ref="zjdProductResh" :shyqrStatus = "shyqrStatus" :shqrxm="circulation.zcfmc" @closeMoule="closeMoule"></MapGisObtain>
+      </van-dialog>
 
     </div>
     </van-form>
@@ -174,6 +204,7 @@
   import { zjdzd, obligeeList } from "@/api/onlineHome/homestead/circulation";
   import { addPhxxb,updatePhxxb,queryGeoZjdzd } from "@/api/onlineHome/phfs/phfs";
   import { ycsyAdd , listByDeptId } from "@/api/onlineHome/homestead/paidUtilize";
+  import {getInfo} from "@/api/login";
   import MapGisObtain from "@/components/Map/MapGisObtain";
   import {Notify} from "vant";
   export default {
@@ -235,8 +266,17 @@
         showjsrq: false,
         showycsydqsj: false,
         columnsData: [],
-        circulation:{phfs:"04"},
+        circulation:{phfs:"04",phrqType:"1"},
         mapShow: false,
+        showPhrq:false,
+        phoneShow:true,
+        zcfmcShow:false,
+        deptName:"",
+        zcfzjhmShow:true,
+        zcfxbShow:true,
+        zcfzzShow:true,
+        shyqrStatus:"1",
+        phrqOptions:[],
       };
     },
     created() {
@@ -274,6 +314,11 @@
               this.bcfsDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
             }
           });
+        //盘活人群
+        this.houseGetDicts("sqph_type").then(res => {
+          this.phrqOptions = res.data;
+          this.phrqType = this.selectDictLabel(res.data, this.circulation.phrqType);
+        });
           //宅基地代码
           zjdzd().then(zjdRes => {
             for (let i = 0; i < zjdRes.rows.length; i++) {
@@ -286,6 +331,9 @@
               this.shyqrdmDictionaries.push(zjdRes.rows[i].shyqrdm);
             }
           });
+        getInfo().then(response => {
+          this.deptName = response.user.deptName;
+        });
       },
       plusOrMinus(values) {
         let newValue
@@ -374,6 +422,31 @@
           }
         });
       },
+      onPhrqChange(val){
+        this.circulation.zjddm = null;
+        this.circulation.zcfzjhm = null;
+        this.circulation.zcfxb = null;
+        this.circulation.zcfdh = null;
+        this.phrqType = val.dictLabel
+        if(val.dictValue === "1"){
+          this.circulation.zcfmc = null;
+          this.zcfmcShow = false;
+          this.phoneShow = true;
+          this.zcfzjhmShow = true;
+          this.zcfxbShow = true;
+          this.zcfzzShow = true;
+          this.shyqrStatus = "1";
+        }else{
+          this.zcfmcShow = true;
+          this.phoneShow = false;
+          this.zcfzjhmShow = false;
+          this.zcfxbShow = false;
+          this.zcfzzShow = false;
+          this.circulation.zcfmc = this.deptName+"村集体";
+          this.shyqrStatus = "2";
+        }
+        this.showPhrq = false;
+      },
       /** 模糊查询人员信息 */
       remoteTransfereeMethod(query) {
         let _this = this;
@@ -382,7 +455,7 @@
             hzxm : query,
           };
           this.searchLoading = true;
-          obligeeList({shyqrdbxm:query,status:2}).then((response) => {
+          obligeeList({shyqrdbxm:query,status:this.shyqrStatus}).then((response) => {
             this.searchLoading = false;
             if (response.code == 200) {
               this.getObligeeOptions = response.rows.map((item) => {
diff --git a/src/views/onlineHome/phfs/hzjy/hzjyDetails.vue b/src/views/onlineHome/phfs/hzjy/hzjyDetails.vue
index ce20f247..5b0ad0a0 100644
--- a/src/views/onlineHome/phfs/hzjy/hzjyDetails.vue
+++ b/src/views/onlineHome/phfs/hzjy/hzjyDetails.vue
@@ -56,6 +56,7 @@
         />
       </van-popup>
       <van-field
+        v-if="circulation.phrqType == 1"
         readonly
         v-model="circulation.zcfxb"
         label="性别"
@@ -63,8 +64,8 @@
         label-width="auto"
       />
       <van-field readonly v-model="circulation.zcfdh" label="联系电话" placeholder="请输入联系电话" input-align="right" label-width="auto" />
-      <van-field readonly v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
-      <van-cell title="是否本集体经济组织成员" >
+      <van-field  v-if="circulation.phrqType == 1" readonly v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
+      <van-cell  v-if="circulation.phrqType == 1" title="是否本集体经济组织成员" >
         <template #right-icon>
           <van-radio-group disabled v-model="circulation.zcfzz" direction="horizontal" >
             <van-radio name="1">是</van-radio>
diff --git a/src/views/onlineHome/phfs/hzjy/hzjyModify.vue b/src/views/onlineHome/phfs/hzjy/hzjyModify.vue
index d31e599a..25e64cae 100644
--- a/src/views/onlineHome/phfs/hzjy/hzjyModify.vue
+++ b/src/views/onlineHome/phfs/hzjy/hzjyModify.vue
@@ -14,6 +14,7 @@
     <div class="main_box">
 
                   <van-field
+                    :disabled="circulation.phfsType == 2"
                      v-model="circulation.zcfmc"
                      label="申请人姓名"
                     placeholder="请输入申请人姓名"
@@ -56,6 +57,7 @@
         />
       </van-popup>
       <van-field
+        v-if="circulation.phrqType == 1"
         disabled
         v-model="xb"
         label="性别"
@@ -63,8 +65,8 @@
         label-width="auto"
       />
       <van-field v-model="circulation.zcfdh" label="联系电话" placeholder="请输入联系电话" input-align="right" label-width="auto" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]" required/>
-      <van-field disabled v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
-      <van-cell title="是否本集体经济组织成员" >
+      <van-field v-if="circulation.phrqType == 1"  disabled v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
+      <van-cell  v-if="circulation.phrqType == 1" title="是否本集体经济组织成员" >
         <template #right-icon>
           <van-radio-group v-model="circulation.zcfzz" direction="horizontal" >
             <van-radio name="1">是</van-radio>
@@ -142,7 +144,7 @@
       <van-field v-model="circulation.zrfdh" label="合作方电话" placeholder="请输入合作方电话" input-align="right" label-width="auto" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]" required/>
 
     <van-dialog v-model:show="mapShow" show-cancel-button>
-        <MapGisObtain ref="zjdProductResh" :shqrxm="circulation.zcfmc" @closeMoule="closeMoule"></MapGisObtain>
+        <MapGisObtain ref="zjdProductResh" :shqrxm="circulation.zcfmc" :shyqrStatus = "circulation.phfsType" @closeMoule="closeMoule"></MapGisObtain>
     </van-dialog>
 
     </div>
@@ -404,7 +406,7 @@
             hzxm : query,
           };
           this.searchLoading = true;
-          obligeeList({shyqrdbxm:query,status:2}).then((response) => {
+          obligeeList({shyqrdbxm:query,status:this.circulation.phfsType}).then((response) => {
             this.searchLoading = false;
             if (response.code == 200) {
               this.getObligeeOptions = response.rows.map((item) => {
diff --git a/src/views/onlineHome/phfs/rgjy/rgjyAdd.vue b/src/views/onlineHome/phfs/rgjy/rgjyAdd.vue
index 5eae104f..224a3175 100644
--- a/src/views/onlineHome/phfs/rgjy/rgjyAdd.vue
+++ b/src/views/onlineHome/phfs/rgjy/rgjyAdd.vue
@@ -13,21 +13,50 @@
     <van-form ref="_Form">
     <div class="main_box">
 
-                  <van-field
-                     v-model="circulation.zcfmc"
-                     label="申请人姓名"
-                    placeholder="请输入申请人姓名"
-                     @input="remoteTransfereeMethod"
-                     :rules="[{ required: true }]" required
-                  />
+      <van-field
+        readonly
+        clickable
+        name="picker"
+        v-model="phrqType"
+        label="盘活人群"
+        placeholder="请选择"
+        @click="showPhrq = true"
+        input-align="right"
+        right-icon="arrow-down"
+        label-width="auto" :rules="[{ required: true }]" required
+      />
+      <van-popup v-model="showPhrq" position="bottom">
+        <van-picker
+          show-toolbar
+          :columns="phrqOptions"
+          value-key="dictLabel"
+          @confirm="onPhrqChange"
+          @cancel="showPhrq = false"
+        />
+      </van-popup>
+      <van-field
+        v-if="!zcfmcShow"
+        v-model="circulation.zcfmc"
+        label="申请人姓名"
+        placeholder="请输入申请人姓名"
+        @input="remoteTransfereeMethod"
+        :rules="[{ required: true }]" required
+      />
 
 
-                     <van-cell  v-for="item in getObligeeOptions"
-                       :key="item.shyqrdbxm"
-                      @click="shyqrdmxmChange(item)"
-                    >
-                       {{item.shyqrdbxm}}
-                     </van-cell>
+      <van-cell  v-for="item in getObligeeOptions"
+                 :key="item.shyqrdbxm"
+                 @click="shyqrdmxmChange(item)"
+      >
+        {{item.shyqrdbxm}}
+      </van-cell>
+
+      <van-field
+        v-if="zcfmcShow"
+        v-model="circulation.zcfmc"
+        label="申请人姓名"
+        :rules="[{ required: true }]" required
+      />
 
       <van-popup v-model="showshyqrdm" position="bottom">
         <van-picker
@@ -57,14 +86,15 @@
       </van-popup>
       <van-field
         disabled
+        v-if="zcfxbShow"
         v-model="xb"
         label="性别"
         input-align="right"
         label-width="auto"
       />
-      <van-field v-model="circulation.zcfdh" label="联系电话" placeholder="请输入联系电话" input-align="right" label-width="auto" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]" required/>
-      <van-field disabled v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
-      <van-cell title="是否本集体经济组织成员" >
+      <van-field  v-model="circulation.zcfdh" :disabled="phoneShow" label="联系电话" placeholder="请输入联系电话" input-align="right" label-width="auto" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]" required/>
+      <van-field  v-if="zcfzjhmShow" disabled v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
+      <van-cell v-if="zcfzzShow" title="是否本集体经济组织成员" >
         <template #right-icon>
           <van-radio-group v-model="circulation.zcfzz" direction="horizontal" >
             <van-radio name="1">是</van-radio>
@@ -149,9 +179,9 @@
       <van-field  v-model="circulation.zrfmc" label="经营方姓名" placeholder="请输入经营方姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required />
       <van-field  v-model="circulation.zrfzjhm" label="经营方证件号" placeholder="请输入经营方证件号" input-align="right" label-width="auto"  :rules="[{ required: true }]" required/>
       <van-field v-model="circulation.zrfdh" label="经营方电话" placeholder="请输入经营方电话" input-align="right" label-width="auto" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]" required/>
-    <van-dialog v-model:show="mapShow" show-cancel-button>
-        <MapGisObtain ref="zjdProductResh" :shqrxm="circulation.zcfmc" @closeMoule="closeMoule"></MapGisObtain>
-    </van-dialog>
+      <van-dialog v-model:show="mapShow" show-cancel-button>
+        <MapGisObtain ref="zjdProductResh" :shyqrStatus = "shyqrStatus" :shqrxm="circulation.zcfmc" @closeMoule="closeMoule"></MapGisObtain>
+      </van-dialog>
 
     </div>
     </van-form>
@@ -174,6 +204,7 @@
   import { zjdzd, obligeeList } from "@/api/onlineHome/homestead/circulation";
   import { addPhxxb,updatePhxxb,queryGeoZjdzd } from "@/api/onlineHome/phfs/phfs";
   import { ycsyAdd , listByDeptId } from "@/api/onlineHome/homestead/paidUtilize";
+  import {getInfo} from "@/api/login";
   import MapGisObtain from "@/components/Map/MapGisObtain";
   import {Notify} from "vant";
   export default {
@@ -235,8 +266,17 @@
         showjsrq: false,
         showycsydqsj: false,
         columnsData: [],
-        circulation:{phfs:"03"},
+        circulation:{phfs:"03",phrqType:"1"},
         mapShow: false,
+        showPhrq:false,
+        phoneShow:true,
+        zcfmcShow:false,
+        deptName:"",
+        zcfzjhmShow:true,
+        zcfxbShow:true,
+        zcfzzShow:true,
+        shyqrStatus:"1",
+        phrqOptions:[],
       };
     },
     created() {
@@ -274,6 +314,11 @@
               this.bcfsDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
             }
           });
+        //盘活人群
+        this.houseGetDicts("sqph_type").then(res => {
+          this.phrqOptions = res.data;
+          this.phrqType = this.selectDictLabel(res.data, this.circulation.phrqType);
+        });
           //宅基地代码
           zjdzd().then(zjdRes => {
             for (let i = 0; i < zjdRes.rows.length; i++) {
@@ -286,6 +331,9 @@
               this.shyqrdmDictionaries.push(zjdRes.rows[i].shyqrdm);
             }
           });
+        getInfo().then(response => {
+          this.deptName = response.user.deptName;
+        });
       },
       plusOrMinus(values) {
         let newValue
@@ -374,6 +422,31 @@
           }
         });
       },
+      onPhrqChange(val){
+        this.circulation.zjddm = null;
+        this.circulation.zcfzjhm = null;
+        this.circulation.zcfxb = null;
+        this.circulation.zcfdh = null;
+        this.phrqType = val.dictLabel
+        if(val.dictValue === "1"){
+          this.circulation.zcfmc = null;
+          this.zcfmcShow = false;
+          this.phoneShow = true;
+          this.zcfzjhmShow = true;
+          this.zcfxbShow = true;
+          this.zcfzzShow = true;
+          this.shyqrStatus = "1";
+        }else{
+          this.zcfmcShow = true;
+          this.phoneShow = false;
+          this.zcfzjhmShow = false;
+          this.zcfxbShow = false;
+          this.zcfzzShow = false;
+          this.circulation.zcfmc = this.deptName+"村集体";
+          this.shyqrStatus = "2";
+        }
+        this.showPhrq = false;
+      },
       /** 模糊查询人员信息 */
       remoteTransfereeMethod(query) {
         let _this = this;
@@ -382,7 +455,7 @@
             hzxm : query,
           };
           this.searchLoading = true;
-          obligeeList({shyqrdbxm:query,status:2}).then((response) => {
+          obligeeList({shyqrdbxm:query,status:this.shyqrStatus}).then((response) => {
             this.searchLoading = false;
             if (response.code == 200) {
               this.getObligeeOptions = response.rows.map((item) => {
diff --git a/src/views/onlineHome/phfs/rgjy/rgjyDetails.vue b/src/views/onlineHome/phfs/rgjy/rgjyDetails.vue
index a483eb12..50da0d2a 100644
--- a/src/views/onlineHome/phfs/rgjy/rgjyDetails.vue
+++ b/src/views/onlineHome/phfs/rgjy/rgjyDetails.vue
@@ -56,6 +56,7 @@
         />
       </van-popup>
       <van-field
+        v-if="circulation.phrqType == 1"
         readonly
         v-model="circulation.zcfxb"
         label="性别"
@@ -63,8 +64,8 @@
         label-width="auto"
       />
       <van-field readonly v-model="circulation.zcfdh" label="联系电话" placeholder="请输入联系电话" input-align="right" label-width="auto" />
-      <van-field readonly v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
-      <van-cell title="是否本集体经济组织成员" >
+      <van-field  v-if="circulation.phrqType == 1" readonly v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
+      <van-cell  v-if="circulation.phrqType == 1" title="是否本集体经济组织成员" >
         <template #right-icon>
           <van-radio-group disabled v-model="circulation.zcfzz" direction="horizontal" >
             <van-radio name="1">是</van-radio>
diff --git a/src/views/onlineHome/phfs/rgjy/rgjyModify.vue b/src/views/onlineHome/phfs/rgjy/rgjyModify.vue
index f3fe94dd..b49158f0 100644
--- a/src/views/onlineHome/phfs/rgjy/rgjyModify.vue
+++ b/src/views/onlineHome/phfs/rgjy/rgjyModify.vue
@@ -14,6 +14,7 @@
     <div class="main_box">
 
                   <van-field
+                    :disabled="circulation.phfsType == 2"
                      v-model="circulation.zcfmc"
                      label="申请人姓名"
                     placeholder="请输入申请人姓名"
@@ -56,6 +57,7 @@
         />
       </van-popup>
       <van-field
+        v-if="circulation.phrqType == 1"
         disabled
         v-model="xb"
         label="性别"
@@ -63,8 +65,8 @@
         label-width="auto"
       />
       <van-field v-model="circulation.zcfdh" label="联系电话" placeholder="请输入联系电话" input-align="right" label-width="auto" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]" required/>
-      <van-field disabled v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
-      <van-cell title="是否本集体经济组织成员" >
+      <van-field v-if="circulation.phrqType == 1" disabled v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
+      <van-cell v-if="circulation.phrqType == 1" title="是否本集体经济组织成员" >
         <template #right-icon>
           <van-radio-group v-model="circulation.zcfzz" direction="horizontal" >
             <van-radio name="1">是</van-radio>
@@ -142,7 +144,7 @@
       <van-field v-model="circulation.zrfdh" label="经营方电话" placeholder="请输入经营方电话" input-align="right" label-width="auto" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]" required/>
 
     <van-dialog v-model:show="mapShow" show-cancel-button>
-        <MapGisObtain ref="zjdProductResh" :shqrxm="circulation.zcfmc" @closeMoule="closeMoule"></MapGisObtain>
+        <MapGisObtain ref="zjdProductResh" :shqrxm="circulation.zcfmc" :shyqrStatus = "circulation.phfsType" @closeMoule="closeMoule"></MapGisObtain>
     </van-dialog>
 
     </div>
@@ -404,7 +406,7 @@
             hzxm : query,
           };
           this.searchLoading = true;
-          obligeeList({shyqrdbxm:query,status:2}).then((response) => {
+          obligeeList({shyqrdbxm:query,status:this.circulation.phfsType}).then((response) => {
             this.searchLoading = false;
             if (response.code == 200) {
               this.getObligeeOptions = response.rows.map((item) => {
diff --git a/src/views/onlineHome/phfs/zzjy/zzjyAdd.vue b/src/views/onlineHome/phfs/zzjy/zzjyAdd.vue
index 63017f83..78ad8b95 100644
--- a/src/views/onlineHome/phfs/zzjy/zzjyAdd.vue
+++ b/src/views/onlineHome/phfs/zzjy/zzjyAdd.vue
@@ -13,21 +13,50 @@
     <van-form ref="_Form">
     <div class="main_box">
 
-                  <van-field
-                     v-model="circulation.zcfmc"
-                     label="申请人姓名"
-                    placeholder="请输入申请人姓名"
-                     @input="remoteTransfereeMethod"
-                     :rules="[{ required: true }]" required
-                  />
+      <van-field
+        readonly
+        clickable
+        name="picker"
+        v-model="phrqType"
+        label="盘活人群"
+        placeholder="请选择"
+        @click="showPhrq = true"
+        input-align="right"
+        right-icon="arrow-down"
+        label-width="auto" :rules="[{ required: true }]" required
+      />
+      <van-popup v-model="showPhrq" position="bottom">
+        <van-picker
+          show-toolbar
+          :columns="phrqOptions"
+          value-key="dictLabel"
+          @confirm="onPhrqChange"
+          @cancel="showPhrq = false"
+        />
+      </van-popup>
+      <van-field
+        v-if="!zcfmcShow"
+        v-model="circulation.zcfmc"
+        label="申请人姓名"
+        placeholder="请输入申请人姓名"
+        @input="remoteTransfereeMethod"
+        :rules="[{ required: true }]" required
+      />
 
 
-                     <van-cell  v-for="item in getObligeeOptions"
-                       :key="item.shyqrdbxm"
-                      @click="shyqrdmxmChange(item)"
-                    >
-                       {{item.shyqrdbxm}}
-                     </van-cell>
+      <van-cell  v-for="item in getObligeeOptions"
+                 :key="item.shyqrdbxm"
+                 @click="shyqrdmxmChange(item)"
+      >
+        {{item.shyqrdbxm}}
+      </van-cell>
+
+      <van-field
+        v-if="zcfmcShow"
+        v-model="circulation.zcfmc"
+        label="申请人姓名"
+        :rules="[{ required: true }]" required
+      />
 
       <van-popup v-model="showshyqrdm" position="bottom">
         <van-picker
@@ -57,14 +86,15 @@
       </van-popup>
       <van-field
         disabled
+        v-if="zcfxbShow"
         v-model="xb"
         label="性别"
         input-align="right"
         label-width="auto"
       />
-      <van-field v-model="circulation.zcfdh" label="联系电话" placeholder="请输入联系电话" input-align="right" label-width="auto" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]" required/>
-      <van-field disabled v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
-      <van-cell title="是否本集体经济组织成员" >
+      <van-field  v-model="circulation.zcfdh" :disabled="phoneShow" label="联系电话" placeholder="请输入联系电话" input-align="right" label-width="auto" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]" required/>
+      <van-field  v-if="zcfzjhmShow" disabled v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
+      <van-cell v-if="zcfzzShow" title="是否本集体经济组织成员" >
         <template #right-icon>
           <van-radio-group v-model="circulation.zcfzz" direction="horizontal" >
             <van-radio name="1">是</van-radio>
@@ -105,9 +135,9 @@
       <van-field v-model="circulation.fwms" type="textarea" label="地上房屋描述" placeholder="请输入地上房屋描述" input-align="right" label-width="auto" />
       <van-field v-model="circulation.bz" type="textarea" label="备注" placeholder="请输入备注" input-align="right" label-width="auto" />
 
-    <van-dialog v-model:show="mapShow" show-cancel-button>
-        <MapGisObtain ref="zjdProductResh" :shqrxm="circulation.zcfmc" @closeMoule="closeMoule"></MapGisObtain>
-    </van-dialog>
+      <van-dialog v-model:show="mapShow" show-cancel-button>
+        <MapGisObtain ref="zjdProductResh" :shyqrStatus = "shyqrStatus" :shqrxm="circulation.zcfmc" @closeMoule="closeMoule"></MapGisObtain>
+      </van-dialog>
 
     </div>
     </van-form>
@@ -130,6 +160,7 @@
   import { zjdzd, obligeeList } from "@/api/onlineHome/homestead/circulation";
   import { addPhxxb,updatePhxxb,queryGeoZjdzd } from "@/api/onlineHome/phfs/phfs";
   import { ycsyAdd , listByDeptId } from "@/api/onlineHome/homestead/paidUtilize";
+  import {getInfo} from "@/api/login";
   import MapGisObtain from "@/components/Map/MapGisObtain";
   import {Notify} from "vant";
   export default {
@@ -189,8 +220,17 @@
         showbasj: false,
         showycsydqsj: false,
         columnsData: [],
-        circulation:{phfs:"01"},
+        circulation:{phfs:"01",phrqType:"1"},
         mapShow: false,
+        showPhrq:false,
+        phoneShow:true,
+        zcfmcShow:false,
+        deptName:"",
+        zcfzjhmShow:true,
+        zcfxbShow:true,
+        zcfzzShow:true,
+        shyqrStatus:"1",
+        phrqOptions:[],
       };
     },
     created() {
@@ -228,6 +268,14 @@
               this.bcfsDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
             }
           });
+          //盘活人群
+          this.houseGetDicts("sqph_type").then(res => {
+            this.phrqOptions = res.data;
+            this.phrqType = this.selectDictLabel(res.data, this.circulation.phrqType);
+          });
+          getInfo().then(response => {
+            this.deptName = response.user.deptName;
+          });
           //宅基地代码
           zjdzd().then(zjdRes => {
             for (let i = 0; i < zjdRes.rows.length; i++) {
@@ -345,6 +393,31 @@
           }
         });
       },
+      onPhrqChange(val){
+        this.circulation.zjddm = null;
+        this.circulation.zcfzjhm = null;
+        this.circulation.zcfxb = null;
+        this.circulation.zcfdh = null;
+        this.phrqType = val.dictLabel
+        if(val.dictValue === "1"){
+          this.circulation.zcfmc = null;
+          this.zcfmcShow = false;
+          this.phoneShow = true;
+          this.zcfzjhmShow = true;
+          this.zcfxbShow = true;
+          this.zcfzzShow = true;
+          this.shyqrStatus = "1";
+        }else{
+          this.zcfmcShow = true;
+          this.phoneShow = false;
+          this.zcfzjhmShow = false;
+          this.zcfxbShow = false;
+          this.zcfzzShow = false;
+          this.circulation.zcfmc = this.deptName+"村集体";
+          this.shyqrStatus = "2";
+        }
+        this.showPhrq = false;
+      },
       /** 模糊查询人员信息 */
       remoteTransfereeMethod(query) {
         let _this = this;
@@ -353,7 +426,7 @@
             hzxm : query,
           };
           this.searchLoading = true;
-          obligeeList({shyqrdbxm:query,status:2}).then((response) => {
+          obligeeList({shyqrdbxm:query,status:this.shyqrStatus}).then((response) => {
             this.searchLoading = false;
             if (response.code == 200) {
               this.getObligeeOptions = response.rows.map((item) => {
diff --git a/src/views/onlineHome/phfs/zzjy/zzjyDetails.vue b/src/views/onlineHome/phfs/zzjy/zzjyDetails.vue
index 3457669f..64e8a890 100644
--- a/src/views/onlineHome/phfs/zzjy/zzjyDetails.vue
+++ b/src/views/onlineHome/phfs/zzjy/zzjyDetails.vue
@@ -56,6 +56,7 @@
         />
       </van-popup>
       <van-field
+        v-if="circulation.phrqType == 1"
         readonly
         v-model="circulation.zcfxb"
         label="性别"
@@ -63,8 +64,8 @@
         label-width="auto"
       />
       <van-field readonly v-model="circulation.zcfdh" label="联系电话" placeholder="请输入联系电话" input-align="right" label-width="auto" />
-      <van-field readonly v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
-      <van-cell title="是否本集体经济组织成员" >
+      <van-field  v-if="circulation.phrqType == 1" readonly v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
+      <van-cell  v-if="circulation.phrqType == 1" title="是否本集体经济组织成员" >
         <template #right-icon>
           <van-radio-group disabled v-model="circulation.zcfzz" direction="horizontal" >
             <van-radio name="1">是</van-radio>
diff --git a/src/views/onlineHome/phfs/zzjy/zzjyModify.vue b/src/views/onlineHome/phfs/zzjy/zzjyModify.vue
index 1cca4af5..4f205f98 100644
--- a/src/views/onlineHome/phfs/zzjy/zzjyModify.vue
+++ b/src/views/onlineHome/phfs/zzjy/zzjyModify.vue
@@ -14,6 +14,7 @@
     <div class="main_box">
 
                   <van-field
+                    :disabled="circulation.phfsType == 2"
                      v-model="circulation.zcfmc"
                      label="申请人姓名"
                     placeholder="请输入申请人姓名"
@@ -56,6 +57,7 @@
         />
       </van-popup>
       <van-field
+        v-if="circulation.phrqType == 1"
         disabled
         v-model="xb"
         label="性别"
@@ -63,8 +65,8 @@
         label-width="auto"
       />
       <van-field v-model="circulation.zcfdh" label="联系电话" placeholder="请输入联系电话" input-align="right" label-width="auto" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]" required/>
-      <van-field disabled v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
-      <van-cell title="是否本集体经济组织成员" >
+      <van-field v-if="circulation.phrqType == 1" disabled v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
+      <van-cell v-if="circulation.phrqType == 1" title="是否本集体经济组织成员" >
         <template #right-icon>
           <van-radio-group v-model="circulation.zcfzz" direction="horizontal" >
             <van-radio name="1">是</van-radio>
@@ -106,7 +108,7 @@
       <van-field v-model="circulation.bz" type="textarea" label="备注" placeholder="请输入备注" input-align="right" label-width="auto" />
 
     <van-dialog v-model:show="mapShow" show-cancel-button>
-        <MapGisObtain ref="zjdProductResh" :shqrxm="circulation.zcfmc" @closeMoule="closeMoule"></MapGisObtain>
+        <MapGisObtain ref="zjdProductResh" :shqrxm="circulation.zcfmc" :shyqrStatus = "circulation.phfsType" @closeMoule="closeMoule"></MapGisObtain>
     </van-dialog>
 
     </div>
@@ -359,7 +361,7 @@
             hzxm : query,
           };
           this.searchLoading = true;
-          obligeeList({shyqrdbxm:query,status:2}).then((response) => {
+          obligeeList({shyqrdbxm:query,status:this.circulation.phfsType}).then((response) => {
             this.searchLoading = false;
             if (response.code == 200) {
               this.getObligeeOptions = response.rows.map((item) => {
diff --git a/src/views/onlineHome/phfs/zzly/zzlyAdd.vue b/src/views/onlineHome/phfs/zzly/zzlyAdd.vue
index f9c1b77c..a6f70063 100644
--- a/src/views/onlineHome/phfs/zzly/zzlyAdd.vue
+++ b/src/views/onlineHome/phfs/zzly/zzlyAdd.vue
@@ -13,21 +13,50 @@
     <van-form ref="_Form">
     <div class="main_box">
 
-                  <van-field
-                     v-model="circulation.zcfmc"
-                     label="申请人姓名"
-                    placeholder="请输入申请人姓名"
-                     @input="remoteTransfereeMethod"
-                     :rules="[{ required: true }]" required
-                  />
+      <van-field
+        readonly
+        clickable
+        name="picker"
+        v-model="phrqType"
+        label="盘活人群"
+        placeholder="请选择"
+        @click="showPhrq = true"
+        input-align="right"
+        right-icon="arrow-down"
+        label-width="auto" :rules="[{ required: true }]" required
+      />
+      <van-popup v-model="showPhrq" position="bottom">
+        <van-picker
+          show-toolbar
+          :columns="phrqOptions"
+          value-key="dictLabel"
+          @confirm="onPhrqChange"
+          @cancel="showPhrq = false"
+        />
+      </van-popup>
+      <van-field
+        v-if="!zcfmcShow"
+        v-model="circulation.zcfmc"
+        label="申请人姓名"
+        placeholder="请输入申请人姓名"
+        @input="remoteTransfereeMethod"
+        :rules="[{ required: true }]" required
+      />
 
 
-                     <van-cell  v-for="item in getObligeeOptions"
-                       :key="item.shyqrdbxm"
-                      @click="shyqrdmxmChange(item)"
-                    >
-                       {{item.shyqrdbxm}}
-                     </van-cell>
+      <van-cell  v-for="item in getObligeeOptions"
+                 :key="item.shyqrdbxm"
+                 @click="shyqrdmxmChange(item)"
+      >
+        {{item.shyqrdbxm}}
+      </van-cell>
+
+      <van-field
+        v-if="zcfmcShow"
+        v-model="circulation.zcfmc"
+        label="申请人姓名"
+        :rules="[{ required: true }]" required
+      />
 
       <van-popup v-model="showshyqrdm" position="bottom">
         <van-picker
@@ -57,14 +86,15 @@
       </van-popup>
       <van-field
         disabled
+        v-if="zcfxbShow"
         v-model="xb"
         label="性别"
         input-align="right"
         label-width="auto"
       />
-      <van-field v-model="circulation.zcfdh" label="联系电话" placeholder="请输入联系电话" input-align="right" label-width="auto" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]" required/>
-      <van-field disabled v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
-      <van-cell title="是否本集体经济组织成员" >
+      <van-field  v-model="circulation.zcfdh" :disabled="phoneShow" label="联系电话" placeholder="请输入联系电话" input-align="right" label-width="auto" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]" required/>
+      <van-field  v-if="zcfzjhmShow" disabled v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
+      <van-cell v-if="zcfzzShow" title="是否本集体经济组织成员" >
         <template #right-icon>
           <van-radio-group v-model="circulation.zcfzz" direction="horizontal" >
             <van-radio name="1">是</van-radio>
@@ -105,9 +135,9 @@
       <van-field v-model="circulation.fwms" type="textarea" label="地上房屋描述" placeholder="请输入地上房屋描述" input-align="right" label-width="auto" />
       <van-field v-model="circulation.bz" type="textarea" label="备注" placeholder="请输入备注" input-align="right" label-width="auto" />
 
-    <van-dialog v-model:show="mapShow" show-cancel-button>
-        <MapGisObtain ref="zjdProductResh" :shqrxm="circulation.zcfmc" @closeMoule="closeMoule"></MapGisObtain>
-    </van-dialog>
+      <van-dialog v-model:show="mapShow" show-cancel-button>
+        <MapGisObtain ref="zjdProductResh" :shyqrStatus = "shyqrStatus" :shqrxm="circulation.zcfmc" @closeMoule="closeMoule"></MapGisObtain>
+      </van-dialog>
 
     </div>
     </van-form>
@@ -130,6 +160,7 @@
   import { zjdzd, obligeeList } from "@/api/onlineHome/homestead/circulation";
   import { addPhxxb,updatePhxxb,queryGeoZjdzd } from "@/api/onlineHome/phfs/phfs";
   import { ycsyAdd , listByDeptId } from "@/api/onlineHome/homestead/paidUtilize";
+  import {getInfo} from "@/api/login";
   import MapGisObtain from "@/components/Map/MapGisObtain";
   import {Notify} from "vant";
   export default {
@@ -189,8 +220,17 @@
         showbasj: false,
         showycsydqsj: false,
         columnsData: [],
-        circulation:{phfs:"05"},
+        circulation:{phfs:"05",phrqType:"1"},
         mapShow: false,
+        showPhrq:false,
+        phoneShow:true,
+        zcfmcShow:false,
+        deptName:"",
+        zcfzjhmShow:true,
+        zcfxbShow:true,
+        zcfzzShow:true,
+        shyqrStatus:"1",
+        phrqOptions:[],
       };
     },
     created() {
@@ -228,6 +268,14 @@
               this.bcfsDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
             }
           });
+        //盘活人群
+        this.houseGetDicts("sqph_type").then(res => {
+          this.phrqOptions = res.data;
+          this.phrqType = this.selectDictLabel(res.data, this.circulation.phrqType);
+        });
+        getInfo().then(response => {
+          this.deptName = response.user.deptName;
+        });
           //宅基地代码
           zjdzd().then(zjdRes => {
             for (let i = 0; i < zjdRes.rows.length; i++) {
@@ -345,6 +393,31 @@
           }
         });
       },
+      onPhrqChange(val){
+        this.circulation.zjddm = null;
+        this.circulation.zcfzjhm = null;
+        this.circulation.zcfxb = null;
+        this.circulation.zcfdh = null;
+        this.phrqType = val.dictLabel
+        if(val.dictValue === "1"){
+          this.circulation.zcfmc = null;
+          this.zcfmcShow = false;
+          this.phoneShow = true;
+          this.zcfzjhmShow = true;
+          this.zcfxbShow = true;
+          this.zcfzzShow = true;
+          this.shyqrStatus = "1";
+        }else{
+          this.zcfmcShow = true;
+          this.phoneShow = false;
+          this.zcfzjhmShow = false;
+          this.zcfxbShow = false;
+          this.zcfzzShow = false;
+          this.circulation.zcfmc = this.deptName+"村集体";
+          this.shyqrStatus = "2";
+        }
+        this.showPhrq = false;
+      },
       /** 模糊查询人员信息 */
       remoteTransfereeMethod(query) {
         let _this = this;
@@ -353,7 +426,7 @@
             hzxm : query,
           };
           this.searchLoading = true;
-          obligeeList({shyqrdbxm:query,status:2}).then((response) => {
+          obligeeList({shyqrdbxm:query,status:this.shyqrStatus}).then((response) => {
             this.searchLoading = false;
             if (response.code == 200) {
               this.getObligeeOptions = response.rows.map((item) => {
diff --git a/src/views/onlineHome/phfs/zzly/zzlyDetails.vue b/src/views/onlineHome/phfs/zzly/zzlyDetails.vue
index 22cd59bb..321f64c4 100644
--- a/src/views/onlineHome/phfs/zzly/zzlyDetails.vue
+++ b/src/views/onlineHome/phfs/zzly/zzlyDetails.vue
@@ -56,6 +56,7 @@
         />
       </van-popup>
       <van-field
+        v-if="circulation.phrqType == 1"
         readonly
         v-model="circulation.zcfxb"
         label="性别"
@@ -63,8 +64,8 @@
         label-width="auto"
       />
       <van-field readonly v-model="circulation.zcfdh" label="联系电话" placeholder="请输入联系电话" input-align="right" label-width="auto" />
-      <van-field readonly v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
-      <van-cell title="是否本集体经济组织成员" >
+      <van-field  v-if="circulation.phrqType == 1" readonly v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
+      <van-cell  v-if="circulation.phrqType == 1" title="是否本集体经济组织成员" >
         <template #right-icon>
           <van-radio-group disabled v-model="circulation.zcfzz" direction="horizontal" >
             <van-radio name="1">是</van-radio>
diff --git a/src/views/onlineHome/phfs/zzly/zzlyModify.vue b/src/views/onlineHome/phfs/zzly/zzlyModify.vue
index e493b573..9415f24e 100644
--- a/src/views/onlineHome/phfs/zzly/zzlyModify.vue
+++ b/src/views/onlineHome/phfs/zzly/zzlyModify.vue
@@ -14,6 +14,7 @@
     <div class="main_box">
 
                   <van-field
+                    :disabled="circulation.phfsType == 2"
                      v-model="circulation.zcfmc"
                      label="申请人姓名"
                     placeholder="请输入申请人姓名"
@@ -21,7 +22,6 @@
                      :rules="[{ required: true }]" required
                   />
 
-
                      <van-cell  v-for="item in getObligeeOptions"
                        :key="item.shyqrdbxm"
                       @click="shyqrdmxmChange(item)"
@@ -56,6 +56,7 @@
         />
       </van-popup>
       <van-field
+        v-if="circulation.phrqType == 1"
         disabled
         v-model="xb"
         label="性别"
@@ -63,8 +64,8 @@
         label-width="auto"
       />
       <van-field v-model="circulation.zcfdh" label="联系电话" placeholder="请输入联系电话" input-align="right" label-width="auto" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]" required/>
-      <van-field disabled v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
-      <van-cell title="是否本集体经济组织成员" >
+      <van-field v-if="circulation.phrqType == 1" disabled v-model="circulation.zcfzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" />
+      <van-cell v-if="circulation.phrqType == 1" title="是否本集体经济组织成员" >
         <template #right-icon>
           <van-radio-group v-model="circulation.zcfzz" direction="horizontal" >
             <van-radio name="1">是</van-radio>
@@ -106,7 +107,7 @@
       <van-field v-model="circulation.bz" type="textarea" label="备注" placeholder="请输入备注" input-align="right" label-width="auto" />
 
     <van-dialog v-model:show="mapShow" show-cancel-button>
-        <MapGisObtain ref="zjdProductResh" :shqrxm="circulation.zcfmc" @closeMoule="closeMoule"></MapGisObtain>
+        <MapGisObtain ref="zjdProductResh" :shqrxm="circulation.zcfmc" :shyqrStatus = "circulation.phfsType" @closeMoule="closeMoule"></MapGisObtain>
     </van-dialog>
 
     </div>
@@ -358,7 +359,7 @@
             hzxm : query,
           };
           this.searchLoading = true;
-          obligeeList({shyqrdbxm:query,status:2}).then((response) => {
+          obligeeList({shyqrdbxm:query,status:this.circulation.phfsType}).then((response) => {
             this.searchLoading = false;
             if (response.code == 200) {
               this.getObligeeOptions = response.rows.map((item) => {