7e93aafc by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 6f80a4bd bdef38ab
......@@ -4,6 +4,14 @@
* @LastEditTime: 2024-02-23 10:45:18
*/
/*
* 不动产登记受理凭证(首环节)getPrintAcceptance
* 不动产登记补充材料通知书 getPrintSupplementalMaterials
* 不动产登记补充材料接收凭证 getPrintReceiveSupplementalMaterials
* 不予登记告知书 getPrintRejectForms
* 不动产登记申请材料退回通知书 getPrintSendBackMaterials
* 不动产更正登记通知书(依职权更正首环节)getPrintRiviseForms
*/
import request from '@/utils/request'
let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
......@@ -100,11 +108,53 @@ export function getPrintSupplementalMaterials (bsmSldy, data) {
})
}
/**
* @description: 获取不予登记告知书
* @param {*} bsmSldy
* @author: renchao
*/
export function getPrintRejectForms (bsmSldy) {
return request({
url: SERVER.SERVERAPI + '/rest/print/applicationForms/getPrintRejectForms',
method: 'get',
params: {
bsmSldy: bsmSldy
}
})
}
/**
* @description: 获取更正登记通知书
* @param {*} bsmSldy
* @author: renchao
*/
export function getPrintRiviseForms (bsmSldy) {
return request({
url: SERVER.SERVERAPI + '/rest/print/applicationForms/getPrintRiviseForms',
method: 'get',
params: {
bsmSldy: bsmSldy
}
})
}
/**
* @description: 获取申请材料退回通知书
* @param {*} bsmSldy
* @author: renchao
*/
export function getPrintSendBackMaterials (bsmSldy) {
return request({
url: SERVER.SERVERAPI + '/rest/print/applicationForms/getPrintSendBackMaterials',
method: 'get',
params: {
bsmSldy: bsmSldy
}
})
}
/**
* @description: 获取补充材料接收凭证
* @param {*} bsmSldy
* @author: renchao
*/
export function getPrintReceiveSupplementalMaterials (bsmSldy) {
export function getPrintReceiveSupplementalMaterials (bsmSldy) {
return request({
url: SERVER.SERVERAPI + '/rest/print/applicationForms/getPrintReceiveSupplementalMaterials',
method: 'get',
......
......@@ -152,9 +152,12 @@
}
.iconName {
line-height: 24px;
height: 10px;
text-align: center;
line-height: 15px;
font-size: 12px;
white-space: nowrap;
width: 70px;
// white-space: nowrap;
}
.container {
......
......@@ -203,8 +203,8 @@ export default {
this.isIndeterminate =
checkedCount > 0 && checkedCount < this.cities.length;
let lists = [];
this.cities.forEach((item, index) => {
this.checkedCities.forEach((el) => {
this.cities.forEach((item, index) => {
if (item.name == el) {
lists.push(this.cities[index]);
}
......
......@@ -74,10 +74,16 @@
</el-col>
</el-row>
<div class="slxx_title title-block">
<el-row>
<el-col :span="16">
查封不动产情况
</el-col>
<el-col :span="4" v-if="ruleForm.sldy.djlx=='300'||ruleForm.sldy.djlx=='500'">
<el-button @click="compare">变化情况对比+</el-button>
</el-col>
</el-row>
<div class="triangle"></div>
</div>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="权利类型:">
......@@ -389,7 +395,23 @@
return item.dcode == e;
});
this.ruleForm.cfdj.cflxmc = cflxItem.dname
}
},
/**
* @description: compare
* @author: renchao
*/
compare () {
this.$popupDialog(
this.ruleForm.qlxx.qllxmc,
"registerBook/comparison",
{
bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
dqqllx: "FDCQ2",
},
"80%",
true
);
},
}
}
</script>
......
......@@ -54,10 +54,16 @@
</el-col>
</el-row>
<div class="slxx_title title-block">
<el-row>
<el-col :span="16">
抵押不动产情况
</el-col>
<el-col :span="4" v-if="ruleForm.sldy.djlx=='300'||ruleForm.sldy.djlx=='500'">
<el-button @click="compare">变化情况对比+</el-button>
</el-col>
</el-row>
<div class="triangle"></div>
</div>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="权利人:">
......@@ -570,6 +576,21 @@
if (!_.isEqual(val, this.ruleForm.ywrList)) {
this.ruleForm.ywrList = _.cloneDeep(val);
}
}, /**
* @description: compare
* @author: renchao
*/
compare () {
this.$popupDialog(
this.ruleForm.qlxx.qllxmc,
"registerBook/comparison",
{
bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
dqqllx: "FDCQ2",
},
"80%",
true
);
},
},
};
......
......@@ -65,6 +65,9 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="4" v-if="ruleForm.sldy.djlx=='300'||ruleForm.sldy.djlx=='500'">
<el-button @click="compare">变化情况对比+</el-button>
</el-col>
</el-row>
<div class="triangle"></div>
</div>
......@@ -545,7 +548,22 @@
return false
}
})
}
}, /**
* @description: compare
* @author: renchao
*/
compare () {
this.$popupDialog(
this.ruleForm.qlxx.qllxmc,
"registerBook/comparison",
{
bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
dqqllx: "FDCQ2",
},
"80%",
true
);
},
}
}
</script>
......
......@@ -61,6 +61,9 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="4" v-if="ruleForm.sldy.djlx=='300'||ruleForm.sldy.djlx=='500'">
<el-button @click="compare">变化情况对比+</el-button>
</el-col>
</el-row>
<div class="triangle"></div>
</div>
......@@ -579,6 +582,21 @@
return item.dcode == e;
});
this.ruleForm.nydsyq.ydyhflmc = itemLx.dname;
}, /**
* @description: compare
* @author: renchao
*/
compare () {
this.$popupDialog(
this.ruleForm.qlxx.qllxmc,
"registerBook/comparison",
{
bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
dqqllx: "FDCQ2",
},
"80%",
true
);
},
},
};
......
......@@ -67,6 +67,9 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="4" v-if="ruleForm.sldy.djlx=='300'||ruleForm.sldy.djlx=='500'">
<el-button @click="compare">变化情况对比+</el-button>
</el-col>
</el-row>
<div class="triangle"></div>
</div>
......@@ -487,6 +490,21 @@
upDateYwrxxList (val) {
this.ruleForm.ywrList && (this.ruleForm.ywrList = _.cloneDeep(val));
this.key++;
}, /**
* @description: compare
* @author: renchao
*/
compare () {
this.$popupDialog(
this.ruleForm.qlxx.qllxmc,
"registerBook/comparison",
{
bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
dqqllx: "FDCQ2",
},
"80%",
true
);
},
/**
* @description: onSubmit
......
......@@ -66,6 +66,9 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="4" v-if="ruleForm.sldy.djlx=='300'||ruleForm.sldy.djlx=='500'">
<el-button @click="compare">变化情况对比+</el-button>
</el-col>
</el-row>
<div class="triangle"></div>
</div>
......@@ -490,6 +493,21 @@
*/
updaterow () {
this.czr = "";
}, /**
* @description: compare
* @author: renchao
*/
compare () {
this.$popupDialog(
this.ruleForm.qlxx.qllxmc,
"registerBook/comparison",
{
bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
dqqllx: "FDCQ2",
},
"80%",
true
);
},
/**
* @description: onSubmit
......
......@@ -49,7 +49,14 @@
</el-col>
</el-row>
<div class="slxx_title title-block">
<el-row>
<el-col :span="16">
不动产情况
</el-col>
<el-col :span="4" v-if="ruleForm.sldy.djlx=='300'||ruleForm.sldy.djlx=='500'">
<el-button @click="compare">变化情况对比+</el-button>
</el-col>
</el-row>
<div class="triangle"></div>
</div>
<el-row :gutter="10" v-if="ruleForm.qlxx">
......@@ -387,6 +394,21 @@
*/
upDateYwrxxList (val) {
this.ruleForm.ywrList = _.cloneDeep(val);
}, /**
* @description: compare
* @author: renchao
*/
compare () {
this.$popupDialog(
this.ruleForm.qlxx.qllxmc,
"registerBook/comparison",
{
bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
dqqllx: "FDCQ2",
},
"80%",
true
);
},
/**
* @description: 是否持证人变化
......
......@@ -49,7 +49,14 @@
</el-col>
</el-row>
<div class="slxx_title title-block">
<el-row>
<el-col :span="16">
预告买卖登记情况
</el-col>
<el-col :span="4" v-if="ruleForm.sldy.djlx=='300'||ruleForm.sldy.djlx=='500'">
<el-button @click="compare">变化情况对比+</el-button>
</el-col>
</el-row>
<div class="triangle"></div>
</div>
<el-row :gutter="10">
......@@ -419,6 +426,21 @@
*/
upDateYwrxxList (val) {
this.ruleForm.ywrList = _.cloneDeep(val);
}, /**
* @description: compare
* @author: renchao
*/
compare () {
this.$popupDialog(
this.ruleForm.qlxx.qllxmc,
"registerBook/comparison",
{
bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
dqqllx: "FDCQ2",
},
"80%",
true
);
},
/**
* @description: 是否持证人变化
......
......@@ -49,7 +49,14 @@
</el-col>
</el-row>
<div class="slxx_title title-block">
<el-row>
<el-col :span="16">
抵押户信息情况
</el-col>
<el-col :span="4" v-if="ruleForm.sldy.djlx=='300'||ruleForm.sldy.djlx=='500'">
<el-button @click="compare">变化情况对比+</el-button>
</el-col>
</el-row>
<div class="triangle"></div>
</div>
<el-row :gutter="10">
......@@ -563,7 +570,23 @@
if (!_.isEqual(val, this.ruleForm.ywrList)) {
this.ruleForm.ywrList = _.cloneDeep(val);
}
}
},
/**
* @description: compare
* @author: renchao
*/
compare () {
this.$popupDialog(
this.ruleForm.qlxx.qllxmc,
"registerBook/comparison",
{
bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
dqqllx: "FDCQ2",
},
"80%",
true
);
},
}
}
</script>
......
......@@ -4,9 +4,10 @@
* @LastEditTime: 2024-02-23 16:27:17
*/
import Vue from 'vue'
import { getPrintTemplateByCode, getPrintAcceptance, getPrintReceiveSupplementalMaterials } from "@/api/print";
import { getPrintTemplateByCode, getPrintAcceptance,getPrintReceiveSupplementalMaterials,getPrintRejectForms,getPrintSendBackMaterials,getPrintRiviseForms} from "@/api/print";
import { uploadUndo } from "@/api/clxx";
import { getLodop } from "@/utils/LodopFuncs";
import { getNewDate } from '@/utils/util'
import adapter from "@/utils/sqs/adapter";
import {
stepExpandInfo,
......@@ -40,7 +41,8 @@ export default {
batchButtonName: '',
// 受理申请信息
slsq: {},
dqhj: ""
dqhj: "",
newDate: getNewDate()
}
},
mounted () {
......@@ -253,8 +255,12 @@ export default {
let key = index + 1
this.$set(infoRes.result, "file" + key, it.sjmc)
this.$set(infoRes.result, "file" + key + 'ys', it.ys)
// this.$set(infoRes.result, "file" + key + 'xs', it.)
})
}
infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
infoRes.result.nowyue = this.newDate.slice(5,7)
infoRes.result.nowri = this.newDate.slice(8,10)
let date = infoRes.result.sqrq
infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
......@@ -281,23 +287,27 @@ export default {
break;
// 补充材料通知书
case "bccltzs":
this.$popupDialog("补充材料通知书", "workflow/top/bcclml/index",
{ bsmSlsq: this.$route.query.bsmSlsq, bsmSldy: this.currentSelectProps.bsmSldy },
this.$popupDialog("补充材料通知书", "workflow/top/bccltzs/index",
{ bsmSlsq: this.$route.query.bsmSlsq, bsmSldy: this.currentSelectProps.bsmSldy,type:"bccltzs" },
'70%', true)
break;
// 获取补充材料接收凭证
case "slpz":
getPrintTemplateByCode({ tmpno: 'bdcdjslpz' }).then(res => {
// 补充材料接收凭证
case "bccljspz":
getPrintTemplateByCode({ tmpno: 'bdcdjbccljspz' }).then(res => {
if (res.code === 200) {
getPrintAcceptance(this.currentSelectProps.bsmSldy).then(infoRes => {
getPrintReceiveSupplementalMaterials(this.currentSelectProps.bsmSldy).then(infoRes => {
if (infoRes.code === 200) {
if (infoRes.result.fileList && infoRes.result.fileList.length > 0) {
infoRes.result.fileList.forEach((it, index) => {
let key = index + 1
this.$set(infoRes.result, "file" + key, it.sjmc)
this.$set(infoRes.result, "file" + key + 'ys', it.ys)
this.$set(infoRes.result, "file" + key + 'lx', it.sjlx==1?"原件":"复印件")
})
}
infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
infoRes.result.nowyue = this.newDate.slice(5,7)
infoRes.result.nowri = this.newDate.slice(8,10)
let date = infoRes.result.sqrq
infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
......@@ -322,6 +332,129 @@ export default {
}
})
break;
// 不予登记告知书
case "bydjgzs":
getPrintTemplateByCode({ tmpno: 'bydjgzs' }).then(res => {
if (res.code === 200) {
getPrintRejectForms(this.currentSelectProps.bsmSldy).then(infoRes => {
if (infoRes.code === 200) {
if (infoRes.result.fileList && infoRes.result.fileList.length > 0) {
infoRes.result.fileList.forEach((it, index) => {
let key = index + 1
this.$set(infoRes.result, "file" + key, it.sjmc)
this.$set(infoRes.result, "file" + key + 'ys', it.ys)
})
}
infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
infoRes.result.nowyue = this.newDate.slice(5,7)
infoRes.result.nowri = this.newDate.slice(8,10)
let date = infoRes.result.sqrq
infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
infoRes.result.sqri = date.split(' ')[0].split('-')[2]
console.log(infoRes.result)
let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
// 装载第一个模板并设置数据
LODOP.ADD_PRINT_DATA("ProgramData", res.result.tmpcontent);
for (let key in infoRes.result) {
LODOP.SET_PRINT_STYLEA(key, "CONTENT", infoRes.result[key]);
}
// 进行预览
LODOP.PREVIEW();
} else {
this.$message.error(infoRes.message);
}
});
} else {
this.$message.error(res.message);
}
})
break;
// 申请材料退回通知书
case "sqclthtzs":
getPrintTemplateByCode({ tmpno: 'bdcdjsqclthtzs' }).then(res => {
if (res.code === 200) {
getPrintSendBackMaterials(this.currentSelectProps.bsmSldy).then(infoRes => {
if (infoRes.code === 200) {
if (infoRes.result.fileList && infoRes.result.fileList.length > 0) {
infoRes.result.fileList.forEach((it, index) => {
let key = index + 1
this.$set(infoRes.result, "file" + key, it.sjmc)
this.$set(infoRes.result, "file" + key + 'ys', it.ys)
})
}
infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
infoRes.result.nowyue = this.newDate.slice(5,7)
infoRes.result.nowri = this.newDate.slice(8,10)
let date = infoRes.result.sqrq
infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
infoRes.result.sqri = date.split(' ')[0].split('-')[2]
console.log(infoRes.result)
let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
// 装载第一个模板并设置数据
LODOP.ADD_PRINT_DATA("ProgramData", res.result.tmpcontent);
for (let key in infoRes.result) {
LODOP.SET_PRINT_STYLEA(key, "CONTENT", infoRes.result[key]);
}
// 进行预览
LODOP.PREVIEW();
} else {
this.$message.error(infoRes.message);
}
});
} else {
this.$message.error(res.message);
}
})
break;
// 不动产更正登记通知书
case "gzdjtzs":
getPrintTemplateByCode({ tmpno: 'bdcgzdjtzs' }).then(res => {
if (res.code === 200) {
getPrintRiviseForms(this.currentSelectProps.bsmSldy).then(infoRes => {
if (infoRes.code === 200) {
if (infoRes.result.fileList && infoRes.result.fileList.length > 0) {
infoRes.result.fileList.forEach((it, index) => {
let key = index + 1
this.$set(infoRes.result, "file" + key, it.sjmc)
this.$set(infoRes.result, "file" + key + 'ys', it.ys)
})
}
infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
infoRes.result.nowyue = this.newDate.slice(5,7)
infoRes.result.nowri = this.newDate.slice(8,10)
let date = infoRes.result.sqrq
infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
infoRes.result.sqri = date.split(' ')[0].split('-')[2]
console.log(infoRes.result)
let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
// 装载第一个模板并设置数据
LODOP.ADD_PRINT_DATA("ProgramData", res.result.tmpcontent);
for (let key in infoRes.result) {
LODOP.SET_PRINT_STYLEA(key, "CONTENT", infoRes.result[key]);
}
// 进行预览
LODOP.PREVIEW();
} else {
this.$message.error(infoRes.message);
}
});
} else {
this.$message.error(res.message);
}
})
break;
}
},
/**
......
<!--
* @Description:
* @Description:补充材料通知书
* @Autor: renchao
* @LastEditTime: 2024-02-26 09:04:04
-->
......@@ -20,6 +20,7 @@
import { ywPopupCacel } from "@/utils/popup.js";
import { getLodop } from "@/utils/LodopFuncs";
import { updateClml, InitClml } from "@/api/clxx.js";
import { getNewDate } from '@/utils/util'
import { getPrintTemplateByCode, getPrintSupplementalMaterials } from "@/api/print";
export default {
props: {
......@@ -35,6 +36,7 @@
selectList: [],
loading: false,
sortable: null,
newDate: getNewDate(),
column: [
{
type: 'selection',
......@@ -127,20 +129,27 @@
this.loading = true
if (this.selectList.length == 0) {
this.$message.error('请先选择材料目录')
this.loading = false
return
}
getPrintTemplateByCode({ tmpno: 'bdcdjbccltts' }).then(res => {
if (res.code === 200) {
console.log("this.selectListssssssssss",this.selectList);
getPrintSupplementalMaterials(this.formData.bsmSldy, this.selectList).then(infoRes => {
this.loading = false
if (infoRes.code === 200) {
console.log("infoRes.resultsssssssssss",infoRes.result);
if (infoRes.result.fileList && infoRes.result.fileList.length > 0) {
infoRes.result.fileList.forEach((it, index) => {
let key = index + 1
this.$set(infoRes.result, "file" + key, it.sjmc)
this.$set(infoRes.result, "file" + key + 'ys', it.ys)
this.$set(infoRes.result, "file" + key + 'lx', it.sjlx==1?"原件":"复印件")
})
}
infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
infoRes.result.nowyue = this.newDate.slice(5,7)
infoRes.result.nowri = this.newDate.slice(8,10)
let date = infoRes.result.sqrq
infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
......
......@@ -152,9 +152,12 @@
}
.iconName {
line-height: 24px;
height: 10px;
text-align: center;
line-height: 15px;
font-size: 12px;
white-space: nowrap;
width: 70px;
// white-space: nowrap;
}
.container {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-11-16 16:48:57
* @LastEditTime: 2024-03-04 14:13:04
-->
<template>
<div class="from-clues">
......@@ -58,7 +58,7 @@
label="选择"
width="50">
<template slot-scope="scope">
<el-radio v-model="radioVal" @change="handleSelect" @click.native.stop :label="scope.row.bdcdyh">{{''}}</el-radio>
<el-radio v-model="radioVal" @change="handleSelect" @click.native.stop :label="scope.row.bhqkbsm">{{''}}</el-radio>
</template>
</el-table-column>
<el-table-column
......@@ -287,7 +287,7 @@
*/
handleRowClick (row) {
this.queryForm.bhqkbsm = row.bhqkbsm
//this.radioVal = row.bdcdyh
this.radioVal = row.bhqkbsm
//row.bglx = '1'
selectZdjbxxSplitMerge({ ...this.queryForm }).then((res) => {
this.$endLoading();
......