Merge branch 'dev'
Showing
6 changed files
with
104 additions
and
112 deletions
| ... | @@ -81,7 +81,18 @@ export function getBdcqljqtsx (data) { | ... | @@ -81,7 +81,18 @@ export function getBdcqljqtsx (data) { |
| 81 | params: data | 81 | params: data |
| 82 | }) | 82 | }) |
| 83 | } | 83 | } |
| 84 | 84 | /** | |
| 85 | * @description: 获取不动产权利及其他事项Bdcdyh | ||
| 86 | * @param {*} data | ||
| 87 | * @author: renchao | ||
| 88 | */ | ||
| 89 | export function getBdcqljqtsxBdcdyh (data) { | ||
| 90 | return request({ | ||
| 91 | url: SERVER.SERVERAPI + '/rest/djbDetail/getBdcqljqtsxBdcdyh', | ||
| 92 | method: 'get', | ||
| 93 | params: data | ||
| 94 | }) | ||
| 95 | } | ||
| 85 | /** | 96 | /** |
| 86 | * @description: 获取土地所有权 | 97 | * @description: 获取土地所有权 |
| 87 | * @param {*} data | 98 | * @param {*} data | ... | ... |
| 1 | /* | 1 | /* |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-10-30 09:01:21 | 4 | * @LastEditTime: 2023-11-10 10:34:55 |
| 5 | */ | 5 | */ |
| 6 | import { mapGetters } from 'vuex' | 6 | import { mapGetters } from 'vuex' |
| 7 | import { defaultParameters } from "../../views/ywbl/ywsq/javascript/publicDefaultPar"; | 7 | import { defaultParameters } from "../../views/ywbl/ywsq/javascript/publicDefaultPar"; |
| ... | @@ -29,7 +29,6 @@ export default { | ... | @@ -29,7 +29,6 @@ export default { |
| 29 | */ | 29 | */ |
| 30 | handkeyCode (e) { | 30 | handkeyCode (e) { |
| 31 | if (e.keyCode === 13) { | 31 | if (e.keyCode === 13) { |
| 32 | console.log("安"); | ||
| 33 | this.handleSearch() | 32 | this.handleSearch() |
| 34 | } | 33 | } |
| 35 | }, | 34 | }, | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-11-09 08:45:33 | 4 | * @LastEditTime: 2023-11-10 10:33:47 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <div class="content"> | 7 | <div class="content"> |
| ... | @@ -123,7 +123,7 @@ | ... | @@ -123,7 +123,7 @@ |
| 123 | } else { | 123 | } else { |
| 124 | this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid)); | 124 | this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid)); |
| 125 | this.activeName = this.sfqdata.length - 1; | 125 | this.activeName = this.sfqdata.length - 1; |
| 126 | this.isActive = "" | 126 | |
| 127 | this.titleActive = this.activeName | 127 | this.titleActive = this.activeName |
| 128 | } | 128 | } |
| 129 | 129 | ||
| ... | @@ -135,6 +135,7 @@ | ... | @@ -135,6 +135,7 @@ |
| 135 | ); | 135 | ); |
| 136 | this.sfqdata[0].children.forEach((item, index) => { | 136 | this.sfqdata[0].children.forEach((item, index) => { |
| 137 | if (item.id == this.defaultNode.id) { | 137 | if (item.id == this.defaultNode.id) { |
| 138 | this.isActive = index | ||
| 138 | this.loadComponent(item.form); | 139 | this.loadComponent(item.form); |
| 139 | } | 140 | } |
| 140 | }); | 141 | }); | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-09-19 10:48:40 | 4 | * @LastEditTime: 2023-11-10 10:36:22 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <div class="content loadingtext"> | 7 | <div class="content loadingtext"> |
| ... | @@ -55,7 +55,7 @@ | ... | @@ -55,7 +55,7 @@ |
| 55 | </div> | 55 | </div> |
| 56 | </template> | 56 | </template> |
| 57 | <script> | 57 | <script> |
| 58 | import { getBdcqljqtsx } from "@/api/djbDetail.js"; | 58 | import { getBdcqljqtsx, getBdcqljqtsxBdcdyh } from "@/api/djbDetail.js"; |
| 59 | import { loadTreeData, loadsfqData, getNode } from "./djbFrameData.js"; | 59 | import { loadTreeData, loadsfqData, getNode } from "./djbFrameData.js"; |
| 60 | import { searchTaskToDo } from "@/api/workflow/search.js"; | 60 | import { searchTaskToDo } from "@/api/workflow/search.js"; |
| 61 | import { leftMenu } from "@/api/workFlow.js"; | 61 | import { leftMenu } from "@/api/workFlow.js"; |
| ... | @@ -92,7 +92,7 @@ | ... | @@ -92,7 +92,7 @@ |
| 92 | }; | 92 | }; |
| 93 | }, | 93 | }, |
| 94 | mounted () { | 94 | mounted () { |
| 95 | this.getdata(); | 95 | this.loadData(this.getCaption(window.location.href)); |
| 96 | }, | 96 | }, |
| 97 | methods: { | 97 | methods: { |
| 98 | // 截取字符的方法 | 98 | // 截取字符的方法 |
| ... | @@ -111,30 +111,30 @@ | ... | @@ -111,30 +111,30 @@ |
| 111 | * @description: 通过不动产业务号获取参数 | 111 | * @description: 通过不动产业务号获取参数 |
| 112 | * @author: renchao | 112 | * @author: renchao |
| 113 | */ | 113 | */ |
| 114 | getdata () { | 114 | // getdata () { |
| 115 | this.queryForm = { | 115 | // this.queryForm = { |
| 116 | bdcdyh: this.getCaption(window.location.href), | 116 | // bdcdyh: this.getCaption(window.location.href), |
| 117 | currentPage: 1, | 117 | // currentPage: 1, |
| 118 | djlx: "", | 118 | // djlx: "", |
| 119 | pageSize: 10, | 119 | // pageSize: 10, |
| 120 | qllx: "", | 120 | // qllx: "", |
| 121 | ywh: "", | 121 | // ywh: "", |
| 122 | ywly: "", | 122 | // ywly: "", |
| 123 | }; | 123 | // }; |
| 124 | if (this.queryForm) { | 124 | // if (this.queryForm) { |
| 125 | this.$startLoading(); | 125 | // this.$startLoading(); |
| 126 | searchTaskToDo({ | 126 | // searchTaskToDo({ |
| 127 | ...this.queryForm, | 127 | // ...this.queryForm, |
| 128 | }).then((res) => { | 128 | // }).then((res) => { |
| 129 | if (res.code === 200) { | 129 | // if (res.code === 200) { |
| 130 | let { records } = res.result; | 130 | // let { records } = res.result; |
| 131 | 131 | ||
| 132 | this.loadBdcdylist(records[0].bsmSlsq, records[0].bestepid); | 132 | // this.loadBdcdylist(records[0].bsmSlsq, records[0].bestepid); |
| 133 | this.$endLoading(); | 133 | // this.$endLoading(); |
| 134 | } | 134 | // } |
| 135 | }); | 135 | // }); |
| 136 | } | 136 | // } |
| 137 | }, | 137 | // }, |
| 138 | 138 | ||
| 139 | // 获取不动产信息 | 139 | // 获取不动产信息 |
| 140 | /** | 140 | /** |
| ... | @@ -143,25 +143,25 @@ | ... | @@ -143,25 +143,25 @@ |
| 143 | * @param {*} b | 143 | * @param {*} b |
| 144 | * @author: renchao | 144 | * @author: renchao |
| 145 | */ | 145 | */ |
| 146 | loadBdcdylist (a, b) { | 146 | // loadBdcdylist (a, b) { |
| 147 | var formdata = new FormData(); | 147 | // var formdata = new FormData(); |
| 148 | formdata.append("bsmSlsq", a); | 148 | // formdata.append("bsmSlsq", a); |
| 149 | formdata.append("bestepid", b); | 149 | // formdata.append("bestepid", b); |
| 150 | leftMenu(formdata).then((res) => { | 150 | // leftMenu(formdata).then((res) => { |
| 151 | if (res.code === 200) { | 151 | // if (res.code === 200) { |
| 152 | if (res.result) { | 152 | // if (res.result) { |
| 153 | this.currentSelectProps = res.result[0]; | 153 | // this.currentSelectProps = res.result[0]; |
| 154 | this.loadData(this.currentSelectProps.bdcdyh); | 154 | // this.loadData(this.currentSelectProps.bdcdyh); |
| 155 | } | 155 | // } |
| 156 | } | 156 | // } |
| 157 | }); | 157 | // }); |
| 158 | }, | 158 | // }, |
| 159 | 159 | ||
| 160 | /** | 160 | /** |
| 161 | * @description: getBdcdyh | 161 | * @description: getBdcdyh |
| 162 | * @author: miaofang | 162 | * @author: miaofang |
| 163 | * 点击不动产单元号事件 | 163 | * 点击不动产单元号事件 |
| 164 | */ | 164 | */ |
| 165 | getBdcdyh (val) { | 165 | getBdcdyh (val) { |
| 166 | this.addloadData(val); | 166 | this.addloadData(val); |
| 167 | }, | 167 | }, |
| ... | @@ -179,7 +179,7 @@ | ... | @@ -179,7 +179,7 @@ |
| 179 | let index = this.sfqdata.findIndex((item) => { | 179 | let index = this.sfqdata.findIndex((item) => { |
| 180 | return item.bdcdyid == val.bdcdyid; | 180 | return item.bdcdyid == val.bdcdyid; |
| 181 | }); | 181 | }); |
| 182 | this.activeName = index | 182 | this.activeName = index; |
| 183 | } else { | 183 | } else { |
| 184 | this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid)); | 184 | this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid)); |
| 185 | this.activeName = this.sfqdata.length - 1; | 185 | this.activeName = this.sfqdata.length - 1; |
| ... | @@ -198,18 +198,15 @@ | ... | @@ -198,18 +198,15 @@ |
| 198 | * @author: renchao | 198 | * @author: renchao |
| 199 | */ | 199 | */ |
| 200 | loadData (val) { | 200 | loadData (val) { |
| 201 | getBdcqljqtsx({ | 201 | getBdcqljqtsxBdcdyh({ |
| 202 | bdcdyid: this.currentSelectProps.bdcdyid, | ||
| 203 | bdcdyh: val, | 202 | bdcdyh: val, |
| 204 | }).then((res) => { | 203 | }).then((res) => { |
| 205 | if (res.code === 200) { | 204 | if (res.code === 200) { |
| 206 | this.treedata = loadTreeData(val); | 205 | this.treedata = loadTreeData(val); |
| 207 | this.sfqdata.push( | 206 | this.sfqdata.push(loadsfqData(res.result, val, res.result.bdcdyid)); |
| 208 | loadsfqData(res.result, val, this.currentSelectProps.bdcdyid) | ||
| 209 | ); | ||
| 210 | this.$nextTick(function () { | 207 | this.$nextTick(function () { |
| 211 | this.defaultNode = getNode( | 208 | this.defaultNode = getNode( |
| 212 | this.currentSelectProps.qllx, | 209 | res.result.ztqllx, |
| 213 | { linShi: 0, xianShi: 0, liShi: 0 }, | 210 | { linShi: 0, xianShi: 0, liShi: 0 }, |
| 214 | res.result.bdcdylx || "" | 211 | res.result.bdcdylx || "" |
| 215 | ); | 212 | ); |
| ... | @@ -218,64 +215,49 @@ | ... | @@ -218,64 +215,49 @@ |
| 218 | this.loadComponent(item.form); | 215 | this.loadComponent(item.form); |
| 219 | this.isActive = index; | 216 | this.isActive = index; |
| 220 | } | 217 | } |
| 221 | }) | 218 | }); |
| 222 | // this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点 | 219 | this.currentSelectProps = { |
| 223 | // this.loadComponent(this.defaultNode.form); | 220 | bdcdyid: res.result.bdcdyid, |
| 224 | 221 | bdcdyh: val, | |
| 225 | // this.setstyle(0, 0, this.iskey); | 222 | qllx: res.result.qllx, |
| 226 | 223 | bsmQlxx: this.currentSelectProps.bsmQlxx, | |
| 227 | // this.setstyle(0, 0, this.iskey); | 224 | }; |
| 228 | }); | 225 | }) |
| 229 | } | 226 | } |
| 230 | }); | 227 | }) |
| 231 | this.currentSelectProps = { | ||
| 232 | bdcdyid: this.currentSelectProps.bdcdyid, | ||
| 233 | bdcdyh: this.currentSelectProps.bdcdyh, | ||
| 234 | qllx: this.currentSelectProps.qllx, | ||
| 235 | bsmQlxx: this.currentSelectProps.bsmQlxx, | ||
| 236 | }; | ||
| 237 | }, | 228 | }, |
| 238 | /* | 229 | /** |
| 239 | 点击登记簿菜单 | 230 | * @description: 点击登记簿菜单 |
| 240 | */ | 231 | * @param {*} data |
| 232 | * @author: renchao | ||
| 233 | */ | ||
| 241 | handleNodeClick (data) { | 234 | handleNodeClick (data) { |
| 242 | this.loadComponent(data.form); | 235 | this.loadComponent(data.form); |
| 243 | }, | 236 | }, |
| 244 | /* | 237 | tap (data, index) { |
| 245 | 点击登记簿菜单 | 238 | this.loadComponent(data.form); |
| 246 | */ | 239 | }, |
| 247 | /** | 240 | /** |
| 248 | * @description: 点击登记簿菜单 | 241 | * @description: taplist |
| 249 | * @param {*} data | 242 | * @param {*} data |
| 243 | * @author: renchao | ||
| 244 | * 新增列表功能 | ||
| 245 | */ | ||
| 246 | taplist (data, index) { | ||
| 247 | this.loadComponent(data.form); | ||
| 248 | this.isActive = index; | ||
| 249 | }, | ||
| 250 | /** | ||
| 251 | * @description: loadComponent | ||
| 252 | * @param {*} form | ||
| 250 | * @author: renchao | 253 | * @author: renchao |
| 251 | */ | 254 | */ |
| 252 | handleNodeClick (data) { | 255 | loadComponent (form) { |
| 253 | this.loadComponent(data.form); | 256 | this.componentTag = (r) => |
| 254 | }, | 257 | require.ensure([], () => r(require("@/views/registerBook/" + form))); |
| 255 | tap (data, index) { | 258 | } |
| 256 | this.loadComponent(data.form); | ||
| 257 | }, | ||
| 258 | /** | ||
| 259 | * @description: taplist | ||
| 260 | * @param {*} data | ||
| 261 | * @author: renchao | ||
| 262 | * 新增列表功能 | ||
| 263 | */ | ||
| 264 | taplist (data, index) { | ||
| 265 | this.loadComponent(data.form); | ||
| 266 | this.isActive = index; | ||
| 267 | }, | ||
| 268 | /** | ||
| 269 | * @description: loadComponent | ||
| 270 | * @param {*} form | ||
| 271 | * @author: renchao | ||
| 272 | */ | ||
| 273 | loadComponent (form) { | ||
| 274 | this.componentTag = (r) => | ||
| 275 | require.ensure([], () => r(require("@/views/registerBook/" + form))); | ||
| 276 | } | ||
| 277 | } | 259 | } |
| 278 | }; | 260 | } |
| 279 | </script> | 261 | </script> |
| 280 | <style scoped lang="scss"> | 262 | <style scoped lang="scss"> |
| 281 | /deep/.rollTable { | 263 | /deep/.rollTable { |
| ... | @@ -315,8 +297,6 @@ | ... | @@ -315,8 +297,6 @@ |
| 315 | height: 45px; | 297 | height: 45px; |
| 316 | } | 298 | } |
| 317 | 299 | ||
| 318 | |||
| 319 | |||
| 320 | /deep/.el-tree-node { | 300 | /deep/.el-tree-node { |
| 321 | white-space: pre-wrap; | 301 | white-space: pre-wrap; |
| 322 | } | 302 | } |
| ... | @@ -341,6 +321,9 @@ | ... | @@ -341,6 +321,9 @@ |
| 341 | display: inline-block; | 321 | display: inline-block; |
| 342 | line-height: 15px; | 322 | line-height: 15px; |
| 343 | } | 323 | } |
| 324 | height: 45px; | ||
| 325 | border: 1px solid rgb(228, 228, 228); | ||
| 326 | border-right: 4px solid #f5f5f5; | ||
| 344 | } | 327 | } |
| 345 | height: 45px; | 328 | height: 45px; |
| 346 | display: inline-block; | 329 | display: inline-block; |
| ... | @@ -367,9 +350,6 @@ | ... | @@ -367,9 +350,6 @@ |
| 367 | justify-content: center; | 350 | justify-content: center; |
| 368 | align-items: center; | 351 | align-items: center; |
| 369 | } | 352 | } |
| 370 | height: 45px; | ||
| 371 | border: 1px solid rgb(228, 228, 228); | ||
| 372 | border-right: 4px solid #f5f5f5; | ||
| 373 | } | 353 | } |
| 374 | 354 | ||
| 375 | .select { | 355 | .select { | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: miaofang | 3 | * @Autor: miaofang |
| 4 | * @LastEditTime: 2023-10-09 10:49:37 | 4 | * @LastEditTime: 2023-11-10 10:28:56 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <div class="djxxTable"> | 7 | <div class="djxxTable"> |
| ... | @@ -32,7 +32,7 @@ | ... | @@ -32,7 +32,7 @@ |
| 32 | render: false | 32 | render: false |
| 33 | }; | 33 | }; |
| 34 | }, | 34 | }, |
| 35 | created () { | 35 | mounted () { |
| 36 | this.loadData(); | 36 | this.loadData(); |
| 37 | }, | 37 | }, |
| 38 | methods: { | 38 | methods: { | ... | ... |
-
Please register or sign in to post a comment