Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
9c222fd6 by 任超
Options

style:楼盘表

1 parent 83f1fbe2
Expand all
Inline Side-by-side
Showing 21 changed files with 124 additions and 83 deletions
...@@ -13,10 +13,9 @@ export function getLpZrz (data) { ...@@ -13,10 +13,9 @@ export function getLpZrz (data) {
13 } 13 }
14 14
15 // 获取楼盘表 15 // 获取楼盘表
16 export function getLpb (params) { 16 export function getLpb (zrzbsm) {
17 return request({ 17 return request({
18 url: SERVER.SERVERAPI + '/rest/zhcx/lpcx/getLpb/', 18 url: SERVER.SERVERAPI + '/rest/zhcx/lpcx/getLpb?zrzbsm=' + zrzbsm,
19 method: 'get', 19 method: 'get'
20 params
21 }) 20 })
22 } 21 }
......
...@@ -65,8 +65,8 @@ ...@@ -65,8 +65,8 @@
65 <el-table-column prop="dh" label="联系电话" align="center"> 65 <el-table-column prop="dh" label="联系电话" align="center">
66 </el-table-column> 66 </el-table-column>
67 </el-table> 67 </el-table>
68 <el-dialog v-dialogDrag :close-on-click-modal="false" title="权利人信息" :visible.sync="dialogVisible" 68 <el-dialog :close-on-click-modal="false" title="权利人信息" :visible.sync="dialogVisible" custom-class="insetDialog"
69 custom-class="insetDialog" append-to-body width="50%"> 69 append-to-body width="50%">
70 <el-form :model="formData" class="qlrForm"> 70 <el-form :model="formData" class="qlrForm">
71 <table class="zdjbxxTable" cellspacing="0" cellpadding="0" border="1"> 71 <table class="zdjbxxTable" cellspacing="0" cellpadding="0" border="1">
72 <tr> 72 <tr>
......
1 <template> 1 <template>
2 <el-dialog v-dialogDrag :close-on-click-modal="false" title="户重新落宗" :visible.sync="isVisible" width="50%" 2 <el-dialog :close-on-click-modal="false" title="户重新落宗" :visible.sync="isVisible" width="50%" @close="close"
3 @close="close" :modal-append-to-body="false"> 3 :modal-append-to-body="false">
4 <div class="content"> 4 <div class="content">
5 <table> 5 <table>
6 <tr> 6 <tr>
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
59 import { Message } from 'element-ui' 59 import { Message } from 'element-ui'
60 export default { 60 export default {
61 name: "hCxlz", 61 name: "hCxlz",
62 components: { zdQueryData }, 62 // components: { zdQueryData },
63 data () { 63 data () {
64 return { 64 return {
65 zd: {}, 65 zd: {},
......
1 <template> 1 <template>
2 <div> 2 <div>
3 <el-dialog v-dialogDrag :close-on-click-modal="false" title="移动户" :visible.sync="isVisible" width="50%" 3 <el-dialog :close-on-click-modal="false" title="移动户" :visible.sync="isVisible" width="50%" @close="close"
4 @close="close" :modal-append-to-body="false"> 4 :modal-append-to-body="false">
5 <div> 5 <div>
6 <div class="bottom-radio"> 6 <div class="bottom-radio">
7 <el-radio-group v-model="moveHdata.sxzylx"> 7 <el-radio-group v-model="moveHdata.sxzylx">
......
1 <template> 1 <template>
2 <div> 2 <div>
3 <el-dialog v-dialogDrag :close-on-click-modal="false" title="批量层" :visible.sync="isVisible" width="50%" 3 <el-dialog :close-on-click-modal="false" title="批量层" :visible.sync="isVisible" width="50%" @close="close"
4 @close="close" :modal-append-to-body="false"> 4 :modal-append-to-body="false">
5 <div> 5 <div>
6 <table border="1"> 6 <table border="1">
7 <tr> 7 <tr>
......
1 <template> 1 <template>
2 <div> 2 <div>
3 <el-dialog v-dialogDrag :close-on-click-modal="false" title="批量户" :visible.sync="isVisible" width="72%" 3 <el-dialog :close-on-click-modal="false" title="批量户" :visible.sync="isVisible" width="72%" @close="close"
4 @close="close" :modal-append-to-body="false"> 4 :modal-append-to-body="false">
5 <div> 5 <div>
6 <table border="1"> 6 <table border="1">
7 <tr> 7 <tr>
......
1 <template> 1 <template>
2 <div class=""> 2 <div class="">
3 <el-dialog v-dialogDrag :close-on-click-modal="false" title="批量室号" :visible.sync="isVisible" width="50%" 3 <el-dialog :close-on-click-modal="false" title="批量室号" :visible.sync="isVisible" width="50%" @close="close"
4 @close="close" :modal-append-to-body="false"> 4 :modal-append-to-body="false">
5 <div> 5 <div>
6 <table border="1"> 6 <table border="1">
7 <tr> 7 <tr>
......
1 <template> 1 <template>
2 <div> 2 <div>
3 <el-dialog v-dialogDrag :close-on-click-modal="false" title="批量坐落" :visible.sync="isVisible" width="60%" 3 <el-dialog :close-on-click-modal="false" title="批量坐落" :visible.sync="isVisible" width="60%" @close="close"
4 @close="close" :modal-append-to-body="false"> 4 :modal-append-to-body="false">
5 <div> 5 <div>
6 <table border="1"> 6 <table border="1">
7 <tr> 7 <tr>
......
...@@ -18,11 +18,17 @@ router.beforeEach(async (to, from, next) => { ...@@ -18,11 +18,17 @@ router.beforeEach(async (to, from, next) => {
18 } 18 }
19 if (hasAddRoute) { 19 if (hasAddRoute) {
20 next() 20 next()
21 // next({ ...to, replace: true })
21 } else { 22 } else {
22 const { result: getMenuData } = await getMenuInfo() 23 const { result: getMenuData } = await getMenuInfo()
23 const accessRoutes = await store.dispatch('permission/generateRoutes', getMenuData) 24 const accessRoutes = await store.dispatch('permission/generateRoutes', getMenuData)
24 router.addRoutes([...accessRoutes, { path: '*', redirect: '/404', hidden: true }]) 25 router.addRoutes([...accessRoutes, { path: '*', redirect: '/404', hidden: true }])
25 next({ ...to, replace: true }) 26 const routeTo = Cookies.get('routerTo')
27 if (routeTo) {
28 next(routeTo)
29 } else {
30 next('/home')
31 }
26 } 32 }
27 NProgress.done() 33 NProgress.done()
28 34
......
...@@ -21,13 +21,13 @@ export const constantRoutes = [ ...@@ -21,13 +21,13 @@ export const constantRoutes = [
21 ] 21 ]
22 }, 22 },
23 { 23 {
24 path: '/', 24 path: '/404',
25 component: Layout, 25 component: Layout,
26 hidden: true, 26 hidden: true,
27 redirect: '/404', 27 redirect: '/404/index',
28 children: [ 28 children: [
29 { 29 {
30 path: '404', 30 path: '/index',
31 component: () => import('@/views/error-page/404'), 31 component: () => import('@/views/error-page/404'),
32 name: '404', 32 name: '404',
33 meta: { title: '404' } 33 meta: { title: '404' }
......
1 const state = {
2 contentWidth: ''
3 }
4
5 const mutations = {
6
7 }
8
9 const actions = {
10 }
11
12 export default {
13 namespaced: true,
14 state,
15 mutations,
16 actions
17 }
1 import store from '../index' 1 import store from '../index'
2 import router, { resetRouter } from '@/router' 2 import router, { resetRouter } from '@/router'
3 import { Message } from "element-ui";
4 import Cookies from 'js-cookie'; 3 import Cookies from 'js-cookie';
5 const state = { 4 const state = {
6 name: Cookies.get('username'), 5 name: Cookies.get('username'),
......
...@@ -21,7 +21,9 @@ import hbj from "../index" ...@@ -21,7 +21,9 @@ import hbj from "../index"
21 export default { 21 export default {
22 name: "index", 22 name: "index",
23 components: { 23 components: {
24 hbj, djb, fjcl 24 hbj,
25 // djb,
26 // fjcl
25 }, 27 },
26 props: { 28 props: {
27 bsm: String, //户标识码 29 bsm: String, //户标识码
......
...@@ -47,8 +47,7 @@ ...@@ -47,8 +47,7 @@
47 <i class="iconfont iconloupanbiaobianji" v-show="!bjztFlag" @click="bjztChange" title="编辑楼盘"></i> 47 <i class="iconfont iconloupanbiaobianji" v-show="!bjztFlag" @click="bjztChange" title="编辑楼盘"></i>
48 </div> 48 </div>
49 </div> --> 49 </div> -->
50 <div class="tab-content" ref="tabContent" :style="{ height: lpbContentHight + 'px' }" v-loading="lpbloading" 50 <div class="tab-content" ref="tabContent" :style="{ height: lpbContentHight + 'px' }" v-show="bjztFlag">
51 v-show="bjztFlag">
52 <!-- 左侧树结构 --> 51 <!-- 左侧树结构 -->
53 <!-- <div class="lp-tree" :class="createFlag ? 'w260' : 'w0'"> 52 <!-- <div class="lp-tree" :class="createFlag ? 'w260' : 'w0'">
54 <LineTree :pd="pd" class="treeData" :islpb="islpb" @loading="loading"></LineTree> 53 <LineTree :pd="pd" class="treeData" :islpb="islpb" @loading="loading"></LineTree>
...@@ -58,7 +57,7 @@ ...@@ -58,7 +57,7 @@
58 </div> --> 57 </div> -->
59 <!-- 楼盘表主体 --> 58 <!-- 楼盘表主体 -->
60 <div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }"> 59 <div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }">
61 <lpbContent ref="lpbContent" :zrzbsm="$route.query.bsm" :key="time"></lpbContent> 60 <lpbContent ref="lpbContent" :zrzbsm="formData.bsm" :key="time"></lpbContent>
62 </div> 61 </div>
63 <!-- 右侧图例 --> 62 <!-- 右侧图例 -->
64 <div class="lp-legend"> 63 <div class="lp-legend">
...@@ -158,7 +157,7 @@ ...@@ -158,7 +157,7 @@
158 <!-- 详细信息 --> 157 <!-- 详细信息 -->
159 <!-- <xxxx v-show="!bjztFlag"></xxxx> --> 158 <!-- <xxxx v-show="!bjztFlag"></xxxx> -->
160 <!-- 右键菜单弹出框 根据菜单类型（menuType）和右键点击的楼盘类型（treeData.type）来区分弹框内容 --> 159 <!-- 右键菜单弹出框 根据菜单类型（menuType）和右键点击的楼盘类型（treeData.type）来区分弹框内容 -->
161 <!-- <el-dialog v-dialogDrag :close-on-click-modal="false" :title="taskTitle" :visible.sync="dialogVisible" width="50%"> 160 <!-- <el-dialog :close-on-click-modal="false" :title="taskTitle" :visible.sync="dialogVisible" width="50%">
162 <div class="addCh" v-if="menuType == 'ljz'"> 161 <div class="addCh" v-if="menuType == 'ljz'">
163 <addLjz ref="ljz" :ljzbsm="curBsm"></addLjz> 162 <addLjz ref="ljz" :ljzbsm="curBsm"></addLjz>
164 </div> 163 </div>
...@@ -182,7 +181,7 @@ ...@@ -182,7 +181,7 @@
182 <pl-zl :pl-zl-visible="plzlVisible" :bsms="bsms" @close="plZlClose" @lodding="lodding"></pl-zl> 181 <pl-zl :pl-zl-visible="plzlVisible" :bsms="bsms" @close="plZlClose" @lodding="lodding"></pl-zl>
183 <pl-c :plc-visible="plcVisible" :bsms="cbsmList" @close="plcClose" @lodding="lodding"></pl-c> 182 <pl-c :plc-visible="plcVisible" :bsms="cbsmList" @close="plcClose" @lodding="lodding"></pl-c>
184 <pl-sh :plShVisible="plShVisible" :bsms="bsms" @close="plshClose" @lodding="lodding"></pl-sh> 183 <pl-sh :plShVisible="plShVisible" :bsms="bsms" @close="plshClose" @lodding="lodding"></pl-sh>
185 <el-dialog v-dialogDrag :close-on-click-modal="false" title="批量上传" :visible.sync="uploadVisible" width="30%"> 184 <el-dialog :close-on-click-modal="false" title="批量上传" :visible.sync="uploadVisible" width="30%">
186 <div class="wrap"> 185 <div class="wrap">
187 <div class="main-button"> 186 <div class="main-button">
188 <el-upload class="upload-demo" action="/api/file/uploadListByGlbsm" :data="fileData" 187 <el-upload class="upload-demo" action="/api/file/uploadListByGlbsm" :data="fileData"
...@@ -217,7 +216,13 @@ import lpbContent from "./lpbContent/index"; ...@@ -217,7 +216,13 @@ import lpbContent from "./lpbContent/index";
217 // import xxxx from '../xxxx/index' 216 // import xxxx from '../xxxx/index'
218 217
219 export default { 218 export default {
220 name: "", 219 name: "bjlp",
220 props: {
221 formData: {
222 type: Object,
223 default: {}
224 }
225 },
221 components: { 226 components: {
222 // LineTree, 227 // LineTree,
223 addLjz, 228 addLjz,
...@@ -315,7 +320,6 @@ export default { ...@@ -315,7 +320,6 @@ export default {
315 time: "", 320 time: "",
316 dyztBsmList: {}, //单元状态bsmList 321 dyztBsmList: {}, //单元状态bsmList
317 cbsmList: [], // 层bsmlist 322 cbsmList: [], // 层bsmlist
318 lpbloading: true,
319 bjztFlag: true, 323 bjztFlag: true,
320 taskTitle: '添加', 324 taskTitle: '添加',
321 curBsm: '', 325 curBsm: '',
...@@ -329,18 +333,18 @@ export default { ...@@ -329,18 +333,18 @@ export default {
329 }, 333 },
330 created () { 334 created () {
331 window.addEventListener("resize", this.getHeight); 335 window.addEventListener("resize", this.getHeight);
332 // this.getHeight(); 336 this.getHeight();
333 }, 337 },
334 mounted () { 338 mounted () {
335 //获取楼盘表树结构 339 //获取楼盘表树结构
336 // this.getLpbMenuTree(this.$store.state.zrzbsm); 340 // this.getLpbMenuTree(formData.zrzbsm);
337 //获取各项单元状态的户bsm 341 //获取各项单元状态的户bsm
338 // this.getDyztBsmList(); 342 // this.getDyztBsmList();
339 //获取房屋用途统计数据 343 //获取房屋用途统计数据
340 // this.getLpbFwytAndQlxz(); 344 // this.getLpbFwytAndQlxz();
341 // 楼盘表绘制区域宽度计算：楼盘表区域宽度-图例宽度34-滚动条宽度6 345 // 楼盘表绘制区域宽度计算：楼盘表区域宽度-图例宽度34-滚动条宽度6
342 setTimeout(() => { 346 setTimeout(() => {
343 this.lpbContentwidth = this.$store.state.contentWidth - 34 - 6; 347 this.lpbContentwidth = ((document.documentElement.clientWidth || document.body.clientWidth) - 340) - 34 - 6;
344 }, 100); 348 }, 100);
345 }, 349 },
346 methods: { 350 methods: {
...@@ -429,7 +433,6 @@ export default { ...@@ -429,7 +433,6 @@ export default {
429 console.log(file); 433 console.log(file);
430 }, 434 },
431 handleExceed (files, fileList) { 435 handleExceed (files, fileList) {
432 console.log(fileList)
433 // this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`); 436 // this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
434 this.$message.warning("上传失败") 437 this.$message.warning("上传失败")
435 }, 438 },
...@@ -524,7 +527,7 @@ export default { ...@@ -524,7 +527,7 @@ export default {
524 }, 527 },
525 //获取高度计算lpb内容区高度 528 //获取高度计算lpb内容区高度
526 getHeight () { 529 getHeight () {
527 this.lpbContentHight = window.innerHeight - 285; 530 this.lpbContentHight = window.innerHeight - 190;
528 }, 531 },
529 //创建楼盘 532 //创建楼盘
530 create () { 533 create () {
......
...@@ -7,18 +7,18 @@ ...@@ -7,18 +7,18 @@
7 : 'ljz-wrap' 7 : 'ljz-wrap'
8 " :style="{ 'width': ljzWidth + 'px' }" v-show="lpbData.ljzs.length > 0"> 8 " :style="{ 'width': ljzWidth + 'px' }" v-show="lpbData.ljzs.length > 0">
9 <!-- 循环逻辑幢数据 --> 9 <!-- 循环逻辑幢数据 -->
10 <div class="ljz" ref="ljz" v-for="(ljzs, ljzIndex) in lpbData.ljzs" :key="ljzIndex" 10 <div class="ljz" ref="ljz" v-for="(ljzs, ljzIndex) in lpbData.ljzs" :key="ljzIndex">
11 :class="[{ 'mt30': ljzIndex == 0 }, { 'mt60': ljzIndex == 1 || lpbData.ljzs.length == 1 }]"> 11 <!-- :class="[{ 'mt30': ljzIndex == 0 }, { 'mt60': ljzIndex == 1 || lpbData.ljzs.length == 1 }]" -->
12
12 <!-- :style="{'marginTop':ljzs.zdys.length>0?'0':'30px'}" --> 13 <!-- :style="{'marginTop':ljzs.zdys.length>0?'0':'30px'}" -->
13 <!-- 循环逻辑幢下的幢单元 --> 14 <!-- 循环逻辑幢下的幢单元 -->
14 <div class="ljz-zdy-wrap"> 15 <div class="ljz-zdy-wrap" :style="{ 'marginTop': ljzs.zdys.length > 0 ? '0' : '30px' }">
15 <div class="ljz-zdy column-reverse" 16 <div class="ljz-zdy column-reverse"
16 :style="{ 'min-height': ljzzdyHeight + 'px', 'marginRight': zdyIndex < (ljzs.zdys.length - 1) || ljzs.cs.length > 1 ? '20px' : '0' }" 17 :style="{ 'min-height': ljzzdyHeight + 'px', 'marginRight': zdyIndex < (ljzs.zdys.length - 1) || ljzs.cs.length > 1 ? '20px' : '0' }"
17 ref="ljzzdy" v-show="ljzs.zdys.length > 0" v-for="(zdys, zdyIndex) in ljzs.zdys" :key="zdyIndex"> 18 ref="ljzzdy" v-show="ljzs.zdys.length > 0" v-for="(zdys, zdyIndex) in ljzs.zdys" :key="zdyIndex">
18 <!-- 幢单元名称 --> 19 <!-- 幢单元名称 -->
19 <div class="zdy-name name"> 20 <div class="zdy-name name">
20 <p class="cp" @dblclick="openZxx(zdys.bsm, 'zdy')"> 21 <p class="cp" @dblclick="openZxx(zdys.bsm, 'zdy')">
21 <!-- {{ zdys.zdymc }} -->
22 <el-checkbox @change='zdySelectAll($event, zdys.cs)'>{{ zdys.zdymc }}</el-checkbox> 22 <el-checkbox @change='zdySelectAll($event, zdys.cs)'>{{ zdys.zdymc }}</el-checkbox>
23 </p> 23 </p>
24 </div> 24 </div>
...@@ -94,8 +94,6 @@ ...@@ -94,8 +94,6 @@
94 </tr> 94 </tr>
95 </table> 95 </table>
96 </div> 96 </div>
97 <!-- </div> -->
98
99 <!-- 逻辑幢名称 --> 97 <!-- 逻辑幢名称 -->
100 <div class="ljz-name name"> 98 <div class="ljz-name name">
101 <p class="cp" @dblclick="openZxx(ljzs.bsm, 'ljz')"> 99 <p class="cp" @dblclick="openZxx(ljzs.bsm, 'ljz')">
...@@ -178,9 +176,8 @@ ...@@ -178,9 +176,8 @@
178 </tr> 176 </tr>
179 </table> 177 </table>
180 </div> 178 </div>
181 <!-- </template> -->
182 </div> 179 </div>
183 <!-- <div class="ch-wrap">层户</div> --> 180 <!-- 层户 -->
184 <div class="zrz" :style="{ width: lpbContentWidth + 'px' }"> 181 <div class="zrz" :style="{ width: lpbContentWidth + 'px' }">
185 <el-checkbox v-model="zrzChecked" @change='lpbSelectAll'>{{ lpbData.xmmc }}</el-checkbox> 182 <el-checkbox v-model="zrzChecked" @change='lpbSelectAll'>{{ lpbData.xmmc }}</el-checkbox>
186 </div> 183 </div>
...@@ -188,7 +185,6 @@ ...@@ -188,7 +185,6 @@
188 <ul v-show="lpbChVisible" :style="{ left: lpbChLeft + 'px', top: lpbChTop + 'px' }" class="contextmenu"> 185 <ul v-show="lpbChVisible" :style="{ left: lpbChLeft + 'px', top: lpbChTop + 'px' }" class="contextmenu">
189 <li v-show="rightClickFlag == 'h'" @click="handleAddH">添加</li> 186 <li v-show="rightClickFlag == 'h'" @click="handleAddH">添加</li>
190 <li v-show="rightClickFlag == 'h'" @click="handleMoveH">移动</li> 187 <li v-show="rightClickFlag == 'h'" @click="handleMoveH">移动</li>
191 <!-- <li v-show="rightClickFlag == 'h'" @click="handleDeleteH">删除</li> -->
192 <li v-show="rightClickFlag == 'h'" @click="handleSyczh">实预测转换</li> 188 <li v-show="rightClickFlag == 'h'" @click="handleSyczh">实预测转换</li>
193 <li v-show="rightClickFlag == 'c'" @click="handleAddC('up')"> 189 <li v-show="rightClickFlag == 'c'" @click="handleAddC('up')">
194 向上添加层 190 向上添加层
...@@ -210,8 +206,7 @@ ...@@ -210,8 +206,7 @@
210 206
211 </ul> 207 </ul>
212 <!-- 层操作弹框 --> 208 <!-- 层操作弹框 -->
213 <el-dialog v-dialogDrag :close-on-click-modal="false" :title="addCData.title" :visible.sync="addCVisible" 209 <el-dialog :close-on-click-modal="false" :title="addCData.title" :visible.sync="addCVisible" width="50%">
214 width="50%">
215 <el-form :model="addCData"> 210 <el-form :model="addCData">
216 <el-form-item label="层号" :label-width="formLabelWidth"> 211 <el-form-item label="层号" :label-width="formLabelWidth">
217 <el-input disabled v-model="addCData.sjc" autocomplete="off"></el-input> 212 <el-input disabled v-model="addCData.sjc" autocomplete="off"></el-input>
...@@ -229,7 +224,7 @@ ...@@ -229,7 +224,7 @@
229 </div> 224 </div>
230 </el-dialog> 225 </el-dialog>
231 <!-- 户分割弹框 --> 226 <!-- 户分割弹框 -->
232 <el-dialog v-dialogDrag :close-on-click-modal="false" title="户分割" :visible.sync="hfgDialogVisible" width="800px"> 227 <el-dialog :close-on-click-modal="false" title="户分割" :visible.sync="hfgDialogVisible" width="800px">
233 <el-form :model="fgData"> 228 <el-form :model="fgData">
234 <el-form-item label="分割户数" required="" :label-width="formLabelWidth"> 229 <el-form-item label="分割户数" required="" :label-width="formLabelWidth">
235 <el-input :disabled="fgData.fgfx != 0" v-model="fgData.fghs" autocomplete="off"></el-input> 230 <el-input :disabled="fgData.fgfx != 0" v-model="fgData.fghs" autocomplete="off"></el-input>
...@@ -243,8 +238,7 @@ ...@@ -243,8 +238,7 @@
243 <move-h :hbsm="chData.bsm" @close="moveHClose" :move-hvisible="moveHvisible" :type="scyclx" 238 <move-h :hbsm="chData.bsm" @close="moveHClose" :move-hvisible="moveHvisible" :type="scyclx"
244 @loading="loadingData($store.state.zrzbsm, $parent.scyclx)"></move-h> 239 @loading="loadingData($store.state.zrzbsm, $parent.scyclx)"></move-h>
245 <!-- 双击户的弹出框 --> 240 <!-- 双击户的弹出框 -->
246 <el-dialog v-dialogDrag :close-on-click-modal="false" title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" 241 <el-dialog :close-on-click-modal="false" title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="80%">
247 width="80%">
248 <hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx" :lpbParent="lpbParent"></hbj> 242 <hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx" :lpbParent="lpbParent"></hbj>
249 </el-dialog> 243 </el-dialog>
250 <!-- 户重新落宗 --> 244 <!-- 户重新落宗 -->
...@@ -254,6 +248,7 @@ ...@@ -254,6 +248,7 @@
254 <script> 248 <script>
255 import moveH from "@/components/moveH/moveH"; 249 import moveH from "@/components/moveH/moveH";
256 import HCxlz from "@/components/hCxlz/hCxlz"; 250 import HCxlz from "@/components/hCxlz/hCxlz";
251 import { getLpb } from '@/api/lpb'
257 // import { getLpb, insertUpDownC, deleteCByBsm } from "@api/lpb"; 252 // import { getLpb, insertUpDownC, deleteCByBsm } from "@api/lpb";
258 // import { hhb, hfg } from "@api/h"; 253 // import { hhb, hfg } from "@api/h";
259 import { Message } from 'element-ui'; 254 import { Message } from 'element-ui';
...@@ -332,10 +327,9 @@ export default { ...@@ -332,10 +327,9 @@ export default {
332 zrzChecked: false, //自然幢全选 327 zrzChecked: false, //自然幢全选
333 }; 328 };
334 }, 329 },
335 created () { },
336 mounted () { 330 mounted () {
337 // this.getLpb(this.zrzbsm, "0"); 331 this.getLpb('9434bdb243ba342cc6c043065fc9e480');
338 // this.getLpb(this.zrzbsm, "1"); 332 // this.getLpb(this.zrzbsm);
339 setTimeout(() => { 333 setTimeout(() => {
340 //让滚动条滚动至最下面 -6是横向滚动条的高度 334 //让滚动条滚动至最下面 -6是横向滚动条的高度
341 this.$refs.lpbContent.scrollTop = 335 this.$refs.lpbContent.scrollTop =
...@@ -353,24 +347,23 @@ export default { ...@@ -353,24 +347,23 @@ export default {
353 getLpb (zrzbsm, scyclx, actual) { 347 getLpb (zrzbsm, scyclx, actual) {
354 getLpb(zrzbsm, scyclx).then((res) => { 348 getLpb(zrzbsm, scyclx).then((res) => {
355 if (res.code == 200) { 349 if (res.code == 200) {
356 this.$parent.lpbloading = false;
357 res.result.ljzs = res.result.ljzs 350 res.result.ljzs = res.result.ljzs
358 .sort(this.compare("place")) 351 .sort(this.compare("place"))
359 .reverse(); 352 .reverse();
360 // this.lpbData = res.result == null ? this.lpbData : res.result; 353 this.lpbData = res.result == null ? this.lpbData : res.result;
361 //给实预测楼盘表对象赋值，默认加载预测楼盘表数据 354 //给实预测楼盘表对象赋值，默认加载预测楼盘表数据
362 if (scyclx == 0) { 355 // if (scyclx == 0) {
363 this.yclpbData = res.result == null ? this.yclpbData : res.result; 356 // this.yclpbData = res.result == null ? this.yclpbData : res.result;
364 this.lpbData = this.yclpbData; 357 // this.lpbData = this.yclpbData;
365 } else { 358 // } else {
366 this.sclpbData = res.result == null ? this.sclpbData : res.result; 359 // this.sclpbData = res.result == null ? this.sclpbData : res.result;
367 } 360 // }
368 if (actual) { 361 // if (actual) {
369 this.lpbData = res.result == null ? this.yclpbData : res.result; 362 // this.lpbData = res.result == null ? this.yclpbData : res.result;
370 } 363 // }
371 if (this.lpbParent == 'isFwsxbg') { 364 // if (this.lpbParent == 'isFwsxbg') {
372 this.lpbData = this.$parent.scyclx == '0' ? this.yclpbData : this.sclpbData; 365 // this.lpbData = this.$parent.scyclx == '0' ? this.yclpbData : this.sclpbData;
373 } 366 // }
374 this.$nextTick(() => { 367 this.$nextTick(() => {
375 //渲染楼盘表 368 //渲染楼盘表
376 this.dataChange(); 369 this.dataChange();
...@@ -1028,11 +1021,9 @@ export default { ...@@ -1028,11 +1021,9 @@ export default {
1028 overflow: hidden; 1021 overflow: hidden;
1029 1022
1030 .ljz { 1023 .ljz {
1031 // margin-bottom: 20px;
1032 display: table; 1024 display: table;
1033 margin-top: 30px;
1034 1025
1035 // position: relative; 1026 // margin-top: 30px;
1036 .ljz-zdy-wrap { 1027 .ljz-zdy-wrap {
1037 width: auto; 1028 width: auto;
1038 display: table; 1029 display: table;
......
...@@ -113,7 +113,6 @@ export default { ...@@ -113,7 +113,6 @@ export default {
113 } 113 }
114 }, 114 },
115 handleTabClick () { 115 handleTabClick () {
116
117 this.pageData.currentPage = 1; 116 this.pageData.currentPage = 1;
118 this.fetchData(); 117 this.fetchData();
119 }, 118 },
...@@ -161,6 +160,17 @@ export default { ...@@ -161,6 +160,17 @@ export default {
161 }, 160 },
162 handleSelectionChange (val) { 161 handleSelectionChange (val) {
163 this.bdcdysz = val 162 this.bdcdysz = val
163 },
164 handleLpbClick (item) {
165 console.log(item, 'eeeeeeeeeeeeee');
166 this.$popup('楼盘表', 'components/bjlp/index', {
167 width: '85%',
168 formData: {
169 bsm: item.bsm
170 },
171 cancel: function () { }, //取消事件的回调
172 confirm: function () { }, //确认事件的回调
173 })
164 } 174 }
165 } 175 }
166 } 176 }
......
...@@ -73,7 +73,7 @@ class data extends filter { ...@@ -73,7 +73,7 @@ class data extends filter {
73 render: (h, scope) => { 73 render: (h, scope) => {
74 return ( 74 return (
75 <div> 75 <div>
76 {(scope.row.tdxzmc)+(' / ')+(scope.row.tdxzmc)} 76 {(scope.row.tdxzmc) + (' / ') + (scope.row.tdxzmc)}
77 </div> 77 </div>
78 ) 78 )
79 } 79 }
...@@ -83,7 +83,7 @@ class data extends filter { ...@@ -83,7 +83,7 @@ class data extends filter {
83 render: (h, scope) => { 83 render: (h, scope) => {
84 return ( 84 return (
85 <div> 85 <div>
86 {(scope.row.zdmj)+(' / ')+(scope.row.scjzmj)} 86 {(scope.row.zdmj) + (' / ') + (scope.row.scjzmj)}
87 </div> 87 </div>
88 ) 88 )
89 } 89 }
...@@ -106,6 +106,15 @@ class data extends filter { ...@@ -106,6 +106,15 @@ class data extends filter {
106 prop: "zl", 106 prop: "zl",
107 label: "自然幢坐落", 107 label: "自然幢坐落",
108 }, 108 },
109 {
110 label: '操作',
111 width: '80',
112 align: 'center',
113 fixed: 'right',
114 render: (h, scope) => {
115 return <el-button type="text" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表</el-button>
116 }
117 }
109 ] 118 ]
110 } 119 }
111 120
......
...@@ -130,6 +130,7 @@ export default { ...@@ -130,6 +130,7 @@ export default {
130 this.btnDisabled = false 130 this.btnDisabled = false
131 Cookies.set("bsmSqyw", item.bsmSqyw) 131 Cookies.set("bsmSqyw", item.bsmSqyw)
132 this.djywbm = item.djywbm 132 this.djywbm = item.djywbm
133 console.log(this.djywbm, 'this.djywbm');
133 } 134 }
134 }, 135 },
135 handleList (list, obj) { 136 handleList (list, obj) {
......
...@@ -110,15 +110,10 @@ export default { ...@@ -110,15 +110,10 @@ export default {
110 // 高级查询 110 // 高级查询
111 moreQueryClick () { }, 111 moreQueryClick () { },
112 openDialog (scroll) { 112 openDialog (scroll) {
113 this.$popup({ 113 this.$popup('登记簿详情', 'registerBook/djbFrame', {
114 titleStyle: "left",
115 title: "登记簿详情", // 弹窗标题
116 editItem: "registerBook/djbFrame", // 弹窗内容
117 formData: scroll, 114 formData: scroll,
118 width: "1220px", 115 width: "1220px",
119 height: "790px", 116 height: "790px",
120 // cancelText: '取消摆烂', // 右边按钮文本
121 // confirmText: '确定点击', //左边按钮文本
122 cancel: () => { 117 cancel: () => {
123 console.log("取消回调"); 118 console.log("取消回调");
124 }, 119 },
...@@ -127,8 +122,17 @@ export default { ...@@ -127,8 +122,17 @@ export default {
127 }, 122 },
128 }); 123 });
129 }, 124 },
130 }, 125 handleLpbClick (item) {
131 }; 126 this.$popup('楼盘表', 'components/bjlp/index', {
127 width: '90%',
128 height: "90%",
129 formData: {
130 bsm: ''
131 }
132 })
133 }
134 }
135 }
132 </script> 136 </script>
133 <style scoped lang="scss"> 137 <style scoped lang="scss">
134 @import "~@/styles/public.scss"; 138 @import "~@/styles/public.scss";
......
...@@ -102,7 +102,7 @@ class data extends filter { ...@@ -102,7 +102,7 @@ class data extends filter {
102 return ( 102 return (
103 <div> 103 <div>
104 <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openDialog(scope.row) }}>登记薄</el-button> 104 <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openDialog(scope.row) }}>登记薄</el-button>
105 <el-button type="text" icon="el-icon-film" onClick={() => { vm.openDialog(scope.row) }}>楼盘表</el-button> 105 <el-button type="text" icon="el-icon-film" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表</el-button>
106 </div> 106 </div>
107 ) 107 )
108 } 108 }
......