Skip to content

任超 / js.CadastralSystem

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

Merge remote-tracking branch 'origin/master'

2 parents fae459c2 776157fc
Expand all
Inline Side-by-side
Showing 11 changed files with 157 additions and 47 deletions
1 import request from '@/plugin/axios'
2
3 /**
4 * 查询逻辑幢基本信息
5 */
6 export function getQjLjzDetailById(data) {
7 return request({
8 url: '/system/qjLjz/getQjLjzDetailById',
9 method: 'get',
10 params: {
11 id: data,
12 }
13 })
14 }
15
16 /**
17 * 更新保存逻辑幢基本信息
18 */
19 export function updateQjLjz(data) {
20 return request({
21 url: '/system/qjLjz/updateQjLjz',
22 method: 'put',
23 data: data,
24 })
25 }
26
...@@ -417,7 +417,6 @@ ...@@ -417,7 +417,6 @@
417 //todo 权利人页面调整 417 //todo 权利人页面调整
418 this.formData.addQjDlrFrRequest=[]; 418 this.formData.addQjDlrFrRequest=[];
419 this.formData.glbsm=this.bsm; 419 this.formData.glbsm=this.bsm;
420 this.formData.gyfsbsm=this.gyfs;
421 //将代理人，法人数据合在一起，名称为addQjDlrFrRequest； 420 //将代理人，法人数据合在一起，名称为addQjDlrFrRequest；
422 //法人的type字段类型为0, 421 //法人的type字段类型为0,
423 this.formData.fr.type=0; 422 this.formData.fr.type=0;
...@@ -427,7 +426,6 @@ ...@@ -427,7 +426,6 @@
427 this.formData.dlrList[k].type=1; 426 this.formData.dlrList[k].type=1;
428 this.formData.addQjDlrFrRequest.push(this.formData.dlrList[k]); 427 this.formData.addQjDlrFrRequest.push(this.formData.dlrList[k]);
429 } 428 }
430 this.formData.gyfsbsm=this.gyfs;
431 //如果是从更新按钮点击确定的则进行更新操作，如果不是，则进行添加操作 429 //如果是从更新按钮点击确定的则进行更新操作，如果不是，则进行添加操作
432 if(this.update){ 430 if(this.update){
433 console.log(this.formData) 431 console.log(this.formData)
...@@ -563,19 +561,12 @@ ...@@ -563,19 +561,12 @@
563 }, 561 },
564 created(){ 562 created(){
565 this.gyfsList = this.$store.state.gyfsList; 563 this.gyfsList = this.$store.state.gyfsList;
566 if(this.tableData.length>1){
567 for(let i = 0;i<this.gyfsList.length;i++){
568 let item = this.gyfsList[i];
569 this.gyfsList.disabled = item.mc === "单独所有" && item.bsm === this.gyfs;
570 }
571 }
572 }, 564 },
573 mounted() { 565 mounted() {
574 this.getQlrInfo(); 566 this.getQlrInfo();
575 if(this.$store.state.gyfsList.length>0){ 567 if(this.$store.state.gyfsList.length>0){
576 this.gyfs=this.$store.state.gyfsList[0].bsm; 568 this.gyfs=this.$store.state.gyfsList[0].bsm;
577 } 569 }
578
579 }, 570 },
580 watch:{ 571 watch:{
581 dialogVisible(n){ 572 dialogVisible(n){
...@@ -632,6 +623,11 @@ ...@@ -632,6 +623,11 @@
632 this.gyfsList[i].disabled = item.mc === "单独所有"; 623 this.gyfsList[i].disabled = item.mc === "单独所有";
633 } 624 }
634 } 625 }
626 console.log(this.tableData.length+":this.tableData[0].length");
627 if(this.tableData.length>1){
628 console.log(JSON.stringify(this.tableData[0])+":this.tableData[0].length");
629 this.gyfs = this.tableData[0].gyfsbsm
630 }
635 }, 631 },
636 } 632 }
637 }; 633 };
......
...@@ -116,11 +116,11 @@ ...@@ -116,11 +116,11 @@
116 <td colspan="5"> 116 <td colspan="5">
117 <el-select class="selectTitle" v-model="form.fwjgbsm"> 117 <el-select class="selectTitle" v-model="form.fwjgbsm">
118 <el-option 118 <el-option
119 v-for="i in $store.state.fwjgList" 119 v-for="item in $store.state.jgOptions"
120 :key="i.bsm" 120 :key="item.bsm"
121 :label="i.mc" 121 :label="item.mc"
122 :value="i.bsm" 122 :value="item.bsm">
123 ></el-option> 123 </el-option>
124 </el-select> 124 </el-select>
125 </td> 125 </td>
126 </tr> 126 </tr>
...@@ -177,10 +177,10 @@ ...@@ -177,10 +177,10 @@
177 <td colspan="9" > 177 <td colspan="9" >
178 <el-select v-model="item1.fwjgzdbsm" placeholder="请选择" > 178 <el-select v-model="item1.fwjgzdbsm" placeholder="请选择" >
179 <el-option 179 <el-option
180 v-for="item in $store.state.fwjgList" 180 v-for="item in $store.state.jgOptions"
181 :key="item.bsm" 181 :key="item.bsm"
182 :label="item.mc" 182 :label="item.mc"
183 :value="item.bsm"> 183 :value="item.bsm">
184 </el-option> 184 </el-option>
185 </el-select> 185 </el-select>
186 </td> 186 </td>
......
1 <template> 1 <template>
2 <div class="content_box"> 2 <div class="content_box">
3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick"> 3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" >
4 <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane> 4 <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane>
5 <el-tab-pane label="附件材料" name="fjcl" @click="loading"> 5 <el-tab-pane label="附件材料" name="fjcl" @click="loading">
6 <fjcl v-if="fjclVisible" ref="fjcl"></fjcl></el-tab-pane> 6 <fjcl v-if="fjclVisible" ref="fjcl"></fjcl></el-tab-pane>
...@@ -47,4 +47,22 @@ ...@@ -47,4 +47,22 @@
47 watch: {}, 47 watch: {},
48 }; 48 };
49 </script> 49 </script>
50 <style scoped lang="less"></style> 50 <style scoped lang="less">
51 .el-tabs{
52 height: calc(100% - 50px);
53 /deep/.el-tabs__content{
54 //height: 100%;
55 /deep/.el-tab-pane{
56 height: 100%;
57 }
58 background: #eaedf5;
59 padding: 0;
60 }
61 /deep/ .el-tabs__item {
62 height: 48px;
63 }
64 /deep/ .el-tabs__header{
65 background-color: #ffffff;
66 }
67 }
68 </style>
......
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
315 315
316 export default { 316 export default {
317 name: "", 317 name: "",
318 inject: ['getTreeByS'], 318 inject: ['getTreeByS','getRightTree'],
319 components: {zdQueryData,dzQueryData,hfghb}, 319 components: {zdQueryData,dzQueryData,hfghb},
320 props: {}, 320 props: {},
321 data() { 321 data() {
...@@ -634,6 +634,7 @@ ...@@ -634,6 +634,7 @@
634 } 634 }
635 saveDzFg(this.dzFghData).then(res => { 635 saveDzFg(this.dzFghData).then(res => {
636 if (res.success) { 636 if (res.success) {
637 this.getRightTree(res.result,'0,1,2');
637 Message.success("保存成功") 638 Message.success("保存成功")
638 //TO DO 多幢分割完成后的操作 639 //TO DO 多幢分割完成后的操作
639 } else { 640 } else {
......
...@@ -377,17 +377,17 @@ export default { ...@@ -377,17 +377,17 @@ export default {
377 switch (row.dylx) { 377 switch (row.dylx) {
378 case "zrz": 378 case "zrz":
379 this.$store.state.zrzbsm = res.result; 379 this.$store.state.zrzbsm = res.result;
380 this.getTreeByBsm(row.glbsm,row.dylx,'2'); 380 this.getTreeByBsm(res.result,row.dylx,'2');
381 path = "/zrz"; 381 path = "/zrz";
382 break; 382 break;
383 case "zd": 383 case "zd":
384 this.$store.state.zdbsm = res.result; 384 this.$store.state.zdbsm = res.result;
385 this.getRightTree(row.glbsm,'2'); 385 this.getRightTree(res.result,'2');
386 path = "/zd"; 386 path = "/zd";
387 break; 387 break;
388 case "dz": 388 case "dz":
389 this.$store.state.dzbsm = res.result; 389 this.$store.state.dzbsm = res.result;
390 this.getTreeByBsm(row.glbsm,row.dylx,'2'); 390 this.getTreeByBsm(res.result,row.dylx,'2');
391 path = "/dz"; 391 path = "/dz";
392 break; 392 break;
393 default: 393 default:
......
...@@ -284,7 +284,7 @@ ...@@ -284,7 +284,7 @@
284 <td colspan="9" > 284 <td colspan="9" >
285 <el-select v-model="item1.fwjgzdbsm" placeholder="请选择" :disabled="disableFlag"> 285 <el-select v-model="item1.fwjgzdbsm" placeholder="请选择" :disabled="disableFlag">
286 <el-option 286 <el-option
287 v-for="item in $store.state.fwjgList" 287 v-for="item in $store.state.jgOptions"
288 :key="item.bsm" 288 :key="item.bsm"
289 :label="item.mc" 289 :label="item.mc"
290 :value="item.bsm"> 290 :value="item.bsm">
...@@ -600,8 +600,10 @@ ...@@ -600,8 +600,10 @@
600 if(res.code===200){ 600 if(res.code===200){
601 this.form = res.result; 601 this.form = res.result;
602 this.hbsm = res.result.bsm; 602 this.hbsm = res.result.bsm;
603 if(res.result.qszt !== '0'){ 603 if(this.form.bblx === 0 && this.form.qszt === 0 && this.form.bhqkbsm == null){
604 this.disableFlag = true; 604 this.disableFlag = false
605 }else {
606 this.disableFlag = true
605 } 607 }
606 if(this.form.scyclx==='0'){ 608 if(this.form.scyclx==='0'){
607 this.$set(this.form,"ycjzmj", this.form.jzmj) 609 this.$set(this.form,"ycjzmj", this.form.jzmj)
......
...@@ -109,15 +109,18 @@ ...@@ -109,15 +109,18 @@
109 <span @click="deleteYtInfo(index)">删除</span> 109 <span @click="deleteYtInfo(index)">删除</span>
110 </td> 110 </td>
111 <td colspan="9"> 111 <td colspan="9">
112 <el-select v-model="item1.fwytzdbsm" placeholder="请选择"> 112 <el-select-tree style="width:100%"
113 <el-option 113 ref="yt"
114 v-for="item in $store.state.tdytList" 114 v-if="show"
115 :key="item.bsm" 115 :default-expand-all="defaultExpandAll"
116 :label="item.mc" 116 :multiple="multiple"
117 :value="item.bsm" 117 :placeholder="placeholder"
118 > 118 :data="$store.state.fwytList"
119 </el-option> 119 :props="treeProps"
120 </el-select> 120 :check-strictly="checkStrictly"
121 :clearable="clearable"
122 v-model="item1.fwytzdbsm"
123 ></el-select-tree>
121 </td> 124 </td>
122 </tr> 125 </tr>
123 126
...@@ -145,15 +148,18 @@ ...@@ -145,15 +148,18 @@
145 <span @click="deleteFwjgInfo(index)">删除</span> 148 <span @click="deleteFwjgInfo(index)">删除</span>
146 </td> 149 </td>
147 <td colspan="9"> 150 <td colspan="9">
148 <el-select v-model="item1.fwjgzdbsm" placeholder="请选择"> 151 <el-select-tree style="width:100%"
149 <el-option 152 ref="yt"
150 v-for="item in $store.state.jgOptions" 153 v-if="show"
151 :key="item.bsm" 154 :default-expand-all="defaultExpandAll"
152 :label="item.mc" 155 :multiple="multiple"
153 :value="item.bsm" 156 :placeholder="placeholder"
154 > 157 :data="$store.state.jgOptions"
155 </el-option> 158 :props="treeProps"
156 </el-select> 159 :check-strictly="checkStrictly"
160 :clearable="clearable"
161 v-model="item1.fwjgzdbsm"
162 ></el-select-tree>
157 </td> 163 </td>
158 </tr> 164 </tr>
159 165
...@@ -192,6 +198,7 @@ ...@@ -192,6 +198,7 @@
192 198
193 <script> 199 <script>
194 import { insertLjzInfo } from "@api/lpb"; 200 import { insertLjzInfo } from "@api/lpb";
201 import { getQjLjzDetailById,updateQjLjz } from "@api/ljz";
195 import { formdate } from "@libs/function"; 202 import { formdate } from "@libs/function";
196 export default { 203 export default {
197 name: "ljz", 204 name: "ljz",
...@@ -204,6 +211,21 @@ export default { ...@@ -204,6 +211,21 @@ export default {
204 }, 211 },
205 data() { 212 data() {
206 return { 213 return {
214
215 //树型结构
216 show:true,
217 clearable: true,
218 defaultExpandAll: true,
219 multiple: false,
220 placeholder: '请选择',
221 disabled: false,
222 checkStrictly: true,
223 treeProps: {
224 value: 'bsm',
225 children: 'children',
226 label: 'mc'
227 },
228
207 form: { 229 form: {
208 zrzbsm: "", 230 zrzbsm: "",
209 ljzh: "", //逻辑幢号 231 ljzh: "", //逻辑幢号
...@@ -336,6 +358,11 @@ export default { ...@@ -336,6 +358,11 @@ export default {
336 }else{ 358 }else{
337 //逻辑幢更新接口调用 TODO 359 //逻辑幢更新接口调用 TODO
338 console.log('保存'); 360 console.log('保存');
361 updateQjLjz(this.form).then((res)=>{
362 if(res.code === 200){
363 this.$message.success("修改成功")
364 }
365 })
339 } 366 }
340 }, 367 },
341 onSubmit() { 368 onSubmit() {
...@@ -343,8 +370,48 @@ export default { ...@@ -343,8 +370,48 @@ export default {
343 }, 370 },
344 //根据逻辑幢bsm查询逻辑幢信息 371 //根据逻辑幢bsm查询逻辑幢信息
345 getLjzInfo(bsm){ 372 getLjzInfo(bsm){
346 //逻辑幢信息查询接口调用 bsm为逻辑幢bsm TODO 373 //逻辑幢信息查询接口调用 bsm为逻辑幢bsm
347 this.form = {zrzh:'11111111'}; 374 getQjLjzDetailById(bsm).then((res)=>{
375 if(res.code === 200){
376 this.form = res.result;
377 this.form.zrzh = this.$store.state.zrzh;
378 this.form.fwjgList= [
379 {
380 fwjgzdbsm: "", //房屋结构字典标识码
381 glbsm: "", //关联标识码
382 sx: "", //顺序
383 },
384 ];
385 this.form.ytList= [
386 {
387 glbsm: "", //关联标识码
388 fwytzdbsm: "", //房屋用途字典标识码
389 sx: "", //顺序
390 },
391 ];
392 if(this.form.qjfwjg.length>0){
393 this.form.fwjgList= [];
394 for(let i =0;i<this.form.qjfwjg.length;i++){
395 this.form.fwjgList.push({
396 fwjgzdbsm: this.form.qjfwjg[i].fwjgzdbsm, //房屋结构字典标识码
397 glbsm: this.form.qjfwjg[i].glbsm, //关联标识码
398 sx: this.form.qjfwjg[i].sx, //顺序
399 })
400 }
401 }
402 if(this.form.qjfwyt.length>0){
403 this.form.ytList= [];
404 for(let i =0;i<this.form.qjfwyt.length;i++){
405 this.form.ytList.push({
406 fwytzdbsm: this.form.qjfwyt[i].fwytzdbsm, //房屋结构字典标识码
407 glbsm: this.form.qjfwyt[i].glbsm, //关联标识码
408 sx: this.form.qjfwyt[i].sx, //顺序
409 })
410 }
411 }
412 console.log(JSON.stringify(this.form)+":this.form")
413 }
414 })
348 this.$forceUpdate(); 415 this.$forceUpdate();
349 } 416 }
350 }, 417 },
......