From edd7ae27e7f335f2e479bf2cd8a01922b10464dc Mon Sep 17 00:00:00 2001
From: xuyuanqing <392009588@qq.com>
Date: Thu, 21 Dec 2023 13:24:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83=E6=9F=A5?=
 =?UTF-8?q?=E6=88=B7=E5=86=85=E6=88=90=E5=91=98=E5=86=9C=E6=88=B7=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/nhcyAdd.vue  | 57 ++++++++++++++++++++++----
 src/views/homesteadSurvey/shyqrAdd.vue |  1 +
 2 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/src/views/homesteadSurvey/nhcyAdd.vue b/src/views/homesteadSurvey/nhcyAdd.vue
index 36f7de00..6fcf9615 100644
--- a/src/views/homesteadSurvey/nhcyAdd.vue
+++ b/src/views/homesteadSurvey/nhcyAdd.vue
@@ -67,18 +67,40 @@
           :rules="[{ required: true }]"
           required
         />
-        <field-select
+<!--        <field-select-->
+<!--          v-if="!showHzxx"-->
+<!--          v-model="form.nhdm"-->
+<!--          label="农户代码"-->
+<!--          value-key="xm"-->
+<!--          placeholder="选择农户代码"-->
+<!--          :columns = "nhdmOptions"-->
+<!--          @confirm="onnhdmChanged"-->
+<!--          :on-remote-response="'data'"-->
+<!--          :rules="[{ required: true }]"-->
+<!--          required-->
+<!--        />-->
+        <van-field
           v-if="!showHzxx"
-          v-model="form.nhdm"
-          label="农户代码"
-          value-key="xm"
-          placeholder="选择农户代码"
-          :columns = "nhdmOptions"
-          @confirm="onnhdmChanged"
-          :on-remote-response="'data'"
+          clickable
           :rules="[{ required: true }]"
           required
+          label="农户代码"
+          placeholder="选择农户代码"
+          v-model="form.nhdm"
+          @click="shownhdm = true"
+          input-align="right"
+          right-icon="arrow-down"
         />
+        <van-popup v-model="shownhdm" position="bottom">
+          <van-search v-model="nhdmSearch"  placeholder="请输入搜索关键词" @input="onSearch"/>
+          <van-picker
+            show-toolbar
+            :columns="newList"
+            value-key="xm"
+            @confirm="onnhdmChanged"
+            @cancel="shownhdm = false"
+          />
+        </van-popup>
         <van-field
           input-align="right"
           v-model="form.xm"
@@ -316,7 +338,11 @@ export default {
       permission:false,
       yhzgxOperate:false,
       nhdmOptions:null,
+      nhdmSearch:null,
+      newList:[],
+      newListTwo:[],
       showHzxx:false,
+      shownhdm:false,
       // 使用权人列表
       syqrlist:[
         {
@@ -375,8 +401,23 @@ export default {
           item.xm = item.xm +"-"+ item.nhdm;
           return {xm:item.xm,nhdm:item.nhdm}
         });
+        this.newList = this.nhdmOptions;
+        this.newListTwo = this.nhdmOptions;
       });
     },
+    onSearch(val) {
+      if(this.nhdmOptions.length>0){
+        this.newList = []
+        for(let j = 0 ;j<this.nhdmOptions.length;j++){
+          if(this.nhdmOptions[j].xm.indexOf(val)>-1){
+            this.newList.push(this.nhdmOptions[j]);
+          }
+        }
+      }
+      if(val==""){
+        this.newList = this.newListTwo;
+      }
+    },
     submitzjd(){
       this.$refs.form.validate().then(() => {
       if(this.form.id == null){
diff --git a/src/views/homesteadSurvey/shyqrAdd.vue b/src/views/homesteadSurvey/shyqrAdd.vue
index a959b234..21fca390 100644
--- a/src/views/homesteadSurvey/shyqrAdd.vue
+++ b/src/views/homesteadSurvey/shyqrAdd.vue
@@ -138,6 +138,7 @@
         />
 
         <van-field
+          readonly
           input-align="right"
           v-model="form.shyqrdbxm"
           name="代表姓名"