ff0f8828 by renchao@pashanhoo.com

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

2 parents de3a4fa4 ada7ba7a
...@@ -6,53 +6,74 @@ ...@@ -6,53 +6,74 @@
6 <template> 6 <template>
7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> 7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
8 <div v-if="this.isShowdrawer"> 8 <div v-if="this.isShowdrawer">
9 <el-menu :default-active="activeIndex" @select="djbClick" class="title-batch"> 9 <el-menu
10 @select="djbClick"
11 class="title-batch"
12 >
10 <el-menu-item index="-1" key="-1" class="menus"> 13 <el-menu-item index="-1" key="-1" class="menus">
11 <div>登记簿</div> 14 <div>登记簿</div>
12 </el-menu-item> 15 </el-menu-item>
13 </el-menu> 16 </el-menu>
14 <div class="blxx"> 17 <div class="blxx">
15 <el-menu :default-active="activeIndex" @select="blxxClick" class="title-batch"> 18 <el-menu
19 @select="blxxClick"
20 class="title-batch"
21 >
16 <el-menu-item index="-1" key="-1" class="menus"> 22 <el-menu-item index="-1" key="-1" class="menus">
17 <div>补录信息</div> 23 <div>补录信息</div>
18 </el-menu-item> 24 </el-menu-item>
19 </el-menu> 25 </el-menu>
20 <el-menu :default-active="activeIndex" @select="unitClick"> 26 <el-menu :default-active="activeIndex" @select="unitClick">
21 <el-menu-item v-for="(item, index) in supplementarylist" :index="index.toString()" :key="index"> 27 <el-menu-item
28 v-for="(item, index) in supplementarylist"
29 :index="index.toString()"
30 :key="index"
31 >
22 <div> 32 <div>
23 <p>{{ item.qllxmc }} ||{{ item.operate }} </p> 33 <p>{{ item.qllxmc }} ||{{ item.operate }}</p>
24 <!-- <p class="title-detail">{{ item.zl }}</p> --> 34 <!-- <p class="title-detail">{{ item.zl }}</p> -->
25 </div> 35 </div>
26 <i class="el-icon-delete" v-if="supplementarylist.length > 1" @click.stop="handleDel(item)"></i> 36 <i
37 class="el-icon-delete"
38 v-if="supplementarylist.length > 1"
39 @click.stop="handleDel(item)"
40 ></i>
27 </el-menu-item> 41 </el-menu-item>
28 </el-menu> 42 </el-menu>
29 </div> 43 </div>
30
31 </div> 44 </div>
32 <div class="map-drawer-click map-drawer" v-if="!isShowdrawer" @click=" 45 <div
46 class="map-drawer-click map-drawer"
47 v-if="!isShowdrawer"
48 @click="
33 () => { 49 () => {
34 this.isShowdrawer = !this.isShowdrawer; 50 this.isShowdrawer = !this.isShowdrawer;
35 } 51 }
36 "></div> 52 "
37 <div class="map-drawer-expand map-drawer" v-else @click=" 53 ></div>
54 <div
55 class="map-drawer-expand map-drawer"
56 v-else
57 @click="
38 () => { 58 () => {
39 this.isShowdrawer = !this.isShowdrawer; 59 this.isShowdrawer = !this.isShowdrawer;
40 } 60 }
41 "></div> 61 "
62 ></div>
42 </div> 63 </div>
43 </template> 64 </template>
44 <script> 65 <script>
45 import { mapGetters } from 'vuex' 66 import { mapGetters } from "vuex";
46 import { leftMenu } from "@/api/fqsq.js" 67 import { leftMenu } from "@/api/fqsq.js";
47 import { deleteRepairRecord } from "@/api/djbbl.js" 68 import { deleteRepairRecord } from "@/api/djbbl.js";
48 import { leftMenubl } from "@/api/djbbl.js" 69 import { leftMenubl } from "@/api/djbbl.js";
49 import { deleteSlbdcdy } from "@/api/ywbl.js"; 70 import { deleteSlbdcdy } from "@/api/ywbl.js";
50 import { getBdcqljqtsx } from "@/api/registerBook.js"; 71 import { getBdcqljqtsx } from "@/api/registerBook.js";
51 import { loadTreeData, getNode } from "./djbFrameData.js"; 72 import { loadTreeData, getNode } from "./djbFrameData.js";
52 export default { 73 export default {
53 data () { 74 data() {
54 return { 75 return {
55 supplementarylist:[], 76 supplementarylist: [],
56 //受理申请标识码 77 //受理申请标识码
57 bsmSlsq: this.$route.query.bsmSlsq, 78 bsmSlsq: this.$route.query.bsmSlsq,
58 //当前流程所在环节 79 //当前流程所在环节
...@@ -61,13 +82,13 @@ import { loadTreeData, getNode } from "./djbFrameData.js"; ...@@ -61,13 +82,13 @@ import { loadTreeData, getNode } from "./djbFrameData.js";
61 bdcdyid: this.$route.query.bdcdyid, 82 bdcdyid: this.$route.query.bdcdyid,
62 //当前流程所在环节 83 //当前流程所在环节
63 bdcdyh: this.$route.query.bdcdyh, 84 bdcdyh: this.$route.query.bdcdyh,
64 qllx:this.$route.query.qllx, 85 qllx: this.$route.query.qllx,
65 // 默认选中 86 // 默认选中
66 activeIndex: '0', 87 activeIndex: "0",
67 // 折叠 88 // 折叠
68 isShowdrawer: true, 89 isShowdrawer: true,
69 //批量操作按钮名称 90 //批量操作按钮名称
70 batchButtonName: '', 91 batchButtonName: "",
71 //左侧菜单数据集合 92 //左侧菜单数据集合
72 unitData: [], 93 unitData: [],
73 // 设置表单传递数据 94 // 设置表单传递数据
...@@ -81,93 +102,111 @@ import { loadTreeData, getNode } from "./djbFrameData.js"; ...@@ -81,93 +102,111 @@ import { loadTreeData, getNode } from "./djbFrameData.js";
81 label: "label", 102 label: "label",
82 }, 103 },
83 showTab: "bdcqldjml", // 选中状态,根据表格中权利类型判断 104 showTab: "bdcqldjml", // 选中状态,根据表格中权利类型判断
84 } 105 };
85 }, 106 },
86 mounted () { 107 mounted() {
87 this.loadBdcdylist(); 108 this.loadBdcdylist();
88 }, 109 },
89 computed: { 110 computed: {
90 ...mapGetters(['isRefresh']) 111 ...mapGetters(["isRefresh"]),
91 }, 112 },
92 watch: { 113 watch: {
93 isRefresh: { 114 isRefresh: {
94 handler (newVal, oldVal) { 115 handler(newVal, oldVal) {
95 if (newVal) this.loadBdcdylist() 116 if (newVal) this.loadBdcdylist();
117 },
118 immediate: true,
96 }, 119 },
97 immediate: true
98 }
99 }, 120 },
100 methods: { 121 methods: {
101 //读取申请单元信息 122 //读取申请单元信息
102 loadBdcdylist () { 123 loadBdcdylist() {
103 var formdata = new FormData(); 124 var formdata = new FormData();
104 formdata.append("bsmSlsq", this.bsmSlsq); 125 formdata.append("bsmSlsq", this.bsmSlsq);
105 formdata.append("bestepid", this.bestepid); 126 formdata.append("bestepid", this.bestepid);
106 leftMenu(formdata).then((res) => { 127 leftMenu(formdata).then((res) => {
107 if (res.code === 200 && res.result) { 128 if (res.code === 200 && res.result) {
108 this.currentSelectProps = res.result[0]; 129 this.currentSelectProps = res.result[0];
109 this.$emit('getCurrentSelectProps', this.currentSelectProps); 130 this.$emit("getCurrentSelectProps", this.currentSelectProps);
110 } 131 }
111 }) 132 });
112 this.getleftMenubl() 133 this.getleftMenubl();
113 }, 134 },
114 // 获取右侧菜单 135 // 获取右侧菜单
115 getleftMenubl(){ 136 getleftMenubl(row) {
116 // var formdata = new FormData();
117 // formdata.append("bsmSlsq", this.bsmSlsq);
118 leftMenubl(this.bsmSlsq).then((res) => { 137 leftMenubl(this.bsmSlsq).then((res) => {
119 this.supplementarylist=res.result; 138 this.supplementarylist = res.result;
139 if(row){
140 this.supplementarylist.forEach((item,index) => {
141 if(item.bsmRepair==row.bsmRepair){
142 this.activeIndex=index
143 this.unitClick(index)
120 } 144 }
121 ) 145 })
146 }
147 });
148
149
122 }, 150 },
123 handleNodeClick (data, node, elem) { 151 handleNodeClick(data, node, elem) {
124 this.$parent.loadComponent(this.currentSelectProps,data); 152 this.$parent.loadComponent(this.currentSelectProps, data);
125 this.$parent.tabset(); 153 this.$parent.tabset();
126 }, 154 },
127 //申请单元点击事件 155 //申请单元点击事件
128 unitClick (index) { 156 unitClick(index) {
129 this.currentSelectProps=this.supplementarylist[index]; 157 this.currentSelectProps = this.supplementarylist[index];
130 // this.$parent.tabset(); 158 this.$emit("getCurrentSelectProps", this.currentSelectProps);
131 // console.log("this.currentSelectProps", this.supplementarylist[index]);
132 // this.currentSelectProps.batchOperation = false;
133 // this.activeIndex = index.toString();
134 // //选中表单传递数据
135 this.$emit('getCurrentSelectProps', this.currentSelectProps);
136 // this.$parent.stepForm(index);
137 // this.$store.dispatch('user/refreshPage', false);
138 }, 159 },
139 //登记簿点击事件 160 //登记簿点击事件
140 djbClick () { 161 djbClick() {
141 this.loadBdcdylist () 162 this.loadBdcdylist();
142 // console.log("this.currentSelectProps",this.currentSelectProps);
143 this.currentSelectProps.batchOperation = true;
144 this.$parent.getdjblist()
145 163
164 // this.$parent.getdjblist()
146 }, 165 },
166 // 定位到该条补录记录
167 // orientation(){
168 // // this.activeIndex="2"
169 // this.unitClick(0)
170 // },
147 // 删除补录记录 171 // 删除补录记录
148 handleDel(row){ 172 handleDel(row) {
149 console.log("是",row); 173 this.$confirm("此操作将永久删除该条补录记录, 是否继续?", "提示", {
174 confirmButtonText: "确定",
175 cancelButtonText: "取消",
176 type: "warning",
177 })
178 .then(() => {
150 deleteRepairRecord(row.bsmRepair).then((res) => { 179 deleteRepairRecord(row.bsmRepair).then((res) => {
151 if (res.code === 200) { 180 this.$message({
152 alert("删除成功") 181 type: "success",
153 } 182 message: "删除成功!",
183 });
184 this.$nextTick(() => {
185 this.getleftMenubl();
186 });
187 });
154 }) 188 })
189 .catch(() => {
190 this.$message({
191 type: "info",
192 message: "已取消删除",
193 });
194 });
155 }, 195 },
156 //补录信息点击事件 196 //补录信息点击事件默认展示第一条补录记录
157 blxxClick () { 197 blxxClick() {
158 this.$parent.tabset() 198 this.unitClick(0);
159
160 }, 199 },
161 } 200 },
162 } 201 };
163 </script> 202 </script>
164 <style scoped lang='scss'> 203 <style scoped lang="scss">
165 @import "~@/styles/mixin.scss"; 204 @import "~@/styles/mixin.scss";
166 @import "../../workFrame.scss"; 205 @import "../../workFrame.scss";
167 .leftmenu ul { 206 .leftmenu ul {
168 height: calc(100vh - 120px); 207 height: calc(100vh - 120px);
169 } 208 }
170 /deep/.rollTable { 209 /deep/.rollTable {
171 height: calc(100vh - 240px) !important; 210 height: calc(100vh - 240px) !important;
172 } 211 }
173 212
...@@ -204,7 +243,7 @@ import { loadTreeData, getNode } from "./djbFrameData.js"; ...@@ -204,7 +243,7 @@ import { loadTreeData, getNode } from "./djbFrameData.js";
204 height: 45px; 243 height: 45px;
205 } 244 }
206 245
207 /deep/ .el-tree-node:focus>.el-tree-node__content { 246 /deep/ .el-tree-node:focus > .el-tree-node__content {
208 background-color: #f5f5f5; 247 background-color: #f5f5f5;
209 color: #0079fe; 248 color: #0079fe;
210 border-right: 4px solid #0079fe; 249 border-right: 4px solid #0079fe;
...@@ -214,15 +253,15 @@ import { loadTreeData, getNode } from "./djbFrameData.js"; ...@@ -214,15 +253,15 @@ import { loadTreeData, getNode } from "./djbFrameData.js";
214 white-space: pre-wrap; 253 white-space: pre-wrap;
215 } 254 }
216 255
217 /deep/ .is-current>.el-tree-node__content { 256 /deep/ .is-current > .el-tree-node__content {
218 background-color: #f5f5f5; 257 background-color: #f5f5f5;
219 color: #0079fe; 258 color: #0079fe;
220 border-right: 4px solid #0079fe; 259 border-right: 4px solid #0079fe;
221 } 260 }
222 .menus{ 261 .menus {
223 background-color: #e7f4fe; 262 background-color: #e7f4fe;
224 } 263 }
225 .blxx{ 264 .blxx {
226 border:#b0d9f8 solid 1px; 265 border: #b0d9f8 solid 1px;
227 } 266 }
228 </style> 267 </style>
......
1 <!-- 1 <!--
2 * @Description : 房地产权2 2 * @Description : 房地产权2
3 * @Autor : miaofang 3 * @Autor : miaofang
4 * @LastEditTime : 2023-06-13 14:33:55 4 * @LastEditTime : 2023-06-14 10:52:48
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -106,21 +106,39 @@ export default { ...@@ -106,21 +106,39 @@ export default {
106 return name; 106 return name;
107 }, 107 },
108 editDialog(row){ 108 editDialog(row){
109 this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", { 109 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
110 datalist:this.columns, 110 confirmButtonText: '确定',
111 data: row, 111 cancelButtonText: '取消',
112 type: 'warning'
113 }).then(() => {
114 this.$parent.addRepairRecord(row)
115
116 this.$message({
117 type: 'success',
118 message: '补录成功!'
119 });
120 }).catch(() => {
121 this.$message({
122 type: 'info',
123 message: '取消编辑'
124 });
125 });
126
127 // this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
128 // datalist:this.columns,
129 // data: row,
130
131 // })
112 132
113 })
114 }, 133 },
115 // 删除 134 // 删除
135 // 删除
116 deleteDialog(row){ 136 deleteDialog(row){
117 let that = this 137 this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
118 this.$confirm('此操作将永久删除, 是否继续?', '提示', {
119 confirmButtonText: '确定', 138 confirmButtonText: '确定',
120 cancelButtonText: '取消', 139 cancelButtonText: '取消',
121 type: 'warning' 140 type: 'warning'
122 }).then(async () => { 141 }).then(() => {
123
124 // let bsmClmx = this.previewImg.imgList[this.previewImg.index].bsmClmx 142 // let bsmClmx = this.previewImg.imgList[this.previewImg.index].bsmClmx
125 // deleteClmx(bsmClmx).then(res => { 143 // deleteClmx(bsmClmx).then(res => {
126 // if (res.code == 200) { 144 // if (res.code == 200) {
...@@ -131,18 +149,19 @@ export default { ...@@ -131,18 +149,19 @@ export default {
131 // }) 149 // })
132 // } 150 // }
133 // }) 151 // })
134 that.$message({ 152 this.$message({
135 message: '删除成功!', 153 type: 'success',
136 type: 'success' 154 message: '删除成功!'
137 }) 155 });
138 }).catch(() => { 156 }).catch(() => {
139 this.$message({ 157 this.$message({
140 type: 'info', 158 type: 'info',
141 message: '已取消删除' 159 message: '已取消删除'
142 }) 160 });
143 }) 161 });
144 162
145 } 163 }
164
146 }, 165 },
147 }; 166 };
148 </script> 167 </script>
......
...@@ -49,7 +49,6 @@ export default { ...@@ -49,7 +49,6 @@ export default {
49 if (res.code === 200) { 49 if (res.code === 200) {
50 this.leftButtonList = res.result.button; 50 this.leftButtonList = res.result.button;
51 this.rightButtonList = res.result.operation; 51 this.rightButtonList = res.result.operation;
52 console.log("this.leftButtonList",this.leftButtonList);
53 // this.rightButtonList.splice(0,2) 52 // this.rightButtonList.splice(0,2)
54 } 53 }
55 }) 54 })
...@@ -57,7 +56,6 @@ export default { ...@@ -57,7 +56,6 @@ export default {
57 }, 56 },
58 //流程环节操作按钮 57 //流程环节操作按钮
59 operation (item) { 58 operation (item) {
60 console.log("流程环节操作按钮信息",item);
61 //按钮 B0:选择不动产单元 B1:流程图 B2:材料分屏 B3:材料导入 B4:登记簿 B5:证书预览 B6:打印申请书 B7:证书领取 B8:楼盘表 B9:登簿 59 //按钮 B0:选择不动产单元 B1:流程图 B2:材料分屏 B3:材料导入 B4:登记簿 B5:证书预览 B6:打印申请书 B7:证书领取 B8:楼盘表 B9:登簿
62 //操作按钮 登簿:record 转件:transfer 退回:back 退出:signout 60 //操作按钮 登簿:record 转件:transfer 退回:back 退出:signout
63 let that = this; 61 let that = this;
...@@ -107,7 +105,23 @@ export default { ...@@ -107,7 +105,23 @@ export default {
107 // bsmSlsq: this.bsmSlsq, 105 // bsmSlsq: this.bsmSlsq,
108 // entryType: '1' 106 // entryType: '1'
109 // }, '65%', true) 107 // }, '65%', true)
108 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
109 confirmButtonText: '确定',
110 cancelButtonText: '取消',
111 type: 'warning'
112 }).then(() => {
110 this.addRepairRecord() 113 this.addRepairRecord()
114 this.$message({
115 type: 'success',
116 message: '补录成功!'
117 });
118 }).catch(() => {
119 this.$message({
120 type: 'info',
121 message: '取消编辑'
122 });
123 });
124
111 break; 125 break;
112 case "B6": 126 case "B6":
113 //根据编号获取对应信息 127 //根据编号获取对应信息
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
37 <!-- 内容框架 --> 37 <!-- 内容框架 -->
38 <div class="containerFrame"> 38 <div class="containerFrame">
39 <!-- 左侧菜单栏 区分业务--> 39 <!-- 左侧菜单栏 区分业务-->
40 <ordinaryMenu @getCurrentSelectProps="getCurrentSelectProps" /> 40 <ordinaryMenu ref="Menu" @getCurrentSelectProps="getCurrentSelectProps" />
41 <div class="leftCon"> 41 <div class="leftCon">
42 <!-- 分屏左侧预览 --> 42 <!-- 分屏左侧预览 -->
43 <div v-if="splitScreen" class="splitScreen-con"> 43 <div v-if="splitScreen" class="splitScreen-con">
...@@ -154,56 +154,28 @@ export default { ...@@ -154,56 +154,28 @@ export default {
154 arr[index].value=item.id 154 arr[index].value=item.id
155 }) 155 })
156 this.tabList=this.tabdata 156 this.tabList=this.tabdata
157 //console.log("登记簿列表",this.tabList);
158 }, 200) 157 }, 200)
159 158
160 }, 159 },
161 // // 获取渲染补录信息列表
162 // getdjblist(){
163 // console.log("执行1",this.currentSelectProps);
164 // getBdcqljqtsx({
165 // bdcdyid: this.currentSelectProps.bdcdyid,
166 // bdcdyh: this.currentSelectProps.bdcdyh,
167 // }).then((res) => {
168 // if (res.code === 200) {
169 // this.treedata = loadTreeData(res.result, this.bdcdyh);
170 // this.$nextTick(function () {
171 // this.defaultNode = getNode(this.currentSelectProps.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, "");
172 // this.tabName =this.defaultNode.id; //data[0].id为默认选中的节点
173 // });
174 // }
175 // });
176
177 // setTimeout(() => {
178 // let settree=JSON.parse(JSON.stringify(this.treedata))
179 // this.tabdata=[...settree,...settree[1].children[0].children[0].children]
180 // this.tabdata.forEach((item,index,arr) => {
181 // arr[index].name=item.label;
182 // arr[index].value=item.id
183 // })
184 // this.tabList=this.tabdata
185 // //console.log("登记簿列表",this.tabList);
186 // }, 200)
187
188 // },
189 160
190 // 增加补录记录 161 // 增加补录记录
191 addRepairRecord(){ 162 addRepairRecord(row){
192 addRepairRecord({ 163 let from={
193 bsmQlxx:"a8a979f688fc9afc6ca7f0c124f64ede", 164 bsmQlxx:"",
194 bsmSlsq:this.bsmSlsq, 165 bsmSlsq:this.bsmSlsq,
195 bsmSldy:this.currentSelectProps.bsmSldy, 166 bsmSldy:this.currentSelectProps.bsmSldy,
196 operate:"C", 167 operate:"C",
197 qllx:this.currentSelectProps.qllx 168 qllx:this.currentSelectProps.qllx
198 }).then((res) => {
199 console.log("添加补录记录",res);
200 if (res.code === 200) {
201 this.treedata = loadTreeData(res.result, this.bdcdyh);
202 this.$nextTick(function () {
203 this.defaultNode = getNode(this.currentSelectProps.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, "");
204 this.tabName =this.defaultNode.id; //data[0].id为默认选中的节点
205 });
206 } 169 }
170 if(row){
171 from.bsmQlxx=row.bsmQlxx
172 from.operate="U"
173 }
174
175 addRepairRecord(from).then((res) => {
176 this.$nextTick(() => {
177 this.$refs.Menu.getleftMenubl(res.result);
178 });
207 }); 179 });
208 }, 180 },
209 tabset(){ 181 tabset(){
......
...@@ -68,6 +68,10 @@ class data extends filter { ...@@ -68,6 +68,10 @@ class data extends filter {
68 minWidth: '150' 68 minWidth: '150'
69 }, 69 },
70 { 70 {
71 prop: "gyqk",
72 label: "共有方式",
73 },
74 {
71 prop: "qlrmc", 75 prop: "qlrmc",
72 label: "使用权人", 76 label: "使用权人",
73 }, 77 },
...@@ -81,7 +85,7 @@ class data extends filter { ...@@ -81,7 +85,7 @@ class data extends filter {
81 label: "权利性质", 85 label: "权利性质",
82 }, 86 },
83 { 87 {
84 prop: "mj", 88 prop: "mjmc",
85 width: '100', 89 width: '100',
86 label: "使用权面积", 90 label: "使用权面积",
87 }, 91 },
...@@ -90,6 +94,11 @@ class data extends filter { ...@@ -90,6 +94,11 @@ class data extends filter {
90 label: "土地用途", 94 label: "土地用途",
91 }, 95 },
92 { 96 {
97 prop: "qdjgmc",
98 width: '100',
99 label: "取得价格",
100 },
101 {
93 prop: "zl", 102 prop: "zl",
94 label: "坐落", 103 label: "坐落",
95 minWidth: '150' 104 minWidth: '150'
......