Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
69a59e53 by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents 8a253254 03f86373
Inline Side-by-side
Showing 5 changed files with 148 additions and 80 deletions
...@@ -29,7 +29,7 @@ export function getBdcdyh (dpdm,dptype) { ...@@ -29,7 +29,7 @@ export function getBdcdyh (dpdm,dptype) {
29 */ 29 */
30 export function saveDzInfo (data) { 30 export function saveDzInfo (data) {
31 return request({ 31 return request({
32 url: '/fw/qjZrz/updateQjZrz', 32 url: '/fw/qjDz/updateQjDz',
33 method: 'put', 33 method: 'put',
34 data:data 34 data:data
35 }) 35 })
...@@ -38,9 +38,9 @@ export function saveDzInfo (data) { ...@@ -38,9 +38,9 @@ export function saveDzInfo (data) {
38 /** 38 /**
39 * 保存自然幢信息 39 * 保存自然幢信息
40 */ 40 */
41 export function getZrzDetailByBsm (data) { 41 export function getDzDetailByBsm (data) {
42 return request({ 42 return request({
43 url: '/fw/qjZrz/getQjZrzDetailById', 43 url: '/fw/qjDz/getDzDetailByBsm',
44 method: 'get', 44 method: 'get',
45 params:{ 45 params:{
46 id:data 46 id:data
......
...@@ -100,11 +100,12 @@ export default { ...@@ -100,11 +100,12 @@ export default {
100 this.$emit("changeTop", e.pageY); 100 this.$emit("changeTop", e.pageY);
101 this.$emit("changeLeft", e.pageX); 101 this.$emit("changeLeft", e.pageX);
102 this.$emit("changeZdData",item); 102 this.$emit("changeZdData",item);
103 //判断所有权类型 103 this.$emit("changeVisible", false);
104 console.log(item.dm,'item.dm '); 104 // //判断所有权类型
105 if(item.dm == 'G' || item.dm == 'J' ||item.dm == 'Z'){ 105 // console.log(item.dm,'item.dm ');
106 this.$emit("changeCreateVisible", true); 106 // if(item.dm == 'G' || item.dm == 'J' ||item.dm == 'Z'){
107 } 107 // this.$emit("changeCreateVisible", true);
108 // }
108 //判断楼盘类型 109 //判断楼盘类型
109 switch (item.type) { 110 switch (item.type) {
110 case 'zd': 111 case 'zd':
......
...@@ -135,17 +135,17 @@ export default { ...@@ -135,17 +135,17 @@ export default {
135 } 135 }
136 }, 136 },
137 137
138 createVisible(value) { 138 // createVisible(value) {
139 if (value) { 139 // if (value) {
140 document.body.addEventListener("click", this.closeMenu); 140 // document.body.addEventListener("click", this.closeMenu);
141 } else { 141 // } else {
142 document.body.removeEventListener("click", this.closeMenu); 142 // document.body.removeEventListener("click", this.closeMenu);
143 } 143 // }
144 } 144 // }
145 }, 145 },
146 created() { 146 created() {
147 console.log("lineTree create"); 147 console.log("lineTree create");
148 // this.preDealData(this.pd); 148 this.preDealData(this.pd);
149 // this.expandTreeItemById(["6b5af49d803f97baf06afb897de257f5"]); 149 // this.expandTreeItemById(["6b5af49d803f97baf06afb897de257f5"]);
150 }, 150 },
151 151
...@@ -184,8 +184,14 @@ export default { ...@@ -184,8 +184,14 @@ export default {
184 this.dialogVisible = false; 184 this.dialogVisible = false;
185 }, 185 },
186 preDealData(list) { 186 preDealData(list) {
187 //楼盘表目录树没有expand属性 187 // //楼盘表目录树没有expand属性
188 list[0].expand = list[0].expand == undefined ? true:list[0].expand; 188 // list[0].expand = list[0].expand == undefined ? true:list[0].expand;
189 list.forEach((x) => {
190 if (x.expand == undefined) this.$set(x, "expand", true);
191 if (x.children && x.children.length > 0) {
192 this.preDealData(x.children);
193 }
194 });
189 return list; 195 return list;
190 }, 196 },
191 // 根据id展开树的具体项 197 // 根据id展开树的具体项
...@@ -206,17 +212,10 @@ export default { ...@@ -206,17 +212,10 @@ export default {
206 console.log(this.formatData, "this.formatData"); 212 console.log(this.formatData, "this.formatData");
207 }, 213 },
208 itemClick(item) { 214 itemClick(item) {
209 item.expand = item.expand == undefined? true:!item.expand; 215 // item.expand = item.expand == undefined? true:!item.expand;
216 item.expand = !item.expand;
210 this.$emit("itemClick", item); 217 this.$emit("itemClick", item);
211 }, 218 },
212 // 详情点击
213 detailClick(data) {
214 clearTimeout(this.timer);
215 this.timer = setTimeout(() => {
216 this.selectedDetail = data;
217 this.$emit("detailClick", data);
218 }, 300);
219 },
220 //自然幢右键点击事件 219 //自然幢右键点击事件
221 openMenu(e,item){ 220 openMenu(e,item){
222 console.log(item,'右键item'); 221 console.log(item,'右键item');
...@@ -228,7 +227,7 @@ export default { ...@@ -228,7 +227,7 @@ export default {
228 //关闭右键菜单 227 //关闭右键菜单
229 closeMenu(){ 228 closeMenu(){
230 this.lpbvisible = false; 229 this.lpbvisible = false;
231 this.createVisible = false; 230 // this.createVisible = false;
232 }, 231 },
233 //楼盘表右键菜单项打开父组件弹框 232 //楼盘表右键菜单项打开父组件弹框
234 openLpbDialog(type){ 233 openLpbDialog(type){
......
...@@ -116,6 +116,10 @@ ...@@ -116,6 +116,10 @@
116 this.$store.state.zdbsm = row.glbsm; 116 this.$store.state.zdbsm = row.glbsm;
117 path = "/zd"; 117 path = "/zd";
118 break; 118 break;
119 case "dz":
120 this.$store.state.dzbsm = row.glbsm;
121 path = "/dz";
122 break;
119 default: 123 default:
120 break; 124 break;
121 } 125 }
......
...@@ -10,12 +10,12 @@ ...@@ -10,12 +10,12 @@
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 <el-input v-model="form.zdbsm"></el-input> 13 <el-input v-model="form.zddm"></el-input>
14 </td> 14 </td>
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.dyhbsm" style="width: 70%"></el-input> 17 <el-input v-model="form.bdcdyh" style="width: 70%"></el-input>
18 <el-button @click.prevent="" size="mini" type="primary" style="width:25%;margin-left:3%">生成</el-button> 18 <el-button @click.prevent="generatorCode" size="mini" type="primary" style="width:25%;margin-left:3%">生成</el-button>
19 </td> 19 </td>
20 </tr> 20 </tr>
21 <tr height="30"> 21 <tr height="30">
...@@ -27,10 +27,10 @@ ...@@ -27,10 +27,10 @@
27 <td colspan="4" > 27 <td colspan="4" >
28 <el-select v-model="form.fwxzbsm" placeholder="请选择" > 28 <el-select v-model="form.fwxzbsm" placeholder="请选择" >
29 <el-option 29 <el-option
30 v-for="item in options" 30 v-for="item in $store.state.fwxzOptions"
31 :key="item.value" 31 :key="item.bsm"
32 :label="item.label" 32 :label="item.mc"
33 :value="item.value"> 33 :value="item.bsm">
34 </el-option> 34 </el-option>
35 </el-select> 35 </el-select>
36 </td> 36 </td>
...@@ -39,12 +39,12 @@ ...@@ -39,12 +39,12 @@
39 <tr height="30"> 39 <tr height="30">
40 <td colspan="2" align="center" >房屋类型</td> 40 <td colspan="2" align="center" >房屋类型</td>
41 <td colspan="4" > 41 <td colspan="4" >
42 <el-select v-model="form.fwxzbsm" placeholder="请选择" > 42 <el-select v-model="form.fwlxbsm" placeholder="请选择" >
43 <el-option 43 <el-option
44 v-for="item in options" 44 v-for="item in $store.state.fwlxList"
45 :key="item.value" 45 :key="item.bsm"
46 :label="item.label" 46 :label="item.mc"
47 :value="item.value"> 47 :value="item.bsm">
48 </el-option> 48 </el-option>
49 </el-select> 49 </el-select>
50 </td> 50 </td>
...@@ -63,10 +63,10 @@ ...@@ -63,10 +63,10 @@
63 <td colspan="4" > 63 <td colspan="4" >
64 <el-select v-model="form.fwcbbsm" placeholder="请选择" > 64 <el-select v-model="form.fwcbbsm" placeholder="请选择" >
65 <el-option 65 <el-option
66 v-for="item in options" 66 v-for="item in $store.state.cbOptions"
67 :key="item.value" 67 :key="item.bsm"
68 :label="item.label" 68 :label="item.mc"
69 :value="item.value"> 69 :value="item.bsm">
70 </el-option> 70 </el-option>
71 </el-select> 71 </el-select>
72 </td> 72 </td>
...@@ -74,16 +74,16 @@ ...@@ -74,16 +74,16 @@
74 <td colspan="4" > 74 <td colspan="4" >
75 <el-select v-model="form.fwcqlybsm" placeholder="请选择" > 75 <el-select v-model="form.fwcqlybsm" placeholder="请选择" >
76 <el-option 76 <el-option
77 v-for="item in options" 77 v-for="item in $store.state.cqlyOptions"
78 :key="item.value" 78 :key="item.bsm"
79 :label="item.label" 79 :label="item.mc"
80 :value="item.value"> 80 :value="item.bsm">
81 </el-option> 81 </el-option>
82 </el-select> 82 </el-select>
83 </td> 83 </td>
84 </tr> 84 </tr>
85 85
86 <tr height="30" v-for="(item1,index) in form.ytList" :key="index"> 86 <tr height="30" v-for="(item1,index) in form.fwytList" :key="index">
87 <td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle"> 87 <td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle">
88 <el-button type="primary" size="mini" style="margin-right: 10px" @click="addYtInfo">添加</el-button> 88 <el-button type="primary" size="mini" style="margin-right: 10px" @click="addYtInfo">添加</el-button>
89 <span>用途</span> 89 <span>用途</span>
...@@ -94,25 +94,33 @@ ...@@ -94,25 +94,33 @@
94 规划用途 94 规划用途
95 </td> 95 </td>
96 <td colspan="4" align="center" > 96 <td colspan="4" align="center" >
97 <el-select v-model="item1.fwytzdbsm" placeholder="请选择" > 97 <el-select-tree class="formInput"
98 <el-option 98 v-if="show"
99 v-for="item in options" 99 :default-expand-all="defaultExpandAll"
100 :key="item.value" 100 :multiple="multiple"
101 :label="item.label" 101 :placeholder="placeholder"
102 :value="item.value"> 102 :disabled="disabled"
103 </el-option> 103 :data="$store.state.fwytList"
104 </el-select> 104 :props="treeProps"
105 :check-strictly="checkStrictly"
106 :clearable="clearable"
107 v-model="item1.fwytzdbsm"
108 ></el-select-tree>
105 </td> 109 </td>
106 <td colspan="1" align="center" >用途</td> 110 <td colspan="1" align="center" >用途</td>
107 <td colspan="4" align="center" > 111 <td colspan="4" align="center" >
108 <el-select v-model="item1.fwsjytbsm" placeholder="请选择" > 112 <el-select-tree class="formInput"
109 <el-option 113 v-if="show"
110 v-for="item in options" 114 :default-expand-all="defaultExpandAll"
111 :key="item.value" 115 :multiple="multiple"
112 :label="item.label" 116 :placeholder="placeholder"
113 :value="item.value"> 117 :disabled="disabled"
114 </el-option> 118 :data="$store.state.fwytList"
115 </el-select> 119 :props="treeProps"
120 :check-strictly="checkStrictly"
121 :clearable="clearable"
122 v-model="item1.fwsjytbsm"
123 ></el-select-tree>
116 </td> 124 </td>
117 </tr> 125 </tr>
118 126
...@@ -201,8 +209,9 @@ ...@@ -201,8 +209,9 @@
201 209
202 <script> 210 <script>
203 import Qlr from "../../../components/formMenu/qlr"; 211 import Qlr from "../../../components/formMenu/qlr";
204 import Qlxz from "../../../components/formMenu/qlxz"; 212 import Qlxz from "../../../components/formMenu/qlxz_simple";
205 import {saveDzInfo,getBdcdyh} from "../../../api/dz"; 213 import {saveDzInfo,getBdcdyh,getDzDetailByBsm} from "../../../api/dz";
214 import {getQjZdjbxxDetailById} from "../../../api/zd"
206 export default { 215 export default {
207 name:'zrz', 216 name:'zrz',
208 components:{ 217 components:{
...@@ -211,11 +220,28 @@ ...@@ -211,11 +220,28 @@
211 }, 220 },
212 data () { 221 data () {
213 return { 222 return {
223
224 //树型结构
225 show:true,
226 clearable: true,
227 defaultExpandAll: true,
228 multiple: false,
229 placeholder: '请选择',
230 disabled: false,
231 checkStrictly: true,
232 treeProps: {
233 value: 'bsm',
234 children: 'children',
235 label: 'mc'
236 },
237
214 bsm:'', //此页面的多幢标识码 238 bsm:'', //此页面的多幢标识码
215 form:{ 239 form:{
216 dzbsm:'', //多幢标识码 240 dzbsm:'', //多幢标识码
217 zdbsm:'', //宗地标识码 241 zdbsm:'', //宗地标识码
242 zddm:'', //宗地代码
218 dyhbsm:'', //不动产单元号标识码 243 dyhbsm:'', //不动产单元号标识码
244 bdcdyh:'', //不动产单元号标识码
219 zl:'', //坐落 245 zl:'', //坐落
220 xmmc:'', //项目名称 246 xmmc:'', //项目名称
221 jgrq:'', //竣工日期 247 jgrq:'', //竣工日期
...@@ -228,7 +254,7 @@ ...@@ -228,7 +254,7 @@
228 zdmj:'', //占地面积 254 zdmj:'', //占地面积
229 name:'', 255 name:'',
230 date:'', 256 date:'',
231 ytList:[{ 257 fwytList:[{
232 glbsm:'', //关联标识码 258 glbsm:'', //关联标识码
233 fwytzdbsm:'', //房屋用途字典标识码 259 fwytzdbsm:'', //房屋用途字典标识码
234 sx:'', //顺序 260 sx:'', //顺序
...@@ -262,30 +288,27 @@ ...@@ -262,30 +288,27 @@
262 }], 288 }],
263 value: '', 289 value: '',
264 ytTitleRowspan:1, //用途的单元格垂直合并数量 290 ytTitleRowspan:1, //用途的单元格垂直合并数量
265 fwjgTitleRowspan:1, //房屋结构的单元格垂直合并数量
266 qlxzGroupTitleRowspan:1, //房屋结构的单元格垂直合并数量
267 qlxzItemTitleRowspan:1, //房屋结构的单元格垂直合并数量
268 } 291 }
269 }, 292 },
270 methods: { 293 methods: {
271 addYtInfo(){ 294 addYtInfo(){
272 this.form.ytList.push({ 295 this.form.fwytList.push({
273 glbsm:'', 296 glbsm:'',
274 fwytzdbsm:'', 297 fwytzdbsm:'',
275 fwsjytbsm:'', 298 fwsjytbsm:'',
276 sx:'', 299 sx:'',
277 }); 300 });
278 this.ytTitleRowspan=this.form.ytList.length; 301 this.ytTitleRowspan=this.form.fwytList.length;
279 }, 302 },
280 deleteYtInfo(index){ 303 deleteYtInfo(index){
281 if(this.form.ytList.length<=1){ 304 if(this.form.fwytList.length<=1){
282 this.$message({ 305 this.$message({
283 message: '不能删除，最少含有一条用途信息', 306 message: '不能删除，最少含有一条用途信息',
284 type: 'warning' 307 type: 'warning'
285 }); 308 });
286 }else{ 309 }else{
287 this.form.ytList.splice(index,1); 310 this.form.fwytList.splice(index,1);
288 this.ytTitleRowspan=this.form.ytList.length; 311 this.ytTitleRowspan=this.form.fwytList.length;
289 } 312 }
290 }, 313 },
291 addFwjgInfo(){ 314 addFwjgInfo(){
...@@ -334,6 +357,47 @@ ...@@ -334,6 +357,47 @@
334 deleteQlxzItem(index){ 357 deleteQlxzItem(index){
335 358
336 }, 359 },
360 getDzDetailByBsm(data){
361 getDzDetailByBsm(data).then((res)=>{
362 if(res.code===200) {
363 this.form = res.result;
364 console.log(this.form+"fwytList")
365 console.log(this.form)
366 if(this.form.fwytList.length===0){
367 this.form.fwytList.push({
368 glbsm:'', //关联标识码
369 fwytzdbsm:'', //房屋用途字典标识码
370 sx:'', //顺序
371 fwsjytbsm:'', //房屋实际用途字典标识码
372 })
373 }
374 this.ytTitleRowspan=this.form.fwytList.length;
375 if(res.result.qjQlxzListVOS.length>0){
376 if(res.result.qjQlxzListVOS[0].list.length<1){
377 res.result.qjQlxzListVOS[0].list.push({
378 "pzdjbsm": "",
379 "pzdjmc": "",
380 "pzytdm": "",
381 "pzytmc": "",
382 "pzytmj": 0,
383 "qlxzbsm": "",
384 "sjdjbsm": "",
385 "sjdjmc": "",
386 "sjytdm": "",
387 "sjytmc": "",
388 "sjytmj": 0,
389 "syqx": "",
390 "tdsyjssj": "",
391 "tdsyqssj": "",
392 "tdzh": ""
393 })
394 }
395 //权利性质数据传给子组件
396 this.$refs.qlxzModule.countList = res.result.qjQlxzListVOS
397 }
398 }
399 })
400 },
337 401
338 402
339 onSave(){ 403 onSave(){
...@@ -366,16 +430,13 @@ ...@@ -366,16 +430,13 @@
366 generatorCode(){ 430 generatorCode(){
367 getBdcdyh(this.form.zddm,"dz") 431 getBdcdyh(this.form.zddm,"dz")
368 .then((res)=>{ 432 .then((res)=>{
369 // this.form.zrzh=res.result.substring(0,24); 433 this.form.bdcdyh=res.result;
370 // this.form.bdcdyh=res.result;
371 }) 434 })
372 }, 435 },
373 }, 436 },
374 created() { 437 created() {
375 if(this.source===1){ 438 if(this.source===1){
376 this.bsm=this.$route.query.bsm; 439 this.bsm=this.$route.query.bsm;
377 // this.form.zdbsm=this.$store.zdbsm;
378 // this.form.xmmc=this.$store.xmmc;
379 this.form.dzbsm=this.$route.query.bsm; 440 this.form.dzbsm=this.$route.query.bsm;
380 this.getZddm(this.$store.state.zdbsm); 441 this.getZddm(this.$store.state.zdbsm);
381 }else { 442 }else {
...@@ -383,6 +444,9 @@ ...@@ -383,6 +444,9 @@
383 this.form.dzbsm=this.$route.query.bsm; 444 this.form.dzbsm=this.$route.query.bsm;
384 } 445 }
385 if(this.source!==1){ 446 if(this.source!==1){
447 this.bsm=this.$route.query.bsm;
448 this.form.dzbsm=this.$route.query.bsm;
449 this.getDzDetailByBsm(this.$route.query.bsm)
386 } 450 }
387 } 451 }
388 } 452 }
......