ff0f8828 by renchao@pashanhoo.com

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

2 parents de3a4fa4 ada7ba7a
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,22 +106,40 @@ export default { ...@@ -106,22 +106,40 @@ 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 142 // let bsmClmx = this.previewImg.imgList[this.previewImg.index].bsmClmx
124 // 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) {
127 // that.$emit('updateList', res.result) 145 // that.$emit('updateList', res.result)
...@@ -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)
110 this.addRepairRecord() 108 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
109 confirmButtonText: '确定',
110 cancelButtonText: '取消',
111 type: 'warning'
112 }).then(() => {
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(){
...@@ -225,7 +197,7 @@ export default { ...@@ -225,7 +197,7 @@ export default {
225 }, 197 },
226 ]; 198 ];
227 this.tabName = 'slxx'; 199 this.tabName = 'slxx';
228 }, 200 },
229 201
230 // stepForm(index){ 202 // stepForm(index){
231 // console.log(index); 203 // console.log(index);
......
...@@ -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,13 +85,18 @@ class data extends filter { ...@@ -81,13 +85,18 @@ 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 },
88 { 92 {
89 prop: "ytmc", 93 prop: "ytmc",
90 label: "土地用途", 94 label: "土地用途",
95 },
96 {
97 prop: "qdjgmc",
98 width: '100',
99 label: "取得价格",
91 }, 100 },
92 { 101 {
93 prop: "zl", 102 prop: "zl",
......