Skip to content

任超 / js.CadastralSystem

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

Merge remote-tracking branch 'origin/master' into master

2 parents ad62a573 e09d8f62
Expand all
Inline Side-by-side
Showing 32 changed files with 922 additions and 279 deletions
...@@ -208,3 +208,4 @@ export function registerCall(data) { ...@@ -208,3 +208,4 @@ export function registerCall(data) {
208 data:data 208 data:data
209 }) 209 })
210 } 210 }
211
......
...@@ -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 }
......
...@@ -59,3 +59,14 @@ export function getHZdxx(bsm) { ...@@ -59,3 +59,14 @@ export function getHZdxx(bsm) {
59 }) 59 })
60 60
61 } 61 }
62
63 /**
64 * 户合并
65 */
66 export function hhb(data) {
67 return request({
68 url: '/bg/hSplitMerge/hHb',
69 method: 'post',
70 data: data
71 })
72 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -10,6 +10,10 @@ export function getSearchList(data) { ...@@ -10,6 +10,10 @@ export function getSearchList(data) {
10 }) 10 })
11 } 11 }
12 12
13 /**
14 * 宗地分割选择宗地列表
15 * @param data
16 */
13 export function zdlist(data) { 17 export function zdlist(data) {
14 return request({ 18 return request({
15 url: '/zd/qjZdjbxx/zdlist', 19 url: '/zd/qjZdjbxx/zdlist',
...@@ -17,3 +21,15 @@ export function zdlist(data) { ...@@ -17,3 +21,15 @@ export function zdlist(data) {
17 data:data 21 data:data
18 }) 22 })
19 } 23 }
24
25 /**
26 * 多幢分割选择多幢列表
27 * @param data
28 */
29 export function dzList(data) {
30 return request({
31 url:'/fw/qjDz/dzlist',
32 method:'post',
33 data:data
34 })
35 }
......
1 <template>
2 <div>
3 <el-dialog
4 title="新增"
5 :visible.sync="isVisible"
6 width="70%"
7 @close="close"
8 :modal-append-to-body="false"
9 center>
10 <div class="search">
11 <el-row>
12 <el-col :span="24">
13 <el-form :inline="true" class="demo-form-inline">
14 <el-form-item label="宗地编码">
15 <el-input
16 v-model="queryData.zddm"
17 placeholder="输入宗地编码"
18 ></el-input>
19 </el-form-item>
20 <el-form-item label="不动产权证号">
21 <el-input
22 v-model="queryData.bdcqzh"
23 placeholder="输入不动产权证号"
24 ></el-input>
25 </el-form-item>
26 <el-form-item label="不动产单元号">
27 <el-input
28 maxlength="28"
29 v-model="queryData.bdcdyh"
30 placeholder="输入不动产单元号"
31 ></el-input>
32 </el-form-item>
33 <el-button type="primary" style="margin-left:30px" @click="search">查询</el-button>
34 <el-button type="warning" @click="reset">重置</el-button>
35 </el-form>
36 </el-col>
37 </el-row>
38 <el-row>
39 <el-col :span="24">
40 <el-form :inline="true" class="demo-form-inline">
41 <el-form-item label="权利人">
42 <el-input
43 v-model="queryData.qlrmc"
44 placeholder="输入权利人"
45 ></el-input>
46 </el-form-item>
47 <el-form-item label="坐落">
48 <el-input
49 v-model="queryData.zl"
50 placeholder="输入坐落"
51 ></el-input>
52 </el-form-item>
53 </el-form>
54 </el-col>
55 </el-row>
56 <div class="table-bode">
57 <table border="1">
58 <tr>
59 <td>序号</td>
60 <td>操作</td>
61 <td>宗地代码</td>
62 <td>不动产单元号</td>
63 <td>项目名称</td>
64 <td>不动产权证号</td>
65 <td>权利人</td>
66 <td>坐落</td>
67 </tr>
68 <tr v-if="Data.length==0">
69 <td colspan="8">
70 <span class="noData">暂无数据</span>
71 </td>
72 </tr>
73 <tr v-else v-for="(item,index) in Data" :key="index">
74 <td>{{index+1}}</td>
75 <td @click="addData(item)" class="xz">
76 <span>选择</span>
77 </td>
78 <td>{{item.zddm}}</td>
79 <td>{{item.bdcdyh}}</td>
80 <td>{{item.xmmc}}</td>
81 <td>{{item.bdcqzh}}</td>
82 <td>{{item.qlr}}</td>
83 <td>{{item.zl}}</td>
84 </tr>
85 </table>
86 </div>
87 </div>
88 <div class="page">
89 <el-pagination
90 background
91 layout="prev, pager, next,total"
92 :page-size="queryData.pageSize"
93 :total="total"
94 @current-change="currentChange"
95 >
96 </el-pagination>
97 </div>
98 </el-dialog>
99
100 </div>
101 </template>
102
103 <script>
104 import {dzList} from './../../api/search'
105
106 export default {
107 name: "zdQueryData",
108 data() {
109 return {
110 total: 1,
111 queryData: {
112 bdcdyh: "",
113 bdcqzh: "",
114 qlrmc: "",
115 xmmc: "",
116 zddm: "",
117 zl: "",
118 pageNo: 1,
119 pageSize: 10,
120 },
121 Data: [],
122 isVisible: false
123 }
124 },
125 props: {
126 centerDialogVisible: {
127 type: Boolean,
128 default: function () {
129 return false
130 }
131 },
132 isClose: {
133 type: Boolean,
134 default: false
135 }
136 },
137 mounted() {
138 this.getData(this.queryData)
139 },
140 created() {
141 },
142 methods: {
143 currentChange: function (val) {
144 this.queryData.pageNo = val;
145 this.getData(this.queryData);
146 },
147 reset: function () {
148 this.queryData = {
149 bdcdyh: "",
150 bdcqzh: "",
151 qlrmc: "",
152 xmmc: "",
153 zddm: "",
154 zl: "",
155 pageNo: 1,
156 pageSize: 10
157 };
158 this.getData(this.queryData)
159 },
160 getData: function (data) {
161 dzList(data).then(res => {
162 this.Data = res.result.records
163 this.total = res.result.total;
164 })
165 },
166 search: function () {
167 this.getData(this.queryData)
168 },
169 addData: function (val) {
170 this.$emit("getData", val)
171 if (this.isClose) {
172 this.close();
173 }
174 },
175 close: function () {
176 this.$emit('close')
177 this.reset();
178 }
179 },
180 watch: {
181 centerDialogVisible(val) {
182 this.isVisible = val
183 }
184 }
185 }
186 </script>
187
188 <style scoped lang="less">
189
190 .main {
191 box-sizing: border-box;
192 padding: 18px;
193 height: auto;
194 width: 80%;
195 }
196
197 /deep/ .el-form-item__label {
198 width: 96px;
199 text-align: right;
200 }
201
202 table {
203 margin-top: 10px;
204 background-color: #fff;
205 font-size: 14px;
206 width: 100%;
207 tr:hover {
208 background-color: #F5F7FA;
209 }
210 }
211
212 td {
213 text-align: center;
214 height: 36px;
215 min-width: 50px;
216 }
217
218 table:hover {
219 cursor: pointer;
220 }
221
222 .inputtitle {
223 line-height: 40px;
224 }
225
226 .shop {
227 margin-top: 20px;
228 }
229
230 .xz {
231 color: blue;
232 }
233
234 .noData {
235 color: #b2b2b2;
236 }
237 .table-bode{
238 height: 450px;
239 }
240 .page {
241 margin-top: 20px;
242 }
243
244 </style>
...@@ -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">
......
...@@ -523,6 +523,40 @@ export default { ...@@ -523,6 +523,40 @@ export default {
523 this.outNum--; 523 this.outNum--;
524 } 524 }
525 }, 525 },
526 reset(){
527 this.countList=[
528 {
529 id: Math.random(),
530 isInside: false,
531 hasNotBorder: false,
532 bsm: "", //权利性质标识码
533 glbsm: "", //宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
534 qlxzdm: "",
535 zhqlxzlx: "", //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质
536 list: [
537 {
538 pzdjbsm: "",
539 pzdjmc: "",
540 pzytdm: "",
541 pzytmc: "",
542 pzytmj: 0,
543 qlxzbsm: "",
544 sjdjbsm: "",
545 sjdjmc: "",
546 sjytdm: "",
547 sjytmc: "",
548 sjytmj: 0,
549 syqx: "",
550 tdsyjssj: "",
551 pickerStart:{},
552 pickerEnd:{},
553 tdsyqssj: "",
554 tdzh: "",
555 },
556 ],
557 },
558 ];
559 },
526 //内层操作 560 //内层操作
527 handleInClick(index, childIndex, type) { 561 handleInClick(index, childIndex, type) {
528 let insideObj = { 562 let insideObj = {
......
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
46 @contextmenu.prevent="openMenu($event, item,list)" 46 @contextmenu.prevent="openMenu($event, item,list)"
47 :class="{ 47 :class="{
48 active_color: item.expand, 48 active_color: item.expand,
49 curPage:$route.query.bsm==item.bsm
49 }" 50 }"
50 > 51 >
51 <img class="qsztImg" v-if="item.qszt=='0'" :src="linshi"/> 52 <img class="qsztImg" v-if="item.qszt=='0'" :src="linshi"/>
...@@ -404,4 +405,7 @@ export default { ...@@ -404,4 +405,7 @@ export default {
404 position: relative; 405 position: relative;
405 top: 1px; 406 top: 1px;
406 } 407 }
408 .curPage{
409 color: orange;
410 }
407 </style> 411 </style>
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
67 <li @click="exportToShp">ESRI Shape</li> 67 <li @click="exportToShp">ESRI Shape</li>
68 </ul> 68 </ul>
69 </li> 69 </li>
70 <li v-show="isZD">导入属性</li> 70 <li v-show="isZD" @click="drsx">导入属性</li>
71 <li v-show="!isZD">导入楼盘</li> 71 <li v-show="!isZD">导入楼盘</li>
72 <li>重叠分析</li> 72 <li>重叠分析</li>
73 <li v-show="isZD && (zdQszt == '1' || zdQszt == '2')" @click="openCreateDialog">添加定着物</li> 73 <li v-show="isZD && (zdQszt == '1' || zdQszt == '2')" @click="openCreateDialog">添加定着物</li>
...@@ -110,6 +110,7 @@ ...@@ -110,6 +110,7 @@
110 <el-dialog title="新建" :visible.sync="dialogVisible" width="48%"> 110 <el-dialog title="新建" :visible.sync="dialogVisible" width="48%">
111 <Create @closeDialog="closeDialog" :auth="true"></Create> 111 <Create @closeDialog="closeDialog" :auth="true"></Create>
112 </el-dialog> 112 </el-dialog>
113 <sxdr :sxdr-visible="sxdrVisible" @close="sxdrClose" :dylx="zdData.type" :bsm="zdData.bsm"></sxdr>
113 </div> 114 </div>
114 </template> 115 </template>
115 <script> 116 <script>
...@@ -121,6 +122,7 @@ import geoUtils from "@components/lineTree/tx/js/geoUtils"; ...@@ -121,6 +122,7 @@ import geoUtils from "@components/lineTree/tx/js/geoUtils";
121 import featureUpdate from "@libs/map/featureUpdate"; 122 import featureUpdate from "@libs/map/featureUpdate";
122 import {deleteLjz,deleteZdy} from "./../../api/lpb" 123 import {deleteLjz,deleteZdy} from "./../../api/lpb"
123 import exportTemJson from '@/assets/json/exportTemplate.json' 124 import exportTemJson from '@/assets/json/exportTemplate.json'
125 import sxdr from './../../components/sxdr/sxdr'
124 export default { 126 export default {
125 inheritAttrs: false, 127 inheritAttrs: false,
126 props: { 128 props: {
...@@ -134,10 +136,11 @@ export default { ...@@ -134,10 +136,11 @@ export default {
134 default: false, 136 default: false,
135 } 137 }
136 }, 138 },
137 components: { lineItem,Create,ImportGeo }, 139 components: { lineItem,Create,ImportGeo,sxdr },
138 mixins:[geoUtils,featureUpdate], 140 mixins:[geoUtils,featureUpdate],
139 data() { 141 data() {
140 return { 142 return {
143 sxdrVisible:false,
141 selectedDetail: {}, 144 selectedDetail: {},
142 timer: {}, 145 timer: {},
143 formatData: [], 146 formatData: [],
...@@ -197,6 +200,12 @@ export default { ...@@ -197,6 +200,12 @@ export default {
197 }, 200 },
198 201
199 methods: { 202 methods: {
203 drsx(){
204 this.sxdrVisible=true;
205 },
206 sxdrClose(){
207 this.sxdrVisible=false;
208 },
200 loading(){ 209 loading(){
201 this.$emit("loading") 210 this.$emit("loading")
202 }, 211 },
......
...@@ -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,18 +362,82 @@ ...@@ -360,18 +362,82 @@
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 };
409 this.$refs.qlxzModule.reset();
410 this.ytTitleRowspan=1; //用途的单元格垂直合并数量
411 this.fwjgTitleRowspan=1; //房屋结构的单元格垂直合并数量
365 }, 412 },
366 save: function () { 413 save: function () {
367 this.form['hbsms'] = this.bsms 414 this.form['hbsms'] = this.bsms
368 this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList(); 415 this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList();
416 for(let i=0;i< this.form.fwjgList.length;i++){
417 if(this.form.fwjgList[i].fwjgzdbsm===''){
418 this.form.fwjgList.splice(i,1);
419 }
420 }
421 for(let i=0;i< this.form.fwytList.length;i++){
422 if(this.form.fwytList[i].fwsjytbsm===''){
423 this.form.fwytList.splice(i,1);
424 }
425 }
426 for(let i=0;i< this.form.qlxzList.length;i++){
427 if(this.form.qlxzList[i].qlxzdm===''){
428 this.form.qlxzList.splice(i,1);
429 }
430 }
369 console.log("批量户信息") 431 console.log("批量户信息")
370 console.log(this.form) 432 console.log(this.form)
371 batchUpdateQjH(this.form).then((res)=>{ 433 batchUpdateQjH(this.form).then((res)=>{
372 if(res.code===200){ 434 if(res.code===200){
373 this.lodding() 435 this.lodding()
374 this.$message.success("保存成功！") 436 this.$message.success("保存成功！")
437 this.$nextTick(()=>{
438 this.reset();
439 })
440 this.close();
375 } 441 }
376 }) 442 })
377 }, 443 },
...@@ -396,6 +462,7 @@ ...@@ -396,6 +462,7 @@
396 background-color: #fff; 462 background-color: #fff;
397 font-size: 14px; 463 font-size: 14px;
398 width: 100%; 464 width: 100%;
465 table-layout: fixed;
399 } 466 }
400 467
401 td { 468 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,36 +6,36 @@ ...@@ -6,36 +6,36 @@
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> -->
13 13
14 <el-row> 14 <el-row>
15 <el-col :span="24"> 15 <el-col :span="24">
16 <el-form :inline="true" class="demo-form-inline"> 16 <el-form :inline="true" class="demo-form-inline">
17 <el-form-item label="宗地编码"> 17 <el-form-item label="宗地编码">
18 <el-input 18 <el-input
19 v-model="queryData.zddm" 19 v-model="queryData.zddm"
20 placeholder="输入宗地编码" 20 placeholder="输入宗地编码"
21 ></el-input> 21 ></el-input>
22 </el-form-item> 22 </el-form-item>
23 <el-form-item label="不动产权证号"> 23 <el-form-item label="不动产权证号">
24 <el-input 24 <el-input
25 v-model="queryData.bdcqzh" 25 v-model="queryData.bdcqzh"
26 placeholder="输入不动产权证号" 26 placeholder="输入不动产权证号"
27 ></el-input> 27 ></el-input>
28 </el-form-item> 28 </el-form-item>
29 <el-form-item label="不动产单元号"> 29 <el-form-item label="不动产单元号">
30 <el-input 30 <el-input
31 maxlength="28" 31 maxlength="28"
32 v-model="queryData.bdcdyh" 32 v-model="queryData.bdcdyh"
33 placeholder="输入不动产单元号" 33 placeholder="输入不动产单元号"
34 ></el-input> 34 ></el-input>
35 </el-form-item> 35 </el-form-item>
36 <el-button type="primary" style="margin-left:30px" @click="search">查询</el-button> 36 <el-button type="primary" style="margin-left:30px" @click="search">查询</el-button>
37 <el-button type="warning" @click="reset">重置</el-button> 37 <el-button type="warning" @click="reset">重置</el-button>
38 </el-form> 38 </el-form>
39 </el-col> 39 </el-col>
40 </el-row> 40 </el-row>
41 <el-row> 41 <el-row>
...@@ -43,85 +43,50 @@ ...@@ -43,85 +43,50 @@
43 <el-form :inline="true" class="demo-form-inline"> 43 <el-form :inline="true" class="demo-form-inline">
44 <el-form-item label="权利人"> 44 <el-form-item label="权利人">
45 <el-input 45 <el-input
46 v-model="queryData.qlrmc" 46 v-model="queryData.qlrmc"
47 placeholder="输入权利人" 47 placeholder="输入权利人"
48 ></el-input> 48 ></el-input>
49 </el-form-item> 49 </el-form-item>
50 <el-form-item label="坐落"> 50 <el-form-item label="坐落">
51 <el-input 51 <el-input
52 v-model="queryData.zl" 52 v-model="queryData.zl"
53 placeholder="输入坐落" 53 placeholder="输入坐落"
54 ></el-input> 54 ></el-input>
55 </el-form-item> 55 </el-form-item>
56 </el-form> 56 </el-form>
57 </el-col> 57 </el-col>
58 </el-row> 58 </el-row>
59 <!-- <el-row :gutter="10" class="shop"> 59 <div class="table-data">
60 <el-col :span="4" class="inputtitle"> 60 <table border="1">
61 宗地编码: 61 <tr>
62 </el-col> 62 <td>序号</td>
63 <el-col :span="8" class=""> 63 <td>操作</td>
64 <el-input v-model="queryData.zddm"></el-input> 64 <td>宗地代码</td>
65 </el-col> 65 <td>不动产单元号</td>
66 <el-col :span="4" class="inputtitle"> 66 <td>项目名称</td>
67 不动产权证号: 67 <td>不动产权证号</td>
68 </el-col> 68 <td>权利人</td>
69 <el-col :span="8" class=""> 69 <td>坐落</td>
70 <el-input v-model="queryData.bdcqzh"></el-input> 70 </tr>
71 </el-col> 71 <tr v-if="Data.length==0">
72 </el-row> --> 72 <td colspan="8">
73 <!-- <el-row :gutter="10"> 73 <span class="noData">暂无数据</span>
74 <el-col :span="4" class="inputtitle"> 74 </td>
75 不动产单元号: 75 </tr>
76 </el-col> 76 <tr v-else v-for="(item,index) in Data" :key="index">
77 <el-col :span="8"> 77 <td>{{index+1}}</td>
78 <el-input v-model="queryData.bdcdyh"></el-input> 78 <td @click="addData(item)" class="xz">
79 </el-col> 79 <span>选择</span>
80 <el-col :span="4" class="inputtitle"> 80 </td>
81 权利人: 81 <td>{{item.zddm}}</td>
82 </el-col> 82 <td>{{item.bdcdyh}}</td>
83 <el-col :span="8"> 83 <td>{{item.xmmc}}</td>
84 <el-input v-model="queryData.qlrmc"></el-input> 84 <td>{{item.bdcqzh}}</td>
85 </el-col> 85 <td>{{item.qlr}}</td>
86 </el-row> 86 <td>{{item.zl}}</td>
87 <el-row :gutter="10"> 87 </tr>
88 <el-col :span="4" class="inputtitle"> 88 </table>
89 坐落: 89 </div>
90 </el-col>
91 <el-col :span="8">
92 <el-input v-model="queryData.zl"></el-input>
93 </el-col>
94 </el-row> -->
95 <table border="1">
96 <tr>
97 <td>序号</td>
98 <td>操作</td>
99 <td>宗地代码</td>
100 <td>不动产单元号</td>
101 <td>项目名称</td>
102 <td>不动产权证号</td>
103 <td>权利人</td>
104 <td>坐落</td>
105 </tr>
106 <tr v-if="Data.length==0">
107 <td colspan="8">
108 <span class="noData">暂无数据</span>
109 </td>
110 </tr>
111 <tr v-else v-for="(item,index) in Data" :key="index">
112 <td>{{index+1}}</td>
113 <td @click="addData(item)" class="xz">
114 <span>选择</span>
115 </td>
116 <td>{{item.zddm}}</td>
117 <td>{{item.bdcdyh}}</td>
118 <td>{{item.xmmc}}</td>
119 <td>{{item.bdcqzh}}</td>
120 <td>{{item.qlr}}</td>
121 <td>{{item.zl}}</td>
122 </tr>
123
124 </table>
125 </div> 90 </div>
126 <div class="page"> 91 <div class="page">
127 <el-pagination 92 <el-pagination
...@@ -145,7 +110,7 @@ ...@@ -145,7 +110,7 @@
145 name: "queryData", 110 name: "queryData",
146 data() { 111 data() {
147 return { 112 return {
148 total:1, 113 total: 1,
149 queryData: { 114 queryData: {
150 bdcdyh: "", 115 bdcdyh: "",
151 bdcqzh: "", 116 bdcqzh: "",
...@@ -175,9 +140,9 @@ ...@@ -175,9 +140,9 @@
175 return ['zd'] 140 return ['zd']
176 } 141 }
177 }, 142 },
178 isZdClose:{ 143 isZdClose: {
179 type:Boolean, 144 type: Boolean,
180 default:false 145 default: false
181 } 146 }
182 }, 147 },
183 mounted() { 148 mounted() {
...@@ -190,7 +155,7 @@ ...@@ -190,7 +155,7 @@
190 this.queryData.pageNo = val; 155 this.queryData.pageNo = val;
191 this.getData(this.queryData); 156 this.getData(this.queryData);
192 }, 157 },
193 reset(){ 158 reset() {
194 this.queryData = { 159 this.queryData = {
195 bdcdyh: "", 160 bdcdyh: "",
196 bdcqzh: "", 161 bdcqzh: "",
...@@ -204,23 +169,23 @@ ...@@ -204,23 +169,23 @@
204 }; 169 };
205 this.getData(this.queryData) 170 this.getData(this.queryData)
206 }, 171 },
207 getData(data){ 172 getData(data) {
208 data['dylxs'] = this.dylxs; 173 data['dylxs'] = this.dylxs;
209 getSearchList(data).then(res => { 174 getSearchList(data).then(res => {
210 this.Data = res.result.records 175 this.Data = res.result.records
211 this.total = res.result.total; 176 this.total = res.result.total;
212 }) 177 })
213 }, 178 },
214 search(){ 179 search() {
215 this.getData(this.queryData) 180 this.getData(this.queryData)
216 }, 181 },
217 addData(val){ 182 addData(val) {
218 this.$emit("getData", val) 183 this.$emit("getData", val)
219 if (this.isZdClose) { 184 if (this.isZdClose) {
220 this.close(); 185 this.close();
221 } 186 }
222 }, 187 },
223 close(){ 188 close() {
224 this.$emit('close') 189 this.$emit('close')
225 this.reset(); 190 this.reset();
226 } 191 }
...@@ -241,7 +206,8 @@ ...@@ -241,7 +206,8 @@
241 height: auto; 206 height: auto;
242 width: 80%; 207 width: 80%;
243 } 208 }
244 /deep/ .el-form-item__label{ 209
210 /deep/ .el-form-item__label {
245 width: 96px; 211 width: 96px;
246 text-align: right; 212 text-align: right;
247 } 213 }
...@@ -251,7 +217,7 @@ ...@@ -251,7 +217,7 @@
251 background-color: #fff; 217 background-color: #fff;
252 font-size: 14px; 218 font-size: 14px;
253 width: 100%; 219 width: 100%;
254 tr:hover{ 220 tr:hover {
255 background-color: #F5F7FA; 221 background-color: #F5F7FA;
256 } 222 }
257 } 223 }
...@@ -281,7 +247,10 @@ ...@@ -281,7 +247,10 @@
281 .noData { 247 .noData {
282 color: #b2b2b2; 248 color: #b2b2b2;
283 } 249 }
284 .page{ 250 .table-data{
251 height: 450px;
252 }
253 .page {
285 margin-top: 20px; 254 margin-top: 20px;
286 } 255 }
287 256
......
1 <template>
2 <div>
3 <el-dialog
4 title="属性导入"
5 :visible.sync="isVisible"
6 width="30%"
7 :before-close="close">
8 <div class="main-button">
9 <el-upload
10 class="upload-demo"
11 :action="uploadUrl"
12 :data="sxdrData"
13 :on-success="uploadSuccess"
14 :show-file-list="false"
15 multiple
16 >
17 <el-button type="primary">上传</el-button>
18 <el-button type="primary" @click="downloadTemplate">下载模板</el-button>
19 </el-upload>
20 </div>
21 <ul>
22 <li v-for="(item,index) in errorData" :key="index">{{item}}</li>
23 </ul>
24 <span slot="footer" class="dialog-footer">
25 <el-button @click="dialogVisible = false">取 消</el-button>
26 <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
27 </span>
28 </el-dialog>
29 </div>
30 </template>
31
32 <script>
33
34 export default {
35 name: "sxdr",
36 props: {
37 sxdrVisible: {
38 type: Boolean,
39 default: false
40 },
41 dylx: {
42 type: String,
43 },
44 bsm: {
45 type: String
46 }
47 },
48 data() {
49 return {
50 uploadUrl: '',
51 isVisible: false,
52 sxdrData: {
53 bsm: ''
54 },
55 errorData: []
56 }
57 },
58 mounted() {
59 this.$store.state.sxdrType = '';
60 },
61 methods: {
62 loading() {
63 this.$store.state.sxdrType = this.dylx;
64 },
65 reset() {
66 this.errorData = [];
67 this.uploadUrl = '';
68 this.sxdrData = {bsm: ''};
69 },
70 close() {
71 this.$emit('close')
72 this.reset();
73 },
74 downloadTemplate() {
75 window.open(`/api/tx/excelGeo/zdTemplate?type=` + this.dylx);
76 },
77 uploadSuccess(res, file, fileList) {
78 this.errorData = [];
79 if (res.success) {
80 this.$message.success("上传成功")
81 debugger
82 this.loading();
83 this.close()
84 } else {
85 if (res.result == null) {
86 this.$message.error(res.message)
87 } else {
88 this.$message.error("上传失败")
89 this.errorData = res.result;
90 }
91 }
92 }
93 },
94 watch: {
95 sxdrVisible(val) {
96 this.isVisible = val;
97 },
98 dylx(val) {
99 switch (val) {
100 case "zd":
101 this.uploadUrl = "/api/tx/excelGeo/Zdimport";
102 break;
103 default:
104 break;
105 }
106 },
107 bsm(val) {
108 this.sxdrData.bsm = val;
109 }
110 }
111 }
112 </script>
113
114 <style scoped lang="less">
115 .main-button {
116 display: -webkit-flex;
117 display: flex;
118 flex-direction: column-reverse;
119 flex-wrap: nowrap;
120 }
121
122 ul {
123 margin-top: 20px;
124 li {
125 line-height: 20px;
126 color: red;
127 }
128 }
129 </style>
...@@ -6,33 +6,33 @@ ...@@ -6,33 +6,33 @@
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">
13 <el-form :inline="true" class="demo-form-inline"> 13 <el-form :inline="true" class="demo-form-inline">
14 <el-form-item label="宗地编码"> 14 <el-form-item label="宗地编码">
15 <el-input 15 <el-input
16 v-model="queryData.zddm" 16 v-model="queryData.zddm"
17 placeholder="输入宗地编码" 17 placeholder="输入宗地编码"
18 ></el-input> 18 ></el-input>
19 </el-form-item> 19 </el-form-item>
20 <el-form-item label="不动产权证号"> 20 <el-form-item label="不动产权证号">
21 <el-input 21 <el-input
22 v-model="queryData.bdcqzh" 22 v-model="queryData.bdcqzh"
23 placeholder="输入不动产权证号" 23 placeholder="输入不动产权证号"
24 ></el-input> 24 ></el-input>
25 </el-form-item> 25 </el-form-item>
26 <el-form-item label="不动产单元号"> 26 <el-form-item label="不动产单元号">
27 <el-input 27 <el-input
28 maxlength="28" 28 maxlength="28"
29 v-model="queryData.bdcdyh" 29 v-model="queryData.bdcdyh"
30 placeholder="输入不动产单元号" 30 placeholder="输入不动产单元号"
31 ></el-input> 31 ></el-input>
32 </el-form-item> 32 </el-form-item>
33 <el-button type="primary" style="margin-left:30px" @click="search">查询</el-button> 33 <el-button type="primary" style="margin-left:30px" @click="search">查询</el-button>
34 <el-button type="warning" @click="reset">重置</el-button> 34 <el-button type="warning" @click="reset">重置</el-button>
35 </el-form> 35 </el-form>
36 </el-col> 36 </el-col>
37 </el-row> 37 </el-row>
38 <el-row> 38 <el-row>
...@@ -40,49 +40,50 @@ ...@@ -40,49 +40,50 @@
40 <el-form :inline="true" class="demo-form-inline"> 40 <el-form :inline="true" class="demo-form-inline">
41 <el-form-item label="权利人"> 41 <el-form-item label="权利人">
42 <el-input 42 <el-input
43 v-model="queryData.qlrmc" 43 v-model="queryData.qlrmc"
44 placeholder="输入权利人" 44 placeholder="输入权利人"
45 ></el-input> 45 ></el-input>
46 </el-form-item> 46 </el-form-item>
47 <el-form-item label="坐落"> 47 <el-form-item label="坐落">
48 <el-input 48 <el-input
49 v-model="queryData.zl" 49 v-model="queryData.zl"
50 placeholder="输入坐落" 50 placeholder="输入坐落"
51 ></el-input> 51 ></el-input>
52 </el-form-item> 52 </el-form-item>
53 </el-form> 53 </el-form>
54 </el-col> 54 </el-col>
55 </el-row> 55 </el-row>
56 <table border="1"> 56 <div class="table-bode">
57 <tr> 57 <table border="1">
58 <td>序号</td> 58 <tr>
59 <td>操作</td> 59 <td>序号</td>
60 <td>宗地代码</td> 60 <td>操作</td>
61 <td>不动产单元号</td> 61 <td>宗地代码</td>
62 <td>项目名称</td> 62 <td>不动产单元号</td>
63 <td>不动产权证号</td> 63 <td>项目名称</td>
64 <td>权利人</td> 64 <td>不动产权证号</td>
65 <td>坐落</td> 65 <td>权利人</td>
66 </tr> 66 <td>坐落</td>
67 <tr v-if="Data.length==0"> 67 </tr>
68 <td colspan="8"> 68 <tr v-if="Data.length==0">
69 <span class="noData">暂无数据</span> 69 <td colspan="8">
70 </td> 70 <span class="noData">暂无数据</span>
71 </tr> 71 </td>
72 <tr v-else v-for="(item,index) in Data" :key="index"> 72 </tr>
73 <td>{{index+1}}</td> 73 <tr v-else v-for="(item,index) in Data" :key="index">
74 <td @click="addData(item)" class="xz"> 74 <td>{{index+1}}</td>
75 <span>选择</span> 75 <td @click="addData(item)" class="xz">
76 </td> 76 <span>选择</span>
77 <td>{{item.zddm}}</td> 77 </td>
78 <td>{{item.bdcdyh}}</td> 78 <td>{{item.zddm}}</td>
79 <td>{{item.xmmc}}</td> 79 <td>{{item.bdcdyh}}</td>
80 <td>{{item.bdcqzh}}</td> 80 <td>{{item.xmmc}}</td>
81 <td>{{item.qlr}}</td> 81 <td>{{item.bdcqzh}}</td>
82 <td>{{item.zl}}</td> 82 <td>{{item.qlr}}</td>
83 </tr> 83 <td>{{item.zl}}</td>
84 84 </tr>
85 </table> 85 </table>
86 </div>
86 </div> 87 </div>
87 <div class="page"> 88 <div class="page">
88 <el-pagination 89 <el-pagination
...@@ -106,13 +107,11 @@ ...@@ -106,13 +107,11 @@
106 name: "zdQueryData", 107 name: "zdQueryData",
107 data() { 108 data() {
108 return { 109 return {
109 total:1, 110 total: 1,
110 queryData: { 111 queryData: {
111 bdcdyh: "", 112 bdcdyh: "",
112 bdcqzh: "", 113 bdcqzh: "",
113 dylxs: ['zd'],
114 qlrmc: "", 114 qlrmc: "",
115 qszt: ["2"],
116 xmmc: "", 115 xmmc: "",
117 zddm: "", 116 zddm: "",
118 zl: "", 117 zl: "",
...@@ -130,15 +129,9 @@ ...@@ -130,15 +129,9 @@
130 return false 129 return false
131 } 130 }
132 }, 131 },
133 qszt:{ 132 isZdClose: {
134 type:Array, 133 type: Boolean,
135 default:function () { 134 default: false
136 return ['2']
137 }
138 },
139 isZdClose:{
140 type:Boolean,
141 default:false
142 } 135 }
143 }, 136 },
144 mounted() { 137 mounted() {
...@@ -156,7 +149,6 @@ ...@@ -156,7 +149,6 @@
156 bdcdyh: "", 149 bdcdyh: "",
157 bdcqzh: "", 150 bdcqzh: "",
158 qlrmc: "", 151 qlrmc: "",
159 qszt: ["2"],
160 xmmc: "", 152 xmmc: "",
161 zddm: "", 153 zddm: "",
162 zl: "", 154 zl: "",
...@@ -166,7 +158,6 @@ ...@@ -166,7 +158,6 @@
166 this.getData(this.queryData) 158 this.getData(this.queryData)
167 }, 159 },
168 getData: function (data) { 160 getData: function (data) {
169 data['dylxs'] = this.dylxs;
170 zdlist(data).then(res => { 161 zdlist(data).then(res => {
171 this.Data = res.result.records 162 this.Data = res.result.records
172 this.total = res.result.total; 163 this.total = res.result.total;
...@@ -202,18 +193,18 @@ ...@@ -202,18 +193,18 @@
202 height: auto; 193 height: auto;
203 width: 80%; 194 width: 80%;
204 } 195 }
205 /deep/ .el-form-item__label{ 196
197 /deep/ .el-form-item__label {
206 width: 96px; 198 width: 96px;
207 text-align: right; 199 text-align: right;
208 } 200 }
209 201
210
211 table { 202 table {
212 margin-top: 10px; 203 margin-top: 10px;
213 background-color: #fff; 204 background-color: #fff;
214 font-size: 14px; 205 font-size: 14px;
215 width: 100%; 206 width: 100%;
216 tr:hover{ 207 tr:hover {
217 background-color: #F5F7FA; 208 background-color: #F5F7FA;
218 } 209 }
219 } 210 }
...@@ -243,7 +234,10 @@ ...@@ -243,7 +234,10 @@
243 .noData { 234 .noData {
244 color: #b2b2b2; 235 color: #b2b2b2;
245 } 236 }
246 .page{ 237 .table-bode{
238 height: 450px;
239 }
240 .page {
247 margin-top: 20px; 241 margin-top: 20px;
248 } 242 }
249 243
......
...@@ -15,6 +15,7 @@ const store = new Vuex.Store({ ...@@ -15,6 +15,7 @@ const store = new Vuex.Store({
15 zdmj: '', // 宗地面积 15 zdmj: '', // 宗地面积
16 zdzl: '', // 宗地坐落 16 zdzl: '', // 宗地坐落
17 rightClickZdbsm:'', //右键菜单传入的zdbsm 17 rightClickZdbsm:'', //右键菜单传入的zdbsm
18 sxdrType:'', // zd/zrz/dz/h 导入属性刷新数据
18 tdytList:[], 19 tdytList:[],
19 tddjList:[], 20 tddjList:[],
20 qlxzList:[], 21 qlxzList:[],
......
...@@ -496,6 +496,19 @@ ...@@ -496,6 +496,19 @@
496 this.form.dzbsm=this.$route.query.bsm; 496 this.form.dzbsm=this.$route.query.bsm;
497 this.getDzDetailByBsm(this.$route.query.bsm) 497 this.getDzDetailByBsm(this.$route.query.bsm)
498 } 498 }
499 },
500 watch:{
501 "$store.state.sxdrType": {
502 handler(n) {
503 this.$nextTick(()=>{
504 if (n === 'dz') {
505 this.getDzDetailByBsm(this.$route.query.bsm)
506 }
507 })
508 },
509 immediate: false,
510 deep: true,
511 }
499 } 512 }
500 } 513 }
501 </script> 514 </script>
......
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
162 </el-tab-pane> 162 </el-tab-pane>
163 <el-tab-pane label="自然幢" name="zrz"> 163 <el-tab-pane label="自然幢" name="zrz">
164 <ul> 164 <ul>
165 <li :class="[zdFghData.newZdlist[index].zrz.indexOf(childItem) > -1 ? 'choosed':'',(childItem.hasChoosed === index || childItem.hasChoosed === '' )? '':'cantClick']" 165 <li :class="[zdFghData.newZdlist[index].zrz.indexOf(childItem) > -1 ? 'choosed':'',(childItem.hasChoosed === index || childItem.hasChoosed === '' )? '':'cantClick']"
166 @click="zrzHandleCommand(childItem,childItem.bsm,index,childIndex)" v-for="(childItem,childIndex) in zdZrzList" :key="childIndex*Math.random()"> 166 @click="zrzHandleCommand(childItem,childItem.bsm,index,childIndex)" v-for="(childItem,childIndex) in zdZrzList" :key="childIndex*Math.random()">
167 {{childItem.xmmc}} <i class="fa fa-check" style="color:'#4EB2FF'"></i> 167 {{childItem.xmmc}} <i class="fa fa-check" style="color:'#4EB2FF'"></i>
168 </li> 168 </li>
...@@ -293,9 +293,10 @@ ...@@ -293,9 +293,10 @@
293 </tr> 293 </tr>
294 </table> 294 </table>
295 </div> 295 </div>
296 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']" 296 <dz-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible"
297 :isZdClose="true" 297 :isClose="true"
298 @close="close"></query-data> 298 @close="close">
299 </dz-query-data>
299 <div class="header-button" :style="{width:fgBoxWidth+'px'}"> 300 <div class="header-button" :style="{width:fgBoxWidth+'px'}">
300 <el-button type="primary" class="saveBtn" @click="save">保存</el-button> 301 <el-button type="primary" class="saveBtn" @click="save">保存</el-button>
301 </div> 302 </div>
...@@ -310,7 +311,7 @@ ...@@ -310,7 +311,7 @@
310 <ul> 311 <ul>
311 <li><span>宗地代码:</span>{{hFgqData.zddm}}</li> 312 <li><span>宗地代码:</span>{{hFgqData.zddm}}</li>
312 <li><span>不动产单元号:</span>{{hFgqData.bdcdyh}}</li> 313 <li><span>不动产单元号:</span>{{hFgqData.bdcdyh}}</li>
313 <li><span>项目名称:</span>{{hFgqData.xmmc}}</li>s's's's's's's's's's's's's's's's's's's 314 <li><span>项目名称:</span>{{hFgqData.xmmc}}</li>
314 <li><span>不动产权证号:</span>{{hFgqData.bdcqzh}}</li> 315 <li><span>不动产权证号:</span>{{hFgqData.bdcqzh}}</li>
315 <li><span>权利人:</span>{{hFgqData.qlr}}</li> 316 <li><span>权利人:</span>{{hFgqData.qlr}}</li>
316 <li><span>坐落:</span>{{hFgqData.zl}}</li> 317 <li><span>坐落:</span>{{hFgqData.zl}}</li>
...@@ -331,7 +332,7 @@ ...@@ -331,7 +332,7 @@
331 </div> 332 </div>
332 <ul> 333 <ul>
333 <li v-for="(item,index) in zdZxx.dzList" :key="index" 334 <li v-for="(item,index) in zdZxx.dzList" :key="index"
334 :class="(index+1)%2==0?'':'oddborder'">{{item.xmmc}} 335 :class="(index+1)%2===0?'':'oddborder'">{{item.xmmc}}
335 </li> 336 </li>
336 </ul> 337 </ul>
337 </div> 338 </div>
...@@ -455,11 +456,12 @@ ...@@ -455,11 +456,12 @@
455 import {getHZdxx} from './../../../../api/h' 456 import {getHZdxx} from './../../../../api/h'
456 import QueryData from './../../../../components/queryData/queryData' 457 import QueryData from './../../../../components/queryData/queryData'
457 import zdQueryData from './../../../../components/zdQueryData/zdQueryData' 458 import zdQueryData from './../../../../components/zdQueryData/zdQueryData'
459 import dzQueryData from './../../../../components/dzQueryData/dzQueryData'
458 import {Message} from 'element-ui' 460 import {Message} from 'element-ui'
459 461
460 export default { 462 export default {
461 name: "", 463 name: "",
462 components: {QueryData, zdQueryData}, 464 components: {QueryData, zdQueryData,dzQueryData},
463 props: {}, 465 props: {},
464 data() { 466 data() {
465 return { 467 return {
...@@ -557,7 +559,7 @@ ...@@ -557,7 +559,7 @@
557 this.dzFghData.fwlist[index].zrzlist.splice(chilInd,1); 559 this.dzFghData.fwlist[index].zrzlist.splice(chilInd,1);
558 this.tempBsmList = this.tempBsmList.filter(i => i!== bsm); 560 this.tempBsmList = this.tempBsmList.filter(i => i!== bsm);
559 this.dzFgqZrzData.forEach(i=>{ 561 this.dzFgqZrzData.forEach(i=>{
560 if (i.bsm == bsm) { 562 if (i.bsm === bsm) {
561 i.hasChoosed = "" 563 i.hasChoosed = ""
562 } 564 }
563 }) 565 })
...@@ -621,7 +623,7 @@ ...@@ -621,7 +623,7 @@
621 ztype: 'zrz' 623 ztype: 'zrz'
622 }) 624 })
623 }, 625 },
624 626
625 dzHandleCommand(obj,bsm, index,childIndex) { 627 dzHandleCommand(obj,bsm, index,childIndex) {
626 //判断选中状态 628 //判断选中状态
627 if(this.zdDzList[childIndex].hasChoosed === '' || this.zdDzList[childIndex].hasChoosed === index){ 629 if(this.zdDzList[childIndex].hasChoosed === '' || this.zdDzList[childIndex].hasChoosed === index){
...@@ -667,7 +669,7 @@ ...@@ -667,7 +669,7 @@
667 if(this.dzFgZrzList[childIndex].hasChoosed === '' || this.dzFgZrzList[childIndex].hasChoosed === index){ 669 if(this.dzFgZrzList[childIndex].hasChoosed === '' || this.dzFgZrzList[childIndex].hasChoosed === index){
668 // this.zdZrzList[childIndex].hasChoosed = index; 670 // this.zdZrzList[childIndex].hasChoosed = index;
669 if(fwlist.zrzlist.indexOf(bsm) < 0){ 671 if(fwlist.zrzlist.indexOf(bsm) < 0){
670 if(fwlist.ztype == 'zrz' && fwlist.zrzlist.length>0){ 672 if(fwlist.ztype === 'zrz' && fwlist.zrzlist.length>0){
671 Message.warning("当前幢类型只能选择一个自然幢") 673 Message.warning("当前幢类型只能选择一个自然幢")
672 }else{ 674 }else{
673 //存入当前选择幢信息的bsm 675 //存入当前选择幢信息的bsm
...@@ -686,7 +688,7 @@ ...@@ -686,7 +688,7 @@
686 return 688 return
687 } 689 }
688 break; 690 break;
689 691
690 default: 692 default:
691 break; 693 break;
692 } 694 }
...@@ -744,7 +746,7 @@ ...@@ -744,7 +746,7 @@
744 } 746 }
745 }, 747 },
746 saveZd() { 748 saveZd() {
747 if(this.tempBsmList.length == (this.zdZxx.dzList.length + this.zdZxx.zrzList.length)){ 749 if(this.tempBsmList.length === (this.zdZxx.dzList.length + this.zdZxx.zrzList.length)){
748 zdfg(this.zdFghData).then(res => { 750 zdfg(this.zdFghData).then(res => {
749 if (res.success) { 751 if (res.success) {
750 this.$store.state.zdbsms = res.result; 752 this.$store.state.zdbsms = res.result;
...@@ -760,7 +762,7 @@ ...@@ -760,7 +762,7 @@
760 } 762 }
761 }) 763 })
762 }else{ 764 }else{
763 this.$message.warning("幢信息未选择完成，无法保存") 765 this.$message.warning("幢信息未选择完成，无法保存")
764 } 766 }
765 }, 767 },
766 saveDz() { 768 saveDz() {
...@@ -973,9 +975,9 @@ ...@@ -973,9 +975,9 @@
973 }, 975 },
974 dzFgqData: { 976 dzFgqData: {
975 handler: function (item) { 977 handler: function (item) {
976 this.dzFgqData.oldZdbsm = item.glbsm; 978 this.dzFgqData.oldZdbsm = item.bsm;
977 this.getDzZdjbxx(item.glbsm); 979 this.getDzZdjbxx(item.bsm);
978 this.dzfgGetZrzxx(item.glbsm) 980 this.dzfgGetZrzxx(item.bsm)
979 }, 981 },
980 deep: true 982 deep: true
981 }, 983 },
...@@ -1001,7 +1003,7 @@ ...@@ -1001,7 +1003,7 @@
1001 </script> 1003 </script>
1002 <style scoped lang="less"> 1004 <style scoped lang="less">
1003 .fg { 1005 .fg {
1004 1006
1005 .menu { 1007 .menu {
1006 /deep/ .el-tabs__content { 1008 /deep/ .el-tabs__content {
1007 position: unset; 1009 position: unset;
...@@ -1041,7 +1043,7 @@ ...@@ -1041,7 +1043,7 @@
1041 } 1043 }
1042 } 1044 }
1043 } 1045 }
1044 1046
1045 /deep/ .el-card__header{ 1047 /deep/ .el-card__header{
1046 padding: 16px 20px; 1048 padding: 16px 20px;
1047 background-color: #FAFAFA; 1049 background-color: #FAFAFA;
...@@ -1143,7 +1145,7 @@ ...@@ -1143,7 +1145,7 @@
1143 width: 96% !important; 1145 width: 96% !important;
1144 } 1146 }
1145 } 1147 }
1146 1148
1147 } 1149 }
1148 .zrz { 1150 .zrz {
1149 width: 100%; 1151 width: 100%;
...@@ -1215,7 +1217,7 @@ ...@@ -1215,7 +1217,7 @@
1215 background: #FAFAFA; 1217 background: #FAFAFA;
1216 } 1218 }
1217 } 1219 }
1218 1220
1219 tr:hover { 1221 tr:hover {
1220 background-color: #F5F7FA; 1222 background-color: #F5F7FA;
1221 } 1223 }
...@@ -1271,7 +1273,7 @@ ...@@ -1271,7 +1273,7 @@
1271 display: inline-block; 1273 display: inline-block;
1272 } 1274 }
1273 } 1275 }
1274 } 1276 }
1275 .choose{ 1277 .choose{
1276 width: 88px; 1278 width: 88px;
1277 color: #30A4FD; 1279 color: #30A4FD;
......
...@@ -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>
......
...@@ -113,16 +113,9 @@ export default { ...@@ -113,16 +113,9 @@ export default {
113 }, 113 },
114 //重置数据 114 //重置数据
115 reset() { 115 reset() {
116 this.tableData = [ 116 this.tableData[0].qsc = "";
117 { 117 this.tableData[0].jsc = "";
118 cz: "+", 118 this.tableData[0].hs = "";
119 ljzbsm: "",
120 zdybsm: "",
121 qsc: "",
122 jsc: "",
123 hs: "",
124 },
125 ];
126 }, 119 },
127 }, 120 },
128 computed: {}, 121 computed: {},
...@@ -171,7 +164,7 @@ export default { ...@@ -171,7 +164,7 @@ export default {
171 }, 164 },
172 scyclx:{ 165 scyclx:{
173 handler(n){ 166 handler(n){
174 this.$nextTick(()=>{ 167 this.$nextTick(()=>{
175 this.formData.scyclx = this.scyclx; 168 this.formData.scyclx = this.scyclx;
176 }) 169 })
177 } 170 }
......
...@@ -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>
...@@ -843,6 +843,17 @@ ...@@ -843,6 +843,17 @@
843 this.form.scyclx = this.scyclx; 843 this.form.scyclx = this.scyclx;
844 }) 844 })
845 } 845 }
846 },
847 "$store.state.sxdrType": {
848 handler(n) {
849 this.$nextTick(()=>{
850 if (n === 'h') {
851 this.getHInfo(this.$store.state.hbsm)
852 }
853 })
854 },
855 immediate: false,
856 deep: true,
846 } 857 }
847 } 858 }
848 } 859 }
...@@ -909,7 +920,7 @@ ...@@ -909,7 +920,7 @@
909 height: 30px !important; 920 height: 30px !important;
910 } 921 }
911 } 922 }
912 923
913 .header-button { 924 .header-button {
914 height: 50px; 925 height: 50px;
915 position: fixed; 926 position: fixed;
......
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
97 </div> 97 </div>
98 <!-- 楼盘表主体 --> 98 <!-- 楼盘表主体 -->
99 <div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }"> 99 <div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }">
100 <lpbContent ref="lpbContent" :key="time"></lpbContent> 100 <lpbContent ref="lpbContent" :zrzbsm="$route.query.bsm" :key="time"></lpbContent>
101 </div> 101 </div>
102 <!-- 右侧图例 --> 102 <!-- 右侧图例 -->
103 <div class="lp-legend"> 103 <div class="lp-legend">
...@@ -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 //弹框中的保存按钮，根据不同菜单点击类型调用不同子组件的保存方法
...@@ -632,7 +635,7 @@ export default { ...@@ -632,7 +635,7 @@ export default {
632 if (res.code === 200) { 635 if (res.code === 200) {
633 this.$message.success("生成完成！"); 636 this.$message.success("生成完成！");
634 } else { 637 } else {
635 this.$message.warning("生成失败！"); 638 this.$message.warning(res.message);
636 } 639 }
637 } 640 }
638 ); 641 );
......
...@@ -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">
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
62 ref="hBsm" 62 ref="hBsm"
63 :key="hsIndex" 63 :key="hsIndex"
64 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''" 64 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
65 @click="handleTdClick($event, hs.bsm)" 65 @click="handleTdClick($event, hs.bsm,hs)"
66 @dblclick="dbclick(hs.bsm)" 66 @dblclick="dbclick(hs.bsm)"
67 @contextmenu.prevent="openMenu($event, hs, 'h')" 67 @contextmenu.prevent="openMenu($event, hs, 'h')"
68 > 68 >
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
117 ref="hBsm" 117 ref="hBsm"
118 :key="hsIndex" 118 :key="hsIndex"
119 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''" 119 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
120 @click="handleTdClick($event, hs.bsm)" 120 @click="handleTdClick($event, hs.bsm,hs)"
121 @dblclick="dbclick(hs.bsm)" 121 @dblclick="dbclick(hs.bsm)"
122 @contextmenu.prevent="openMenu($event, hs, 'h')" 122 @contextmenu.prevent="openMenu($event, hs, 'h')"
123 > 123 >
...@@ -133,7 +133,9 @@ ...@@ -133,7 +133,9 @@
133 133
134 <!-- 逻辑幢名称 --> 134 <!-- 逻辑幢名称 -->
135 <div class="ljz-name name"> 135 <div class="ljz-name name">
136 {{ ljzs.ljzmc }} 136 <p>
137 {{ ljzs.ljzmc }}
138 </p>
137 </div> 139 </div>
138 </div> 140 </div>
139 </div> 141 </div>
...@@ -177,7 +179,7 @@ ...@@ -177,7 +179,7 @@
177 ref="hBsm" 179 ref="hBsm"
178 :key="hsIndex" 180 :key="hsIndex"
179 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''" 181 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
180 @click="handleTdClick($event, hs.bsm)" 182 @click="handleTdClick($event, hs.bsm,hs)"
181 @dblclick="dbclick(hs.bsm)" 183 @dblclick="dbclick(hs.bsm)"
182 @contextmenu.prevent="openMenu($event, hs, 'h')" 184 @contextmenu.prevent="openMenu($event, hs, 'h')"
183 > 185 >
...@@ -222,7 +224,7 @@ ...@@ -222,7 +224,7 @@
222 ref="hBsm" 224 ref="hBsm"
223 :key="hsIndex" 225 :key="hsIndex"
224 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''" 226 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
225 @click="handleTdClick($event, hs.bsm)" 227 @click="handleTdClick($event, hs.bsm,hs)"
226 @dblclick="dbclick(hs.bsm)" 228 @dblclick="dbclick(hs.bsm)"
227 @contextmenu.prevent="openMenu($event, hs, 'h')" 229 @contextmenu.prevent="openMenu($event, hs, 'h')"
228 > 230 >
...@@ -257,13 +259,16 @@ ...@@ -257,13 +259,16 @@
257 向下添加层 259 向下添加层
258 </li> 260 </li>
259 <li v-show="rightClickFlag == 'c'" @click="handleDeleteC">删除层</li> 261 <li v-show="rightClickFlag == 'c'" @click="handleDeleteC">删除层</li>
262 <!-- 合并 -->
263 <li v-show="rightClickFlag == 'hb'" :class="canHb!='zyhb'? 'cantHb':''" @click="handleHb('zyhb')">左右合并</li>
264 <li v-show="rightClickFlag == 'hb'" :class="canHb!='sxhb'? 'cantHb':''" @click="handleHb('sxhb')">上下合并</li>
265
260 </ul> 266 </ul>
261 <!-- 层操作弹框 --> 267 <!-- 层操作弹框 -->
262 <el-dialog 268 <el-dialog
263 :title="addCData.title" 269 :title="addCData.title"
264 :visible.sync="addCVisible" 270 :visible.sync="addCVisible"
265 width="50%" 271 width="50%"
266 center
267 > 272 >
268 <el-form :model="addCData"> 273 <el-form :model="addCData">
269 <el-form-item label="层号" :label-width="formLabelWidth"> 274 <el-form-item label="层号" :label-width="formLabelWidth">
...@@ -300,11 +305,22 @@ ...@@ -300,11 +305,22 @@
300 </template> 305 </template>
301 <script> 306 <script>
302 import moveH from "./../../../../../components/moveH/moveH"; 307 import moveH from "./../../../../../components/moveH/moveH";
303 import { getLpb, insertUpDownC, deleteCByBsm } from "../../../../../api/lpb"; 308 import { getLpb, insertUpDownC, deleteCByBsm } from "@api/lpb";
309 import { hhb } from "@api/h";
310 import { Message } from 'element-ui';
304 export default { 311 export default {
305 name: "", 312 name: "",
306 components: { moveH }, 313 components: { moveH },
307 props: {}, 314 props: {
315 isHbfg:{
316 type:Boolean,
317 default:false
318 },
319 zrzbsm:{
320 type:String,
321 default:''
322 }
323 },
308 data() { 324 data() {
309 return { 325 return {
310 moveHvisible: false, 326 moveHvisible: false,
...@@ -345,13 +361,15 @@ export default { ...@@ -345,13 +361,15 @@ export default {
345 }, 361 },
346 formLabelWidth: "120px", 362 formLabelWidth: "120px",
347 yclpbData:{}, 363 yclpbData:{},
348 sclpbData:{} 364 sclpbData:{},
365 fghbChoosedList:[],
366 canHb:''//判断合并类型
349 }; 367 };
350 }, 368 },
351 created() {}, 369 created() {},
352 mounted() { 370 mounted() {
353 this.getLpb(this.$store.state.zrzbsm, "0"); 371 this.getLpb(this.zrzbsm, "0");
354 this.getLpb(this.$store.state.zrzbsm, "1"); 372 this.getLpb(this.zrzbsm, "1");
355 setTimeout(() => { 373 setTimeout(() => {
356 //tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight 374 //tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight
357 this.lpbContentWidth = this.$store.state.contentWidth - 34 - 20; 375 this.lpbContentWidth = this.$store.state.contentWidth - 34 - 20;
...@@ -490,7 +508,7 @@ export default { ...@@ -490,7 +508,7 @@ export default {
490 } 508 }
491 }, 509 },
492 //户单击事件 510 //户单击事件
493 handleTdClick(e, bsm) { 511 handleTdClick(e, bsm,hs) {
494 let self = this; 512 let self = this;
495 // 开启延时器，200ms的间隔区分单击和双击，解决双击时执行两次单击事件 513 // 开启延时器，200ms的间隔区分单击和双击，解决双击时执行两次单击事件
496 clearTimeout(self.time); 514 clearTimeout(self.time);
...@@ -499,20 +517,38 @@ export default { ...@@ -499,20 +517,38 @@ export default {
499 if (e.target.className.indexOf("tdSelect") == -1) { 517 if (e.target.className.indexOf("tdSelect") == -1) {
500 //未选中→选中 518 //未选中→选中
501 e.target.className = "tdSelect"; //加边框 519 e.target.className = "tdSelect"; //加边框
502 this.hbsmList.push(bsm); // 将户bsm放进hbsmList 520 if(this.isHbfg){
521 this.fghbChoosedList.push(hs);
522 this.hbsmList.push(bsm); // 将户bsm放进hbsmList
523 }else{
524 this.hbsmList.push(bsm); // 将户bsm放进hbsmList
525 }
503 } else { 526 } else {
504 //选中→未选中 527 //选中→未选中
505 e.target.className = ""; 528 e.target.className = "";
506 this.deleteArrOption(this.hbsmList, bsm); 529 if(this.isHbfg){
530 this.deleteArrOption(this.fghbChoosedList, hs)
531 this.deleteArrOption(this.hbsmList, bsm);
532 }else{
533 this.deleteArrOption(this.hbsmList, bsm);
534 }
535 }
536 if(this.isHbfg){
537
538 }else{
539 this.$parent.getHbsm(this.hbsmList, false);
507 } 540 }
508 this.$parent.getHbsm(this.hbsmList, false);
509 }, 200); 541 }, 200);
510 }, 542 },
511 //户双击事件 543 //户双击事件
512 dbclick(bsm) { 544 dbclick(bsm) {
513 clearTimeout(this.time); 545 clearTimeout(this.time);
514 // this.hbsmList.push(bsm); // 将户bsm放进hbsmList 546 if (this.isHbfg) {
515 this.$parent.getHbsm(bsm, true); 547
548 }else{
549 // this.hbsmList.push(bsm); // 将户bsm放进hbsmList
550 this.$parent.getHbsm(bsm, true);
551 }
516 }, 552 },
517 //删除多重数组中的某一项 553 //删除多重数组中的某一项
518 deleteArrOption(arr, item) { 554 deleteArrOption(arr, item) {
...@@ -537,26 +573,53 @@ export default { ...@@ -537,26 +573,53 @@ export default {
537 }, 573 },
538 //户右键点击事件 574 //户右键点击事件
539 openMenu(e, item, type) { 575 openMenu(e, item, type) {
540 console.log(e, "e");
541 this.lpbChLeft = e.pageX; 576 this.lpbChLeft = e.pageX;
542 this.lpbChTop = e.pageY; 577 this.lpbChTop = e.pageY;
543 this.chData = item; 578 if (this.isHbfg) {
544 this.rightClickFlag = type; 579 this.rightClickFlag = 'hb';
545 this.lpbChVisible = true; 580 if (this.fghbChoosedList.length>1) {
581 this.lpbChVisible = true;
582 //判断选中户可以执行的合并类型
583 let chIsSame = this.fghbChoosedList.every((item)=> {
584 return item.ch == this.fghbChoosedList[0].ch;
585 });
586 let hhIsSame = this.fghbChoosedList.every((item)=> {
587 return item.hh == this.fghbChoosedList[0].hh;
588 });
589 this.$nextTick(()=>{
590 if(chIsSame){
591 this.canHb = 'zyhb'
592 }else if(hhIsSame){
593 this.canHb = 'sxhb'
594 }else{
595 this.canHb = ''
596 }
597 })
598 }
599 }else{
600 console.log(e, "e");
601 this.chData = item;
602 this.rightClickFlag = type;
603 this.lpbChVisible = true;
604 }
546 }, 605 },
547 // 层选中事件 606 // 层选中事件
548 handleClickC(e, item) { 607 handleClickC(e, item) {
549 //判断点击的层是否选中 608 if (this.isHbfg) {
550 if (e.target.className.indexOf("tdSelect") == -1) { 609
551 //未选中→选中 610 }else{
552 e.target.className += " tdSelect"; //加边框 611 //判断点击的层是否选中
553 this.cbsmList.push(item.bsm); // 将户bsm放进hbsmList 612 if (e.target.className.indexOf("tdSelect") == -1) {
554 } else { 613 //未选中→选中
555 //选中→未选中 614 e.target.className += " tdSelect"; //加边框
556 e.target.className = "floor"; 615 this.cbsmList.push(item.bsm); // 将户bsm放进hbsmList
557 this.deleteArrOption(this.cbsmList, item.bsm); 616 } else {
617 //选中→未选中
618 e.target.className = "floor";
619 this.deleteArrOption(this.cbsmList, item.bsm);
620 }
621 this.$parent.getCbsm(this.cbsmList);
558 } 622 }
559 this.$parent.getCbsm(this.cbsmList);
560 }, 623 },
561 //关闭右键菜单 624 //关闭右键菜单
562 closeMenu() { 625 closeMenu() {
...@@ -639,6 +702,46 @@ export default { ...@@ -639,6 +702,46 @@ export default {
639 qsztClick(){ 702 qsztClick(){
640 703
641 }, 704 },
705 //户合并
706 handleHb(type){
707 let olbBsms = '';
708 this.hbsmList.forEach((item,index)=>{
709 olbBsms+= index<this.hbsmList.length-1? item+',':item
710 })
711 if (type == this.canHb) {
712 this.$confirm("是否确认合并选中户?", "提示", {
713 confirmButtonText: "确定",
714 cancelButtonText: "取消",
715 type: "warning",
716 })
717 .then(() => {
718 //确定合并 调用合并接口 this.hbsmList为选中户bsm数组 TO DO
719 let params = {
720 "newuserbsm": "",
721 "oldBsms": olbBsms,
722 "scyclx": this.$parent.scyclx,
723 "ljzbsm": this.fghbChoosedList[0].ljzbsm,
724 "zdybsm": this.fghbChoosedList[0].zdybsm,
725 "zrzbsm": this.fghbChoosedList[0].zrzbsm
726 }
727 // console.log(params,'params');
728 hhb(params).then((res) => {
729 if(res.code == 200){
730 Message.success('合并成功');
731 // 清除选中户
732 this.clearChoosedH();
733 this.fghbChoosedList = [];
734 // 更新楼盘表
735 this.getLpb(this.zrzbsm, this.$parent.scyclx);
736 }
737 })
738 .catch(() => {});
739 })
740 .catch(() => {});
741 }else{
742
743 }
744 }
642 }, 745 },
643 computed: { 746 computed: {
644 createFlagChange() { 747 createFlagChange() {
...@@ -688,12 +791,8 @@ export default { ...@@ -688,12 +791,8 @@ export default {
688 //父组件中选择单元状态改变选中户的边框颜色 791 //父组件中选择单元状态改变选中户的边框颜色
689 choosedList(n) { 792 choosedList(n) {
690 this.$refs.hBsm.forEach((item) => { 793 this.$refs.hBsm.forEach((item) => {
691 // console.log(item.dataset.bsm,'item.dataset.bsm');
692 // console.log(this.choosedList,'this.choosedList');
693 this.choosedList.forEach((i) => { 794 this.choosedList.forEach((i) => {
694 if (item.dataset.bsm == i) { 795 if (item.dataset.bsm == i) {
695 // console.log(item.style.border,'item.style.border');
696 // console.log(this.borderColor,'this.borderColor');
697 item.style.border = '1px solid '+this.borderColor; 796 item.style.border = '1px solid '+this.borderColor;
698 } 797 }
699 }); 798 });
...@@ -742,7 +841,8 @@ export default { ...@@ -742,7 +841,8 @@ export default {
742 bottom: 0; 841 bottom: 0;
743 position: absolute; 842 position: absolute;
744 height: 40px; 843 height: 40px;
745 background-color: rosybrown; 844 // background-color: rosybrown;
845 border:1px solid #E6E6E6
746 } 846 }
747 // .chTable-wrap{ 847 // .chTable-wrap{
748 // position: absolute; 848 // position: absolute;
...@@ -766,7 +866,12 @@ export default { ...@@ -766,7 +866,12 @@ export default {
766 .ljz-name { 866 .ljz-name {
767 width: calc(100% - 32px); 867 width: calc(100% - 32px);
768 height: 40px; 868 height: 40px;
769 background-color: darkorange; 869 // background-color: darkorange;
870 p{
871 width: 100%;
872 height: 100%;
873 border:1px solid #E6E6E6
874 }
770 } 875 }
771 } 876 }
772 div:last-child { 877 div:last-child {
...@@ -792,7 +897,8 @@ export default { ...@@ -792,7 +897,8 @@ export default {
792 display: inline-table; 897 display: inline-table;
793 .zdy-name { 898 .zdy-name {
794 bottom: 0; 899 bottom: 0;
795 background-color: blanchedalmond; 900 // background-color: blanchedalmond;
901 border:1px solid #E6E6E6
796 } 902 }
797 } 903 }
798 .zdy-zdy:last-child { 904 .zdy-zdy:last-child {
...@@ -802,7 +908,8 @@ export default { ...@@ -802,7 +908,8 @@ export default {
802 .zdy-name { 908 .zdy-name {
803 width: calc; 909 width: calc;
804 height: 40px; 910 height: 40px;
805 background-color: rosybrown; 911 // background-color: rosybrown;
912 border:1px solid #E6E6E6
806 } 913 }
807 } 914 }
808 .column-reverse { 915 .column-reverse {
...@@ -877,13 +984,17 @@ export default { ...@@ -877,13 +984,17 @@ export default {
877 .zrz { 984 .zrz {
878 height: 60px; 985 height: 60px;
879 line-height: 60px; 986 line-height: 60px;
880 background-color: darkgoldenrod; 987 background-color: #ffffff;
988 border:1px solid #E6E6E6;
881 position: relative; 989 position: relative;
882 bottom: 66px; 990 bottom: 66px;
883 text-align: center; 991 text-align: center;
884 transition: 0.5s; 992 transition: 0.5s;
885 } 993 }
886 994 .cantHb{
995 opacity: .5;
996 cursor: not-allowed;
997 }
887 .btnGroup { 998 .btnGroup {
888 margin: 20px auto 0; 999 margin: 20px auto 0;
889 width: 150px; 1000 width: 150px;
......
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 },
......
...@@ -690,7 +690,7 @@ ...@@ -690,7 +690,7 @@
690 } 690 }
691 //权利性质数据传给子组件 691 //权利性质数据传给子组件
692 this.$refs.qlxzModule.countList = res.result.qjQlxzListVOS 692 this.$refs.qlxzModule.countList = res.result.qjQlxzListVOS
693 693
694 } 694 }
695 } 695 }
696 }) 696 })
...@@ -763,7 +763,7 @@ ...@@ -763,7 +763,7 @@
763 }) 763 })
764 }, 764 },
765 deep:true 765 deep:true
766 }, 766 },
767 "form.fwjgList": { 767 "form.fwjgList": {
768 handler : function (newVal, oldVal) { 768 handler : function (newVal, oldVal) {
769 newVal.forEach((item,ind)=>{ 769 newVal.forEach((item,ind)=>{
...@@ -774,6 +774,17 @@ ...@@ -774,6 +774,17 @@
774 }, 774 },
775 deep:true 775 deep:true
776 }, 776 },
777 "$store.state.sxdrType": {
778 handler(n) {
779 this.$nextTick(()=>{
780 if (n === 'zrz') {
781 this.getZrzDetailByBsm(this.$route.query.bsm)
782 }
783 })
784 },
785 immediate: false,
786 deep: true,
787 }
777 } 788 }
778 } 789 }
779 </script> 790 </script>
......