Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
1b2b5c68 by tianhaohao@pashanhoo.com
Options

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

2 parents e972a40f 87d653a9
Inline Side-by-side
Showing 8 changed files with 424 additions and 42 deletions
......@@ -34,7 +34,6 @@
<script>
import config from "./tableSelect";
export default {
props: {
modelValue: null,
......
......@@ -56,7 +56,7 @@ router.beforeEach(async (to, from, next) => {
await store.dispatch('user/getUserInfo')
router.addRoutes([...accessRoutes, { path: '*', redirect: '/404', hidden: true }])
const routeTo = Cookies.get('routerTo')
if (routeTo && routeTo !== '/') {
if (to.fullPath||routeTo && routeTo !== '/') {
next({ ...to, replace: true })
} else {
next('/home')
......
......@@ -77,12 +77,10 @@ export function getNode(qllx, qlxx, bdcdylx) {
} else {
node = { id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label};
console.log("node",node);
}
} else {
console.log("jin1111");
node = { id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label};
console.log("nodenodenodenode",node);
}
break;
}
......
......@@ -63,6 +63,11 @@
<el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记原因：">
<el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记类型：">
<el-select v-model="ruleForm.qlxx.djlx">
......@@ -101,6 +106,119 @@
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="权属状态：">
<el-select v-model="ruleForm.qlxx.qszt">
<el-option
v-for="item in qsztlist"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="供地役不动产单元号：">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col> <el-col :span="8">
<el-form-item label="供役地权利人：">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col> <el-col :span="8">
<el-form-item label="供役地权利人证件种类">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col> <el-col :span="8">
<el-form-item label="供役地权利人证件号">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col> <el-col :span="8">
<el-form-item label="需役地不动产单元号">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col> <el-col :span="8">
<el-form-item label="需役地坐落">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col> <el-col :span="8">
<el-form-item label="需役地权利人">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col> <el-col :span="8">
<el-form-item label="需役地权利人证件种类：">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col> <el-col :span="8">
<el-form-item label="需役地权利人证件号：">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col> <el-col :span="8">
<el-form-item label="地役权内容：">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col> <el-col :span="8">
<el-form-item label="不动产登记证明号：">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col> <el-col :span="8">
<el-form-item label="权利起始时间">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col> <el-col :span="8">
<el-form-item label="权利结束时间">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col> <el-col :span="8">
<el-form-item label="权利期限">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col> <el-col :span="8">
<el-form-item label="登记时间：">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col> <el-col :span="8">
<el-form-item label="登记时间：">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col> <el-col :span="8">
<el-form-item label="登记时间：">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col> <el-col :span="8">
<el-form-item label="登记时间：">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col> <el-col :span="8">
<el-form-item label="登记时间：">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col> <el-col :span="8">
<el-form-item label="登记时间：">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col> <el-col :span="8">
<el-form-item label="登记时间：">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col> <el-col :span="8">
<el-form-item label="登记时间：">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col> <el-col :span="8">
<el-form-item label="登记时间：">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="附记：">
<el-input v-model="ruleForm.qlxx.fj"></el-input>
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
权利人信息
......@@ -165,6 +283,17 @@ export default {
disabled: true,
czrOptions: [],
ruleForm: {},
// 权属状态
qsztlist: [
{
dcode: "1",
dname: "现势",
},
{
dcode: "2",
dname: "历史",
},
],
//传递参数\
rules: {},
};
......
......@@ -13,7 +13,8 @@
ref="ruleForm"
:label-position="flag ? 'top' : ''"
:inline="flag"
label-width="127px">
label-width="127px"
>
<div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
<div class="slxx_title title-block">
补录信息
......@@ -64,9 +65,19 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记原因：">
<el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记类型：">
<el-select v-model="ruleForm.qlxx.djlx">
<el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
<el-option
v-for="item in dictData['A21']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</el-form-item>
......@@ -101,7 +112,147 @@
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="权属状态：">
<el-select v-model="ruleForm.qlxx.qszt">
<el-option
v-for="item in qsztlist"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="预告登记种类">
<el-select v-model="ruleForm.qlxx.djlx">
<el-option
v-for="item in dictData['A29']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="土地使用权人">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="规划用途">
<el-select v-model="ruleForm.qlxx.djlx">
<el-option
v-for="item in dictData['A17']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="用途名称">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="房屋性质">
<el-select v-model="ruleForm.qlxx.djlx">
<el-option
v-for="item in dictData['A19']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="房屋性质名称">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="房屋结构">
<el-select v-model="ruleForm.qlxx.djlx">
<el-option
v-for="item in dictData['A46']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所在层">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总层数">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="建筑面积">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="注销预告业务号">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="注销预告原因">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="注销时间">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="取得价格/被担保主债权数额">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="金额单位">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="担保范围">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否存在禁止或限制转让抵押不动产的约定">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="不动产登记证明号">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="附记：">
<el-input v-model="ruleForm.qlxx.fj"></el-input>
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
权利人信息
......@@ -110,8 +261,7 @@
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="共有方式：">
<el-radio-group
v-model="ruleForm.qlxx.gyqk">
<el-radio-group v-model="ruleForm.qlxx.gyqk">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -124,7 +274,8 @@
:tableData="ruleForm.qlrData"
@upDateQlrxxList="upDateQlrxxList"
:key="key"
:gyfs="ruleForm.qlxx.gyfs" />
:gyfs="ruleForm.qlxx.gyfs"
/>
<div>
<div class="slxx_title title-block">
......@@ -135,7 +286,8 @@
v-if="ruleForm.ywrData"
:tableData="ruleForm.ywrData"
:key="key"
@upDateQlrxxList="upDateYwrxxList" />
@upDateQlrxxList="upDateYwrxxList"
/>
</div>
</div>
<el-row class="btn">
......@@ -148,13 +300,12 @@
</template>
<script>
import { mapGetters } from "vuex";
import { init,save } from "@/api/djbbl.js";
import { init, save } from "@/api/djbbl.js";
import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
export default {
components: { qlrCommonTable,tdytTable },
components: { qlrCommonTable, ywrCommonTable, tdytTable },
computed: {
...mapGetters(["dictData", "flag"]),
},
......@@ -167,6 +318,17 @@ export default {
disabled: true,
czrOptions: [],
ruleForm: {},
// 权属状态
qsztlist: [
{
dcode: "1",
dname: "现势",
},
{
dcode: "2",
dname: "历史",
},
],
//传递参数\
rules: {},
};
......@@ -177,26 +339,26 @@ export default {
mounted() {},
methods: {
loadData() {
console.log("预告登记",this.propsParam);
console.log("预告登记", this.propsParam);
init(this.propsParam.bsmRepair).then((res) => {
if (res.code == 200) {
this.ruleForm = res.result;
console.log("this.ruleForm",this.ruleForm);
console.log("this.ruleForm", this.ruleForm);
this.isShow = true;
}
});
},
// 更新土地用途信息
// 更新土地用途信息
upDateTdytxxList(val) {
console.log("VAL",val);
console.log("VAL", val);
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.key++;
},
// 更新权利人信息
upDateQlrxxList(val) {
console.log("val",val);
console.log("val", val);
this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
console.log("this.ruleForm.qlrData",this.ruleForm.qlrData);
console.log("this.ruleForm.qlrData", this.ruleForm.qlrData);
this.czrOptions = this.ruleForm.qlrData;
this.key++;
},
......@@ -206,7 +368,7 @@ export default {
this.key++;
},
onSubmit() {
console.log("this.ruleForm大信息",this.ruleForm);
console.log("this.ruleForm大信息", this.ruleForm);
if (this.ruleForm.qlrData.length == 0) {
this.$message({
showClose: true,
......
......@@ -13,7 +13,8 @@
ref="ruleForm"
:label-position="flag ? 'top' : ''"
:inline="flag"
label-width="127px">
label-width="127px"
>
<div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
<div class="slxx_title title-block">
补录信息
......@@ -64,9 +65,19 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记原因：">
<el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记类型：">
<el-select v-model="ruleForm.qlxx.djlx">
<el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
<el-option
v-for="item in dictData['A21']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</el-form-item>
......@@ -101,6 +112,60 @@
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="权属状态：">
<el-select v-model="ruleForm.qlxx.qszt">
<el-option
v-for="item in qsztlist"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="异议事项">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="不动产登记证明号">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记时间：">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记时间：">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记时间：">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记时间：">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记时间：">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="附记：">
<el-input v-model="ruleForm.qlxx.fj"></el-input>
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
权利人信息
......@@ -109,8 +174,7 @@
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="共有方式：">
<el-radio-group
v-model="ruleForm.qlxx.gyqk">
<el-radio-group v-model="ruleForm.qlxx.gyqk">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -123,7 +187,8 @@
:tableData="ruleForm.qlrData"
@upDateQlrxxList="upDateQlrxxList"
:key="key"
:gyfs="ruleForm.qlxx.gyfs" />
:gyfs="ruleForm.qlxx.gyfs"
/>
<div>
<div class="slxx_title title-block">
......@@ -134,7 +199,8 @@
v-if="ruleForm.ywrData"
:tableData="ruleForm.ywrData"
:key="key"
@upDateQlrxxList="upDateYwrxxList" />
@upDateQlrxxList="upDateYwrxxList"
/>
</div>
</div>
<el-row class="btn">
......@@ -147,12 +213,12 @@
</template>
<script>
import { mapGetters } from "vuex";
import { init,save } from "@/api/djbbl.js";
import { init, save } from "@/api/djbbl.js";
import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
export default {
components: { qlrCommonTable,ywrCommonTable,tdytTable },
components: { qlrCommonTable, ywrCommonTable, tdytTable },
computed: {
...mapGetters(["dictData", "flag"]),
},
......@@ -165,6 +231,17 @@ export default {
disabled: true,
czrOptions: [],
ruleForm: {},
// 权属状态
qsztlist: [
{
dcode: "1",
dname: "现势",
},
{
dcode: "2",
dname: "历史",
},
],
//传递参数\
rules: {},
};
......@@ -175,26 +252,26 @@ export default {
mounted() {},
methods: {
loadData() {
console.log("预告登记",this.propsParam);
console.log("预告登记", this.propsParam);
init(this.propsParam.bsmRepair).then((res) => {
if (res.code == 200) {
this.ruleForm = res.result;
console.log("this.ruleForm",this.ruleForm);
console.log("this.ruleForm", this.ruleForm);
this.isShow = true;
}
});
},
// 更新土地用途信息
// 更新土地用途信息
upDateTdytxxList(val) {
console.log("VAL",val);
console.log("VAL", val);
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.key++;
},
// 更新权利人信息
upDateQlrxxList(val) {
console.log("val",val);
console.log("val", val);
this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
console.log("this.ruleForm.qlrData",this.ruleForm.qlrData);
console.log("this.ruleForm.qlrData", this.ruleForm.qlrData);
this.czrOptions = this.ruleForm.qlrData;
this.key++;
},
......@@ -204,7 +281,7 @@ export default {
this.key++;
},
onSubmit() {
console.log("this.ruleForm大信息",this.ruleForm);
console.log("this.ruleForm大信息", this.ruleForm);
if (this.ruleForm.qlrData.length == 0) {
this.$message({
showClose: true,
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-25 10:33:16
* @LastEditTime: 2023-06-29 16:31:57
-->
<template>
<div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
<!-- 表单部分 -->
<el-tabs v-model="activeName" @tab-click="handleClick" v-if="headTabBdcqz.length >1">
<el-tab-pane :label="item.qlr + '(' + item.bdcqzh + ')'" :name="item.bdcqzlx"
v-for="(item, index) in headTabBdcqz" :key="index"></el-tab-pane>
<el-tab-pane :label="item.qlr + (item.bdcqzh !== null ? '(' + item.bdcqzh + ')' : '')" :name="item.bsmBdcqz"
v-for="(item, index) in headTabBdcqz" :key="index">
</el-tab-pane>
</el-tabs>
<div class="no-data" v-if="headTabBdcqz.length == 0">暂无数据</div>
<canvas ref="zs" width="1000" v-show="activeName=='1'" height="700"></canvas>
......@@ -49,7 +50,7 @@
ruleForm: {
bsmBdcqz: '',
szmc: '不动产权证书',
bdcqzlx: '',
bsmBdcqz: '',
szzh: '',
ysxlh: '',
},
......@@ -77,7 +78,7 @@
getSlsqBdcqzList({ bsmSlsq: this.formData.bsmSlsq }).then(res => {
if (res.code == 200) {
if (res.result && res.result.length > 0) {
this.activeName = res.result[0].bdcqzlx
this.activeName = res.result[0].bsmBdcqz
this.bdcqz = res.result[0]
this.headTabBdcqz = res.result
if (this.activeName == 1) {
......@@ -93,7 +94,7 @@
//tab表头切换方法
handleClick (e) {
this.bdcqz = this.headTabBdcqz[e.index - 0]
this.activeName = this.headTabBdcqz.bdcqzlx
this.activeName = this.headTabBdcqz.bsmBdcqz
if (this.activeName == '1') {
this.drawTextOnImage()
} else {
......
......@@ -192,7 +192,20 @@
this.queryClick();
},
ywhClick (item) {
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(
"/workFrameView?bsmSlsq=" +
item.bsmSlsq +
"&bestepid=" +
......@@ -201,6 +214,9 @@
"&viewtype=1"
);
window.open(href, `urlname${item.bsmSlsq}`);
}
},
},
};
......