Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem
Showing
5 changed files
with
31 additions
and
32 deletions
... | @@ -114,3 +114,15 @@ export function updateZl(data) { | ... | @@ -114,3 +114,15 @@ export function updateZl(data) { |
114 | data: data | 114 | data: data |
115 | }) | 115 | }) |
116 | } | 116 | } |
117 | |||
118 | /** | ||
119 | * 重新落宗选择自然幢列表 | ||
120 | */ | ||
121 | export function cxlzZrzList(data) { | ||
122 | return request({ | ||
123 | url:'/fw/qjZrz/cxlz-zrz-list', | ||
124 | method:'post', | ||
125 | data:data | ||
126 | }) | ||
127 | } | ||
128 | ... | ... |
... | @@ -104,7 +104,6 @@ | ... | @@ -104,7 +104,6 @@ |
104 | bdcdyh: "", | 104 | bdcdyh: "", |
105 | bdcqzh: "", | 105 | bdcqzh: "", |
106 | qlrmc: "", | 106 | qlrmc: "", |
107 | qszt: ["2"], | ||
108 | xmmc: "", | 107 | xmmc: "", |
109 | zddm: "", | 108 | zddm: "", |
110 | zl: "", | 109 | zl: "", |
... | @@ -175,7 +174,6 @@ | ... | @@ -175,7 +174,6 @@ |
175 | bdcdyh: "", | 174 | bdcdyh: "", |
176 | bdcqzh: "", | 175 | bdcqzh: "", |
177 | qlrmc: "", | 176 | qlrmc: "", |
178 | qszt: ["2"], | ||
179 | xmmc: "", | 177 | xmmc: "", |
180 | zddm: "", | 178 | zddm: "", |
181 | zl: "", | 179 | zl: "", | ... | ... |
... | @@ -24,8 +24,8 @@ | ... | @@ -24,8 +24,8 @@ |
24 | <td class="input"> | 24 | <td class="input"> |
25 | <el-select v-model="hcxlzData.zrzbsm" filterable placeholder="请选择" @change="zrzChange"> | 25 | <el-select v-model="hcxlzData.zrzbsm" filterable placeholder="请选择" @change="zrzChange"> |
26 | <el-option | 26 | <el-option |
27 | v-for="item in zrzList" | 27 | v-for="(item,index) in zrzList" |
28 | :key="item.xmmc" | 28 | :key="index" |
29 | :label="item.label" | 29 | :label="item.label" |
30 | :value="item.bsm"> | 30 | :value="item.bsm"> |
31 | </el-option> | 31 | </el-option> |
... | @@ -37,8 +37,8 @@ | ... | @@ -37,8 +37,8 @@ |
37 | <td class="input"> | 37 | <td class="input"> |
38 | <el-select v-model="hcxlzData.ljzbsm" filterable placeholder="请选择" @change="ljzChange"> | 38 | <el-select v-model="hcxlzData.ljzbsm" filterable placeholder="请选择" @change="ljzChange"> |
39 | <el-option | 39 | <el-option |
40 | v-for="item in ljzList" | 40 | v-for="(item,index) in ljzList" |
41 | :key="item.bsm" | 41 | :key="index" |
42 | :label="item.ljzmc" | 42 | :label="item.ljzmc" |
43 | :value="item.bsm"> | 43 | :value="item.bsm"> |
44 | </el-option> | 44 | </el-option> |
... | @@ -50,8 +50,8 @@ | ... | @@ -50,8 +50,8 @@ |
50 | <td class="input"> | 50 | <td class="input"> |
51 | <el-select v-model="hcxlzData.zdybsm" filterable placeholder="请选择"> | 51 | <el-select v-model="hcxlzData.zdybsm" filterable placeholder="请选择"> |
52 | <el-option | 52 | <el-option |
53 | v-for="item in zdyList" | 53 | v-for="(item,index) in zdyList" |
54 | :key="item.bsm" | 54 | :key="index" |
55 | :label="item.zdymc" | 55 | :label="item.zdymc" |
56 | :value="item.bsm"> | 56 | :value="item.bsm"> |
57 | </el-option> | 57 | </el-option> |
... | @@ -121,9 +121,9 @@ | ... | @@ -121,9 +121,9 @@ |
121 | }) | 121 | }) |
122 | }, | 122 | }, |
123 | zrzChange: function () { | 123 | zrzChange: function () { |
124 | const item = this.zrzList.find(i => i.bsm == this.hcxlzData.zrzbsm); | 124 | const item = this.zrzList.find(i => i.bsm === this.hcxlzData.zrzbsm); |
125 | this.hcxlzData.ljzbsm = '' | 125 | this.hcxlzData.ljzbsm = ''; |
126 | this.hcxlzData.zdybsm = '' | 126 | this.hcxlzData.zdybsm = ''; |
127 | this.ljzList = item.ljzList; | 127 | this.ljzList = item.ljzList; |
128 | this.ljzList.push({ | 128 | this.ljzList.push({ |
129 | ljzmc: '空', | 129 | ljzmc: '空', |
... | @@ -139,13 +139,13 @@ | ... | @@ -139,13 +139,13 @@ |
139 | zdXlcd(bsm).then(res => { | 139 | zdXlcd(bsm).then(res => { |
140 | if (res.success){ | 140 | if (res.success){ |
141 | this.zrzList = res.result; | 141 | this.zrzList = res.result; |
142 | this.xzzdClose(); | ||
142 | } else { | 143 | } else { |
143 | Message.error(res.message) | 144 | Message.error(res.message) |
144 | } | 145 | } |
145 | }) | 146 | }) |
146 | }, | 147 | }, |
147 | getZdxx: function (val) { | 148 | getZdxx: function (val) { |
148 | console.log(val, "宗地信息") | ||
149 | this.zd = val | 149 | this.zd = val |
150 | this.zdxx = val.xmmc + "(" + val.zddm + ")"; | 150 | this.zdxx = val.xmmc + "(" + val.zddm + ")"; |
151 | }, | 151 | }, |
... | @@ -161,13 +161,11 @@ | ... | @@ -161,13 +161,11 @@ |
161 | this.hcxlzData.bsms = this.bsms; | 161 | this.hcxlzData.bsms = this.bsms; |
162 | }, | 162 | }, |
163 | cancel() { | 163 | cancel() { |
164 | console.log("cancel......") | ||
165 | this.close(); | 164 | this.close(); |
166 | }, | 165 | }, |
167 | save() { | 166 | save() { |
168 | console.log("save.......") | 167 | if (this.hcxlzData.zrzbsm === '') { |
169 | if (this.hcxlzData.zrzbsm == '') { | 168 | Message.error("请选择自然幢"); |
170 | Message.error("请选择自然幢") | ||
171 | return; | 169 | return; |
172 | } | 170 | } |
173 | hzl(this.hcxlzData).then(res => { | 171 | hzl(this.hcxlzData).then(res => { |
... | @@ -188,9 +186,9 @@ | ... | @@ -188,9 +186,9 @@ |
188 | this.isVisible = val | 186 | this.isVisible = val |
189 | }, | 187 | }, |
190 | zd: function (val) { | 188 | zd: function (val) { |
191 | this.hcxlzData.zrzbsm = '' | 189 | this.hcxlzData.zrzbsm = ''; |
192 | this.hcxlzData.zdybsm = '' | 190 | this.hcxlzData.zdybsm = ''; |
193 | this.hcxlzData.ljzbsm = '' | 191 | this.hcxlzData.ljzbsm = ''; |
194 | this.getZrz(val.zdbsm) | 192 | this.getZrz(val.zdbsm) |
195 | } | 193 | } |
196 | } | 194 | } | ... | ... |
... | @@ -65,7 +65,7 @@ | ... | @@ -65,7 +65,7 @@ |
65 | <td>权利人</td> | 65 | <td>权利人</td> |
66 | <td>坐落</td> | 66 | <td>坐落</td> |
67 | </tr> | 67 | </tr> |
68 | <tr v-if="Data.length==0"> | 68 | <tr v-if="Data.length===0"> |
69 | <td colspan="8"> | 69 | <td colspan="8"> |
70 | <span class="noData">暂无数据</span> | 70 | <span class="noData">暂无数据</span> |
71 | </td> | 71 | </td> |
... | @@ -168,9 +168,6 @@ | ... | @@ -168,9 +168,6 @@ |
168 | }, | 168 | }, |
169 | addData: function (val) { | 169 | addData: function (val) { |
170 | this.$emit("getData",val) | 170 | this.$emit("getData",val) |
171 | // if (this.isZdClose) { | ||
172 | // this.close(); | ||
173 | // } | ||
174 | }, | 171 | }, |
175 | isClose(flag){ | 172 | isClose(flag){ |
176 | 173 | ... | ... |
... | @@ -108,7 +108,7 @@ | ... | @@ -108,7 +108,7 @@ |
108 | </template> | 108 | </template> |
109 | 109 | ||
110 | <script> | 110 | <script> |
111 | import { getSearchList } from "@api/search"; | 111 | import { cxlzZrzList } from "@api/zrz"; |
112 | import cxlzQueryData from "@components/cxlxQueryData/cxlzQueryData"; | 112 | import cxlzQueryData from "@components/cxlxQueryData/cxlzQueryData"; |
113 | 113 | ||
114 | export default { | 114 | export default { |
... | @@ -123,9 +123,7 @@ export default { | ... | @@ -123,9 +123,7 @@ export default { |
123 | queryData: { | 123 | queryData: { |
124 | bdcdyh: "", | 124 | bdcdyh: "", |
125 | bdcqzh: "", | 125 | bdcqzh: "", |
126 | dylxs: ["zrz"], | ||
127 | qlrmc: "", | 126 | qlrmc: "", |
128 | qszt: ["2"], | ||
129 | xmmc: "", | 127 | xmmc: "", |
130 | zddm: "", | 128 | zddm: "", |
131 | zl: "", | 129 | zl: "", |
... | @@ -159,7 +157,6 @@ export default { | ... | @@ -159,7 +157,6 @@ export default { |
159 | }, | 157 | }, |
160 | methods: { | 158 | methods: { |
161 | currentChange: function(val) { | 159 | currentChange: function(val) { |
162 | console.log(`当前页: ${val}`); | ||
163 | this.queryData.pageNo = val; | 160 | this.queryData.pageNo = val; |
164 | this.getData(this.queryData); | 161 | this.getData(this.queryData); |
165 | }, | 162 | }, |
... | @@ -174,20 +171,17 @@ export default { | ... | @@ -174,20 +171,17 @@ export default { |
174 | this.queryData = { | 171 | this.queryData = { |
175 | bdcdyh: "", | 172 | bdcdyh: "", |
176 | bdcqzh: "", | 173 | bdcqzh: "", |
177 | dylxs: ["zrz"], | ||
178 | qlrmc: "", | 174 | qlrmc: "", |
179 | qszt: ["2"], | ||
180 | xmmc: "", | 175 | xmmc: "", |
181 | zddm: "", | 176 | zddm: "", |
182 | zl: "", | 177 | zl: "", |
183 | pageNo: 1, | 178 | pageNo: 1, |
184 | pageSize: 12, | 179 | pageSize: 12 |
185 | type:'add', | ||
186 | }; | 180 | }; |
187 | this.getData(this.queryData); | 181 | this.getData(this.queryData); |
188 | }, | 182 | }, |
189 | getData: function(data) { | 183 | getData: function(data) { |
190 | getSearchList(data).then((res) => { | 184 | cxlzZrzList(data).then((res) => { |
191 | this.Data = res.result.records; | 185 | this.Data = res.result.records; |
192 | this.total = res.result.total; | 186 | this.total = res.result.total; |
193 | }); | 187 | }); | ... | ... |
-
Please register or sign in to post a comment