Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
27385376 by 杨威
Options

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

2 parents e2c8f399 a8ea6fad
Inline Side-by-side
Showing 3 changed files with 33 additions and 100 deletions
...@@ -28,6 +28,10 @@ const store = new Vuex.Store({ ...@@ -28,6 +28,10 @@ const store = new Vuex.Store({
28 xzqList: [], 28 xzqList: [],
29 djqList: [], 29 djqList: [],
30 djzqList: [], 30 djzqList: [],
31 fwxzOptions:[],
32 cbOptions:[],
33 cqlyOptions:[],
34 jgOptions:[],
31 //创建自然幢时需要用到的临时存储信息 35 //创建自然幢时需要用到的临时存储信息
32 zrzbsm: '', 36 zrzbsm: '',
33 zjlxList: [], 37 zjlxList: [],
......
...@@ -258,6 +258,11 @@ export default { ...@@ -258,6 +258,11 @@ export default {
258 s.qlxzList = s.qlxzList.length == 0 ?await this.getDicData("权利性质") : s.qlxzList; 258 s.qlxzList = s.qlxzList.length == 0 ?await this.getDicData("权利性质") : s.qlxzList;
259 s.tdytList = s.tdytList.length == 0 ?await this.getDicData("土地用途") : s.tdytList; 259 s.tdytList = s.tdytList.length == 0 ?await this.getDicData("土地用途") : s.tdytList;
260 s.tddjList = s.tddjList.length == 0 ?await this.getDicData("土地等级") : s.tddjList; 260 s.tddjList = s.tddjList.length == 0 ?await this.getDicData("土地等级") : s.tddjList;
261
262 s.fwxzOptions = s.fwxzOptions.length == 0 ?await this.getDicData("房屋性质") : s.fwxzOptions;
263 s.cbOptions = s.cbOptions.length == 0 ?await this.getDicData("房屋产别") : s.cbOptions;
264 s.cqlyOptions = s.cqlyOptions.length == 0 ?await this.getDicData("产权来源") : s.cqlyOptions;
265 s.jgOptions = s.jgOptions.length == 0 ?await this.getDicData("房屋结构") : s.jgOptions;
261 }, 266 },
262 async getDicData(name) { 267 async getDicData(name) {
263 return await getDdicByMC(name).then((res)=> { 268 return await getDdicByMC(name).then((res)=> {
......
...@@ -49,10 +49,10 @@ ...@@ -49,10 +49,10 @@
49 <td colspan="4" > 49 <td colspan="4" >
50 <el-select v-model="form.fwxzbsm" placeholder="请选择" > 50 <el-select v-model="form.fwxzbsm" placeholder="请选择" >
51 <el-option 51 <el-option
52 v-for="item in fwxzOptions" 52 v-for="item in $store.state.fwxzOptions"
53 :key="item.value" 53 :key="item.bsm"
54 :label="item.label" 54 :label="item.mc"
55 :value="item.value"> 55 :value="item.bsm">
56 </el-option> 56 </el-option>
57 </el-select> 57 </el-select>
58 </td> 58 </td>
...@@ -126,10 +126,10 @@ ...@@ -126,10 +126,10 @@
126 <td colspan="4" > 126 <td colspan="4" >
127 <el-select v-model="form.fwcbbsm" placeholder="请选择" > 127 <el-select v-model="form.fwcbbsm" placeholder="请选择" >
128 <el-option 128 <el-option
129 v-for="item in cbOptions" 129 v-for="item in $store.state.cbOptions"
130 :key="item.value" 130 :key="item.bsm"
131 :label="item.label" 131 :label="item.mc"
132 :value="item.value"> 132 :value="item.bsm">
133 </el-option> 133 </el-option>
134 </el-select> 134 </el-select>
135 </td> 135 </td>
...@@ -137,10 +137,10 @@ ...@@ -137,10 +137,10 @@
137 <td colspan="4" > 137 <td colspan="4" >
138 <el-select v-model="form.fwcqlybsm" placeholder="请选择" > 138 <el-select v-model="form.fwcqlybsm" placeholder="请选择" >
139 <el-option 139 <el-option
140 v-for="item in cqlyOptions" 140 v-for="item in $store.state.cqlyOptions"
141 :key="item.value" 141 :key="item.bsm"
142 :label="item.label" 142 :label="item.mc"
143 :value="item.value"> 143 :value="item.bsm">
144 </el-option> 144 </el-option>
145 </el-select> 145 </el-select>
146 </td> 146 </td>
...@@ -159,10 +159,10 @@ ...@@ -159,10 +159,10 @@
159 <td width="30" colspan="4" align="center" > 159 <td width="30" colspan="4" align="center" >
160 <el-select v-model="item1.fwytzdbsm" placeholder="请选择" > 160 <el-select v-model="item1.fwytzdbsm" placeholder="请选择" >
161 <el-option 161 <el-option
162 v-for="item in ytOptions" 162 v-for="item in $store.state.tdytList"
163 :key="item.value" 163 :key="item.bsm"
164 :label="item.label" 164 :label="item.mc"
165 :value="item.value"> 165 :value="item.bsm">
166 </el-option> 166 </el-option>
167 </el-select> 167 </el-select>
168 </td> 168 </td>
...@@ -170,10 +170,10 @@ ...@@ -170,10 +170,10 @@
170 <td width="30" colspan="4" align="center" > 170 <td width="30" colspan="4" align="center" >
171 <el-select v-model="item1.fwsjytbsm" placeholder="请选择" > 171 <el-select v-model="item1.fwsjytbsm" placeholder="请选择" >
172 <el-option 172 <el-option
173 v-for="item in ytOptions" 173 v-for="item in $store.state.tdytList"
174 :key="item.value" 174 :key="item.bsm"
175 :label="item.label" 175 :label="item.mc"
176 :value="item.value"> 176 :value="item.bsm">
177 </el-option> 177 </el-option>
178 </el-select> 178 </el-select>
179 </td> 179 </td>
...@@ -190,10 +190,10 @@ ...@@ -190,10 +190,10 @@
190 <td colspan="9" > 190 <td colspan="9" >
191 <el-select v-model="item1.fwjgzdbsm" placeholder="请选择" > 191 <el-select v-model="item1.fwjgzdbsm" placeholder="请选择" >
192 <el-option 192 <el-option
193 v-for="item in jgOptions" 193 v-for="item in $store.state.jgOptions"
194 :key="item.value" 194 :key="item.bsm"
195 :label="item.label" 195 :label="item.mc"
196 :value="item.value"> 196 :value="item.bsm">
197 </el-option> 197 </el-option>
198 </el-select> 198 </el-select>
199 </td> 199 </td>
...@@ -271,7 +271,6 @@ ...@@ -271,7 +271,6 @@
271 import Qlxz from "../../../components/formMenu/qlxz"; 271 import Qlxz from "../../../components/formMenu/qlxz";
272 import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "../../../api/zrz" 272 import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "../../../api/zrz"
273 import {getQjZdjbxxDetailById} from "../../../api/zd" 273 import {getQjZdjbxxDetailById} from "../../../api/zd"
274 import {getDdicByMC} from "../../../api/common"
275 export default { 274 export default {
276 name:'zrz', 275 name:'zrz',
277 components:{ 276 components:{
...@@ -343,12 +342,6 @@ ...@@ -343,12 +342,6 @@
343 value: '选项5', 342 value: '选项5',
344 label: '北京烤鸭' 343 label: '北京烤鸭'
345 }], 344 }],
346 fwxzOptions:[],
347 cbOptions:[],
348 cqlyOptions:[],
349 ytOptions:[],
350 jgOptions:[],
351 djOptions:[],
352 value: '', 345 value: '',
353 ytTitleRowspan:1, //用途的单元格垂直合并数量 346 ytTitleRowspan:1, //用途的单元格垂直合并数量
354 fwjgTitleRowspan:1, //房屋结构的单元格垂直合并数量 347 fwjgTitleRowspan:1, //房屋结构的单元格垂直合并数量
...@@ -447,74 +440,6 @@ ...@@ -447,74 +440,6 @@
447 this.form.bdcdyh=res.result; 440 this.form.bdcdyh=res.result;
448 }) 441 })
449 }, 442 },
450 getDDic(){
451 getDdicByMC("房屋性质").then((res)=>{
452 if(res.result!=null){
453 for(let i=0;i<res.result.length;i++){
454 this.fwxzOptions.push({
455 label:res.result[i].mc,
456 value:res.result[i].bsm
457 })
458 }
459 }
460
461 })
462 getDdicByMC("房屋产别").then((res)=>{
463 if(res.result!=null){
464 for(let i=0;i<res.result.length;i++){
465 this.cbOptions.push({
466 label:res.result[i].mc,
467 value:res.result[i].bsm
468 })
469 }
470 }
471
472 })
473 getDdicByMC("产权来源").then((res)=>{
474 if(res.result!=null){
475 for(let i=0;i<res.result.length;i++){
476 this.cqlyOptions.push({
477 label:res.result[i].mc,
478 value:res.result[i].bsm
479 })
480 }
481 }
482
483 })
484 getDdicByMC("土地用途").then((res)=>{
485 if(res.result!=null){
486 for(let i=0;i<res.result.length;i++){
487 this.ytOptions.push({
488 label:res.result[i].mc,
489 value:res.result[i].bsm
490 })
491 }
492 }
493
494 })
495 getDdicByMC("土地等级").then((res)=>{
496 if(res.result!=null){
497 for(let i=0;i<res.result.length;i++){
498 this.djOptions.push({
499 label:res.result[i].mc,
500 value:res.result[i].bsm
501 })
502 }
503 }
504
505 })
506 getDdicByMC("房屋结构").then((res)=>{
507 if(res.result!=null){
508 for(let i=0;i<res.result.length;i++){
509 this.jgOptions.push({
510 label:res.result[i].mc,
511 value:res.result[i].bsm
512 })
513 }
514 }
515
516 })
517 },
518 443
519 getQlrxxData() { 444 getQlrxxData() {
520 console.log(this.$refs.qlrxxModule.getQlgyfsData()); //权利共有方式数据 445 console.log(this.$refs.qlrxxModule.getQlgyfsData()); //权利共有方式数据
...@@ -554,7 +479,6 @@ ...@@ -554,7 +479,6 @@
554 }, 479 },
555 }, 480 },
556 created(){ 481 created(){
557 this.getDDic();
558 //todo 怎么判断进入到该页面是从新建处进来的，还是从右键宗地进来的！如果是从新建进来的就需要把虚拟宗标识码带过来； 482 //todo 怎么判断进入到该页面是从新建处进来的，还是从右键宗地进来的！如果是从新建进来的就需要把虚拟宗标识码带过来；
559 this.source = this.$route.query.source; 483 this.source = this.$route.query.source;
560 //source为1代表是从新建中进入道该页面的，source为2代表是从综合查询进入到该页面的 484 //source为1代表是从新建中进入道该页面的，source为2代表是从综合查询进入到该页面的
......