Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
ed20099f by xiaomiao
Options

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents b62a9419 7cd220ab
Inline Side-by-side
Showing 12 changed files with 236 additions and 100 deletions
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-19 09:50:51 4 * @LastEditTime: 2023-07-21 11:23:22
5 --> 5 -->
6 <template> 6 <template>
7 <div class="edit"> 7 <div class="edit">
...@@ -16,14 +16,16 @@ ...@@ -16,14 +16,16 @@
16 :style="{ height: lpbContentHight + 'px' }" 16 :style="{ height: lpbContentHight + 'px' }"
17 v-show="bjztFlag"> 17 v-show="bjztFlag">
18 <!-- 楼盘表主体 --> 18 <!-- 楼盘表主体 -->
19 <div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }"> 19 <div class="lp-overview" :style="{ width: lpbContentwidth + 'px','margin-right': formData.onlyShow ? '10px' : 0 }">
20 <lpbContent 20 <lpbContent
21 ref="lpbContent" 21 ref="lpbContent"
22 :zrzbsm="formData.bsm" 22 :zrzbsm="formData.bsm"
23 :onlyShow="formData.onlyShow"
24 :unitData="formData.unitData"
23 :key="time"></lpbContent> 25 :key="time"></lpbContent>
24 </div> 26 </div>
25 <!-- 右侧图例 --> 27 <!-- 右侧图例 -->
26 <div class="lp-legend"> 28 <div class="lp-legend" v-if="formData.onlyShow">
27 <div class="handleCol"> 29 <div class="handleCol">
28 <div class="btn" @click="legendToggle"> 30 <div class="btn" @click="legendToggle">
29 <i v-show="!legendToggleFlag" class="el-icon-d-arrow-left"></i> 31 <i v-show="!legendToggleFlag" class="el-icon-d-arrow-left"></i>
...@@ -182,7 +184,9 @@ ...@@ -182,7 +184,9 @@
182 props: { 184 props: {
183 formData: { 185 formData: {
184 type: Object, 186 type: Object,
185 default: {}, 187 default: () => {
188 return {}
189 }
186 }, 190 },
187 }, 191 },
188 components: { 192 components: {
...@@ -404,30 +408,30 @@ ...@@ -404,30 +408,30 @@
404 } 408 }
405 } 409 }
406 }); 410 });
407 getLpbQsxtj(this.formData.bsm).then((res) => { 411 // getLpbQsxtj(this.formData.bsm).then((res) => {
408 if (res.code === 200) { 412 // if (res.code === 200) {
409 this.qsxList = [ 413 // this.qsxList = [
410 { 414 // {
411 name: "坐落", 415 // name: "坐落",
412 bsms: res.result.zl.bsms, 416 // bsms: res.result.zl.bsms,
413 color: "#2591FD", 417 // color: "#2591FD",
414 ts: res.result.zl.bsms.length, 418 // ts: res.result.zl.bsms.length,
415 }, 419 // },
416 { 420 // {
417 name: "分层分户图", 421 // name: "分层分户图",
418 bsms: res.result.fcfht.bsms, 422 // bsms: res.result.fcfht.bsms,
419 color: "#2591FD", 423 // color: "#2591FD",
420 ts: res.result.fcfht.bsms.length, 424 // ts: res.result.fcfht.bsms.length,
421 }, 425 // },
422 { 426 // {
423 name: "室号", 427 // name: "室号",
424 bsms: res.result.shbw.bsms, 428 // bsms: res.result.shbw.bsms,
425 color: "#2591FD", 429 // color: "#2591FD",
426 ts: res.result.shbw.bsms.length, 430 // ts: res.result.shbw.bsms.length,
427 }, 431 // },
428 ]; 432 // ];
429 } 433 // }
430 }); 434 // });
431 }, 435 },
432 }, 436 },
433 computed: {}, 437 computed: {},
...@@ -488,7 +492,6 @@ ...@@ -488,7 +492,6 @@
488 border: 1px solid rgb(236, 236, 236); 492 border: 1px solid rgb(236, 236, 236);
489 border-top: 0; 493 border-top: 0;
490 border-bottom: 0; 494 border-bottom: 0;
491 margin-right: 10px;
492 box-sizing: border-box; 495 box-sizing: border-box;
493 } 496 }
494 497
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: yangwei 2 * @Author: yangwei
3 * @Date: 2023-02-28 15:47:12 3 * @Date: 2023-02-28 15:47:12
4 * @LastEditors: yangwei 4 * @LastEditors: yangwei
5 * @LastEditTime: 2023-06-16 16:14:51 5 * @LastEditTime: 2023-07-21 14:39:12
6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ch.vue 6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ch.vue
7 * @Description: 7 * @Description:
8 * 8 *
...@@ -86,7 +86,8 @@ export default { ...@@ -86,7 +86,8 @@ export default {
86 openMenu:{value:'openMenu',default:null}, 86 openMenu:{value:'openMenu',default:null},
87 selectAll:{value:'selectAll',default:null}, 87 selectAll:{value:'selectAll',default:null},
88 changeChoosedObj:{value:'changeChoosedObj',default:null}, 88 changeChoosedObj:{value:'changeChoosedObj',default:null},
89 clearChangeChoosedObj:{value:'clearChangeChoosedObj',default:null} 89 clearChangeChoosedObj:{value:'clearChangeChoosedObj',default:null},
90 getBsmList:{value:'getBsmList',default:null}
90 }, 91 },
91 props: { 92 props: {
92 ch: { 93 ch: {
...@@ -102,15 +103,31 @@ export default { ...@@ -102,15 +103,31 @@ export default {
102 hbsmList: [], 103 hbsmList: [],
103 //选中层bsm合集 104 //选中层bsm合集
104 cbsmList: [], 105 cbsmList: [],
105 //选中户qszt集合
106 hqsztList: [],
107 //区分单双击事件的定时器 106 //区分单双击事件的定时器
108 time: null, 107 time: null,
109 // 边框颜色 108 // 边框颜色
110 borderColor:'rgb(230, 230, 230)' 109 borderColor:'rgb(230, 230, 230)',
110 // 申请单元列表数据
111 unitIdList:[]
111 }; 112 };
112 }, 113 },
113 mounted() {}, 114 mounted() {
115 // 根据申请单元列表数据处理选中户
116 if(window.unitData.length){
117 window.unitData.forEach(e => {
118 this.unitIdList.push(e.bdcdyid)
119 })
120 this.ch.forEach((c) => {
121 c.hs.forEach((h) => {
122 if (h.dyhbsm.indexOf(this.unitIdList) > -1) {
123 h.select = true;
124 // 使用hbsmList时，需要去重
125 this.hbsmList.push(h.bsm)
126 }
127 });
128 });
129 }
130 },
114 methods: { 131 methods: {
115 // 层选中事件 132 // 层选中事件
116 /** 133 /**
...@@ -120,17 +137,24 @@ export default { ...@@ -120,17 +137,24 @@ export default {
120 * @author: renchao 137 * @author: renchao
121 */ 138 */
122 handleClickC(e, item) { 139 handleClickC(e, item) {
123 //判断点击的层是否选中 140 // 判断点击的层是否选中
124 // if (e.target.className.indexOf("tdSelect") == -1) { 141 if (e.target.className.indexOf("tdSelect") == -1) {
125 // //未选中→选中 142 //未选中→选中
126 // e.target.className += " tdSelect"; //加边框 143 item.hs.forEach((h) => {
127 // this.cbsmList.push(item.bsm); 144 //加边框
128 // } else { 145 e.target.className += " tdSelect";
129 // //选中→未选中 146 h.select = true;
130 // e.target.className = "floor"; 147 // 使用hbsmList时，需要去重
131 // this.cbsmList = this.cbsmList.filter((i) => i != item.bsm); 148 this.hbsmList.push(h.bsm)
132 // } 149 });
133 // this.$parent.getCbsm(this.cbsmList); 150 } else {
151 //选中→未选中
152 item.hs.forEach((h) => {
153 e.target.className = "floor";
154 h.select = false;
155 this.hbsmList = this.hbsmList.filter((i) => i != h.bsm);
156 });
157 }
134 }, 158 },
135 //户单击事件 159 //户单击事件
136 /** 160 /**
...@@ -141,6 +165,26 @@ export default { ...@@ -141,6 +165,26 @@ export default {
141 * @author: renchao 165 * @author: renchao
142 */ 166 */
143 handleClickH(e, bsm, hs) { 167 handleClickH(e, bsm, hs) {
168 let self = this;
169 // 开启延时器，200ms的间隔区分单击和双击，解决双击时执行两次单击事件
170 clearTimeout(self.time);
171 self.time = setTimeout(() => {
172 // this.closeMenu();
173 //判断点击的户是否选中
174 if (!hs.select) {
175 //未选中→选中
176 //加边框
177 hs.select = true;
178 // 将户bsm放进hbsmList
179 self.hbsmList.push(bsm);
180 } else {
181 //选中→未选中
182 hs.select = false;
183 self.hbsmList = self.hbsmList.filter((i) => i != bsm);
184 }
185 //更新当前选中户数据
186 this.$forceUpdate();
187 }, 200);
144 }, 188 },
145 // 户单元状态点击事件 189 // 户单元状态点击事件
146 /** 190 /**
...@@ -151,7 +195,7 @@ export default { ...@@ -151,7 +195,7 @@ export default {
151 * @author: renchao 195 * @author: renchao
152 */ 196 */
153 hDyztClick(e, bsm, hs) { 197 hDyztClick(e, bsm, hs) {
154 // this.handleClickH(e.target.parentNode, bsm, hs); 198 this.handleClickH(e.target.parentNode, bsm, hs);
155 }, 199 },
156 //户双击事件 200 //户双击事件
157 /** 201 /**
...@@ -191,21 +235,51 @@ export default { ...@@ -191,21 +235,51 @@ export default {
191 // item.style.border = `1px solid ${this.borderColor}` 235 // item.style.border = `1px solid ${this.borderColor}`
192 }); 236 });
193 }, 237 },
238 //清除选中
239 clearChoosed(){
240 //清除选中户
241 this.zdySelectAll(false)
242 //清除选中层
243 this.cbsmList = [];
244 this.$refs.cBsm && this.$refs.cBsm.forEach((item)=>{
245 item.className = 'floor'
246 })
247 },
194 }, 248 },
195 watch: { 249 watch: {
196 selectAll: { 250 selectAll: {
197 handler(val) { 251 handler(val) {
198 this.zdySelectAll(val.selectAll); 252 this.zdySelectAll(val.selectAll);
253 val.cancelChoosed && this.clearChoosed()
199 }, 254 },
200 immediate: true, 255 immediate: true,
201 deep: true, 256 deep: true,
202 }, 257 },
258 hbsmList(val){
259 let list = []
260 val.length && val.forEach((i)=>{
261 this.ch.forEach((c) => {
262 c.hs.forEach((h) => {
263 if (i == h.bsm) {
264 list.push(
265 {
266 bdcdyh:h.bdcdyh,
267 bsm:h.bsm,
268 dyhbsm:h.dyhbsm
269 }
270 )
271 }
272 });
273 });
274 })
275 this.getBsmList(list)
276 },
203 changeChoosedObj: { 277 changeChoosedObj: {
204 handler(val) { 278 handler(val) {
205 //清除选中户
206 this.borderColor = 'rgb(230, 230, 230)'; 279 this.borderColor = 'rgb(230, 230, 230)';
207 this.zdySelectAll(false,true)
208 if (val.bsms.length) { 280 if (val.bsms.length) {
281 //清除选中户
282 this.zdySelectAll(false,true)
209 this.$refs.hBsm.forEach((item) => { 283 this.$refs.hBsm.forEach((item) => {
210 val.bsms.forEach((i,ind) => { 284 val.bsms.forEach((i,ind) => {
211 if (item.dataset.bsm == i) { 285 if (item.dataset.bsm == i) {
...@@ -214,19 +288,17 @@ export default { ...@@ -214,19 +288,17 @@ export default {
214 window.lpbContent.$refs.lpbContent.scrollTop = item.offsetTop; 288 window.lpbContent.$refs.lpbContent.scrollTop = item.offsetTop;
215 window.lpbContent.$refs.lpbContent.scrollLeft = item.offsetLeft; 289 window.lpbContent.$refs.lpbContent.scrollLeft = item.offsetLeft;
216 } 290 }
217 item.style.border = '1px solid '+ val.color; 291 // item.style.border = '1px solid '+ val.color;
218 // item.style.backgroundColor = val.color; 292 // 背景色高亮
293 item.style.backgroundColor = val.color;
219 } 294 }
220 }); 295 });
221 }); 296 });
222 }else{
223 this.borderColor = 'rgb(230, 230, 230)'
224 } 297 }
225
226 }, 298 },
227 immediate: true, 299 immediate: true,
228 deep: true, 300 deep: true,
229 }, 301 }
230 }, 302 },
231 }; 303 };
232 </script> 304 </script>
......
1 <template> 1 <template>
2 <div class="lpbContent-wrap" ref="lpbContentWrap"> 2 <div class="lpbContent-wrap" ref="lpbContentWrap">
3 <div class="lpbContent" ref="lpbContent"> 3 <div class="lpbContent" ref="lpbContent" :style="{ 'height': 'calc(100% - '+ lpbContentHeight +'px)'}">
4 <!-- 纵向倒序排列 逻辑幢位于独立幢单元和独立层户的上方 --> 4 <!-- 纵向倒序排列 逻辑幢位于独立幢单元和独立层户的上方 -->
5 <div class="ch-zdy-wrap"> 5 <div class="ch-zdy-wrap">
6 <!-- 幢单元 --> 6 <!-- 幢单元 -->
7 <zdy-cpn v-if="lpbData.zdys.length" :zdys="lpbData.zdys" /> 7 <zdy-cpn v-if="lpbData.zdys.length" :zdys="lpbData.zdys" :onlyShow="onlyShow"/>
8 <!-- 独立层户 --> 8 <!-- 独立层户 -->
9 <ch-cpn v-if="lpbData.cs.length" :ch="lpbData.cs" /> 9 <ch-cpn v-if="lpbData.cs.length" :ch="lpbData.cs" />
10 </div> 10 </div>
11 <!-- 逻辑幢 --> 11 <!-- 逻辑幢 -->
12 <ljzs-cpn v-if="lpbData.ljzs.length" :ljzs="lpbData.ljzs" /> 12 <ljzs-cpn v-if="lpbData.ljzs.length" :ljzs="lpbData.ljzs" :onlyShow="onlyShow"/>
13 </div> 13 </div>
14 <!-- 自然幢名称 --> 14 <!-- 自然幢名称 -->
15 <p class="lpb-xmmc"> 15 <p class="lpb-xmmc" :style="{ 'border-bottom': onlyShow ? 0 : '1px solid #e6e6e6'}">
16 <!-- <el-checkbox @change="zdySelectAll($event)">{{ 16 <el-checkbox @change="zdySelectAll($event)" v-if="!onlyShow">{{
17 lpbData.xmmc 17 lpbData.xmmc
18 }}</el-checkbox> --> 18 }}</el-checkbox>
19 {{lpbData.xmmc}} 19 <span v-else>{{lpbData.xmmc}}</span>
20 </p> 20 </p>
21 <el-button type="primary" class="save-btn" v-if="!onlyShow" @click="saveLpb">保存</el-button>
21 <!-- 右键菜单 --> 22 <!-- 右键菜单 -->
22 <ul 23 <ul
23 v-show="lpbChVisible" 24 v-show="lpbChVisible"
...@@ -40,7 +41,8 @@ export default { ...@@ -40,7 +41,8 @@ export default {
40 openMenu: this.openMenu, 41 openMenu: this.openMenu,
41 selectAll: this.selectAllObj, 42 selectAll: this.selectAllObj,
42 changeChoosedObj:this.changeChoosedObj, 43 changeChoosedObj:this.changeChoosedObj,
43 clearChangeChoosedObj:this.clearChangeChoosedObj 44 clearChangeChoosedObj:this.clearChangeChoosedObj,
45 getBsmList:this.getBsmList
44 }; 46 };
45 }, 47 },
46 name: "", 48 name: "",
...@@ -58,6 +60,10 @@ export default { ...@@ -58,6 +60,10 @@ export default {
58 type: Boolean, 60 type: Boolean,
59 default: true, 61 default: true,
60 }, 62 },
63 onlyShow:{
64 type: Boolean,
65 default: true,
66 }
61 }, 67 },
62 data() { 68 data() {
63 return { 69 return {
...@@ -79,7 +85,9 @@ export default { ...@@ -79,7 +85,9 @@ export default {
79 changeChoosedObj:{ 85 changeChoosedObj:{
80 bsms:[], 86 bsms:[],
81 color:'' 87 color:''
82 } 88 },
89 // 选中户bsm合集
90 bsmList:[]
83 }; 91 };
84 }, 92 },
85 mounted() { 93 mounted() {
...@@ -87,6 +95,24 @@ export default { ...@@ -87,6 +95,24 @@ export default {
87 window.lpbContent = this; 95 window.lpbContent = this;
88 }, 96 },
89 methods: { 97 methods: {
98 /**
99 * @description: 获取当前楼盘表选中户信息
100 * @param {Array} bsmList
101 * @author: renchao
102 */
103 getBsmList(bsmList){
104 this.bsmList = bsmList;
105 },
106 /**
107 * @description: 保存当前楼盘表
108 * @author: renchao
109 */
110 saveLpb(){
111 // todo 调用保存接口 传入参数待定
112 console.log(this.bsmList,'this.bsmList');
113 // 保存成功后关闭弹框
114 this.$popupCacel()
115 },
90 // 改变户选中状态 116 // 改变户选中状态
91 /** 117 /**
92 * @description: 改变户选中状态 118 * @description: 改变户选中状态
...@@ -125,8 +151,8 @@ export default { ...@@ -125,8 +151,8 @@ export default {
125 getLpb(zrzbsm, scyclx, actual) { 151 getLpb(zrzbsm, scyclx, actual) {
126 getLpb(zrzbsm, scyclx).then((res) => { 152 getLpb(zrzbsm, scyclx).then((res) => {
127 if (res.code == 200) { 153 if (res.code == 200) {
128 res.result.ljzs = res.result.ljzs.sort(this.compare("place")); 154 res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place"));
129 this.lpbData = res.result == null ? this.lpbData : res.result; 155 this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb;
130 // this.$nextTick(() => { 156 // this.$nextTick(() => {
131 // //渲染楼盘表 157 // //渲染楼盘表
132 // this.dataChange(); 158 // this.dataChange();
...@@ -182,6 +208,11 @@ export default { ...@@ -182,6 +208,11 @@ export default {
182 }; 208 };
183 }, 209 },
184 }, 210 },
211 computed:{
212 lpbContentHeight(){
213 return this.onlyShow ? 36 : 76
214 }
215 },
185 watch: { 216 watch: {
186 //户右键菜单显示时，监听到鼠标点击时关闭户右键菜单 217 //户右键菜单显示时，监听到鼠标点击时关闭户右键菜单
187 lpbChVisible(value) { 218 lpbChVisible(value) {
...@@ -190,7 +221,7 @@ export default { ...@@ -190,7 +221,7 @@ export default {
190 } else { 221 } else {
191 document.body.removeEventListener("click", this.closeMenu); 222 document.body.removeEventListener("click", this.closeMenu);
192 } 223 }
193 }, 224 }
194 }, 225 },
195 }; 226 };
196 </script> 227 </script>
...@@ -201,7 +232,6 @@ export default { ...@@ -201,7 +232,6 @@ export default {
201 overflow: hidden; 232 overflow: hidden;
202 .lpbContent { 233 .lpbContent {
203 width: 100%; 234 width: 100%;
204 height: calc(100% - 36px);
205 position: relative; 235 position: relative;
206 overflow: scroll; 236 overflow: scroll;
207 -webkit-user-select: none; 237 -webkit-user-select: none;
...@@ -221,6 +251,10 @@ export default { ...@@ -221,6 +251,10 @@ export default {
221 border: 0; 251 border: 0;
222 border-top: 1px solid #e6e6e6; 252 border-top: 1px solid #e6e6e6;
223 } 253 }
254 .save-btn{
255 display: block;
256 margin: 5px auto;
257 }
224 // 自定义右键菜单样式 258 // 自定义右键菜单样式
225 .contextmenu { 259 .contextmenu {
226 margin: 0; 260 margin: 0;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: yangwei 2 * @Author: yangwei
3 * @Date: 2023-02-28 17:25:45 3 * @Date: 2023-02-28 17:25:45
4 * @LastEditors: yangwei 4 * @LastEditors: yangwei
5 * @LastEditTime: 2023-07-11 10:05:55 5 * @LastEditTime: 2023-07-21 14:59:46
6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ljzs.vue 6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ljzs.vue
7 * @Description: 7 * @Description:
8 * 8 *
...@@ -20,11 +20,13 @@ ...@@ -20,11 +20,13 @@
20 " 20 "
21 > 21 >
22 <!-- 逻辑幢名称 --> 22 <!-- 逻辑幢名称 -->
23 <p class="lpb-xmmc ljz-xmmc">{{ ljz.ljzmc }}</p> 23 <p class="lpb-xmmc ljz-xmmc">
24 <span>{{ljz.ljzmc}}</span>
25 </p>
24 <!-- 独立层户 --> 26 <!-- 独立层户 -->
25 <ch-cpn v-if="ljz.cs.length" :ch="ljz.cs" /> 27 <ch-cpn v-if="ljz.cs.length" :ch="ljz.cs" />
26 <!-- 幢单元 --> 28 <!-- 幢单元 -->
27 <zdy-cpn v-if="ljz.zdys.length" :zdys="ljz.zdys" /> 29 <zdy-cpn v-if="ljz.zdys.length" :zdys="ljz.zdys" :onlyShow="onlyShow"/>
28 </div> 30 </div>
29 </div> 31 </div>
30 </div> 32 </div>
...@@ -40,7 +42,7 @@ ...@@ -40,7 +42,7 @@
40 <!-- 独立层户 --> 42 <!-- 独立层户 -->
41 <ch-cpn v-if="ljzarr[0].cs.length" :ch="ljzarr[0].cs" /> 43 <ch-cpn v-if="ljzarr[0].cs.length" :ch="ljzarr[0].cs" />
42 <!-- 幢单元 --> 44 <!-- 幢单元 -->
43 <zdy-cpn v-if="ljzarr[0].zdys.length" :zdys="ljzarr[0].zdys" /> 45 <zdy-cpn v-if="ljzarr[0].zdys.length" :zdys="ljzarr[0].zdys" :onlyShow="onlyShow"/>
44 </div> 46 </div>
45 </div> 47 </div>
46 </div> 48 </div>
...@@ -59,12 +61,15 @@ export default { ...@@ -59,12 +61,15 @@ export default {
59 return []; 61 return [];
60 }, 62 },
61 }, 63 },
64 onlyShow:{
65 type: Boolean,
66 default: true,
67 }
62 }, 68 },
63 data() { 69 data() {
64 return { 70 return {
65 }; 71 };
66 }, 72 },
67
68 mounted() { 73 mounted() {
69 console.log(this.ljzsCptd); 74 console.log(this.ljzsCptd);
70 }, 75 },
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: yangwei 2 * @Author: yangwei
3 * @Date: 2023-02-28 16:29:04 3 * @Date: 2023-02-28 16:29:04
4 * @LastEditors: yangwei 4 * @LastEditors: yangwei
5 * @LastEditTime: 2023-06-08 13:58:58 5 * @LastEditTime: 2023-07-21 14:55:30
6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\zdys.vue 6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\zdys.vue
7 * @Description: 7 * @Description:
8 * 8 *
...@@ -13,10 +13,10 @@ ...@@ -13,10 +13,10 @@
13 <div v-for="zdy in realZdys" :key="zdy.bsm"> 13 <div v-for="zdy in realZdys" :key="zdy.bsm">
14 <!-- 幢单元名称 --> 14 <!-- 幢单元名称 -->
15 <p class="lpb-xmmc"> 15 <p class="lpb-xmmc">
16 <!-- <el-checkbox @change="zdySelectAll($event,zdy.bsm)">{{ 16 <el-checkbox @change="zdySelectAll($event,zdy.bsm)" v-if="!onlyShow">{{
17 zdy.zdymc 17 zdy.zdymc
18 }}</el-checkbox> --> 18 }}</el-checkbox>
19 {{zdy.zdymc}} 19 <span v-else>aaa{{zdy.zdymc}}</span>
20 </p> 20 </p>
21 <!-- 每个幢单元下的层户 --> 21 <!-- 每个幢单元下的层户 -->
22 <ch-cpn :ref="zdy.bsm" :ch="zdy.cs" /> 22 <ch-cpn :ref="zdy.bsm" :ch="zdy.cs" />
...@@ -36,6 +36,10 @@ export default { ...@@ -36,6 +36,10 @@ export default {
36 return []; 36 return [];
37 }, 37 },
38 }, 38 },
39 onlyShow:{
40 type: Boolean,
41 default: true,
42 }
39 }, 43 },
40 data() { 44 data() {
41 return {}; 45 return {};
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-19 14:11:05 4 * @LastEditTime: 2023-07-24 09:47:54
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
...@@ -364,7 +364,12 @@ ...@@ -364,7 +364,12 @@
364 height: 75vh; 364 height: 75vh;
365 overflow-y: scroll; 365 overflow-y: scroll;
366 } 366 }
367 367 /deep/.el-radio__label {
368 display: inline-block !important;
369 }
370 /deep/.el-radio {
371 margin-right: 5px;
372 }
368 .el-radio-group { 373 .el-radio-group {
369 white-space: nowrap; 374 white-space: nowrap;
370 } 375 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-05 09:55:42 4 * @LastEditTime: 2023-07-24 08:53:26
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clxx"> 7 <div class="clxx">
...@@ -69,8 +69,8 @@ ...@@ -69,8 +69,8 @@
69 created () { 69 created () {
70 this.clmlInitList(1) 70 this.clmlInitList(1)
71 }, 71 },
72 mounted() { 72 mounted () {
73 this.ableOperation=this.$parent.ableOperation 73 this.ableOperation = this.$parent.ableOperation
74 }, 74 },
75 methods: { 75 methods: {
76 // 自动预览 76 // 自动预览
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
151 */ 151 */
152 updateList (val) { 152 updateList (val) {
153 let that = this 153 let that = this
154 if (val.children.length != []) { //删除最后一张图片时 val=null 154 if (val.children.length != 0) { //删除最后一张图片时 val=null
155 this.tableData.forEach(item => { 155 this.tableData.forEach(item => {
156 if (item.bsmSj === val.bsmSj) { 156 if (item.bsmSj === val.bsmSj) {
157 item.children = val.children 157 item.children = val.children
......
1 <!-- 1 <!--
2 * @Description: workFrame左侧菜单列表-普通 2 * @Description: workFrame左侧菜单列表-普通
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-17 16:20:37 4 * @LastEditTime: 2023-07-21 10:15:11
5 --> 5 -->
6 <template> 6 <template>
7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> 7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
...@@ -92,6 +92,7 @@ ...@@ -92,6 +92,7 @@
92 leftMenu(formdata).then((res) => { 92 leftMenu(formdata).then((res) => {
93 if (res.code === 200 && res.result) { 93 if (res.code === 200 && res.result) {
94 this.unitData = res.result; 94 this.unitData = res.result;
95 window.unitData = res.result;
95 this.currentSelectProps = res.result[0]; 96 this.currentSelectProps = res.result[0];
96 this.$emit('getCurrentSelectProps', this.currentSelectProps); 97 this.$emit('getCurrentSelectProps', this.currentSelectProps);
97 this.judgeBatchShow(); 98 this.judgeBatchShow();
...@@ -176,6 +177,7 @@ ...@@ -176,6 +177,7 @@
176 * @author: renchao 177 * @author: renchao
177 */ 178 */
178 batchUnitClick () { 179 batchUnitClick () {
180 debugger
179 this.currentSelectProps.batchOperation = true; 181 this.currentSelectProps.batchOperation = true;
180 // this.activeIndex = "-1"; 182 // this.activeIndex = "-1";
181 this.$parent.stepForm(0); 183 this.$parent.stepForm(0);
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-21 13:43:14 4 * @LastEditTime: 2023-07-17 14:20:17
5 */ 5 */
6 import { getPrintTemplateByCode } from "@/api/print"; 6 import { getPrintTemplateByCode } from "@/api/print";
7 import { uploadUndo } from "@/api/clxx"; 7 import { uploadUndo } from "@/api/clxx";
...@@ -155,7 +155,9 @@ export default { ...@@ -155,7 +155,9 @@ export default {
155 getZrzbsmList(this.bsmSlsq).then((res) => { 155 getZrzbsmList(this.bsmSlsq).then((res) => {
156 if (res.code === 200) { 156 if (res.code === 200) {
157 this.$popupDialog('楼盘表', 'lpb/index', { 157 this.$popupDialog('楼盘表', 'lpb/index', {
158 bsm: res.result[0] 158 bsm: res.result[0],
159 onlyShow:false,
160 unitData:window.unitData
159 }, '90%', true) 161 }, '90%', true)
160 } else { 162 } else {
161 this.$message.error(res.message) 163 this.$message.error(res.message)
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-24 15:31:00 4 * @LastEditTime: 2023-07-24 09:39:34
5 --> 5 -->
6 <template> 6 <template>
7 <div class="container"> 7 <div class="container">
...@@ -159,7 +159,12 @@ ...@@ -159,7 +159,12 @@
159 //获取单元对应的所有表单信息 159 //获取单元对应的所有表单信息
160 this.tabList = res.result; 160 this.tabList = res.result;
161 //默认加载第一个表单信息 161 //默认加载第一个表单信息
162 let arr = res.result.filter(item => item.defaultForm)
163 if (arr.length > 0) {
164 this.tabName = arr[0].value;
165 } else {
162 this.tabName = res.result[0].value; 166 this.tabName = res.result[0].value;
167 }
163 this.ableOperation = this.tabList[0].ableOperation 168 this.ableOperation = this.tabList[0].ableOperation
164 //批量操作无分屏按钮 169 //批量操作无分屏按钮
165 if (index != null) { 170 if (index != null) {
......
1 <!-- 1 <!--
2 * @Description: 受理信息 2 * @Description: 受理信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-21 14:16:07 4 * @LastEditTime: 2023-07-21 14:27:15
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
161 </el-radio-group> 161 </el-radio-group>
162 </el-form-item> 162 </el-form-item>
163 </el-col> 163 </el-col>
164 <el-col :span="5" v-show="ruleForm.sldy.gyfs == '2'"> 164 <el-col :span="5" v-if="ruleForm.sldy.gyfs && ruleForm.sldy.gyfs == '2'">
165 <el-form-item label="是否分别持证："> 165 <el-form-item label="是否分别持证：">
166 <el-radio-group v-model="ruleForm.sffbcz" :disabled="!ableOperation"> 166 <el-radio-group v-model="ruleForm.sffbcz" :disabled="!ableOperation">
167 <el-radio label="1">是</el-radio> 167 <el-radio label="1">是</el-radio>
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
169 </el-radio-group> 169 </el-radio-group>
170 </el-form-item> 170 </el-form-item>
171 </el-col> 171 </el-col>
172 <el-col :span="5" v-show="ruleForm.sldy.gyfs == '2'"> 172 <el-col :span="5" v-if="ruleForm.sldy.gyfs && ruleForm.sldy.gyfs == '2'">
173 <el-form-item label="持证人："> 173 <el-form-item label="持证人：">
174 <el-select v-model="ruleForm.czr" placeholder="持证人" :disabled="!ableOperation"> 174 <el-select v-model="ruleForm.czr" placeholder="持证人" :disabled="!ableOperation">
175 <el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value"> 175 <el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value">
...@@ -240,12 +240,17 @@ ...@@ -240,12 +240,17 @@
240 tdytOption: [], 240 tdytOption: [],
241 czrOptions: [], 241 czrOptions: [],
242 ruleForm: { 242 ruleForm: {
243 ywh: "", 243 flow: {
244 ywh: ''
245 },
244 slry: "", 246 slry: "",
245 slsj: "", 247 slsj: "",
246 qllx: "", 248 qllx: "",
247 djlx: "", 249 djlx: "",
248 djqx: "", 250 djqx: "",
251 sldy: {
252 gyfs: ''
253 },
249 // 宗地代码 254 // 宗地代码
250 zddm: "", 255 zddm: "",
251 bdcdyh: "", 256 bdcdyh: "",
...@@ -264,7 +269,6 @@ ...@@ -264,7 +269,6 @@
264 fwxz: '', 269 fwxz: '',
265 fwjg: '', 270 fwjg: '',
266 // 权利人信息 271 // 权利人信息
267 gyfs: "1",
268 // 是否分别持证 272 // 是否分别持证
269 sffbcz: "", 273 sffbcz: "",
270 // 持证人 274 // 持证人
...@@ -276,6 +280,9 @@ ...@@ -276,6 +280,9 @@
276 }, 280 },
277 fdcq2: { 281 fdcq2: {
278 fwxzmc: '' 282 fwxzmc: ''
283 },
284 slsq: {
285 gyfs: ''
279 } 286 }
280 }, 287 },
281 //传递参数 288 //传递参数
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-19 14:00:03 4 * @LastEditTime: 2023-07-21 11:25:20
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -116,13 +116,10 @@ ...@@ -116,13 +116,10 @@
116 * @author: renchao 116 * @author: renchao
117 */ 117 */
118 openlpbClick (scope) { 118 openlpbClick (scope) {
119 this.$popup('楼盘表', 'lpb/index', { 119 this.$popupDialog('楼盘表', 'lpb/index', {
120 width: '90%', 120 bsm: scope.row.bsm,
121 height: "92%", 121 onlyShow:true
122 formData: { 122 }, '90%', true)
123 bsm: scope.row.bsm
124 }
125 })
126 } 123 }
127 } 124 }
128 } 125 }
......