ef56ffcc by tianhaohao@pashanhoo.com

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

2 parents b501aa13 1d82675b
No preview for this file type
1 { 1 {
2 "TITLE": "不动产登记系统", 2 "TITLE": "不动产登记系统",
3 "SERVERAPI": "/bdcdj", 3 "SERVERAPI": "/bdcdj",
4 "ip": "http://192.168.2.38" 4 "ip": "http://192.168.2.38",
5 "IDCARDURL": "http://127.0.0.1:33088/function=get_idcard&readnew=0"
5 } 6 }
...\ No newline at end of file ...\ No newline at end of file
......
1 {
2 "TITLE": "不动产登记系统",
3 "SERVERAPI": "/bdcdj",
4 "ip": "http://192.168.2.38"
5 }
...\ No newline at end of file ...\ No newline at end of file
1 {
2 "TITLE": "不动产登记系统",
3 "SERVERAPI": "service-bdcdj-th",
4 "ip": "http://192.168.2.38"
5 }
...\ No newline at end of file ...\ No newline at end of file
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
75 }, 75 },
76 heightNum: { 76 heightNum: {
77 type: Number, 77 type: Number,
78 default: 355, 78 default: 0,
79 }, 79 },
80 maxHeight: { 80 maxHeight: {
81 type: Number, 81 type: Number,
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
137 getHeight () { 137 getHeight () {
138 if (!this.heightNumSetting) { 138 if (!this.heightNumSetting) {
139 let _this = this 139 let _this = this
140 if (this.heightNum) { 140 if (this.heightNum == 0) {
141 _this.$nextTick(() => { 141 _this.$nextTick(() => {
142 if (document.querySelector(".tags-view-container")) { 142 if (document.querySelector(".tags-view-container")) {
143 window.addEventListener('resize', () => { 143 window.addEventListener('resize', () => {
......
1 /*
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-06-14 15:05:38
5 */
1 import Vue from 'vue' 6 import Vue from 'vue'
2 import Popup from './index.vue' 7 import Popup from './index.vue'
3 const PopupBox = Vue.extend(Popup) 8 const PopupBox = Vue.extend(Popup)
...@@ -36,9 +41,9 @@ const Popup1 = (title, editItem, data, formData) => { ...@@ -36,9 +41,9 @@ const Popup1 = (title, editItem, data, formData) => {
36 document.body.appendChild(instance.$el) 41 document.body.appendChild(instance.$el)
37 Vue.nextTick(() => { 42 Vue.nextTick(() => {
38 instance.isShow = true 43 instance.isShow = true
44 // 将组件实例赋值给loading
45 popuping = instance
39 }) 46 })
40 // 将组件实例赋值给loading
41 popuping = instance
42 return instance 47 return instance
43 } 48 }
44 export default Popup1 49 export default Popup1
......
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);
......
1 /*
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-06-14 14:48:35
5 */
1 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
2 let vm = null
3
4 const sendThis = (_this) => {
5 vm = _this
6 }
7 class data extends filter { 7 class data extends filter {
8 constructor() { 8 constructor() {
9 super() 9 super()
...@@ -16,6 +16,7 @@ class data extends filter { ...@@ -16,6 +16,7 @@ class data extends filter {
16 }, 16 },
17 { 17 {
18 prop: 'bdcqzh', 18 prop: 'bdcqzh',
19 width: '110',
19 label: '不动产权证号', 20 label: '不动产权证号',
20 }, 21 },
21 { 22 {
...@@ -32,6 +33,7 @@ class data extends filter { ...@@ -32,6 +33,7 @@ class data extends filter {
32 }, 33 },
33 { 34 {
34 prop: 'bdcdyh', 35 prop: 'bdcdyh',
36 width: '110',
35 label: '不动产单元号', 37 label: '不动产单元号',
36 }, 38 },
37 { 39 {
...@@ -52,6 +54,7 @@ class data extends filter { ...@@ -52,6 +54,7 @@ class data extends filter {
52 }, 54 },
53 { 55 {
54 prop: 'fwmj', 56 prop: 'fwmj',
57 width: '120',
55 label: '建筑面积(㎡)', 58 label: '建筑面积(㎡)',
56 }, 59 },
57 { 60 {
...@@ -77,284 +80,8 @@ class data extends filter { ...@@ -77,284 +80,8 @@ class data extends filter {
77 } 80 }
78 ] 81 ]
79 } 82 }
80 sqrCol () {
81 return [
82 {
83 width: "60",
84 renderHeader: (h, scope) => {
85 return (
86 <i
87 class="el-icon-plus pointer"
88 onClick={() => {
89 vm.add("sqr");
90 }}
91 style="color:#409EFF"
92 ></i>
93 );
94 },
95 render: (h, scope) => {
96 return (
97 <i
98 class="el-icon-minus pointer"
99 onClick={() => {
100 vm.remove(scope.$index, scope.row, "sqr");
101 }}
102 ></i>
103 );
104 },
105 },
106 {
107 width: "150",
108 label: "身份证读卡器",
109 render: (h, scope) => {
110 return (
111 <div>
112 <el-button
113 type="text"
114 icon="el-icon-edit-outline"
115 onClick={() => {
116 vm.handleRead(scope);
117 }}
118 >
119 读取
120 </el-button>
121 </div>
122 );
123 },
124 },
125 {
126 width: "150",
127 prop: "sqrxm",
128 label: "姓名/名称",
129 render: (h, scope) => {
130 return (
131 <el-input
132 placeholder="姓名/名称"
133 value={scope.row[scope.column.property]}
134 onInput={(val) => {
135 scope.row[scope.column.property] = val;
136 }}
137 ></el-input>
138 );
139 },
140 },
141 {
142 prop: "sqrzjlxbm",
143 label: "证件种类",
144 render: (h, scope) => {
145 return (
146 <el-select
147 class="width100"
148 clearable
149 value={scope.row[scope.column.property]}
150 onChange={(val) => {
151 scope.row[scope.column.property] = val;
152 }}
153 >
154 {this.getDictData('A30').map((option) => {
155 return (
156 <el-option
157 label={option.dname}
158 value={option.dcode}
159 ></el-option>
160 );
161 })}
162 </el-select>
163 );
164 },
165 },
166 {
167 prop: "sqrzjhm",
168 label: "证件号",
169 render: (h, scope) => {
170 return (
171 <el-input
172 placeholder="证件号"
173 value={scope.row[scope.column.property]}
174 onInput={(val) => {
175 scope.row[scope.column.property] = val;
176 }}
177 maxlength="21"
178 ></el-input>
179 );
180 },
181 },
182 {
183 prop: "lxdh",
184 label: "联系电话",
185 render: (h, scope) => {
186 return (
187 <div class="typePhone">
188 <el-input
189 placeholder="联系电话"
190 value={scope.row[scope.column.property]}
191 onInput={(val) => {
192 scope.row[scope.column.property] = val;
193 }}
194 onBlur={(val) => {
195 vm.teltest(scope.row);
196 }}
197 type="tel"
198 maxlength="11"
199 ></el-input>
200 <span
201 v-show={scope.row.inputErr}
202 style={{
203 fontSize: "12px",
204 color: "red",
205 position: "absolute",
206 bottom: "-2px",
207 left: "0",
208 }}
209 >
210 请输入正确手机号
211 </span>
212 </div>
213 );
214 },
215 },
216 ]
217 }
218 qlrCol () {
219 return [
220 {
221 width: "60",
222 renderHeader: (h, scope) => {
223 return (
224 <i
225 class="el-icon-plus pointer"
226 onClick={() => {
227 vm.add("qlr");
228 }}
229 style="color:#409EFF"
230 ></i>
231 );
232 },
233 render: (h, scope) => {
234 return (
235 <i
236 class="el-icon-minus pointer"
237 onClick={() => {
238 vm.remove(scope.$index, scope.row, "qlr");
239 }}
240 ></i>
241 );
242 },
243 },
244 {
245 width: "150",
246 label: "身份证读卡器",
247 render: (h, scope) => {
248 return (
249 <div>
250 <el-button
251 type="text"
252 icon="el-icon-edit-outline"
253 onClick={() => {
254 vm.handleRead(scope);
255 }}
256 >
257 读取
258 </el-button>
259 </div>
260 );
261 },
262 },
263 {
264 width: "150",
265 prop: "sqrxm",
266 label: "姓名/名称",
267 render: (h, scope) => {
268 return (
269 <el-input
270 placeholder="姓名/名称"
271 value={scope.row[scope.column.property]}
272 onInput={(val) => {
273 scope.row[scope.column.property] = val;
274 }}
275 ></el-input>
276 );
277 },
278 },
279 {
280 prop: "sqrzjlxbm",
281 label: "证件种类",
282 render: (h, scope) => {
283 return (
284 <el-select
285 class="width100"
286 value={scope.row[scope.column.property]}
287 onChange={(val) => {
288 scope.row[scope.column.property] = val;
289 }}
290 >
291 {this.getDictData('A30').map((option) => {
292 return (
293 <el-option
294 label={option.dname}
295 value={option.dcode}
296 ></el-option>
297 );
298 })}
299 </el-select>
300 );
301 },
302 },
303 {
304 prop: "sqrzjhm",
305 label: "证件号",
306 render: (h, scope) => {
307 return (
308 <el-input
309 placeholder="证件号"
310 value={scope.row[scope.column.property]}
311 onInput={(val) => {
312 scope.row[scope.column.property] = val;
313 }}
314 maxlength="21"
315 ></el-input>
316 );
317 },
318 },
319 {
320 prop: "lxdh",
321 label: "联系电话",
322 render: (h, scope) => {
323 return (
324 <div class="typePhone">
325 <el-input
326 placeholder="联系电话"
327 value={scope.row[scope.column.property]}
328 onInput={(val) => {
329 scope.row[scope.column.property] = val;
330 }}
331 onBlur={(val) => {
332 vm.teltest(scope.row);
333 }}
334 type="tel"
335 maxlength="11"
336 ></el-input>
337 <span
338 v-show={scope.row.inputErr}
339 style={{
340 fontSize: "12px",
341 color: "red",
342 position: "absolute",
343 bottom: "-2px",
344 left: "0",
345 }}
346 >
347 请输入正确手机号
348 </span>
349 </div>
350 );
351 },
352 },
353 ]
354 }
355 } 83 }
356 let datas = new data() 84 let datas = new data()
357 export { 85 export {
358 datas, 86 datas
359 sendThis
360 } 87 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-14 09:47:38 4 * @LastEditTime: 2023-06-14 13:14:26
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
...@@ -195,9 +195,7 @@ ...@@ -195,9 +195,7 @@
195 195
196 // 身份证读取 196 // 身份证读取
197 readClick (row) { 197 readClick (row) {
198 var httpurl = "http://127.0.0.1:33088/"; 198 axios.post(this.BASE_API.IDCARDURL).then(res => {
199 var url = httpurl + "function=get_idcard&readnew=0"
200 axios.post(url).then(res => {
201 if (res.data.code == 0) { 199 if (res.data.code == 0) {
202 let data = res.data.IDCardInfo 200 let data = res.data.IDCardInfo
203 row.sqrmc = data.name 201 row.sqrmc = data.name
......