f602e3dd by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 38963f3e 466ac35d
......@@ -51,17 +51,26 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否效验土地确权" prop="enabled" v-if="form.sqdjyw">
<el-radio-group v-model="form.sqdjyw.sfjytd">
<el-radio label="1"></el-radio>
<el-radio label="0"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="业务流程ID" prop="flowid" v-if="form.sqdjyw">
<el-input v-model="form.sqdjyw.flowid"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="16">
<el-form-item label="流程参数" prop="flowparams" v-if="form.sqdjyw">
<el-input v-model="form.sqdjyw.flowparams"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="登记原因设置" prop="sfqydjyymb" v-if="form.sqdjyw">
......@@ -93,7 +102,11 @@
</el-row>
</el-form>
<el-collapse class="modifycollapse" accordion>
<el-collapse-item title="登记情形设置" name="1">
<el-collapse-item title="登记类型" name="0" v-if="form.sqdjyw.sqfl=='2'">
<lb-table :column="djqxCol" :pagination="false" heightNumSetting :minHeight="160" :data="form.djlx">
</lb-table>
</el-collapse-item>
<el-collapse-item title="登记情形设置" name="1" v-if="form.sqdjyw.sqfl=='1'">
<lb-table :column="djqxCol" :pagination="false" heightNumSetting :minHeight="160" :data="form.djqx">
</lb-table>
</el-collapse-item>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-05 15:36:51
* @LastEditTime: 2023-09-05 16:37:35
-->
<template>
<div>
......@@ -24,7 +24,7 @@
</el-select>
</el-col>
<el-col :span="2" v-if="this.formData.ysxlh">
<el-button type="primary" @click="invalidDiglog=true">作废</el-button>
<el-button type="primary" @click="handleZF" v-if="disabled">作废</el-button>
</el-col>
</el-row>
......@@ -166,11 +166,15 @@
this.zfyy = "";
this.invalidDiglog = false
},
handleZF () {
this.invalidDiglog = true
},
/**
* @description: 作废缮证信息
* @author: renchao
*/
confirmInvalid () {
store.dispatch('user/reWorkFresh', false)
invalidCertificate({ bsmBdcqz: this.bdcqz.bsmBdcqz, zfyy: this.zfyy }).then((res) => {
if (res.code === 200) {
this.$message.success("作废成功");
......@@ -179,12 +183,12 @@
this.zfyy = ''
this.ruleForm.ysxlh = ''
this.bdcqz.ysxlh = ''
store.dispatch('user/reWorkFresh', false)
if (this.bdcqz.bdcqzlx == 1) {
this.drawTextOnImage()
} else {
this.drawTextzmImage()
}
store.dispatch('user/reWorkFresh', true)
} else {
this.$message.error(res.message);
}
......@@ -587,6 +591,7 @@
this.$message.error('请选择印刷序列号');
return;
}
store.dispatch('user/reWorkFresh', false)
let that = this
if (this.bdcqz.bdcqzlx == 1) {
getPrintTemplateByCode({ tmpno: 'zsdy' }).then(resInfo => {
......@@ -646,6 +651,7 @@
this.$message.error('请选择印刷序列号');
return;
}
store.dispatch('user/reWorkFresh', false)
this.ruleForm.bsmBdcqz = this.bdcqz.bsmBdcqz;
this.ruleForm.bdcqzlx = this.bdcqz.bdcqzlx;
this.ruleForm.szzh = this.bdcqz.bdcqzh;
......
<template>
<div>
<div>不动产信息</div>
<div>买方信息</div>
<div>卖方信息</div>
<div>合同信息</div>
<div>缴税信息</div>
<div class="slxx swxx">
<!--
<div>缴税信息</div> -->
<el-form
:model="ruleForm"
ref="ruleForm"
v-Loading="loading"
:label-position="flag ? 'top' : ''"
:inline="flag"
label-width="120px">
<div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
<div class="slxx_title title-block">
不动产信息
<div class="triangle"></div>
</div>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="不动产单元号:">
<el-input disabled v-model="ruleForm.bdcdyh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="原产证号:">
<el-input disabled v-model="ruleForm.yfczh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="面积(m3):">
<el-input disabled v-model="ruleForm.mj"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="权利类型:">
<el-input disabled v-model="ruleForm.qllxmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="用途:">
<el-input disabled v-model="ruleForm.yt"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="坐落:">
<el-input disabled v-model="ruleForm.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
买方信息
<div class="triangle"></div>
</div>
<lb-table :column="column" :pagination="false" :heightNumSetting="true"
:data="ruleForm.tableDataList">
</lb-table>
<div class="slxx_title title-block">
卖方信息
<div class="triangle"></div>
</div>
<lb-table :column="column1" :pagination="false" :heightNumSetting="true"
:data="ruleForm.tableDataList">
</lb-table>
<div class="slxx_title title-block">
合同信息
<div class="triangle"></div>
</div>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="合同编号:">
<el-input v-model="ruleForm.htbh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="合同金额(万元):">
<el-input v-model="ruleForm.htje"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="签订时间:">
<el-date-picker
class="width100"
v-model="ruleForm.qdsj"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</div>
<el-row class="btn" v-if="viewEdit">
<el-form-item>
<el-button type="primary" @click="onSubmit">保存</el-button>
</el-form-item>
</el-row>
</el-form>
</div>
</template>
<script>
import { mapGetters } from "vuex";
export default {
computed: {
...mapGetters(["dictData", "flag"]),
},
mounted () {
// this.loading = true
this.viewEdit = 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("isEdit", this.viewEdit);
// Init(formdata).then((res) => {
// if (res.code === 200 && res.result) {
// }
// });
},
data () {
return {
loading: false,
//表单是否可操作
viewEdit: false,
column: [
{
prop: "qlrxm",
label: "权利人姓名"
},
{
prop: "gyqk",
label: "共有情况"
},
{
prop: "zjzl",
label: "身份证号种类"
},
{
prop: "zjhm",
label: "证件号码"
},
],
column1: [{
prop: "ywrxm",
label: "义务人姓名"
},
{
prop: "zjzl",
label: "身份证号种类"
},
{
prop: "zjhm",
label: "证件号码"
},],
ruleForm: {
tableDataList: []
}
}
},
methods: {
onSubmit () { }
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/slxx/slxx.scss";
</style>
......
......@@ -13,8 +13,7 @@
ref="ruleForm"
:label-position="flag ? 'top' : ''"
:inline="flag"
label-width="180px"
>
label-width="180px">
<div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
<div class="slxx_title title-block">
申请业务信息
......@@ -117,7 +116,7 @@
</div>
<el-row :gutter="10">
<el-col :span="8" >
<el-col :span="8">
<el-form-item label="原不动产证号:">
<el-input disabled v-model="ruleForm.sldy.ybdcqzsh"></el-input>
</el-form-item>
......@@ -153,12 +152,10 @@
<el-col :span="8">
<el-form-item
label="是否禁止或者限制转让的约定:"
label-width="200px"
>
label-width="200px">
<el-radio-group
v-model="ruleForm.diyaq.sfczjzhxz"
:disabled="!viewEdit || isJfOperation"
>
:disabled="!viewEdit || isJfOperation">
<el-radio label="1"></el-radio>
<el-radio label="0"></el-radio>
</el-radio-group>
......@@ -166,8 +163,7 @@
</el-col>
<el-col :span="8">
<el-form-item
label="是否预告登记:"
>
label="是否预告登记:">
<el-radio-group v-model="ruleForm.diyaq.sfygdj" disabled>
<el-radio label="1"></el-radio>
<el-radio label="0"></el-radio>
......@@ -178,8 +174,7 @@
<el-form-item label="债务履行期限:">
<el-input
v-model="ruleForm.diyaq.dyqx"
:disabled="!viewEdit || isJfOperation"
></el-input>
:disabled="!viewEdit || isJfOperation"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -191,18 +186,15 @@
<el-input
v-model="ruleForm.diyaq.bdbzzqse"
:disabled="!viewEdit || isJfOperation"
style="width: 500%"
></el-input>
style="width: 500%"></el-input>
<el-select
v-model="ruleForm.diyaq.jedw"
:disabled="!viewEdit || isJfOperation"
>
:disabled="!viewEdit || isJfOperation">
<el-option
v-for="item in dictData['A57']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
:value="item.dcode">
</el-option>
</el-select>
</div>
......@@ -213,8 +205,7 @@
<el-form-item label="最高债权额:">
<el-input
v-model="ruleForm.diyaq.zgzqse"
:disabled="!viewEdit || isJfOperation"
></el-input>
:disabled="!viewEdit || isJfOperation"></el-input>
</el-form-item>
</el-col>
......@@ -223,8 +214,7 @@
<el-date-picker
v-model="ruleForm.diyaq.zwlxqssj"
:disabled="!viewEdit || isJfOperation"
type="date"
>
type="date">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -233,8 +223,7 @@
<el-date-picker
v-model="ruleForm.diyaq.zwlxjssj"
:disabled="!viewEdit || isJfOperation"
type="date"
>
type="date">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -246,8 +235,7 @@
v-model="ruleForm.diyaq.dbfw"
:disabled="
(ruleForm.sldy.djlx == '300' && !viewEdit) || isJfOperation
"
></el-input>
"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -256,8 +244,7 @@
<el-form-item label="最高债权确定事实和数额:">
<el-input
v-model="ruleForm.diyaq.zgzqqdss"
:disabled="!viewEdit || isJfOperation"
></el-input>
:disabled="!viewEdit || isJfOperation"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -269,8 +256,7 @@
maxlength="500"
show-word-limit
v-model="ruleForm.diyaq.fj"
:disabled="!viewEdit || isJfOperation"
></el-input>
:disabled="!viewEdit || isJfOperation"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -284,8 +270,7 @@
<el-form-item label="共有方式:">
<el-radio-group
:disabled="!viewEdit"
v-model="ruleForm.sldy.gyfs"
>
v-model="ruleForm.sldy.gyfs">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -298,8 +283,7 @@
<el-radio-group
v-model="ruleForm.sldy.sqfbcz"
:disabled="!viewEdit"
@input="updaterow()"
>
@input="updaterow()">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
</el-radio-group>
......@@ -307,20 +291,17 @@
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'"
>
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit"
>
:disabled="!viewEdit">
<el-option
v-for="item in czrOptions"
:key="item.zjh"
:label="item.sqrmc"
:value="item.zjh"
>
:value="item.zjh">
</el-option>
</el-select>
</el-form-item>
......@@ -330,8 +311,7 @@
:tableData="ruleForm.qlrList"
:disabled="viewEdit"
@upDateQlrxxList="upDateQlrxxList"
:gyfs="ruleForm.sldy.gyfs"
/>
:gyfs="ruleForm.sldy.gyfs" />
<div class="slxx_title title-block">
抵押人信息
<div class="triangle"></div>
......@@ -339,8 +319,7 @@
<qlrCommonTable
:tableData="ruleForm.ywrList"
:disabled="viewEdit"
@upDateQlrxxList="upDateYwrxxList"
/>
@upDateQlrxxList="upDateYwrxxList" />
<div class="slxx_title title-block">
登记原因
......@@ -351,14 +330,12 @@
<el-form-item
v-if="ruleForm.sldy.djlx == '400'"
label="注销抵押原因:"
prop="djyy"
>
prop="djyy">
<el-input
class="textArea"
type="textarea"
:disabled="!viewEdit"
v-model="ruleForm.diyaq.zxdyyy"
>
v-model="ruleForm.diyaq.zxdyyy">
</el-input>
</el-form-item>
<el-form-item v-else label="登记原因:" prop="djyy">
......@@ -368,8 +345,7 @@
maxlength="500"
show-word-limit
:disabled="!viewEdit"
v-model="ruleForm.diyaq.djyy"
>
v-model="ruleForm.diyaq.djyy">
</el-input>
</el-form-item>
</el-col>
......@@ -384,11 +360,11 @@
</div>
</template>
<script>
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
import { Init, saveData } from "@/api/workflow/diyaqFlow.js";
import { mapGetters } from "vuex";
export default {
mounted() {
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
import { Init, saveData } from "@/api/workflow/diyaqFlow.js";
import { mapGetters } from "vuex";
export default {
mounted () {
this.viewEdit = this.$parent.currentSelectTab.ableOperation;
this.propsParam = this.$attrs;
var formdata = new FormData();
......@@ -417,7 +393,7 @@ export default {
computed: {
...mapGetters(["dictData", "flag"]),
},
data() {
data () {
return {
//表单是否可操作
viewEdit: true,
......@@ -441,7 +417,7 @@ export default {
* @description: onSubmitClick
* @author: renchao
*/
onSubmitClick() {
onSubmitClick () {
let that = this;
if (this.ruleForm.qlrList.length == 0) {
this.$message({
......@@ -518,7 +494,7 @@ export default {
* @param {*} val
* @author: renchao
*/
upDateQlrxxList(val) {
upDateQlrxxList (val) {
if (!_.isEqual(val, this.ruleForm.qlrList)) {
this.ruleForm.qlrList = _.cloneDeep(val);
this.czrOptions = this.ruleForm.qlrList;
......@@ -530,7 +506,7 @@ export default {
* @param {*} val
* @author: renchao
*/
updaterow() {
updaterow () {
this.czr = "";
},
/**
......@@ -538,15 +514,15 @@ export default {
* @param {*} val
* @author: renchao
*/
upDateYwrxxList(val) {
upDateYwrxxList (val) {
if (!_.isEqual(val, this.ruleForm.ywrList)) {
this.ruleForm.ywrList = _.cloneDeep(val);
}
},
},
};
};
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/slxx/slxx.scss";
@import "~@/styles/public.scss";
@import "~@/styles/slxx/slxx.scss";
</style>
......
<!--
* @Description: 房屋多幢受理信息
* @Autor: ssq
* @LastEditTime: 2023-09-01 13:23:30
* @LastEditTime: 2023-09-05 15:48:55
-->
<template>
<div class="slxx">
......@@ -353,8 +353,6 @@
this.czrOptions = this.ruleForm.qlrList;
this.key++;
},
// 是否持证人变化
/**
* @description: 是否持证人变化
* @param {*} val
......
<!--
* @Description: 受理信息
* @Autor: renchao
* @LastEditTime: 2023-09-01 13:40:52
* @LastEditTime: 2023-09-05 15:53:51
-->
<template>
<div class="slxx">
......@@ -378,8 +378,7 @@
v-if="ruleForm.qlxx"
@upDateQlrxxList="upDateYwrxxList"
:tableData="ruleForm.ywrList"
:disabled="viewEdit"
/>
:disabled="viewEdit" />
</div>
<div class="slxx_title title-block">
登记原因
......@@ -443,7 +442,7 @@
}
});
},
components: { qlrCommonTable, tdytTable },
components: { qlrCommonTable, tdytTable, ywrCommonTable },
computed: {
...mapGetters(["dictData", "flag"]),
},
......
......@@ -45,8 +45,9 @@ class data extends filter {
}
},
{
prop: "qllxmc",
label: "权利类型",
prop: "ygdjzlmc",
label: "预告登记种类",
minWidth: '100'
},
{
prop: "bdcdyh",
......
......@@ -45,9 +45,9 @@ class data extends filter {
}
},
{
prop: "bdcqzh",
label: "不动产登记证明号",
minWidth: '150'
prop: "ygdjzlmc",
label: "预告登记种类",
minWidth: '100'
},
{
prop: "bdcdyh",
......@@ -55,40 +55,33 @@ class data extends filter {
minWidth: '150'
},
{
prop: "dyfs",
label: "抵押方式",
render: (h, scope) => {
switch (scope.row.dyfs) {
case '1':
return <span>一般抵押</span>
case '2':
return <span>最高额抵押</span>
}
}
prop: "bdcqzh",
label: "不动产登记证明号",
minWidth: '150'
},
{
prop: "qlrmc",
label: "抵押权人",
label: "权利人",
},
{
prop: "qlrzjhm",
label: "抵押权人证件号",
label: "证件号码",
},
{
prop: "ywrmc",
label: "抵押人",
label: "义务人",
},
{
prop: "ywrzjhm",
label: "抵押人证件号",
label: "证件号码",
},
{
prop: "dyje",
label: "抵押金额(万元)",
prop: "jzmj",
label: "建筑面积",
},
{
prop: "dymj",
label: "抵押面积",
prop: "qdjg",
label: "被担保主债权数额",
},
{
prop: "dyqx",
......