Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
9482cd1b by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents 6b97ec38 1eb03185
Inline Side-by-side
Showing 18 changed files with 190 additions and 228 deletions
...@@ -97,3 +97,13 @@ export function saveDzFg(data) { ...@@ -97,3 +97,13 @@ export function saveDzFg(data) {
97 data: data, 97 data: data,
98 }) 98 })
99 } 99 }
100 /**
101 * 多幢合并保存
102 */
103 export function saveDzHb(data) {
104 return request({
105 url: '/bg/dzSplitMerge/dzHb',
106 method: 'post',
107 data: data,
108 })
109 }
......
...@@ -55,7 +55,6 @@ ...@@ -55,7 +55,6 @@
55 custom-class="insetDialog" 55 custom-class="insetDialog"
56 append-to-body 56 append-to-body
57 width="50%" 57 width="50%"
58 center
59 > 58 >
60 <el-form :model="formData" class="qlrForm"> 59 <el-form :model="formData" class="qlrForm">
61 <table class="zdjbxxTable" cellspacing="0" cellpadding="0" border="1"> 60 <table class="zdjbxxTable" cellspacing="0" cellpadding="0" border="1">
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 width="50%" 6 width="50%"
7 @close="close" 7 @close="close"
8 :modal-append-to-body="false" 8 :modal-append-to-body="false"
9 center> 9 >
10 <div> 10 <div>
11 <div class="bottom-radio"> 11 <div class="bottom-radio">
12 <el-radio-group v-model="moveHdata.sxzylx"> 12 <el-radio-group v-model="moveHdata.sxzylx">
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 width="50%" 6 width="50%"
7 @close="close" 7 @close="close"
8 :modal-append-to-body="false" 8 :modal-append-to-body="false"
9 center> 9 >
10 <div> 10 <div>
11 <table border="1"> 11 <table border="1">
12 <tr> 12 <tr>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 width="70%" 6 width="70%"
7 @close="close" 7 @close="close"
8 :modal-append-to-body="false" 8 :modal-append-to-body="false"
9 center> 9 >
10 <div> 10 <div>
11 <table border="1"> 11 <table border="1">
12 <tr> 12 <tr>
...@@ -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 {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 width="50%" 6 width="50%"
7 @close="close" 7 @close="close"
8 :modal-append-to-body="false" 8 :modal-append-to-body="false"
9 center> 9 >
10 <div> 10 <div>
11 <span class="xl" @click="xl">祥例</span> 11 <span class="xl" @click="xl">祥例</span>
12 <table border="1"> 12 <table border="1">
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 width="60%" 6 width="60%"
7 @close="close" 7 @close="close"
8 :modal-append-to-body="false" 8 :modal-append-to-body="false"
9 center> 9 >
10 <div> 10 <div>
11 <table border="1"> 11 <table border="1">
12 <tr> 12 <tr>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 width="70%" 6 width="70%"
7 @close="close" 7 @close="close"
8 :modal-append-to-body="false" 8 :modal-append-to-body="false"
9 center> 9 >
10 <div class="search"> 10 <div class="search">
11 <!-- <el-button type="primary" @click="search">查询</el-button> 11 <!-- <el-button type="primary" @click="search">查询</el-button>
12 <el-button type="primary" @click="result">重置</el-button> --> 12 <el-button type="primary" @click="result">重置</el-button> -->
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 width="70%" 6 width="70%"
7 @close="close" 7 @close="close"
8 :modal-append-to-body="false" 8 :modal-append-to-body="false"
9 center> 9 >
10 <div class="search"> 10 <div class="search">
11 <el-row> 11 <el-row>
12 <el-col :span="24"> 12 <el-col :span="24">
......
...@@ -163,67 +163,12 @@ ...@@ -163,67 +163,12 @@
163 <span class="tips">合并后多幢信息</span> 163 <span class="tips">合并后多幢信息</span>
164 <table border="1"> 164 <table border="1">
165 <tr> 165 <tr>
166 <th class="xzq">行政区</th>
167 <th class="djq">地籍区</th>
168 <th class="djzq">地籍子区</th>
169 <th class="syqlx">所有权类型</th>
170 <th class="tdtzm">土地特征码</th>
171 <th class="xmmc">项目名称</th> 166 <th class="xmmc">项目名称</th>
172 <th class="zxx">幢信息</th> 167 <th class="zxx">幢信息</th>
173 </tr> 168 </tr>
174 <tr> 169 <tr v-for="item in dzhbhData" :key="item.bsm">
175 <td class="xzq">
176 <el-select v-model="dzhbhData.xzqbsm" @change="changeXzq(dzhbhData.xzqbsm)">
177 <el-option
178 v-for="i in xzq"
179 :key="i.bsm"
180 :label="i.mc"
181 :value="i.bsm"
182 ></el-option>
183 </el-select>
184 </td>
185 <td class="djq">
186 <el-select v-model="dzhbhData.djqbsm" @change="changeDjq(dzhbhData.djqbsm)">
187 <el-option
188 v-for="i in djq"
189 :key="i.bsm"
190 :label="i.mc"
191 :value="i.bsm"
192 ></el-option>
193 </el-select>
194 </td>
195 <td class="syqlx">
196 <el-select v-model="dzhbhData.djzqbsm">
197 <el-option
198 v-for="i in djzq"
199 :key="i.bsm"
200 :label="i.mc"
201 :value="i.bsm"
202 ></el-option>
203 </el-select>
204 </td>
205 <td class="tdtzm">
206 <el-select v-model="dzhbhData.syqlxbsm">
207 <el-option
208 v-for="i in syq"
209 :key="i.value"
210 :label="i.label"
211 :value="i.value"
212 ></el-option>
213 </el-select>
214 </td>
215 <td class="syqlx">
216 <el-select v-model="dzhbhData.zdtzmbsm">
217 <el-option
218 v-for="i in tdtzm"
219 :key="i.bsm"
220 :label="i.mc"
221 :value="i.bsm"
222 ></el-option>
223 </el-select>
224 </td>
225 <td class="xmmc"> 170 <td class="xmmc">
226 <input type="text" v-model="dzhbhData.xmmc" class="formInput"/> 171 <input type="text" v-model="item.xmmc" class="formInput"/>
227 </td> 172 </td>
228 <td class="zxx"> 173 <td class="zxx">
229 <span class="xz">选择</span> 174 <span class="xz">选择</span>
...@@ -234,123 +179,13 @@ ...@@ -234,123 +179,13 @@
234 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']" :isZdClose="true" 179 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']" :isZdClose="true"
235 @close="close"></query-data> 180 @close="close"></query-data>
236 <div class="header-button" :style="{width:fgBoxWidth+'px'}"> 181 <div class="header-button" :style="{width:fgBoxWidth+'px'}">
237 <el-button type="primary" class="saveBtn">保存</el-button> 182 <el-button type="primary" class="saveBtn" @click="dzhbSave">保存</el-button>
238 </div> 183 </div>
239 </div> 184 </div>
240 </el-tab-pane> 185 </el-tab-pane>
241 <el-tab-pane label="户合并" name="h"> 186 <el-tab-pane label="户合并" name="h">
242 <div class="hb-tabs"> 187 <div class="hb-tabs">
243 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button> 188 <hfghb></hfghb>
244 <div class="hbq">
245 <span class="tips">合并前户信息</span>
246 <table border="1">
247 <tr>
248 <td class="xh">序号</td>
249 <td class="zddm">宗地代码</td>
250 <td class="bdcdyh">不动产单元号</td>
251 <td class="xmmc">项目名称</td>
252 <td class="bdcqzh">不动产权证号</td>
253 <td class="qlr">权利人</td>
254 <td class="zl">坐落</td>
255 <td class="">操作</td>
256 </tr>
257 <tr v-if="hhbqData.length==0">
258 <td colspan="8">
259 <span class="noData">暂无数据</span>
260 </td>
261 </tr>
262 <tr v-else v-for="(item,index) in hhbqData" :key="index">
263 <td class="xh">{{index+1}}</td>
264 <td class="zddm"><input type="text" class="formInput" v-model="item.zddm"
265 readonly="readonly"/></td>
266 <td class="bdcdyh"><input type="text" class="formInput" v-model="item.bdcdyh"
267 readonly="readonly"/></td>
268 <td class="xmmc"><input type="text" class="formInput" v-model="item.xmmc"
269 readonly="readonly"/></td>
270 <td class="bdcqzh"><input type="text" class="formInput" v-model="item.bdcqzh"
271 readonly="readonly"/></td>
272 <td class="qlr"><input type="text" class="formInput" v-model="item.qlr"
273 readonly="readonly"/></td>
274 <td class="zl"><input type="text" class="formInput" v-model="item.zl"
275 readonly="readonly"/></td>
276 <td class="cz" @click="deleteData(index)"><span>删除</span></td>
277 </tr>
278 </table>
279 </div>
280 <div class="hbh">
281 <span class="tips">合并后户信息</span>
282 <table border="1">
283 <tr>
284 <th class="xzq">行政区</th>
285 <th class="djq">地籍区</th>
286 <th class="djzq">地籍子区</th>
287 <th class="syqlx">所有权类型</th>
288 <th class="tdtzm">土地特征码</th>
289 <th class="xmmc">项目名称</th>
290 <th class="zxx">幢信息</th>
291 </tr>
292 <tr>
293 <td class="xzq">
294 <el-select v-model="hhbhData.xzqbsm" @change="changeXzq(hhbhData.xzqbsm)">
295 <el-option
296 v-for="i in xzq"
297 :key="i.bsm"
298 :label="i.mc"
299 :value="i.bsm"
300 ></el-option>
301 </el-select>
302 </td>
303 <td class="djq">
304 <el-select v-model="hhbhData.djqbsm" @change="changeDjq(hhbhData.djqbsm)">
305 <el-option
306 v-for="i in djq"
307 :key="i.bsm"
308 :label="i.mc"
309 :value="i.bsm"
310 ></el-option>
311 </el-select>
312 </td>
313 <td class="syqlx">
314 <el-select v-model="hhbhData.djzqbsm">
315 <el-option
316 v-for="i in djzq"
317 :key="i.bsm"
318 :label="i.mc"
319 :value="i.bsm"
320 ></el-option>
321 </el-select>
322 </td>
323 <td class="tdtzm">
324 <el-select v-model="hhbhData.syqlxbsm">
325 <el-option
326 v-for="i in syq"
327 :key="i.value"
328 :label="i.label"
329 :value="i.value"
330 ></el-option>
331 </el-select>
332 </td>
333 <td class="syqlx">
334 <el-select v-model="hhbhData.zdtzmbsm">
335 <el-option
336 v-for="i in tdtzm"
337 :key="i.bsm"
338 :label="i.mc"
339 :value="i.bsm"
340 ></el-option>
341 </el-select>
342 </td>
343 <td class="xmmc">
344 <input type="text" v-model="hhbhData.xmmc" class="formInput"/>
345 </td>
346 <td class="zxx">
347 <span class="xz">选择</span>
348 </td>
349 </tr>
350 </table>
351 </div>
352 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['h']" :isZdClose="true"
353 @close="close"></query-data>
354 <div class="header-button" :style="{width:fgBoxWidth+'px'}"> 189 <div class="header-button" :style="{width:fgBoxWidth+'px'}">
355 <el-button type="primary" class="saveBtn">保存</el-button> 190 <el-button type="primary" class="saveBtn">保存</el-button>
356 </div> 191 </div>
...@@ -368,12 +203,14 @@ ...@@ -368,12 +203,14 @@
368 getDdicByMC 203 getDdicByMC
369 } from "./../../../../api/common"; 204 } from "./../../../../api/common";
370 import {ZdHb} from "./../../../../api/zd" 205 import {ZdHb} from "./../../../../api/zd"
206 import {saveDzHb} from "./../../../../api/dz"
371 import QueryData from './../../../../components/queryData/queryData' 207 import QueryData from './../../../../components/queryData/queryData'
372 import zdQueryData from './../../../../components/zdQueryData/zdQueryData' 208 import zdQueryData from './../../../../components/zdQueryData/zdQueryData'
209 import hfghb from '../hfghb/index'
373 210
374 export default { 211 export default {
375 name: "", 212 name: "",
376 components: {QueryData,zdQueryData}, 213 components: {QueryData,zdQueryData,hfghb},
377 props: {}, 214 props: {},
378 data() { 215 data() {
379 return { 216 return {
...@@ -383,7 +220,11 @@ ...@@ -383,7 +220,11 @@
383 dzhbqData: [], // 多幢合并前数据 220 dzhbqData: [], // 多幢合并前数据
384 hhbqData: [], // 户合并前数据 221 hhbqData: [], // 户合并前数据
385 zdhbhData: {}, // 宗地合并后数据 222 zdhbhData: {}, // 宗地合并后数据
386 dzhbhData: {}, // 多幢合并后数据 223 dzhbhData: [
224 {
225 xmmc:''
226 }
227 ], // 多幢合并后数据
387 hhbhData: {}, // 户合并后数据 228 hhbhData: {}, // 户合并后数据
388 fgBoxWidth: 0, 229 fgBoxWidth: 0,
389 xzq: [], 230 xzq: [],
...@@ -594,6 +435,31 @@ ...@@ -594,6 +435,31 @@
594 break; 435 break;
595 } 436 }
596 }, 437 },
438 //多幢合并保存
439 dzhbSave(){
440 console.log(this.dzhbqData,'dzhbqData');
441 let params = {
442 fwlist:[],
443 newdzxmmc:this.dzhbhData[0].xmmc,
444 zdbsm:''
445 }
446 this.dzhbqData.forEach(item=>{
447 params.fwlist.push({
448 zbsm:item.bsm,
449 ztype:item.dylx
450 })
451 })
452 this.$nextTick(()=>{
453 console.log(params);
454 //TODO 调用保存接口
455 // saveDzHb(params).then((res) => {
456
457 // })
458 // .catch((error) => {
459
460 // });
461 })
462 }
597 }, 463 },
598 computed: {}, 464 computed: {},
599 watch: {}, 465 watch: {},
...@@ -653,7 +519,7 @@ ...@@ -653,7 +519,7 @@
653 .addBtn { 519 .addBtn {
654 position: absolute; 520 position: absolute;
655 right: 30px; 521 right: 30px;
656 top: -46px; 522 top: 0;
657 z-index: 999; 523 z-index: 999;
658 } 524 }
659 .header { 525 .header {
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
55 title="批量修改" 55 title="批量修改"
56 :visible.sync="centerDialogVisible" 56 :visible.sync="centerDialogVisible"
57 width="30%" 57 width="30%"
58 center> 58 >
59 <div class="plxg"> 59 <div class="plxg">
60 <div> 60 <div>
61 <span class="batchlx"> 界标类型:</span> 61 <span class="batchlx"> 界标类型:</span>
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
67 title="批量修改" 67 title="批量修改"
68 :visible.sync="centerDialogVisible" 68 :visible.sync="centerDialogVisible"
69 width="30%" 69 width="30%"
70 center> 70 >
71 <div class="plxg"> 71 <div class="plxg">
72 <div class="batchlx"> 72 <div class="batchlx">
73 <span class=""> 界址线类型:</span> 73 <span class=""> 界址线类型:</span>
......
...@@ -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>
......
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
220 </div> 220 </div>
221 221
222 <!-- 右键菜单弹出框 --> 222 <!-- 右键菜单弹出框 -->
223 <el-dialog title="添加" :visible.sync="dialogVisible" width="50%" center> 223 <el-dialog title="添加" :visible.sync="dialogVisible" width="50%" >
224 <!-- 根据菜单类型（menuType）和右键点击的楼盘类型（treeData.type）来区分弹框内容 --> 224 <!-- 根据菜单类型（menuType）和右键点击的楼盘类型（treeData.type）来区分弹框内容 -->
225 <div class="addCh" v-show="menuType == 'ljz'"> 225 <div class="addCh" v-show="menuType == 'ljz'">
226 <addLjz ref="ljz"></addLjz> 226 <addLjz ref="ljz"></addLjz>
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
255 @close="hcxlzClose" 255 @close="hcxlzClose"
256 ></h-cxlz> 256 ></h-cxlz>
257 <!-- 双击户的弹出框 --> 257 <!-- 双击户的弹出框 -->
258 <el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" center> 258 <el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" >
259 <hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj> 259 <hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj>
260 </el-dialog> 260 </el-dialog>
261 </div> 261 </div>
...@@ -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">
......
...@@ -263,7 +263,6 @@ ...@@ -263,7 +263,6 @@
263 :title="addCData.title" 263 :title="addCData.title"
264 :visible.sync="addCVisible" 264 :visible.sync="addCVisible"
265 width="50%" 265 width="50%"
266 center
267 > 266 >
268 <el-form :model="addCData"> 267 <el-form :model="addCData">
269 <el-form-item label="层号" :label-width="formLabelWidth"> 268 <el-form-item label="层号" :label-width="formLabelWidth">
......
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 },
......