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

......@@ -317,7 +317,7 @@
</el-col>
<el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
<el-form-item label="解封业务号:">
<el-input v-model="ruleForm.cfdj.jfywh"></el-input>
<el-input v-model="ruleForm.qlxx.zxywh"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -340,13 +340,13 @@
</el-col>
<el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
<el-form-item label="解封登簿人:">
<el-input v-model="ruleForm.cfdj.jfdbr"></el-input>
<el-input v-model="ruleForm.qlxx.zxdbr"></el-input>
</el-form-item>
</el-col>
<el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
<el-form-item label="解封登记时间:">
<el-date-picker
v-model="ruleForm.cfdj.jfdjsj"
v-model="ruleForm.qlxx.zxsj"
class="width100"
type="date"
placeholder="选择日期"
......
......@@ -189,6 +189,9 @@ export default {
if(this.ruleForm.ygdj){
this.ruleForm.ygdj.jedw="1"
this.ruleForm.ygdj.mjdw="1"
if(this.ruleForm.ygdj.sfczjzhxz==null){
this.ruleForm.ygdj.sfczjzhxz="1"
}
}
if(this.ruleForm.diyaq){
this.ruleForm.diyaq.mjdw="1"
......
......@@ -41,7 +41,7 @@
</el-row>
<div class="slxx_title title-block bdcqk">
抵押不动产情况
<div class="count">
<div class="count">
<el-form-item
label="抵押不动产信息:"
prop="ztQlxx.bdcqzh"
......@@ -59,12 +59,10 @@
<el-table-column
prop="bdcqzh"
width="160"
label="不动产权证书"
></el-table-column>
label="不动产权证书"></el-table-column>
<el-table-column
prop="qlrmc"
label="被执行人"
></el-table-column>
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>
......@@ -126,29 +124,25 @@
</el-row>
<div class="slxx_title title-block bdcqk">
抵押权信息
<div class="count" v-if="ssqlxxshow">
<div class="count" v-if="ssqlxxshow">
<el-form-item
label="上手权利信息:"
prop="ssQlxx.bdcqzh"
:rules="rules.ssQlxxrules"
>
:rules="rules.ssQlxxrules">
<select-table
v-model="ruleForm.ssQlxx"
:table-width="730"
:tableData="ssQlxxList"
:props="props"
@change="ssQlxxchange"
>
@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>
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>
......@@ -487,33 +481,6 @@
</el-radio-group>
</el-form-item>
</el-col>
<!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
<el-form-item label="是否分别持证:">
<el-radio-group
v-model="ruleForm.qlxx.sqfbcz"
:disabled="!ableOperation">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col
:span="6"
v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
placeholder="持证人"
:disabled="!ableOperation">
<el-option
v-for="item in czrOptions"
:key="item.zjh"
:label="item.sqrmc"
:value="item.zjh">
</el-option>
</el-select>
</el-form-item>
</el-col> -->
</el-row>
<qlrCommonTable
:tableData="ruleForm.qlrData"
......
......@@ -648,6 +648,7 @@ djlxchange(val) {
message: "请补充土地性质",
type: "error",
});
return false;
}
if (this.ruleForm.qlxx.gyfs == "0") {
if (this.ruleForm.qlrData.length > 1) {
......
......@@ -99,7 +99,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="不动产权证号:">
<el-form-item label="不动产登记证明号">
<el-input disabled v-model="ruleForm.ztQlxx.bdcqzh"></el-input>
</el-form-item>
</el-col>
......@@ -211,14 +211,6 @@
<el-input v-model="ruleForm.qlxx.zl"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item
label="不动产权证号:"
prop="qlxx.bdcqzh"
:rules="rules.bdcqzhrules">
<el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="区县代码:" prop="qlxx.qxdm" :rules="rules.qxdmrules">
<el-input v-model="ruleForm.qlxx.qxdm"></el-input>
......@@ -341,7 +333,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="总层数:">
<el-input v-model="ruleForm.ygdj.zcs"></el-input>
<el-input oninput = "value=value.replace(/[^\d]/g,'')" maxlength="4" v-model="ruleForm.ygdj.zcs"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -366,22 +358,22 @@
</el-col>
<el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
<el-form-item label="注销预告业务号:">
<el-input v-model="ruleForm.ygdj.zxygywh"></el-input>
<el-input v-model="ruleForm.qlxx.zxywh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
<el-form-item label="注销预告原因:">
<el-input v-model="ruleForm.ygdj.zxygyy"></el-input>
<el-input v-model="ruleForm.ygdj.zxyy"></el-input>
</el-form-item>
</el-col>
<el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
<el-form-item label="注销时间:">
<el-date-picker
v-model="ruleForm.ygdj.zxsj"
v-model="ruleForm.qlxx.zxsj"
type="date"
class="width100"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH/mm/ss"
format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
......@@ -393,7 +385,7 @@
content="取得价格被担保主债权数额:"
placement="top"
effect="light">
<span type="text" style="color: #444" size="mini">取得价格被担保...</span>
<span type="text" style="color: #444" size="mini">取得价格被...:</span>
</el-tooltip>
</span>
<div class="flex">
......@@ -426,15 +418,28 @@
content="是否存在禁止或限制转让抵押不动产的约定:"
placement="top"
effect="light">
<span type="text" style="color: #444" size="mini">是否存在禁止或限制...</span>
<span type="text" style="color: #444" size="mini">是否存在禁止...:</span>
</el-tooltip>
</span>
<el-input v-model="ruleForm.ygdj.sfczjzhxz"></el-input>
<el-radio-group v-model="ruleForm.ygdj.sfczjzhxz">
<el-radio label="1"></el-radio>
<el-radio label="2"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item
label="是否存在禁止或限制转让抵押不动产的约定:" label-width="345px">
<el-radio-group v-model="ruleForm.ygdj.sfczjzhxz" @change="djlxchange">
<el-radio label="1"></el-radio>
<el-radio label="2"></el-radio>
</el-radio-group>
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="不动产登记证明号:">
<el-input v-model="ruleForm.ygdj.bdcdjzmh"></el-input>
<el-form-item label="不动产登记证明号:" prop="qlxx.bdcqzh"
:rules="rules.bdcqzhrules">
<el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
......
......@@ -42,7 +42,7 @@
</el-row>
<div class="slxx_title title-block bdcqk">
预告买卖不动产情况
<div class="count" v-if="ssqlxxshow">
<div class="count" v-if="ssqlxxshow">
<el-form-item
label="上手权利信息:"
prop="ssQlxx.bdcqzh"
......@@ -249,7 +249,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="总层数:">
<el-input v-model="ruleForm.ygdj.zcs"></el-input>
<el-input oninput = "value=value.replace(/[^\d]/g,'')" maxlength="4" v-model="ruleForm.ygdj.zcs"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -259,7 +259,7 @@
v-model="ruleForm.ygdj.jzmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.ygdj.mjdw"
v-model="ruleForm.ygdj.mjdw"
:disabled="!ableOperation"
style="width: 20%">
<el-option
......@@ -305,7 +305,7 @@
<span
type="text"
style="color: #444"
size="mini">取得价格被担保...</span>
size="mini">取得价格被...:</span>
</el-tooltip>
</span>
<div class="flex">
......@@ -334,18 +334,17 @@
<el-col :span="8">
<el-form-item>
<span slot="label" style="display: inline-block">
<el-tooltip
content="是否存在禁止或限制转让抵押不动产的约定:"
placement="top"
effect="light">
<span
type="text"
style="color: #444"
size="mini">是否存在禁止或限制...</span>
<span type="text" style="color: #444" size="mini">是否存在禁止...:</span>
</el-tooltip>
</span>
<el-input v-model="ruleForm.ygdj.sfczjzhxz"></el-input>
<el-radio-group v-model="ruleForm.ygdj.sfczjzhxz">
<el-radio label="1"></el-radio>
<el-radio label="2"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -376,33 +375,6 @@
</el-radio-group>
</el-form-item>
</el-col>
<!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
<el-form-item label="是否分别持证:">
<el-radio-group
v-model="ruleForm.qlxx.sqfbcz"
:disabled="!ableOperation">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col
:span="6"
v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
placeholder="持证人"
:disabled="!ableOperation">
<el-option
v-for="item in czrOptions"
:key="item.zjh"
:label="item.sqrmc"
:value="item.zjh">
</el-option>
</el-select>
</el-form-item>
</el-col> -->
</el-row>
<qlrCommonTable
:tableData="ruleForm.qlrData"
......@@ -433,7 +405,7 @@
</div>
</template>
<script>
import ywmix from "./dataprocessing";
import ywmix from "./dataprocessing";
import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
......@@ -443,7 +415,7 @@
components: { qlrCommonTable, ywrCommonTable, tdytTable, selectTable },
data () {
return {
//传递参数\
//传递参数\
rules: {
ztQlxxrules: [
{ required: true, message: "抵押不动产信息", trigger: "blur" },
......
......@@ -132,14 +132,11 @@
* @author: renchao
*/
getCurrentSelectProps (val) {
console.log(val, 'valvalvalval');
this.currentSelectProps = val
getZdInfo(val.bdcdyid).then(res => {
this.bsmZd = res?.result[0]?.bsmZd
})
// getZdInfo(val.bdcdyid).then(res => {
// this.bsmZd = res?.result[0]?.bsmZd
// })
},
/**
* @description: beforeunloadHandler
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-14 10:52:06
* @LastEditTime: 2023-08-14 12:56:43
-->
<template>
<!-- 受理信息 -->
......@@ -289,6 +289,7 @@
Init(formdata).then((res) => {
if (res.code === 200 && res.result) {
this.ruleForm = res.result;
this.czrOptions = this.ruleForm.qlrList;
this.ruleForm.diyaq.sfczjzhxz = "0";
}
this.$endLoading();
......@@ -339,8 +340,6 @@
}
});
},
// 更新权利人信息
/**
* @description: 更新权利人信息
* @param {*} val
......@@ -352,7 +351,6 @@
this.czrOptions = this.ruleForm.qlrList;
}
},
// 更新义务人信息
/**
* @description: 更新义务人信息
* @param {*} val
......
<!--
* @Description: 房屋多幢受理信息
* @Autor: ssq
* @LastEditTime: 2023-08-14 10:58:48
* @LastEditTime: 2023-08-14 13:02:34
-->
<template>
<div class="slxx">
......@@ -117,14 +117,14 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="5">
<!-- <el-col :span="5">
<el-form-item label="发证方式:">
<el-radio-group v-model="ruleForm.slsq.fzfs" :disabled="!ableOperation">
<el-radio label="1">小证</el-radio>
<el-radio label="2">大证</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="5" v-show="ruleForm.sldy.gyfs != '0'">
<el-form-item label="是否分别持证:">
<el-radio-group
......@@ -212,6 +212,7 @@
}
//初始化发证方式,1:小证,2:大正
this.ruleForm.slsq.fzfs == null ? this.ruleForm.slsq.fzfs = '1' : this.ruleForm.slsq.fzfs;
this.czrOptions = this.ruleForm.qlrList;
}
});
},
......@@ -253,7 +254,6 @@
}
},
methods: {
// 更新土地用途信息
/**
* @description: 更新土地用途信息
* @param {*} val
......@@ -261,10 +261,8 @@
*/
upDateTdytxxList (val) {
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.czrOptions = this.ruleForm.qlrList;
this.key++;
},
// 更新权利人信息
/**
* @description: 更新权利人信息
* @param {*} val
......@@ -272,6 +270,8 @@
*/
upDateQlrxxList (val) {
this.ruleForm.qlrList = _.cloneDeep(val);
this.czrOptions = this.ruleForm.qlrList;
this.key++;
},
/**
* @description: showCZInfo
......
<!--
* @Description: 受理信息
* @Autor: renchao
* @LastEditTime: 2023-08-14 10:56:46
* @LastEditTime: 2023-08-14 12:57:21
-->
<template>
<div class="slxx">
......@@ -271,12 +271,13 @@
}
//初始化发证方式,1:小证,2:大正
this.ruleForm.slsq.fzfs == null ? this.ruleForm.slsq.fzfs = '1' : this.ruleForm.slsq.fzfs;
this.czrOptions = this.ruleForm.qlrList;
}
});
})
},
components: { qlrCommonTable, tdytTable },
computed: {
...mapGetters(["dictData", "flag"]),
...mapGetters(["dictData", "flag"])
},
data () {
return {
......@@ -320,7 +321,6 @@
*/
upDateTdytxxList (val) {
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.czrOptions = this.ruleForm.qlrList;
this.key++;
},
......@@ -331,6 +331,7 @@
*/
upDateQlrxxList (val) {
this.ruleForm.qlrList = _.cloneDeep(val);
this.czrOptions = this.ruleForm.qlrList;
},
/**
* @description: 更新权利人信息
......
<!--
* @Description: 受理信息
* @Autor: renchao
* @LastEditTime: 2023-08-14 10:27:21
* @LastEditTime: 2023-08-14 12:58:13
-->
<template>
<div class="slxx">
......@@ -279,6 +279,7 @@
};
//初始化发证方式,1:小证,2:大正
this.ruleForm.slsq.fzfs == null ? this.ruleForm.slsq.fzfs = '1' : this.ruleForm.slsq.fzfs;
this.czrOptions = this.ruleForm.qlrList;
}
});
},
......@@ -359,7 +360,6 @@
}
});
},
// 更新土地用途信息
/**
* @description: 更新土地用途信息
* @param {*} val
......@@ -367,10 +367,8 @@
*/
upDateTdytxxList (val) {
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.czrOptions = this.ruleForm.qlrList;
this.key++;
},
// 更新权利人信息
/**
* @description: 更新权利人信息
* @param {*} val
......@@ -378,6 +376,8 @@
*/
upDateQlrxxList (val) {
this.ruleForm.qlrList = _.cloneDeep(val);
this.czrOptions = this.ruleForm.qlrList;
this.key++;
},
// 更新权利人信息
/**
......
<!--
* @Description: 受理信息
* @Autor: renchao
* @LastEditTime: 2023-08-14 10:54:26
* @LastEditTime: 2023-08-14 12:58:35
-->
<template>
<div class="slxx">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''" :inline="flag"
label-width="130px">
<el-form
:model="ruleForm"
:rules="rules"
ref="ruleForm"
:label-position="flag ? 'top' : ''"
:inline="flag"
label-width="130px"
>
<div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
<div class="slxx_title title-block">
受理信息
......@@ -14,7 +20,7 @@
</div>
<el-row :gutter="10" v-if="ruleForm.slsq">
<el-col :span="8">
<el-form-item label="业务号:">
<el-form-item label="业务号111:">
<el-input disabled v-model="ruleForm.flow.ywh"></el-input>
</el-form-item>
</el-col>
......@@ -30,14 +36,20 @@
</el-col>
</el-row>
<el-row :gutter="10" v-if="ruleForm.slsq">
<el-col :span="8" v-if="ruleForm.sldyList.length>0">
<el-col :span="8" v-if="ruleForm.sldyList.length > 0">
<el-form-item label="权利类型:">
<el-input disabled v-model="ruleForm.sldyList[0].qllxmc"></el-input>
<el-input
disabled
v-model="ruleForm.sldyList[0].qllxmc"
></el-input>
</el-form-item>
</el-col>
<el-col :span="8" v-if="ruleForm.sldyList.length>0">
<el-col :span="8" v-if="ruleForm.sldyList.length > 0">
<el-form-item label="登记类型:">
<el-input disabled v-model="ruleForm.sldyList[0].djlxmc"></el-input>
<el-input
disabled
v-model="ruleForm.sldyList[0].djlxmc"
></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -101,8 +113,11 @@
<el-row :gutter="10">
<el-col :span="12" v-if="ruleForm.sldyList.length>0">
<el-form-item label="共有方式:">
<el-radio-group :disabled="!ableOperation" @change="showCZInfo"
v-model="ruleForm.sldyList[0].gyfs">
<el-radio-group
:disabled="!ableOperation"
@change="showCZInfo"
v-model="ruleForm.sldyList[0].gyfs"
>
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -111,10 +126,10 @@
</el-form-item>
</el-col>
<el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
<el-col :span="6" v-if="ruleForm.sldyList[0].gyfs!=0">
<el-form-item label="是否分别持证:">
<el-radio-group
v-model="ruleForm.sldy.sqfbcz"
v-model="ruleForm.sldyList[0].sqfbcz"
:disabled="!ableOperation">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
......@@ -122,8 +137,7 @@
</el-form-item>
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
:span="6" v-if="ruleForm.sldyList[0].gyfs!=0">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
......@@ -140,17 +154,24 @@
</el-col>
</el-row>
<qlrCommonTable @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList"
:gyfs="ruleForm.slsq.gyfs" />
<qlrCommonTable
@upDateQlrxxList="upDateQlrxxList"
:tableData="ruleForm.qlrList"
:gyfs="ruleForm.sldyList[0].gyfs"
/>
<div class="slxx_title title-block">
登记原因
<div class="triangle"></div>
</div>
<el-row :gutter="10">
<el-col v-if="ruleForm.fdcq2List.length>0">
<el-col v-if="ruleForm.fdcq2List.length > 0">
<el-form-item v-if="ruleForm.slsq" label="登记原因:" prop="djyy">
<el-input class="textArea" type="textarea" :disabled="!ableOperation"
v-model="ruleForm.fdcq2List[0].djyy">
<el-input
class="textArea"
type="textarea"
:disabled="!ableOperation"
v-model="ruleForm.fdcq2List[0].djyy"
>
</el-input>
</el-form-item>
</el-col>
......@@ -171,24 +192,19 @@
import { mapGetters } from "vuex";
export default {
mixins: [ywmix],
mounted (callbackfn, thisArg) {
this.ableOperation = this.$parent.currentSelectTab.ableOperation
this.propsParam = this.$attrs;
var formdata = new FormData();
formdata.append("bsmSldy", this.propsParam.bsmSldy);
formdata.append("djlx", this.propsParam.djlx);
formdata.append("bsmSlsq", this.bsmSlsq);
formdata.append("isEdit", this.ableOperation);
BatchInit(formdata).then((res) => {
if (res.code == 200) {
this.ruleForm = res.result;
this.splicingFdcq2Info();
}
})
computed: {
...mapGetters(["dictData", "flag"]),
},
components: { qlrCommonTable },
computed: {
...mapGetters(["dictData", "flag"])
components: { qlrCommonTable},
// 更新义务人信息
/**
* @description: 更新义务人信息
* @param {*} val
* @author: renchao
*/
upDateYwrxxList(val) {
this.ruleForm.ywrList = _.cloneDeep(val);
},
data () {
return {
......@@ -215,6 +231,7 @@
//表单是否可操作
ableOperation: true,
rules: {},
gyfs:"",
bsmSlsq: this.$route.query.bsmSlsq,//受理申请标识码
splicingFdcq2: {//前端根据后台数组组装展示内容
fwxz: ''//房屋性质
......@@ -224,6 +241,24 @@
}
}
},
mounted (callbackfn, thisArg) {
this.ableOperation = this.$parent.currentSelectTab.ableOperation
this.propsParam = this.$attrs;
var formdata = new FormData();
formdata.append("bsmSldy", this.propsParam.bsmSldy);
formdata.append("djlx", this.propsParam.djlx);
formdata.append("bsmSlsq", this.bsmSlsq);
formdata.append("isEdit", this.ableOperation);
BatchInit(formdata).then((res) => {
if (res.code == 200) {
this.ruleForm = res.result;
this.czrOptions = this.ruleForm.qlrList;
console.log("ruleForm.sldyList[0].gyfsssssssssssssssssssss",this.ruleForm.sldyList[0].gyfs);
this.gyfs=this.ruleForm.sldyList[0].gyfs
this.splicingFdcq2Info();
}
})
},
methods: {
//组装房地产权通用信息
/**
......@@ -265,7 +300,7 @@
* @author: renchao
*/
showCZInfo () {
console.log(this.ruleForm.slsq.gyfs);
// console.log(this.ruleForm.slsq.gyfs);
},
// 更新义务人信息
/**
......@@ -301,78 +336,78 @@
}
}
</script>
<style scoped lang='scss'>
@import "~@/styles/public.scss";
<style scoped lang="scss">
@import "~@/styles/public.scss";
/deep/.el-form {
display: flex;
flex-direction: column;
height: calc(100vh - 130px);
}
/deep/.el-form {
display: flex;
flex-direction: column;
height: calc(100vh - 130px);
}
/deep/.el-form-item__label {
padding: 0;
}
/deep/.el-form-item__label {
padding: 0;
}
/deep/.el-radio {
margin-right: 10px;
}
/deep/.el-radio {
margin-right: 10px;
}
/deep/.el-select {
width: 100%;
}
/deep/.el-select {
width: 100%;
}
/deep/.el-form-item {
margin-bottom: 8px;
}
/deep/.el-form-item {
margin-bottom: 8px;
}
.marginBot0 {
margin-bottom: 0 !important;
}
.marginBot0 {
margin-bottom: 0 !important;
}
.slxx {
box-sizing: border-box;
}
.slxx {
box-sizing: border-box;
}
.slxx_con {
flex: 1;
height: 100%;
background-color: #ffffff;
overflow-y: auto;
padding-right: 3px;
overflow-x: hidden;
}
.slxx_con {
flex: 1;
height: 100%;
background-color: #ffffff;
overflow-y: auto;
padding-right: 3px;
overflow-x: hidden;
}
.submit_btn {
height: 50px;
}
.submit_btn {
height: 50px;
}
.slxx_title {
border-bottom: 1px solid $borderColor;
padding-left: 10px;
padding-bottom: 5px;
margin-bottom: 10px;
margin-top: 5px;
font-size: 16px;
font-weight: 500;
color: #4a4a4a;
}
.slxx_title {
border-bottom: 1px solid $borderColor;
padding-left: 10px;
padding-bottom: 5px;
margin-bottom: 10px;
margin-top: 5px;
font-size: 16px;
font-weight: 500;
color: #4a4a4a;
}
.btn {
text-align: center;
padding-top: 10px;
height: 36px;
background-color: #ffffff;
padding: 5px 0;
}
.btn {
text-align: center;
padding-top: 10px;
height: 36px;
background-color: #ffffff;
padding: 5px 0;
}
.textArea {
/deep/.el-textarea__inner {
min-height: 90px !important;
}
.textArea {
/deep/.el-textarea__inner {
min-height: 90px !important;
}
}
/deep/.el-form-item__label {
padding-bottom: 0px;
}
/deep/.el-form-item__label {
padding-bottom: 0px;
}
</style>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-04 15:45:47
* @LastEditTime: 2023-08-14 13:03:32
-->
<template>
<!-- 受理信息 -->
......@@ -163,7 +163,7 @@
</el-form-item>
</el-col>
</el-row>
<qlrCommonTable :tableData="ruleForm.qlrxx" :gyfs="ruleForm.gyfs" :disabled="!ableOperation" />
<qlrCommonTable :tableData="ruleForm.qlrList" :gyfs="ruleForm.gyfs" :disabled="!ableOperation" />
<div class="slxx_title title-block">
登记原因
<div class="triangle"></div>
......@@ -206,6 +206,7 @@
...res.result.qlxxdatas,
...res.result.jsydsyqdatas,
};
this.czrOptions = this.ruleForm.qlrList;
}
});
},
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-14 10:27:43
* @LastEditTime: 2023-08-14 13:04:38
-->
<template>
<!-- 受理信息 -->
......@@ -283,7 +283,6 @@
*/
upDateTdytxxList (val) {
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.czrOptions = this.ruleForm.qlrList;
this.key++;
},
// 更新权利人信息
......
......@@ -2,7 +2,7 @@
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-14 10:28:15
* @LastEditTime: 2023-08-14 12:54:53
-->
<template>
<!-- 受理信息 -->
......@@ -232,6 +232,7 @@
Init(formdata).then((res) => {
if (res.code === 200 && res.result) {
this.ruleForm = res.result;
this.czrOptions = this.ruleForm.qlrList;
}
this.$endLoading();
});
......@@ -265,7 +266,6 @@
*/
upDateTdytxxList (val) {
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.czrOptions = this.ruleForm.qlrList;
this.key++;
},
/**
......@@ -275,6 +275,8 @@
*/
upDateQlrxxList (val) {
this.ruleForm.qlrList = _.cloneDeep(val);
this.czrOptions = this.ruleForm.qlrList;
this.key++
},
/**
* @description: onSubmit
......
<!--
* @Description: 房屋多幢受理信息
* @Autor: ssq
* @LastEditTime: 2023-08-14 10:57:31
* @LastEditTime: 2023-08-14 12:49:48
-->
<template>
<div class="slxx">
......@@ -172,31 +172,6 @@
</el-radio-group>
</el-form-item>
</el-col>
<!-- <el-col :span="6" v-show="ruleForm.sldy.gyfs == '2'">
<el-form-item label="是否分别持证:">
<el-radio-group
v-model="ruleForm.sldy.sqfbcz"
:disabled="!ableOperation">
<el-radio label="1"></el-radio>
<el-radio label="0"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6" v-show="ruleForm.sldy.gyfs == '2'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.slsq.czr"
placeholder="持证人"
:disabled="!ableOperation">
<el-option
v-for="item in czrOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
<el-form-item label="是否分别持证:">
<el-radio-group
......@@ -292,6 +267,7 @@
this.ruleForm.slsq.fzfs == null
? (this.ruleForm.slsq.fzfs = "1")
: this.ruleForm.slsq.fzfs;
this.czrOptions = this.ruleForm.qlrList;
}
});
},
......@@ -331,7 +307,6 @@
};
},
methods: {
// 更新土地用途信息
/**
* @description: 更新土地用途信息
* @param {*} val
......@@ -339,10 +314,7 @@
*/
upDateTdytxxList (val) {
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.czrOptions = this.ruleForm.qlrList;
this.key++;
},
// 更新权利人信息
/**
* @description: 更新权利人信息
* @param {*} val
......@@ -350,10 +322,11 @@
*/
upDateQlrxxList (val) {
this.ruleForm.qlrList = _.cloneDeep(val);
this.czrOptions = this.ruleForm.qlrList;
this.key++;
},
// 更新权利人信息
/**
* @description: 更新权利人信息
* @description: 更新业务人信息
* @param {*} val
* @author: renchao
*/
......
......@@ -258,12 +258,8 @@
formdata.append("isEdit", this.ableOperation);
Init(formdata).then((res) => {
this.ruleForm = res.result;
this.czrOptions = this.ruleForm.qlrList;
this.$endLoading();
if (res.code === 200) {
}
else {
this.$alert(res.message, '提示');
}
})
},
components: { qlrCommonTable, JtcyTable },
......
......@@ -263,12 +263,9 @@
formdata.append("isEdit", this.ableOperation);
Init(formdata).then((res) => {
this.ruleForm = res.result;
this.czrOptions = this.ruleForm.qlrList;
this.$endLoading();
if (res.code === 200) {
}
else {
this.$alert(res.message, '提示');
}
})
},
components: { qlrCommonTable, JtcyTable },
......@@ -310,7 +307,6 @@
}
});
},
//权利人更新
/**
* @description: 权利人更新
* @param {*} val
......@@ -320,7 +316,6 @@
this.ruleForm.qlrList = _.cloneDeep(val)
this.czrOptions = this.ruleForm.qlrList;
},
// 更新义务人信息
/**
* @description: 更新义务人信息
* @param {*} val
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-04 15:51:27
* @LastEditTime: 2023-08-14 13:06:03
-->
<template>
<!-- 受理信息 -->
......@@ -358,6 +358,7 @@
Init(formdata).then((res) => {
this.$nextTick(() => {
that.ruleForm = res.result;
this.czrOptions = this.ruleForm.qlrList;
that.$endLoading();
that.isShow = true;
this.czrOptions = this.ruleForm.qlrList;
......@@ -403,7 +404,6 @@
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.key++;
},
// 更新权利人信息
/**
* @description: 更新权利人信息
* @param {*} val
......
......@@ -228,8 +228,8 @@
formdata.append("isEdit", this.ableOperation);
Init(formdata).then(res => {
if (res.code === 200 && res.result) {
console.log(res.result.ygdj.ygdjzlmc);
this.ruleForm = res.result;
this.czrOptions = this.ruleForm.qlrList;
this.$endLoading();
}
})
......@@ -258,7 +258,6 @@
};
},
methods: {
// 更新权利人信息
/**
* @description: 更新权利人信息
* @param {*} val
......@@ -268,9 +267,8 @@
this.ruleForm.qlrList = _.cloneDeep(val);
this.czrOptions = this.ruleForm.qlrList
},
// 更新权利人信息
/**
* @description: 更新权利人信息
* @description: 更新业务人信息
* @param {*} val
* @author: renchao
*/
......
......@@ -198,6 +198,7 @@
if (res.code === 200 && res.result) {
this.$endLoading();
this.ruleForm = res.result;
this.czrOptions = this.ruleForm.qlrList;
}
});
},
......@@ -242,7 +243,7 @@
this.czrOptions = this.ruleForm.qlrList;
},
/**
* @description: 更新权利人信息
* @description: 更新业务人信息
* @param {*} val
* @author: renchao
*/
......
......@@ -260,6 +260,7 @@
Init(formdata).then((res) => {
if (res.code === 200 && res.result) {
that.ruleForm = res.result;
this.czrOptions = this.ruleForm.qlrList;
setTimeout(() => {
that.loading = false
}, 300)
......
......@@ -222,9 +222,8 @@
bacthInit(formdata).then((res) => {
this.$endLoading();
if (res.code === 200 && res.result) {
this.$nextTick(() => {
this.ruleForm = res.result;
})
this.ruleForm = res.result;
this.czrOptions = this.ruleForm.qlrList;
} else {
this.$message.error(res.message);
}
......
......@@ -274,8 +274,8 @@
Init(formdata).then((res) => {
if (res.code === 200 && res.result) {
this.ruleForm = res.result;
this.czrOptions = this.ruleForm.qlrList;
this.$endLoading();
//this.ruleForm.diyaq.sfczjzhxz = "0";
}
})
},
......@@ -319,7 +319,6 @@
});
},
// 更新权利人信息
/**
* @description: 更新权利人信息
* @param {*} val
......@@ -328,6 +327,7 @@
upDateQlrxxList (val) {
if (!_.isEqual(val, this.ruleForm.qlrList)) {
this.ruleForm.qlrList = _.cloneDeep(val);
this.czrOptions = this.ruleForm.qlrList
}
},
// 更新义务人信息
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-07 16:06:37
* @LastEditTime: 2023-08-14 13:26:06
-->
<template>
<div class="from-clues">
......@@ -9,7 +9,7 @@
<el-tab-pane label="自然幢" name="zrz"></el-tab-pane>
<el-tab-pane label="多幢" name="dz"></el-tab-pane>
</el-tabs>
<div v-if="activeName == 'zrz'">
<div v-show="activeName == 'zrz'">
<div class="from-clues-header">
<el-form :model="queryzrzForm" ref="queryzrzForm" label-width="110px">
<el-row>
......@@ -72,7 +72,7 @@
<el-button type="primary" plain @click="submitForm" :loading="loading">发起申请</el-button>
</div>
</div>
<div v-if="activeName == 'dz'">
<div v-show="activeName == 'dz'">
<div class="from-clues-header">
<el-form :model="querydzForm" ref="querydzForm" label-width="110px">
<el-row>
......@@ -112,7 +112,7 @@
</el-form>
</div>
<div class="from-clues-content loadingtext">
<lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="400"
<lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
:current-page.sync="pageData.currentPage" :total="dztableData.total" @size-change="handleSizeChange" @select="select"
@p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="dztableData.columns"
:data="dztableData.data">
......
......@@ -173,7 +173,6 @@
* @author: renchao
*/
qllxClick (index) {
console.log("业务", index);
this.btnDisabled = true;
this.sqywQllxList.forEach(item => {
if (item.check) item.check = false;
......@@ -200,9 +199,9 @@
this.btnDisabled = false;
// this.djqxList = []
} else {
this.getNextNode(data[index].bsmSqyw);
this.btnDisabled = true;
}
this.getNextNode(data[index].bsmSqyw);
},
//获取下个节点类型数据
/**
......@@ -240,7 +239,6 @@
}
})
},
//双击事件
/**
* @description: 双击事件
* @param {*} data
......@@ -253,7 +251,6 @@
this.selectSqywClick(data, index);
this.dialogClick();
},
//打开弹框内容
/**
* @description: 打开弹框内容
* @author: renchao
......@@ -372,9 +369,7 @@
* @author: renchao
*/
openDialog () {
console.log("this.selectParam", this.selectParam);
let title = "申请业务:" + this.selectParam?.djywmc ? this.selectParam?.djywmc : '';
this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'sqywInfo': this.selectParam }, "90%", true)
},
/**
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-04 09:54:32
* @LastEditTime: 2023-08-14 11:21:48
*/
import filter from '@/utils/filter.js'
let vm = null
......@@ -50,8 +50,8 @@ class data extends filter {
},
{
prop: "qllxmc",
width: '100',
showOverflowTooltip: true,
width: '100',
label: "权利类型",
},
{
......
export function queueDjywmc (djywbm, djqxbm) {
console.log(djqxbm);
console.log(djywbm, 'djywbm');
if (djqxbm == "A0320099" || djqxbm == "A0330099") {
return "selectJsydsyqSplitMerge";
}
......@@ -35,14 +35,20 @@ export function queueDjywmc (djywbm, djqxbm) {
vm = "selectJsydsyq";
break;
case "A04100"://国有建设用地使用权/房屋所有权(首次登记)
case "A06100":
case "A08100":
case "A06100": // 宅基地使用权/房屋所有权 || 首次登记
case "A08100": // 集体建设用地使用权/房屋所有权 || 首次登记
case "B37100":
vm = "fwsyq";
break;
case "A04200":
case "A04200": //国有建设用地使用权/房屋所有权 || 转移登记
case "A04300":
case "A04400":
case "A06200": // 宅基地使用权/房屋所有权 || 转移登记
case "A06300":
case "A06400":
case "A08200": // 集体建设用地使用权/房屋所有权 || 转移登记
case "A08300":
case "A08400":
vm = "selectFwsyq";
break;
case "A23100"://农用地使用权(首次登记)
......