Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
431f8adf by 杨威
Options

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

2 parents c59d4cf1 26430a11
Inline Side-by-side
Showing 6 changed files with 131 additions and 43 deletions
...@@ -126,12 +126,12 @@ ...@@ -126,12 +126,12 @@
126 </tr> 126 </tr>
127 <tr height="30" v-for="(item1,index) in form.fwytList" :key="index"> 127 <tr height="30" v-for="(item1,index) in form.fwytList" :key="index">
128 <td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle"> 128 <td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle">
129 <el-button type="primary" size="mini" style="margin-right: 10px" @click="addYtInfo">添加</el-button> 129 <el-button type="primary" class="outAdd addMinus" size="mini" style="margin-right: 10px" @click="addYtInfo">+</el-button>
130 <span>用途</span> 130 <span>用途</span>
131 </td> 131 </td>
132 132
133 <td width="30" colspan="1" align="center" > 133 <td width="30" colspan="1" align="center" >
134 <el-button type="info" size="mini" style="" @click="deleteYtInfo(index)" circle>删除</el-button> 134 <el-button type="info" class="inMinus addMinus" size="mini" style="" @click="deleteYtInfo(index)" circle>-</el-button>
135 规划用途 135 规划用途
136 </td> 136 </td>
137 <td width="30" colspan="4" align="center" > 137 <td width="30" colspan="4" align="center" >
...@@ -167,11 +167,12 @@ ...@@ -167,11 +167,12 @@
167 167
168 <tr height="30" v-for="(item1,index) in form.fwjgList" :key="'jg'+index"> 168 <tr height="30" v-for="(item1,index) in form.fwjgList" :key="'jg'+index">
169 <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" align="center" > 169 <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" align="center" >
170 <el-button type="primary" size="mini" style="margin-right: 10px" @click="addFwjgInfo">添加</el-button> 170 <el-button type="primary" class="outAdd addMinus" size="mini" style="margin-right: 10px" @click="addFwjgInfo">+</el-button>
171 <span>房屋结构</span> 171 <span>房屋结构</span>
172 </td> 172 </td>
173 <td colspan="1" align="center" > 173 <td colspan="1" align="center" >
174 <span @click="deleteFwjgInfo(index)">删除</span> 174 <span @click="deleteFwjgInfo(index)">删除</span>
175 <!-- <el-button type="info" class="inMinus addMinus" size="mini" style="" @click="deleteFwjgInfo(index)" circle>-</el-button>-->
175 </td> 176 </td>
176 <td colspan="9" > 177 <td colspan="9" >
177 <el-select v-model="item1.fwjgzdbsm" placeholder="请选择" > 178 <el-select v-model="item1.fwjgzdbsm" placeholder="请选择" >
...@@ -187,7 +188,7 @@ ...@@ -187,7 +188,7 @@
187 188
188 <tr> 189 <tr>
189 <td colspan="12" rowspan="4" align="center"> 190 <td colspan="12" rowspan="4" align="center">
190 <Qlxz ref="qlxzModule" :hasSyqx='false'></Qlxz> 191 <Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz>
191 </td> 192 </td>
192 </tr> 193 </tr>
193 <tr></tr> 194 <tr></tr>
...@@ -210,7 +211,7 @@ ...@@ -210,7 +211,7 @@
210 </div> 211 </div>
211 <div class="shop"> 212 <div class="shop">
212 <el-button type="primary" @click="save">保存</el-button> 213 <el-button type="primary" @click="save">保存</el-button>
213 <el-button type="primary" @click="result">重置</el-button> 214 <el-button type="primary" @click="reset">重置</el-button>
214 <el-button type="primary" @click="cancel">取消</el-button> 215 <el-button type="primary" @click="cancel">取消</el-button>
215 </div> 216 </div>
216 </el-dialog> 217 </el-dialog>
...@@ -252,6 +253,7 @@ ...@@ -252,6 +253,7 @@
252 }, 253 },
253 254
254 form:{ 255 form:{
256 qszt:'0',
255 jzmj:'', 257 jzmj:'',
256 tnjzmj:'', 258 tnjzmj:'',
257 ftjzmj:'', 259 ftjzmj:'',
...@@ -360,8 +362,50 @@ ...@@ -360,8 +362,50 @@
360 this.isVisible = false 362 this.isVisible = false
361 this.result() 363 this.result()
362 }, 364 },
363 result: function () { 365 reset: function () {
364 366 this.form={
367 qszt:'0',
368 jzmj:'',
369 tnjzmj:'',
370 ftjzmj:'',
371 dxbfjzmj:'',
372 qtjzmj:'',
373 ftxs:'',
374 hxbsm:'',
375 hxjgbsm:'',
376 gytdmj: '',
377 fttdmj: '',
378 dytdmj: '',
379 fwlxbsm: '',
380 fwcbbsm:'',
381 fwcqlybsm:'',
382 fwxzbsm:'',
383 dqtgs:'',
384 nqtgs:'',
385 xqtgs:'',
386 bqtgs:'',
387 fwjgbsm:'',
388 fwytList:[{
389 glbsm:'', //关联标识码
390 fwytzdbsm:'', //房屋用途字典标识码
391 sx:'', //顺序
392 fwsjytbsm:'', //房屋实际用途字典标识码
393 }],
394 fwjgList:[{
395 fwjgzdbsm:'', //房屋结构字典标识码
396 glbsm:'', //关联标识码
397 sx:'', //顺序
398 }],
399 qlxzList:[{
400 qlxzdm:'', //权利性质代码
401 glbsm:'', //宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
402 qlxzzdbsm:'', //权利性质字典表标识码
403 qlxzmc:'', //权利名称名称
404 zhqlxzlx:'', //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质
405 addQjTdytRequestList:[{
406 }], //土地用途新增实体列表
407 }]
408 }
365 }, 409 },
366 save: function () { 410 save: function () {
367 this.form['hbsms'] = this.bsms 411 this.form['hbsms'] = this.bsms
...@@ -372,6 +416,8 @@ ...@@ -372,6 +416,8 @@
372 if(res.code===200){ 416 if(res.code===200){
373 this.lodding() 417 this.lodding()
374 this.$message.success("保存成功！") 418 this.$message.success("保存成功！")
419 this.reset();
420 this.close();
375 } 421 }
376 }) 422 })
377 }, 423 },
...@@ -396,6 +442,7 @@ ...@@ -396,6 +442,7 @@
396 background-color: #fff; 442 background-color: #fff;
397 font-size: 14px; 443 font-size: 14px;
398 width: 100%; 444 width: 100%;
445 table-layout: fixed;
399 } 446 }
400 447
401 td { 448 td {
......
...@@ -154,15 +154,27 @@ ...@@ -154,15 +154,27 @@
154 <tr> 154 <tr>
155 <td colspan="2">国民经济行业分类</td> 155 <td colspan="2">国民经济行业分类</td>
156 <td colspan="4"> 156 <td colspan="4">
157 <el-select class="formSelect" :disabled="formData.qszt!='0'" v-model="formData.gmjjhyflbsm"> 157 <!-- <el-select class="formSelect" :disabled="formData.qszt!='0'" v-model="formData.gmjjhyflbsm">-->
158 <el-option 158 <!-- <el-option-->
159 v-for="item in $store.state.gmjjhyflbsmList" 159 <!-- v-for="item in $store.state.gmjjhyflbsmList"-->
160 :key="item.bsm" 160 <!-- :key="item.bsm"-->
161 :label="item.mc" 161 <!-- :label="item.mc"-->
162 :value="item.bsm" 162 <!-- :value="item.bsm"-->
163 > 163 <!-- >-->
164 </el-option> 164 <!-- </el-option>-->
165 </el-select> 165 <!-- </el-select>-->
166 <el-select-tree
167 v-if="show"
168 :default-expand-all="defaultExpandAll"
169 :multiple="multiple"
170 :placeholder="placeholder"
171 :disabled="disabled"
172 :data="$store.state.gmjjhyflbsmList"
173 :props="treeProps"
174 :check-strictly="checkStrictly"
175 :clearable="clearable"
176 v-model="formData.gmjjhyflbsm"
177 ></el-select-tree>
166 </td> 178 </td>
167 <td colspan="2">价格(元)</td> 179 <td colspan="2">价格(元)</td>
168 <td colspan="4" class="psr"> 180 <td colspan="4" class="psr">
...@@ -397,6 +409,21 @@ ...@@ -397,6 +409,21 @@
397 props: {}, 409 props: {},
398 data() { 410 data() {
399 return { 411 return {
412
413 //树型结构
414 show: true,
415 clearable: true,
416 defaultExpandAll: true,
417 multiple: false,
418 placeholder: "请选择",
419 disabled: false,
420 checkStrictly: true,
421 treeProps: {
422 value: "dm",
423 children: "children",
424 label: "mc",
425 },
426
400 rules: [], 427 rules: [],
401 rjl: '', 428 rjl: '',
402 jzmd: '', 429 jzmd: '',
......
...@@ -310,7 +310,7 @@ ...@@ -310,7 +310,7 @@
310 310
311 <tr> 311 <tr>
312 <td colspan="12" rowspan="4" align="center"> 312 <td colspan="12" rowspan="4" align="center">
313 <Qlxz ref="qlxzModule" :hasSyqx='false'></Qlxz> 313 <Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz>
314 </td> 314 </td>
315 </tr> 315 </tr>
316 <tr></tr> 316 <tr></tr>
......
...@@ -507,6 +507,9 @@ export default { ...@@ -507,6 +507,9 @@ export default {
507 openLpbDialog(data, type) { 507 openLpbDialog(data, type) {
508 this.treeData = data; 508 this.treeData = data;
509 this.menuType = type; 509 this.menuType = type;
510 this.$nextTick(()=>{
511 this.resetInfo();
512 });
510 this.dialogVisible = true; 513 this.dialogVisible = true;
511 }, 514 },
512 //弹框中的保存按钮，根据不同菜单点击类型调用不同子组件的保存方法 515 //弹框中的保存按钮，根据不同菜单点击类型调用不同子组件的保存方法
......
...@@ -29,16 +29,9 @@ ...@@ -29,16 +29,9 @@
29 <td colspan="4"> 29 <td colspan="4">
30 <el-input v-model="form.ljzmc"></el-input> 30 <el-input v-model="form.ljzmc"></el-input>
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">
34 <el-input v-model="form.bdcdyh" maxlength="28" class="percent80"></el-input> 34 <el-input v-model="form.jzwzt"></el-input>
35 <el-button
36 @click.prevent=""
37 size="mini"
38 type="warning"
39 class="createBtn"
40 >生成</el-button
41 >
42 </td> 35 </td>
43 </tr> 36 </tr>
44 37
...@@ -177,13 +170,9 @@ ...@@ -177,13 +170,9 @@
177 170
178 <tr height="30"> 171 <tr height="30">
179 <td colspan="2" align="center">总层数</td> 172 <td colspan="2" align="center">总层数</td>
180 <td colspan="4"> 173 <td colspan="10">
181 <el-input v-model="form.zcs"></el-input> 174 <el-input v-model="form.zcs"></el-input>
182 </td> 175 </td>
183 <td colspan="2" align="center">建筑物状态</td>
184 <td colspan="4">
185 <el-input v-model="form.jzwzt"></el-input>
186 </td>
187 </tr> 176 </tr>
188 177
189 <tr height="30"> 178 <tr height="30">
......
1 <template> 1 <template>
2 <div class=""> 2 <div class="">
3 <el-radio-group v-model="scyclx" @change="scyclxChange">
4 <el-radio-button label="0">预测</el-radio-button>
5 <el-radio-button label="1">实测</el-radio-button>
6 </el-radio-group>
3 <el-table 7 <el-table
4 :data="tableData" 8 :data="tableData"
5 style="width: 100%;margin-bottom: 20px;" 9 style="width: 100%;margin-bottom: 20px;"
6 row-key="bsm" 10 row-key="bsm"
7 border 11 border
8 default-expand-all 12 :default-expand-all="false"
9 :tree-props="{children: 'children', hasChildren: 'hasChildren'}"> 13 :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
10 <el-table-column 14 <el-table-column
11 prop="mc" 15 prop="mc"
...@@ -35,23 +39,23 @@ ...@@ -35,23 +39,23 @@
35 </el-table-column> 39 </el-table-column>
36 <el-table-column 40 <el-table-column
37 prop="jzmj" 41 prop="jzmj"
38 label="面积"> 42 label="建筑面积(㎡)">
39 </el-table-column> 43 </el-table-column>
40 <el-table-column 44 <el-table-column
41 prop="tnjzmj" 45 prop="tnjzmj"
42 label="套内建筑面积"> 46 label="套内建筑面积(㎡)">
43 </el-table-column> 47 </el-table-column>
44 <el-table-column 48 <el-table-column
45 prop="ftjzmj" 49 prop="ftjzmj"
46 label="分摊建筑面积"> 50 label="分摊建筑面积(㎡)">
47 </el-table-column> 51 </el-table-column>
48 <el-table-column 52 <el-table-column
49 prop="dxbfjzmj" 53 prop="dxbfjzmj"
50 label="地下部分建筑面积"> 54 label="地下部分建筑面积(㎡)">
51 </el-table-column> 55 </el-table-column>
52 <el-table-column 56 <el-table-column
53 prop="qtjzmj" 57 prop="qtjzmj"
54 label="其它建筑面积"> 58 label="其它建筑面积(㎡)">
55 </el-table-column> 59 </el-table-column>
56 </el-table> 60 </el-table>
57 </div> 61 </div>
...@@ -65,7 +69,10 @@ export default { ...@@ -65,7 +69,10 @@ export default {
65 props:{}, 69 props:{},
66 data(){ 70 data(){
67 return { 71 return {
68 tableData: [] 72 tableData: [],
73 scData:[],
74 ycData:[],
75 scyclx:'0',
69 } 76 }
70 }, 77 },
71 created(){}, 78 created(){},
...@@ -74,6 +81,14 @@ export default { ...@@ -74,6 +81,14 @@ export default {
74 }, 81 },
75 methods:{ 82 methods:{
76 83
84 scyclxChange(){
85 if(this.scyclx === '0'){
86 this.tableData = this.ycData;
87 }else {
88 this.tableData = this.scData;
89 }
90 },
91
77 chFilter(row, column){ 92 chFilter(row, column){
78 if(row.ch === 0){ 93 if(row.ch === 0){
79 return '' 94 return ''
...@@ -91,12 +106,19 @@ export default { ...@@ -91,12 +106,19 @@ export default {
91 }, 106 },
92 107
93 getData(){ 108 getData(){
94 let zrzbsm = '12a4eb0cf2b527273ff5f0b96820715a'; 109 let zrzbsm = this.$store.state.zrzbsm;
95 let scyclx = '0'; 110 // let scyclx = this.scyclx;
96 getDetailInfo(zrzbsm,scyclx).then((res)=>{ 111 getDetailInfo(zrzbsm,'0').then((res)=>{
112 if(res.code===200){
113 console.log(res.result)
114 this.ycData = res.result;
115 this.tableData=this.ycData;
116 }
117 });
118 getDetailInfo(zrzbsm,'1').then((res)=>{
97 if(res.code===200){ 119 if(res.code===200){
98 console.log(res.result) 120 console.log(res.result)
99 this.tableData = res.result; 121 this.scData = res.result;
100 } 122 }
101 }) 123 })
102 }, 124 },
......