a87ac918 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents f273ca1f 862004bb
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-11-10 10:34:55
* @LastEditTime: 2023-11-14 13:28:47
*/
import { mapGetters } from 'vuex'
import { defaultParameters } from "../../views/ywbl/ywsq/javascript/publicDefaultPar";
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-11-10 10:55:05
* @LastEditTime: 2023-11-14 13:25:36
-->
<template>
<div class="rlPopup">
......@@ -362,7 +362,7 @@
height: 66px;
line-height: 75px;
color: #fff;
background-color: rgb(239, 239, 239);
background-color: #ccc;
border-radius: 50%;
cursor: pointer;
text-align: center;
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-11-10 10:55:18
* @LastEditTime: 2023-11-14 13:25:42
-->
<template>
<div class="rlPopup">
......@@ -361,7 +361,7 @@
height: 66px;
line-height: 75px;
color: #fff;
background-color: rgb(239, 239, 239);
background-color: #ccc;
border-radius: 50%;
cursor: pointer;
text-align: center;
......
......@@ -70,7 +70,7 @@
<style lang="scss" scoped>
.djbfm {
width: 100%;
height: 80%;
height: 100%;
background: #fff;
line-height: 45px;
text-align: center;
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-10-12 09:56:45
* @LastEditTime: 2023-11-14 13:25:49
-->
<template>
<div class="rlPopup">
......@@ -165,7 +165,7 @@
height: 66px;
line-height: 75px;
color: #fff;
background-color: rgb(239, 239, 239);
background-color: #ccc;
border-radius: 50%;
cursor: pointer;
text-align: center;
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-11-10 10:41:04
* @LastEditTime: 2023-11-14 15:10:12
-->
<template>
<div class="content">
......@@ -11,6 +11,7 @@
:data="treedata"
:props="defaultProps"
@node-click="handleNodeClick"
:highlight-current="highlight"
:default-expand-all="true"
:expand-on-click-node="false"
node-key="id"
......@@ -24,7 +25,8 @@
:key="index"
:name="index">
<template slot="title">
<span class="text" :class="[titleActive == index ? 'nameSelect' : '']" @click="tap(item, index)">
<!-- nameSelect -->
<span class="text" :class="[titleActive == index ? 'curentSelect' : '']" @click="tap(item, index)">
<span> {{ item.label }}</span>
</span>
</template>
......@@ -63,6 +65,7 @@
},
data () {
return {
highlight: true,
activeName: 0,
titleActive: "",
//接收参数
......@@ -101,6 +104,7 @@
* 点击不动产单元号事件
*/
getBdcdyh (val) {
this.highlight = false
this.addloadData(val);
},
/**
......@@ -118,12 +122,9 @@
return item.bdcdyid == val.bdcdyid
})
this.activeName = index
this.titleActive = -1
this.titleActive = this.activeName
} else {
this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid))
this.activeName = this.sfqdata.length - 1
this.titleActive = this.activeName
}
this.$nextTick(function () {
......@@ -135,6 +136,7 @@
this.sfqdata[0].children.forEach((item, index) => {
if (item.id == this.defaultNode.id) {
this.isActive = index
this.titleActive = -1
this.loadComponent(item.form)
}
})
......@@ -172,9 +174,10 @@
if (item.id == this.defaultNode.id) {
this.loadComponent(item.form);
this.isActive = index;
this.titleActive = -1
}
});
});
})
})
}
});
this.currentSelectProps = {
......@@ -190,6 +193,9 @@
* @author: renchao
*/
handleNodeClick (data) {
this.highlight = true
this.titleActive = -1
this.isActive = -1
this.loadComponent(data.form);
},
/**
......@@ -203,10 +209,13 @@
this.isActive = -1
this.titleActive = index
this.loadComponent(data.form);
this.highlight = false
},
taplist (data, index) {
this.loadComponent(data.form);
this.isActive = index;
this.titleActive = -1
this.highlight = false
},
/**
* @description: loadComponent
......@@ -221,6 +230,26 @@
}
</script>
<style scoped lang="scss">
/deep/.el-collapse-item__header .el-collapse-item__arrow:hover {
transition: transform 0.3s;
transform: scale(1.3);
z-index: 1;
color: #0079fe;
font-weight: 700;
}
/deep/.el-tree--highlight-current
.el-tree-node.is-current
> .el-tree-node__content {
background-color: #f5f5f5;
color: #0079fe;
border-right: 4px solid #0079fe;
}
.curentSelect {
background-color: #f5f5f5;
color: #0079fe;
border-right: 4px solid #0079fe;
border-bottom: 1px solid #ffffff;
}
.content {
width: 100%;
height: 100%;
......@@ -238,8 +267,6 @@
.right {
width: calc(100% - 256px);
height: 704px;
// overflow-y: scroll;
// overflow: auto;
background-color: #f5f5f5;
border: 1px solid rgb(228, 228, 228);
}
......@@ -255,22 +282,10 @@
height: 45px;
}
/deep/ .el-tree-node:focus > .el-tree-node__content {
// background-color: #f5f5f5;
// color: #0079fe;
// border-right: 4px solid #0079fe;
}
/deep/.el-tree-node {
white-space: pre-wrap;
}
/deep/ .is-current > .el-tree-node__content {
// background-color: #f5f5f5;
// color: #0079fe;
// border-right: 4px solid #0079fe;
}
/deep/.el-collapse-item__header {
width: 100%;
cursor: pointer;
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-10-10 09:11:05
* @LastEditTime: 2023-11-14 14:50:46
-->
<template>
<div class="djbfm">
......@@ -75,7 +75,7 @@
<style lang="scss" scoped>
.djbfm {
width: 100%;
height: 80%;
height: 100%;
position: relative;
.print {
z-index: 10;
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-11-10 10:53:37
* @LastEditTime: 2023-11-14 13:25:52
-->
<template>
<div class="rlPopup">
......@@ -363,7 +363,7 @@
height: 66px;
line-height: 75px;
color: #fff;
background-color: rgb(239, 239, 239);
background-color: #ccc;
border-radius: 50%;
cursor: pointer;
text-align: center;
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-11-14 15:15:10
-->
<template>
<div class="from-clues">
<!-- 表单部分 -->
<div class="from-clues-header">
<el-form :model="queryForm" ref="queryForm" label-width="100px">
<el-row>
<el-col :span="7">
<el-form-item label="不动产权证号">
<el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="不动产单元号">
<el-input placeholder="请输入不动产单元号" v-model="queryForm.bdcdyh" clearable maxlength="28" class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="坐落" label-width="60px">
<el-input placeholder="请输入坐落" v-model.trim="queryForm.zl" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="4" class="btnColRight">
<el-form-item>
<el-button type="primary" @click="handleSearch">查询</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<!-- 表格 -->
<div class="mergeTable loadingtext">
<el-table
:data="tableData.data"
height="230"
border
:cell-style="{ textAlign: 'center' }"
:header-cell-style="{textAlign: 'center'}"
@row-click="handleRowClick"
style="width: 100%">
<el-table-column
label="选择"
width="50">
<template slot-scope="scope">
<el-radio v-model="radioVal" @change="handleSelect" @click.native.stop :label="scope.row.bdcdyh">{{''}}</el-radio>
</template>
</el-table-column>
<el-table-column
type="index"
label="序号"
width="50">
</el-table-column>
<el-table-column
label="状态"
width="150">
<template slot-scope="scope">
<a style='color:#3498db;' v-show="scope.row.djblzt==1">正在办理</a>
<span v-show="scope.row.zjgcdyzt==1">>,在建工程抵押</span>
<span v-show="scope.row.ycfzt==1">>,已预查封</span>
<span v-show="scope.row.ycfzt==1">>,已预查封</span>
<span v-show="scope.row.cfzt==1">>,已查封</span>
<span v-show="scope.row.diyizt==1">>,已地役</span>
<span v-show="scope.row.yyzt==1">>,异议中</span>
<span v-show="scope.row.xzzt==1">,已限制</span>
<span v-show="scope.row.ygmmzt==1">>,已预告买卖</span>
<span v-show="scope.row.ygdyzt==1">>,已预告抵押</span>
<span v-show="scope.row.dyzt==1">>,已抵押</span>
</template>
</el-table-column>
<el-table-column
property="qllxmc"
label="权利类型">
</el-table-column>
<el-table-column
property="bdcdyh"
label="不动产单元号"
width="150">
</el-table-column>
<el-table-column
property="bdcqzh"
label="不动产权证号"
width="160">
</el-table-column>
<el-table-column
property="gyqk"
label="共有情况">
</el-table-column>
<el-table-column
property="qlrmc"
label="权利人">
</el-table-column>
<el-table-column
property="qlrzjhm"
label="证件号">
</el-table-column>
<el-table-column
property="qlxzmc"
label="权利性质">
</el-table-column>
<el-table-column
property="qlytmc"
label="用途">
</el-table-column>
<el-table-column
property="qlmjmc"
label="面积">
</el-table-column>
<el-table-column
property="zl"
label="坐落">
</el-table-column>
<el-table-column
label="操作"
width="80">
<template slot-scope="scope">
<el-button type="text" icon="el-icon-edit-outline" @click="openBook(scope.row)">登记薄</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="mergeTable loadingtext">
房屋变化情况
<lb-table ref="table" :pagination=false :calcHeight="450" :column="tableData.columns1"
:data="tableData.datastwo">
</lb-table>
</div>
<div class="submit_button">
<el-button @click="$popupCacel">取消</el-button>
<el-button type="primary" plain @click="submitForm" :loading="loading">发起申请</el-button>
</div>
</div>
</template>
<script>
//首次登记
import jump from "./mixin/jump";
import store from '@/store/index.js'
import table from "@/utils/mixin/table";
import { ywPopupDialog } from "@/utils/popup.js";
import { datas, sendThis } from "../javascript/selectFwfgSplitMerge.js";
import { defaultParameters } from "../javascript/publicDefaultPar.js";
import { selectJsydQlxxSplitMergeBefore, selectZdjbxxSplitMerge } from "@/api/ywsq.js";
import { startBusinessFlow } from "@/api/workFlow.js";
export default {
mixins: [table, jump],
props: {
isJump: { type: Boolean, default: false },
sqywInfo: { type: Object, default: () => { } },
},
data () {
return {
loading: false,
queryForm: defaultParameters.defaultParameters(),
// 表格数据
tableData: {
data: [],
columns1: datas.columns(),
datastwo: []
},
bdcdysz: [],
radioVal: ""
}
},
mounted () {
sendThis(this)
},
methods: {
/**
* @description: 单选事件
* @author: renchao
*/
handleSelect () {
this.tableData.data.forEach(item => {
if (this.radioVal == item.bdcdyh) {
item.bglx = '1'
this.bdcdysz[0] = item
this.queryForm.bhqkbsm = item.bhqkbsm
}
})
selectZdjbxxSplitMerge({ ...this.queryForm }).then((res) => {
this.$endLoading();
if (res.code === 200) {
this.tableData.datastwo = res.result
this.tableData.datastwo.forEach(item => {
item.bsm = item.zdbsm;
})
this.bdcdysz = this.tableData.datastwo
}
})
},
/**
* @description: queryClick
* @author: renchao
*/
queryClick () {
this.$startLoading();
this.queryForm.sqywbm = this.sqywInfo.djywbm;
selectJsydQlxxSplitMergeBefore({ ...this.queryForm, ...this.pageData }).then((res) => {
this.$endLoading();
if (res.code === 200) {
this.tableData.data = res.result
}
});
},
/**
* @description: submitForm
* @author: renchao
*/
submitForm () {
this.loading = true
startBusinessFlow({
bsmSqyw: this.sqywInfo.bsmSqyw,
bdcdysz: this.bdcdysz,
}).then((res) => {
this.loading = false
if (res.code == 200) {
this.$message({
showClose: true,
message: "发起申请成功",
type: "success",
});
if (!this.isJump) {
this.jump(res.result, this.sqywInfo.djywbm);
} else {
store.dispatch('user/refreshPage', true);
}
this.$popupCacel()
} else {
if (res.result && res.result.length > 0) {
ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
} else {
ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
}
}
}).catch(() => {
this.loading = false
})
},
/**
* @description: openBook
* @param {*} row
* @author: renchao
*/
openBook (row) {
var param = {
bdcdyid: row.bdcdyid,
qllx: row.qllx,
bdcdyh: row.bdcdyh,
bsmQlxx: row.bsmQlxx,
};
this.$popup("登记簿详情", "registerBook/djbFrame", {
formData: param
})
},
/**
* @description: select
* @param {*} selection
* @param {*} row
* @author: renchao
*/
select (selection, row) {
if (this.sqywInfo.sqywdylx == "1") {
// 清除 所有勾选项
this.$refs.table.clearSelection()
// 当表格数据都没有被勾选的时候 就返回
// 主要用于将当前勾选的表格状态清除
if (selection.length == 0) return
this.$refs.table.toggleRowSelection(row, true);
}
},
/**
* @description: handleRowClick
* @param {*} row
* @author: renchao
*/
handleRowClick (row) {
this.queryForm.bhqkbsm = row.bhqkbsm
this.radioVal = row.bdcdyh
row.bglx = '1'
selectZdjbxxSplitMerge({ ...this.queryForm }).then((res) => {
this.$endLoading();
if (res.code === 200) {
this.tableData.datastwo = res.result
this.tableData.datastwo.forEach(item => {
item.bsm = item.zdbsm;
})
this.bdcdysz = this.tableData.datastwo
}
})
}
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
@import "~@/styles/public.scss";
.mergeTable {
margin-top: 5px;
}
/deep/.el-radio__label {
display: none;
}
</style>
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-11-14 13:23:26
* @LastEditTime: 2023-11-14 15:16:22
-->
<template>
<div class="from-clues">
......@@ -45,7 +45,7 @@
</el-form>
</div>
<!-- 表格 -->
<div class="from-clues-content loadingtext">
<div class="mergeTable loadingtext">
<el-table
:data="tableData.data"
height="230"
......@@ -123,9 +123,9 @@
</el-table>
</div>
<div class="from-clues-content loadingtext">
<div class="mergeTable loadingtext">
土地变化情况
<lb-table ref="table" :pagination=false :calcHeight="500" :column="tableData.columns1"
<lb-table ref="table" :pagination=false :calcHeight="450" :column="tableData.columns1"
:data="tableData.datastwo">
</lb-table>
</div>
......@@ -298,6 +298,9 @@
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
@import "~@/styles/public.scss";
.mergeTable {
margin-top: 5px;
}
/deep/.el-radio__label {
display: none;
}
......
......@@ -216,10 +216,9 @@
this.$popup("登记簿详情", "registerBook/djbFrame", {
formData: param
})
},
},
};
}
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-11-14 14:16:21
*/
import filter from '@/utils/filter.js'
let vm = null
const sendThis = (_this) => {
vm = _this
}
class data extends filter {
constructor() {
super()
}
columns () {
return [
{
type: 'selection',
label: '全选',
},
{
label: '序号',
type: 'index',
width: '50',
render: (h, scope) => {
return (
<div>
{(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
</div>
)
}
},
{
prop: "status",
label: "状态",
width: '130',
render: (h, scope) => {
return (
<div>
<a style='color:#3498db;' v-show={scope.row.djblzt == 1}>{this.yWstatus(scope.row)}</a>
<span v-show={scope.row.djblzt != 1}>{this.yWstatus(scope.row)}</span>
</div>
)
}
},
{
prop: "qllxmc",
label: "权利类型",
minWidth: '130'
},
{
prop: "bdcdyh",
label: "不动产单元号",
minWidth: '130'
},
{
label: "不动产权证号",
width: '150',
render: (h, scope) => {
return (
<el-tooltip effect="dark" content={scope.row.bdcqzh} placement="top" popper-class="tooltip-width ">
<span class="ellipsis-table"> {scope.row.bdcqzh}</span>
</el-tooltip>
)
}
},
{
prop: "gyqk",
label: "共有情况",
},
{
label: "权利人",
width: '120',
render: (h, scope) => {
return (
<el-tooltip effect="dark" content={scope.row.qlrmc} placement="top" popper-class="tooltip-width ">
<span class="ellipsis-table"> {scope.row.qlrmc}</span>
</el-tooltip>
)
}
},
{
label: "证件号",
witdth: '100',
render: (h, scope) => {
return (
<el-tooltip effect="dark" content={scope.row.qlrzjhm} placement="top" popper-class="tooltip-width ">
<span class="ellipsis-table"> {scope.row.qlrzjhm}</span>
</el-tooltip>
)
}
},
{
prop: "qlxzmc",
label: "权利性质",
},
{
label: "用途",
width: '120',
render: (h, scope) => {
return (
<el-tooltip effect="dark" content={scope.row.qlytmc} placement="top" popper-class="tooltip-width ">
<span class="ellipsis-table"> {scope.row.qlytmc}</span>
</el-tooltip>
)
}
},
{
prop: "qlmjmc",
label: "面积",
},
{
label: "坐落",
minWidth: '150',
render: (h, scope) => {
return (
<el-tooltip effect="dark" content={scope.row.zl} placement="top" popper-class="tooltip-width ">
<span class="ellipsis-table"> {scope.row.zl}</span>
</el-tooltip>
)
}
},
{
label: '操作',
width: '80',
align: 'center',
fixed: 'right',
render: (h, scope) => {
return (
<div>
<el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
</div>
)
}
}
]
}
}
let datas = new data()
export {
datas,
sendThis
}
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-10-31 08:50:23
* @LastEditTime: 2023-11-14 14:15:21
*/
import filter from '@/utils/filter.js'
let vm = null
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-11-14 13:10:27
* @LastEditTime: 2023-11-14 13:48:11
*/
import filter from '@/utils/filter.js'
let vm = null
......@@ -41,11 +41,12 @@ class data extends filter {
},
{
prop: "qllxmc",
width: 140,
label: "权利类型",
},
{
label: "不动产单元号",
width: '150',
width: 170,
render: (h, scope) => {
return (
<el-tooltip effect="dark" content={scope.row.bdcdyh} placement="top" popper-class="tooltip-width ">
......@@ -56,7 +57,7 @@ class data extends filter {
},
{
label: "不动产权证号",
width: '150',
width: 170,
render: (h, scope) => {
return (
<el-tooltip effect="dark" content={scope.row.bdcqzh} placement="top" popper-class="tooltip-width ">
......@@ -75,7 +76,7 @@ class data extends filter {
},
{
prop: "qlxzmc",
width: '80',
width: 100,
label: "权利性质",
},
{
......@@ -129,37 +130,38 @@ class datatwo extends filter {
}
},
{
label: "状态",
width: '130',
label: "变更类型",
width: 80,
render: (h, scope) => {
return (
<div>
<a style='color:#3498db;' v-show={scope.row.djblzt == 1}>{this.yWstatus(scope.row)}</a>
<span v-show={scope.row.djblzt != 1}>{this.yWstatus(scope.row)}</span>
{
scope.row.bglx == '1' ? <span>变更前</span> : <span>变更后</span>
}
</div>
)
}
},
{
label: "变更类型",
width: 80,
label: "状态",
width: '130',
render: (h, scope) => {
return (
<div>
{
scope.row.bglx == '1' ? <span>变更前</span> : <span>变更后</span>
}
<a style='color:#3498db;' v-show={scope.row.djblzt == 1}>{this.yWstatus(scope.row)}</a>
<span v-show={scope.row.djblzt != 1}>{this.yWstatus(scope.row)}</span>
</div>
)
}
},
{
prop: "qllxmc",
width: 140,
label: "权利类型",
},
{
label: "不动产单元号",
width: '150',
width: 170,
render: (h, scope) => {
return (
<el-tooltip effect="dark" content={scope.row.bdcdyh} placement="top" popper-class="tooltip-width ">
......@@ -170,7 +172,7 @@ class datatwo extends filter {
},
{
label: "不动产权证号",
width: '150',
width: 170,
render: (h, scope) => {
return (
<el-tooltip effect="dark" content={scope.row.bdcqzh} placement="top" popper-class="tooltip-width ">
......@@ -186,15 +188,16 @@ class datatwo extends filter {
{
prop: "qlrzjhm",
label: "证件号",
width: 150,
},
{
prop: "qlxzmc",
width: '80',
width: 100,
label: "权利性质",
},
{
prop: "qlmjmc",
width: '100',
width: 100,
label: "使用权面积",
},
{
......
export function queueDjywmc (djywbm, djqxbm) {
console.log(djywbm, 'djywbm');
console.log(djywbm, 'djywbm', 'djqxbm', djqxbm);
// 土地分割
if (djqxbm == "A0320099" || djqxbm == "A0330099") {
return "selectJsydsyqSplitMerge";
}
// 房屋分割
if (['A04300S1', 'A04200S1', 'A04300S2'].includes(djqxbm)) {
return "selectFwfgSplitMerge";
}
if (djqxbm == "A37100S2") {
return "selectYgdy";
}
......@@ -47,6 +52,7 @@ export function queueDjywmc (djywbm, djqxbm) {
case "B37100": // 在建工程抵押权 || 首次登记
vm = "fwsyq";
break;
// 房屋分割
case "A04200": //国有建设用地使用权/房屋所有权 || 转移登记
case "A04300":
case "A04400":
......