5c65daec by renchao@pashanhoo.com

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

2 parents d07239f1 30767602
...@@ -173,7 +173,8 @@ export default { ...@@ -173,7 +173,8 @@ export default {
173 break; 173 break;
174 case "B8": 174 case "B8":
175 this.$popupDialog('楼盘表', 'lpb/index', { 175 this.$popupDialog('楼盘表', 'lpb/index', {
176 bsm: '' 176 bsm: '',
177 onlyShow: true,
177 }, '90%', true) 178 }, '90%', true)
178 break; 179 break;
179 case "back": //退回按钮 180 case "back": //退回按钮
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-12 16:55:35 4 * @LastEditTime: 2023-09-15 14:46:47
5 --> 5 -->
6 <template> 6 <template>
7 <div class="edit"> 7 <div class="edit">
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
22 :zrzbsm="formData.bsm" 22 :zrzbsm="formData.bsm"
23 :scyclx="formData.scyclx" 23 :scyclx="formData.scyclx"
24 :onlyShow="formData.onlyShow" 24 :onlyShow="formData.onlyShow"
25 :showSave="formData.showSave"
25 :unitData="formData.unitData" 26 :unitData="formData.unitData"
26 :sqywInfo="formData" 27 :sqywInfo="formData"
27 :key="time"></lpbContent> 28 :key="time"></lpbContent>
......
...@@ -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-09-14 15:04:20 5 * @LastEditTime: 2023-09-15 14:52:50
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 *
...@@ -96,6 +96,10 @@ export default { ...@@ -96,6 +96,10 @@ export default {
96 return []; 96 return [];
97 }, 97 },
98 }, 98 },
99 onlyShow:{
100 type: Boolean,
101 default: true,
102 }
99 }, 103 },
100 data() { 104 data() {
101 return { 105 return {
...@@ -140,23 +144,25 @@ export default { ...@@ -140,23 +144,25 @@ export default {
140 * @author: renchao 144 * @author: renchao
141 */ 145 */
142 handleClickC(e, item) { 146 handleClickC(e, item) {
143 // 判断点击的层是否选中 147 if (!this.onlyShow) {
144 if (e.target.className.indexOf("tdSelect") == -1) { 148 // 判断点击的层是否选中
145 //未选中→选中 149 if (e.target.className.indexOf("tdSelect") == -1) {
146 item.hs.forEach((h) => { 150 //未选中→选中
147 //加边框 151 item.hs.forEach((h) => {
148 e.target.className += " tdSelect"; 152 //加边框
149 h.select = true; 153 e.target.className += " tdSelect";
150 // 使用hbsmList时,需要去重 154 h.select = true;
151 this.hbsmList.push(h.bsm) 155 // 使用hbsmList时,需要去重
152 }); 156 this.hbsmList.push(h.bsm)
153 } else { 157 });
154 //选中→未选中 158 } else {
155 item.hs.forEach((h) => { 159 //选中→未选中
156 e.target.className = "floor"; 160 item.hs.forEach((h) => {
157 h.select = false; 161 e.target.className = "floor";
158 this.hbsmList = this.hbsmList.filter((i) => i != h.bsm); 162 h.select = false;
159 }); 163 this.hbsmList = this.hbsmList.filter((i) => i != h.bsm);
164 });
165 }
160 } 166 }
161 }, 167 },
162 //户单击事件 168 //户单击事件
...@@ -168,26 +174,28 @@ export default { ...@@ -168,26 +174,28 @@ export default {
168 * @author: renchao 174 * @author: renchao
169 */ 175 */
170 handleClickH(e, bsm, hs) { 176 handleClickH(e, bsm, hs) {
171 let self = this; 177 if (!this.onlyShow) {
172 // 开启延时器,200ms的间隔区分单击和双击,解决双击时执行两次单击事件 178 let self = this;
173 clearTimeout(self.time); 179 // 开启延时器,200ms的间隔区分单击和双击,解决双击时执行两次单击事件
174 self.time = setTimeout(() => { 180 clearTimeout(self.time);
175 // this.closeMenu(); 181 self.time = setTimeout(() => {
176 //判断点击的户是否选中 182 // this.closeMenu();
177 if (!hs.select) { 183 //判断点击的户是否选中
178 //未选中→选中 184 if (!hs.select) {
179 //加边框 185 //未选中→选中
180 hs.select = true; 186 //加边框
181 // 将户bsm放进hbsmList 187 hs.select = true;
182 self.hbsmList.push(bsm); 188 // 将户bsm放进hbsmList
183 } else { 189 self.hbsmList.push(bsm);
184 //选中→未选中 190 } else {
185 hs.select = false; 191 //选中→未选中
186 self.hbsmList = self.hbsmList.filter((i) => i != bsm); 192 hs.select = false;
187 } 193 self.hbsmList = self.hbsmList.filter((i) => i != bsm);
188 //更新当前选中户数据 194 }
189 this.$forceUpdate(); 195 //更新当前选中户数据
190 }, 200); 196 this.$forceUpdate();
197 }, 200);
198 }
191 }, 199 },
192 // 户单元状态点击事件 200 // 户单元状态点击事件
193 /** 201 /**
...@@ -198,7 +206,9 @@ export default { ...@@ -198,7 +206,9 @@ export default {
198 * @author: renchao 206 * @author: renchao
199 */ 207 */
200 hDyztClick(e, bsm, hs) { 208 hDyztClick(e, bsm, hs) {
201 this.handleClickH(e.target.parentNode, bsm, hs); 209 if (!this.onlyShow) {
210 this.handleClickH(e.target.parentNode, bsm, hs);
211 }
202 }, 212 },
203 //户双击事件 213 //户双击事件
204 /** 214 /**
......
...@@ -4,22 +4,22 @@ ...@@ -4,22 +4,22 @@
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" :onlyShow="onlyShow"/> 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" :onlyShow="onlyShow"/>
10 </div> 10 </div>
11 <!-- 逻辑幢 --> 11 <!-- 逻辑幢 -->
12 <ljzs-cpn v-if="lpbData.ljzs.length" :ljzs="lpbData.ljzs" :onlyShow="onlyShow"/> 12 <ljzs-cpn v-if="lpbData.ljzs.length" :ljzs="lpbData.ljzs" :onlyShow="onlyShow"/>
13 </div> 13 </div>
14 <!-- 自然幢名称 --> 14 <!-- 自然幢名称 -->
15 <!-- <p class="lpb-xmmc" :style="{ 'border-bottom': onlyShow ? 0 : '1px solid #e6e6e6'}"> --> 15 <p class="lpb-xmmc" v-if="onlyShow" style="border-bottom: 1px solid #e6e6e6">{{ lpbData.xmmc }}</p>
16 <p class="lpb-xmmc" :style="{ 'border-bottom':'1px solid #e6e6e6'}"> 16 <p class="lpb-xmmc" v-else :style="{ 'border-bottom':'1px solid #e6e6e6'}">
17 <el-checkbox @change="zdySelectAll($event)">{{ 17 <el-checkbox @change="zdySelectAll($event)">{{
18 lpbData.xmmc 18 lpbData.xmmc
19 }}</el-checkbox> 19 }}</el-checkbox>
20 </p> 20 </p>
21 <el-button type="primary" class="save-btn" v-if="!onlyShow" @click="saveLpb">保存</el-button> 21 <el-button type="primary" class="save-btn" v-if="!onlyShow && showSave" @click="saveLpb">保存</el-button>
22 <el-button type="primary" class="save-btn" v-else @click="submitForm" :loading="loading">发起申请</el-button> 22 <el-button type="primary" class="save-btn" v-if="!onlyShow" @click="submitForm" :loading="loading">发起申请</el-button>
23 <!-- 右键菜单 --> 23 <!-- 右键菜单 -->
24 <ul 24 <ul
25 v-show="lpbChVisible" 25 v-show="lpbChVisible"
...@@ -70,6 +70,10 @@ export default { ...@@ -70,6 +70,10 @@ export default {
70 type: Boolean, 70 type: Boolean,
71 default: true, 71 default: true,
72 }, 72 },
73 showSave:{
74 type: Boolean,
75 default: false,
76 },
73 scyclx: { 77 scyclx: {
74 type: Number, 78 type: Number,
75 default: 0, 79 default: 0,
...@@ -278,8 +282,8 @@ export default { ...@@ -278,8 +282,8 @@ export default {
278 }, 282 },
279 computed:{ 283 computed:{
280 lpbContentHeight(){ 284 lpbContentHeight(){
281 // return this.onlyShow ? 36 : 76 285 return this.onlyShow ? 32 : 76
282 return 76 286 // return 76
283 } 287 }
284 }, 288 },
285 watch: { 289 watch: {
......
...@@ -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-09-14 14:35:19 5 * @LastEditTime: 2023-09-15 14:55:58
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 *
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 }}</el-checkbox> 26 }}</el-checkbox>
27 </p> 27 </p>
28 <!-- 独立层户 --> 28 <!-- 独立层户 -->
29 <ch-cpn v-if="ljz.cs.length" :ref="ljz.bsm" :ch="ljz.cs" /> 29 <ch-cpn v-if="ljz.cs.length" :ref="ljz.bsm" :ch="ljz.cs" :onlyShow="onlyShow"/>
30 <!-- 幢单元 --> 30 <!-- 幢单元 -->
31 <zdy-cpn v-if="ljz.zdys.length" :ref="'zdy' + ljz.bsm" :zdys="ljz.zdys" :onlyShow="onlyShow"/> 31 <zdy-cpn v-if="ljz.zdys.length" :ref="'zdy' + ljz.bsm" :zdys="ljz.zdys" :onlyShow="onlyShow"/>
32 </div> 32 </div>
...@@ -40,13 +40,14 @@ ...@@ -40,13 +40,14 @@
40 v-else 40 v-else
41 > 41 >
42 <!-- 逻辑幢名称 --> 42 <!-- 逻辑幢名称 -->
43 <p class="lpb-xmmc ljz-xmmc"> 43 <p class="lpb-xmmc ljz-xmmc" v-if="onlyShow">{{ ljzarr[0].ljzmc }}</p>
44 <p class="lpb-xmmc ljz-xmmc" v-else>
44 <el-checkbox @change="zdySelectAll($event,ljzarr[0].bsm)">{{ 45 <el-checkbox @change="zdySelectAll($event,ljzarr[0].bsm)">{{
45 ljzarr[0].ljzmc 46 ljzarr[0].ljzmc
46 }}</el-checkbox> 47 }}</el-checkbox>
47 </p> 48 </p>
48 <!-- 独立层户 --> 49 <!-- 独立层户 -->
49 <ch-cpn v-if="ljzarr[0].cs.length" :ref="ljzarr[0].bsm" :ch="ljzarr[0].cs" /> 50 <ch-cpn v-if="ljzarr[0].cs.length" :ref="ljzarr[0].bsm" :ch="ljzarr[0].cs" :onlyShow="onlyShow"/>
50 <!-- 幢单元 --> 51 <!-- 幢单元 -->
51 <zdy-cpn v-if="ljzarr[0].zdys.length" :ref="'zdy' + ljzarr[0].bsm" :zdys="ljzarr[0].zdys" :onlyShow="onlyShow"/> 52 <zdy-cpn v-if="ljzarr[0].zdys.length" :ref="'zdy' + ljzarr[0].bsm" :zdys="ljzarr[0].zdys" :onlyShow="onlyShow"/>
52 </div> 53 </div>
......
...@@ -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-09-14 14:36:51 5 * @LastEditTime: 2023-09-15 14:57:10
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,12 +13,13 @@ ...@@ -13,12 +13,13 @@
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 <span v-else>{{zdy.zdymc}}</span>
19 </p> 20 </p>
20 <!-- 每个幢单元下的层户 --> 21 <!-- 每个幢单元下的层户 -->
21 <ch-cpn :ref="zdy.bsm" :ch="zdy.cs" /> 22 <ch-cpn :ref="zdy.bsm" :ch="zdy.cs" :onlyShow="onlyShow"/>
22 </div> 23 </div>
23 </div> 24 </div>
24 </template> 25 </template>
......
...@@ -22,14 +22,9 @@ class data extends filter { ...@@ -22,14 +22,9 @@ class data extends filter {
22 ) 22 )
23 } 23 }
24 }, 24 },
25
25 { 26 {
26 prop: "ywh", 27 label: "推送状态",
27 label: "业务号",
28 // width: '110',
29 },
30 {
31 label: "权属状态",
32 // width: '80',
33 render: (h, scope) => { 28 render: (h, scope) => {
34 let obj = { 29 let obj = {
35 "0": { 30 "0": {
...@@ -52,10 +47,38 @@ class data extends filter { ...@@ -52,10 +47,38 @@ class data extends filter {
52 } 47 }
53 }, 48 },
54 { 49 {
50 prop: "ywh",
51 label: "业务号",
52 // width: '110',
53 },
54 {
55 prop: "ywh1",
56 label: "登记业务名称",
57 // width: '110',
58 },
59 {
60 prop: "ywh2",
61 label: "登记情形名称",
62 // width: '110',
63 },
64 {
65 prop: "bdcdyh",
66 label: "不动产单元号",
67 // width: '110',
68 },
69 {
55 prop: "createtime", 70 prop: "createtime",
56 label: "创建时间", 71 label: "创建时间",
57 }, 72 },
58 { 73 {
74 prop: "createtime",
75 label: "推送时间",
76 },
77 {
78 prop: "createtime1",
79 label: "响应时间",
80 },
81 {
59 label: '操作', 82 label: '操作',
60 width: '100', 83 width: '100',
61 render: (h, scope) => { 84 render: (h, scope) => {
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-15 17:07:54 4 * @LastEditTime: 2023-09-18 09:32:09
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";
...@@ -171,6 +171,7 @@ export default { ...@@ -171,6 +171,7 @@ export default {
171 this.$popupDialog('楼盘表', 'lpb/index', { 171 this.$popupDialog('楼盘表', 'lpb/index', {
172 bsm: res.result[0], 172 bsm: res.result[0],
173 onlyShow: false, 173 onlyShow: false,
174 showSave: true,
174 unitData: window.unitData 175 unitData: window.unitData
175 }, '90%', true) 176 }, '90%', true)
176 } else { 177 } else {
......
...@@ -306,6 +306,7 @@ ...@@ -306,6 +306,7 @@
306 ywPopupDialog('楼盘表', 'lpb/index', { 306 ywPopupDialog('楼盘表', 'lpb/index', {
307 bsm: item.bsm, 307 bsm: item.bsm,
308 bsmSqyw:this.sqywInfo.bsmSqyw, 308 bsmSqyw:this.sqywInfo.bsmSqyw,
309 onlyShow: false,
309 scyclx:1 310 scyclx:1
310 }, '85%', true,false) 311 }, '85%', true,false)
311 }, 312 },
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-24 11:00:59 4 * @LastEditTime: 2023-09-15 14:34:40
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 主体权利信息查询 --> 7 <!-- 主体权利信息查询 -->
...@@ -249,9 +249,9 @@ ...@@ -249,9 +249,9 @@
249 * @param {*} row 249 * @param {*} row
250 * @author: miaofang 250 * @author: miaofang
251 */ 251 */
252 handleLpbClick (item) { 252 handleLpbClick (item) {
253 console.log("item",item); 253 console.log("item",item);
254 console.log("this.sqywInfo",this.sqywInfo); 254 console.log("this.sqywInfo",this.sqywInfo);
255 this.$popup('楼盘表', 'lpb/index', { 255 this.$popup('楼盘表', 'lpb/index', {
256 width: '85%', 256 width: '85%',
257 formData: { 257 formData: {
...@@ -261,6 +261,7 @@ ...@@ -261,6 +261,7 @@
261 bsmSqyw: this.sqywInfo.bsmSqyw, 261 bsmSqyw: this.sqywInfo.bsmSqyw,
262 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "", 262 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
263 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "", 263 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
264 onlyShow: false
264 } 265 }
265 }) 266 })
266 }, 267 },
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-25 14:47:41 4 * @LastEditTime: 2023-09-15 14:24:32
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
199 bsm: item.zrzbsm, 199 bsm: item.zrzbsm,
200 zrzbsm: item.zrzbsm, 200 zrzbsm: item.zrzbsm,
201 zdbsm: item.zrzbsm, 201 zdbsm: item.zrzbsm,
202 202 onlyShow: true
203 } 203 }
204 }) 204 })
205 } 205 }
......
...@@ -23,6 +23,21 @@ class data extends filter { ...@@ -23,6 +23,21 @@ class data extends filter {
23 } 23 }
24 }, 24 },
25 { 25 {
26 label: "证书状态",
27 width: '80',
28 render: (h, scope) => {
29 return (
30 <div>
31 {
32 scope.row.zszt=='1' ?
33 <div class='allow'>有效</div> :
34 <div class='prohibit'>失效</div>
35 }
36 </div>
37 )
38 }
39 },
40 {
26 label: "领取状态", 41 label: "领取状态",
27 width: '80', 42 width: '80',
28 render: (h, scope) => { 43 render: (h, scope) => {
...@@ -38,15 +53,30 @@ class data extends filter { ...@@ -38,15 +53,30 @@ class data extends filter {
38 } 53 }
39 }, 54 },
40 { 55 {
41 prop: "lzrxm", 56 label: "不动产权证类型",
42 label: "领取人", 57 width: '120',
43 width: '100' 58 render: (h, scope) => {
44 }, 59 return (
45 { 60 <div>
46 prop: "fzsj", 61 {
47 label: "领取时间", 62 scope.row.bdcqzlx=='1' ?
48 width: '140' 63 <div>不动产权证书</div> :
64 <div>不动产登记证明</div>
65 }
66 </div>
67 )
68 }
49 }, 69 },
70 // {
71 // prop: "lzrxm",
72 // label: "领取人",
73 // width: '100'
74 // },
75 // {
76 // prop: "fzsj",
77 // label: "领取时间",
78 // width: '140'
79 // },
50 { 80 {
51 label: "业务号", 81 label: "业务号",
52 minWidth: '100', 82 minWidth: '100',
...@@ -59,15 +89,16 @@ class data extends filter { ...@@ -59,15 +89,16 @@ class data extends filter {
59 } 89 }
60 }, 90 },
61 { 91 {
62 prop: "ysxlh",
63 label: "印刷序列号",
64 width: '100'
65 },
66 {
67 label: "权利类型", 92 label: "权利类型",
68 prop: "qllx", 93 prop: "qllx",
69 }, 94 },
70 { 95 {
96 prop: "ysxlh",
97 label: "印刷序列号",
98 width: '100'
99 },
100 {
101 prop: "bdcqzh",
71 label: "不动产权证号", 102 label: "不动产权证号",
72 minWidth: '150', 103 minWidth: '150',
73 render: (h, scope) => { 104 render: (h, scope) => {
...@@ -105,7 +136,7 @@ class data extends filter { ...@@ -105,7 +136,7 @@ class data extends filter {
105 } 136 }
106 }, 137 },
107 { 138 {
108 label: "证书内容", 139 label: "证书详情",
109 width: '80', 140 width: '80',
110 render: (h, scope) => { 141 render: (h, scope) => {
111 return ( 142 return (
......
...@@ -100,6 +100,7 @@ ...@@ -100,6 +100,7 @@
100 // onlyShow: true, 100 // onlyShow: true,
101 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "", 101 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
102 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "", 102 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
103 onlyShow: true
103 } 104 }
104 }) 105 })
105 } 106 }
......