c1f411b1 by xiaomiao

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

2 parents 9d1e29f6 f660a05b
...@@ -66,3 +66,15 @@ export function choiceBdcdy (data) { ...@@ -66,3 +66,15 @@ export function choiceBdcdy (data) {
66 }) 66 })
67 } 67 }
68 68
69 /**
70 * @description: 选择补录权利信息
71 * @param {*} data
72 * @author: renchao
73 */
74 export function selectRepairQlxx (data) {
75 return request({
76 url: 'ywbl/ywsq/selectRepairQlxx',
77 method: 'post',
78 data
79 })
80 }
......
...@@ -31,7 +31,7 @@ export function getleftMenu () { ...@@ -31,7 +31,7 @@ export function getleftMenu () {
31 } 31 }
32 32
33 /** 33 /**
34 * @description: 登记簿补录-获取左侧菜单 34 * @description: 登记簿补录
35 * @author: renchao 35 * @author: renchao
36 */ 36 */
37 export function getRepairBiz () { 37 export function getRepairBiz () {
...@@ -42,6 +42,17 @@ export function getleftMenu () { ...@@ -42,6 +42,17 @@ export function getleftMenu () {
42 } 42 }
43 43
44 /** 44 /**
45 * @description: 一并申请业务
46 * @author: renchao
47 */
48 export function getTogetherBiz () {
49 return request({
50 url: SERVER.SERVERAPI + '/rest/ywbl/BusinessApply/getTogetherBiz',
51 method: 'post'
52 })
53 }
54
55 /**
45 * @description: 业务办理-获取下个节点内容 56 * @description: 业务办理-获取下个节点内容
46 * @param {*} bsmSqyw 57 * @param {*} bsmSqyw
47 * @author: renchao 58 * @author: renchao
...@@ -66,18 +77,6 @@ export function selectScBdcdy (data) { ...@@ -66,18 +77,6 @@ export function selectScBdcdy (data) {
66 }) 77 })
67 } 78 }
68 79
69 // /*
70 // 业务办理-选择单元-根据条件进行列表查询-房屋所有权
71 // */
72 // export function selectFwsyq (data) {
73 // return request({
74 // url: 'ywbl/ywsq/selectFwsyq',
75 // method: 'post',
76 // data
77 // showLoading: true
78 // })
79 // }
80
81 /** 80 /**
82 * @description: 待办箱列表查询接口 81 * @description: 待办箱列表查询接口
83 * @param {*} data 82 * @param {*} data
...@@ -116,7 +115,7 @@ export function startBusinessFlow (data) { ...@@ -116,7 +115,7 @@ export function startBusinessFlow (data) {
116 } 115 }
117 116
118 /** 117 /**
119 * @description: 业务办理-发起业务申请流程 118 * @description: 业务办理-发起补录申请流程
120 * @param {*} data 119 * @param {*} data
121 * @author: renchao 120 * @author: renchao
122 */ 121 */
...@@ -192,7 +191,7 @@ export function addCollectBiz (bsmSqyw) { ...@@ -192,7 +191,7 @@ export function addCollectBiz (bsmSqyw) {
192 } 191 }
193 192
194 /** 193 /**
195 * @description: 业务办理-业务申请-添加收藏业务 194 * @description: 业务办理-业务申请-取消收藏业务
196 * @param {*} bsmSqyw 195 * @param {*} bsmSqyw
197 * @author: renchao 196 * @author: renchao
198 */ 197 */
......
...@@ -24,12 +24,16 @@ class data extends filter { ...@@ -24,12 +24,16 @@ class data extends filter {
24 label: "历史", 24 label: "历史",
25 }, 25 },
26 ], 26 ],
27 JSYDSYQ: [ 27 JSYDSYQ: [
28 { 28 {
29 prop: "qszt", 29 prop: "qszt",
30 label: "权属状态", 30 label: "权属状态",
31 }, 31 },
32 { 32 {
33 prop: "sjlx",
34 label: "数据类型",
35 },
36 {
33 prop: "qllxmc", 37 prop: "qllxmc",
34 label: "权利类型", 38 label: "权利类型",
35 }, 39 },
...@@ -78,8 +82,8 @@ class data extends filter { ...@@ -78,8 +82,8 @@ class data extends filter {
78 label: "证件号", 82 label: "证件号",
79 }, 83 },
80 { 84 {
81 prop: "mj", 85 prop: "mjmc",
82 label: "使用权面积(m²)", 86 label: "使用权面积",
83 }, 87 },
84 { 88 {
85 prop: "qlxzmc", 89 prop: "qlxzmc",
...@@ -130,12 +134,16 @@ class data extends filter { ...@@ -130,12 +134,16 @@ class data extends filter {
130 label: "附记", 134 label: "附记",
131 }, 135 },
132 ], 136 ],
133 FDCQ2: [ 137 FDCQ2: [
134 { 138 {
135 prop: "qszt", 139 prop: "qszt",
136 label: "权属状态", 140 label: "权属状态",
137 }, 141 },
138 { 142 {
143 prop: "sjlx",
144 label: "数据类型",
145 },
146 {
139 prop: "qllxmc", 147 prop: "qllxmc",
140 label: "权利类型", 148 label: "权利类型",
141 }, 149 },
...@@ -265,12 +273,16 @@ class data extends filter { ...@@ -265,12 +273,16 @@ class data extends filter {
265 label: "附记", 273 label: "附记",
266 }, 274 },
267 ], 275 ],
268 NYDSYQ: [ 276 NYDSYQ: [
269 { 277 {
270 prop: "qszt", 278 prop: "qszt",
271 label: "权属状态", 279 label: "权属状态",
272 }, 280 },
273 { 281 {
282 prop: "sjlx",
283 label: "数据类型",
284 },
285 {
274 prop: "qllxmc", 286 prop: "qllxmc",
275 label: "权利类型", 287 label: "权利类型",
276 }, 288 },
...@@ -391,12 +403,16 @@ class data extends filter { ...@@ -391,12 +403,16 @@ class data extends filter {
391 label: "附记", 403 label: "附记",
392 }, 404 },
393 ], 405 ],
394 DYAQ: [ 406 DYAQ: [
395 { 407 {
396 prop: "qszt", 408 prop: "qszt",
397 label: "权属状态", 409 label: "权属状态",
398 }, 410 },
399 { 411 {
412 prop: "sjlx",
413 label: "数据类型",
414 },
415 {
400 prop: "dybdclx", 416 prop: "dybdclx",
401 label: "抵押不动产类型", 417 label: "抵押不动产类型",
402 }, 418 },
...@@ -547,12 +563,16 @@ class data extends filter { ...@@ -547,12 +563,16 @@ class data extends filter {
547 }, 563 },
548 564
549 ], 565 ],
550 DYIQ: [ 566 DYIQ: [
551 { 567 {
552 prop: "qszt", 568 prop: "qszt",
553 label: "权属状态", 569 label: "权属状态",
554 }, 570 },
555 { 571 {
572 prop: "sjlx",
573 label: "数据类型",
574 },
575 {
556 prop: "djlxmc", 576 prop: "djlxmc",
557 label: "登记类型", 577 label: "登记类型",
558 }, 578 },
...@@ -637,12 +657,16 @@ class data extends filter { ...@@ -637,12 +657,16 @@ class data extends filter {
637 label: "登记时间", 657 label: "登记时间",
638 }, 658 },
639 ], 659 ],
640 YGDJ: [ 660 YGDJ: [
641 { 661 {
642 prop: "qszt", 662 prop: "qszt",
643 label: "权属状态", 663 label: "权属状态",
644 }, 664 },
645 { 665 {
666 prop: "sjlx",
667 label: "数据类型",
668 },
669 {
646 prop: "ygdjzl", 670 prop: "ygdjzl",
647 label: "预告登记种类", 671 label: "预告登记种类",
648 }, 672 },
...@@ -759,12 +783,16 @@ class data extends filter { ...@@ -759,12 +783,16 @@ class data extends filter {
759 label: "注销时间", 783 label: "注销时间",
760 } 784 }
761 ], 785 ],
762 CFDJ: [ 786 CFDJ: [
763 { 787 {
764 prop: "qszt", 788 prop: "qszt",
765 label: "权属状态", 789 label: "权属状态",
766 }, 790 },
767 { 791 {
792 prop: "sjlx",
793 label: "数据类型",
794 },
795 {
768 prop: "cflxmc", 796 prop: "cflxmc",
769 label: "查封类型", 797 label: "查封类型",
770 }, 798 },
...@@ -868,6 +896,10 @@ class data extends filter { ...@@ -868,6 +896,10 @@ class data extends filter {
868 ], 896 ],
869 YYDJ: [ 897 YYDJ: [
870 { 898 {
899 prop: "sjlx",
900 label: "数据类型",
901 },
902 {
871 prop: "qszt", 903 prop: "qszt",
872 label: "权属状态", 904 label: "权属状态",
873 }, 905 },
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
56 import store from '@/store/index.js' 56 import store from '@/store/index.js'
57 import table from "@/utils/mixin/table"; 57 import table from "@/utils/mixin/table";
58 import { datas, sendThis } from "../javascript/selectDjbbl.js"; 58 import { datas, sendThis } from "../javascript/selectDjbbl.js";
59 import { getDjbBysearch } from "@/api/zhcx.js"; 59 import { selectRepairQlxx } from "@/api/selectQlxx.js";
60 import jump from "../components/mixin/djbbljump"; 60 import jump from "../components/mixin/djbbljump";
61 export default { 61 export default {
62 name: "djbcx", 62 name: "djbcx",
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
100 // 初始化数据 100 // 初始化数据
101 queryClick () { 101 queryClick () {
102 this.$startLoading() 102 this.$startLoading()
103 getDjbBysearch({ ...this.queryForm, ...this.pageData }).then((res) => { 103 selectRepairQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
104 this.$endLoading() 104 this.$endLoading()
105 if (res.code === 200) { 105 if (res.code === 200) {
106 let { total, records } = res.result; 106 let { total, records } = res.result;
......
...@@ -29,7 +29,18 @@ ...@@ -29,7 +29,18 @@
29 </ul> 29 </ul>
30 </div> 30 </div>
31 <!-- 一并申请 --> 31 <!-- 一并申请 -->
32 <div v-if="selectType == 'together'" class="right-title">一并申请</div> 32 <div v-if="selectType == 'together'" class="right-situation el-card">
33 <div class="right-title">一并申请</div>
34 <ul>
35 <li :class="item.selected ? 'cactive' : ''" v-for="(item, index) in djqxList" :key="index"
36 @dblclick="dblclick(djqxList, index, item)" @click="selectSqywClick(djqxList, index)">
37 <dt>{{ item.nodename }}</dt>
38 <p :class="item.userCollect == 1 ? 'active' : ''" @click.stop="handleCollection(item)">
39 <i class="el-icon-star-off"></i>
40 </p>
41 </li>
42 </ul>
43 </div>
33 <!-- 登记簿补录 --> 44 <!-- 登记簿补录 -->
34 <div v-if="selectType == 'amend'" class="right-situation el-card"> 45 <div v-if="selectType == 'amend'" class="right-situation el-card">
35 <div class="right-title">登记簿补录</div> 46 <div class="right-title">登记簿补录</div>
...@@ -80,7 +91,7 @@ ...@@ -80,7 +91,7 @@
80 </div> 91 </div>
81 </template> 92 </template>
82 <script> 93 <script>
83 import { getCollectBiz, getleftMenu, getNextNode, getRepairBiz, addCollectBiz, deleteCollectBiz } from "@/api/ywbl" 94 import { getCollectBiz, getleftMenu, getNextNode, getRepairBiz,getTogetherBiz, addCollectBiz, deleteCollectBiz } from "@/api/ywbl"
84 export default { 95 export default {
85 data () { 96 data () {
86 return { 97 return {
...@@ -130,13 +141,20 @@ ...@@ -130,13 +141,20 @@
130 console.log("item", item); 141 console.log("item", item);
131 this.btnDisabled = true; 142 this.btnDisabled = true;
132 this.selectType = item.type; 143 this.selectType = item.type;
133 console.log("this.sqywQllxList", this.sqywQllxList);
134 this.sqywQllxList.forEach(item => { 144 this.sqywQllxList.forEach(item => {
135 if (item.check) item.check = false; 145 if (item.check) item.check = false;
136 }); 146 });
137 if (this.selectType == 'amend') { 147 if (this.selectType == 'amend') {
138 this.getRepairBiz(); 148 this.getRepairBiz();
139 } 149 }
150 if (this.selectType == 'together') {
151 getTogetherBiz().then(res => {
152 if (res) {
153 console.log("res", res);
154 this.djqxList = res.result;
155 }
156 })
157 }
140 }, 158 },
141 //权利类型菜单事件 159 //权利类型菜单事件
142 qllxClick (index) { 160 qllxClick (index) {
......
...@@ -23,6 +23,19 @@ class data extends filter { ...@@ -23,6 +23,19 @@ class data extends filter {
23 } 23 }
24 }, 24 },
25 { 25 {
26 label: "数据类型",
27 width: '80',
28 render: (h, scope) => {
29 return (
30 <div>
31 <span v-show={scope.row.sjlx == 1} >系统数据</span>
32 <span v-show={scope.row.sjlx == 2} >存量数据</span>
33 <span v-show={scope.row.sjlx == 3} >补录数据</span>
34 </div>
35 )
36 }
37 },
38 {
26 label: "权属状态", 39 label: "权属状态",
27 width: '80', 40 width: '80',
28 render: (h, scope) => { 41 render: (h, scope) => {
...@@ -61,6 +74,7 @@ class data extends filter { ...@@ -61,6 +74,7 @@ class data extends filter {
61 { 74 {
62 prop: "qllxmc", 75 prop: "qllxmc",
63 label: "权利类型", 76 label: "权利类型",
77 width: '140',
64 }, 78 },
65 { 79 {
66 prop: "djlxmc", 80 prop: "djlxmc",
......