42f13917 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 96d0575c 9d2d16ee
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-01-17 10:33:10
* @LastEditTime: 2024-01-18 08:20:44
-->
<template>
<div>
......@@ -511,9 +511,6 @@
context.fillText(this.bdcqz.sxh ? this.bdcqz.sxh : '', 960, 123);
context.fillText(this.bdcqz.zmqlhsx ? this.bdcqz.zmqlhsx : '', 775, 180);
// context.fillText(this.bdcqz.qlr ? this.bdcqz.qlr : '', 775, 228);
// 义务人
// context.fillText(this.bdcqz.ywr ? this.bdcqz.ywr : '', 775, 275);
// 权利人
let qlrlines = this.bdcqz.qlr ? this.bdcqz.qlr.split(' ') : [];
if (getByteLen(this.bdcqz.qlr) > 37) {
......@@ -556,49 +553,7 @@
})
}
// 义务人
let ywrlines = this.bdcqz.ywr ? this.bdcqz.ywr.split(' ') : [];
if (getByteLen(this.bdcqz.ywr) > 37) {
ywrlines.forEach((line, index) => {
let currentLine = '';
let arr = [];
for (let word of line) {
const testLine = currentLine + word;
const lineWidth = context.measureText(testLine).width;
if (lineWidth <= 295) {
currentLine = testLine;
} else {
arr.push(currentLine);
currentLine = word;
}
}
arr.push(currentLine);
arr.forEach((line, index) => {
context.fillText(line, 775, 265 + (index * 20)); // 调整行高
})
})
} else {
ywrlines.forEach((line, index) => {
let currentLine = '';
let arr = [];
for (let word of line) {
const testLine = currentLine + word;
const lineWidth = context.measureText(testLine).width;
if (lineWidth <= 295) {
currentLine = testLine;
} else {
arr.push(currentLine);
currentLine = word;
}
}
arr.push(currentLine);
arr.forEach((line, index) => {
context.fillText(line, 775, 275 + (index * 20)); // 调整行高
})
})
}
context.fillText(this.bdcqz.ywr ? this.bdcqz.ywr : '', 775, 275);
let lines2 = this.bdcqz.zl ? this.bdcqz.zl.split(' ') : [];
if (getByteLen(this.bdcqz.zl) > 37) {
lines2.forEach((line, index) => {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-21 10:18:57
* @LastEditTime: 2024-01-17 17:30:08
-->
<template>
<div class="from-clues">
<!-- 表单部分 -->
<div class="from-clues-header">
<el-form :model="queryForm" ref="queryForm" label-width="90px">
<el-form :model="queryForm" ref="queryForm" label-width="100px">
<el-row style="margin-bottom:10px">
<el-col :span="5">
<el-form-item label="不动产单元号" label-width="110px">
<el-col :span="6">
<el-form-item label="不动产单元号">
<el-input
placeholder="请输入不动产单元号"
maxlength="28"
......@@ -19,12 +19,12 @@
class="width100"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="6">
<el-form-item label="查封机关">
<el-input placeholder="请输入查封机关" v-model="queryForm.cfjg" clearable class="width100"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="6">
<el-form-item label="查封文号">
<el-input
placeholder="请输入不动产权证号"
......@@ -34,13 +34,26 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="坐落" label-width="50px">
<el-form-item label="坐落">
<el-input placeholder="请输入坐落" v-model="queryForm.zl" clearable class="width100"></el-input>
</el-form-item>
</el-col>
<el-col :span="3" class="btnColRight">
<el-col :span="6">
<el-form-item label="权利人">
<el-input placeholder="请输入权利人" v-model.trim="queryForm.qlr" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="证件号">
<el-input placeholder="请输入证件号" v-model.trim="queryForm.zjh" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="12" class="btnColRight">
<el-form-item>
<el-button type="primary" @click="queryClick">查询</el-button>
<el-button type="primary" @click="resetForm(true)">重置</el-button>
</el-form-item>
</el-col>
</el-row>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-11-16 14:06:51
* @LastEditTime: 2024-01-17 17:20:34
-->
<template>
<div class="from-clues">
......@@ -74,23 +74,36 @@
</div>
<div v-show="activeName == 'dz'">
<div class="from-clues-header">
<el-form :model="querydzForm" ref="querydzForm" label-width="110px">
<el-form :model="querydzForm" ref="querydzForm" label-width="80px">
<el-row>
<el-col :span="7">
<el-col :span="6">
<el-form-item label="宗地代码">
<el-input placeholder="请输入宗地代码" v-model="querydzForm.zddm" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="6">
<el-form-item label="坐落">
<el-input placeholder="请输入土地坐落" v-model="querydzForm.zl" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="10" class="btnColRight">
<el-col :span="6">
<el-form-item label="权利人">
<el-input placeholder="请输入权利人" v-model="querydzForm.qlr" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="证件号">
<el-input placeholder="请输入证件号" v-model="querydzForm.zjh" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24" class="btnColRight">
<el-form-item>
<el-button type="primary" @click="handleSearch">查询</el-button>
<el-button type="primary" @click="resetFormDz(true)">重置</el-button>
</el-form-item>
</el-col>
</el-row>
......@@ -139,10 +152,10 @@
bdcqzh: ''
},
querydzForm: {
qllx: '',
bdcdyh: '',
ywh: '',
bdcqzh: ''
zddm: '',
zl: '',
qlr: '',
zjh: ''
},
zrztableData: {
total: 0,
......@@ -183,6 +196,16 @@
}
},
methods: {
resetFormDz () {
this.querydzForm = {
zddm: '',
zl: '',
qlr: '',
zjh: ''
}
this.pageData.currentPage = 1;
this.queryClick()
},
/**
* @description: queryClick
* @author: renchao
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-11-16 16:48:43
* @LastEditTime: 2024-01-17 17:25:09
-->
<template>
<div class="from-clues">
......@@ -9,21 +9,34 @@
<div class="from-clues-header">
<el-form :model="queryForm" ref="queryForm" label-width="100px">
<el-row>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="不动产单元号">
<el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="坐落" label-width="60px">
<el-input placeholder="请输入坐落" v-model.trim="queryForm.zl" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="权利人">
<el-input placeholder="请输入权利人" v-model.trim="queryForm.qlr" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="证件号">
<el-input placeholder="请输入证件号" v-model.trim="queryForm.zjh" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" class="btnColRight">
<el-form-item>
<el-button type="primary" @click="handleSearch">查询</el-button>
<el-button type="primary" @click="resetForm(true)">重置</el-button>
</el-form-item>
</el-col>
</el-row>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-01-17 16:17:30
* @LastEditTime: 2024-01-18 08:21:51
-->
<template>
<!-- 主体权利信息查询 -->
<div class="from-clues">
<!-- 表单部分 -->
<div class="from-clues-header">
<el-form :model="queryForm" ref="queryForm">
<el-form :model="queryForm" ref="queryForm" label-width="100px">
<el-row>
<el-col :span="5">
<el-form-item label="权利类型" label-width="70px">
<el-col :span="6">
<el-form-item label="权利类型">
<el-select v-model="queryForm.qllx" class="width100" filterable clearable placeholder="请选择权利类型">
<el-option v-for="item in qllxList" :key="item.dcode" :label="item.dname" :value="item.dcode">
</el-option>
......@@ -24,21 +24,34 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="6">
<el-form-item label="业务号">
<el-input placeholder="请输入业务号" v-model="queryForm.ywh" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="6">
<el-form-item label="不动产权证号">
<el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="3" class="btnColRight">
<el-col :span="6">
<el-form-item label="权利人">
<el-input placeholder="请输入权利人" v-model.trim="queryForm.qlr" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="证件号">
<el-input placeholder="请输入证件号" v-model.trim="queryForm.zjh" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="12" class="btnColRight">
<el-form-item>
<el-button type="primary" @click="handleSearch">查询</el-button>
<el-button type="primary" @click="resetForm(true)">重置</el-button>
</el-form-item>
</el-col>
</el-row>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-11-16 14:16:58
* @LastEditTime: 2024-01-17 17:26:18
-->
<template>
<!-- 主体权利信息查询 -->
......@@ -24,13 +24,26 @@
</el-col>
<el-col :span="6">
<el-form-item label="坐落">
<el-input placeholder="" v-model.trim="queryForm.zl" clearable class="width100">
<el-input placeholder="坐落" v-model.trim="queryForm.zl" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6" class="btnColRight">
<el-col :span="6">
<el-form-item label="权利人">
<el-input placeholder="请输入权利人" v-model.trim="queryForm.qlr" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="证件号">
<el-input placeholder="请输入证件号" v-model.trim="queryForm.zjh" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="18" class="btnColRight">
<el-form-item>
<el-button type="primary" @click="handleSearch">查询</el-button>
<el-button type="primary" @click="resetForm(true)">重置</el-button>
</el-form-item>
</el-col>
</el-row>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-11-16 14:17:20
* @LastEditTime: 2024-01-17 17:27:24
-->
<template>
<!-- 主体权利信息查询 -->
......@@ -24,13 +24,26 @@
</el-col>
<el-col :span="6">
<el-form-item label="坐落">
<el-input placeholder="" v-model.trim="queryForm.zl" clearable class="width100">
<el-input placeholder="坐落" v-model.trim="queryForm.zl" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6" class="btnColRight">
<el-col :span="6">
<el-form-item label="权利人">
<el-input placeholder="请输入权利人" v-model.trim="queryForm.qlr" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="证件号">
<el-input placeholder="请输入证件号" v-model.trim="queryForm.zjh" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="18" class="btnColRight">
<el-form-item>
<el-button type="primary" @click="handleSearch">查询</el-button>
<el-button type="primary" @click="resetForm(true)">重置</el-button>
</el-form-item>
</el-col>
</el-row>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-10-24 15:04:30
* @LastEditTime: 2024-01-17 17:15:13
-->
<template>
<div class="from-clues">
......@@ -74,23 +74,36 @@
</div>
<div v-show="activeName == 'dz'">
<div class="from-clues-header">
<el-form :model="querydzForm" ref="querydzForm" label-width="110px">
<el-form :model="querydzForm" ref="querydzForm" label-width="90px">
<el-row>
<el-col :span="7">
<el-col :span="6">
<el-form-item label="宗地代码">
<el-input placeholder="请输入宗地代码" v-model="querydzForm.zddm" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="6">
<el-form-item label="坐落">
<el-input placeholder="请输入土地坐落" v-model="querydzForm.zl" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="10" class="btnColRight">
<el-col :span="6">
<el-form-item label="权利人">
<el-input placeholder="请输入权利人" v-model="querydzForm.qlr" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="证件号">
<el-input placeholder="请输入证件号" v-model="querydzForm.zjh" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24" class="btnColRight">
<el-form-item>
<el-button type="primary" @click="handleSearch">查询</el-button>
<el-button type="primary" @click="resetFormDz(true)">重置</el-button>
</el-form-item>
</el-col>
</el-row>
......@@ -139,10 +152,10 @@
bdcqzh: ''
},
querydzForm: {
qllx: '',
bdcdyh: '',
ywh: '',
bdcqzh: ''
zddm: '',
zl: '',
qlr: '',
zjh: ''
},
zrztableData: {
total: 0,
......@@ -183,6 +196,16 @@
}
},
methods: {
resetFormDz () {
this.querydzForm = {
zddm: '',
zl: '',
qlr: '',
zjh: ''
}
this.pageData.currentPage = 1;
this.queryClick()
},
/**
* @description: queryClick
* @author: renchao
......