Merge remote-tracking branch 'origin/master'
Showing
6 changed files
with
216 additions
and
139 deletions
... | @@ -122,3 +122,27 @@ ol, ul { list-style:none; } | ... | @@ -122,3 +122,27 @@ ol, ul { list-style:none; } |
122 | .el-tabs__content{ | 122 | .el-tabs__content{ |
123 | position: unset; | 123 | position: unset; |
124 | } | 124 | } |
125 | // 自定义右键菜单样式 | ||
126 | .contextmenu { | ||
127 | margin: 0; | ||
128 | background: #fff; | ||
129 | z-index: 3000; | ||
130 | position: absolute; | ||
131 | list-style-type: none; | ||
132 | padding: 5px 0; | ||
133 | border-radius: 4px; | ||
134 | font-size: 12px; | ||
135 | font-weight: 400; | ||
136 | color: #333; | ||
137 | box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3); | ||
138 | } | ||
139 | .contextmenu li { | ||
140 | margin: 0; | ||
141 | padding: 7px 16px; | ||
142 | cursor: pointer; | ||
143 | } | ||
144 | |||
145 | .contextmenu li:hover { | ||
146 | background: #eee; | ||
147 | } | ||
148 | // end | ||
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class="main"> | ||
3 | <el-dialog | 2 | <el-dialog |
4 | title="户重新落宗" | 3 | title="户重新落宗" |
5 | :visible.sync="isVisible" | 4 | :visible.sync="isVisible" |
... | @@ -68,7 +67,6 @@ | ... | @@ -68,7 +67,6 @@ |
68 | <query-data :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx" | 67 | <query-data :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx" |
69 | :isZdClose="true"></query-data> | 68 | :isZdClose="true"></query-data> |
70 | </el-dialog> | 69 | </el-dialog> |
71 | </div> | ||
72 | </template> | 70 | </template> |
73 | 71 | ||
74 | <script> | 72 | <script> | ... | ... |
... | @@ -260,31 +260,7 @@ export default { | ... | @@ -260,31 +260,7 @@ export default { |
260 | }; | 260 | }; |
261 | </script> | 261 | </script> |
262 | <style lang="less" scoped> | 262 | <style lang="less" scoped> |
263 | // 自定义右键菜单样式 start | ||
264 | .contextmenu { | ||
265 | margin: 0; | ||
266 | background: #fff; | ||
267 | z-index: 3000; | ||
268 | position: absolute; | ||
269 | list-style-type: none; | ||
270 | padding: 5px 0; | ||
271 | border-radius: 4px; | ||
272 | font-size: 12px; | ||
273 | font-weight: 400; | ||
274 | color: #333; | ||
275 | box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3); | ||
276 | } | ||
277 | |||
278 | .contextmenu li { | ||
279 | margin: 0; | ||
280 | padding: 7px 16px; | ||
281 | cursor: pointer; | ||
282 | } | ||
283 | 263 | ||
284 | .contextmenu li:hover { | ||
285 | background: #eee; | ||
286 | } | ||
287 | // end | ||
288 | .content { | 264 | .content { |
289 | height: 100%; | 265 | height: 100%; |
290 | width: 100%; | 266 | width: 100%; | ... | ... |
... | @@ -12,9 +12,9 @@ | ... | @@ -12,9 +12,9 @@ |
12 | <table class="chTable" :style="{'top':(ljzzdyHeight-1-zdys.cs.length*65)+'px'}" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0"> | 12 | <table class="chTable" :style="{'top':(ljzzdyHeight-1-zdys.cs.length*65)+'px'}" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0"> |
13 | <tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex"> | 13 | <tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex"> |
14 | <!-- 显示层数 --> | 14 | <!-- 显示层数 --> |
15 | <td class="floor">{{cs.sjc}}层</td> | 15 | <td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')">{{cs.sjc}}层</td> |
16 | <!-- 显示户 --> | 16 | <!-- 显示户 --> |
17 | <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.shbw}}</td> | 17 | <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td> |
18 | </tr> | 18 | </tr> |
19 | </table> | 19 | </table> |
20 | <!-- </div> --> | 20 | <!-- </div> --> |
... | @@ -28,9 +28,9 @@ | ... | @@ -28,9 +28,9 @@ |
28 | <table class="chTable" :style="{'top':(ljzzdyHeight+40-1-ljzs.cs.length*65)+'px'}" border="1" cellspacing="0" cellpadding="0"> | 28 | <table class="chTable" :style="{'top':(ljzzdyHeight+40-1-ljzs.cs.length*65)+'px'}" border="1" cellspacing="0" cellpadding="0"> |
29 | <tr v-for="(cs) in ljzs.cs" :key="cs.bsm"> | 29 | <tr v-for="(cs) in ljzs.cs" :key="cs.bsm"> |
30 | <!-- 显示层数 --> | 30 | <!-- 显示层数 --> |
31 | <td class="floor">{{cs.sjc}}层</td> | 31 | <td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')">{{cs.sjc}}层</td> |
32 | <!-- 显示户 --> | 32 | <!-- 显示户 --> |
33 | <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.shbw}}</td> | 33 | <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td> |
34 | </tr> | 34 | </tr> |
35 | </table> | 35 | </table> |
36 | </div> | 36 | </div> |
... | @@ -53,9 +53,9 @@ | ... | @@ -53,9 +53,9 @@ |
53 | <table class="chTable" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0"> | 53 | <table class="chTable" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0"> |
54 | <tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex"> | 54 | <tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex"> |
55 | <!-- 显示层数 --> | 55 | <!-- 显示层数 --> |
56 | <td class="floor">{{cs.sjc}}层</td> | 56 | <td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')">{{cs.sjc}}层</td> |
57 | <!-- 显示户 --> | 57 | <!-- 显示户 --> |
58 | <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.shbw}}</td> | 58 | <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td> |
59 | </tr> | 59 | </tr> |
60 | </table> | 60 | </table> |
61 | </div> | 61 | </div> |
... | @@ -65,9 +65,9 @@ | ... | @@ -65,9 +65,9 @@ |
65 | <table class="chTable" ref="ch" border="1" cellspacing="0" cellpadding="0" v-show="lpbData.cs != null && lpbData.cs.length>0" > | 65 | <table class="chTable" ref="ch" border="1" cellspacing="0" cellpadding="0" v-show="lpbData.cs != null && lpbData.cs.length>0" > |
66 | <tr v-for="(cs,csIndex) in lpbData.cs" :key="csIndex"> | 66 | <tr v-for="(cs,csIndex) in lpbData.cs" :key="csIndex"> |
67 | <!-- 显示层数 --> | 67 | <!-- 显示层数 --> |
68 | <td class="floor">{{cs.sjc}}层</td> | 68 | <td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')">{{cs.sjc}}层</td> |
69 | <!-- 显示户 --> | 69 | <!-- 显示户 --> |
70 | <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.shbw}}</td> | 70 | <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td> |
71 | </tr> | 71 | </tr> |
72 | </table> | 72 | </table> |
73 | </div> | 73 | </div> |
... | @@ -81,6 +81,18 @@ | ... | @@ -81,6 +81,18 @@ |
81 | > | 81 | > |
82 | {{ lpbData.xmmc }} | 82 | {{ lpbData.xmmc }} |
83 | </div> | 83 | </div> |
84 | <ul | ||
85 | v-show="lpbChVisible" | ||
86 | :style="{ left: lpbChLeft + 'px', top: lpbChTop + 'px' }" | ||
87 | class="contextmenu" | ||
88 | > | ||
89 | <li v-show='rightClickFlag=="h"' @click="handleAddH">添加</li> | ||
90 | <li v-show='rightClickFlag=="h"' @click="handleMoveH">移动</li> | ||
91 | <li v-show='rightClickFlag=="h"' @click="handleDeleteH">删除</li> | ||
92 | <li v-show='rightClickFlag=="h"' @click="handleSyczh">实预测转换</li> | ||
93 | <li v-show='rightClickFlag=="c"' @click="handleAddC">添加</li> | ||
94 | <li v-show='rightClickFlag=="c"' @click="handleDeleteC">删除</li> | ||
95 | </ul> | ||
84 | </div> | 96 | </div> |
85 | </template> | 97 | </template> |
86 | <script> | 98 | <script> |
... | @@ -109,6 +121,12 @@ export default { | ... | @@ -109,6 +121,12 @@ export default { |
109 | searchNum: Math.random(), | 121 | searchNum: Math.random(), |
110 | //接收父组件传入的根据单元状态/房屋性质/房屋用途筛选的户bsmList | 122 | //接收父组件传入的根据单元状态/房屋性质/房屋用途筛选的户bsmList |
111 | choosedList: [], | 123 | choosedList: [], |
124 | lpbChVisible:false, //层户右键菜单显隐 | ||
125 | lpbChLeft:100, | ||
126 | lpbChTop:100, | ||
127 | //右键层户数据 | ||
128 | chData:'', | ||
129 | rightClickFlag:"" | ||
112 | }; | 130 | }; |
113 | }, | 131 | }, |
114 | created() {}, | 132 | created() {}, |
... | @@ -247,7 +265,7 @@ export default { | ... | @@ -247,7 +265,7 @@ export default { |
247 | }, | 265 | }, |
248 | //清除选中户 | 266 | //清除选中户 |
249 | clearChoosedH() { | 267 | clearChoosedH() { |
250 | this.$nextTick(() => { | 268 | // this.$nextTick(() => { |
251 | //将每个选中的户的选中状态清除 | 269 | //将每个选中的户的选中状态清除 |
252 | this.$refs.hBsm.forEach((item) => { | 270 | this.$refs.hBsm.forEach((item) => { |
253 | if (item.className == "tdSelect") { | 271 | if (item.className == "tdSelect") { |
... | @@ -256,8 +274,43 @@ export default { | ... | @@ -256,8 +274,43 @@ export default { |
256 | }); | 274 | }); |
257 | // 清空hbsmList | 275 | // 清空hbsmList |
258 | this.hbsmList = []; | 276 | this.hbsmList = []; |
259 | }); | 277 | // }); |
278 | }, | ||
279 | //户右键点击事件 | ||
280 | openMenu(e,item,type){ | ||
281 | console.log(e,'e'); | ||
282 | this.lpbChLeft = e.pageX; | ||
283 | this.lpbChTop = e.pageY; | ||
284 | this.chData = item; | ||
285 | this.rightClickFlag = type; | ||
286 | this.lpbChVisible = true; | ||
287 | }, | ||
288 | //关闭右键菜单 | ||
289 | closeMenu(){ | ||
290 | this.lpbChVisible = false | ||
291 | }, | ||
292 | //户右键菜单 start | ||
293 | handleAddH(){ | ||
294 | |||
295 | }, | ||
296 | handleMoveH(){ | ||
297 | |||
260 | }, | 298 | }, |
299 | handleDeleteH(){ | ||
300 | |||
301 | }, | ||
302 | handleSyczh(){ | ||
303 | |||
304 | }, | ||
305 | //end | ||
306 | // 层右键菜单 start | ||
307 | handleAddC(){ | ||
308 | |||
309 | }, | ||
310 | handleDeleteC(){ | ||
311 | |||
312 | }, | ||
313 | //end | ||
261 | }, | 314 | }, |
262 | computed: { | 315 | computed: { |
263 | createFlagChange() { | 316 | createFlagChange() { |
... | @@ -298,11 +351,19 @@ export default { | ... | @@ -298,11 +351,19 @@ export default { |
298 | this.$refs.hBsm.forEach((item) => { | 351 | this.$refs.hBsm.forEach((item) => { |
299 | this.choosedList.forEach((i) => { | 352 | this.choosedList.forEach((i) => { |
300 | if (item.dataset.bsm == i) { | 353 | if (item.dataset.bsm == i) { |
354 | console.log(item.dataset.bsm+'----分割线-----'+i); | ||
301 | item.className = "tdSelect"; | 355 | item.className = "tdSelect"; |
302 | } | 356 | } |
303 | }); | 357 | }); |
304 | }); | 358 | }); |
305 | }, | 359 | }, |
360 | lpbChVisible(value) { | ||
361 | if (value) { | ||
362 | document.body.addEventListener("click", this.closeMenu); | ||
363 | } else { | ||
364 | document.body.removeEventListener("click", this.closeMenu); | ||
365 | } | ||
366 | } | ||
306 | }, | 367 | }, |
307 | }; | 368 | }; |
308 | </script> | 369 | </script> |
... | @@ -311,7 +372,6 @@ export default { | ... | @@ -311,7 +372,6 @@ export default { |
311 | width: 100%; | 372 | width: 100%; |
312 | height: 100%; | 373 | height: 100%; |
313 | overflow: hidden; | 374 | overflow: hidden; |
314 | position: relative; | ||
315 | .lpbContent { | 375 | .lpbContent { |
316 | width: 100%; | 376 | width: 100%; |
317 | height: 100%; | 377 | height: 100%; |
... | @@ -438,8 +498,8 @@ export default { | ... | @@ -438,8 +498,8 @@ export default { |
438 | height: 60px; | 498 | height: 60px; |
439 | line-height: 60px; | 499 | line-height: 60px; |
440 | background-color: darkgoldenrod; | 500 | background-color: darkgoldenrod; |
441 | position: absolute; | 501 | position: relative; |
442 | bottom: 6px; | 502 | bottom: 66px; |
443 | text-align: center; | 503 | text-align: center; |
444 | transition: 0.5s; | 504 | transition: 0.5s; |
445 | } | 505 | } | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class="zrz content-form main" v-loading="loading"> | 2 | <div class="main"> |
3 | <el-form ref="form" :model="form" label-width="160px"> | 3 | <div class="formMenu"> |
4 | <Qlr ref="qlrxxModule" :bsm="bsm"></Qlr> | 4 | <Qlr ref="qlrxxModule" :bsm="bsm"></Qlr> |
5 | <table border="1" width="100%" cellspacing="0" cellpadding="0" class="zrzTable"> | 5 | <table border="1" width="100%" cellspacing="0" cellpadding="0" class="zrzTable"> |
6 | <tbody> | 6 | <tr> |
7 | <tr height="30"> | 7 | <th colspan="12">自然幢基本信息</th> |
8 | <td colspan="12" align="center" ><font size="4">自然幢基本信息</font></td> | ||
9 | </tr> | 8 | </tr> |
10 | <tr height="30"> | 9 | <tr> |
11 | <td colspan="2" align="center" >宗地代码</td> | 10 | <td colspan="2">宗地代码</td> |
12 | <td colspan="4" > | 11 | <td colspan="4" style="min-width:450px"> |
13 | <input v-model="form.zddm" class="formInput" disabled> | 12 | <input v-model="form.zddm" class="formInput" disabled> |
14 | <input v-show="false" class="formInput" v-model="form.zdbsm"> | 13 | <input v-show="false" class="formInput" v-model="form.zdbsm"> |
15 | </td> | 14 | </td> |
16 | <td colspan="2" align="center" >自然幢号</td> | 15 | <td colspan="2" >自然幢号</td> |
17 | <td colspan="4" > | 16 | <td colspan="4" > |
18 | <input class="formInput" v-model="form.zrzh" style="width: 70%"> | 17 | <input class="formInput" v-model="form.zrzh" style="width: 70%"> |
19 | <el-button @click.prevent="generatorCode" type="primary" size="mini" style="width:25%;margin-left:3%">生成</el-button> | ||
20 | </td> | 18 | </td> |
21 | </tr> | 19 | </tr> |
22 | <tr height="30"> | 20 | <tr> |
23 | <td colspan="2" align="center" >项目名称</td> | 21 | <td colspan="2" >项目名称</td> |
24 | <td colspan="4" > | 22 | <td colspan="4" > |
25 | <input class="formInput" v-model="form.xmmc"> | 23 | <input class="formInput" v-model="form.xmmc"> |
26 | </td> | 24 | </td> |
27 | <td colspan="2" align="center" >不动产单元号</td> | 25 | <td colspan="2" >不动产单元号</td> |
28 | <!-- todo 此处暂时存放的是不动产单元号标识码,而不是不动产单元号--> | ||
29 | <td colspan="4" > | 26 | <td colspan="4" > |
30 | <input class="formInput percent78" v-model="form.bdcdyh" style="width: 70%"> | 27 | <input class="formInput percent78" v-model="form.bdcdyh" style="width: 70%"> |
31 | <input class="formInput percent78" v-show="false" v-model="form.dyhbsm" style="width: 70%"> | 28 | <input class="formInput percent78" v-show="false" v-model="form.dyhbsm" style="width: 70%"> |
... | @@ -33,19 +30,19 @@ | ... | @@ -33,19 +30,19 @@ |
33 | </td> | 30 | </td> |
34 | </tr> | 31 | </tr> |
35 | 32 | ||
36 | <tr height="30"> | 33 | <tr> |
37 | <td colspan="2" align="center" >建筑物名称</td> | 34 | <td colspan="2" >建筑物名称</td> |
38 | <td colspan="4" > | 35 | <td colspan="4" > |
39 | <input class="formInput" v-model="form.jzwmc"> | 36 | <input class="formInput" v-model="form.jzwmc"> |
40 | </td> | 37 | </td> |
41 | <td colspan="2" align="center" >建筑物基本用途</td> | 38 | <td colspan="2" >建筑物基本用途</td> |
42 | <td colspan="4" > | 39 | <td colspan="4" > |
43 | <input class="formInput" v-model="form.jzwjbyt"> | 40 | <input class="formInput" v-model="form.jzwjbyt"> |
44 | </td> | 41 | </td> |
45 | </tr> | 42 | </tr> |
46 | 43 | ||
47 | <tr height="30"> | 44 | <tr> |
48 | <td colspan="2" align="center" >房屋性质</td> | 45 | <td colspan="2" >房屋性质</td> |
49 | <td colspan="4" > | 46 | <td colspan="4" > |
50 | <el-select class="formSelect" v-model="form.fwxzbsm" placeholder="请选择" > | 47 | <el-select class="formSelect" v-model="form.fwxzbsm" placeholder="请选择" > |
51 | <el-option | 48 | <el-option |
... | @@ -56,7 +53,7 @@ | ... | @@ -56,7 +53,7 @@ |
56 | </el-option> | 53 | </el-option> |
57 | </el-select> | 54 | </el-select> |
58 | </td> | 55 | </td> |
59 | <td colspan="2" align="center" >竣工日期</td> | 56 | <td colspan="2" >竣工日期</td> |
60 | <td colspan="4" > | 57 | <td colspan="4" > |
61 | <el-date-picker | 58 | <el-date-picker |
62 | v-model="form.jgrq" | 59 | v-model="form.jgrq" |
... | @@ -66,65 +63,65 @@ | ... | @@ -66,65 +63,65 @@ |
66 | </td> | 63 | </td> |
67 | </tr> | 64 | </tr> |
68 | 65 | ||
69 | <tr height="30"> | 66 | <tr> |
70 | <td colspan="2" align="center" >建筑物高度(m)</td> | 67 | <td colspan="2" >建筑物高度(m)</td> |
71 | <td colspan="4" > | 68 | <td colspan="4" > |
72 | <input class="formInput" v-model="form.jzwgd"> | 69 | <input class="formInput" v-model="form.jzwgd"> |
73 | </td> | 70 | </td> |
74 | <td colspan="2" align="center" >总套数</td> | 71 | <td colspan="2" >总套数</td> |
75 | <td colspan="4" > | 72 | <td colspan="4" > |
76 | <input class="formInput" v-model="form.zts"> | 73 | <input class="formInput" v-model="form.zts"> |
77 | </td> | 74 | </td> |
78 | </tr> | 75 | </tr> |
79 | 76 | ||
80 | <tr height="30"> | 77 | <tr> |
81 | <td colspan="2" align="center" >幢用地面积(㎡)</td> | 78 | <td colspan="2" >幢用地面积(㎡)</td> |
82 | <td colspan="4" > | 79 | <td colspan="4" > |
83 | <input class="formInput" v-model="form.zydmj"> | 80 | <input class="formInput" v-model="form.zydmj"> |
84 | </td> | 81 | </td> |
85 | <td colspan="2" align="center" >幢占用地面积(㎡)</td> | 82 | <td colspan="2" >幢占用地面积(㎡)</td> |
86 | <td colspan="4" > | 83 | <td colspan="4" > |
87 | <input class="formInput" v-model="form.zzdmj"> | 84 | <input class="formInput" v-model="form.zzdmj"> |
88 | </td> | 85 | </td> |
89 | </tr> | 86 | </tr> |
90 | 87 | ||
91 | <tr height="30"> | 88 | <tr> |
92 | <td colspan="2" align="center" >预测建筑面积(㎡)</td> | 89 | <td colspan="2" >预测建筑面积(㎡)</td> |
93 | <td colspan="4" > | 90 | <td colspan="4" > |
94 | <input class="formInput" v-model="form.ycjzmj"> | 91 | <input class="formInput" v-model="form.ycjzmj"> |
95 | </td> | 92 | </td> |
96 | <td colspan="2" align="center" >实测建筑面积(㎡)</td> | 93 | <td colspan="2" >实测建筑面积(㎡)</td> |
97 | <td colspan="4" > | 94 | <td colspan="4" > |
98 | <input class="formInput" v-model="form.scjzmj"> | 95 | <input class="formInput" v-model="form.scjzmj"> |
99 | </td> | 96 | </td> |
100 | </tr> | 97 | </tr> |
101 | 98 | ||
102 | <tr height="30"> | 99 | <tr> |
103 | <td colspan="2" align="center" >地下层数</td> | 100 | <td colspan="2" >地下层数</td> |
104 | <td colspan="4" > | 101 | <td colspan="4" > |
105 | <input class="formInput" v-model="form.dxcs"> | 102 | <input class="formInput" v-model="form.dxcs"> |
106 | </td> | 103 | </td> |
107 | <td colspan="2" align="center" >地上层数</td> | 104 | <td colspan="2" >地上层数</td> |
108 | <td colspan="4" > | 105 | <td colspan="4" > |
109 | <input class="formInput" v-model="form.dscs"> | 106 | <input class="formInput" v-model="form.dscs"> |
110 | </td> | 107 | </td> |
111 | </tr> | 108 | </tr> |
112 | 109 | ||
113 | <tr height="30"> | 110 | <tr> |
114 | <td colspan="2" align="center" >总层数</td> | 111 | <td colspan="2" >总层数</td> |
115 | <td colspan="4" > | 112 | <td colspan="4" > |
116 | <input class="formInput" v-model="form.zcs"> | 113 | <input class="formInput" v-model="form.zcs"> |
117 | </td> | 114 | </td> |
118 | <td colspan="2" align="center" >地下深度(m)</td> | 115 | <td colspan="2" >地下深度(m)</td> |
119 | <td colspan="4" > | 116 | <td colspan="4" > |
120 | <input class="formInput" v-model="form.dxsd"> | 117 | <input class="formInput" v-model="form.dxsd"> |
121 | </td> | 118 | </td> |
122 | </tr> | 119 | </tr> |
123 | 120 | ||
124 | <tr height="30"> | 121 | <tr> |
125 | <td colspan="2" align="center" >产别</td> | 122 | <td colspan="2" >产别</td> |
126 | <td colspan="4" > | 123 | <td colspan="4" > |
127 | <el-select class="formInput" v-model="form.fwcbbsm" placeholder="请选择" > | 124 | <el-select v-model="form.fwcbbsm" placeholder="请选择" > |
128 | <el-option | 125 | <el-option |
129 | v-for="item in $store.state.cbOptions" | 126 | v-for="item in $store.state.cbOptions" |
130 | :key="item.bsm" | 127 | :key="item.bsm" |
... | @@ -133,9 +130,9 @@ | ... | @@ -133,9 +130,9 @@ |
133 | </el-option> | 130 | </el-option> |
134 | </el-select> | 131 | </el-select> |
135 | </td> | 132 | </td> |
136 | <td colspan="2" align="center" >产权来源</td> | 133 | <td colspan="2" >产权来源</td> |
137 | <td colspan="4" > | 134 | <td colspan="4" > |
138 | <el-select class="formInput" v-model="form.fwcqlybsm" placeholder="请选择" > | 135 | <el-select v-model="form.fwcqlybsm" placeholder="请选择" > |
139 | <el-option | 136 | <el-option |
140 | v-for="item in $store.state.cqlyOptions" | 137 | v-for="item in $store.state.cqlyOptions" |
141 | :key="item.bsm" | 138 | :key="item.bsm" |
... | @@ -146,18 +143,18 @@ | ... | @@ -146,18 +143,18 @@ |
146 | </td> | 143 | </td> |
147 | </tr> | 144 | </tr> |
148 | 145 | ||
149 | <tr height="30" v-for="(item1,index) in form.fwytList" :key="index"> | 146 | <tr v-for="(item1,index) in form.fwytList" :key="index"> |
150 | <td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle"> | 147 | <td colspan="2" v-if="index===0" :rowspan="ytTitleRowspan" id="ytTitle"> |
151 | <el-button type="primary" size="mini" style="margin-right: 10px" @click="addYtInfo">添加</el-button> | 148 | <el-button type="primary" size="mini" style="margin-right: 10px" @click="addYtInfo">添加</el-button> |
152 | <span>用途</span> | 149 | <span>用途</span> |
153 | </td> | 150 | </td> |
154 | 151 | ||
155 | <td width="30" colspan="1" align="center" > | 152 | <td colspan="1" style="min-width:120px"> |
156 | <el-button type="info" size="mini" style="" @click="deleteYtInfo(index)" circle>删除</el-button> | 153 | <el-button type="info" size="mini" style="" @click="deleteYtInfo(index)" circle>删除</el-button> |
157 | 规划用途 | 154 | 规划用途 |
158 | </td> | 155 | </td> |
159 | <td width="30" colspan="4" align="center" > | 156 | <td colspan="3" > |
160 | <el-select-tree class="formInput" | 157 | <el-select-tree |
161 | v-if="show" | 158 | v-if="show" |
162 | :default-expand-all="defaultExpandAll" | 159 | :default-expand-all="defaultExpandAll" |
163 | :multiple="multiple" | 160 | :multiple="multiple" |
... | @@ -170,9 +167,9 @@ | ... | @@ -170,9 +167,9 @@ |
170 | v-model="item1.fwytzdbsm" | 167 | v-model="item1.fwytzdbsm" |
171 | ></el-select-tree> | 168 | ></el-select-tree> |
172 | </td> | 169 | </td> |
173 | <td width="30" colspan="1" align="center" >用途</td> | 170 | <td colspan="2" >用途</td> |
174 | <td width="30" colspan="4" align="center" > | 171 | <td colspan="4" > |
175 | <el-select-tree class="formInput" | 172 | <el-select-tree |
176 | v-if="show" | 173 | v-if="show" |
177 | :default-expand-all="defaultExpandAll" | 174 | :default-expand-all="defaultExpandAll" |
178 | :multiple="multiple" | 175 | :multiple="multiple" |
... | @@ -187,12 +184,12 @@ | ... | @@ -187,12 +184,12 @@ |
187 | </td> | 184 | </td> |
188 | </tr> | 185 | </tr> |
189 | 186 | ||
190 | <tr height="30" v-for="(item1,index) in form.fwjgList" :key="'jg'+index"> | 187 | <tr v-for="(item1,index) in form.fwjgList" :key="'jg'+index"> |
191 | <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" align="center" > | 188 | <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" > |
192 | <el-button type="primary" size="mini" style="margin-right: 10px" @click="addFwjgInfo">添加</el-button> | 189 | <el-button type="primary" size="mini" style="margin-right: 10px" @click="addFwjgInfo">添加</el-button> |
193 | <span>房屋结构</span> | 190 | <span>房屋结构</span> |
194 | </td> | 191 | </td> |
195 | <td colspan="1" align="center" > | 192 | <td colspan="1" > |
196 | <span @click="deleteFwjgInfo(index)">删除</span> | 193 | <span @click="deleteFwjgInfo(index)">删除</span> |
197 | </td> | 194 | </td> |
198 | <td colspan="9" > | 195 | <td colspan="9" > |
... | @@ -216,8 +213,8 @@ | ... | @@ -216,8 +213,8 @@ |
216 | <tr></tr> | 213 | <tr></tr> |
217 | <tr></tr> | 214 | <tr></tr> |
218 | 215 | ||
219 | <tr height="30"> | 216 | <tr> |
220 | <td colspan="2" align="center" > | 217 | <td colspan="2" > |
221 | <span>坐落</span> | 218 | <span>坐落</span> |
222 | </td> | 219 | </td> |
223 | <td colspan="10" > | 220 | <td colspan="10" > |
... | @@ -225,19 +222,19 @@ | ... | @@ -225,19 +222,19 @@ |
225 | </td> | 222 | </td> |
226 | </tr> | 223 | </tr> |
227 | 224 | ||
228 | <tr height="30"> | 225 | <tr> |
229 | <td colspan="2" rowspan="2" align="center" > | 226 | <td colspan="2" rowspan="2" > |
230 | <span>附加说明</span> | 227 | <span>附加说明</span> |
231 | </td> | 228 | </td> |
232 | <td colspan="10" rowspan="2" > | 229 | <td colspan="10" rowspan="2" > |
233 | <input class="formInput" v-model="form.bz" type="textarea"> | 230 | <input class="formInput" v-model="form.bz" type="textarea"> |
234 | </td> | 231 | </td> |
235 | </tr> | 232 | </tr> |
236 | <tr height="30"> | 233 | <tr> |
237 | </tr> | 234 | </tr> |
238 | 235 | ||
239 | <tr height="30"> | 236 | <tr> |
240 | <td colspan="2" rowspan="2" align="center" > | 237 | <td colspan="2" rowspan="2" > |
241 | <span>调查意见</span> | 238 | <span>调查意见</span> |
242 | </td> | 239 | </td> |
243 | <td colspan="10" > | 240 | <td colspan="10" > |
... | @@ -245,14 +242,14 @@ | ... | @@ -245,14 +242,14 @@ |
245 | </td> | 242 | </td> |
246 | </tr> | 243 | </tr> |
247 | 244 | ||
248 | <tr height="30"> | 245 | <tr> |
249 | <td colspan="4" rowspan="2" align="right" style="width:8.33%;padding-right:10px"> | 246 | <td colspan="4" rowspan="2"> |
250 | <span>审查员</span> | 247 | <span>审查员</span> |
251 | </td> | 248 | </td> |
252 | <td colspan="2" > | 249 | <td colspan="2" > |
253 | <input class="formInput" v-model="form.scy"> | 250 | <input class="formInput" v-model="form.scy"> |
254 | </td> | 251 | </td> |
255 | <td colspan="2" align="right" style="width:8.33%;padding-right:10px"> | 252 | <td colspan="2"> |
256 | <span>审查日期</span> | 253 | <span>审查日期</span> |
257 | </td> | 254 | </td> |
258 | <td colspan="2" > | 255 | <td colspan="2" > |
... | @@ -264,15 +261,14 @@ | ... | @@ -264,15 +261,14 @@ |
264 | </el-date-picker> | 261 | </el-date-picker> |
265 | </td> | 262 | </td> |
266 | </tr> | 263 | </tr> |
267 | </tbody> | 264 | |
268 | </table> | 265 | </table> |
269 | </el-form> | ||
270 | <div style="min-height: 40px;text-align: center;margin-top: 10px"> | 266 | <div style="min-height: 40px;text-align: center;margin-top: 10px"> |
271 | <el-button type="success" @click="onSave">保存</el-button> | 267 | <el-button type="success" @click="onSave">保存</el-button> |
272 | <el-button type="primary" @click="onSubmit">提交</el-button> | 268 | <el-button type="primary" @click="onSubmit">提交</el-button> |
273 | </div> | 269 | </div> |
274 | </div> | 270 | </div> |
275 | 271 | </div> | |
276 | </template> | 272 | </template> |
277 | 273 | ||
278 | <script> | 274 | <script> |
... | @@ -549,50 +545,74 @@ | ... | @@ -549,50 +545,74 @@ |
549 | } | 545 | } |
550 | </script> | 546 | </script> |
551 | <style rel="stylesheet/less" lang="less" scoped> | 547 | <style rel="stylesheet/less" lang="less" scoped> |
552 | .zrz { | 548 | .main { |
553 | min-height: 200px; | 549 | box-sizing: border-box; |
554 | width: 100%; | 550 | padding: 18px; |
555 | 551 | height: auto; | |
556 | /deep/.el-input__inner{ | 552 | .formMenu { |
557 | width: 100%; | 553 | width: 100%; |
558 | border: 0; | 554 | margin: 0 auto; |
559 | } | 555 | } |
560 | 556 | .zrzTable { | |
561 | /deep/textarea{ | 557 | margin: 10px 0; |
558 | background-color: #fff; | ||
559 | font-size: 14px; | ||
562 | width: 100%; | 560 | width: 100%; |
563 | border: 0; | 561 | th { |
562 | height: 36px; | ||
563 | line-height: 36px; | ||
564 | font-size: 16px; | ||
564 | } | 565 | } |
565 | 566 | td { | |
566 | 567 | text-align: center; | |
567 | .el-form-item{ | 568 | height: 36px; |
568 | font-weight: bold; | ||
569 | font-size: xx-large | ||
570 | } | 569 | } |
571 | 570 | /deep/ .el-input__inner { | |
572 | table{ | 571 | margin: 0; |
573 | background: #fff; | 572 | height: 36px; |
574 | table-layout: fixed; | 573 | outline: none; |
574 | border: none; | ||
575 | color: #606764; | ||
576 | overflow: visible; | ||
577 | text-align: center; | ||
578 | cursor: text; | ||
575 | } | 579 | } |
576 | 580 | .percent78 { | |
577 | td{ | 581 | width: 78%; |
578 | //bgcolor:#F1F4FC; | 582 | float: left; |
579 | background-color:#fff; | ||
580 | width:8.33% | ||
581 | } | 583 | } |
582 | 584 | .percent68 { | |
583 | .el-select{ | 585 | width: 68% !important; |
584 | display:block; | 586 | float: left; |
587 | position: relative; | ||
588 | top: 7px; | ||
585 | } | 589 | } |
586 | 590 | .percent47 { | |
587 | table{ | 591 | width: 45% !important; |
588 | font-size: 14px; | 592 | float: left; |
589 | } | 593 | } |
590 | 594 | .percent4 { | |
591 | .zrzTable{ | 595 | height: 20px; |
592 | margin-top: 10px; | 596 | line-height: 20px; |
593 | td{ | 597 | width: 4% !important; |
594 | text-align: center; | 598 | float: left; |
595 | height: 36px; | 599 | } |
600 | .percent30 { | ||
601 | width: 30% !important; | ||
602 | float: left; | ||
603 | } | ||
604 | .createBtn { | ||
605 | position: absolute; | ||
606 | width: 50px; | ||
607 | padding: 6px 4px; | ||
608 | right: 4px; | ||
609 | top: 4px; | ||
610 | } | ||
611 | .el-input__icon { | ||
612 | line-height: 37px; | ||
613 | } | ||
614 | .el-select { | ||
615 | width: 100%; | ||
596 | } | 616 | } |
597 | } | 617 | } |
598 | } | 618 | } | ... | ... |
-
Please register or sign in to post a comment