Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

@@ -114,3 +114,15 @@ export function updateZl(data) {
         data: data
     })
 }
+
+/**
+ * 重新落宗选择自然幢列表
+ */
+export function cxlzZrzList(data) {
+    return request({
+        url:'/fw/qjZrz/cxlz-zrz-list',
+        method:'post',
+        data:data
+    })
+}
+

@@ -104,7 +104,6 @@
                     bdcdyh: "",
                     bdcqzh: "",
                     qlrmc: "",
-                    qszt: ["2"],
                     xmmc: "",
                     zddm: "",
                     zl: "",
@@ -175,7 +174,6 @@
                     bdcdyh: "",
                     bdcqzh: "",
                     qlrmc: "",
-                    qszt: ["2"],
                     xmmc: "",
                     zddm: "",
                     zl: "",

@@ -24,8 +24,8 @@
                         <td class="input">
                             <el-select v-model="hcxlzData.zrzbsm" filterable placeholder="请选择" @change="zrzChange">
                                 <el-option
-                                        v-for="item in zrzList"
-                                        :key="item.xmmc"
+                                        v-for="(item,index) in zrzList"
+                                        :key="index"
                                         :label="item.label"
                                         :value="item.bsm">
                                 </el-option>
@@ -37,8 +37,8 @@
                         <td class="input">
                             <el-select v-model="hcxlzData.ljzbsm" filterable placeholder="请选择" @change="ljzChange">
                                 <el-option
-                                        v-for="item in ljzList"
-                                        :key="item.bsm"
+                                        v-for="(item,index) in ljzList"
+                                        :key="index"
                                         :label="item.ljzmc"
                                         :value="item.bsm">
                                 </el-option>
@@ -50,8 +50,8 @@
                         <td class="input">
                             <el-select v-model="hcxlzData.zdybsm" filterable placeholder="请选择">
                                 <el-option
-                                        v-for="item in zdyList"
-                                        :key="item.bsm"
+                                        v-for="(item,index) in zdyList"
+                                        :key="index"
                                         :label="item.zdymc"
                                         :value="item.bsm">
                                 </el-option>
@@ -121,9 +121,9 @@
                 })
             },
             zrzChange: function () {
-                const item = this.zrzList.find(i => i.bsm == this.hcxlzData.zrzbsm);
-                this.hcxlzData.ljzbsm = ''
-                this.hcxlzData.zdybsm = ''
+                const item = this.zrzList.find(i => i.bsm === this.hcxlzData.zrzbsm);
+                this.hcxlzData.ljzbsm = '';
+                this.hcxlzData.zdybsm = '';
                 this.ljzList = item.ljzList;
                 this.ljzList.push({
                     ljzmc: '空',
@@ -139,13 +139,13 @@
                 zdXlcd(bsm).then(res => {
                     if (res.success){
                         this.zrzList = res.result;
+                        this.xzzdClose();
                     } else {
                         Message.error(res.message)
                     }
                 })
             },
             getZdxx: function (val) {
-                console.log(val, "宗地信息")
                 this.zd = val
                 this.zdxx = val.xmmc + "(" + val.zddm + ")";
             },
@@ -161,13 +161,11 @@
                 this.hcxlzData.bsms = this.bsms;
             },
             cancel() {
-                console.log("cancel......")
                 this.close();
             },
             save() {
-                console.log("save.......")
-                if (this.hcxlzData.zrzbsm == '') {
-                    Message.error("请选择自然幢")
+                if (this.hcxlzData.zrzbsm === '') {
+                    Message.error("请选择自然幢");
                     return;
                 }
                 hzl(this.hcxlzData).then(res => {
@@ -188,9 +186,9 @@
                 this.isVisible = val
             },
             zd: function (val) {
-                this.hcxlzData.zrzbsm = ''
-                this.hcxlzData.zdybsm = ''
-                this.hcxlzData.ljzbsm = ''
+                this.hcxlzData.zrzbsm = '';
+                this.hcxlzData.zdybsm = '';
+                this.hcxlzData.ljzbsm = '';
                 this.getZrz(val.zdbsm)
             }
         }

@@ -65,7 +65,7 @@
                             <td>权利人</td>
                             <td>坐落</td>
                         </tr>
-                        <tr v-if="Data.length==0">
+                        <tr v-if="Data.length===0">
                             <td colspan="8">
                                 <span class="noData">暂无数据</span>
                             </td>
@@ -168,9 +168,6 @@
             },
             addData: function (val) {
                this.$emit("getData",val)
-            //    if (this.isZdClose) {
-                //  this.close();
-            //    }
             },
             isClose(flag){
 

@@ -108,7 +108,7 @@
 </template>
 
 <script>
-import { getSearchList } from "@api/search";
+import { cxlzZrzList } from "@api/zrz";
 import cxlzQueryData from "@components/cxlxQueryData/cxlzQueryData";
 
 export default {
@@ -123,9 +123,7 @@ export default {
 			queryData: {
 				bdcdyh: "",
 				bdcqzh: "",
-				dylxs: ["zrz"],
 				qlrmc: "",
-				qszt: ["2"],
 				xmmc: "",
 				zddm: "",
 				zl: "",
@@ -159,7 +157,6 @@ export default {
 	},
 	methods: {
 		currentChange: function(val) {
-			console.log(`当前页: ${val}`);
 			this.queryData.pageNo = val;
 			this.getData(this.queryData);
 		},
@@ -174,20 +171,17 @@ export default {
 			this.queryData = {
 				bdcdyh: "",
 				bdcqzh: "",
-				dylxs: ["zrz"],
 				qlrmc: "",
-				qszt: ["2"],
 				xmmc: "",
 				zddm: "",
 				zl: "",
 				pageNo: 1,
-				pageSize: 12,
-				type:'add',
+				pageSize: 12
 			};
 			this.getData(this.queryData);
 		},
 		getData: function(data) {
-			getSearchList(data).then((res) => {
+            cxlzZrzList(data).then((res) => {
 				this.Data = res.result.records;
 				this.total = res.result.total;
 			});