24661287 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents c8d4e109 9205d969
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-30 17:20:50
* @LastEditTime: 2023-08-31 08:51:09
-->
<template>
<div>
......
......@@ -21,10 +21,11 @@
<div class="menu-con">
<p>{{ item.bdcdyh }}</p>
<el-tooltip effect="dark" :content="item.zl" placement="top">
<p class="title-detail">{{ item.zl }}</p>
<p v-if="item.sqfl=='1'" class="title-detail">{{ item.zl }}</p>
<p v-else class="title-detail">{{ item.qllxmc }}</p>
</el-tooltip>
</div>
<i class="el-icon-delete" v-if="unitData.length > 1" @click.stop="handleDel(item)"></i>
<i class="el-icon-delete" v-if="unitData.length > 1 && item.sqfl=='1'" @click.stop="handleDel(item)"></i>
</el-menu-item>
</el-menu>
</div>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-30 16:54:26
* @LastEditTime: 2023-08-30 17:31:53
-->
<template>
<div class="szxx">
......@@ -109,7 +109,6 @@
this.viewEdit = this.$parent.currentSelectTab.ableOperation
},
methods: {
//初始化列表
/**
* @description: 初始化列表
* @author: renchao
......@@ -125,7 +124,6 @@
}
});
},
//打开证书预览弹窗
/**
* @description: 打开证书预览弹窗
* @param {*} item
......@@ -134,6 +132,7 @@
*/
openZsylDialog (item, type) {
store.dispatch('user/reWorkFresh', false)
if (type == 1) {
//证书预览
this.$popupDialog("证书证明预览", "workflow/components/dialog/zsyl", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "76%", true);
......@@ -141,13 +140,13 @@
this.$popupDialog("证书证明打印", "workflow/components/dialog/zsdy", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "76%", true);
}
},
//再次打印
/**
* @description: 再次打印
* @param {*} item
* @author: renchao
*/
openInvalidDiglog (item) {
this.bdcqz = item
this.ysxlh = item.ysxlh
this.bsmSz = item.bsmSz;
this.invalidDiglog = true;
......@@ -162,7 +161,6 @@
this.bsmSz = "";
this.zfyy = "";
},
//作废缮证信息
/**
* @description: 作废缮证信息
* @author: renchao
......@@ -178,7 +176,7 @@
} else {
this.$message.error(res.message);
}
});
})
},
/**
* @description: openRecordPop
......
......@@ -118,7 +118,7 @@
<el-row :gutter="10">
<el-col :span="8" >
<el-form-item label="原不动产证号:">
<el-form-item label="原不动产证号:">
<el-input disabled v-model="ruleForm.sldy.ybdcqzsh"></el-input>
</el-form-item>
</el-col>
......
......@@ -54,7 +54,7 @@
</div>
<el-row :gutter="10" v-if="ruleForm.qlxx">
<el-col :span="8">
<el-form-item label="原不动产登记证明号:">
<el-form-item label="原不动产号:">
<el-input disabled v-model="ruleForm.sldy.ybdcqzsh"></el-input>
</el-form-item>
</el-col>
......
......@@ -59,7 +59,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>
......@@ -121,7 +121,7 @@
</div>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="原不动产登记证明号:">
<el-form-item label="原不动产号:">
<el-input disabled v-model="ruleForm.sldy.ybdcqzsh"></el-input>
</el-form-item>
</el-col>
......@@ -195,7 +195,7 @@
</el-col>
</el-row>
<div class="slxx_title title-block">
权利人信息
抵押权人信息
<div class="triangle"></div>
</div>
<el-row :gutter="10">
......@@ -245,7 +245,7 @@
:disabled="viewEdit"
:gyfs="ruleForm.sldy.gyfs" />
<div class="slxx_title title-block">
义务人信息
抵押人信息
<div class="triangle"></div>
</div>
<qlrCommonTable
......