0f8df322 by renchao@pashanhoo.com

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

2 parents 3585896f 1f8b14f9
......@@ -53,7 +53,20 @@
font-weight: 500;
color: #4a4a4a;
}
.bdcqk {
margin-top: 15px;
position: relative;
.count {
color: blue!important;
width: 874px;
font-size: 14px;
position: absolute;
left:200px;
top: -3px;
height: 30px;
}
}
.btn {
text-align: center;
padding-top: 10px;
......
......@@ -2,7 +2,7 @@
* @Description:
* @Autor: renchao
:show-message="false"
* @LastEditTime: 2023-08-04 16:33:14
* @LastEditTime: 2023-08-04 16:35:53
-->
<template>
<!-- 受理信息 -->
......@@ -40,19 +40,16 @@
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
<div class="slxx_title title-block bdcqk">
查封登记不动产情况
<div class="triangle"></div>
</div>
<el-row :gutter="10">
<el-col :span="8">
<div class="count">
<el-form-item
label="查封不动产权信息:"
prop="ztQlxx.bdcqzh"
:rules="rules.ztQlxxrules">
<select-table
v-model="ruleForm.ztQlxx"
:table-width="550"
:table-width="730"
:tableData="ztQlxxList"
:props="props"
@change="ztQlxxchange">
......@@ -72,34 +69,13 @@
<el-table-column prop="zl" label="坐落"></el-table-column>
</select-table>
</el-form-item>
</el-col>
</div>
<div class="triangle"></div>
</div>
<el-row :gutter="10">
<el-col :span="8" v-if="ruleForm.cfdj.sfbxf == '1'">
<el-form-item
label="上手权利信息:"
prop="ssQlxx.bdcqzh"
:rules="rules.ssQlxxrules">
<select-table
v-model="ruleForm.ssQlxx"
:table-width="550"
:tableData="ssQlxxList"
:props="props"
@change="ssQlxxchange">
<el-table-column
prop="qllxmc"
width="130"
label="权利类型"></el-table-column>
<el-table-column
prop="bdcqzh"
width="160"
label="不动产权证书"></el-table-column>
<el-table-column prop="qlrmc" label="权利人"></el-table-column>
<el-table-column prop="mjmc" label="面积"></el-table-column>
<el-table-column prop="ytmc" label="用途"></el-table-column>
<el-table-column prop="zl" label="坐落"></el-table-column>
</select-table>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" v-if="ruleForm.ztQlxx != null">
<el-col :span="8">
......@@ -152,8 +128,35 @@
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
<div class="slxx_title title-block bdcqk">
查封登记信息
<div class="count">
<el-form-item
label="上手权利信息:"
prop="ssQlxx.bdcqzh"
:rules="rules.ssQlxxrules"
v-if="ruleForm.cfdj.sfbxf == '1'">
<select-table
v-model="ruleForm.ssQlxx"
:table-width="730"
:tableData="ssQlxxList"
:props="props"
@change="ssQlxxchange">
<el-table-column
prop="qllxmc"
width="130"
label="权利类型"></el-table-column>
<el-table-column
prop="bdcqzh"
width="160"
label="不动产权证书"></el-table-column>
<el-table-column prop="qlrmc" label="权利人"></el-table-column>
<el-table-column prop="mjmc" label="面积"></el-table-column>
<el-table-column prop="ytmc" label="用途"></el-table-column>
<el-table-column prop="zl" label="坐落"></el-table-column>
</select-table>
</el-form-item>
</div>
<div class="triangle"></div>
</div>
<el-row :gutter="10">
......@@ -186,6 +189,7 @@
<el-form-item
label="是否被续封:"
prop="cfdj.sfbxf"
<<<<<<< HEAD
:rules="rules.sfbxfrules">
<el-select v-model="ruleForm.cfdj.sfbxf" @change="djlxchange">
<el-option
......@@ -194,6 +198,14 @@
:label="item.dname"
:value="item.dcode"></el-option>
</el-select>
=======
:rules="rules.sfbxfrules"
>
<el-radio-group v-model="ruleForm.cfdj.sfbxf">
<el-radio label="1"></el-radio>
<el-radio label="2"></el-radio>
</el-radio-group>
>>>>>>> 1f8b14f926a91690cf660a297aa8a8f4a2658f8b
</el-form-item>
</el-col>
<el-col :span="8">
......
......@@ -14,7 +14,7 @@
ref="ruleForm"
:label-position="flag ? 'top' : ''"
:inline="flag"
label-width="169px"
label-width="170px"
inline-message
:show-message="false">
<div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
......@@ -39,19 +39,16 @@
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
<div class="slxx_title title-block bdcqk">
抵押不动产情况
<div class="triangle"></div>
</div>
<el-row :gutter="10">
<el-col :span="8">
<div class="count">
<el-form-item
label="抵押不动产信息:"
prop="ztQlxx.bdcqzh"
:rules="rules.ztQlxxrules">
<select-table
v-model="ruleForm.ztQlxx"
:table-width="550"
:table-width="730"
:tableData="ztQlxxList"
:props="props"
@change="ztQlxxchange">
......@@ -62,43 +59,20 @@
<el-table-column
prop="bdcqzh"
width="160"
label="不动产权证书"></el-table-column>
<el-table-column prop="qlrmc" label="权利人"></el-table-column>
<el-table-column prop="mjmc" label="面积"></el-table-column>
<el-table-column prop="ytmc" label="用途"></el-table-column>
<el-table-column prop="zl" label="坐落"></el-table-column>
</select-table>
</el-form-item>
</el-col>
<el-col :span="8" v-if="ssqlxxshow">
<el-form-item
label="上手权利信息:"
prop="ssQlxx.bdcqzh"
:rules="rules.ssQlxxrules">
<select-table
v-model="ruleForm.ssQlxx"
:table-width="550"
:tableData="ssQlxxList"
:props="props"
@change="ssQlxxchange">
label="不动产权证书"
></el-table-column>
<el-table-column
prop="qllxmc"
width="130"
label="权利类型"></el-table-column>
<el-table-column
prop="bdcqzh"
width="160"
label="不动产权证书"></el-table-column>
<el-table-column prop="qlrmc" label="权利人"></el-table-column>
prop="qlrmc"
label="被执行人"
></el-table-column>
<el-table-column prop="mjmc" label="面积"></el-table-column>
<el-table-column prop="ytmc" label="用途"></el-table-column>
<el-table-column prop="zl" label="坐落"></el-table-column>
</select-table>
</el-form-item>
</el-col>
</el-row>
</div>
<div class="triangle"></div>
</div>
<el-row :gutter="10" v-if="ruleForm.ztQlxx != null">
<el-col :span="8">
<el-form-item label="权利人:">
......@@ -150,8 +124,38 @@
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
<div class="slxx_title title-block bdcqk">
抵押权信息
<div class="count" v-if="ssqlxxshow">
<el-form-item
label="上手权利信息:"
prop="ssQlxx.bdcqzh"
:rules="rules.ssQlxxrules"
>
<select-table
v-model="ruleForm.ssQlxx"
:table-width="730"
:tableData="ssQlxxList"
:props="props"
@change="ssQlxxchange"
>
<el-table-column
prop="qllxmc"
width="130"
label="权利类型"
></el-table-column>
<el-table-column
prop="bdcqzh"
width="160"
label="不动产权证书"
></el-table-column>
<el-table-column prop="qlrmc" label="权利人"></el-table-column>
<el-table-column prop="mjmc" label="面积"></el-table-column>
<el-table-column prop="ytmc" label="用途"></el-table-column>
<el-table-column prop="zl" label="坐落"></el-table-column>
</select-table>
</el-form-item>
</div>
<div class="triangle"></div>
</div>
......@@ -675,7 +679,7 @@
this.ssQlxxchangediolog(val);
},
// 弹框事件
ssQlxxchangediolog (val) {
ssQlxxchangediolog(val) {
this.$confirm("是否将上手权利信息同步到表单", "提示", {
iconClass: "el-icon-question", //自定义图标样式
confirmButtonText: "确认", //确认按钮文字更换
......@@ -696,13 +700,16 @@
}
for (var key in this.ruleForm.qlxx) {
if (
(this.ruleForm.qlxx[key] == null && key != "ywh") ||
this.ruleForm.qlxx[key] == null
) {
console.log("this.ruleForm.qlxx[key]", key);
if (key != "ywh") {
this.ruleForm.qlxx[key] == ""||
this.ruleForm.qlxx[key] == null &&
key != "ywh" &&
key != "dbr" &&
key != "djsj" &&
key != "ssywh" &&
key != "ssywh" &&
key != "bdcqzh") {
this.ruleForm.qlxx[key] = this.nowlist.qlxx[key];
}
}
}
if (!this.ruleForm.tdytqxList.length) {
......@@ -714,7 +721,6 @@
if (!this.ruleForm.ywrData.length) {
this.ruleForm.ywrData = this.nowlist.ywrData;
}
console.log("this.ruleForm", this.ruleForm);
this.$message({
type: "success",
message: "同步成功!",
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-04 16:33:22
* @LastEditTime: 2023-08-04 16:35:32
-->
<template>
<!-- 受理信息 -->
......@@ -15,7 +15,7 @@
:label-position="flag ? 'top' : ''"
:inline="flag"
:show-message="false"
label-width="150px">
label-width="145px">
<div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
<div class="slxx_title title-block">
补录信息
......@@ -38,63 +38,43 @@
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
<div class="slxx_title title-block bdcqk">
地役权不动产情况
<div class="triangle"></div>
</div>
<el-row :gutter="10">
<el-col :span="8">
<div class="count">
<el-form-item
label="地役权不动产信息:"
label="地役权不动产情况"
prop="ztQlxx.bdcqzh"
:rules="rules.ztQlxxrules">
:rules="rules.ztQlxxrules"
>
<select-table
v-model="ruleForm.ztQlxx"
:table-width="550"
:table-width="730"
:tableData="ztQlxxList"
:props="props"
@change="ztQlxxchange">
@change="ztQlxxchange"
>
<el-table-column
prop="qllxmc"
width="130"
label="权利类型"></el-table-column>
label="权利类型"
></el-table-column>
<el-table-column
prop="bdcqzh"
width="160"
label="不动产权证书"></el-table-column>
<el-table-column prop="qlrmc" label="权利人"></el-table-column>
<el-table-column prop="mjmc" label="面积"></el-table-column>
<el-table-column prop="ytmc" label="用途"></el-table-column>
<el-table-column prop="zl" label="坐落"></el-table-column>
</select-table>
</el-form-item>
</el-col>
<el-col :span="8" v-if="ssqlxxshow">
<el-form-item label="上手权利信息:" prop="ssQlxx.bdcqzh" :rules="rules.ssQlxxrules">
<select-table
v-model="ruleForm.ssQlxx"
:table-width="550"
:tableData="ssQlxxList"
:props="props"
@change="ssQlxxchange">
<el-table-column
prop="qllxmc"
width="130"
label="权利类型"></el-table-column>
label="不动产权证书"
></el-table-column>
<el-table-column
prop="bdcqzh"
width="160"
label="不动产权证书"></el-table-column>
<el-table-column prop="qlrmc" label="权利人"></el-table-column>
prop="qlrmc"
label="被执行人"
></el-table-column>
<el-table-column prop="mjmc" label="面积"></el-table-column>
<el-table-column prop="ytmc" label="用途"></el-table-column>
<el-table-column prop="zl" label="坐落"></el-table-column>
</select-table>
</el-form-item>
</el-col>
</el-row>
</div>
<div class="triangle"></div>
</div>
<el-row :gutter="10" v-if="ruleForm.ztQlxx != null">
<el-col :span="8">
<el-form-item label="权利人:">
......@@ -146,8 +126,38 @@
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
<div class="slxx_title title-block bdcqk">
地役权信息
<div class="count" v-if="ssqlxxshow">
<el-form-item
label="上手权利信息:"
prop="ssQlxx.bdcqzh"
:rules="rules.ssQlxxrules"
>
<select-table
v-model="ruleForm.ssQlxx"
:table-width="730"
:tableData="ssQlxxList"
:props="props"
@change="ssQlxxchange"
>
<el-table-column
prop="qllxmc"
width="130"
label="权利类型"
></el-table-column>
<el-table-column
prop="bdcqzh"
width="160"
label="不动产权证书"
></el-table-column>
<el-table-column prop="qlrmc" label="权利人"></el-table-column>
<el-table-column prop="mjmc" label="面积"></el-table-column>
<el-table-column prop="ytmc" label="用途"></el-table-column>
<el-table-column prop="zl" label="坐落"></el-table-column>
</select-table>
</el-form-item>
</div>
<div class="triangle"></div>
</div>
<el-row :gutter="10">
......@@ -366,7 +376,7 @@
<el-form-item label="共有方式:">
<el-radio-group
:disabled="!ableOperation"
v-model="ruleForm.sldy.gyfs">
v-model="ruleForm.qlxx.gyfs">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -374,10 +384,10 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
<el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
<el-form-item label="是否分别持证:">
<el-radio-group
v-model="ruleForm.sldy.sqfbcz"
v-model="ruleForm.qlxx.sqfbcz"
:disabled="!ableOperation">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
......@@ -386,7 +396,7 @@
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
......@@ -433,7 +443,7 @@
<script>
import { mapGetters } from "vuex";
import ywmix from "@/views/ywbl/mixin/index"
import { init, getSsQlxx, getZtQlxx, getQlxxByQlxxBsm, save } from "@/api/djbRepair.js";
import { init, getSsQlxx, getZtQlxx, getQlxxByQlxxBsm,save } from "@/api/djbRepair.js";
import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
......@@ -549,11 +559,10 @@
ssQlxxchange (val) {
this.ruleForm.ssQlxx = val;
this.ruleForm.qlxx.ssywh = val.ywh;
this.ssQlxxchangediolog(val)
this.ssQlxxchangediolog (val)
},
// 弹框事件
ssQlxxchangediolog (val) {
console.log("确定了", this.ruleForm)
this.$confirm("是否将上手权利信息同步到表单", "提示", {
iconClass: "el-icon-question", //自定义图标样式
confirmButtonText: "确认", //确认按钮文字更换
......@@ -564,8 +573,6 @@
getQlxxByQlxxBsm({ qlxxBsm: val.bsmQlxx }).then((res) => {
if (res.code == 200) {
this.nowlist = res.result;
console.log("his.nowlist", this.nowlist);
console.log("this.ruleForm", this.ruleForm);
for (var key in this.ruleForm.dyiq) {
if (
this.ruleForm.dyiq[key] == "" ||
......@@ -576,13 +583,16 @@
}
for (var key in this.ruleForm.qlxx) {
if (
(this.ruleForm.qlxx[key] == null && key != "ywh") ||
this.ruleForm.qlxx[key] == null
) {
console.log("this.ruleForm.qlxx[key]", key);
if (key != "ywh") {
this.ruleForm.qlxx[key] == ""||
this.ruleForm.qlxx[key] == null &&
key != "ywh" &&
key != "dbr" &&
key != "djsj" &&
key != "ssywh" &&
key != "ssywh" &&
key != "bdcqzh") {
this.ruleForm.qlxx[key] = this.nowlist.qlxx[key];
}
}
}
if (!this.ruleForm.tdytqxList.length) {
......@@ -594,7 +604,6 @@
if (!this.ruleForm.ywrData.length) {
this.ruleForm.ywrData = this.nowlist.ywrData;
}
console.log("this.ruleForm", this.ruleForm);
this.$message({
type: "success",
message: "同步成功!",
......@@ -614,7 +623,6 @@
* @author: renchao
*/
djlxchange (val) {
console.log("val", val);
if (val == null || val == 100) {
this.ssqlxxshow = false;
} else {
......
......@@ -39,19 +39,16 @@
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
房地产权(独幢、层、套、间房屋)
<div class="triangle"></div>
</div>
<el-row :gutter="24">
<el-col :span="24" v-if="ssqlxxshow">
<div class="slxx_title title-block bdcqk">
房地产权信息
<div class="count" v-if="ssqlxxshow">
<el-form-item
label="上手权利信息:"
prop="ssQlxx.bdcqzh"
:rules="rules.ssQlxxrules">
<select-table
v-model="ruleForm.ssQlxx"
:table-width="550"
:table-width="730"
:tableData="ssQlxxList"
:props="props"
@change="ssQlxxchange">
......@@ -69,8 +66,9 @@
<el-table-column prop="zl" label="坐落"></el-table-column>
</select-table>
</el-form-item>
</el-col>
</el-row>
</div>
<div class="triangle"></div>
</div>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="不动产单元号:">
......@@ -160,7 +158,7 @@
<!-- 下拉框 -->
<el-form-item label="土地性质:" style="margin-bottom: 3px">
<treeselect
v-model="tdxz"
v-model="ruleForm.fdcq2.tdxz"
noOptionsText="暂无数据"
placeholder=""
:normalizer="normalizer"
......@@ -564,8 +562,8 @@
},
};
},
created () { },
mounted () {
created() {},
mounted() {
this.loadData();
this.ableOperation = this.$parent.ableOperation;
},
......@@ -575,14 +573,13 @@
* @param {*} val
* @author: renchao
*/
ssQlxxchange (val) {
ssQlxxchange(val) {
this.ruleForm.ssQlxx = val;
this.ruleForm.qlxx.ssywh = val.ywh;
this.ssQlxxchangediolog(val);
},
// 弹框事件
ssQlxxchangediolog (val) {
console.log("确定了", this.ruleForm, val);
ssQlxxchangediolog(val) {
this.$confirm("是否将上手权利信息同步到表单", "提示", {
iconClass: "el-icon-question", //自定义图标样式
confirmButtonText: "确认", //确认按钮文字更换
......@@ -595,8 +592,6 @@
getQlxxByQlxxBsm({ qlxxBsm: val.bsmQlxx }).then((res) => {
if (res.code == 200) {
this.nowlist = res.result;
console.log("his.nowlist", this.nowlist);
console.log("this.ruleForm", this.ruleForm);
for (var key in this.ruleForm.fdcq2) {
if (
this.ruleForm.fdcq2[key] == "" ||
......@@ -607,13 +602,16 @@
}
for (var key in this.ruleForm.qlxx) {
if (
(this.ruleForm.qlxx[key] == null && key != "ywh") ||
this.ruleForm.qlxx[key] == null
) {
console.log("this.ruleForm.qlxx[key]", key);
if (key != "ywh") {
this.ruleForm.qlxx[key] == ""||
this.ruleForm.qlxx[key] == null &&
key != "ywh" &&
key != "dbr" &&
key != "djsj" &&
key != "ssywh" &&
key != "ssywh" &&
key != "bdcqzh") {
this.ruleForm.qlxx[key] = this.nowlist.qlxx[key];
}
}
}
if (!this.ruleForm.tdytqxList.length) {
......@@ -625,7 +623,6 @@
if (!this.ruleForm.ywrData.length) {
this.ruleForm.ywrData = this.nowlist.ywrData;
}
console.log("this.ruleForm", this.ruleForm);
this.$message({
type: "success",
message: "同步成功!",
......@@ -644,7 +641,7 @@
* @param {*} val
* @author: renchao
*/
djlxchange (val) {
djlxchange(val) {
if (val == null || val == 100) {
this.ssqlxxshow = false;
} else {
......@@ -655,7 +652,7 @@
* @description: loadData
* @author: renchao
*/
loadData () {
loadData() {
this.$startLoading();
this.propsParam.isEdit = this.$parent.isEdit;
init(this.propsParam).then((res) => {
......@@ -692,7 +689,7 @@
* @param {*} val
* @author: renchao
*/
upDateTdytxxList (val) {
upDateTdytxxList(val) {
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.key++;
},
......@@ -702,7 +699,7 @@
* @param {*} val
* @author: renchao
*/
upDateQlrxxList (val) {
upDateQlrxxList(val) {
this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
this.czrOptions = this.ruleForm.qlrData;
this.key++;
......@@ -713,7 +710,7 @@
* @param {*} val
* @author: renchao
*/
upDateYwrxxList (val) {
upDateYwrxxList(val) {
this.ruleForm.ywrData && (this.ruleForm.ywrData = _.cloneDeep(val));
this.key++;
},
......@@ -721,7 +718,7 @@
* @description: onSubmit
* @author: renchao
*/
onSubmit () {
onSubmit() {
this.$refs.ruleForm.validate((valid) => {
if (valid) {
if (this.ruleForm.qlrData.length == 0) {
......@@ -740,20 +737,31 @@
});
return false;
}
if (!this.tdxz) {
if (!this.ruleForm.fdcq2.tdxz) {
this.$message({
showClose: true,
message: "请补充土地性质",
type: "error",
});
}
if (this.ruleForm.qlxx.gyfs == "0") {
if (this.ruleForm.qlrData.length > 1) {
this.$message({
showClose: true,
message: "请确认权利人信息",
type: "error",
});
return false;
}
this.ruleForm.tdytqxList = this.ruleForm.tdytqxList.map((item) => {
return {
...item,
qlxzbm: this.tdxz,
};
if (this.ruleForm.tdytqxList.length == 0 && !this.tdxz) {
this.$message({
showClose: true,
message: "请补充土地用途信息",
type: "error",
});
return false;
}
}
if (this.ruleForm.sldy.gyfs == "0") {
if (this.ruleForm.qlrData.length > 1) {
this.$message({
......@@ -820,7 +828,7 @@
});
},
},
};
};
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
......
......@@ -14,7 +14,10 @@
ref="ruleForm"
:label-position="flag ? 'top' : ''"
:inline="flag"
label-width="145px">
label-width="145px"
inline-message
:show-message="false"
>
<div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
<div class="slxx_title title-block">
补录信息
......@@ -37,19 +40,16 @@
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
<div class="slxx_title title-block bdcqk">
建设用地、宅基地使用权信息
<div class="triangle"></div>
</div>
<el-row :gutter="24">
<el-col :span="8" v-if="ssqlxxshow">
<div class="count" v-if="ssqlxxshow">
<el-form-item
label="上手权利信息:"
prop="ssQlxx.bdcqzh"
:rules="rules.ssQlxxrules">
<select-table
v-model="ruleForm.ssQlxx"
:table-width="550"
:table-width="730"
:tableData="ssQlxxList"
:props="props"
@change="ssQlxxchange">
......@@ -67,8 +67,9 @@
<el-table-column prop="zl" label="坐落"></el-table-column>
</select-table>
</el-form-item>
</el-col>
</el-row>
</div>
<div class="triangle"></div>
</div>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="不动产单元号:">
......@@ -76,7 +77,11 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="业务号:">
<el-form-item
label="业务号:"
prop="qlxx.ywh"
:rules="rules.ywhrules"
>
<el-input v-model="ruleForm.qlxx.ywh"></el-input>
</el-form-item>
</el-col>
......@@ -258,7 +263,7 @@
<el-form-item label="共有方式:">
<el-radio-group
:disabled="!ableOperation"
v-model="ruleForm.sldy.gyfs">
v-model="ruleForm.qlxx.gyfs">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -266,10 +271,10 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
<el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
<el-form-item label="是否分别持证:">
<el-radio-group
v-model="ruleForm.sldy.sqfbcz"
v-model="ruleForm.qlxx.sqfbcz"
:disabled="!ableOperation">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
......@@ -278,7 +283,7 @@
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
......@@ -310,20 +315,20 @@
</div>
</template>
<script>
import { mapGetters } from "vuex";
import store from "@/store/index.js";
import ywmix from "@/views/ywbl/mixin/index";
import { init, getSsQlxx, getQlxxByQlxxBsm, save } from "@/api/djbRepair.js";
import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
import selectTable from "@/components/selectTable/index.vue";
export default {
import { mapGetters } from "vuex";
import store from "@/store/index.js";
import ywmix from "@/views/ywbl/mixin/index";
import { init, getSsQlxx,getQlxxByQlxxBsm, save } from "@/api/djbRepair.js";
import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
import selectTable from "@/components/selectTable/index.vue";
export default {
mixins: [ywmix],
components: { qlrCommonTable, tdytTable, selectTable },
computed: {
...mapGetters(["dictData", "flag"]),
// 根据流程判断表单是否为只读
editDisabled () {
editDisabled() {
if (!this.ableOperation) {
//只读状态
return true;
......@@ -331,7 +336,7 @@
return false;
},
},
data () {
data() {
return {
mjdw: "1",
ssqlxxshow: true,
......@@ -340,7 +345,7 @@
value: "bdcdyid",
},
// 键名转换,方法默认是label和children进行树状渲染
normalizer (node) {
normalizer(node) {
//方法
if (node.children == null || node.children == "null") {
delete node.children;
......@@ -412,13 +417,14 @@
dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }],
djlxrules: [{ required: true, message: "登记类型", trigger: "blur" }],
ywhrules: [{ required: true, message: "业务号", trigger: "blur" }],
},
};
},
created () {
created() {
this.loadData();
},
mounted () {
mounted() {
this.ableOperation = this.$parent.ableOperation;
},
methods: {
......@@ -427,14 +433,13 @@
* @param {*} val
* @author: renchao
*/
ssQlxxchange (val) {
ssQlxxchange(val) {
this.ruleForm.ssQlxx = val;
this.ruleForm.qlxx.ssywh = val.ywh;
this.ssQlxxchangediolog(val);
},
// 弹框事件
ssQlxxchangediolog (val) {
console.log("确定了", this.ruleForm);
ssQlxxchangediolog(val) {
this.$confirm("是否将上手权利信息同步到表单", "提示", {
iconClass: "el-icon-question", //自定义图标样式
confirmButtonText: "确认", //确认按钮文字更换
......@@ -445,8 +450,6 @@
getQlxxByQlxxBsm({ qlxxBsm: val.bsmQlxx }).then((res) => {
if (res.code == 200) {
this.nowlist = res.result;
console.log("his.nowlist", this.nowlist);
console.log("this.ruleForm", this.ruleForm);
for (var key in this.ruleForm.jsydsyq) {
if (
this.ruleForm.jsydsyq[key] == "" ||
......@@ -457,13 +460,16 @@
}
for (var key in this.ruleForm.qlxx) {
if (
(this.ruleForm.qlxx[key] == null && key != "ywh") ||
this.ruleForm.qlxx[key] == null
) {
console.log("this.ruleForm.qlxx[key]", key);
if (key != "ywh") {
this.ruleForm.qlxx[key] == ""||
this.ruleForm.qlxx[key] == null &&
key != "ywh" &&
key != "dbr" &&
key != "djsj" &&
key != "ssywh" &&
key != "ssywh" &&
key != "bdcqzh") {
this.ruleForm.qlxx[key] = this.nowlist.qlxx[key];
}
}
}
if (!this.ruleForm.tdytqxList.length) {
......@@ -475,7 +481,6 @@
if (!this.ruleForm.ywrData.length) {
this.ruleForm.ywrData = this.nowlist.ywrData;
}
console.log("this.ruleForm", this.ruleForm);
this.$message({
type: "success",
message: "同步成功!",
......@@ -590,7 +595,7 @@
});
return false;
}
if (this.ruleForm.qlrData.length != 0 && this.ruleForm.sldy.sqfbcz == 0 && this.ruleForm.czr == '') {
if (this.ruleForm.qlrData.length != 0 && this.ruleForm.qlxx.sqfbcz == 0 && this.ruleForm.czr == '') {
this.$message({
showClose: true,
message: "请选择持证人信息",
......@@ -598,7 +603,7 @@
});
return false;
}
if (this.ruleForm.sldy.gyfs == "0") {
if (this.ruleForm.qlxx.gyfs == "0") {
if (this.ruleForm.qlrData.length > 1) {
this.$message({
showClose: true,
......@@ -618,7 +623,7 @@
return false;
}
//是否分别持证
if (this.ruleForm.sldy.sqfbcz == "1") {
if (this.ruleForm.qlxx.sqfbcz == "1") {
//是
this.ruleForm.qlrList.forEach((item, index) => {
item.sfczr = "1";
......
......@@ -15,7 +15,8 @@
:show-message="false"
:label-position="flag ? 'top' : ''"
:inline="flag"
label-width="120px">
label-width="145px"
>
<div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
<div class="slxx_title title-block">
补录信息
......@@ -38,19 +39,16 @@
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
<div class="slxx_title title-block bdcqk">
土地所有权信息
<div class="triangle"></div>
</div>
<el-row :gutter="10">
<el-col :span="8" v-if="ssqlxxshow">
<div class="count" v-if="ssqlxxshow">
<el-form-item
label="上手权利信息:"
prop="ssQlxx.bdcqzh"
:rules="rules.ssQlxxrules">
<select-table
v-model="ruleForm.ssQlxx"
:table-width="550"
:table-width="730"
:tableData="ssQlxxList"
:props="props"
@change="ssQlxxchange">
......@@ -68,7 +66,10 @@
<el-table-column prop="zl" label="坐落"></el-table-column>
</select-table>
</el-form-item>
</el-col>
</div>
<div class="triangle"></div>
</div>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="上手业务号:">
<el-input disabled v-model="ruleForm.qlxx.ssywh"></el-input>
......@@ -97,7 +98,11 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="业务号:">
<el-form-item
label="业务号:"
prop="qlxx.ywh"
:rules="rules.ywhrules"
>
<el-input v-model="ruleForm.qlxx.ywh"></el-input>
</el-form-item>
</el-col>
......@@ -403,20 +408,20 @@
</div>
</template>
<script>
import { mapGetters } from "vuex";
import store from "@/store/index.js";
import ywmix from "@/views/ywbl/mixin/index";
import { init, getSsQlxx, getQlxxByQlxxBsm, save } from "@/api/djbRepair.js";
import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
import selectTable from "@/components/selectTable/index.vue";
import tdytTable from "@/views/workflow/components/tdytTable";
export default {
import { mapGetters } from "vuex";
import store from "@/store/index.js";
import ywmix from "@/views/ywbl/mixin/index";
import { init, getSsQlxx, getQlxxByQlxxBsm, save } from "@/api/djbRepair.js";
import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
import selectTable from "@/components/selectTable/index.vue";
import tdytTable from "@/views/workflow/components/tdytTable";
export default {
mixins: [ywmix],
components: { qlrCommonTable, tdytTable, selectTable },
computed: {
...mapGetters(["dictData", "flag"]),
// 根据流程判断表单是否为只读
editDisabled () {
editDisabled() {
if (!this.ableOperation) {
//只读状态
return true;
......@@ -424,7 +429,7 @@
return false;
},
},
data () {
data() {
return {
ssqlxxshow: true,
props: {
......@@ -432,7 +437,7 @@
value: "bdcdyid",
},
// 键名转换,方法默认是label和children进行树状渲染
normalizer (node) {
normalizer(node) {
//方法
if (node.children == null || node.children == "null") {
delete node.children;
......@@ -503,11 +508,12 @@
dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }],
djlxrules: [{ required: true, message: "登记类型", trigger: "change" }],
ywhrules: [{ required: true, message: "业务号", trigger: "blur" }],
},
};
},
created () { },
mounted () {
created() {},
mounted() {
this.loadData();
this.ableOperation = this.$parent.ableOperation;
},
......@@ -517,26 +523,24 @@
* @param {*} val
* @author: renchao
*/
ssQlxxchange (val) {
ssQlxxchange(val) {
this.ruleForm.ssQlxx = val;
this.ruleForm.qlxx.ssywh = val.ywh;
this.ssQlxxchangediolog(val);
},
// 弹框事件
ssQlxxchangediolog (val) {
console.log("确定了", this.ruleForm);
ssQlxxchangediolog(val) {
this.$confirm("是否将上手权利信息同步到表单", "提示", {
iconClass: "el-icon-question", //自定义图标样式
confirmButtonText: "确认", //确认按钮文字更换
cancelButtonText: "取消", //取消按钮文字更换
showClose: true, //是否显示右上角关闭按钮
type: "warning",
}).then(() => {
})
.then(() => {
getQlxxByQlxxBsm({ qlxxBsm: val.bsmQlxx }).then((res) => {
if (res.code == 200) {
this.nowlist = res.result;
console.log("his.nowlist", this.nowlist);
console.log("this.ruleForm", this.ruleForm);
for (var key in this.ruleForm.tdsyq) {
if (
this.ruleForm.tdsyq[key] == "" ||
......@@ -547,13 +551,16 @@
}
for (var key in this.ruleForm.qlxx) {
if (
(this.ruleForm.qlxx[key] == null && key != "ywh") ||
this.ruleForm.qlxx[key] == null
) {
console.log("this.ruleForm.qlxx[key]", key);
if (key != "ywh") {
this.ruleForm.qlxx[key] == ""||
this.ruleForm.qlxx[key] == null &&
key != "ywh" &&
key != "dbr" &&
key != "djsj" &&
key != "ssywh" &&
key != "ssywh" &&
key != "bdcqzh") {
this.ruleForm.qlxx[key] = this.nowlist.qlxx[key];
}
}
}
if (!this.ruleForm.tdytqxList.length) {
......@@ -565,14 +572,14 @@
if (!this.ruleForm.ywrData.length) {
this.ruleForm.ywrData = this.nowlist.ywrData;
}
console.log("this.ruleForm", this.ruleForm);
this.$message({
type: "success",
message: "同步成功!",
});
}
});
}).catch(() => {
})
.catch(() => {
this.$message({
type: "info",
message: "已取消同步",
......@@ -584,8 +591,7 @@
* @param {*} val
* @author: renchao
*/
djlxchange (val) {
console.log("val", val);
djlxchange(val) {
if (val == null || val == 100) {
this.ssqlxxshow = false;
} else {
......@@ -599,14 +605,14 @@
* @param {*} val
* @author: renchao
*/
getDictData (val) {
getDictData(val) {
return store.getters.dictData[val];
},
/**
* @description: loadData
* @author: renchao
*/
loadData () {
loadData() {
this.$startLoading();
this.propsParam.isEdit = this.$parent.isEdit;
init(this.propsParam).then((res) => {
......@@ -637,7 +643,7 @@
* @param {*} val
* @author: renchao
*/
upDateTdytxxList (val) {
upDateTdytxxList(val) {
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.key++;
},
......@@ -647,7 +653,7 @@
* @param {*} val
* @author: renchao
*/
upDateQlrxxList (val) {
upDateQlrxxList(val) {
this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
this.czrOptions = this.ruleForm.qlrData;
this.key++;
......
......@@ -40,19 +40,17 @@
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
预告抵押登记信息不动产情况
<div class="triangle"></div>
</div>
<el-row :gutter="10">
<el-col :span="8" v-if="ztQlxxList">
<div class="slxx_title title-block bdcqk">
预告抵押不动产情况
<div class="count">
<el-form-item
label="抵押不动产信息:"
prop="ztQlxx"
:rules="rules.ztQlxxrules">
label="预告抵押不动产情况"
prop="ztQlxx.bdcqzh"
:rules="rules.ztQlxxrules"
>
<select-table
v-model="ruleForm.ztQlxx"
:table-width="550"
:table-width="730"
:tableData="ztQlxxList"
:props="props"
@change="ztQlxxchange">
......@@ -63,43 +61,20 @@
<el-table-column
prop="bdcqzh"
width="160"
label="不动产权证书"></el-table-column>
<el-table-column prop="qlrmc" label="权利人"></el-table-column>
<el-table-column prop="mjmc" label="面积"></el-table-column>
<el-table-column prop="ytmc" label="用途"></el-table-column>
<el-table-column prop="zl" label="坐落"></el-table-column>
</select-table>
</el-form-item>
</el-col>
<el-col :span="8" v-if="ssqlxxshow">
<el-form-item
label="上手权利信息:"
prop="ssQlxx.bdcqzh"
:rules="rules.ssQlxxrules">
<select-table
v-model="ruleForm.ssQlxx"
:table-width="550"
:tableData="ssQlxxList"
:props="props"
@change="ssQlxxchange">
<el-table-column
prop="qllxmc"
width="130"
label="权利类型"></el-table-column>
label="不动产权证书"
></el-table-column>
<el-table-column
prop="bdcqzh"
width="160"
label="不动产权证书"></el-table-column>
<el-table-column prop="qlrmc" label="权利人"></el-table-column>
prop="qlrmc"
label="被执行人"
></el-table-column>
<el-table-column prop="mjmc" label="面积"></el-table-column>
<el-table-column prop="ytmc" label="用途"></el-table-column>
<el-table-column prop="zl" label="坐落"></el-table-column>
</select-table>
</el-form-item>
</el-col>
</el-row>
</div>
<div class="triangle"></div>
</div>
<el-row :gutter="10" v-if="ruleForm.ztQlxx != null">
<el-col :span="8">
<el-form-item label="权利人:">
......@@ -151,8 +126,38 @@
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
<div class="slxx_title title-block bdcqk">
预告登记信息
<div class="count" v-if="ssqlxxshow">
<el-form-item
label="上手权利信息:"
prop="ssQlxx.bdcqzh"
:rules="rules.ssQlxxrules"
>
<select-table
v-model="ruleForm.ssQlxx"
:table-width="730"
:tableData="ssQlxxList"
:props="props"
@change="ssQlxxchange"
>
<el-table-column
prop="qllxmc"
width="130"
label="权利类型"
></el-table-column>
<el-table-column
prop="bdcqzh"
width="160"
label="不动产权证书"
></el-table-column>
<el-table-column prop="qlrmc" label="权利人"></el-table-column>
<el-table-column prop="mjmc" label="面积"></el-table-column>
<el-table-column prop="ytmc" label="用途"></el-table-column>
<el-table-column prop="zl" label="坐落"></el-table-column>
</select-table>
</el-form-item>
</div>
<div class="triangle"></div>
</div>
<el-row :gutter="10">
......@@ -613,10 +618,10 @@
ableOperation: false,
};
},
created () {
created() {
this.loadData();
},
mounted () {
mounted() {
this.ableOperation = this.$parent.ableOperation;
},
methods: {
......@@ -625,7 +630,7 @@
* @param {*} val
* @author: renchao
*/
ztQlxxchange (val) {
ztQlxxchange(val) {
this.ruleForm.ztQlxx = val;
},
/**
......@@ -633,14 +638,13 @@
* @param {*} val
* @author: renchao
*/
ssQlxxchange (val) {
ssQlxxchange(val) {
this.ruleForm.ssQlxx = val;
this.ruleForm.qlxx.ssywh = val.ywh;
this.ssQlxxchangediolog(val);
},
// 弹框事件
ssQlxxchangediolog (val) {
console.log("确定了", this.ruleForm);
ssQlxxchangediolog(val) {
this.$confirm("是否将上手权利信息同步到表单", "提示", {
iconClass: "el-icon-question", //自定义图标样式
confirmButtonText: "确认", //确认按钮文字更换
......@@ -652,8 +656,6 @@
getQlxxByQlxxBsm({ qlxxBsm: val.bsmQlxx }).then((res) => {
if (res.code == 200) {
this.nowlist = res.result;
console.log("his.nowlist", this.nowlist);
console.log("this.ruleForm", this.ruleForm);
for (var key in this.ruleForm.ygdj) {
if (
this.ruleForm.ygdj[key] == "" ||
......@@ -664,13 +666,16 @@
}
for (var key in this.ruleForm.qlxx) {
if (
(this.ruleForm.qlxx[key] == null && key != "ywh") ||
this.ruleForm.qlxx[key] == null
) {
console.log("this.ruleForm.qlxx[key]", key);
if (key != "ywh") {
this.ruleForm.qlxx[key] == ""||
this.ruleForm.qlxx[key] == null &&
key != "ywh" &&
key != "dbr" &&
key != "djsj" &&
key != "ssywh" &&
key != "ssywh" &&
key != "bdcqzh") {
this.ruleForm.qlxx[key] = this.nowlist.qlxx[key];
}
}
}
if (!this.ruleForm.tdytqxList.length) {
......@@ -682,7 +687,6 @@
if (!this.ruleForm.ywrData.length) {
this.ruleForm.ywrData = this.nowlist.ywrData;
}
console.log("this.ruleForm", this.ruleForm);
this.$message({
type: "success",
message: "同步成功!",
......@@ -697,6 +701,7 @@
});
});
},
/**
* @description: djlxchange
* @param {*} val
......
......@@ -40,19 +40,16 @@
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
预告买卖登记信息不动产情况
<div class="triangle"></div>
</div>
<el-row :gutter="24">
<el-col :span="24" v-if="ssqlxxshow">
<div class="slxx_title title-block bdcqk">
预告买卖不动产情况
<div class="count" v-if="ssqlxxshow">
<el-form-item
label="上手权利信息:"
prop="ssQlxx.bdcqzh"
:rules="rules.ssQlxxrules">
<select-table
v-model="ruleForm.ssQlxx"
:table-width="550"
:table-width="730"
:tableData="ssQlxxList"
:props="props"
@change="ssQlxxchange">
......@@ -70,8 +67,9 @@
<el-table-column prop="zl" label="坐落"></el-table-column>
</select-table>
</el-form-item>
</el-col>
</el-row>
</div>
<div class="triangle"></div>
</div>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="上手业务号:">
......@@ -513,8 +511,11 @@
],
//传递参数\
rules: {
ztQlxxrules: [
{ required: true, message: "抵押不动产信息", trigger: "blur" },
],
bdcqzhrules: [
{ required: true, message: "不动产权证号:", trigger: "blur" },
{ required: true, message: "不动产登记证明号", trigger: "blur" },
],
// qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
......@@ -532,38 +533,44 @@
ableOperation: false,
};
},
created () {
created() {
this.loadData();
},
mounted () {
mounted() {
this.ableOperation = this.$parent.ableOperation;
},
methods: {
/**
* @description: ztQlxxchange
* @param {*} val
* @author: renchao
*/
ztQlxxchange(val) {
this.ruleForm.ztQlxx = val;
},
/**
* @description: ssQlxxchange
* @param {*} val
* @author: renchao
*/
ssQlxxchange (val) {
ssQlxxchange(val) {
this.ruleForm.ssQlxx = val;
this.ruleForm.qlxx.ssywh = val.ywh;
this.ssQlxxchangediolog(val);
},
// 弹框事件
ssQlxxchangediolog (val) {
console.log("确定了", this.ruleForm);
ssQlxxchangediolog(val) {
this.$confirm("是否将上手权利信息同步到表单", "提示", {
iconClass: "el-icon-question", //自定义图标样式
confirmButtonText: "确认", //确认按钮文字更换
cancelButtonText: "取消", //取消按钮文字更换
showClose: true, //是否显示右上角关闭按钮
type: "warning",
}).then(() => {
})
.then(() => {
getQlxxByQlxxBsm({ qlxxBsm: val.bsmQlxx }).then((res) => {
if (res.code == 200) {
this.nowlist = res.result;
console.log("his.nowlist", this.nowlist);
console.log("this.ruleForm", this.ruleForm);
for (var key in this.ruleForm.ygdj) {
if (
this.ruleForm.ygdj[key] == "" ||
......@@ -574,13 +581,16 @@
}
for (var key in this.ruleForm.qlxx) {
if (
(this.ruleForm.qlxx[key] == null && key != "ywh") ||
this.ruleForm.qlxx[key] == null
) {
console.log("this.ruleForm.qlxx[key]", key);
if (key != "ywh") {
this.ruleForm.qlxx[key] == ""||
this.ruleForm.qlxx[key] == null &&
key != "ywh" &&
key != "dbr" &&
key != "djsj" &&
key != "ssywh" &&
key != "ssywh" &&
key != "bdcqzh") {
this.ruleForm.qlxx[key] = this.nowlist.qlxx[key];
}
}
}
if (!this.ruleForm.tdytqxList.length) {
......@@ -592,14 +602,14 @@
if (!this.ruleForm.ywrData.length) {
this.ruleForm.ywrData = this.nowlist.ywrData;
}
console.log("this.ruleForm", this.ruleForm);
this.$message({
type: "success",
message: "同步成功!",
});
}
});
}).catch(() => {
})
.catch(() => {
this.$message({
type: "info",
message: "已取消同步",
......
......@@ -90,16 +90,19 @@ export default {
tableData: [{ jdmc: "初审" }, { jdmc: "复审" }, { jdmc: "核定" }],
falg: false,
falg1: false,
monitor:true
};
},
watch: {
yjsqOptions: {
handler(val) {
console.log("val", val);
console.log("this.tableData[this.currentindex]",this.tableData[this.currentindex]);
if(this.monitor){
this.add(val);
this.monitor=false
}else{
this.add(val);
}
},
deep: true,
immediate: true,
......