a716ef02 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 4e0300e7 0f8df322
......@@ -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;
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-04 15:53:09
* @LastEditTime: 2023-08-04 16:29:10
-->
<template>
<!-- 受理信息 -->
......@@ -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">
<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="权利人:">
......@@ -129,7 +103,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="坐落:">
<el-input disabled v-model="ruleForm.ztQlxx.zl"></el-input>
<el-input disabled v-model="ruleForm.sldy.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -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>
......@@ -655,7 +659,7 @@
this.loadData();
this.ableOperation = this.$parent.ableOperation;
},
methods: {
methods: {
/**
* @description: ztQlxxchange
* @param {*} val
......@@ -674,54 +678,56 @@
this.ruleForm.qlxx.ssywh = val.ywh;
this.ssQlxxchangediolog(val);
},
// 弹框事件
ssQlxxchangediolog (val) {
this.$confirm("是否将上手权利信息同步到表单", "提示", {
iconClass: "el-icon-question", //自定义图标样式
confirmButtonText: "确认", //确认按钮文字更换
cancelButtonText: "取消", //取消按钮文字更换
showClose: true, //是否显示右上角关闭按钮
type: "warning",
// 弹框事件
ssQlxxchangediolog(val) {
this.$confirm("是否将上手权利信息同步到表单", "提示", {
iconClass: "el-icon-question", //自定义图标样式
confirmButtonText: "确认", //确认按钮文字更换
cancelButtonText: "取消", //取消按钮文字更换
showClose: true, //是否显示右上角关闭按钮
type: "warning",
}).then(() => {
getQlxxByQlxxBsm({ qlxxBsm: val.bsmQlxx }).then((res) => {
if (res.code == 200) {
this.nowlist = res.result;
for (var key in this.ruleForm.diyaq) {
if (
this.ruleForm.diyaq[key] == "" ||
this.ruleForm.diyaq[key] == null
) {
this.ruleForm.diyaq[key] = this.nowlist.diyaq[key];
}
getQlxxByQlxxBsm({ qlxxBsm: val.bsmQlxx }).then((res) => {
if (res.code == 200) {
this.nowlist = res.result;
for (var key in this.ruleForm.diyaq) {
if (
this.ruleForm.diyaq[key] == "" ||
this.ruleForm.diyaq[key] == null
) {
this.ruleForm.diyaq[key] = this.nowlist.diyaq[key];
}
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") {
}
for (var key in this.ruleForm.qlxx) {
if (
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) {
this.ruleForm.tdytqxList = this.nowlist.tdytqxList;
}
if (!this.ruleForm.qlrData.length) {
this.ruleForm.qlrData = this.nowlist.qlrData;
}
if (!this.ruleForm.ywrData.length) {
this.ruleForm.ywrData = this.nowlist.ywrData;
}
console.log("this.ruleForm", this.ruleForm);
this.$message({
type: "success",
message: "同步成功!",
});
}
});
}).catch(() => {
if (!this.ruleForm.tdytqxList.length) {
this.ruleForm.tdytqxList = this.nowlist.tdytqxList;
}
if (!this.ruleForm.qlrData.length) {
this.ruleForm.qlrData = this.nowlist.qlrData;
}
if (!this.ruleForm.ywrData.length) {
this.ruleForm.ywrData = this.nowlist.ywrData;
}
this.$message({
type: "success",
message: "同步成功!",
});
}
});
}).catch(() => {
this.$message({
type: "info",
message: "已取消同步",
......@@ -746,6 +752,9 @@
init(this.propsParam).then((res) => {
if (res.code == 200) {
this.ruleForm = res.result;
this.$endLoading();
this.isShow = true;
let djlx = this.ruleForm.qlxx.djlx;
......@@ -866,7 +875,7 @@
} else {
item.sfczr = "0";
}
});
})
}
}
save(this.ruleForm).then((res) => {
......
......@@ -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="上手业务号:">
......@@ -511,10 +509,13 @@
dname: "历史",
},
],
//传递参数\
//传递参数\
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 () {
this.loadData();
created() {
this.loadData();
},
mounted() {
this.ableOperation = this.$parent.ableOperation;
},
methods: {
/**
* @description: ztQlxxchange
* @param {*} val
* @author: renchao
*/
ztQlxxchange(val) {
this.ruleForm.ztQlxx = val;
},
mounted () {
this.ableOperation = this.$parent.ableOperation;
/**
* @description: ssQlxxchange
* @param {*} val
* @author: renchao
*/
ssQlxxchange(val) {
this.ruleForm.ssQlxx = val;
this.ruleForm.qlxx.ssywh = val.ywh;
this.ssQlxxchangediolog(val);
},
methods: {
/**
* @description: ssQlxxchange
* @param {*} val
* @author: renchao
*/
ssQlxxchange (val) {
this.ruleForm.ssQlxx = val;
this.ruleForm.qlxx.ssywh = val.ywh;
this.ssQlxxchangediolog(val);
},
// 弹框事件
ssQlxxchangediolog (val) {
console.log("确定了", this.ruleForm);
this.$confirm("是否将上手权利信息同步到表单", "提示", {
iconClass: "el-icon-question", //自定义图标样式
confirmButtonText: "确认", //确认按钮文字更换
cancelButtonText: "取消", //取消按钮文字更换
showClose: true, //是否显示右上角关闭按钮
type: "warning",
}).then(() => {
// 弹框事件
ssQlxxchangediolog(val) {
this.$confirm("是否将上手权利信息同步到表单", "提示", {
iconClass: "el-icon-question", //自定义图标样式
confirmButtonText: "确认", //确认按钮文字更换
cancelButtonText: "取消", //取消按钮文字更换
showClose: true, //是否显示右上角关闭按钮
type: "warning",
})
.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] == "" ||
......@@ -573,14 +580,17 @@
}
}
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") {
if (
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,20 +602,20 @@
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: "已取消同步",
});
});
},
},
/**
* @description: djlxchange
* @param {*} val
......
......@@ -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]);
this.add(val);
if(this.monitor){
this.add(val);
this.monitor=false
}else{
this.add(val);
}
},
deep: true,
immediate: true,
......
......@@ -82,7 +82,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="坐落:">
<el-input disabled v-model="ruleForm.ztQlxx.zl"></el-input>
<el-input disabled v-model="ruleForm.sldy.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
......
<!--
* @Description: 房屋多幢受理信息
* @Autor: ssq
* @LastEditTime: 2023-08-04 15:45:27
* @LastEditTime: 2023-08-04 16:33:46
-->
<template>
<div class="slxx">
......@@ -58,7 +58,7 @@
</el-col>
<el-col :span="16">
<el-form-item label="坐落:">
<el-input disabled v-model="ruleForm.qlxx.zl"></el-input>
<el-input disabled v-model="ruleForm.sldy.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
......
<!--
* @Description: 受理信息
* @Autor: renchao
* @LastEditTime: 2023-08-02 08:53:43
* @LastEditTime: 2023-08-04 16:32:05
-->
<template>
<div class="slxx">
......@@ -58,7 +58,7 @@
</el-col>
<el-col :span="16">
<el-form-item label="坐落:">
<el-input disabled v-model="ruleForm.qlxx.zl"></el-input>
<el-input disabled v-model="ruleForm.sldy.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
......
<!--
* @Description: 受理信息
* @Autor: renchao
* @LastEditTime: 2023-08-04 15:45:38
* @LastEditTime: 2023-08-04 16:32:08
-->
<template>
<div class="slxx">
......@@ -60,7 +60,7 @@
</el-col>
<el-col :span="16">
<el-form-item label="坐落:">
<el-input disabled v-model="ruleForm.qlxx.zl"></el-input>
<el-input disabled v-model="ruleForm.sldy.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-04 15:54:00
* @LastEditTime: 2023-08-04 16:31:38
-->
<template>
<!-- 受理信息 -->
......@@ -113,7 +113,7 @@
<el-col :span="16">
<el-form-item label="坐落:">
<el-input v-model="ruleForm.zdjbxx.zl"></el-input>
<el-input v-model="ruleForm.sldy.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
......
......@@ -2,7 +2,7 @@
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-04 15:46:02
* @LastEditTime: 2023-08-04 16:32:14
-->
<template>
<!-- 受理信息 -->
......@@ -116,7 +116,7 @@
<el-col :span="16">
<el-form-item label="坐落:">
<el-input disabled v-model="ruleForm.qlxx.zl"></el-input>
<el-input disabled v-model="ruleForm.sldy.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
......
......@@ -63,7 +63,7 @@
</el-col>
<el-col :span="16">
<el-form-item label="坐落:">
<el-input disabled v-model="ruleForm.qlxx.zl"></el-input>
<el-input disabled v-model="ruleForm.sldy.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
......
......@@ -83,7 +83,7 @@
<el-row :gutter="10">
<el-col :span="16">
<el-form-item label="坐落:">
<el-input disabled v-model="ruleForm.zdjbxx.zl"></el-input>
<el-input disabled v-model="ruleForm.sldy.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
......
......@@ -83,7 +83,7 @@
<el-row :gutter="10">
<el-col :span="16">
<el-form-item label="坐落:">
<el-input disabled v-model="ruleForm.zdjbxx.zl"></el-input>
<el-input disabled v-model="ruleForm.sldy.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
......
......@@ -54,7 +54,7 @@
</el-col>
<el-col :span="16">
<el-form-item label="坐落:">
<el-input disabled v-model="ruleForm.qlxx.zl"></el-input>
<el-input disabled v-model="ruleForm.sldy.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
......
......@@ -56,7 +56,7 @@
</el-col>
<el-col :span="16">
<el-form-item label="坐落:">
<el-input disabled v-model="ruleForm.qlxx.zl"></el-input>
<el-input disabled v-model="ruleForm.sldy.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
......
......@@ -93,7 +93,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="坐落:">
<el-input disabled v-model="ruleForm.qlxx.zl"></el-input>
<el-input disabled v-model="ruleForm.sldy.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
......