e184c474 by renchao@pashanhoo.com

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents 6cd576b7 83880f4d
...@@ -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 import { log } from 'bpmn-js-token-simulation';
2 import { mapGetters } from 'vuex' 1 import { mapGetters } from 'vuex'
3 import { defaultParameters } from "../../views/ywbl/ywsq/javascript/publicDefaultPar"; 2 import { defaultParameters } from "../../views/ywbl/ywsq/javascript/publicDefaultPar";
4 export default { 3 export default {
...@@ -28,7 +27,6 @@ export default { ...@@ -28,7 +27,6 @@ export default {
28 */ 27 */
29 handkeyCode (e) { 28 handkeyCode (e) {
30 if (e.keyCode === 13) { 29 if (e.keyCode === 13) {
31 console.log("安");
32 this.handleSearch() 30 this.handleSearch()
33 } 31 }
34 }, 32 },
......
1
1 /* 2 /*
2 * @Description: 3 * @Description:
3 * @Autor: renchao 4 * @Autor: renchao
......
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
14 :default-expand-all="true" 14 :default-expand-all="true"
15 :expand-on-click-node="false" 15 :expand-on-click-node="false"
16 node-key="id" 16 node-key="id"
17 :default-checked-keys="[showTab]"> 17 :default-checked-keys="[showTab]"
18 >
18 </el-tree> 19 </el-tree>
19 <el-collapse v-model="activeName" accordion> 20 <el-collapse v-model="activeName" accordion>
20 <el-collapse-item 21 <el-collapse-item
...@@ -22,7 +23,8 @@ ...@@ -22,7 +23,8 @@
22 ref="sfq" 23 ref="sfq"
23 v-for="(item, index) in sfqdata" 24 v-for="(item, index) in sfqdata"
24 :key="index" 25 :key="index"
25 :name="index"> 26 :name="index"
27 >
26 <template slot="title"> 28 <template slot="title">
27 <span class="text" @click="tap(item)"> 29 <span class="text" @click="tap(item)">
28 <span> 30 <span>
...@@ -35,7 +37,8 @@ ...@@ -35,7 +37,8 @@
35 :re="item" 37 :re="item"
36 :key="index" 38 :key="index"
37 :class="[isActive == index ? activeCls : '', errorCls]" 39 :class="[isActive == index ? activeCls : '', errorCls]"
38 @click="taplist(item, index)"> 40 @click="taplist(item, index)"
41 >
39 <span> 42 <span>
40 {{ item.label }} 43 {{ item.label }}
41 </span> 44 </span>
...@@ -50,374 +53,370 @@ ...@@ -50,374 +53,370 @@
50 <component 53 <component
51 :is="componentTag" 54 :is="componentTag"
52 @getBdcdyh="getBdcdyh" 55 @getBdcdyh="getBdcdyh"
53 v-bind="currentSelectProps" /> 56 v-bind="currentSelectProps"
57 />
54 </div> 58 </div>
55 </div> 59 </div>
56 </template> 60 </template>
57 <script> 61 <script>
58 import { getBdcqljqtsx } from "@/api/djbDetail.js"; 62 import { getBdcqljqtsx, getBdcqljqtsxBdcdyh } from "@/api/djbDetail.js";
59 import { loadTreeData, loadsfqData, getNode } from "./djbFrameData.js"; 63 import { loadTreeData, loadsfqData, getNode } from "./djbFrameData.js";
60 import { searchTaskToDo } from "@/api/workflow/search.js"; 64 import { searchTaskToDo } from "@/api/workflow/search.js";
61 import { leftMenu } from "@/api/workFlow.js"; 65 import { leftMenu } from "@/api/workFlow.js";
62 export default { 66 export default {
63 data () { 67 data() {
64 return { 68 return {
65 //接收参数 69 //接收参数
66 // propsParam: this.$attrs, 70 // propsParam: this.$attrs,
67 //左侧目录 71 //左侧目录
68 catalog: {}, 72 catalog: {},
69 //选择加载哪一个组件 73 //选择加载哪一个组件
70 componentTag: "", 74 componentTag: "",
71 //子组件接收参数 75 //子组件接收参数
72 currentSelectProps: {}, 76 currentSelectProps: {},
73 //左侧树形结构数据 77 //左侧树形结构数据
74 treedata: [], 78 treedata: [],
75 sfqdata: [], 79 sfqdata: [],
76 keyy: "", 80 keyy: "",
77 iskey: "", 81 iskey: "",
78 activeName: 0, 82 activeName: 0,
79 // 查询参数 83 // 查询参数
80 queryForm: {}, 84 queryForm: {},
81 85
82 defaultNode: "", 86 defaultNode: "",
83 isActive: "", 87 isActive: "",
84 activeCls: "select", 88 activeCls: "select",
85 errorCls: "unselected", 89 errorCls: "unselected",
86 defaultProps: { 90 defaultProps: {
87 value: "id", 91 value: "id",
88 children: "children", 92 children: "children",
89 label: "label", 93 label: "label",
90 },
91 showTab: "bdcqldjml", // 选中状态,根据表格中权利类型判断
92 };
93 },
94 mounted () {
95 this.getdata();
96 },
97 methods: {
98 // 截取字符的方法
99 /**
100 * @description: 截取字符的方法
101 * @param {*} obj
102 * @author: renchao
103 */
104 getCaption (obj) {
105 let index = obj.lastIndexOf("=");
106 obj = obj.substring(index + 1, obj.length);
107 return obj;
108 }, 94 },
109 // 通过不动产业务号获取参数 95 showTab: "bdcqldjml", // 选中状态,根据表格中权利类型判断
110 /** 96 };
111 * @description: 通过不动产业务号获取参数 97 },
112 * @author: renchao 98 mounted() {
113 */ 99 this.loadData(this.getCaption(window.location.href));
114 getdata () { 100 },
115 this.queryForm = { 101 methods: {
116 bdcdyh: this.getCaption(window.location.href), 102 // 截取字符的方法
117 currentPage: 1, 103 /**
118 djlx: "", 104 * @description: 截取字符的方法
119 pageSize: 10, 105 * @param {*} obj
120 qllx: "", 106 * @author: renchao
121 ywh: "", 107 */
122 ywly: "", 108 getCaption(obj) {
123 }; 109 let index = obj.lastIndexOf("=");
124 if (this.queryForm) { 110 obj = obj.substring(index + 1, obj.length);
125 this.$startLoading(); 111 return obj;
126 searchTaskToDo({ 112 },
127 ...this.queryForm, 113 // 通过不动产业务号获取参数
128 }).then((res) => { 114 /**
129 if (res.code === 200) { 115 * @description: 通过不动产业务号获取参数
130 let { records } = res.result; 116 * @author: renchao
117 */
118 // getdata () {
119 // this.queryForm = {
120 // bdcdyh: this.getCaption(window.location.href),
121 // currentPage: 1,
122 // djlx: "",
123 // pageSize: 10,
124 // qllx: "",
125 // ywh: "",
126 // ywly: "",
127 // };
128 // if (this.queryForm) {
129 // this.$startLoading();
130 // searchTaskToDo({
131 // ...this.queryForm,
132 // }).then((res) => {
133 // if (res.code === 200) {
134 // let { records } = res.result;
131 135
132 this.loadBdcdylist(records[0].bsmSlsq, records[0].bestepid); 136 // this.loadBdcdylist(records[0].bsmSlsq, records[0].bestepid);
133 this.$endLoading(); 137 // this.$endLoading();
134 } 138 // }
135 }); 139 // });
136 } 140 // }
137 }, 141 // },
138 142
139 // 获取不动产信息 143 // 获取不动产信息
140 /** 144 /**
141 * @description: 获取不动产信息 145 * @description: 获取不动产信息
142 * @param {*} a 146 * @param {*} a
143 * @param {*} b 147 * @param {*} b
144 * @author: renchao 148 * @author: renchao
145 */ 149 */
146 loadBdcdylist (a, b) { 150 // loadBdcdylist (a, b) {
147 var formdata = new FormData(); 151 // var formdata = new FormData();
148 formdata.append("bsmSlsq", a); 152 // formdata.append("bsmSlsq", a);
149 formdata.append("bestepid", b); 153 // formdata.append("bestepid", b);
150 leftMenu(formdata).then((res) => { 154 // leftMenu(formdata).then((res) => {
151 if (res.code === 200) { 155 // if (res.code === 200) {
152 if (res.result) { 156 // if (res.result) {
153 this.currentSelectProps = res.result[0]; 157 // this.currentSelectProps = res.result[0];
154 this.loadData(this.currentSelectProps.bdcdyh); 158 // this.loadData(this.currentSelectProps.bdcdyh);
155 } 159 // }
156 } 160 // }
157 }); 161 // });
158 }, 162 // },
159 163
160 /** 164 /**
161 * @description: getBdcdyh 165 * @description: getBdcdyh
162 * @author: miaofang 166 * @author: miaofang
163 * 点击不动产单元号事件 167 * 点击不动产单元号事件
164 */ 168 */
165 getBdcdyh (val) { 169 getBdcdyh(val) {
166 this.addloadData(val); 170 this.addloadData(val);
167 }, 171 },
168 /** 172 /**
169 * @description: addloadData 173 * @description: addloadData
170 * @author: miaofang 174 * @author: miaofang
171 */ 175 */
172 addloadData (val) { 176 addloadData(val) {
173 getBdcqljqtsx({ 177 getBdcqljqtsx({
174 bdcdyid: val.bdcdyid, 178 bdcdyid: val.bdcdyid,
175 bdcdyh: val.bdcdyh, 179 bdcdyh: val.bdcdyh,
176 }).then((res) => { 180 }).then((res) => {
177 if (res.code === 200) { 181 if (res.code === 200) {
178 if (this.sfqdata.some((item) => item.bdcdyid === val.bdcdyid)) { 182 if (this.sfqdata.some((item) => item.bdcdyid === val.bdcdyid)) {
179 let index = this.sfqdata.findIndex((item) => { 183 let index = this.sfqdata.findIndex((item) => {
180 return item.bdcdyid == val.bdcdyid; 184 return item.bdcdyid == val.bdcdyid;
181 }); 185 });
182 this.activeName = index 186 this.activeName = index;
183 } else { 187 } else {
184 this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid)); 188 this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid));
185 this.activeName = this.sfqdata.length - 1; 189 this.activeName = this.sfqdata.length - 1;
186 }
187 } 190 }
188 }); 191 }
189 this.currentSelectProps = { 192 });
190 bdcdyid: val.bdcdyid, 193 this.currentSelectProps = {
191 bdcdyh: val.bdcdyh, 194 bdcdyid: val.bdcdyid,
192 qllx: this.currentSelectProps.qllx, 195 bdcdyh: val.bdcdyh,
193 bsmQlxx: this.currentSelectProps.bsmQlxx, 196 qllx: this.currentSelectProps.qllx,
194 }; 197 bsmQlxx: this.currentSelectProps.bsmQlxx,
195 }, 198 };
196 /** 199 },
197 * @description: loadData 200 /**
198 * @author: renchao 201 * @description: loadData
199 */ 202 * @author: renchao
200 loadData (val) { 203 */
201 getBdcqljqtsx({ 204 loadData(val) {
202 bdcdyid: this.currentSelectProps.bdcdyid, 205 getBdcqljqtsxBdcdyh({
203 bdcdyh: val, 206 bdcdyh: val,
204 }).then((res) => { 207 }).then((res) => {
205 if (res.code === 200) { 208 if (res.code === 200) {
206 this.treedata = loadTreeData(val); 209 this.treedata = loadTreeData(val);
207 this.sfqdata.push( 210 this.sfqdata.push(loadsfqData(res.result, val, res.result.bdcdyid));
208 loadsfqData(res.result, val, this.currentSelectProps.bdcdyid) 211 this.$nextTick(function () {
212 this.defaultNode = getNode(
213 res.result.ztqllx,
214 { linShi: 0, xianShi: 0, liShi: 0 },
215 res.result.bdcdylx || ""
209 ); 216 );
210 this.$nextTick(function () { 217 this.sfqdata[0].children.forEach((item, index) => {
211 this.defaultNode = getNode( 218 if (item.id == this.defaultNode.id) {
212 this.currentSelectProps.qllx, 219 this.loadComponent(item.form);
213 { linShi: 0, xianShi: 0, liShi: 0 }, 220 this.isActive = index;
214 res.result.bdcdylx || "" 221 }
215 );
216 this.sfqdata[0].children.forEach((item, index) => {
217 if (item.id == this.defaultNode.id) {
218 this.loadComponent(item.form);
219 this.isActive = index;
220 }
221 })
222 // this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
223 // this.loadComponent(this.defaultNode.form);
224
225 // this.setstyle(0, 0, this.iskey);
226
227
228 }); 222 });
229 } 223 this.currentSelectProps = {
230 }); 224 bdcdyid: res.result.bdcdyid,
231 this.currentSelectProps = { 225 bdcdyh: val,
232 bdcdyid: this.currentSelectProps.bdcdyid, 226 qllx: res.result.qllx,
233 bdcdyh: this.currentSelectProps.bdcdyh, 227 bsmQlxx: this.currentSelectProps.bsmQlxx,
234 qllx: this.currentSelectProps.qllx, 228 };
235 bsmQlxx: this.currentSelectProps.bsmQlxx, 229 // this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
236 }; 230 // this.loadComponent(this.defaultNode.form);
237 }, 231
238 /* 232 // this.setstyle(0, 0, this.iskey);
233 });
234 }
235 });
236 },
237 /*
239 点击登记簿菜单 238 点击登记簿菜单
240 */ 239 */
241 /** 240 /**
242 * @description: 点击登记簿菜单 241 * @description: 点击登记簿菜单
243 * @param {*} data 242 * @param {*} data
244 * @author: renchao 243 * @author: renchao
245 */ 244 */
246 handleNodeClick (data) { 245 handleNodeClick(data) {
247 this.loadComponent(data.form); 246 this.loadComponent(data.form);
248 }, 247 },
249 248
250 /** 249 /**
251 * @description: setstyle 250 * @description: setstyle
252 * @param {*} data 251 * @param {*} data
253 * @author: renchao 252 * @author: renchao
254 * 设置样式和点击定位到当前功能 253 * 设置样式和点击定位到当前功能
255 */ 254 */
256 // setstyle (newindex, index, key) { 255 // setstyle (newindex, index, key) {
257 // if (key != undefined || this.keyy == index) { 256 // if (key != undefined || this.keyy == index) {
258 // if (key != undefined) { 257 // if (key != undefined) {
259 // this.keyy = key 258 // this.keyy = key
260 // } 259 // }
261 // this.loadComponent(this.$refs.sfq[newindex].$children[this.keyy].$attrs.re.form); 260 // this.loadComponent(this.$refs.sfq[newindex].$children[this.keyy].$attrs.re.form);
262 // let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el 261 // let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el
263 // dpme.style.backgroundColor = "#f5f5f5"; 262 // dpme.style.backgroundColor = "#f5f5f5";
264 // dpme.style.color = "#0079fe"; 263 // dpme.style.color = "#0079fe";
265 // dpme.style.borderRight = "4px solid #0079fe"; 264 // dpme.style.borderRight = "4px solid #0079fe";
266 // } else { 265 // } else {
267 // let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el 266 // let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el
268 // dpme.style.backgroundColor = "#ffffff"; 267 // dpme.style.backgroundColor = "#ffffff";
269 // dpme.style.color = "black"; 268 // dpme.style.color = "black";
270 // dpme.style.border = "none"; 269 // dpme.style.border = "none";
271 // } 270 // }
272 // }, 271 // },
273 /** 272 /**
274 * @description: tap 273 * @description: tap
275 * @param {*} data 274 * @param {*} data
276 * @author: renchao 275 * @author: renchao
277 * 新增列表功能 276 * 新增列表功能
278 */ 277 */
279 tap (data, index) { 278 tap(data, index) {
280 this.loadComponent(data.form); 279 this.loadComponent(data.form);
281 }, 280 },
282 /** 281 /**
283 * @description: taplist 282 * @description: taplist
284 * @param {*} data 283 * @param {*} data
285 * @author: renchao 284 * @author: renchao
286 * 新增列表功能 285 * 新增列表功能
287 */ 286 */
288 taplist (data, index) { 287 taplist(data, index) {
289 this.loadComponent(data.form); 288 this.loadComponent(data.form);
290 this.isActive = index; 289 this.isActive = index;
291 }, 290 },
292 /** 291 /**
293 * @description: loadComponent 292 * @description: loadComponent
294 * @param {*} form 293 * @param {*} form
295 * @author: renchao 294 * @author: renchao
296 */ 295 */
297 loadComponent (form) { 296 loadComponent(form) {
298 this.componentTag = (r) => 297 this.componentTag = (r) =>
299 require.ensure([], () => r(require("@/views/registerBook/" + form))); 298 require.ensure([], () => r(require("@/views/registerBook/" + form)));
300 },
301 }, 299 },
302 }; 300 },
301 };
303 </script> 302 </script>
304 <style scoped lang="scss"> 303 <style scoped lang="scss">
305 /deep/.rollTable { 304 /deep/.rollTable {
306 height: calc(120vh - 254px) !important; 305 height: calc(120vh - 254px) !important;
307 } 306 }
308
309 .content {
310 width: 100%;
311 height: 100%;
312 display: flex;
313
314 .left {
315 width: 256px;
316 height: 100%;
317 background-color: #f5f5f5;
318 color: #333;
319 border: 1px solid rgb(228, 228, 228);
320 }
321 307
322 .right { 308 .content {
323 width: calc(100% - 256px); 309 width: 100%;
324 height: 100%; 310 height: 100%;
325 // overflow-y: scroll; 311 display: flex;
326 overflow: auto;
327 background-color: #f5f5f5;
328 border: 1px solid rgb(228, 228, 228);
329 }
330 }
331 312
332 /deep/ .expanded.el-tree-node__expand-icon, 313 .left {
333 /deep/ .el-tree-node__expand-icon { 314 width: 256px;
334 visibility: hidden; 315 height: 100%;
316 background-color: #f5f5f5;
317 color: #333;
318 border: 1px solid rgb(228, 228, 228);
335 } 319 }
336 320
337 /deep/ .el-tree-node__content { 321 .right {
322 width: calc(100% - 256px);
323 height: 100%;
324 // overflow-y: scroll;
325 overflow: auto;
326 background-color: #f5f5f5;
338 border: 1px solid rgb(228, 228, 228); 327 border: 1px solid rgb(228, 228, 228);
339 height: 45px;
340 } 328 }
329 }
341 330
342 /deep/ .el-tree-node:focus > .el-tree-node__content { 331 /deep/ .expanded.el-tree-node__expand-icon,
343 // background-color: #f5f5f5; 332 /deep/ .el-tree-node__expand-icon {
344 // color: #0079fe; 333 visibility: hidden;
345 // border-right: 4px solid #0079fe; 334 }
346 }
347 335
348 /deep/.el-tree-node { 336 /deep/ .el-tree-node__content {
349 white-space: pre-wrap; 337 border: 1px solid rgb(228, 228, 228);
350 } 338 height: 45px;
339 }
340
341 /deep/ .el-tree-node:focus > .el-tree-node__content {
342 // background-color: #f5f5f5;
343 // color: #0079fe;
344 // border-right: 4px solid #0079fe;
345 }
351 346
352 /deep/ .is-current > .el-tree-node__content { 347 /deep/.el-tree-node {
353 // background-color: #f5f5f5; 348 white-space: pre-wrap;
354 // color: #0079fe; 349 }
355 // border-right: 4px solid #0079fe; 350
351 /deep/ .is-current > .el-tree-node__content {
352 // background-color: #f5f5f5;
353 // color: #0079fe;
354 // border-right: 4px solid #0079fe;
355 }
356 /deep/.el-collapse-item__header {
357 width: 100%;
358 cursor: pointer;
359 position: relative;
360 .el-collapse-item__arrow {
361 position: absolute;
362 top: 15px;
363 right: 0px;
356 } 364 }
357 /deep/.el-collapse-item__header { 365 align-items: center;
366 .text {
358 width: 100%; 367 width: 100%;
359 cursor: pointer;
360 position: relative;
361 .el-collapse-item__arrow {
362 position: absolute;
363 top: 15px;
364 right: 0px;
365 }
366 align-items: center;
367 .text {
368 width: 100%;
369 height: 45px;
370 display: inline-block;
371 span {
372 margin-left: 60px;
373 padding-top: 10px;
374 display: inline-block;
375 line-height: 15px;
376 }
377 }
378 height: 45px; 368 height: 45px;
379 display: inline-block; 369 display: inline-block;
380 line-height: 45px;
381 border: 1px solid rgb(228, 228, 228);
382 }
383 /deep/.el-collapse-item__content {
384 padding-bottom: 5px;
385 }
386 /deep/.unselected {
387 // white-space: wrap;
388 border: none;
389 cursor: pointer;
390 width: 250px;
391 height: 45px;
392 border: 1px solid rgb(228, 228, 228);
393 border-right: 4px solid #f5f5f5;
394 margin: auto;
395 text-align: center;
396 align-items: center;
397 span { 370 span {
398 width: 100%; 371 margin-left: 60px;
372 padding-top: 10px;
399 display: inline-block; 373 display: inline-block;
400 justify-content: center; 374 line-height: 15px;
401 align-items: center;
402 } 375 }
403 } 376 }
377 height: 45px;
378 display: inline-block;
379 line-height: 45px;
380 border: 1px solid rgb(228, 228, 228);
381 }
382 /deep/.el-collapse-item__content {
383 padding-bottom: 5px;
384 }
385 /deep/.unselected {
386 // white-space: wrap;
387 border: none;
388 cursor: pointer;
389 width: 250px;
390 height: 45px;
391 border: 1px solid rgb(228, 228, 228);
392 border-right: 4px solid #f5f5f5;
393 margin: auto;
394 text-align: center;
395 align-items: center;
396 span {
397 width: 100%;
398 display: inline-block;
399 justify-content: center;
400 align-items: center;
401 }
402 }
404 403
405 .select { 404 .select {
406 border: none; 405 border: none;
407 cursor: pointer; 406 cursor: pointer;
408 width: 250px; 407 width: 250px;
409 height: 45px; 408 height: 45px;
410 background-color: #f5f5f5; 409 background-color: #f5f5f5;
411 color: #0079fe; 410 color: #0079fe;
412 border-right: 4px solid #0079fe; 411 border-right: 4px solid #0079fe;
413 margin: auto; 412 margin: auto;
414 text-align: center; 413 text-align: center;
414 align-items: center;
415 span {
416 width: 100%;
417 display: inline-block;
418 justify-content: center;
415 align-items: center; 419 align-items: center;
416 span {
417 width: 100%;
418 display: inline-block;
419 justify-content: center;
420 align-items: center;
421 }
422 } 420 }
421 }
423 </style> 422 </style>
......