公示 新建获取农户 宅基地信息

src/views/onlineHome/homestead/arbitration/arbitrationHandlerList.vue

@@ -92,12 +92,11 @@ export default {
   },
   methods: {
     getList(target) {
-      if(this.loading) return;
       let type = typeof (target);
       console.log(type, target);
       if (target === 0) {
         this.refreshing = true;
-        this.finished = false;
+        this.finished = true;
         this.total = 0;
         this.queryParams.pageNum = 1;
         this.list = [];
@@ -111,7 +110,7 @@ export default {
       else
       {
         this.refreshing = true;
-        this.finished = false;
+        this.finished = true;
         this.total = 0;
         this.queryParams.pageNum = 1;
         this.list = []
@@ -126,9 +125,7 @@ export default {
           this.list.push(e);
         });
         this.total += response.rows.length;
-        if (this.total >= response.total) {
-          this.finished = true;
-        }
+        this.finished = this.total >= response.total;
       }).finally(() => {
         this.loading = false;
         this.refreshing = false;

src/views/onlineHome/homestead/arbitration/arbitrationList.vue

@@ -98,12 +98,11 @@ export default {
   },
   methods: {
     getList(target) {
-      if(this.loading) return;
       let type = typeof (target);
       console.log(type, target);
       if (target === 0) {
         this.refreshing = true;
-        this.finished = false;
+        this.finished = true;
         this.total = 0;
         this.queryParams.pageNum = 1;
         this.list = [];
@@ -117,7 +116,7 @@ export default {
       else
       {
         this.refreshing = true;
-        this.finished = false;
+        this.finished = true;
         this.total = 0;
         this.queryParams.pageNum = 1;
         this.list = []
@@ -132,9 +131,7 @@ export default {
           this.list.push(e);
         });
         this.total += response.rows.length;
-        if (this.total >= response.total) {
-          this.finished = true;
-        }
+        this.finished = this.total >= response.total;
       }).finally(() => {
         this.loading = false;
         this.refreshing = false;

src/views/onlineHome/homestead/arbitration/arbitrationProcessList.vue

@@ -92,12 +92,11 @@ export default {
   },
   methods: {
     getList(target) {
-      if(this.loading) return;
       let type = typeof (target);
       console.log(type, target);
       if (target === 0) {
         this.refreshing = true;
-        this.finished = false;
+        this.finished = true;
         this.total = 0;
         this.queryParams.pageNum = 1;
         this.list = [];
@@ -111,7 +110,7 @@ export default {
       else
       {
         this.refreshing = true;
-        this.finished = false;
+        this.finished = true;
         this.total = 0;
         this.queryParams.pageNum = 1;
         this.list = []
@@ -126,9 +125,7 @@ export default {
           this.list.push(e);
         });
         this.total += response.rows.length;
-        if (this.total >= response.total) {
-          this.finished = true;
-        }
+        this.finished = this.total >= response.total;
       }).finally(() => {
         this.loading = false;
         this.refreshing = false;

src/views/onlineHome/homestead/circulation/circulationAdd.vue

@@ -294,6 +294,8 @@
             for( let i = 0 ; i < zjdRes.rows.length ; i++){
               this.zjdDictionaries.push(zjdRes.rows[i].zjddm);
             }
+            if(this.zjdDictionaries.length > 0)
+              this.onConfirmZjd(this.zjdDictionaries[0]);
           });
           //流转前房屋用途
           this.houseGetDicts("fwyt").then((res) => {//流转前房屋用途
@@ -319,8 +321,11 @@
         var form = {};
         form.zjddm = value;
         getByZjddm(form).then(qlrRes => {
-          console.log(qlrRes.data.shyqrdm)
-          this.circulation.shyqrdm = qlrRes.data.shyqrdm;
+          let data = qlrRes.data;
+          console.log(data)
+          this.circulation.shyqrdm = data.shyqrdm;
+          this.$set(this.circulation, 'suyqrdbxm', data.shyqrdbxm);
+          this.$set(this.circulation, 'zcfsfbjtjjzzcy', data.sfbncjtjjzzcy == '1' || data.sfbncjtjjzzcy == 'Y' ? 'Y' : 'N');
           this.$forceUpdate();
         });
         this.showZjd = false;

src/views/onlineHome/homestead/homeApplication/houseAnnounce.vue

@@ -160,7 +160,7 @@ export default {
       console.log(type, target);
       if (target === 0) {
         this.refreshing = true;
-        this.finished = false;
+        this.finished = true;
         this.total = 0;
         this.queryParams.pageNum = 1;
         this.list = [];
@@ -174,7 +174,7 @@ export default {
       else
       {
         this.refreshing = true;
-        this.finished = false;
+        this.finished = true;
         this.resetQuery();
         this.total = 0;
         this.queryParams.pageNum = 1;
@@ -190,9 +190,7 @@ export default {
           this.list.push(e);
         });
         this.total += response.rows.length;
-        if (this.total >= response.total) {
-          this.finished = true;
-        }
+        this.finished = this.total >= response.total;
       }).finally(() => {
         this.loading = false;
         this.refreshing = false;

src/views/onlineHome/homestead/homeApplication/houseLicense.vue

@@ -112,7 +112,7 @@ export default {
       console.log(type, target);
       if (target === 0) {
         this.refreshing = true;
-        this.finished = false;
+        this.finished = true;
         this.total = 0;
         this.queryParams.pageNum = 1;
         this.list = [];
@@ -126,7 +126,7 @@ export default {
       else
       {
         this.refreshing = true;
-        this.finished = false;
+        this.finished = true;
         this.resetQuery();
         this.total = 0;
         this.queryParams.pageNum = 1;
@@ -142,9 +142,7 @@ export default {
           this.list.push(e);
         });
         this.total += response.rows.length;
-        if (this.total >= response.total) {
-          this.finished = true;
-        }
+        this.finished = this.total >= response.total;
       }).finally(() => {
         this.loading = false;
         this.refreshing = false;

src/views/onlineHome/homestead/mortgage/mortgageAdd.vue

@@ -30,11 +30,11 @@
             @cancel="showzjddm = false"
           />
         </van-popup>
-        <van-field v-model="circulation.bdcdyh" label="不动产单元号" placeholder="请输入流转面积(㎡)" input-align="right" label-width="auto"/>
-        <van-field v-model="circulation.bdcqzh" label="不动产权证号" placeholder="请输入流转单价(元)" input-align="right" label-width="auto"/>
-        <van-field v-model="circulation.bdcdydjywh" label="不动产抵押登记业务号" placeholder="请输入流转费用(元)" input-align="right" label-width="auto"/>
-        <van-field v-model="circulation.zjjzwzl" label="在建建筑物坐落" placeholder="请输入流转单价(元)" input-align="right" label-width="auto"/>
-        <van-field v-model="circulation.zjjzwdyfw" label="在建建筑物抵押范围" placeholder="请输入流转费用(元)" input-align="right" label-width="auto"/>
+        <van-field v-model="circulation.bdcdyh" label="不动产单元号" placeholder="请输入不动产单元号" input-align="right" label-width="auto"/>
+        <van-field v-model="circulation.bdcqzh" label="不动产权证号" placeholder="请输入不动产权证号" input-align="right" label-width="auto"/>
+        <van-field v-model="circulation.bdcdydjywh" label="不动产抵押登记业务号" placeholder="请输入不动产抵押登记业务号" input-align="right" label-width="auto"/>
+        <van-field v-model="circulation.zjjzwzl" label="在建建筑物坐落" placeholder="请输入在建建筑物坐落" input-align="right" label-width="auto"/>
+        <van-field v-model="circulation.zjjzwdyfw" label="在建建筑物抵押范围" placeholder="请输入在建建筑物抵押范围" input-align="right" label-width="auto"/>
         <van-field
           readonly
           clickable
@@ -168,7 +168,7 @@
 
 <script>
 import { dyAdd } from "@/api/onlineHome/homestead/mortgage";
-import { zjdzd } from "@/api/onlineHome/homestead/circulation";
+import { zjdzd, getByZjddm } from "@/api/onlineHome/homestead/circulation";
 export default {
     name: "mortgageAdd",
   data() {
@@ -230,12 +230,21 @@ export default {
         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){
       console.log(data)
       this.circulation.zjddm = data;
       this.showzjddm = false;
+      getByZjddm({zjddm: data,}).then(qlrRes => {
+        let data = qlrRes.data;
+        console.log(data)
+        this.$set(this.circulation, 'bdcdyh', data.bdcdyh);
+        this.$set(this.circulation, 'bdcqzh', data.bdcqzh);
+        this.$forceUpdate();
+      });
     },
     onConfirmQszt(data){
       this.qszt = data.text;

src/views/onlineHome/homestead/mortgage/mortgageModify.vue

@@ -30,11 +30,11 @@
             @cancel="showzjddm = false"
           />
         </van-popup>
-        <van-field v-model="circulation.bdcdyh" label="不动产单元号" placeholder="请输入流转面积(㎡)" input-align="right" label-width="auto"/>
-        <van-field v-model="circulation.bdcqzh" label="不动产权证号" placeholder="请输入流转单价(元)" input-align="right" label-width="auto"/>
-        <van-field v-model="circulation.bdcdydjywh" label="不动产抵押登记业务号" placeholder="请输入流转费用(元)" input-align="right" label-width="auto"/>
-        <van-field v-model="circulation.zjjzwzl" label="在建建筑物坐落" placeholder="请输入流转单价(元)" input-align="right" label-width="auto"/>
-        <van-field v-model="circulation.zjjzwdyfw" label="在建建筑物抵押范围" placeholder="请输入流转费用(元)" input-align="right" label-width="auto"/>
+        <van-field v-model="circulation.bdcdyh" label="不动产单元号" placeholder="请输入不动产单元号" input-align="right" label-width="auto"/>
+        <van-field v-model="circulation.bdcqzh" label="不动产权证号" placeholder="请输入不动产权证号" input-align="right" label-width="auto"/>
+        <van-field v-model="circulation.bdcdydjywh" label="不动产抵押登记业务号" placeholder="请输入不动产抵押登记业务号" input-align="right" label-width="auto"/>
+        <van-field v-model="circulation.zjjzwzl" label="在建建筑物坐落" placeholder="请输入在建建筑物坐落" input-align="right" label-width="auto"/>
+        <van-field v-model="circulation.zjjzwdyfw" label="在建建筑物抵押范围" placeholder="请输入在建建筑物抵押范围" input-align="right" label-width="auto"/>
         <van-field
           readonly
           clickable
@@ -168,7 +168,7 @@
 
 <script>
 import { dyApply , getDy , dyEdit } from "@/api/onlineHome/homestead/mortgage";
-import { zjdzd } from "@/api/onlineHome/homestead/circulation";
+import { zjdzd, getByZjddm } from "@/api/onlineHome/homestead/circulation";
 export default {
     name: "mortgageModify",
   data() {
@@ -243,6 +243,13 @@ export default {
       console.log(data)
       this.circulation.zjddm = data;
       this.showzjddm = false;
+      getByZjddm({zjddm: data,}).then(qlrRes => {
+        let data = qlrRes.data;
+        console.log(data)
+        this.$set(this.circulation, 'bdcdyh', data.bdcdyh);
+        this.$set(this.circulation, 'bdcqzh', data.bdcqzh);
+        this.$forceUpdate();
+      });
     },
     onConfirmQszt(data){
       this.qszt = data.text;

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

@@ -160,7 +160,7 @@
 </template>
 
 <script>
-import { zjdzd } from "@/api/onlineHome/homestead/circulation";
+import { zjdzd, getByZjddm } from "@/api/onlineHome/homestead/circulation";
 import { dyAdd } from "@/api/onlineHome/homestead/paidExit";
 export default {
   name: "paidExitAdd",
@@ -230,12 +230,28 @@ export default {
         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){
       console.log(data)
       this.circulation.zjddm = data;
       this.showzjddm = false;
+      getByZjddm({zjddm: data,}).then(qlrRes => {
+        let data = qlrRes.data;
+        console.log(data)
+        this.$set(this.circulation, 'sqrxm', data.shyqrdbxm);
+        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;

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

@@ -160,7 +160,7 @@
 </template>
 
 <script>
-  import { zjdzd } from "@/api/onlineHome/homestead/circulation";
+  import { zjdzd, getByZjddm } from "@/api/onlineHome/homestead/circulation";
   import { zyyctcEdit , getZyyctc , zyyctcApply } from "@/api/onlineHome/homestead/paidExit";
   export default {
     name: "paidExitModify",
@@ -244,6 +244,20 @@
         console.log(data)
         this.circulation.zjddm = data;
         this.showzjddm = false;
+        getByZjddm({zjddm: data,}).then(qlrRes => {
+          let data = qlrRes.data;
+          console.log(data)
+          this.$set(this.circulation, 'sqrxm', data.shyqrdbxm);
+          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;

src/views/onlineHome/publicity.vue

@@ -2,61 +2,109 @@
     <div class="app-container">
       <van-nav-bar
         title="公示公告"
+        fixed
+        placeholder
       >
         <template #right>
-          <van-icon name="wap-nav" color="#000" size="18"/>
+<!--          <van-icon name="wap-nav" color="#000" size="18"/>-->
         </template>
       </van-nav-bar>
-      <van-list
-        v-model="loading"
-        :finished="finished"
-        finished-text="没有更多了"
-        @load="onLoad"
-      >
-        <van-cell v-for="item in list" :key="item" is-link url="" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16); min-height: 100px;">
-          <template #title>
-            <p style="display:inline-block;background: #EC4B2C;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p><p style="font-weight: bold;font-size: 18px;">{{item}}</p>
-          </template>
-          <template #label>
-            <p style="font-size: 16px"></p>
-          </template>
-        </van-cell>
-      </van-list>
+      <van-pull-refresh v-model="refreshing" @refresh="getList()">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="getList('+1')"
+        >
+          <van-cell v-for="item in list" :key="item.id" is-link url="" style="margin:2%;width:96%;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16); min-height: 100px;" :to="{name:'proposerLite', query: {id:item.applyProposerId}}">
+            <template #title>
+              <p style="display:inline-block;background: #EC4B2C;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p><p style="font-weight: bold;font-size: 18px;">{{item.projectName}}</p>
+            </template>
+            <template #label>
+              <p style="font-size: 0.35rem; margin-left: 30px; margin-bottom: 0.1rem;">{{formatDict(options.announce_type, item.announceType)}}</p>
+             <p style="font-size: 0.35rem; margin-left: 30px; margin-top: 0.1rem;">{{item.startDate}} 至 {{item.endDate}}</p>
+            </template>
+          </van-cell>
+        </van-list>
+      </van-pull-refresh>
       <onlineHomeIndex></onlineHomeIndex>
     </div>
 </template>
 
 <script>
+import { getList } from "@/api/onlineHome/homestead/information";
   import onlineHomeIndex from "../onlineHomeIndex";
     export default {
       components: {
         onlineHomeIndex
       },
         name: "publicity",
+      created() {
+        this.initOptions();
+        this.getList();
+      },
       data() {
         return {
           list: [],
+          refreshing: false,
           loading: false,
           finished: false,
+          queryParams:{
+            pageNum:1,
+            pageSize:10,
+            orderByColumn:'createTime',
+            isAsc:'desc',
+            announceStatus: '2',
+          },
+          options: {
+            announce_status: [],
+            announce_type: [],
+          },
         };
       },
       methods: {
-        onLoad() {
-          // 异步更新数据
-          // setTimeout 仅做示例，真实场景中一般为 ajax 请求
-          setTimeout(() => {
-            for (let i = 0; i < 1; i++) {
-              this.list.push("暂无公示公告");
-            }
-
-            // 加载状态结束
-            this.loading = false;
-
-            // 数据全部加载完成
-            if (this.list.length >= 1) {
+        getList(target) {
+          let type = typeof (target);
+          console.log(type, target);
+          if (type === 'number')
+            this.queryParams.pageNum = target;
+          else if (type === 'string') {
+            this.queryParams.pageNum = eval(this.queryParams.pageNum + target)
+          }
+          else
+          {
+            this.refreshing = true;
+            this.finished = true;
+            this.total = 0;
+            this.queryParams.pageNum = 1;
+            this.list = []
+          }
+          getList(this.queryParams).then((response) => {
+            console.log(response)
+            if (response.rows.length === 0) {
               this.finished = true;
+              return;
             }
-          }, 1000);
+            response.rows.forEach((e) => {
+              this.list.push(e);
+            });
+            this.total += response.rows.length;
+            this.finished = this.total >= response.total;
+          }).finally(() => {
+            this.loading = false;
+            this.refreshing = false;
+          });
+        },
+        initOptions() {
+          for(let k in this.options)
+          {
+            this.houseGetDicts(k).then((res) => {
+              this.options[k] = res.data;
+            });
+          }
+        },
+        formatDict(dict, value) {
+          return this.selectDictLabel(dict, value);
         },
       },
     }