Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
6306e097 by 杨威
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem into master 

 Conflicts:
	src/components/lineTree/lineTree.vue
	src/views/zd/zddcb/index.vue
2 parents f43aad33 8778a3e1
Inline Side-by-side
Showing 12 changed files with 124 additions and 44 deletions
...@@ -145,3 +145,26 @@ export function moveH(data) { ...@@ -145,3 +145,26 @@ export function moveH(data) {
145 data:data 145 data:data
146 }) 146 })
147 } 147 }
148
149 /**
150 * 删除逻辑幢
151 * @param bsm
152 */
153 export function deleteLjz(id) {
154 return request({
155 url:'system/qjLjz/deleteLjzByBsm',
156 method:'delete',
157 params:{
158 id
159 }
160 })
161 }
162 export function deleteZdy(id) {
163 return request({
164 url:'system/qjZdy/deleteZdyByBsm',
165 method:'delete',
166 params:{
167 id
168 }
169 })
170 }
......
...@@ -137,6 +137,9 @@ ol, ul { list-style:none; } ...@@ -137,6 +137,9 @@ ol, ul { list-style:none; }
137 -webkit-box-shadow: 0px 4px 28px 0px rgba(0, 0, 0, 0.4); 137 -webkit-box-shadow: 0px 4px 28px 0px rgba(0, 0, 0, 0.4);
138 box-shadow: 0px 4px 28px 0px rgba(0, 0, 0, 0.4); 138 box-shadow: 0px 4px 28px 0px rgba(0, 0, 0, 0.4);
139 } 139 }
140 .el-dialog__body{
141 padding-bottom: 25px!important;
142 }
140 // 自定义右键菜单样式 143 // 自定义右键菜单样式
141 .contextmenu { 144 .contextmenu {
142 margin: 0; 145 margin: 0;
......
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
72 class="contextmenu" 72 class="contextmenu"
73 > 73 >
74 <li @click="openCreateDialog">新建自然幢</li> 74 <li @click="openCreateDialog">新建自然幢</li>
75 <li @click="deleteByBsm()">删除</li>
75 </ul> 76 </ul>
76 <ul 77 <ul
77 v-show="createVisible" 78 v-show="createVisible"
...@@ -88,6 +89,8 @@ ...@@ -88,6 +89,8 @@
88 <li v-show="zdData.type == 'zrz'" @click="openLpbDialog('ljz')">添加逻辑幢</li> 89 <li v-show="zdData.type == 'zrz'" @click="openLpbDialog('ljz')">添加逻辑幢</li>
89 <li v-show="zdData.type == 'zrz' || zdData.type == 'ljz'" @click="openLpbDialog('zdy')">添加幢单元</li> 90 <li v-show="zdData.type == 'zrz' || zdData.type == 'ljz'" @click="openLpbDialog('zdy')">添加幢单元</li>
90 <li v-show="zdData.type == 'zrz' || zdData.type == 'ljz' || zdData.type == 'zdy'" @click="openLpbDialog('ch')">添加层户</li> 91 <li v-show="zdData.type == 'zrz' || zdData.type == 'ljz' || zdData.type == 'zdy'" @click="openLpbDialog('ch')">添加层户</li>
92 <li v-show="zdData.type == 'ljz'" @click="deleteLjz">删除逻辑幢</li>
93 <li v-show="zdData.type == 'zdy'" @click="deleteZdy">删除幢单元</li>
91 </ul> 94 </ul>
92 95
93 <el-dialog title="导入图形" :visible.sync="improtDialog"> 96 <el-dialog title="导入图形" :visible.sync="improtDialog">
...@@ -106,6 +109,7 @@ import Create from "../../views/panel/create/index"; ...@@ -106,6 +109,7 @@ import Create from "../../views/panel/create/index";
106 import ImportGeo from './tx/importGeo' 109 import ImportGeo from './tx/importGeo'
107 import geoUtils from "@components/lineTree/tx/js/geoUtils"; 110 import geoUtils from "@components/lineTree/tx/js/geoUtils";
108 import featureUpdate from "@libs/map/featureUpdate"; 111 import featureUpdate from "@libs/map/featureUpdate";
112 import {deleteLjz,deleteZdy} from "./../../api/lpb"
109 export default { 113 export default {
110 inheritAttrs: false, 114 inheritAttrs: false,
111 props: { 115 props: {
...@@ -182,6 +186,29 @@ export default { ...@@ -182,6 +186,29 @@ export default {
182 }, 186 },
183 187
184 methods: { 188 methods: {
189 loading(){
190 this.$emit("loading")
191 },
192 deleteLjz(){
193 console.log("删除逻辑幢")
194 console.log(this.zdData,"zdData")
195 deleteLjz(this.zdData.bsm).then(res=>{
196 if (res.success) {
197 this.loading()
198 }else {
199
200 }
201 })
202 },
203 deleteZdy(){
204 console.log("删除幢单元")
205 console.log(this.zdData,"zdData")
206 deleteZdy(this.zdData.bsm).then(res=>{
207 if (res.success) {
208 this.loading()
209 }
210 })
211 },
185 // 改变菜单数据 212 // 改变菜单数据
186 changeVisible(data) { 213 changeVisible(data) {
187 this.visible = data; 214 this.visible = data;
...@@ -490,12 +517,6 @@ export default { ...@@ -490,12 +517,6 @@ export default {
490 text-overflow: ellipsis; 517 text-overflow: ellipsis;
491 white-space: nowrap; 518 white-space: nowrap;
492 } 519 }
493 // .active_color {
494 // color: #ffffff;
495 // }
496 .reTree_box {
497 // overflow-y: auto;
498 }
499 .reTree_icon { 520 .reTree_icon {
500 width: 17px; 521 width: 17px;
501 height: 17px; 522 height: 17px;
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
20 </el-form-item> 20 </el-form-item>
21 <el-form-item label="不动产单元号"> 21 <el-form-item label="不动产单元号">
22 <el-input 22 <el-input
23 maxlength="28"
23 v-model="queryData.bdcdyh" 24 v-model="queryData.bdcdyh"
24 placeholder="输入不动产单元号" 25 placeholder="输入不动产单元号"
25 @change="query" 26 @change="query"
......
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
10 <tr height="30"> 10 <tr height="30">
11 <td colspan="2" align="center" >宗地代码</td> 11 <td colspan="2" align="center" >宗地代码</td>
12 <td colspan="4" > 12 <td colspan="4" >
13 <input class="formInput" v-model="form.zddm"> 13 <input class="formInput" maxlength="19" v-model="form.zddm">
14 </td> 14 </td>
15 <td colspan="2" align="center" >不动产单元号</td> 15 <td colspan="2" align="center" >不动产单元号</td>
16 <td colspan="4" class="psr"> 16 <td colspan="4" class="psr">
17 <input class="formInput percent80" v-model="form.bdcdyh"> 17 <input class="formInput percent80" maxlength="28" v-model="form.bdcdyh">
18 <el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button> 18 <el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button>
19 </td> 19 </td>
20 </tr> 20 </tr>
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
22 <el-col :span="8"> 22 <el-col :span="8">
23 <el-form-item label="不动产单元号"> 23 <el-form-item label="不动产单元号">
24 <el-input 24 <el-input
25 maxlength="28"
25 v-model="queryData.bdcdyh" 26 v-model="queryData.bdcdyh"
26 placeholder="输入不动产单元号" 27 placeholder="输入不动产单元号"
27 ></el-input> 28 ></el-input>
......
...@@ -117,16 +117,20 @@ ...@@ -117,16 +117,20 @@
117 //点击办理 117 //点击办理
118 handleClick(row) { 118 handleClick(row) {
119 let type;name; 119 let type;name;
120 let path = "";
121
120 switch (row.dylx) { 122 switch (row.dylx) {
121 case "zd": 123 case "zd":
122 type = "0"; 124 type = "0";
123 name = '宗地'; 125 name = '宗地';
124 this.$store.state.zdbsm = row.glbsm 126 this.$store.state.zdbsm = row.glbsm
127 path = "/zd";
125 break; 128 break;
126 case "zrz": 129 case "zrz":
127 type = "1"; 130 type = "1";
128 name = '自然幢'; 131 name = '自然幢';
129 this.$store.state.zrzbsm = row.glbsm; 132 this.$store.state.zrzbsm = row.glbsm;
133 path = "/zrz";
130 break; 134 break;
131 case "h": 135 case "h":
132 case "h0": 136 case "h0":
...@@ -138,6 +142,7 @@ ...@@ -138,6 +142,7 @@
138 type = "3"; 142 type = "3";
139 name = "多幢"; 143 name = "多幢";
140 this.$store.state.dzbsm = row.glbsm; 144 this.$store.state.dzbsm = row.glbsm;
145 path = "/dz";
141 default: 146 default:
142 break; 147 break;
143 } 148 }
...@@ -154,7 +159,13 @@ ...@@ -154,7 +159,13 @@
154 type: 'success', 159 type: 'success',
155 message: '更正成功!' 160 message: '更正成功!'
156 }); 161 });
157 this.$router.push("/"+path); 162 this.$router.push({
163 path: path,
164 query: {
165 bsm: res.result,
166 source: 2
167 }
168 });
158 } else { 169 } else {
159 this.$message({ 170 this.$message({
160 message: res.message, 171 message: res.message,
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
46 </el-pagination> 46 </el-pagination>
47 </div> 47 </div>
48 48
49 <el-dialog title="户编辑" :visible.sync="hbjVisible" width="50%" center> 49 <el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" center>
50 <hbj ref="hbj" :bsm="hbsm" :key="hbsm"></hbj> 50 <hbj ref="hbj" :bsm="hbsm" :key="hbsm"></hbj>
51 <div class="btnGroup"> 51 <div class="btnGroup">
52 <el-button type="primary" @click="hbjSaveInfo">保存</el-button> 52 <el-button type="primary" @click="hbjSaveInfo">保存</el-button>
...@@ -219,5 +219,14 @@ ...@@ -219,5 +219,14 @@
219 padding: 18px 0; 219 padding: 18px 0;
220 } 220 }
221 } 221 }
222 .hbjDialog{
223 /deep/ .el-dialog{
224 margin-top: 10vh!important;
225 }
226 }
227 .btnGroup{
228 margin: 20px auto 0;
229 width: 230px;
230 }
222 } 231 }
223 </style> 232 </style>
......
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
107 </td> 107 </td>
108 <td colspan="2">宗地代码<i class="requisite">*</i></td> 108 <td colspan="2">宗地代码<i class="requisite">*</i></td>
109 <td colspan="4" class="psr"> 109 <td colspan="4" class="psr">
110 <input :disabled="formData.qszt!='0'" 110 <input :disabled="formData.qszt!='0'" maxlength="19"
111 type="text" placeholder="请输入" 111 type="text" placeholder="请输入"
112 class="formInput percent80" 112 class="formInput percent80"
113 v-model="formData.zddm" 113 v-model="formData.zddm"
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
126 <td colspan="2">不动产单元号<i class="requisite">*</i></td> 126 <td colspan="2">不动产单元号<i class="requisite">*</i></td>
127 <td colspan="4" class="psr"> 127 <td colspan="4" class="psr">
128 <input 128 <input
129 type="text" :disabled="formData.qszt!='0'" 129 type="text" :disabled="formData.qszt!='0'" maxlength="28"
130 class="formInput percent80" 130 class="formInput percent80"
131 v-model="formData.bdcdyh" 131 v-model="formData.bdcdyh"
132 /> 132 />
...@@ -454,7 +454,7 @@ export default { ...@@ -454,7 +454,7 @@ export default {
454 }) 454 })
455 } 455 }
456 //权利性质数据传给子组件 456 //权利性质数据传给子组件
457 this.$refs.qlxzModule.countList = res.result.list 457 this.$refs.qlxzModule.countList = res.result.list;
458 } 458 }
459 } 459 }
460 }) 460 })
...@@ -485,7 +485,6 @@ export default { ...@@ -485,7 +485,6 @@ export default {
485 this.dpdm = this.dpdm + item.dm; 485 this.dpdm = this.dpdm + item.dm;
486 } 486 }
487 }); 487 });
488 console.log(this.dpdm)
489 }, 488 },
490 489
491 //不动产单元号再次生成提示框 490 //不动产单元号再次生成提示框
...@@ -540,8 +539,13 @@ export default { ...@@ -540,8 +539,13 @@ export default {
540 this.formData.jyrjl = this.isInterval(this.formData.jyrjl) ? this.rjl : this.formData.jyrjl; 539 this.formData.jyrjl = this.isInterval(this.formData.jyrjl) ? this.rjl : this.formData.jyrjl;
541 this.formData.jyjzmd = this.isInterval(this.formData.jyjzmd) ? this.jzmd : this.formData.jyjzmd; 540 this.formData.jyjzmd = this.isInterval(this.formData.jyjzmd) ? this.jzmd : this.formData.jyjzmd;
542 this.formData.jyjzxg = this.isInterval(this.formData.jyjzxg) ? this.jzxg : this.formData.jyjzxg; 541 this.formData.jyjzxg = this.isInterval(this.formData.jyjzxg) ? this.jzxg : this.formData.jyjzxg;
543 542 //判断宗地代码和不动产单元号是否手动修改过（宗地代码和不动产单元号的前14位是否和底盘代码一致）
544 543 if(this.formData.zddm.substring(0,14) != this.dpdm || this.formData.bdcdyh.substring(0,14) != this.dpdm){
544 this.$message({
545 message: '宗地代码或不动产单元号有误，请核对后再试一次',
546 type: "warning",
547 });
548 }else{
545 // FIXME:表单验证错误 549 // FIXME:表单验证错误
546 /* this.$refs['ruleForm'].validate((valid) => { 550 /* this.$refs['ruleForm'].validate((valid) => {
547 debugger 551 debugger
...@@ -569,10 +573,11 @@ export default { ...@@ -569,10 +573,11 @@ export default {
569 type: "warning", 573 type: "warning",
570 }); 574 });
571 } 575 }
572 //保存空间库
573 //todo
574 }) 576 })
575 .catch((error) => {}); 577 .catch((error) => {});
578 }
579
580
576 581
577 }, 582 },
578 //提交宗地基本信息 583 //提交宗地基本信息
...@@ -631,14 +636,17 @@ export default { ...@@ -631,14 +636,17 @@ export default {
631 this.$store.state.xzqList = res.result; 636 this.$store.state.xzqList = res.result;
632 }) 637 })
633 .catch((error) => {}); 638 .catch((error) => {});
639
640 getListByPbsm(djqdm)
641 .then((res) => {
642 this.$store.state.djzqList = res.result;
634 getListByXzqbsm(xzqdm) 643 getListByXzqbsm(xzqdm)
635 .then((res) => { 644 .then((res) => {
636 this.$store.state.djqList = res.result; 645 this.$store.state.djqList = res.result;
646 //生成底盘代码
647 this.generatorDpdm();
637 }) 648 })
638 .catch((error) => {}); 649 .catch((error) => {});
639 getListByPbsm(djqdm)
640 .then((res) => {
641 this.$store.state.djzqList = res.result;
642 }) 650 })
643 .catch((error) => {}); 651 .catch((error) => {});
644 } 652 }
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
8 <el-radio-button label="0">预测</el-radio-button> 8 <el-radio-button label="0">预测</el-radio-button>
9 </el-radio-group> 9 </el-radio-group>
10 <el-input 10 <el-input
11 maxlength="28"
11 v-model="bdcdyh" 12 v-model="bdcdyh"
12 :style="{ width: inputWidth + 'px' }" 13 :style="{ width: inputWidth + 'px' }"
13 @focus="inputFocus" 14 @focus="inputFocus"
...@@ -79,7 +80,7 @@ ...@@ -79,7 +80,7 @@
79 > 80 >
80 <!-- 左侧树结构 --> 81 <!-- 左侧树结构 -->
81 <div class="lp-tree" :class="createFlag ? 'w260' : 'w0'"> 82 <div class="lp-tree" :class="createFlag ? 'w260' : 'w0'">
82 <LineTree :pd="pd" class="treeData" :islpb="islpb"></LineTree> 83 <LineTree :pd="pd" class="treeData" :islpb="islpb" @loading="loading"></LineTree>
83 <p 84 <p
84 @click="createFlag = false" 85 @click="createFlag = false"
85 style="width:20px;float:left;margin-top: 12px;margin-left:10px;cursor:pointer;" 86 style="width:20px;float:left;margin-top: 12px;margin-left:10px;cursor:pointer;"
...@@ -246,7 +247,7 @@ ...@@ -246,7 +247,7 @@
246 @close="hcxlzClose" 247 @close="hcxlzClose"
247 ></h-cxlz> 248 ></h-cxlz>
248 <!-- 双击户的弹出框 --> 249 <!-- 双击户的弹出框 -->
249 <el-dialog title="户编辑" :visible.sync="hbjVisible" width="50%" center> 250 <el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" center>
250 <hbj ref="hbj" :bsm="hbsm"></hbj> 251 <hbj ref="hbj" :bsm="hbsm"></hbj>
251 <div class="btnGroup"> 252 <div class="btnGroup">
252 <el-button type="primary" @click="hbjSaveInfo">保存</el-button> 253 <el-button type="primary" @click="hbjSaveInfo">保存</el-button>
...@@ -393,6 +394,9 @@ export default { ...@@ -393,6 +394,9 @@ export default {
393 }, 100); 394 }, 100);
394 }, 395 },
395 methods: { 396 methods: {
397 loading(){
398 this.getLpbMenuTree(this.$store.state.zrzbsm);
399 },
396 openPlC(){ 400 openPlC(){
397 if (this.cbsmList.length <= 0) { 401 if (this.cbsmList.length <= 0) {
398 Message.warning("请选择层") 402 Message.warning("请选择层")
...@@ -848,5 +852,10 @@ export default { ...@@ -848,5 +852,10 @@ export default {
848 margin: 20px auto 0; 852 margin: 20px auto 0;
849 width: 230px; 853 width: 230px;
850 } 854 }
855 .hbjDialog{
856 /deep/ .el-dialog{
857 margin-top: 10vh!important;
858 }
859 }
851 } 860 }
852 </style> 861 </style>
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 </td> 21 </td>
22 <td colspan="2" align="center">自然幢号</td> 22 <td colspan="2" align="center">自然幢号</td>
23 <td colspan="4"> 23 <td colspan="4">
24 <el-input v-model="form.zrzh"></el-input> 24 <el-input v-model="form.zrzh" maxlength="24"></el-input>
25 </td> 25 </td>
26 </tr> 26 </tr>
27 <tr height="30"> 27 <tr height="30">
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
31 </td> 31 </td>
32 <td colspan="2" align="center">不动产单元号</td> 32 <td colspan="2" align="center">不动产单元号</td>
33 <td colspan="4" class="psr"> 33 <td colspan="4" class="psr">
34 <el-input v-model="form.bdcdyh" class="percent80"></el-input> 34 <el-input v-model="form.bdcdyh" maxlength="28" class="percent80"></el-input>
35 <el-button 35 <el-button
36 @click.prevent="" 36 @click.prevent=""
37 size="mini" 37 size="mini"
......
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
10 <td colspan="2">宗地代码</td> 10 <td colspan="2">宗地代码</td>
11 <td colspan="4" style="min-width:450px"> 11 <td colspan="4" style="min-width:450px">
12 <input v-model="form.zddm" class="formInput" disabled> 12 <input v-model="form.zddm" class="formInput" disabled>
13 <input v-show="false" :disabled="form.qszt!='0'" class="formInput" v-model="form.zdbsm"> 13 <input v-show="false" :disabled="form.qszt!='0'" maxlength="19" class="formInput" v-model="form.zdbsm">
14 </td> 14 </td>
15 <td colspan="2" >自然幢号<i class="requisite">*</i></td> 15 <td colspan="2" >自然幢号<i class="requisite">*</i></td>
16 <td colspan="4" class="psr"> 16 <td colspan="4" class="psr">
17 <input class="formInput percent80" :disabled="form.qszt!='0'" v-model="form.zrzh"> 17 <input class="formInput percent80" :disabled="form.qszt!='0'" maxlength="24" v-model="form.zrzh">
18 <el-button @click.prevent="generatorCode" type="warning" class="createBtn" size="mini">生成</el-button> 18 <el-button @click.prevent="generatorCode" type="warning" class="createBtn" size="mini">生成</el-button>
19 </td> 19 </td>
20 </tr> 20 </tr>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 </td> 25 </td>
26 <td colspan="2" >不动产单元号<i class="requisite">*</i></td> 26 <td colspan="2" >不动产单元号<i class="requisite">*</i></td>
27 <td colspan="4"> 27 <td colspan="4">
28 <input class="formInput " :disabled="form.qszt!='0'" v-model="form.bdcdyh"> 28 <input class="formInput " :disabled="form.qszt!='0'" maxlength="28" v-model="form.bdcdyh">
29 </td> 29 </td>
30 </tr> 30 </tr>
31 31
...@@ -348,22 +348,6 @@ ...@@ -348,22 +348,6 @@
348 sx:'', //顺序 348 sx:'', //顺序
349 }], 349 }],
350 }, 350 },
351 options: [{
352 value: '选项1',
353 label: '黄金糕'
354 }, {
355 value: '选项2',
356 label: '双皮奶'
357 }, {
358 value: '选项3',
359 label: '蚵仔煎'
360 }, {
361 value: '选项4',
362 label: '龙须面'
363 }, {
364 value: '选项5',
365 label: '北京烤鸭'
366 }],
367 value: '', 351 value: '',
368 ytTitleRowspan:1, //用途的单元格垂直合并数量 352 ytTitleRowspan:1, //用途的单元格垂直合并数量
369 fwjgTitleRowspan:1, //房屋结构的单元格垂直合并数量 353 fwjgTitleRowspan:1, //房屋结构的单元格垂直合并数量
...@@ -412,6 +396,14 @@ ...@@ -412,6 +396,14 @@
412 } 396 }
413 }, 397 },
414 onSave(){ 398 onSave(){
399 //判断自然幢号和不动产单元号是否手动修改过（自然幢号和不动产单元号的前19位是否和宗地代码一致）
400 console.log(this.form,'this.form');
401 if(this.form.zrzh.substring(0,19) != this.form.zddm || this.form.bdcdyh.substring(0,19) != this.form.zddm){
402 this.$message({
403 message: '自然幢号或不动产单元号有误，请核对后再试一次',
404 type: "warning",
405 });
406 }else{
415 this.loading=true; 407 this.loading=true;
416 this.form.zrzbsm=this.bsm; 408 this.form.zrzbsm=this.bsm;
417 this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList(); 409 this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList();
...@@ -429,6 +421,8 @@ ...@@ -429,6 +421,8 @@
429 }) 421 })
430 this.loading=false; 422 this.loading=false;
431 } 423 }
424 }
425
432 }, 426 },
433 onSubmit(){ 427 onSubmit(){
434 let data={ 428 let data={
......