be043e2c by renchao@pashanhoo.com

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

2 parents 204ba7b4 6fd2bd04
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-16 14:05:25
*/
import request from '@/utils/request'
let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
/**
* @description: 获取申请查询列表
* @param {*} data
* @author: renchao
*/
export function getSqcxPage (data) {
return request({
url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/getSqcxPage',
method: 'post',
data
})
}
/**
* @description: 新增申请查询家庭房产信息
* @param {*} data
* @author: renchao
*/
export function addJtfcCxjgXx (data) {
return request({
url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/addJtfcCxjgXx',
method: 'post',
data
})
}
/**
* @description: 新增申请查询房屋明细信息
* @param {*} data
* @author: renchao
*/
export function addFwmxCxjgXx (data) {
return request({
url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/addFwmxCxjgXx',
method: 'post',
data
})
}
/**
* @description: 获取申请查询记录详细信息
* @param {*} params
* @author: renchao
*/
export function getJtfcInfo (params) {
return request({
url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/getJtfcInfo/',
method: 'get',
params
})
}
/**
* @description: 获取房屋明细记录详细信息
* @param {*} params
* @author: renchao
*/
export function getFwmxInfo (params) {
return request({
url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/getFwmxInfo/',
method: 'get',
params
})
}
/**
* @description: 打印家庭房产
* @param {*} data
* @author: renchao
*/
export function printJtcfInfo (data) {
return request({
url: SERVER.SERVERAPI + '/rest/djbRepair/addRepairRecord',
method: 'post',
data
})
}
......@@ -29,6 +29,18 @@ export function getleftMenu () {
method: 'post'
})
}
/**
* @description: 登记簿补录-获取左侧菜单
* @author: renchao
*/
export function getRepairBiz () {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/BusinessApply/getRepairBiz',
method: 'post'
})
}
/**
* @description: 业务办理-获取下个节点内容
* @param {*} bsmSqyw
......
......@@ -126,7 +126,6 @@
methods: {
// 单选
singleElection (row) {
console.log("点击行");
this.selected = this.data.indexOf(row);
},
......
......@@ -3,7 +3,7 @@
var qlxxPage = [
{ qllx: "A01", id: "jsydsyq", form: "jsydsyq.vue", label: "集体土地所有权" },
{ qllx: "A02", id: "jsydsyq", form: "jsydsyq.vue", label: "国家土地所有权" },
{ qllx: "A03", id: "jsydsyq", form: "jsydsyq.vue", label: "国有建设用地使用权" },
{ qllx: "A03", id: "fdcq2", form: "jsydsyq.vue", label: "国有建设用地使用权" },
{ qllx: "A04", id: "", form: "", label: "国有建设用地使用权/房屋所有权" },
{ qllx: "A05", id: "jsydsyq", form: "jsydsyq.vue", label: "宅基地使用权" },
{ qllx: "A06", id: "", form: "", label: "宅基地使用权/房屋所有权" },
......@@ -46,7 +46,7 @@ export function loadTreeData(qlxxData, bdcdyh) {
treedata.push({ id: "zdjbxx", form: "zdjbxx.vue", label: "宗地基本信息", children: [] });
treedata[1].children.push({ id: "bdcqldjml", form: "bdcqldjml.vue", label: "不动产权利登记目录", children: [] });
treedata[1].children[0].children.push({
id: "bdcqljqtsx", form: "bdcqljqtsx.vue", label: "不动产权利及其他事项\n (" + bdcdyh.slice(19) + ")", children: [],
id: "bdcqljqtsx", form: "bdcqljqtsx.vue", label: "不动产权利及其他事项", children: [],
});
//主体权利
treedata[1].children[0].children[0].children.push(getNode(qlxxData.ztqllx, qlxxData.ztql, qlxxData.bdcdylx));
......
......@@ -98,6 +98,18 @@ import { loadTreeData, getNode } from "./djbFrameData.js";
methods: {
//读取申请单元信息
loadBdcdylist () {
var formdata = new FormData();
formdata.append("bsmSlsq", this.bsmSlsq);
formdata.append("bestepid", this.bestepid);
leftMenu(formdata).then((res) => {
if (res.code === 200 && res.result) {
this.currentSelectProps = res.result[0];
this.$emit('getCurrentSelectProps', this.currentSelectProps);
// this.getdjblist()
}
})
this.loadData ()
},
// 获取登记簿菜单
......@@ -106,98 +118,10 @@ import { loadTreeData, getNode } from "./djbFrameData.js";
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
}]
// getBdcqljqtsx({
// bdcdyid: this.bdcdyid,
// bdcdyh: this.bdcdyh,
// }).then((res) => {
// if (res.code === 200) {
// this.treedata = loadTreeData(res.result, this.bdcdyh);
// this.$nextTick(function () {
// this.defaultNode = getNode(this.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, "");
// this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
// this.$parent.loadComponent(this.currentSelectProps,this.defaultNode);
// });
// }
// });
// this.currentSelectProps = {
// bdcdyid: this.bdcdyid,
// bdcdyh: this.bdcdyh,
// qllx: this.qllx,
// bsmQlxx: this.bsmQlxx,
// bestepid:this.bestepid
// };
// this.$parent.stepForm();
},
handleNodeClick (data, node, elem) {
console.log("this.currentSelectProps",this.currentSelectProps);
console.log("data",data);
this.$parent.loadComponent(this.currentSelectProps,data);
this.$parent.tabset();
},
......@@ -214,6 +138,7 @@ import { loadTreeData, getNode } from "./djbFrameData.js";
},
//登记簿点击事件
djbClick () {
console.log("this.currentSelectProps",this.currentSelectProps);
this.currentSelectProps.batchOperation = true;
this.$parent.getdjblist()
......
......@@ -543,7 +543,6 @@ export default {
@include flex;
flex-direction: column;
overflow-y: hidden;
height: 620px;
padding: 0 2px;
.btn {
......
......@@ -49,12 +49,9 @@ export default {
formdata.append("bestepid", this.bestepid);
stepExpandInfo(formdata).then((res) => {
if (res.code === 200) {
this.leftButtonList =[];
this.rightButtonList = res.result.operation;
this.slsq = res.result.slsq
console.log("this.slsq",this.slsq);
console.log("this.rightButtonList",this.rightButtonList);
this.rightButtonList.splice(0,2)
this.leftButtonList = res.result.button;
this.rightButtonList = res.result.operation;
// this.rightButtonList.splice(0,2)
}
})
......
......@@ -81,7 +81,7 @@ import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue";
import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js";
// 登记簿数据信息
import { leftMenu } from "@/api/fqsq.js"
import { getBdcqljqtsx } from "@/api/registerBook.js";
export default {
components: {
......@@ -121,53 +121,40 @@ export default {
};
},
mounted() {
this.getdjblist()
},
methods: {
getCurrentSelectProps (val) {
this.currentSelectProps = val
this.getdjblist()
},
getdjblist(){
getBdcqljqtsx({
bdcdyid: this.bdcdyid,
bdcdyh: this.bdcdyh,
bdcdyid: this.currentSelectProps.bdcdyid,
bdcdyh: this.currentSelectProps.bdcdyh,
}).then((res) => {
if (res.code === 200) {
this.treedata = loadTreeData(res.result, this.bdcdyh);
this.$nextTick(function () {
this.defaultNode = getNode(this.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, "");
console.log("this.defaultNode.idssssssssssssssssss",this.defaultNode.id);
this.defaultNode = getNode(this.currentSelectProps.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, "");
this.tabName =this.defaultNode.id; //data[0].id为默认选中的节点
});
}
});
this.currentSelectProps = {
bdcdyid: this.bdcdyid,
bdcdyh: this.bdcdyh,
qllx: this.qllx,
bsmQlxx: this.bsmQlxx,
bestepid:this.bestepid
};
setTimeout(() => {
let settree=JSON.parse(JSON.stringify(this.treedata))
console.log("settreesettreesettree",settree);
this.tabdata=
this.tabdata=[...settree,...settree[1].children[0].children[0].children]
console.log("this.tabdata",this.tabdata);
this.tabdata.forEach((item,index,arr) => {
arr[index].name=item.label;
arr[index].value=item.id
})
this.tabList=this.tabdata
}, 200)
// this.tabdatalet
},
tabset(){
console.log("补录信息");
this.tabList = [
{
name: "受理信息",
......@@ -189,7 +176,7 @@ this.getdjblist()
},
// stepForm(index){
// console.log("stepForm()",11111111111111111,index);
// console.log(index);
// },
//右侧表单选项卡事件
......@@ -198,12 +185,12 @@ this.getdjblist()
},
//切换选项卡内容组件
getFromRouter (tabname) {
for (let item of this.tabList) {
if (item.value === tabname) {
this.currentSelectTab = item
break;
}
}
// for (let item of this.tabList) {
// if (item.value === tabname) {
// this.currentSelectTab = item
// break;
// }
// }
this.componentTag = getForm(tabname, this.$route.query.sqywbm);
}
},
......
......@@ -86,7 +86,6 @@ export default {
leftMenu(formdata).then((res) => {
if (res.code === 200 && res.result) {
this.unitData = res.result;
console.log("this.unitData",this.unitData);
this.currentSelectProps = res.result[0];
this.$emit('getCurrentSelectProps', this.currentSelectProps);
this.judgeBatchShow();
......
<!--
* @Description:
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:42:49
-->
......@@ -210,7 +210,19 @@
if (res.code == 200) {
if (res.result) {
//有任务权限
const { href } = this.$router.resolve(
if(item.sjlx=="3"){
const { href } = this.$router.resolve(
"/djbworkFrame?bsmSlsq=" +
item.bsmSlsq +
"&bestepid=" +
item.bestepid +
"&bsmBusiness=" +
"&sqywbm=" +
item.djywbm
);
window.open(href, `urlname${item.bsmSlsq}`);
}else{
const { href } = this.$router.resolve(
"/workFrame?bsmSlsq=" +
item.bsmSlsq +
"&bestepid=" +
......@@ -219,8 +231,11 @@
"&sqywbm=" +
item.djywbm
);
window.open(href, `urlname${item.bsmSlsq}`);
}
localStorage.setItem('ywbl', JSON.stringify(item));
window.open(href, `urlname${item.bsmSlsq}`);
//从待办箱进入的调取任务领取接口
claimTask(item.bsmSlsq, item.bestepid);
} else {
......
<template>
<div class="from-clues">
<!-- 表单部分 -->
<div class="from-clues-header">
<el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="70px">
<el-row>
<!-- <el-col :span="5">
<el-form-item label="权利类型">
<el-select v-model="queryForm.qllx" filterable class="width100" clearable placeholder="请选择权利类型">
<el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode">
</el-option>
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="5">
<el-form-item label="不动产单元号" label-width="105px">
<el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="不动产权证号" label-width="105px">
<el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="业务号">
<el-input placeholder="请输入业务号" v-model="queryForm.ywh" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="4" class="btnColRight">
<el-form-item>
<el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button>
<el-button @click="moreQueryClick">高级查询</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<!-- 表格 -->
<div class="from-clues-content">
<lb-table :page-size="pageData.size" class="loadingtext" @sort-change="handleSort"
:current-page.sync="pageData.current" :total="tableData.total" @size-change="handleSizeChange"
@p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
</lb-table>
</div>
</div>
</template>
<script>
import { mapGetters } from "vuex";
import table from "@/utils/mixin/table";
import { datas, sendThis } from "../javascript/selectDjbbl.js";
import { getDjbBysearch } from "@/api/zhcx.js";
export default {
name: "djbcx",
mixins: [table],
mounted () {
sendThis(this);
this.queryClick()
},
data () {
return {
queryForm: {
qllx: "",
bdcdyh: "",
bdcqzh: "",
ywh: "",
},
pageData: {
current: 1,
size: 10,
total: 0,
},
tableData: {
columns: datas.columns(),
data: [],
},
qllxs: [],
isDialog: false,
djbxxData: {},
};
},
computed: {
// ...mapGetters(["dictData"]),
},
methods: {
// 初始化数据
queryClick () {
this.$startLoading()
getDjbBysearch({ ...this.queryForm, ...this.pageData }).then((res) => {
this.$endLoading()
if (res.code === 200) {
let { total, records } = res.result;
this.tableData.data = records;
this.tableData.total = total;
}
});
},
handleSort (name, sort) {
console.log(name, sort);
},
// 高级查询
moreQueryClick () { },
// openDialog (scroll) {
// this.$popupDialog('登记簿详情', 'registerBook/djbFrame', scroll, '85%');
// },
// handleLpbClick (item) {
// this.$popupDialog('楼盘表', 'lpb/index', {
// bsm: ''
// }, '85%')
// },
ywhClick (item) {
const { href } = this.$router.resolve(
"/djbworkFrame?bdcdyid=" +
item.bdcdyid+
"&bdcdyh=" +
item.bdcdyh+
"&qllx="+
item.qllx+
"&bsmQlxx="+
item.bsmQlxx +
"&viewtype=1"
);
localStorage.setItem('ywbl', JSON.stringify(item));
window.open(href, `urlname${item.bdcdyid}`);
},
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
@import "~@/styles/public.scss";
.icon-circle {
position: relative;
}
.icon-circle::before {
content: "";
width: 4px;
height: 4px;
border-radius: 50%;
background: #000;
top: 0px;
left: 0px;
}
</style>
......@@ -31,7 +31,18 @@
<!-- 一并申请 -->
<div v-if="selectType == 'together'" class="right-title">一并申请</div>
<!-- 登记簿补录 -->
<div v-if="selectType == 'amend'" class="right-title">登记簿补录</div>
<div v-if="selectType == 'amend'" class="right-situation el-card">
<div class="right-title">登记簿补录</div>
<ul>
<li :class="item.selected ? 'cactive' : ''" v-for="(item, index) in djqxList" :key="index"
@dblclick="dblclick(djqxList, index, item)" @click="selectSqywClick(djqxList, index)">
<dt>{{ item.nodename }}</dt>
<p :class="item.userCollect == 1 ? 'active' : ''" @click.stop="handleCollection(item)">
<i class="el-icon-star-off"></i>
</p>
</li>
</ul>
</div>
<!-- 业务申请 -->
<template v-if="selectType == 'apply'">
<div class="right-type el-card box-card is-always-shadow">
......@@ -69,7 +80,7 @@
</div>
</template>
<script>
import { getCollectBiz, getleftMenu, getNextNode, addCollectBiz, deleteCollectBiz } from "@/api/ywbl"
import { getCollectBiz, getleftMenu, getNextNode,getRepairBiz, addCollectBiz, deleteCollectBiz } from "@/api/ywbl"
export default {
data () {
return {
......@@ -85,13 +96,13 @@
activeNames: ['1'],
//收藏业务集合
collectList: [],
//申请权利类型集合
//申请权利类型集合
sqywQllxList: [],
//登记类型集合
//登记类型集合
djlxList: [],
//申请权利类型集合
//申请权利类型集合
djqxList: [],
//选中业务的参数
//选中业务的参数
selectParam: {},
//选择按钮显示或隐藏
btnDisabled: true,
......@@ -116,14 +127,20 @@
},
//申请业务类型菜单事件
sqywlxClick (item) {
console.log("item",item);
this.btnDisabled = true;
this.selectType = item.type;
console.log("this.sqywQllxList",this.sqywQllxList);
this.sqywQllxList.forEach(item => {
if (item.check) item.check = false;
})
});
if(this.selectType == 'amend'){
this.getRepairBiz();
}
},
//权利类型菜单事件
qllxClick (index) {
console.log("业务",index);
this.btnDisabled = true;
this.sqywQllxList.forEach(item => {
if (item.check) item.check = false;
......@@ -136,6 +153,7 @@
},
//选择申请业务事件
selectSqywClick (data, index) {
console.log("选择",data,index);
data.forEach(item => {
item.selected = false;
});
......@@ -165,6 +183,18 @@
}
})
},
//获取下个节点类型数据
getRepairBiz () {
getRepairBiz().then(res => {
if (res) {
console.log("res",res);
this.djqxList = res.result;
};
})
},
//双击事件
dblclick (data, index, item) {
localStorage.setItem('ywbl', JSON.stringify(item));
......@@ -177,6 +207,7 @@
},
//收藏操作
handleCollection (item) {
console.log("item收藏",item);
let that = this
if (item.userCollect == '2') {
addCollectBiz(item.bsmSqyw).then(res => {
......@@ -252,7 +283,9 @@
this.openDialog()
},
openDialog () {
console.log("this.selectParam",this.selectParam);
let title = "申请业务:" + this.selectParam?.djywmc ? this.selectParam?.djywmc : '';
this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'sqywInfo': this.selectParam }, "80%")
},
loadView (view) {
......@@ -272,4 +305,4 @@
/deep/.el-collapse-item__wrap {
border-bottom: none;
}
</style>
\ No newline at end of file
</style>
......
import filter from '@/utils/filter.js'
let vm = null
const sendThis = (_this) => {
vm = _this
}
class data extends filter {
constructor() {
super()
}
columns () {
return [
{
label: '序号',
type: 'index',
width: '50',
render: (h, scope) => {
return (
<div>
{(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
</div>
)
}
},
{
label: "权属状态",
width: '80',
render: (h, scope) => {
let obj = {
"1": {
text: '现势',
color: '#4BD863'
},
"2": {
text: '历史',
color: '#AAAAAA'
},
"0": {
text: '临时',
color: '#FE9400'
}
}
let textName = obj[scope.row.qszt]?.text || ''
let colorName = obj[scope.row.qszt]?.color || ''
return (
<div>
<span style={`color:${colorName}`}>&nbsp;</span>
<span >{textName}</span>
</div>
)
}
},
{
prop: "ywh",
label: "业务号",
width: '110',
render: (h, scope) => {
return <el-button type="text" onClick={() => { vm.ywhClick(scope.row) }}>{scope.row.ywh}</el-button>
}
},
{
prop: "qllxmc",
label: "权利类型",
},
{
prop: "djlxmc",
label: "登记类型",
width: '90',
},
{
prop: "bdcdyh",
label: "不动产单元号",
minWidth: '150'
},
{
prop: "bdcqzh",
label: "不动产权证号",
minWidth: '150'
},
{
prop: "qlrmc",
label: "权利人",
},
{
prop: "ywrmc",
label: "义务人",
},
{
prop: "mj",
label: "面积",
width: '80'
},
{
prop: "ytmc",
label: "用途",
minWidth: '130'
},
{
prop: "zl",
label: "坐落",
minWidth: '150'
},
// {
// label: '操作',
// width: '130',
// render: (h, scope) => {
// return (
// <div>
// <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openDialog(scope.row) }}>登记薄</el-button>
// <el-button type="text" icon="el-icon-film" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表</el-button>
// </div>
// )
// }
// }
]
}
}
let datas = new data()
export {
datas,
sendThis
}
......@@ -3,6 +3,9 @@ export function queueDjywmc(djywbm, djqxbm) {
if (djqxbm == "A0320099" || djqxbm == "A0330099") {
return "selectJsydsyqSplitMerge";
}
if (djqxbm == "DJBBL001") {
return "selectDjbbl";
}
let vm = null;
switch (djywbm) {
case "A03100"://建设用地使用权(首次登记)
......
......@@ -33,7 +33,6 @@
},
methods: {
loadView (view) {
console.log(view, 'view');
return (r) =>
require.ensure([], () => r(require(`./components/${view}.vue`)));
},
......
......@@ -122,7 +122,8 @@ export default {
"&qllx="+
item.qllx+
"&bsmQlxx="+
item.bsmQlxx
item.bsmQlxx+
"&viewtype=1"
);
localStorage.setItem('ywbl', JSON.stringify(item));
window.open(href, `urlname${item.bdcdyid}`);
......