Skip to content

bdc / bdcdj-web

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

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

2 parents 0e184dd5 fbb72e1a
Expand all
Inline Side-by-side
Showing 39 changed files with 278 additions and 119 deletions
...@@ -66,7 +66,24 @@ export function leftMenubl (params) { ...@@ -66,7 +66,24 @@ export function leftMenubl (params) {
66 params 66 params
67 }) 67 })
68 } 68 }
69 69 /**
70 * @description: 获取权利类型数组
71 * @param {*} params
72 * @author: renchao
73 */
74 // export function getQllxByBdcdyid (params) {
75 // return request({
76 // url: SERVER.SERVERAPI + '/rest/djbDetail/getQllxByBdcdyid?bdcdyid='+params,
77 // method: 'get',
78 // })
79 // }
80 export function getQllxByBdcdyid (params) {
81 return request({
82 url: SERVER.SERVERAPI + '/rest/djbDetail/getQllxByBdcdyid',
83 method: 'get',
84 params
85 })
86 }
70 /** 87 /**
71 * @description: 保存数据 88 * @description: 保存数据
72 * @param {*} data 89 * @param {*} data
......
...@@ -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 */
......
1 import { log } from 'bpmn-js-token-simulation';
1 import { mapGetters } from 'vuex' 2 import { mapGetters } from 'vuex'
2 import { defaultParameters } from "../../views/ywbl/ywsq/javascript/publicDefaultPar"; 3 import { defaultParameters } from "../../views/ywbl/ywsq/javascript/publicDefaultPar";
3 export default { 4 export default {
...@@ -9,13 +10,23 @@ export default { ...@@ -9,13 +10,23 @@ export default {
9 } 10 }
10 } 11 }
11 }, 12 },
13 created() {
14
15 },
12 computed: { 16 computed: {
13 ...mapGetters(['dictData']), 17 ...mapGetters(['dictData']),
14 }, 18 },
15 mounted () { 19 mounted () {
20 window.addEventListener('keydown', this.handkeyCode, true)//开启监听键盘按下事件
16 this.handleSearch() 21 this.handleSearch()
17 }, 22 },
18 methods: { 23 methods: {
24 handkeyCode(e) {
25 if(e.keyCode === 13){
26 console.log("安");
27 this.handleSearch()
28 }
29 },
19 handleSearch(){ 30 handleSearch(){
20 this.pageData.currentPage = 1 31 this.pageData.currentPage = 1
21 if (this.fetchData) { 32 if (this.fetchData) {
......
1 import { log } from "bpmn-js-token-simulation";
1 2
2 3
3 var qlxxPage = [ 4 var qlxxPage = [
...@@ -36,6 +37,7 @@ var qlxxPage = [ ...@@ -36,6 +37,7 @@ var qlxxPage = [
36 { qllx: "B39", id: "cfdj", form: "cfdj.vue", label: "查封登记" }, 37 { qllx: "B39", id: "cfdj", form: "cfdj.vue", label: "查封登记" },
37 { qllx: "B40", id: "ygdj", form: "ygdj.vue", label: "预告登记" }, 38 { qllx: "B40", id: "ygdj", form: "ygdj.vue", label: "预告登记" },
38 { qllx: "B41", id: "ygdj", form: "ygdj.vue", label: "预告登记" }, 39 { qllx: "B41", id: "ygdj", form: "ygdj.vue", label: "预告登记" },
40 { qllx: "DJB", id: "djbfm", form: "djbfm.vue", label: "预告登记" },
39 ]; 41 ];
40 42
41 //组装登记簿树形结构 43 //组装登记簿树形结构
...@@ -66,6 +68,7 @@ export function loadTreeData(qlxxData, bdcdyh) { ...@@ -66,6 +68,7 @@ export function loadTreeData(qlxxData, bdcdyh) {
66 68
67 //获取权利类型、不动产单元类型对应的树形节点信息 69 //获取权利类型、不动产单元类型对应的树形节点信息
68 export function getNode(qllx, qlxx, bdcdylx) { 70 export function getNode(qllx, qlxx, bdcdylx) {
71 console.log("qllx",qllx,"bdcdylx",bdcdylx);
69 let node; 72 let node;
70 for (var i = 0; i < qlxxPage.length; i++) { 73 for (var i = 0; i < qlxxPage.length; i++) {
71 if (qlxxPage[i].qllx == qllx) { 74 if (qlxxPage[i].qllx == qllx) {
...@@ -76,7 +79,9 @@ export function getNode(qllx, qlxx, bdcdylx) { ...@@ -76,7 +79,9 @@ export function getNode(qllx, qlxx, bdcdylx) {
76 node = { id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label}; 79 node = { id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label};
77 } 80 }
78 } else { 81 } else {
82 console.log("jin1111");
79 node = { id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label}; 83 node = { id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label};
84 console.log("nodenodenodenode",node);
80 } 85 }
81 break; 86 break;
82 } 87 }
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 :key="index" 30 :key="index"
31 > 31 >
32 <div> 32 <div>
33 <p>{{ item.qllxmc }} ||{{ item.operate }}</p> 33 <p>{{ item.qllxmc }} <span class="tpcolor">({{ item.operate=="U"?"编辑":"新增" }})</span></p>
34 <!-- <p class="title-detail">{{ item.zl }}</p> --> 34 <!-- <p class="title-detail">{{ item.zl }}</p> -->
35 </div> 35 </div>
36 <i 36 <i
...@@ -127,6 +127,7 @@ export default { ...@@ -127,6 +127,7 @@ export default {
127 leftMenu(formdata).then((res) => { 127 leftMenu(formdata).then((res) => {
128 if (res.code === 200 && res.result) { 128 if (res.code === 200 && res.result) {
129 this.currentSelectProps = res.result[0]; 129 this.currentSelectProps = res.result[0];
130 console.log("this.currentSelectProps",this.currentSelectProps);
130 this.$emit("getCurrentSelectProps", this.currentSelectProps); 131 this.$emit("getCurrentSelectProps", this.currentSelectProps);
131 } 132 }
132 }); 133 });
...@@ -263,5 +264,8 @@ export default { ...@@ -263,5 +264,8 @@ export default {
263 } 264 }
264 .blxx { 265 .blxx {
265 border: #b0d9f8 solid 1px; 266 border: #b0d9f8 solid 1px;
267 .tpcolor{
268 color: red;
269 }
266 } 270 }
267 </style> 271 </style>
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
34 </template> 34 </template>
35 <script> 35 <script>
36 import { mapGetters } from "vuex"; 36 import { mapGetters } from "vuex";
37 import clxxAddDialog from "./components/tabsconcent/clxxAddDialog.vue"; 37 import clxxAddDialog from "./components/clxxAddDialog.vue";
38 import imagePreview from '@/views/components/imagePreview.vue' 38 import imagePreview from '@/views/components/imagePreview.vue'
39 import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js"; 39 import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js";
40 import { popupDialog } from "@/utils/popup.js"; 40 import { popupDialog } from "@/utils/popup.js";
......
1 <!-- 1 <!--
2 * @Description : 房地产权1 2 * @Description : 房地产权1
3 * @Autor : miaofang 3 * @Autor : miaofang
4 * @LastEditTime : 2023-06-02 14:45:00 4 * @LastEditTime : 2023-06-16 10:23:27
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -111,23 +111,22 @@ ...@@ -111,23 +111,22 @@
111 }, 111 },
112 // 编辑 112 // 编辑
113 editDialog(row){ 113 editDialog(row){
114 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', { 114 // this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
115 confirmButtonText: '确定', 115 // confirmButtonText: '确定',
116 cancelButtonText: '取消', 116 // cancelButtonText: '取消',
117 type: 'warning' 117 // type: 'warning'
118 }).then(() => { 118 // }).then(() => {
119 this.$parent.addRepairRecord(row) 119 this.$parent.addRepairRecord(row)
120 120 // this.$message({
121 this.$message({ 121 // type: 'success',
122 type: 'success', 122 // message: '补录成功!'
123 message: '补录成功!' 123 // });
124 }); 124 // }).catch(() => {
125 }).catch(() => { 125 // this.$message({
126 this.$message({ 126 // type: 'info',
127 type: 'info', 127 // message: '取消编辑'
128 message: '取消编辑' 128 // });
129 }); 129 // });
130 });
131 130
132 // this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", { 131 // this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
133 // datalist:this.columns, 132 // datalist:this.columns,
......
1 <!-- 1 <!--
2 * @Description : 房地产权2 2 * @Description : 房地产权2
3 * @Autor : miaofang 3 * @Autor : miaofang
4 * @LastEditTime : 2023-06-14 10:52:48 4 * @LastEditTime : 2023-06-16 16:53:36
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
......
1 <!-- 1 <!--
2 * @Description :国有建设用地使用权 2 * @Description :国有建设用地使用权
3 * @Autor : miaofang 3 * @Autor : miaofang
4 * @LastEditTime : 2023-06-13 13:55:51 4 * @LastEditTime : 2023-06-16 10:23:54
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -115,23 +115,23 @@ ...@@ -115,23 +115,23 @@
115 }, 115 },
116 // 编辑 116 // 编辑
117 editDialog(row){ 117 editDialog(row){
118 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', { 118 // this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
119 confirmButtonText: '确定', 119 // confirmButtonText: '确定',
120 cancelButtonText: '取消', 120 // cancelButtonText: '取消',
121 type: 'warning' 121 // type: 'warning'
122 }).then(() => { 122 // }).then(() => {
123 this.$parent.addRepairRecord(row) 123 this.$parent.addRepairRecord(row)
124 124
125 this.$message({ 125 // this.$message({
126 type: 'success', 126 // type: 'success',
127 message: '补录成功!' 127 // message: '补录成功!'
128 }); 128 // });
129 }).catch(() => { 129 // }).catch(() => {
130 this.$message({ 130 // this.$message({
131 type: 'info', 131 // type: 'info',
132 message: '取消编辑' 132 // message: '取消编辑'
133 }); 133 // });
134 }); 134 // });
135 135
136 // this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", { 136 // this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
137 // datalist:this.columns, 137 // datalist:this.columns,
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px"> 10 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px">
11 <div class="spyj_form" v-for="(item, index) in tableData" :key="index"> 11 <div class="spyj_form" v-for="(item, index) in tableData" :key="index">
12 <div class="item_left"> 12 <div class="item_left">
13 {{ item.jdmc }}初审意见 13 {{ item.jdmc }}意见
14 </div> 14 </div>
15 <div class="item_right"> 15 <div class="item_right">
16 <el-row> 16 <el-row>
...@@ -101,7 +101,9 @@ ...@@ -101,7 +101,9 @@
101 getSpyjList(formdata).then((res) => { 101 getSpyjList(formdata).then((res) => {
102 this.$endLoading() 102 this.$endLoading()
103 if (res.code === 200 && res.result) { 103 if (res.code === 200 && res.result) {
104
104 this.tableData = res.result ? res.result : [] 105 this.tableData = res.result ? res.result : []
106 console.log("this.tableDatathis.tableDatathis.tableDatathis.tableData",this.tableData);
105 if (res.result.length == 0) { 107 if (res.result.length == 0) {
106 that.isNoData = true 108 that.isNoData = true
107 } 109 }
......
...@@ -98,14 +98,24 @@ export function getForm (tabName, djywbm) { ...@@ -98,14 +98,24 @@ export function getForm (tabName, djywbm) {
98 break; 98 break;
99 // 受理信息 99 // 受理信息
100 case "slxx": 100 case "slxx":
101 form = require("@/views/djbworkflow/djbBook/slxx.vue"); 101 form = require("@/views/djbworkflow/djbBook/components/blxxtabs/fwsyq/slxx.vue");
102 break; 102 break;
103 // case "clxx":
104 // form = require("@/views/djbworkflow/djbBook/components/clxx.vue");
105 // break;
106 // case "spyj":
107 // form = require("@/views/djbworkflow/djbBook/components/spyj.vue");
108 // break;
109 // case "slxx":
110 // form = require("@/views/djbworkflow/djbBook/slxx.vue");
111 // break;
103 case "clxx": 112 case "clxx":
104 form = require("@/views/djbworkflow/djbBook/clxx.vue"); 113 form = require("@/views/djbworkflow/djbBook/clxx.vue");
105 break; 114 break;
106 case "spyj": 115 case "spyj":
107 form = require("@/views/djbworkflow/djbBook/spyj.vue"); 116 form = require("@/views/djbworkflow/djbBook/spyj.vue");
108 break; 117 break;
118
109 // case "clxx": 119 // case "clxx":
110 // form = require("@/views/djbworkflow/components/clxxUnify.vue"); 120 // form = require("@/views/djbworkflow/components/clxxUnify.vue");
111 // break; 121 // break;
......
...@@ -101,26 +101,57 @@ export default { ...@@ -101,26 +101,57 @@ export default {
101 this.$popupDialog("登记簿详情", "registerBook/djbFrame", this.currentSelectProps, '80%', true) 101 this.$popupDialog("登记簿详情", "registerBook/djbFrame", this.currentSelectProps, '80%', true)
102 break; 102 break;
103 case "B5": 103 case "B5":
104 // this.$popupDialog("证书预览", "workflow/components/dialog/zsyl", { 104 const h = this.$createElement;
105 // bsmSlsq: this.bsmSlsq, 105 this.$msgbox({
106 // entryType: '1' 106 title: '消息',
107 // }, '65%', true) 107 message: h('p', null, [
108 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', { 108 h('span', null, '内容可以是 '),
109 h('i', { style: 'color: teal' }, 'VNode')
110 ]),
111 showCancelButton: true,
109 confirmButtonText: '确定', 112 confirmButtonText: '确定',
110 cancelButtonText: '取消', 113 cancelButtonText: '取消',
111 type: 'warning' 114 beforeClose: (action, instance, done) => {
112 }).then(() => { 115 if (action === 'confirm') {
116 instance.confirmButtonLoading = true;
117 instance.confirmButtonText = '执行中...';
118 setTimeout(() => {
119 done();
120 setTimeout(() => {
121 instance.confirmButtonLoading = false;
122 }, 300);
123 }, 3000);
124 } else {
125 done();
126 }
127 }
128 }).then(action => {
113 this.addRepairRecord() 129 this.addRepairRecord()
114 this.$message({ 130 this.$message({
115 type: 'success',
116 message: '补录成功!'
117 });
118 }).catch(() => {
119 this.$message({
120 type: 'info', 131 type: 'info',
121 message: '取消编辑' 132 message: 'action: ' + action
122 }); 133 });
123 }); 134 });
135 // this.$popupDialog("证书预览", "workflow/components/dialog/zsyl", {
136 // bsmSlsq: this.bsmSlsq,
137 // entryType: '1'
138 // }, '65%', true)
139 // this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
140 // confirmButtonText: '确定',
141 // cancelButtonText: '取消',
142 // type: 'warning'
143 // }).then(() => {
144 // this.addRepairRecord()
145 // this.$message({
146 // type: 'success',
147 // message: '补录成功!'
148 // });
149 // }).catch(() => {
150 // this.$message({
151 // type: 'info',
152 // message: '取消编辑'
153 // });
154 // });
124 155
125 break; 156 break;
126 case "B6": 157 case "B6":
......
...@@ -79,7 +79,10 @@ import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue"; ...@@ -79,7 +79,10 @@ import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
79 import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue"; 79 import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue";
80 import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js"; 80 import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js";
81 // 登记簿数据信息 81 // 登记簿数据信息
82 import { addRepairRecord } from "@/api/djbbl.js" 82 import { addRepairRecord } from "@/api/djbbl.js"
83 // 获取权利类型数组
84 import { getQllxByBdcdyid } from "@/api/djbbl.js"
85
83 import { getBdcqljqtsx } from "@/api/registerBook.js"; 86 import { getBdcqljqtsx } from "@/api/registerBook.js";
84 export default { 87 export default {
85 components: { 88 components: {
...@@ -101,6 +104,8 @@ export default { ...@@ -101,6 +104,8 @@ export default {
101 qllx: this.$route.query.qllx, 104 qllx: this.$route.query.qllx,
102 //设置那个表单选中 105 //设置那个表单选中
103 tabName: "", 106 tabName: "",
107 // 权利类型数组
108 qllxlist:[],
104 //表单集合 109 //表单集合
105 tabList: [], 110 tabList: [],
106 //选择加载哪一个组件 111 //选择加载哪一个组件
...@@ -119,14 +124,24 @@ export default { ...@@ -119,14 +124,24 @@ export default {
119 }; 124 };
120 }, 125 },
121 mounted() { 126 mounted() {
127
122 }, 128 },
123 129
124 methods: { 130 methods: {
131 getQllxByBdcdyid(){
132 console.log("this.currentSelectProps.bdcdyid",this.currentSelectProps.bdcdyid);
133 getQllxByBdcdyid({bdcdyid:this.currentSelectProps.bdcdyid}).then((res) => {
134 if (res.code === 200) {
135 console.log("Qllxlist",res);
136
137 }
138 });
139 },
125 // 获取右侧选项卡 140 // 获取右侧选项卡
126 getCurrentSelectProps (val) { 141 getCurrentSelectProps (val) {
127 this.currentSelectProps = val 142 this.currentSelectProps = val
128 if(this.currentSelectProps.bsmRepair){ 143 if(this.currentSelectProps.bsmRepair){
129 this.tabset() 144 this.tabset(val)
130 }else{ 145 }else{
131 this.getdjblist() 146 this.getdjblist()
132 } 147 }
...@@ -141,7 +156,9 @@ export default { ...@@ -141,7 +156,9 @@ export default {
141 if (res.code === 200) { 156 if (res.code === 200) {
142 this.treedata = loadTreeData(res.result, this.bdcdyh); 157 this.treedata = loadTreeData(res.result, this.bdcdyh);
143 this.$nextTick(function () { 158 this.$nextTick(function () {
159 console.log("this.currentSelectProps.qllx",this.currentSelectProps);
144 this.defaultNode = getNode(this.currentSelectProps.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, ""); 160 this.defaultNode = getNode(this.currentSelectProps.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, "");
161 console.log("this.defaultNode",this.defaultNode);
145 this.tabName =this.defaultNode.id; //data[0].id为默认选中的节点 162 this.tabName =this.defaultNode.id; //data[0].id为默认选中的节点
146 }); 163 });
147 } 164 }
...@@ -155,15 +172,16 @@ export default { ...@@ -155,15 +172,16 @@ export default {
155 arr[index].value=item.id 172 arr[index].value=item.id
156 }) 173 })
157 this.tabList=this.tabdata 174 this.tabList=this.tabdata
175 this.getQllxByBdcdyid()
158 }, 200) 176 }, 200)
159 177
160 }, 178 },
161 179
162 tabset(){ 180 tabset(val){
163 this.tabName = ''; 181 this.tabName = '';
164 this.tabList = [ 182 this.tabList = [
165 { 183 {
166 name: "受理信息", 184 name:val.qllxmc+ "补录信息",
167 value: "slxx", 185 value: "slxx",
168 sort: 1, 186 sort: 1,
169 }, 187 },
...@@ -185,10 +203,6 @@ export default { ...@@ -185,10 +203,6 @@ export default {
185 203
186 }, 204 },
187 205
188 // stepForm(index){
189 // console.log(index);
190 // },
191
192 //右侧表单选项卡事件 206 //右侧表单选项卡事件
193 beforeLeave (activeName, oldActiveName) { 207 beforeLeave (activeName, oldActiveName) {
194 if (activeName && activeName != 0) this.getFromRouter(activeName) 208 if (activeName && activeName != 0) this.getFromRouter(activeName)
...@@ -206,6 +220,7 @@ export default { ...@@ -206,6 +220,7 @@ export default {
206 220
207 // 增加补录记录 221 // 增加补录记录
208 addRepairRecord(row){ 222 addRepairRecord(row){
223 console.log("this.currentSelectProps",this.currentSelectProps);
209 let from={ 224 let from={
210 bsmQlxx:"", 225 bsmQlxx:"",
211 bsmSlsq:this.bsmSlsq, 226 bsmSlsq:this.bsmSlsq,
...@@ -216,6 +231,7 @@ export default { ...@@ -216,6 +231,7 @@ export default {
216 if(row){ 231 if(row){
217 from.bsmQlxx=row.bsmQlxx 232 from.bsmQlxx=row.bsmQlxx
218 from.operate="U" 233 from.operate="U"
234 from.qllx=row.qllx
219 } 235 }
220 236
221 addRepairRecord(from).then((res) => { 237 addRepairRecord(from).then((res) => {
......
...@@ -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 },
......
...@@ -100,7 +100,6 @@ ...@@ -100,7 +100,6 @@
100 }, 100 },
101 methods: { 101 methods: {
102 queryClick () { 102 queryClick () {
103 console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
104 this.$startLoading(); 103 this.$startLoading();
105 selectCfdj({ ...this.queryForm, ...this.pageData }).then((res) => { 104 selectCfdj({ ...this.queryForm, ...this.pageData }).then((res) => {
106 this.$endLoading(); 105 this.$endLoading();
......
...@@ -171,7 +171,6 @@ ...@@ -171,7 +171,6 @@
171 }, 171 },
172 methods: { 172 methods: {
173 queryClick () { 173 queryClick () {
174 console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
175 this.$startLoading(); 174 this.$startLoading();
176 if (!this.isJump) { 175 if (!this.isJump) {
177 //从业务办理进入 176 //从业务办理进入
......
...@@ -70,7 +70,6 @@ ...@@ -70,7 +70,6 @@
70 }, 70 },
71 methods: { 71 methods: {
72 queryClick () { 72 queryClick () {
73 console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
74 this.$startLoading(); 73 this.$startLoading();
75 this.queryForm.sqywbm = this.sqywInfo.djywbm; 74 this.queryForm.sqywbm = this.sqywInfo.djywbm;
76 selectNydsyqQlxx({ ...this.queryForm, ...this.pageData }).then((res) => { 75 selectNydsyqQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
......
...@@ -98,7 +98,6 @@ ...@@ -98,7 +98,6 @@
98 methods: { 98 methods: {
99 //默认加载表格信息 99 //默认加载表格信息
100 queryClick () { 100 queryClick () {
101 console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
102 this.$startLoading(); 101 this.$startLoading();
103 this.queryForm.bsmSqyw = this.bsmSqyw; 102 this.queryForm.bsmSqyw = this.bsmSqyw;
104 selectQlxx({ ...this.queryForm, ...this.pageData }).then((res) => { 103 selectQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
......
...@@ -56,8 +56,8 @@ ...@@ -56,8 +56,8 @@
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/jump"; 60 import jump from "../components/mixin/djbbljump";
61 export default { 61 export default {
62 name: "djbcx", 62 name: "djbcx",
63 mixins: [table, jump], 63 mixins: [table, jump],
...@@ -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;
...@@ -140,7 +140,6 @@ ...@@ -140,7 +140,6 @@
140 this.$message.error("请至少选择一条数据"); 140 this.$message.error("请至少选择一条数据");
141 return; 141 return;
142 } 142 }
143 console.log("this.sqywInfo", this.sqywInfo, this.sqywInfo.nodetype == "djqx");
144 let from = { 143 let from = {
145 bsmSqyw: this.bsmSqyw, 144 bsmSqyw: this.bsmSqyw,
146 bdcdysz: this.bdcdysz, 145 bdcdysz: this.bdcdysz,
......
...@@ -75,7 +75,6 @@ ...@@ -75,7 +75,6 @@
75 }, 75 },
76 methods: { 76 methods: {
77 queryClick () { 77 queryClick () {
78 console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
79 this.$startLoading(); 78 this.$startLoading();
80 this.queryForm.sqywbm = this.sqywInfo.djywbm; 79 this.queryForm.sqywbm = this.sqywInfo.djywbm;
81 selectFwsyq({ ...this.queryForm, ...this.pageData }).then((res) => { 80 selectFwsyq({ ...this.queryForm, ...this.pageData }).then((res) => {
......
...@@ -75,7 +75,6 @@ ...@@ -75,7 +75,6 @@
75 }, 75 },
76 methods: { 76 methods: {
77 queryClick () { 77 queryClick () {
78 console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
79 this.$startLoading(); 78 this.$startLoading();
80 this.queryForm.sqywbm = this.sqywInfo.djywbm; 79 this.queryForm.sqywbm = this.sqywInfo.djywbm;
81 selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => { 80 selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => {
......
...@@ -83,7 +83,6 @@ ...@@ -83,7 +83,6 @@
83 }, 83 },
84 methods: { 84 methods: {
85 queryClick () { 85 queryClick () {
86 console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
87 this.$startLoading(); 86 this.$startLoading();
88 this.queryForm.sqywbm = this.sqywInfo.djywbm; 87 this.queryForm.sqywbm = this.sqywInfo.djywbm;
89 selectJsydQlxx({ ...this.queryForm, ...this.pageData }).then((res) => { 88 selectJsydQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
......
...@@ -79,7 +79,6 @@ ...@@ -79,7 +79,6 @@
79 }, 79 },
80 methods: { 80 methods: {
81 queryClick () { 81 queryClick () {
82 console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
83 this.$startLoading(); 82 this.$startLoading();
84 this.queryForm.sqywbm = this.sqywInfo.djywbm; 83 this.queryForm.sqywbm = this.sqywInfo.djywbm;
85 selectZdjbxx({ ...this.queryForm, ...this.pageData }).then((res) => { 84 selectZdjbxx({ ...this.queryForm, ...this.pageData }).then((res) => {
......
...@@ -75,7 +75,6 @@ ...@@ -75,7 +75,6 @@
75 }, 75 },
76 methods: { 76 methods: {
77 queryClick () { 77 queryClick () {
78 console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
79 this.$startLoading(); 78 this.$startLoading();
80 this.queryForm.sqywbm = this.sqywInfo.djywbm; 79 this.queryForm.sqywbm = this.sqywInfo.djywbm;
81 selectYgdj200({ ...this.queryForm, ...this.pageData }).then((res) => { 80 selectYgdj200({ ...this.queryForm, ...this.pageData }).then((res) => {
......
...@@ -75,7 +75,6 @@ ...@@ -75,7 +75,6 @@
75 }, 75 },
76 methods: { 76 methods: {
77 queryClick () { 77 queryClick () {
78 console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
79 this.$startLoading(); 78 this.$startLoading();
80 this.queryForm.sqywbm = this.sqywInfo.djywbm; 79 this.queryForm.sqywbm = this.sqywInfo.djywbm;
81 selectYgdy({ ...this.queryForm, ...this.pageData }).then((res) => { 80 selectYgdy({ ...this.queryForm, ...this.pageData }).then((res) => {
......
...@@ -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) {
......
...@@ -113,22 +113,22 @@ export default { ...@@ -113,22 +113,22 @@ export default {
113 bsm: '' 113 bsm: ''
114 }, '85%') 114 }, '85%')
115 }, 115 },
116 ywhClick (item) { 116 // ywhClick (item) {
117 const { href } = this.$router.resolve( 117 // const { href } = this.$router.resolve(
118 "/djbworkFrame?bdcdyid=" + 118 // "/djbworkFrame?bdcdyid=" +
119 item.bdcdyid+ 119 // item.bdcdyid+
120 "&bdcdyh=" + 120 // "&bdcdyh=" +
121 item.bdcdyh+ 121 // item.bdcdyh+
122 "&qllx="+ 122 // "&qllx="+
123 item.qllx+ 123 // item.qllx+
124 "&bsmQlxx="+ 124 // "&bsmQlxx="+
125 item.bsmQlxx+ 125 // item.bsmQlxx+
126 "&viewtype=1" 126 // "&viewtype=1"
127 ); 127 // );
128 localStorage.setItem('ywbl', JSON.stringify(item)); 128 // localStorage.setItem('ywbl', JSON.stringify(item));
129 window.open(href, `urlname${item.bdcdyid}`); 129 // window.open(href, `urlname${item.bdcdyid}`);
130 130
131 }, 131 // },
132 } 132 }
133 } 133 }
134 </script> 134 </script>
......
...@@ -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) => {
...@@ -54,13 +67,14 @@ class data extends filter { ...@@ -54,13 +67,14 @@ class data extends filter {
54 prop: "ywh", 67 prop: "ywh",
55 label: "业务号", 68 label: "业务号",
56 width: '110', 69 width: '110',
57 render: (h, scope) => { 70 // render: (h, scope) => {
58 return <el-button type="text" onClick={() => { vm.ywhClick(scope.row) }}>{scope.row.ywh}</el-button> 71 // return <el-button type="text" onClick={() => { vm.ywhClick(scope.row) }}>{scope.row.ywh}</el-button>
59 } 72 // }
60 }, 73 },
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",
......