Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
5c65daec by renchao@pashanhoo.com
Options

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

2 parents d07239f1 30767602
Inline Side-by-side
Showing 13 changed files with 160 additions and 84 deletions
......@@ -173,7 +173,8 @@ export default {
break;
case "B8":
this.$popupDialog('楼盘表', 'lpb/index', {
bsm: ''
bsm: '',
onlyShow: true,
}, '90%', true)
break;
case "back": //退回按钮
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-12 16:55:35
* @LastEditTime: 2023-09-15 14:46:47
-->
<template>
<div class="edit">
......@@ -22,6 +22,7 @@
:zrzbsm="formData.bsm"
:scyclx="formData.scyclx"
:onlyShow="formData.onlyShow"
:showSave="formData.showSave"
:unitData="formData.unitData"
:sqywInfo="formData"
:key="time"></lpbContent>
......
......@@ -2,7 +2,7 @@
* @Author: yangwei
* @Date: 2023-02-28 15:47:12
* @LastEditors: yangwei
* @LastEditTime: 2023-09-14 15:04:20
* @LastEditTime: 2023-09-15 14:52:50
* @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ch.vue
* @Description:
*
......@@ -96,6 +96,10 @@ export default {
return [];
},
},
onlyShow:{
type: Boolean,
default: true,
}
},
data() {
return {
......@@ -140,23 +144,25 @@ export default {
* @author: renchao
*/
handleClickC(e, item) {
// 判断点击的层是否选中
if (e.target.className.indexOf("tdSelect") == -1) {
//未选中→选中
item.hs.forEach((h) => {
//加边框
e.target.className += " tdSelect";
h.select = true;
// 使用hbsmList时，需要去重
this.hbsmList.push(h.bsm)
});
} else {
//选中→未选中
item.hs.forEach((h) => {
e.target.className = "floor";
h.select = false;
this.hbsmList = this.hbsmList.filter((i) => i != h.bsm);
});
if (!this.onlyShow) {
// 判断点击的层是否选中
if (e.target.className.indexOf("tdSelect") == -1) {
//未选中→选中
item.hs.forEach((h) => {
//加边框
e.target.className += " tdSelect";
h.select = true;
// 使用hbsmList时，需要去重
this.hbsmList.push(h.bsm)
});
} else {
//选中→未选中
item.hs.forEach((h) => {
e.target.className = "floor";
h.select = false;
this.hbsmList = this.hbsmList.filter((i) => i != h.bsm);
});
}
}
},
//户单击事件
......@@ -168,26 +174,28 @@ export default {
* @author: renchao
*/
handleClickH(e, bsm, hs) {
let self = this;
// 开启延时器，200ms的间隔区分单击和双击，解决双击时执行两次单击事件
clearTimeout(self.time);
self.time = setTimeout(() => {
// this.closeMenu();
//判断点击的户是否选中
if (!hs.select) {
//未选中→选中
//加边框
hs.select = true;
// 将户bsm放进hbsmList
self.hbsmList.push(bsm);
} else {
//选中→未选中
hs.select = false;
self.hbsmList = self.hbsmList.filter((i) => i != bsm);
}
//更新当前选中户数据
this.$forceUpdate();
}, 200);
if (!this.onlyShow) {
let self = this;
// 开启延时器，200ms的间隔区分单击和双击，解决双击时执行两次单击事件
clearTimeout(self.time);
self.time = setTimeout(() => {
// this.closeMenu();
//判断点击的户是否选中
if (!hs.select) {
//未选中→选中
//加边框
hs.select = true;
// 将户bsm放进hbsmList
self.hbsmList.push(bsm);
} else {
//选中→未选中
hs.select = false;
self.hbsmList = self.hbsmList.filter((i) => i != bsm);
}
//更新当前选中户数据
this.$forceUpdate();
}, 200);
}
},
// 户单元状态点击事件
/**
......@@ -198,7 +206,9 @@ export default {
* @author: renchao
*/
hDyztClick(e, bsm, hs) {
this.handleClickH(e.target.parentNode, bsm, hs);
if (!this.onlyShow) {
this.handleClickH(e.target.parentNode, bsm, hs);
}
},
//户双击事件
/**
......
......@@ -4,22 +4,22 @@
<!-- 纵向倒序排列 逻辑幢位于独立幢单元和独立层户的上方 -->
<div class="ch-zdy-wrap">
<!-- 幢单元 -->
<zdy-cpn v-if="lpbData.zdys.length" :zdys="lpbData.zdys" :onlyShow="onlyShow"/>
<zdy-cpn v-if="lpbData.zdys.length" :zdys="lpbData.zdys" :onlyShow="onlyShow"/>
<!-- 独立层户 -->
<ch-cpn v-if="lpbData.cs.length" :ch="lpbData.cs" />
<ch-cpn v-if="lpbData.cs.length" :ch="lpbData.cs" :onlyShow="onlyShow"/>
</div>
<!-- 逻辑幢 -->
<ljzs-cpn v-if="lpbData.ljzs.length" :ljzs="lpbData.ljzs" :onlyShow="onlyShow"/>
</div>
<!-- 自然幢名称 -->
<!-- <p class="lpb-xmmc" :style="{ 'border-bottom': onlyShow ? 0 : '1px solid #e6e6e6'}"> -->
<p class="lpb-xmmc" :style="{ 'border-bottom':'1px solid #e6e6e6'}">
<p class="lpb-xmmc" v-if="onlyShow" style="border-bottom: 1px solid #e6e6e6">{{ lpbData.xmmc }}</p>
<p class="lpb-xmmc" v-else :style="{ 'border-bottom':'1px solid #e6e6e6'}">
<el-checkbox @change="zdySelectAll($event)">{{
lpbData.xmmc
}}</el-checkbox>
</p>
<el-button type="primary" class="save-btn" v-if="!onlyShow" @click="saveLpb">保存</el-button>
<el-button type="primary" class="save-btn" v-else @click="submitForm" :loading="loading">发起申请</el-button>
<el-button type="primary" class="save-btn" v-if="!onlyShow && showSave" @click="saveLpb">保存</el-button>
<el-button type="primary" class="save-btn" v-if="!onlyShow" @click="submitForm" :loading="loading">发起申请</el-button>
<!-- 右键菜单 -->
<ul
v-show="lpbChVisible"
......@@ -70,6 +70,10 @@ export default {
type: Boolean,
default: true,
},
showSave:{
type: Boolean,
default: false,
},
scyclx: {
type: Number,
default: 0,
......@@ -278,8 +282,8 @@ export default {
},
computed:{
lpbContentHeight(){
// return this.onlyShow ? 36 : 76
return 76
return this.onlyShow ? 32 : 76
// return 76
}
},
watch: {
......
......@@ -2,7 +2,7 @@
* @Author: yangwei
* @Date: 2023-02-28 17:25:45
* @LastEditors: yangwei
* @LastEditTime: 2023-09-14 14:35:19
* @LastEditTime: 2023-09-15 14:55:58
* @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ljzs.vue
* @Description:
*
......@@ -26,7 +26,7 @@
}}</el-checkbox>
</p>
<!-- 独立层户 -->
<ch-cpn v-if="ljz.cs.length" :ref="ljz.bsm" :ch="ljz.cs" />
<ch-cpn v-if="ljz.cs.length" :ref="ljz.bsm" :ch="ljz.cs" :onlyShow="onlyShow"/>
<!-- 幢单元 -->
<zdy-cpn v-if="ljz.zdys.length" :ref="'zdy' + ljz.bsm" :zdys="ljz.zdys" :onlyShow="onlyShow"/>
</div>
......@@ -40,13 +40,14 @@
v-else
>
<!-- 逻辑幢名称 -->
<p class="lpb-xmmc ljz-xmmc">
<p class="lpb-xmmc ljz-xmmc" v-if="onlyShow">{{ ljzarr[0].ljzmc }}</p>
<p class="lpb-xmmc ljz-xmmc" v-else>
<el-checkbox @change="zdySelectAll($event,ljzarr[0].bsm)">{{
ljzarr[0].ljzmc
}}</el-checkbox>
</p>
<!-- 独立层户 -->
<ch-cpn v-if="ljzarr[0].cs.length" :ref="ljzarr[0].bsm" :ch="ljzarr[0].cs" />
<ch-cpn v-if="ljzarr[0].cs.length" :ref="ljzarr[0].bsm" :ch="ljzarr[0].cs" :onlyShow="onlyShow"/>
<!-- 幢单元 -->
<zdy-cpn v-if="ljzarr[0].zdys.length" :ref="'zdy' + ljzarr[0].bsm" :zdys="ljzarr[0].zdys" :onlyShow="onlyShow"/>
</div>
......
......@@ -2,7 +2,7 @@
* @Author: yangwei
* @Date: 2023-02-28 16:29:04
* @LastEditors: yangwei
* @LastEditTime: 2023-09-14 14:36:51
* @LastEditTime: 2023-09-15 14:57:10
* @FilePath: \bdcdj-web\src\views\lpb\lpbContent\zdys.vue
* @Description:
*
......@@ -13,12 +13,13 @@
<div v-for="zdy in realZdys" :key="zdy.bsm">
<!-- 幢单元名称 -->
<p class="lpb-xmmc">
<el-checkbox @change="zdySelectAll($event,zdy.bsm)">{{
<el-checkbox @change="zdySelectAll($event,zdy.bsm)" v-if="!onlyShow">{{
zdy.zdymc
}}</el-checkbox>
<span v-else>{{zdy.zdymc}}</span>
</p>
<!-- 每个幢单元下的层户 -->
<ch-cpn :ref="zdy.bsm" :ch="zdy.cs" />
<ch-cpn :ref="zdy.bsm" :ch="zdy.cs" :onlyShow="onlyShow"/>
</div>
</div>
</template>
......
......@@ -22,14 +22,9 @@ class data extends filter {
)
}
},
{
prop: "ywh",
label: "业务号",
// width: '110',
},
{
label: "权属状态",
// width: '80',
label: "推送状态",
render: (h, scope) => {
let obj = {
"0": {
......@@ -52,10 +47,38 @@ class data extends filter {
}
},
{
prop: "ywh",
label: "业务号",
// width: '110',
},
{
prop: "ywh1",
label: "登记业务名称",
// width: '110',
},
{
prop: "ywh2",
label: "登记情形名称",
// width: '110',
},
{
prop: "bdcdyh",
label: "不动产单元号",
// width: '110',
},
{
prop: "createtime",
label: "创建时间",
},
{
prop: "createtime",
label: "推送时间",
},
{
prop: "createtime1",
label: "响应时间",
},
{
label: '操作',
width: '100',
render: (h, scope) => {
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-15 17:07:54
* @LastEditTime: 2023-09-18 09:32:09
*/
import { getPrintTemplateByCode } from "@/api/print";
import { uploadUndo } from "@/api/clxx";
......@@ -171,6 +171,7 @@ export default {
this.$popupDialog('楼盘表', 'lpb/index', {
bsm: res.result[0],
onlyShow: false,
showSave: true,
unitData: window.unitData
}, '90%', true)
} else {
......
......@@ -306,6 +306,7 @@
ywPopupDialog('楼盘表', 'lpb/index', {
bsm: item.bsm,
bsmSqyw:this.sqywInfo.bsmSqyw,
onlyShow: false,
scyclx:1
}, '85%', true,false)
},
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-24 11:00:59
* @LastEditTime: 2023-09-15 14:34:40
-->
<template>
<!-- 主体权利信息查询 -->
......@@ -249,9 +249,9 @@
* @param {*} row
* @author: miaofang
*/
handleLpbClick (item) {
console.log("item",item);
console.log("this.sqywInfo",this.sqywInfo);
handleLpbClick (item) {
console.log("item",item);
console.log("this.sqywInfo",this.sqywInfo);
this.$popup('楼盘表', 'lpb/index', {
width: '85%',
formData: {
......@@ -261,6 +261,7 @@
bsmSqyw: this.sqywInfo.bsmSqyw,
djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
onlyShow: false
}
})
},
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-25 14:47:41
* @LastEditTime: 2023-09-15 14:24:32
-->
<template>
<div class="from-clues">
......@@ -199,7 +199,7 @@
bsm: item.zrzbsm,
zrzbsm: item.zrzbsm,
zdbsm: item.zrzbsm,
onlyShow: true
}
})
}
......
......@@ -23,6 +23,21 @@ class data extends filter {
}
},
{
label: "证书状态",
width: '80',
render: (h, scope) => {
return (
<div>
{
scope.row.zszt=='1' ?
<div class='allow'>有效</div> :
<div class='prohibit'>失效</div>
}
</div>
)
}
},
{
label: "领取状态",
width: '80',
render: (h, scope) => {
......@@ -38,15 +53,30 @@ class data extends filter {
}
},
{
prop: "lzrxm",
label: "领取人",
width: '100'
},
{
prop: "fzsj",
label: "领取时间",
width: '140'
label: "不动产权证类型",
width: '120',
render: (h, scope) => {
return (
<div>
{
scope.row.bdcqzlx=='1' ?
<div>不动产权证书</div> :
<div>不动产登记证明</div>
}
</div>
)
}
},
// {
// prop: "lzrxm",
// label: "领取人",
// width: '100'
// },
// {
// prop: "fzsj",
// label: "领取时间",
// width: '140'
// },
{
label: "业务号",
minWidth: '100',
......@@ -59,15 +89,16 @@ class data extends filter {
}
},
{
prop: "ysxlh",
label: "印刷序列号",
width: '100'
},
{
label: "权利类型",
prop: "qllx",
},
{
prop: "ysxlh",
label: "印刷序列号",
width: '100'
},
{
prop: "bdcqzh",
label: "不动产权证号",
minWidth: '150',
render: (h, scope) => {
......@@ -105,7 +136,7 @@ class data extends filter {
}
},
{
label: "证书内容",
label: "证书详情",
width: '80',
render: (h, scope) => {
return (
......
......@@ -100,6 +100,7 @@
// onlyShow: true,
djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
onlyShow: true
}
})
}
......