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

src/api/onlineHome/homestead/circulation.js

@@ -48,6 +48,15 @@ export function selectTHouseBaseObligeeMapList(query) {
     params: query
   })
 }
+
+export function getObligeeList(query) {
+  return request({
+    url: '/house/obligee/selectObligeeListByName',
+    method: 'get',
+    params: query
+  })
+}
+
 //权利人代码
 export function getByZjddm(data){
   return request({

src/views/onlineHome/homestead/freeExit/freeExitAdd.vue

@@ -12,13 +12,14 @@
     </van-nav-bar>
     <van-form ref="_Form">
       <div class="main_box">
+        <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
         <van-field
           readonly
           clickable
           v-model="circulation.zjddm"
           label="宅基地代码"
           placeholder="请选择"
-          @click="showzjddm = true"
+          @click="remoteProposerMethod"
           input-align="right"
           right-icon="arrow-down" :rules="[{ required: true }]" required
         />
@@ -26,11 +27,11 @@
           <van-picker
             show-toolbar
             :columns="zjdDictionaries"
+            value-key="zjddm"
             @confirm="onConfirmZjddm"
             @cancel="showzjddm = false"
           />
         </van-popup>
-        <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
         <van-field
           readonly
           clickable
@@ -148,7 +149,7 @@
 </template>
 
 <script>
-  import { zjdzd, getByZjddm } from "@/api/onlineHome/homestead/circulation";
+  import { zjdzd, getByZjddm, getObligeeList } from "@/api/onlineHome/homestead/circulation";
   import { dyAdd,  } from "@/api/onlineHome/homestead/paidExit";
   import {Notify} from "vant";
   export default {
@@ -214,15 +215,15 @@
           }
         });
         //宅基地代码
-        zjdzd().then(zjdRes => {
+        /*zjdzd().then(zjdRes => {
           for( let i = 0 ; i < zjdRes.rows.length ; i++){
             this.zjdDictionaries.push(zjdRes.rows[i].zjddm);
           }
           if(this.zjdDictionaries.length > 0)
             this.onConfirmZjddm(this.zjdDictionaries[0]);
-        });
+        });*/
       },
-      onConfirmZjddm(data){
+      /*onConfirmZjddm(data){
         console.log(data)
         this.circulation.zjddm = data;
         this.showzjddm = false;
@@ -240,6 +241,22 @@
           }
           this.$forceUpdate();
         });
+      },*/
+      onConfirmZjddm(data){
+        console.log(data);
+        this.showzjddm = false;
+        if (data) {
+          this.$set(this.circulation, 'zjddm', data.zjddm);
+          this.$set(this.circulation, 'sqrzjhm', data.shyqrdbzjhm);
+          this.$set(this.circulation, 'sqrzjlx', data.shyqrdbzjlx);
+          if(data.shyqrdbzjlx)
+          {
+            let val = this.zjlxDictionaries.find((x) => x.value == data.shyqrdbzjlx);
+            if(val)
+              this.zjlx = val.text;
+          }
+        }
+        // this.$forceUpdate();
       },
       onConfirmZjlx(data){
         this.zjlx = data.text;
@@ -279,6 +296,24 @@
       back() {
         setTimeout(() => this.$router.back(-1), 1000)
       },
+      remoteProposerMethod() {
+        this.showzjddm = true;
+        this.zjdDictionaries = [];
+        if (this.circulation.sqrxm) {
+          getObligeeList({shyqrdbxm:this.circulation.sqrxm}).then(response => {
+            this.zjdDictionaries = response.data.map(item => {
+              return {
+                zjddm: item.zjddm,
+                shyqrdbxm: item.shyqrdbxm,
+                shyqrdbzjlx: item.shyqrdbzjlx,
+                shyqrdbzjhm: item.shyqrdbzjhm
+              }
+            });
+          });
+        } else {
+          this.zjdDictionaries = [];
+        }
+      }
     },
   }
 </script>

src/views/onlineHome/homestead/paidExit/paidExitAdd.vue

@@ -12,13 +12,14 @@
       </van-nav-bar>
       <van-form ref="_Form">
       <div class="main_box">
+        <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
         <van-field
           readonly
           clickable
           v-model="circulation.zjddm"
           label="宅基地代码"
           placeholder="请选择"
-          @click="showzjddm = true"
+          @click="remoteProposerMethod"
           input-align="right"
           right-icon="arrow-down" :rules="[{ required: true }]" required
         />
@@ -26,11 +27,11 @@
           <van-picker
             show-toolbar
             :columns="zjdDictionaries"
+            value-key="zjddm"
             @confirm="onConfirmZjddm"
             @cancel="showzjddm = false"
           />
         </van-popup>
-        <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
         <van-field
           readonly
           clickable
@@ -171,7 +172,7 @@
 </template>
 
 <script>
-import { zjdzd, getByZjddm } from "@/api/onlineHome/homestead/circulation";
+import { zjdzd, getByZjddm, getObligeeList } from "@/api/onlineHome/homestead/circulation";
 import { dyAdd, zyyctcApply } from "@/api/onlineHome/homestead/paidExit";
 import {Notify} from "vant";
 export default {
@@ -243,15 +244,15 @@ export default {
         }
       });
       //宅基地代码
-      zjdzd().then(zjdRes => {
+      /*zjdzd().then(zjdRes => {
         for( let i = 0 ; i < zjdRes.rows.length ; i++){
           this.zjdDictionaries.push(zjdRes.rows[i].zjddm);
         }
         if(this.zjdDictionaries.length > 0)
           this.onConfirmZjddm(this.zjdDictionaries[0]);
-      });
+      });*/
     },
-    onConfirmZjddm(data){
+    /*onConfirmZjddm(data){
       console.log(data)
       this.circulation.zjddm = data;
       this.showzjddm = false;
@@ -269,6 +270,22 @@ export default {
         }
         this.$forceUpdate();
       });
+    },*/
+    onConfirmZjddm(data){
+      console.log(data);
+      this.showzjddm = false;
+      if (data) {
+        this.$set(this.circulation, 'zjddm', data.zjddm);
+        this.$set(this.circulation, 'sqrzjhm', data.shyqrdbzjhm);
+        this.$set(this.circulation, 'sqrzjlx', data.shyqrdbzjlx);
+        if(data.shyqrdbzjlx)
+        {
+          let val = this.zjlxDictionaries.find((x) => x.value == data.shyqrdbzjlx);
+          if(val)
+            this.zjlx = val.text;
+        }
+      }
+      // this.$forceUpdate();
     },
     onConfirmZjlx(data){
       this.zjlx = data.text;
@@ -322,6 +339,24 @@ export default {
     back() {
       setTimeout(() => this.$router.back(-1), 1000)
     },
+    remoteProposerMethod() {
+      this.showzjddm = true;
+      this.zjdDictionaries = [];
+      if (this.circulation.sqrxm) {
+        getObligeeList({shyqrdbxm:this.circulation.sqrxm}).then(response => {
+          this.zjdDictionaries = response.data.map(item => {
+            return {
+              zjddm: item.zjddm,
+              shyqrdbxm: item.shyqrdbxm,
+              shyqrdbzjlx: item.shyqrdbzjlx,
+              shyqrdbzjhm: item.shyqrdbzjhm
+            }
+          });
+        });
+      } else {
+        this.zjdDictionaries = [];
+      }
+    }
   },
 }
 </script>