Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
c579ca83 by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents 61082672 d7b43e96
Inline Side-by-side
Showing 7 changed files with 244 additions and 83 deletions
1 import request from '@/plugin/axios'
2 /**
3 * 查询所有行政区
4 */
5 export function getSearchList() {
6 return request({
7 url: '/system/basiccommon/query',
8 method: 'get',
9 })
10 }
...\ No newline at end of file ...\ No newline at end of file
...@@ -9,3 +9,28 @@ export function insertZrzjbxx (data) { ...@@ -9,3 +9,28 @@ export function insertZrzjbxx (data) {
9 data: data, 9 data: data,
10 }) 10 })
11 } 11 }
12
13 /**
14 * 生成不动产单元号
15 */
16 export function getBdcdyh (dpdm,dptype) {
17 return request({
18 url: '/system/generator/getBdcdyh',
19 method: 'get',
20 params:{
21 dpdm:dpdm,
22 dptype:dptype
23 }
24 })
25 }
26
27 /**
28 * 保存自然幢信息
29 */
30 export function saveZrzInfo (data) {
31 return request({
32 url: '/fw/qjZrz/updateQjZrz',
33 method: 'put',
34 data:data
35 })
36 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -12,7 +12,10 @@ const store = new Vuex.Store({ ...@@ -12,7 +12,10 @@ const store = new Vuex.Store({
12 zdbsm:'', 12 zdbsm:'',
13 xzqList:[], 13 xzqList:[],
14 djqList:[], 14 djqList:[],
15 djzqList:[] 15 djzqList:[],
16 //创建自然幢时需要用到的临时存储信息
17 zrzbsm:'',
18 xmmc:'',
16 }, 19 },
17 modules: { 20 modules: {
18 user, 21 user,
......
...@@ -31,27 +31,6 @@ ...@@ -31,27 +31,6 @@
31 <i :class="item.icon"></i> 31 <i :class="item.icon"></i>
32 <span>{{ item.name }}</span> 32 <span>{{ item.name }}</span>
33 </div> 33 </div>
34 <div class="top-items">
35 <el-menu
36 :default-active="activeIndex"
37 class="el-menu-demo"
38 mode="horizontal"
39 @select="handleSelect"
40 :router="true"
41 >
42 <el-submenu index="2">
43 <template slot="title"
44 >临时网页开发路由跳转</template
45 >
46 <el-menu-item
47 v-for="(item, index) in tempTab"
48 :index="item.path"
49 :key="'tempTab' + index"
50 >{{ item.name }}</el-menu-item
51 >
52 </el-submenu>
53 </el-menu>
54 </div>
55 </div> 34 </div>
56 <div class="header-bottom"> 35 <div class="header-bottom">
57 <Navigation ref="navigation"></Navigation> 36 <Navigation ref="navigation"></Navigation>
...@@ -73,7 +52,6 @@ ...@@ -73,7 +52,6 @@
73 </template> 52 </template>
74 <script> 53 <script>
75 import util from "@/libs/util.js"; 54 import util from "@/libs/util.js";
76 import screenfull from "screenfull";
77 import Navigation from "../components/IvyElement/navigation"; 55 import Navigation from "../components/IvyElement/navigation";
78 import Create from "./panel/create/index"; 56 import Create from "./panel/create/index";
79 import LineTree from "../components/lineTree/lineTree"; 57 import LineTree from "../components/lineTree/lineTree";
...@@ -86,7 +64,6 @@ export default { ...@@ -86,7 +64,6 @@ export default {
86 }, 64 },
87 data() { 65 data() {
88 return { 66 return {
89 activeIndex: "1",
90 navigationList: [], 67 navigationList: [],
91 isActive: false, 68 isActive: false,
92 textLogo: false, 69 textLogo: false,
...@@ -310,21 +287,10 @@ export default { ...@@ -310,21 +287,10 @@ export default {
310 } 287 }
311 }); 288 });
312 }, 289 },
313 screen() {
314 // 如果不允许进入全屏，发出不允许提示
315 // if (!screenfull.enabled) {
316 // this.$message('您的浏览器不能全屏');
317 // return false
318 // }
319 screenfull.toggle();
320 },
321 //树控件点击事件 290 //树控件点击事件
322 itemClick(data) { 291 itemClick(data) {
323 console.log(data); 292 console.log(data);
324 }, 293 },
325 handleSelect(key, keyPath) {
326 console.log(key, keyPath);
327 },
328 //关闭新建子组件弹框 294 //关闭新建子组件弹框
329 closeDialog(){ 295 closeDialog(){
330 this.dialogVisible = false; 296 this.dialogVisible = false;
......
...@@ -242,7 +242,12 @@ export default { ...@@ -242,7 +242,12 @@ export default {
242 }); 242 });
243 //todo 跳转到自然幢基本信息内容表页面 (预留) 243 //todo 跳转到自然幢基本信息内容表页面 (预留)
244 this.close(); 244 this.close();
245 this.$router.push("/zrz"); 245 this.$store.zdbsm=res.result.zdbsm;
246 this.$store.zrzbsm=res.result.bsm;
247 this.$store.xmmc=res.result.xmmc;
248 this.$router.push({
249 path: '/zrz', query:{data: res.result}
250 });
246 } else { 251 } else {
247 this.$message.error("创建失败！"); 252 this.$message.error("创建失败！");
248 } 253 }
......
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
43 43
44 <script> 44 <script>
45 import SearchHead from "../../../components/searchHead/searchHead"; 45 import SearchHead from "../../../components/searchHead/searchHead";
46 import {getSearchList} from "../../../api/search";
46 export default { 47 export default {
47 name: "", 48 name: "",
48 components: { SearchHead }, 49 components: { SearchHead },
...@@ -55,35 +56,42 @@ export default { ...@@ -55,35 +56,42 @@ export default {
55 type: [], 56 type: [],
56 }, 57 },
57 tableData: [ 58 tableData: [
58 { 59 // {
59 bdcdyh: "610101001001GB00001W", 60 // bdcdyh: "610101001001GB00001W",
60 xmmc: "万科集团万科城", 61 // xmmc: "万科集团万科城",
61 bdcqzh: "陕（2017）西安市不动产权第00000", 62 // bdcqzh: "陕（2017）西安市不动产权第00000",
62 lx: "宗地", 63 // lx: "宗地",
63 qlr: "李子新", 64 // qlr: "李子新",
64 zl: "灞桥－田家湾-咸宁东路,近浐河西路", 65 // zl: "灞桥－田家湾-咸宁东路,近浐河西路",
65 zrsj: "2020.09.07 ", 66 // zrsj: "2020.09.07 ",
66 cjr: "李子新", 67 // cjr: "李子新",
67 }, 68 // },
68 ], 69 ],
69 tableHeight: "", 70 tableHeight: "",
70 }; 71 };
71 }, 72 },
72 created() {}, 73 created() {},
73 mounted() { 74 mounted() {
74 for (let i = 0; i < 11; i++) { 75 getSearchList().then((res)=>{
75 let obj = { 76 console.log(res)
76 bdcdyh: "610101001001GB00001W", 77 if(res.code===200){
77 xmmc: "万科集团万科城", 78 this.tableData=res.result.records;
78 bdcqzh: "陕（2017）西安市不动产权第00000", 79 console.log(this.tableData)
79 lx: "自然幢", 80 }
80 qlr: "李子新", 81 })
81 zl: "灞桥－田家湾-咸宁东路,近浐河西路", 82 // for (let i = 0; i < 11; i++) {
82 zrsj: "2020.09.07 ", 83 // let obj = {
83 cjr: "李子新", 84 // bdcdyh: "610101001001GB00001W",
84 }; 85 // xmmc: "万科集团万科城",
85 this.tableData.push(obj); 86 // bdcqzh: "陕（2017）西安市不动产权第00000",
86 } 87 // lx: "自然幢",
88 // qlr: "李子新",
89 // zl: "灞桥－田家湾-咸宁东路,近浐河西路",
90 // zrsj: "2020.09.07 ",
91 // cjr: "李子新",
92 // };
93 // this.tableData.push(obj);
94 // }
87 this.tableHeight = this.$refs.dataGrid.offsetHeight - 68; 95 this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
88 }, 96 },
89 methods: { 97 methods: {
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 <td colspan="2" align="center" >自然幢号</td> 15 <td colspan="2" align="center" >自然幢号</td>
16 <td colspan="4" > 16 <td colspan="4" >
17 <el-input v-model="form.zrzh" style="width: 70%"></el-input> 17 <el-input v-model="form.zrzh" style="width: 70%"></el-input>
18 <el-button @click.prevent="" type="primary" size="mini" style="width:25%;margin-left:3%">生成</el-button> 18 <el-button @click.prevent="generatorCode" type="primary" size="mini" style="width:25%;margin-left:3%">生成</el-button>
19 </td> 19 </td>
20 </tr> 20 </tr>
21 <tr height="30"> 21 <tr height="30">
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 <td colspan="2" align="center" >不动产单元号</td> 26 <td colspan="2" align="center" >不动产单元号</td>
27 <!-- todo 此处暂时存放的是不动产单元号标识码，而不是不动产单元号--> 27 <!-- todo 此处暂时存放的是不动产单元号标识码，而不是不动产单元号-->
28 <td colspan="4" > 28 <td colspan="4" >
29 <el-input v-model="form.dyhbsm" style="width: 70%"></el-input> 29 <el-input v-model="form.bdcdyh" style="width: 70%"></el-input>
30 <el-button @click.prevent="" type="primary" size="mini" style="width:25%;margin-left:3%">生成</el-button> 30 <el-button @click.prevent="" type="primary" size="mini" style="width:25%;margin-left:3%">生成</el-button>
31 </td> 31 </td>
32 </tr> 32 </tr>
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
47 <td colspan="4" > 47 <td colspan="4" >
48 <el-select v-model="form.fwxzbsm" placeholder="请选择" > 48 <el-select v-model="form.fwxzbsm" placeholder="请选择" >
49 <el-option 49 <el-option
50 v-for="item in options" 50 v-for="item in fwxzOptions"
51 :key="item.value" 51 :key="item.value"
52 :label="item.label" 52 :label="item.label"
53 :value="item.value"> 53 :value="item.value">
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
124 <td colspan="4" > 124 <td colspan="4" >
125 <el-select v-model="form.fwcbbsm" placeholder="请选择" > 125 <el-select v-model="form.fwcbbsm" placeholder="请选择" >
126 <el-option 126 <el-option
127 v-for="item in options" 127 v-for="item in cbOptions"
128 :key="item.value" 128 :key="item.value"
129 :label="item.label" 129 :label="item.label"
130 :value="item.value"> 130 :value="item.value">
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
135 <td colspan="4" > 135 <td colspan="4" >
136 <el-select v-model="form.fwcqlybsm" placeholder="请选择" > 136 <el-select v-model="form.fwcqlybsm" placeholder="请选择" >
137 <el-option 137 <el-option
138 v-for="item in options" 138 v-for="item in cqlyOptions"
139 :key="item.value" 139 :key="item.value"
140 :label="item.label" 140 :label="item.label"
141 :value="item.value"> 141 :value="item.value">
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
144 </td> 144 </td>
145 </tr> 145 </tr>
146 146
147 <tr height="30" v-for="(item1,index) in form.ytList" :key="index"> 147 <tr height="30" v-for="(item1,index) in form.fwytList" :key="index">
148 <td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle"> 148 <td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle">
149 <el-button type="primary" size="mini" style="margin-right: 10px" @click="addYtInfo">添加</el-button> 149 <el-button type="primary" size="mini" style="margin-right: 10px" @click="addYtInfo">添加</el-button>
150 <span>用途</span> 150 <span>用途</span>
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
157 <td width="30" colspan="4" align="center" > 157 <td width="30" colspan="4" align="center" >
158 <el-select v-model="item1.fwytzdbsm" placeholder="请选择" > 158 <el-select v-model="item1.fwytzdbsm" placeholder="请选择" >
159 <el-option 159 <el-option
160 v-for="item in options" 160 v-for="item in ytOptions"
161 :key="item.value" 161 :key="item.value"
162 :label="item.label" 162 :label="item.label"
163 :value="item.value"> 163 :value="item.value">
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
168 <td width="30" colspan="4" align="center" > 168 <td width="30" colspan="4" align="center" >
169 <el-select v-model="item1.fwsjytbsm" placeholder="请选择" > 169 <el-select v-model="item1.fwsjytbsm" placeholder="请选择" >
170 <el-option 170 <el-option
171 v-for="item in options" 171 v-for="item in ytOptions"
172 :key="item.value" 172 :key="item.value"
173 :label="item.label" 173 :label="item.label"
174 :value="item.value"> 174 :value="item.value">
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
188 <td colspan="9" > 188 <td colspan="9" >
189 <el-select v-model="item1.fwjgzdbsm" placeholder="请选择" > 189 <el-select v-model="item1.fwjgzdbsm" placeholder="请选择" >
190 <el-option 190 <el-option
191 v-for="item in options" 191 v-for="item in jgOptions"
192 :key="item.value" 192 :key="item.value"
193 :label="item.label" 193 :label="item.label"
194 :value="item.value"> 194 :value="item.value">
...@@ -267,6 +267,8 @@ ...@@ -267,6 +267,8 @@
267 <script> 267 <script>
268 import Qlr from "../../../components/formMenu/qlr"; 268 import Qlr from "../../../components/formMenu/qlr";
269 import Qlxz from "../../../components/formMenu/qlxz"; 269 import Qlxz from "../../../components/formMenu/qlxz";
270 import {getBdcdyh,saveZrzInfo} from "../../../api/zrz"
271 import {getDdicByMC} from "../../../api/common"
270 export default { 272 export default {
271 name:'zrz', 273 name:'zrz',
272 components:{ 274 components:{
...@@ -279,7 +281,7 @@ ...@@ -279,7 +281,7 @@
279 zrzbsm:'', //自然幢标识码 281 zrzbsm:'', //自然幢标识码
280 zdbsm:'', //宗地标识码 282 zdbsm:'', //宗地标识码
281 dzbsm:'', //多幢标识码 283 dzbsm:'', //多幢标识码
282 dyhbsm:'', //不动产单元号标识码 284 bdcdyh:'', //不动产单元号标识码
283 zrzh:'', //自然幢号 285 zrzh:'', //自然幢号
284 jzwgd:'', //建筑物高度 286 jzwgd:'', //建筑物高度
285 zzdmj:'', //幢占地面积 287 zzdmj:'', //幢占地面积
...@@ -304,7 +306,7 @@ ...@@ -304,7 +306,7 @@
304 ydybsm:'', //原单元标识码 306 ydybsm:'', //原单元标识码
305 name:'', 307 name:'',
306 date:'', 308 date:'',
307 ytList:[{ 309 fwytList:[{
308 glbsm:'', //关联标识码 310 glbsm:'', //关联标识码
309 fwytzdbsm:'', //房屋用途字典标识码 311 fwytzdbsm:'', //房屋用途字典标识码
310 sx:'', //顺序 312 sx:'', //顺序
...@@ -315,15 +317,7 @@ ...@@ -315,15 +317,7 @@
315 glbsm:'', //关联标识码 317 glbsm:'', //关联标识码
316 sx:'', //顺序 318 sx:'', //顺序
317 }], 319 }],
318 qlxzList:[{ 320 qlxzList:[]
319 qlxzdm:'', //权利性质代码
320 glbsm:'', //宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
321 qlxzzdbsm:'', //权利性质字典表标识码
322 qlxzmc:'', //权利名称名称
323 zhqlxzlx:'', //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质
324 addQjTdytRequestList:[{
325 }], //土地用途新增实体列表
326 }]
327 }, 321 },
328 options: [{ 322 options: [{
329 value: '选项1', 323 value: '选项1',
...@@ -341,6 +335,12 @@ ...@@ -341,6 +335,12 @@
341 value: '选项5', 335 value: '选项5',
342 label: '北京烤鸭' 336 label: '北京烤鸭'
343 }], 337 }],
338 fwxzOptions:[],
339 cbOptions:[],
340 cqlyOptions:[],
341 ytOptions:[],
342 jgOptions:[],
343 djOptions:[],
344 value: '', 344 value: '',
345 ytTitleRowspan:1, //用途的单元格垂直合并数量 345 ytTitleRowspan:1, //用途的单元格垂直合并数量
346 fwjgTitleRowspan:1, //房屋结构的单元格垂直合并数量 346 fwjgTitleRowspan:1, //房屋结构的单元格垂直合并数量
...@@ -348,7 +348,7 @@ ...@@ -348,7 +348,7 @@
348 }, 348 },
349 methods: { 349 methods: {
350 addYtInfo(){ 350 addYtInfo(){
351 this.form.ytList.push({ 351 this.form.fwytList.push({
352 glbsm:'', 352 glbsm:'',
353 fwytzdbsm:'', 353 fwytzdbsm:'',
354 fwsjytbsm:'', 354 fwsjytbsm:'',
...@@ -357,13 +357,13 @@ ...@@ -357,13 +357,13 @@
357 this.ytTitleRowspan=this.form.ytList.length; 357 this.ytTitleRowspan=this.form.ytList.length;
358 }, 358 },
359 deleteYtInfo(index){ 359 deleteYtInfo(index){
360 if(this.form.ytList.length<=1){ 360 if(this.form.fwytList.length<=1){
361 this.$message({ 361 this.$message({
362 message: '不能删除，最少含有一条用途信息', 362 message: '不能删除，最少含有一条用途信息',
363 type: 'warning' 363 type: 'warning'
364 }); 364 });
365 }else{ 365 }else{
366 this.form.ytList.splice(index,1); 366 this.form.fwytList.splice(index,1);
367 this.ytTitleRowspan=this.form.ytList.length; 367 this.ytTitleRowspan=this.form.ytList.length;
368 } 368 }
369 }, 369 },
...@@ -388,10 +388,154 @@ ...@@ -388,10 +388,154 @@
388 }, 388 },
389 onSave(){ 389 onSave(){
390 console.log(this.form) 390 console.log(this.form)
391 // this.form.qlxzList=this.$refs.qlxzModule.getQlxzDataList();
392 this.form.qlxzList=
393 [{
394 "addQjTdytRequestList": [
395 {
396 "bz": "string",
397 "mj": 0,
398 "pzdjbsm": "string",
399 "pzdjmc": "string",
400 "pzytdm": "1",
401 "pzytmc": "string",
402 "pzytmj": 0,
403 "qlxzbsm": "string",
404 "sjdjbsm": "string",
405 "sjdjmc": "string",
406 "sjytdm": "1234",
407 "sjytmc": "string",
408 "sjytmj": 0,
409 "syqx": "string",
410 "tdsyjssj": "2020-10-09 03:15:37.730Z",
411 "tdsyqssj": "2020-10-09 03:15:37.730Z",
412 "tdzh": "string"
413 }
414 ],
415 "glbsm": "string",
416 "qlxzdm": "string",
417 "qlxzmc": "string",
418 "qlxzzdbsm": "string",
419 "zhqlxzlx": 0
420 }];
421 if(1>0){
422 saveZrzInfo(this.form).then((res)=>{
423 if(res.code===200){
424 this.$message.success("保存完成！")
425 }
426 })
427 }
391 }, 428 },
392 onSubmit(){ 429 onSubmit(){
393 console.log(this.form) 430 console.log(this.form)
394 } 431 },
432 generatorCode(){
433 getBdcdyh(this.form.zdbsm,"zrz")
434 .then((res)=>{
435 this.form.zrzh=res.result.substring(0,24);
436 this.form.bdcdyh=res.result;
437 })
438 },
439 getFwxzList(){
440 getDdicByMC("房屋性质").then((res)=>{
441 if(res.result!=null){
442 for(let i=0;i<res.result.length;i++){
443 this.fwxzOptions.push({
444 label:res.result[i].mc,
445 value:res.result[i].bsm
446 })
447 }
448 }
449
450 })
451 },
452 getCbList(){
453 getDdicByMC("房屋产别").then((res)=>{
454 if(res.result!=null){
455 for(let i=0;i<res.result.length;i++){
456 this.cbOptions.push({
457 label:res.result[i].mc,
458 value:res.result[i].bsm
459 })
460 }
461 }
462
463 })
464 },
465 getCqlyList(){
466 getDdicByMC("产权来源").then((res)=>{
467 if(res.result!=null){
468 for(let i=0;i<res.result.length;i++){
469 this.cqlyOptions.push({
470 label:res.result[i].mc,
471 value:res.result[i].bsm
472 })
473 }
474 }
475
476 })
477 },
478 getYtList(){
479 getDdicByMC("土地用途").then((res)=>{
480 if(res.result!=null){
481 for(let i=0;i<res.result.length;i++){
482 this.ytOptions.push({
483 label:res.result[i].mc,
484 value:res.result[i].bsm
485 })
486 }
487 }
488
489 })
490 },
491 getDList(){
492 getDdicByMC("土地等级").then((res)=>{
493 if(res.result!=null){
494 for(let i=0;i<res.result.length;i++){
495 this.djOptions.push({
496 label:res.result[i].mc,
497 value:res.result[i].bsm
498 })
499 }
500 }
501
502 })
503 },
504 getJgist(){
505 getDdicByMC("房屋结构").then((res)=>{
506 if(res.result!=null){
507 for(let i=0;i<res.result.length;i++){
508 this.jgOptions.push({
509 label:res.result[i].mc,
510 value:res.result[i].bsm
511 })
512 }
513 }
514
515 })
516 },
517 getQlrxxData() {
518 console.log(this.$refs.qlrxxModule.getQlgyfsData()); //权利共有方式数据
519 console.log(this.$refs.qlrxxModule.getQlrxxData()); //权利人表格数据
520 },
521 getQlxzData() {
522 console.log(this.$refs.qlxzModule.getQlxzDataList()); //权利性质数据
523 },
524 },
525 created(){
526
527 },
528 mounted() {
529 this.getFwxzList();
530 this.getCbList();
531 this.getCqlyList();
532 this.getYtList();
533 this.getDList();
534 this.getJgist();
535 //todo 怎么判断进入到该页面是从新建处进来的，还是从右键宗地进来的！如果是从新建进来的就需要把虚拟宗标识码带过来；
536 this.form.zdbsm=this.$store.zdbsm;
537 this.form.xmmc=this.$store.xmmc;
538 this.form.zrzbsm=this.$store.zrzbsm;
395 } 539 }
396 } 540 }
397 </script> 541 </script>
......