96d0575c by renchao@pashanhoo.com

Merge branch 'dev'

2 parents e4675516 eebd3ac8
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-01-17 11:16:21
* @LastEditTime: 2024-01-17 15:34:28
-->
<template>
<div class="from-clues">
......@@ -13,48 +13,60 @@
<div class="from-clues-header">
<el-form :model="queryzrzForm" ref="queryzrzForm" label-width="110px">
<el-row>
<el-col :span="7">
<el-form-item label="宗地代码">
<el-col :span="6">
<el-form-item label="宗地代码" label-width="90px">
<el-input placeholder="请输入宗地代码" v-model="queryzrzForm.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="queryzrzForm.bdcqzh" 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="queryzrzForm.zl" clearable>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-col :span="6">
<el-form-item label="自然幢号">
<el-input placeholder="请输入自然幢号" v-model="queryzrzForm.zrzh" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="项目名称">
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="项目名称" label-width="90px">
<el-input placeholder="请输入项目名称" v-model="queryzrzForm.xmmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="6">
<el-form-item label="建筑物名称">
<el-input placeholder="请输入建筑物名称" v-model="queryzrzForm.jzwmc" 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="queryzrzForm.qlr" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="证件号">
<el-input placeholder="请输入证件号" v-model="queryzrzForm.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="resetForm(true)">重置</el-button>
<el-button type="primary" @click="resetFormZrz(true)">重置</el-button>
</el-form-item>
</el-col>
</el-row>
......@@ -74,23 +86,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>
......@@ -133,16 +158,20 @@
activeName: 'zrz',
radioVal: '',
queryzrzForm: {
qllx: '',
bdcdyh: '',
ywh: '',
bdcqzh: ''
zddm: '',
bdcqzh: '',
zl: '',
zrzh: '',
xmmc: '',
jzwmc: '',
qlr: '',
zjh: ''
},
querydzForm: {
qllx: '',
bdcdyh: '',
ywh: '',
bdcqzh: ''
zddm: '',
zl: '',
qlr: '',
zjh: ''
},
zrztableData: {
total: 0,
......@@ -183,15 +212,28 @@
}
},
methods: {
resetForm () {
resetFormZrz () {
this.queryzrzForm = {
zddm: '',
bdcqzh: '',
zl: '',
zrzh: '',
xmmc: '',
jzwmc: ''
jzwmc: '',
qlr: '',
zjh: ''
}
this.pageData.currentPage = 1;
this.queryClick()
},
resetFormDz () {
this.querydzForm = {
zddm: '',
zl: '',
qlr: '',
zjh: ''
}
this.pageData.currentPage = 1;
this.queryClick()
},
/**
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-11-16 16:49:01
* @LastEditTime: 2024-01-17 16:17:30
-->
<template>
<!-- 主体权利信息查询 -->
......@@ -12,8 +12,8 @@
<el-row>
<el-col :span="5">
<el-form-item label="权利类型" label-width="70px">
<el-select v-model="queryForm.qllx" filterable clearable class="width100" placeholder="请选择权利类型">
<el-option v-for="item in qllxData" :key="item.sxzdz" :label="item.sxzdmc" :value="item.sxzdz">
<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>
</el-select>
</el-form-item>
......@@ -61,13 +61,12 @@
<script>
import jump from "./mixin/jump";
import store from '@/store/index.js'
import { selectQlxx } from "@/api/ywsq.js";
import ywsqTable from "@/utils/mixin/ywsqTable";
import { ywPopupDialog } from "@/utils/popup.js";
import { datas, sendThis } from "../javascript/selecBdcql.js";
import { defaultParameters } from "../javascript/publicDefaultPar.js";
import { selectQlxx } from "@/api/ywsq.js";
import { startBusinessFlow, startTogetherFlow } from "@/api/workFlow.js";
import { getQllxByBsmSqyw } from "@/api/sysSqdjyw.js";
export default {
mixins: [ywsqTable, jump],
props: {
......@@ -85,21 +84,13 @@
data: [],
},
bdcdysz: [],
qllxList: store.getters.dictData['A8'],
};
},
mounted () {
sendThis(this);
},
created () {
//初始化权利类型下拉框内容
getQllxByBsmSqyw(this.bsmSqyw).then((res) => {
if (res.code === 200) {
this.qllxData = res.result ? res.result : [];
}
});
},
methods: {
//默认加载表格信息
/**
* @description: 默认加载表格信息
* @author: renchao
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-01-17 13:20:17
* @LastEditTime: 2024-01-17 15:37:02
-->
<template>
<!-- 主体权利信息查询 -->
......@@ -10,13 +10,13 @@
<div class="from-clues-header">
<el-form :model="queryForm" ref="queryForm" label-width="105px">
<el-row>
<el-col :span="7">
<el-col :span="6">
<el-form-item label="不动产权证号">
<el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-col :span="6">
<el-form-item label="不动产单元号">
<el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width100">
</el-input>
......@@ -28,10 +28,22 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="4" class="btnColRight">
<el-col :span="6">
<el-form-item label="权利人">
<el-input placeholder="请输入权利人" v-model="queryForm.qlr" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="证件号">
<el-input placeholder="请输入证件号" v-model="queryForm.zjh" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="18" class="btnColRight">
<el-form-item>
<!-- <el-button type="primary" @click="resetForm(true)">重置</el-button> -->
<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 13:32:55
* @LastEditTime: 2024-01-17 16:16:15
-->
<template>
<!-- 主体权利信息查询 -->
......@@ -10,12 +10,12 @@
<div class="from-clues-header">
<el-form :model="queryForm" ref="queryForm" label-width="100px">
<el-row>
<el-col :span="6">
<!-- <el-col :span="6">
<el-form-item label="不动产权证号">
<el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="6">
<el-form-item label="不动产单元号">
<el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width100">
......@@ -24,13 +24,26 @@
</el-col>
<el-col :span="6">
<el-form-item label="坐落" label-width="60px">
<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">
<el-form-item label="权利人" label-width="60px">
<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="证件号" label-width="60px">
<el-input placeholder="权利人" v-model.trim="queryForm.zjh" clearable class="width100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6" class="btnColRight">
<el-col :span="24" 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>
......