Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
f2140c02 by renchao@pashanhoo.com
Options

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

2 parents d5cfac56 1dc5ab1f
Expand all
Inline Side-by-side
Showing 6 changed files with 87 additions and 82 deletions
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-15 10:52:40 4 * @LastEditTime: 2023-09-15 10:52:40
5 */ 5 */
...@@ -89,12 +89,12 @@ export function getNode (qllx, qlxx, bdcdylx, bdcdyid) { ...@@ -89,12 +89,12 @@ export function getNode (qllx, qlxx, bdcdylx, bdcdyid) {
89 if (qlxxPage[i].qllx == qllx) { 89 if (qlxxPage[i].qllx == qllx) {
90 if (qllx == "A04" || qllx == "A06" || qllx == "A08") { 90 if (qllx == "A04" || qllx == "A06" || qllx == "A08") {
91 if (bdcdylx == "4") { 91 if (bdcdylx == "4") {
92 node = { bdcdyid: bdcdyid, id: "fdcq1", form: "fdcq1.vue", label: qlxxPage[i].label + "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" }; 92 node = { bdcdyid: bdcdyid, id: "fdcq1", form: "fdcq1.vue", label: qlxxPage[i].label ,zt: "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" };
93 } else { 93 } else {
94 node = { bdcdyid: bdcdyid, id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label + "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" }; 94 node = { bdcdyid: bdcdyid, id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label ,zt: "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" };
95 } 95 }
96 } else { 96 } else {
97 node = { bdcdyid: bdcdyid, id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label + "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" }; 97 node = { bdcdyid: bdcdyid, id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label ,zt: "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" };
98 } 98 }
99 break; 99 break;
100 } 100 }
......
...@@ -26,21 +26,26 @@ ...@@ -26,21 +26,26 @@
26 :name="index" 26 :name="index"
27 > 27 >
28 <template slot="title"> 28 <template slot="title">
29 <span class="text" @click="addlist(item)"> 29 <span class="text" @click="tap(item)">
30 <span> 30 <span>
31 {{ item.label }} 31 {{ item.label }}
32 </span> 32 </span>
33 </span> 33 </span>
34 </template> 34 </template>
35 <el-button 35 <p
36 v-for="(item, index) in item.children" 36 v-for="(item, index) in item.children"
37 :re='item' 37 :re="item"
38 :key="index" 38 :key="index"
39 class="sfqcontent" 39 :class="[isActive == index ? activeCls : '', errorCls]"
40 @click="addlist(item, index)" 40 @click="taplist(item, index)"
41 > 41 >
42 {{ item.label }} 42 <span>
43 </el-button> 43 {{ item.label }}
44 </span>
45 <span>
46 {{ item.zt }}
47 </span>
48 </p>
44 </el-collapse-item> 49 </el-collapse-item>
45 </el-collapse> 50 </el-collapse>
46 </div> 51 </div>
...@@ -79,6 +84,9 @@ export default { ...@@ -79,6 +84,9 @@ export default {
79 queryForm: {}, 84 queryForm: {},
80 85
81 defaultNode: "", 86 defaultNode: "",
87 isActive: "",
88 activeCls: "select",
89 errorCls: "unselected",
82 defaultProps: { 90 defaultProps: {
83 value: "id", 91 value: "id",
84 children: "children", 92 children: "children",
...@@ -176,13 +184,9 @@ export default { ...@@ -176,13 +184,9 @@ export default {
176 return item.bdcdyid == val.bdcdyid; 184 return item.bdcdyid == val.bdcdyid;
177 }); 185 });
178 this.activeName = index 186 this.activeName = index
179 this.setstyle(index, 0, this.iskey);
180 } else { 187 } else {
181 this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid)); 188 this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid));
182 this.activeName = this.sfqdata.length - 1; 189 this.activeName = this.sfqdata.length - 1;
183 this.$nextTick(() => {
184 this.setstyle(this.sfqdata.length - 1, 0, this.iskey);
185 })
186 } 190 }
187 } 191 }
188 }); 192 });
...@@ -215,13 +219,14 @@ export default { ...@@ -215,13 +219,14 @@ export default {
215 ); 219 );
216 this.sfqdata[0].children.forEach((item, index) => { 220 this.sfqdata[0].children.forEach((item, index) => {
217 if (item.id == this.defaultNode.id) { 221 if (item.id == this.defaultNode.id) {
218 this.iskey = index 222 this.loadComponent(item.form);
223 this.isActive = index;
219 } 224 }
220 }) 225 })
221 // this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点 226 // this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
222 // this.loadComponent(this.defaultNode.form); 227 // this.loadComponent(this.defaultNode.form);
223 228
224 this.setstyle(0, 0, this.iskey); 229 // this.setstyle(0, 0, this.iskey);
225 230
226 231
227 }); 232 });
...@@ -252,50 +257,42 @@ export default { ...@@ -252,50 +257,42 @@ export default {
252 * @author: renchao 257 * @author: renchao
253 * 设置样式和点击定位到当前功能 258 * 设置样式和点击定位到当前功能
254 */ 259 */
255 setstyle (newindex, index, key) { 260 // setstyle (newindex, index, key) {
256 if (key != undefined || this.keyy == index) { 261 // if (key != undefined || this.keyy == index) {
257 if (key != undefined) { 262 // if (key != undefined) {
258 this.keyy = key 263 // this.keyy = key
259 } 264 // }
260 this.loadComponent(this.$refs.sfq[newindex].$children[this.keyy].$attrs.re.form); 265 // this.loadComponent(this.$refs.sfq[newindex].$children[this.keyy].$attrs.re.form);
261 let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el 266 // let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el
262 dpme.style.backgroundColor = "#f5f5f5"; 267 // dpme.style.backgroundColor = "#f5f5f5";
263 dpme.style.color = "#0079fe"; 268 // dpme.style.color = "#0079fe";
264 dpme.style.borderRight = "4px solid #0079fe"; 269 // dpme.style.borderRight = "4px solid #0079fe";
265 } else { 270 // } else {
266 let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el 271 // let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el
267 dpme.style.backgroundColor = "#ffffff"; 272 // dpme.style.backgroundColor = "#ffffff";
268 dpme.style.color = "black"; 273 // dpme.style.color = "black";
269 dpme.style.border = "none"; 274 // dpme.style.border = "none";
270 } 275 // }
271 276 // },
272
273
274
275 },
276 /** 277 /**
277 * @description: addlist 278 * @description: tap
278 * @param {*} data 279 * @param {*} data
279 * @author: renchao 280 * @author: renchao
280 * 新增列表功能 281 * 新增列表功能
281 */ 282 */
282 addlist (data, index) { 283 tap(data, index) {
283 if (index != undefined) { 284 this.loadComponent(data.form);
284 let newindex = this.sfqdata.findIndex((item) => { 285 },
285 return item.bdcdyid == data.bdcdyid; 286 /**
286 }); 287 * @description: taplist
287 this.setstyle(newindex, index); 288 * @param {*} data
288 this.currentSelectProps.bdcdyid = data.bdcdyid; 289 * @author: renchao
289 this.loadComponent(data.form); 290 * 新增列表功能
290 } else { 291 */
291 let newindex = this.sfqdata.findIndex((item) => { 292 taplist(data, index) {
292 return item.bdcdyid == data.bdcdyid; 293 this.loadComponent(data.form);
293 }); 294 this.isActive = index;
294 this.setstyle(newindex, index, this.iskey); 295 },
295 this.currentSelectProps.bdcdyid = data.bdcdyid;
296 }
297
298 },
299 /** 296 /**
300 * @description: loadComponent 297 * @description: loadComponent
301 * @param {*} form 298 * @param {*} form
...@@ -390,33 +387,41 @@ export default { ...@@ -390,33 +387,41 @@ export default {
390 /deep/.el-collapse-item__content { 387 /deep/.el-collapse-item__content {
391 padding-bottom: 5px; 388 padding-bottom: 5px;
392 } 389 }
393 /deep/.sfqcontent { 390 /deep/.unselected {
394 white-space: wrap; 391 // white-space: wrap;
395 border: none; 392 border: none;
396 padding: 0;
397 margin: 0;
398 cursor: pointer; 393 cursor: pointer;
399 width: 100%; 394 width: 250px;
400 height: 100px;
401 word-break: break-word;
402 display: inline;
403 span {
404 font-size: 13px;
405 display: block;
406 line-height: 15px;
407 margin-left: 70px;
408 }
409 height: 45px; 395 height: 45px;
410 border: 1px solid rgb(228, 228, 228); 396 border: 1px solid rgb(228, 228, 228);
411 border-right: 4px solid #f5f5f5; 397 border-right: 4px solid #f5f5f5;
398 margin: auto;
399 text-align: center;
400 align-items: center;
401 span {
402 width: 100%;
403 display: inline-block;
404 justify-content: center;
405 align-items: center;
406 }
412 } 407 }
413 .sfqcontent:hover { 408
414 background-color: #f5f5f5; 409 .select {
415 color: black; 410 border: none;
416 } 411 cursor: pointer;
417 .sfqcontent:focus { 412 width: 250px;
413 height: 45px;
418 background-color: #f5f5f5; 414 background-color: #f5f5f5;
419 color: #0079fe; 415 color: #0079fe;
420 border-right: 4px solid #0079fe; 416 border-right: 4px solid #0079fe;
417 margin: auto;
418 text-align: center;
419 align-items: center;
420 span {
421 width: 100%;
422 display: inline-block;
423 justify-content: center;
424 align-items: center;
425 }
421 } 426 }
422 </style> 427 </style>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-08 16:38:43 4 * @LastEditTime: 2023-09-18 15:24:05
5 --> 5 -->
6 <template> 6 <template>
7 <div class="szxx"> 7 <div class="szxx">
...@@ -235,7 +235,7 @@ export default { ...@@ -235,7 +235,7 @@ export default {
235 color: #8b4534; 235 color: #8b4534;
236 } 236 }
237 .szxx_body { 237 .szxx_body {
238 height: 280px; 238 min-height: 280px;
239 } 239 }
240 } 240 }
241 .zs-card { 241 .zs-card {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 11:19:54 4 * @LastEditTime: 2023-09-18 16:22:28
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
8 <el-tabs type="card" v-model="activeName" @tab-click="handleTabClick" v-if="!isJump"> 8 <el-tabs type="card" v-model="activeName" @tab-click="handleTabClick" v-if="!isJump">
9 <el-tab-pane label="自然幢" name="zrz"></el-tab-pane> 9 <el-tab-pane label="自然幢" name="zrz"></el-tab-pane>
10 <el-tab-pane label="多幢" name="dz"></el-tab-pane> 10 <el-tab-pane label="多幢" name="dz" v-if="sqywInfo.djywbm !== 'B37100'"></el-tab-pane>
11 </el-tabs> 11 </el-tabs>
12 <div v-show="activeName == 'zrz'"> 12 <div v-show="activeName == 'zrz'">
13 <div class="from-clues-header"> 13 <div class="from-clues-header">
...@@ -336,8 +336,8 @@ ...@@ -336,8 +336,8 @@
336 let refs = 'table1'; 336 let refs = 'table1';
337 if (this.activeName == 'dz') { 337 if (this.activeName == 'dz') {
338 refs = 'table'; 338 refs = 'table';
339 this.$refs[refs].clearSelection() 339 }else{
340 } else { 340 this.sqywInfo.djywbm !== 'B37100' && this.$refs[refs].clearSelection()
341 } 341 }
342 const bdcdysz = this.bdcdysz 342 const bdcdysz = this.bdcdysz
343 if (bdcdysz.length > 0) { 343 if (bdcdysz.length > 0) {
......
...@@ -40,7 +40,7 @@ export function queueDjywmc (djywbm, djqxbm) { ...@@ -40,7 +40,7 @@ export function queueDjywmc (djywbm, djqxbm) {
40 case "A04100"://国有建设用地使用权/房屋所有权(首次登记) 40 case "A04100"://国有建设用地使用权/房屋所有权(首次登记)
41 case "A06100": // 宅基地使用权/房屋所有权 || 首次登记 41 case "A06100": // 宅基地使用权/房屋所有权 || 首次登记
42 case "A08100": // 集体建设用地使用权/房屋所有权 || 首次登记 42 case "A08100": // 集体建设用地使用权/房屋所有权 || 首次登记
43 case "B37100": 43 case "B37100": // 在建工程抵押权 || 首次登记
44 vm = "fwsyq"; 44 vm = "fwsyq";
45 break; 45 break;
46 case "A04200": //国有建设用地使用权/房屋所有权 || 转移登记 46 case "A04200": //国有建设用地使用权/房屋所有权 || 转移登记
......