96d0575c by renchao@pashanhoo.com

Merge branch 'dev'

2 parents e4675516 eebd3ac8
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-01-17 11:16:21 4 * @LastEditTime: 2024-01-17 15:34:28
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -13,48 +13,60 @@ ...@@ -13,48 +13,60 @@
13 <div class="from-clues-header"> 13 <div class="from-clues-header">
14 <el-form :model="queryzrzForm" ref="queryzrzForm" label-width="110px"> 14 <el-form :model="queryzrzForm" ref="queryzrzForm" label-width="110px">
15 <el-row> 15 <el-row>
16 <el-col :span="7"> 16 <el-col :span="6">
17 <el-form-item label="宗地代码"> 17 <el-form-item label="宗地代码" label-width="90px">
18 <el-input placeholder="请输入宗地代码" v-model="queryzrzForm.zddm" clearable> 18 <el-input placeholder="请输入宗地代码" v-model="queryzrzForm.zddm" clearable>
19 </el-input> 19 </el-input>
20 </el-form-item> 20 </el-form-item>
21 </el-col> 21 </el-col>
22 <el-col :span="7"> 22 <el-col :span="6">
23 <el-form-item label="土地证号"> 23 <el-form-item label="土地证号">
24 <el-input placeholder="请输入土地证号" v-model="queryzrzForm.bdcqzh" clearable> 24 <el-input placeholder="请输入土地证号" v-model="queryzrzForm.bdcqzh" clearable>
25 </el-input> 25 </el-input>
26 </el-form-item> 26 </el-form-item>
27 </el-col> 27 </el-col>
28 <el-col :span="7"> 28 <el-col :span="6">
29 <el-form-item label="土地坐落"> 29 <el-form-item label="土地坐落">
30 <el-input placeholder="请输入土地坐落" v-model="queryzrzForm.zl" clearable> 30 <el-input placeholder="请输入土地坐落" v-model="queryzrzForm.zl" clearable>
31 </el-input> 31 </el-input>
32 </el-form-item> 32 </el-form-item>
33 </el-col> 33 </el-col>
34 </el-row> 34 <el-col :span="6">
35 <el-row>
36 <el-col :span="7">
37 <el-form-item label="自然幢号"> 35 <el-form-item label="自然幢号">
38 <el-input placeholder="请输入自然幢号" v-model="queryzrzForm.zrzh" clearable> 36 <el-input placeholder="请输入自然幢号" v-model="queryzrzForm.zrzh" clearable>
39 </el-input> 37 </el-input>
40 </el-form-item> 38 </el-form-item>
41 </el-col> 39 </el-col>
42 <el-col :span="7"> 40 </el-row>
43 <el-form-item label="项目名称"> 41 <el-row>
42 <el-col :span="6">
43 <el-form-item label="项目名称" label-width="90px">
44 <el-input placeholder="请输入项目名称" v-model="queryzrzForm.xmmc"></el-input> 44 <el-input placeholder="请输入项目名称" v-model="queryzrzForm.xmmc"></el-input>
45 </el-form-item> 45 </el-form-item>
46 </el-col> 46 </el-col>
47 <el-col :span="7"> 47 <el-col :span="6">
48 <el-form-item label="建筑物名称"> 48 <el-form-item label="建筑物名称">
49 <el-input placeholder="请输入建筑物名称" v-model="queryzrzForm.jzwmc" clearable> 49 <el-input placeholder="请输入建筑物名称" v-model="queryzrzForm.jzwmc" clearable>
50 </el-input> 50 </el-input>
51 </el-form-item> 51 </el-form-item>
52 </el-col> 52 </el-col>
53 53
54 <el-col :span="3" class="btnColRight"> 54 <el-col :span="6">
55 <el-form-item label="权利人">
56 <el-input placeholder="请输入权利人" v-model="queryzrzForm.qlr" clearable>
57 </el-input>
58 </el-form-item>
59 </el-col>
60 <el-col :span="6">
61 <el-form-item label="证件号">
62 <el-input placeholder="请输入证件号" v-model="queryzrzForm.zjh" clearable>
63 </el-input>
64 </el-form-item>
65 </el-col>
66 <el-col :span="24" class="btnColRight">
55 <el-form-item> 67 <el-form-item>
56 <el-button type="primary" @click="handleSearch">查询</el-button> 68 <el-button type="primary" @click="handleSearch">查询</el-button>
57 <el-button type="primary" @click="resetForm(true)">重置</el-button> 69 <el-button type="primary" @click="resetFormZrz(true)">重置</el-button>
58 </el-form-item> 70 </el-form-item>
59 </el-col> 71 </el-col>
60 </el-row> 72 </el-row>
...@@ -74,23 +86,36 @@ ...@@ -74,23 +86,36 @@
74 </div> 86 </div>
75 <div v-show="activeName == 'dz'"> 87 <div v-show="activeName == 'dz'">
76 <div class="from-clues-header"> 88 <div class="from-clues-header">
77 <el-form :model="querydzForm" ref="querydzForm" label-width="110px"> 89 <el-form :model="querydzForm" ref="querydzForm" label-width="90px">
78 <el-row> 90 <el-row>
79 <el-col :span="7"> 91 <el-col :span="6">
80 <el-form-item label="宗地代码"> 92 <el-form-item label="宗地代码">
81 <el-input placeholder="请输入宗地代码" v-model="querydzForm.zddm" clearable> 93 <el-input placeholder="请输入宗地代码" v-model="querydzForm.zddm" clearable>
82 </el-input> 94 </el-input>
83 </el-form-item> 95 </el-form-item>
84 </el-col> 96 </el-col>
85 <el-col :span="7"> 97 <el-col :span="6">
86 <el-form-item label="坐落"> 98 <el-form-item label="坐落">
87 <el-input placeholder="请输入土地坐落" v-model="querydzForm.zl" clearable> 99 <el-input placeholder="请输入土地坐落" v-model="querydzForm.zl" clearable>
88 </el-input> 100 </el-input>
89 </el-form-item> 101 </el-form-item>
90 </el-col> 102 </el-col>
91 <el-col :span="10" class="btnColRight"> 103 <el-col :span="6">
104 <el-form-item label="权利人">
105 <el-input placeholder="请输入权利人" v-model="querydzForm.qlr" clearable>
106 </el-input>
107 </el-form-item>
108 </el-col>
109 <el-col :span="6">
110 <el-form-item label="证件号">
111 <el-input placeholder="请输入证件号" v-model="querydzForm.zjh" clearable>
112 </el-input>
113 </el-form-item>
114 </el-col>
115 <el-col :span="24" class="btnColRight">
92 <el-form-item> 116 <el-form-item>
93 <el-button type="primary" @click="handleSearch">查询</el-button> 117 <el-button type="primary" @click="handleSearch">查询</el-button>
118 <el-button type="primary" @click="resetFormDz(true)">重置</el-button>
94 </el-form-item> 119 </el-form-item>
95 </el-col> 120 </el-col>
96 </el-row> 121 </el-row>
...@@ -133,16 +158,20 @@ ...@@ -133,16 +158,20 @@
133 activeName: 'zrz', 158 activeName: 'zrz',
134 radioVal: '', 159 radioVal: '',
135 queryzrzForm: { 160 queryzrzForm: {
136 qllx: '', 161 zddm: '',
137 bdcdyh: '', 162 bdcqzh: '',
138 ywh: '', 163 zl: '',
139 bdcqzh: '' 164 zrzh: '',
165 xmmc: '',
166 jzwmc: '',
167 qlr: '',
168 zjh: ''
140 }, 169 },
141 querydzForm: { 170 querydzForm: {
142 qllx: '', 171 zddm: '',
143 bdcdyh: '', 172 zl: '',
144 ywh: '', 173 qlr: '',
145 bdcqzh: '' 174 zjh: ''
146 }, 175 },
147 zrztableData: { 176 zrztableData: {
148 total: 0, 177 total: 0,
...@@ -183,15 +212,28 @@ ...@@ -183,15 +212,28 @@
183 } 212 }
184 }, 213 },
185 methods: { 214 methods: {
186 resetForm () { 215 resetFormZrz () {
187 this.queryzrzForm = { 216 this.queryzrzForm = {
188 zddm: '', 217 zddm: '',
189 bdcqzh: '', 218 bdcqzh: '',
190 zl: '', 219 zl: '',
191 zrzh: '', 220 zrzh: '',
192 xmmc: '', 221 xmmc: '',
193 jzwmc: '' 222 jzwmc: '',
223 qlr: '',
224 zjh: ''
225 }
226 this.pageData.currentPage = 1;
227 this.queryClick()
228 },
229 resetFormDz () {
230 this.querydzForm = {
231 zddm: '',
232 zl: '',
233 qlr: '',
234 zjh: ''
194 } 235 }
236 this.pageData.currentPage = 1;
195 this.queryClick() 237 this.queryClick()
196 }, 238 },
197 /** 239 /**
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-11-16 16:49:01 4 * @LastEditTime: 2024-01-17 16:17:30
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 主体权利信息查询 --> 7 <!-- 主体权利信息查询 -->
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
12 <el-row> 12 <el-row>
13 <el-col :span="5"> 13 <el-col :span="5">
14 <el-form-item label="权利类型" label-width="70px"> 14 <el-form-item label="权利类型" label-width="70px">
15 <el-select v-model="queryForm.qllx" filterable clearable class="width100" placeholder="请选择权利类型"> 15 <el-select v-model="queryForm.qllx" class="width100" filterable clearable placeholder="请选择权利类型">
16 <el-option v-for="item in qllxData" :key="item.sxzdz" :label="item.sxzdmc" :value="item.sxzdz"> 16 <el-option v-for="item in qllxList" :key="item.dcode" :label="item.dname" :value="item.dcode">
17 </el-option> 17 </el-option>
18 </el-select> 18 </el-select>
19 </el-form-item> 19 </el-form-item>
...@@ -61,13 +61,12 @@ ...@@ -61,13 +61,12 @@
61 <script> 61 <script>
62 import jump from "./mixin/jump"; 62 import jump from "./mixin/jump";
63 import store from '@/store/index.js' 63 import store from '@/store/index.js'
64 import { selectQlxx } from "@/api/ywsq.js";
64 import ywsqTable from "@/utils/mixin/ywsqTable"; 65 import ywsqTable from "@/utils/mixin/ywsqTable";
65 import { ywPopupDialog } from "@/utils/popup.js"; 66 import { ywPopupDialog } from "@/utils/popup.js";
66 import { datas, sendThis } from "../javascript/selecBdcql.js"; 67 import { datas, sendThis } from "../javascript/selecBdcql.js";
67 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 68 import { defaultParameters } from "../javascript/publicDefaultPar.js";
68 import { selectQlxx } from "@/api/ywsq.js";
69 import { startBusinessFlow, startTogetherFlow } from "@/api/workFlow.js"; 69 import { startBusinessFlow, startTogetherFlow } from "@/api/workFlow.js";
70 import { getQllxByBsmSqyw } from "@/api/sysSqdjyw.js";
71 export default { 70 export default {
72 mixins: [ywsqTable, jump], 71 mixins: [ywsqTable, jump],
73 props: { 72 props: {
...@@ -85,21 +84,13 @@ ...@@ -85,21 +84,13 @@
85 data: [], 84 data: [],
86 }, 85 },
87 bdcdysz: [], 86 bdcdysz: [],
87 qllxList: store.getters.dictData['A8'],
88 }; 88 };
89 }, 89 },
90 mounted () { 90 mounted () {
91 sendThis(this); 91 sendThis(this);
92 }, 92 },
93 created () {
94 //初始化权利类型下拉框内容
95 getQllxByBsmSqyw(this.bsmSqyw).then((res) => {
96 if (res.code === 200) {
97 this.qllxData = res.result ? res.result : [];
98 }
99 });
100 },
101 methods: { 93 methods: {
102 //默认加载表格信息
103 /** 94 /**
104 * @description: 默认加载表格信息 95 * @description: 默认加载表格信息
105 * @author: renchao 96 * @author: renchao
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-01-17 13:20:17 4 * @LastEditTime: 2024-01-17 15:37:02
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 主体权利信息查询 --> 7 <!-- 主体权利信息查询 -->
...@@ -10,13 +10,13 @@ ...@@ -10,13 +10,13 @@
10 <div class="from-clues-header"> 10 <div class="from-clues-header">
11 <el-form :model="queryForm" ref="queryForm" label-width="105px"> 11 <el-form :model="queryForm" ref="queryForm" label-width="105px">
12 <el-row> 12 <el-row>
13 <el-col :span="7"> 13 <el-col :span="6">
14 <el-form-item label="不动产权证号"> 14 <el-form-item label="不动产权证号">
15 <el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width100"> 15 <el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width100">
16 </el-input> 16 </el-input>
17 </el-form-item> 17 </el-form-item>
18 </el-col> 18 </el-col>
19 <el-col :span="7"> 19 <el-col :span="6">
20 <el-form-item label="不动产单元号"> 20 <el-form-item label="不动产单元号">
21 <el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width100"> 21 <el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width100">
22 </el-input> 22 </el-input>
...@@ -28,10 +28,22 @@ ...@@ -28,10 +28,22 @@
28 </el-input> 28 </el-input>
29 </el-form-item> 29 </el-form-item>
30 </el-col> 30 </el-col>
31 <el-col :span="4" class="btnColRight"> 31 <el-col :span="6">
32 <el-form-item label="权利人">
33 <el-input placeholder="请输入权利人" v-model="queryForm.qlr" clearable>
34 </el-input>
35 </el-form-item>
36 </el-col>
37 <el-col :span="6">
38 <el-form-item label="证件号">
39 <el-input placeholder="请输入证件号" v-model="queryForm.zjh" clearable>
40 </el-input>
41 </el-form-item>
42 </el-col>
43 <el-col :span="18" class="btnColRight">
32 <el-form-item> 44 <el-form-item>
33 <!-- <el-button type="primary" @click="resetForm(true)">重置</el-button> -->
34 <el-button type="primary" @click="handleSearch">查询</el-button> 45 <el-button type="primary" @click="handleSearch">查询</el-button>
46 <el-button type="primary" @click="resetForm(true)">重置</el-button>
35 </el-form-item> 47 </el-form-item>
36 </el-col> 48 </el-col>
37 </el-row> 49 </el-row>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-01-17 13:32:55 4 * @LastEditTime: 2024-01-17 16:16:15
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 主体权利信息查询 --> 7 <!-- 主体权利信息查询 -->
...@@ -10,12 +10,12 @@ ...@@ -10,12 +10,12 @@
10 <div class="from-clues-header"> 10 <div class="from-clues-header">
11 <el-form :model="queryForm" ref="queryForm" label-width="100px"> 11 <el-form :model="queryForm" ref="queryForm" label-width="100px">
12 <el-row> 12 <el-row>
13 <el-col :span="6"> 13 <!-- <el-col :span="6">
14 <el-form-item label="不动产权证号"> 14 <el-form-item label="不动产权证号">
15 <el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width100"> 15 <el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width100">
16 </el-input> 16 </el-input>
17 </el-form-item> 17 </el-form-item>
18 </el-col> 18 </el-col> -->
19 <el-col :span="6"> 19 <el-col :span="6">
20 <el-form-item label="不动产单元号"> 20 <el-form-item label="不动产单元号">
21 <el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width100"> 21 <el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width100">
...@@ -24,13 +24,26 @@ ...@@ -24,13 +24,26 @@
24 </el-col> 24 </el-col>
25 <el-col :span="6"> 25 <el-col :span="6">
26 <el-form-item label="坐落" label-width="60px"> 26 <el-form-item label="坐落" label-width="60px">
27 <el-input placeholder="" v-model.trim="queryForm.zl" clearable class="width100"> 27 <el-input placeholder="坐落" v-model.trim="queryForm.zl" clearable class="width100">
28 </el-input>
29 </el-form-item>
30 </el-col>
31 <el-col :span="6">
32 <el-form-item label="权利人" label-width="60px">
33 <el-input placeholder="权利人" v-model.trim="queryForm.qlr" clearable class="width100">
34 </el-input>
35 </el-form-item>
36 </el-col>
37 <el-col :span="6">
38 <el-form-item label="证件号" label-width="60px">
39 <el-input placeholder="权利人" v-model.trim="queryForm.zjh" clearable class="width100">
28 </el-input> 40 </el-input>
29 </el-form-item> 41 </el-form-item>
30 </el-col> 42 </el-col>
31 <el-col :span="6" class="btnColRight"> 43 <el-col :span="24" class="btnColRight">
32 <el-form-item> 44 <el-form-item>
33 <el-button type="primary" @click="handleSearch">查询</el-button> 45 <el-button type="primary" @click="handleSearch">查询</el-button>
46 <el-button type="primary" @click="resetForm(true)">重置</el-button>
34 </el-form-item> 47 </el-form-item>
35 </el-col> 48 </el-col>
36 </el-row> 49 </el-row>
......