Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
bd36467b by 焦泽平
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

2 parents c77667b4 543e13c6
Inline Side-by-side
Showing 9 changed files with 217 additions and 162 deletions
...@@ -5,31 +5,14 @@ ...@@ -5,31 +5,14 @@
5 </template> 5 </template>
6 6
7 <script> 7 <script>
8 import { getDdicByMC } from "../src/api/common";
9 export default { 8 export default {
10 mounted() { 9 mounted() {
11 this.getDic();
12 window.addEventListener("unload", this.saveState); 10 window.addEventListener("unload", this.saveState);
13 }, 11 },
14 methods: { 12 methods: {
15 saveState() { 13 saveState() {
16 sessionStorage.setItem("state", JSON.stringify(this.$store.state)); 14 sessionStorage.setItem("state", JSON.stringify(this.$store.state));
17 }, 15 },
18 //请求字典数据
19 getDic() {
20 let s = this.$store.state;
21 s.zjzlList = s.zjzlList.length == 0 ? this.getDicData("证件种类") : s.zjzlList;
22 s.gjList = s.gjList.length == 0 ? this.getDicData("国家和地区") : s.gjList;
23 s.ssList = s.ssList.length == 0 ? this.getDicData("省市") : s.ssList;
24 s.qlrlxList = s.qlrlxList.length == 0 ? this.getDicData("权利人类型") : s.qlrlxList;
25 s.xbList = s.xbList.length == 0 ? this.getDicData("性别") : s.xbList;
26 s.sshyList = s.sshyList.length == 0 ? this.getDicData("国民经济行业分类代码") : s.sshyList;
27 },
28 getDicData(name) {
29 getDdicByMC(name).then((res) => {
30 return res.result;
31 });
32 },
33 }, 16 },
34 }; 17 };
35 </script> 18 </script>
......
1 import request from '@/plugin/axios'
2 /**
3 * 新增权利人法人代理人
4 */
5 export function insertQlrDlrFr(data) {
6 return request({
7 url: '/system/Qlr/insertQlrDlrFr',
8 method: 'post',
9 data: data,
10 })
11 }
12
13 /**
14 * 根据glbsm查询qlr信息
15 */
16 export function getQlrInfoByGlbsm(data) {
17 return request({
18 url: '/system/Qlr/getQlrByGlbsm',
19 method: 'get',
20 params: {
21 glbsm:data
22 },
23 })
24 }
...\ No newline at end of file ...\ No newline at end of file
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
61 <td colspan="3"> 61 <td colspan="3">
62 <el-select class="formSelect" v-model="formData.qlrlxbsm"> 62 <el-select class="formSelect" v-model="formData.qlrlxbsm">
63 <el-option 63 <el-option
64 v-for="item in qlrlxList" 64 v-for="item in $store.state.qlrlxList"
65 :key="item.bsm" 65 :key="item.bsm"
66 :label="item.mc" 66 :label="item.mc"
67 :value="item.bsm" 67 :value="item.bsm"
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
75 <td colspan="3"> 75 <td colspan="3">
76 <el-select class="formSelect" v-model="formData.zjzlbsm"> 76 <el-select class="formSelect" v-model="formData.zjzlbsm">
77 <el-option 77 <el-option
78 v-for="item in zlzlList" 78 v-for="item in $store.state.zjzlList"
79 :key="item.bsm" 79 :key="item.bsm"
80 :label="item.mc" 80 :label="item.mc"
81 :value="item.bsm" 81 :value="item.bsm"
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
103 <td colspan="3"> 103 <td colspan="3">
104 <el-select class="formSelect" v-model="formData.gjbsm"> 104 <el-select class="formSelect" v-model="formData.gjbsm">
105 <el-option 105 <el-option
106 v-for="item in gjList" 106 v-for="item in $store.state.gjList"
107 :key="item.bsm" 107 :key="item.bsm"
108 :label="item.mc" 108 :label="item.mc"
109 :value="item.bsm" 109 :value="item.bsm"
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
115 <td colspan="3"> 115 <td colspan="3">
116 <el-select class="formSelect" v-model="formData.hjszssbsm"> 116 <el-select class="formSelect" v-model="formData.hjszssbsm">
117 <el-option 117 <el-option
118 v-for="item in ssList" 118 v-for="item in $store.state.ssList"
119 :key="item.bsm" 119 :key="item.bsm"
120 :label="item.mc" 120 :label="item.mc"
121 :value="item.bsm" 121 :value="item.bsm"
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
129 <td colspan="3"> 129 <td colspan="3">
130 <el-select class="formSelect" v-model="formData.xbbsm"> 130 <el-select class="formSelect" v-model="formData.xbbsm">
131 <el-option 131 <el-option
132 v-for="item in xbList" 132 v-for="item in $store.state.xbList"
133 :key="item.bsm" 133 :key="item.bsm"
134 :label="item.mc" 134 :label="item.mc"
135 :value="item.bsm" 135 :value="item.bsm"
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
147 <td colspan="3"> 147 <td colspan="3">
148 <el-select class="formSelect" v-model="formData.sshy"> 148 <el-select class="formSelect" v-model="formData.sshy">
149 <el-option 149 <el-option
150 v-for="item in sshyList" 150 v-for="item in $store.state.sshyList"
151 :key="item.bsm" 151 :key="item.bsm"
152 :label="item.mc" 152 :label="item.mc"
153 :value="item.bsm" 153 :value="item.bsm"
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
176 <td colspan="3"> 176 <td colspan="3">
177 <el-select class="formSelect" v-model="formData.fr.zjzlbsm"> 177 <el-select class="formSelect" v-model="formData.fr.zjzlbsm">
178 <el-option 178 <el-option
179 v-for="item in zjzlList" 179 v-for="item in $store.state.zjzlList"
180 :key="item.bsm" 180 :key="item.bsm"
181 :label="item.mc" 181 :label="item.mc"
182 :value="item.bsm" 182 :value="item.bsm"
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
199 <td colspan="10">代理人信息</td> 199 <td colspan="10">代理人信息</td>
200 </tr> 200 </tr>
201 <template v-for="(item, index) in formData.dlr"> 201 <template v-for="(item, index) in formData.dlr">
202 <tr :key="item.zjh"> 202 <tr :key="item.index">
203 <td rowspan="2" class="btnCol"> 203 <td rowspan="2" class="btnCol">
204 <el-button 204 <el-button
205 type="primary" 205 type="primary"
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
222 <td colspan="3"> 222 <td colspan="3">
223 <el-select class="formSelect" v-model="item.zjzlbsm"> 223 <el-select class="formSelect" v-model="item.zjzlbsm">
224 <el-option 224 <el-option
225 v-for="item in zjzlList" 225 v-for="item in $store.state.zjzlList"
226 :key="item.bsm" 226 :key="item.bsm"
227 :label="item.mc" 227 :label="item.mc"
228 :value="item.bsm" 228 :value="item.bsm"
...@@ -231,7 +231,8 @@ ...@@ -231,7 +231,8 @@
231 </el-select> 231 </el-select>
232 </td> 232 </td>
233 </tr> 233 </tr>
234 <tr :key="item.dh"> 234 <!-- <tr :key="item.dh">-->
235 <tr :key="'dh'+item.index">
235 <td>证件号码</td> 236 <td>证件号码</td>
236 <td colspan="3"> 237 <td colspan="3">
237 <input type="text" class="formInput" v-model="item.zjh" /> 238 <input type="text" class="formInput" v-model="item.zjh" />
...@@ -251,7 +252,7 @@ ...@@ -251,7 +252,7 @@
251 <td colspan="3"> 252 <td colspan="3">
252 <el-select class="formSelect" v-model="formData.gyfsbsm"> 253 <el-select class="formSelect" v-model="formData.gyfsbsm">
253 <el-option 254 <el-option
254 v-for="item in qlrlxList" 255 v-for="item in $store.state.gyfsList"
255 :key="item.bsm" 256 :key="item.bsm"
256 :label="item.mc" 257 :label="item.mc"
257 :value="item.bsm" 258 :value="item.bsm"
...@@ -283,7 +284,7 @@ ...@@ -283,7 +284,7 @@
283 </table> 284 </table>
284 </el-form> 285 </el-form>
285 <span slot="footer" class="dialog-footer"> 286 <span slot="footer" class="dialog-footer">
286 <el-button type="primary" @click="dialogVisible = false" 287 <el-button type="primary" @click="addNewQlrInfo"
287 >确 定</el-button 288 >确 定</el-button
288 > 289 >
289 <el-button @click="dialogVisible = false">取 消</el-button> 290 <el-button @click="dialogVisible = false">取 消</el-button>
...@@ -293,20 +294,30 @@ ...@@ -293,20 +294,30 @@
293 </template> 294 </template>
294 295
295 <script> 296 <script>
296 export default { 297 import {getDdicByMC} from "../../api/common";
298 import {insertQlrDlrFr,getQlrInfoByGlbsm} from "../../api/qlr";
299
300 export default {
297 props: { 301 props: {
298 widtd: { 302 // widtd: {
299 type: String, 303 // type: String,
300 default: "70%", 304 // default: "70%",
301 }, 305 // },
302 title: { 306 // title: {
303 type: String, 307 // type: String,
304 default: "", 308 // default: "",
305 }, 309 // },
306 topHeight: { 310 // topHeight: {
307 type: String, 311 // type: String,
308 default: "15vh", 312 // default: "15vh",
313 // },
314 lx: {
315 type:String,
309 }, 316 },
317 bsm: {
318 type:String,
319 required:true
320 }
310 }, 321 },
311 data() { 322 data() {
312 return { 323 return {
...@@ -316,6 +327,7 @@ export default { ...@@ -316,6 +327,7 @@ export default {
316 multipleSelection: {}, 327 multipleSelection: {},
317 dialogVisible: false, 328 dialogVisible: false,
318 formData: { 329 formData: {
330 addQjDlrFrRequest:[],
319 dlr: [ 331 dlr: [
320 { 332 {
321 dh: "", 333 dh: "",
...@@ -356,12 +368,13 @@ export default { ...@@ -356,12 +368,13 @@ export default {
356 zjh: "", 368 zjh: "",
357 zjzlbsm: "", 369 zjzlbsm: "",
358 }, 370 },
359 qlrlxList: this.$store.state.qlrlxList, 371 // qlrlxList: [],
360 zjzlList: this.$store.state.zjzlList, 372 // zjzlList: [],
361 xbList: this.$store.state.xbList, 373 // gjList: [],
362 gjList: this.$store.state.gjList, 374 // ssList: [],
363 ssList: this.$store.state.ssList, 375 // xbList: [],
364 sshyList: this.$store.state.sshyList, 376 // sshyList: [],
377 // gyfsList: [],
365 }; 378 };
366 }, 379 },
367 methods: { 380 methods: {
...@@ -376,6 +389,25 @@ export default { ...@@ -376,6 +389,25 @@ export default {
376 this.dialogVisible = true; 389 this.dialogVisible = true;
377 } 390 }
378 }, 391 },
392 addNewQlrInfo(){
393 //todo 权利人页面调整
394 this.formData.glbsm=this.bsm;
395 //将代理人，法人数据合在一起，名称为addQjDlrFrRequest；
396 //法人的type字段类型为0
397 this.formData.fr.type=0;
398 this.formData.addQjDlrFrRequest.push(this.formData.fr);
399 for(let k=0;k<this.formData.dlr.length;k++){
400 this.formData.dlr[k].type=1;
401 this.formData.addQjDlrFrRequest.push(this.formData.dlr[k]);
402 }
403 insertQlrDlrFr(this.formData).then((res)=>{
404 if(res.code===200){
405 this.tableData.push(this.formData);
406 Object.assign(this.$data, this.$options.data())
407 this.dialogVisible = false;
408 }
409 })
410 },
379 //修改行数据 411 //修改行数据
380 changeRow() { 412 changeRow() {
381 if (this.multipleSelection.length == 1) { 413 if (this.multipleSelection.length == 1) {
...@@ -442,8 +474,27 @@ export default { ...@@ -442,8 +474,27 @@ export default {
442 }); 474 });
443 } 475 }
444 }, 476 },
477 getQlrInfo(){
478 console.log("===========================")
479 console.log(this.bsm)
480 getQlrInfoByGlbsm(this.bsm).then((res)=>{
481 if(res.code){
482 if(res.result!=null){
483 this.tableData=res.result;
484 }
485 }
486 })
487 }
488 },
489 created(){
490 console.log("===========================cres")
491 console.log(this.bsm)
492
493 this.getQlrInfo();
445 }, 494 },
446 }; 495 mounted() {
496 }
497 };
447 </script> 498 </script>
448 <style lang="less"> 499 <style lang="less">
449 .temp { 500 .temp {
......
...@@ -211,14 +211,12 @@ export default { ...@@ -211,14 +211,12 @@ export default {
211 getDicData(){ 211 getDicData(){
212 getDdicByMC("土地用途") 212 getDdicByMC("土地用途")
213 .then((res) => { 213 .then((res) => {
214 console.log(res.result);
215 this.pzytList = res.result; 214 this.pzytList = res.result;
216 this.sjytList = res.result; 215 this.sjytList = res.result;
217 }) 216 })
218 .catch((error) => {}); 217 .catch((error) => {});
219 getDdicByMC("土地等级") 218 getDdicByMC("土地等级")
220 .then((res) => { 219 .then((res) => {
221 console.log(res.result);
222 this.djList = res.result; 220 this.djList = res.result;
223 }) 221 })
224 .catch((error) => {}); 222 .catch((error) => {});
......
...@@ -5,25 +5,29 @@ import user from './modules/user' ...@@ -5,25 +5,29 @@ import user from './modules/user'
5 import permission_routes from './modules/permission_routes' 5 import permission_routes from './modules/permission_routes'
6 import setTabs from './modules/setTabs' 6 import setTabs from './modules/setTabs'
7 7
8 Vue.use(Vuex) 8 Vue.use(Vuex);
9
10 const store = new Vuex.Store({ 9 const store = new Vuex.Store({
11 state: sessionStorage.getItem('state') ? JSON.parse(sessionStorage.getItem('state')) : { 10 state: sessionStorage.getItem('state') ? JSON.parse(sessionStorage.getItem('state')) : {
12 zdbsm: '', 11 zdbsm: '',
13 xzqList: [], 12 qllxList:[],
14 djqList: [], 13 zdtzmList:[],
15 djzqList: [], 14 qlsdfsList:[],
16 zjzlList:[], 15 zjzlList:[],
17 gjList:[], 16 gjList:[],
18 ssList:[], 17 ssList:[],
19 qlrlxList:[], 18 qlrlxList:[],
20 xbList:[], 19 xbList:[],
21 sshyList:[], 20 sshyList:[],
21 xzqList: [],
22 djqList: [],
23 djzqList: [],
22 //创建自然幢时需要用到的临时存储信息 24 //创建自然幢时需要用到的临时存储信息
23 zrzbsm: '', 25 zrzbsm: '',
24 xmmc: '', 26 xmmc: '',
25 zdmj: '', 27 zdmj: '',
26 zdzl: '' 28 zdzl: '',
29 zjlxList: [],
30 gyfsList: [],
27 }, 31 },
28 modules: { 32 modules: {
29 user, 33 user,
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 </div> 15 </div>
16 </el-aside> 16 </el-aside>
17 <el-container> 17 <el-container>
18 <el-header height="100px"> 18 <el-header>
19 <div class="header-top"> 19 <div class="header-top">
20 <div class="top-items" @click="toggleClick"> 20 <div class="top-items" @click="toggleClick">
21 <i class="fa fa-outdent hamburger" v-show="!isActive"></i> 21 <i class="fa fa-outdent hamburger" v-show="!isActive"></i>
...@@ -32,35 +32,31 @@ ...@@ -32,35 +32,31 @@
32 <span>{{ item.name }}</span> 32 <span>{{ item.name }}</span>
33 </div> 33 </div>
34 </div> 34 </div>
35 <div class="header-bottom"> 35 <!-- <div class="header-bottom">
36 <Navigation ref="navigation"></Navigation> 36 <Navigation ref="navigation"></Navigation>
37 </div> 37 </div> -->
38 <el-dialog 38 <el-dialog title="新建" :visible.sync="dialogVisible" width="40%">
39 title="新建"
40 :visible.sync="dialogVisible"
41 width="40%"
42 >
43 <Create @closeDialog="closeDialog"></Create> 39 <Create @closeDialog="closeDialog"></Create>
44 </el-dialog> 40 </el-dialog>
45 </el-header> 41 </el-header>
46 <el-main> 42 <el-main>
47 <router-view/> 43 <router-view />
48 </el-main> 44 </el-main>
49 </el-container> 45 </el-container>
50 </el-container> 46 </el-container>
51 </div> 47 </div>
52 </template> 48 </template>
53 <script> 49 <script>
54 import util from "@/libs/util.js"; 50 import util from "@/libs/util.js";
55 import Navigation from "../components/IvyElement/navigation"; 51 import Navigation from "../components/IvyElement/navigation";
56 import Create from "./panel/create/index"; 52 import Create from "./panel/create/index";
57 import LineTree from "../components/lineTree/lineTree"; 53 import LineTree from "../components/lineTree/lineTree";
58 import {setTimeout} from "timers"; 54 import { setTimeout } from "timers";
59 import {getTree} from "../api/common" 55 import { getTree,getDdicByMC } from "../api/common";
60 56
61 export default { 57 export default {
62 components: { 58 components: {
63 Navigation, 59 // Navigation,
64 LineTree, 60 LineTree,
65 Create, 61 Create,
66 }, 62 },
...@@ -187,7 +183,7 @@ ...@@ -187,7 +183,7 @@
187 }, 183 },
188 }, 184 },
189 watch: { 185 watch: {
190 "$route.path": function (newPath) { 186 "$route.path": function(newPath) {
191 //监测路由变化，高亮顶部导航 187 //监测路由变化，高亮顶部导航
192 this.headTop.forEach((item, index) => { 188 this.headTop.forEach((item, index) => {
193 item.select = false; 189 item.select = false;
...@@ -195,13 +191,13 @@ ...@@ -195,13 +191,13 @@
195 item.select = true; 191 item.select = true;
196 } 192 }
197 }); 193 });
198 if(newPath == '/zd'){ 194 if (newPath == "/zd") {
199 this.getRightTree(this.$store.state.zdbsm) 195 this.getRightTree(this.$store.state.zdbsm);
200 } 196 }
201 }, 197 },
202 "$store.state.zdbsm": function (bsm) { 198 "$store.state.zdbsm": function(bsm) {
203 this.getRightTree(bsm) 199 this.getRightTree(bsm);
204 } 200 },
205 }, 201 },
206 created() { 202 created() {
207 if (this.$route.meta) { 203 if (this.$route.meta) {
...@@ -223,7 +219,7 @@ ...@@ -223,7 +219,7 @@
223 icon: "fa fa-address-card-o", 219 icon: "fa fa-address-card-o",
224 path: "/add", 220 path: "/add",
225 }, 221 },
226 {name: "更正", icon: "fa fa-address-card-o", path: "/modify"}, 222 { name: "更正", icon: "fa fa-address-card-o", path: "/modify" },
227 { 223 {
228 name: "变更", 224 name: "变更",
229 icon: "fa fa-address-card-o", 225 icon: "fa fa-address-card-o",
...@@ -243,14 +239,34 @@ ...@@ -243,14 +239,34 @@
243 // this.navSelect(indId); 239 // this.navSelect(indId);
244 // this.sortNavigation(this.navigationList, indId); 240 // this.sortNavigation(this.navigationList, indId);
245 // } 241 // }
242 this.getDic();
246 }, 243 },
247 methods: { 244 methods: {
245 //请求字典数据
246 async getDic() {
247 let s = this.$store.state;
248 s.zjzlList = s.zjzlList.length == 0 ?await this.getDicData("证件种类") : s.zjzlList;
249 s.gjList = s.gjList.length == 0 ?await this.getDicData("国家和地区") : s.gjList;
250 s.ssList = s.ssList.length == 0 ?await this.getDicData("省市") : s.ssList;
251 s.qlrlxList = s.qlrlxList.length == 0 ?await this.getDicData("权利人类型") : s.qlrlxList;
252 s.xbList = s.xbList.length == 0 ? await this.getDicData("性别") : s.xbList;
253 s.sshyList = s.sshyList.length == 0 ?await this.getDicData("所属行业") : s.sshyList;
254 s.qllxList = s.qllxList.length == 0 ?await this.getDicData("权利类型") : s.qllxList;
255 s.zdtzmList = s.zdtzmList.length == 0 ?await this.getDicData("宗地（宗海）特征码") : s.sshyList;
256 s.qlsdfsList = s.qlsdfsList.length == 0 ?await this.getDicData("权利设定方式") : s.qlsdfsList;
257 s.gyfsList = s.gyfsList.length == 0 ?await this.getDicData("共有方式") : s.gyfsList;
258 },
259 async getDicData(name) {
260 return await getDdicByMC(name).then((res)=> {
261 return res.result
262 });
263 },
248 getRightTree(bsm) { 264 getRightTree(bsm) {
249 getTree(bsm).then(res => { 265 getTree(bsm).then((res) => {
250 if (res.success) { 266 if (res.success) {
251 this.pd=res.result 267 this.pd = res.result;
252 } 268 }
253 }) 269 });
254 }, 270 },
255 sortNavigation(data, selectId) { 271 sortNavigation(data, selectId) {
256 let headTop = this.headTop; 272 let headTop = this.headTop;
...@@ -309,12 +325,12 @@ ...@@ -309,12 +325,12 @@
309 //关闭新建子组件弹框 325 //关闭新建子组件弹框
310 closeDialog() { 326 closeDialog() {
311 this.dialogVisible = false; 327 this.dialogVisible = false;
312 }
313 }, 328 },
314 }; 329 },
330 };
315 </script> 331 </script>
316 <style lang="less" scoped> 332 <style lang="less" scoped>
317 .home-box { 333 .home-box {
318 width: 100%; 334 width: 100%;
319 height: 100vh; 335 height: 100vh;
320 .el-container { 336 .el-container {
...@@ -419,5 +435,5 @@ ...@@ -419,5 +435,5 @@
419 // line-height: 160px; 435 // line-height: 160px;
420 padding: 0; 436 padding: 0;
421 } 437 }
422 } 438 }
423 </style> 439 </style>
......
1 <template> 1 <template>
2 <div class="main"> 2 <div class="main">
3 <SearchHead @getSearchCondition="getData"></SearchHead> 3 <SearchHead @getSearchCondition="geQuerytData"></SearchHead>
4 <div class="dataGrid" ref="dataGrid"> 4 <div class="dataGrid" ref="dataGrid">
5 <el-table 5 <el-table
6 :data="tableData" 6 :data="tableData"
...@@ -36,8 +36,7 @@ ...@@ -36,8 +36,7 @@
36 </el-table> 36 </el-table>
37 <div class="pagination"> 37 <div class="pagination">
38 <el-pagination background layout="prev, pager, next" :total="total" 38 <el-pagination background layout="prev, pager, next" :total="total"
39 @current-change="handleCurrentChange" 39 :current-page="pageNo" @current-change="handleCurrentChange">
40 :current-page.sync="currentPage">
41 </el-pagination> 40 </el-pagination>
42 </div> 41 </div>
43 </div> 42 </div>
...@@ -54,11 +53,12 @@ ...@@ -54,11 +53,12 @@
54 props: {}, 53 props: {},
55 data() { 54 data() {
56 return { 55 return {
57 total:0, 56 total: 0,
58 pageNo: 1, 57 pageNo: 1,
59 pageSize: 10, 58 pageSize: 10,
60 tableData: [], 59 tableData: [],
61 tableHeight: "", 60 tableHeight: "",
61 queryData: {}
62 }; 62 };
63 }, 63 },
64 created() { 64 created() {
...@@ -80,19 +80,24 @@ ...@@ -80,19 +80,24 @@
80 handleCurrentChange(val) { 80 handleCurrentChange(val) {
81 console.log(`当前页: ${val}`); 81 console.log(`当前页: ${val}`);
82 this.pageNo = val; 82 this.pageNo = val;
83 this.getData({}); 83 this.queryData.pageNo = val;
84 this.getData(this.queryData);
84 }, 85 },
85 //获取子组件点击查询触发的事件 86 getData(data) {
86 getData(obj) { 87 getSearchList(data).then(res => {
87 console.log(obj);
88 //将obj作为参数调用接口查询表格数据
89 obj['pageNo'] = this.pageNo
90 obj['pageSize'] = this.pageSize
91 getSearchList(obj).then(res => {
92 this.tableData = res.result.records 88 this.tableData = res.result.records
93 this.total=res.result.total 89 this.total = res.result.total
94 }) 90 })
95 }, 91 },
92 //获取子组件点击查询触发的事件
93 geQuerytData(obj) {
94 this.queryData = obj
95 //将obj作为参数调用接口查询表格数据
96 this.queryData['pageSize'] = this.pageSize
97 this.pageNo = 1
98 this.queryData['pageNo'] = 1
99 this.getData(this.queryData)
100 },
96 //点击办理 101 //点击办理
97 handleClick(row) { 102 handleClick(row) {
98 let path = ""; 103 let path = "";
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
2 <div class="main"> 2 <div class="main">
3 <div class="formMenu"> 3 <div class="formMenu">
4 <Qlr ref="qlrxxModule"></Qlr> 4 <Qlr ref="qlrxxModule"></Qlr>
5
6 <!-- <el-button 5 <!-- <el-button
7 type="primary" 6 type="primary"
8 class="changeBtn" 7 class="changeBtn"
...@@ -28,7 +27,7 @@ ...@@ -28,7 +27,7 @@
28 @change="changeXzq(formData.xzqbsm)" 27 @change="changeXzq(formData.xzqbsm)"
29 > 28 >
30 <el-option 29 <el-option
31 v-for="item in xzqList" 30 v-for="item in $store.state.xzqList"
32 :key="item.xzqbsm" 31 :key="item.xzqbsm"
33 :label="item.xzqmc" 32 :label="item.xzqmc"
34 :value="item.xzqbsm" 33 :value="item.xzqbsm"
...@@ -44,7 +43,7 @@ ...@@ -44,7 +43,7 @@
44 @change="changeDjq(formData.djqbsm)" 43 @change="changeDjq(formData.djqbsm)"
45 > 44 >
46 <el-option 45 <el-option
47 v-for="item in djqList" 46 v-for="item in $store.state.djqList"
48 :key="item.bsm" 47 :key="item.bsm"
49 :label="item.mc" 48 :label="item.mc"
50 :value="item.bsm" 49 :value="item.bsm"
...@@ -56,7 +55,7 @@ ...@@ -56,7 +55,7 @@
56 <td colspan="2"> 55 <td colspan="2">
57 <el-select class="formSelect" v-model="formData.djzqbsm"> 56 <el-select class="formSelect" v-model="formData.djzqbsm">
58 <el-option 57 <el-option
59 v-for="item in djzqList" 58 v-for="item in $store.state.djzqList"
60 :key="item.bsm" 59 :key="item.bsm"
61 :label="item.mc" 60 :label="item.mc"
62 :value="item.bsm" 61 :value="item.bsm"
...@@ -70,7 +69,7 @@ ...@@ -70,7 +69,7 @@
70 <td colspan="4"> 69 <td colspan="4">
71 <el-select class="formSelect" v-model="formData.qllxbsm"> 70 <el-select class="formSelect" v-model="formData.qllxbsm">
72 <el-option 71 <el-option
73 v-for="item in qllxList" 72 v-for="item in $store.state.qllxList"
74 :key="item.bsm" 73 :key="item.bsm"
75 :label="item.mc" 74 :label="item.mc"
76 :value="item.bsm" 75 :value="item.bsm"
...@@ -82,7 +81,7 @@ ...@@ -82,7 +81,7 @@
82 <td colspan="4"> 81 <td colspan="4">
83 <el-select class="formSelect" v-model="formData.zdtzmbsm"> 82 <el-select class="formSelect" v-model="formData.zdtzmbsm">
84 <el-option 83 <el-option
85 v-for="item in zdtzmList" 84 v-for="item in $store.state.zdtzmList"
86 :key="item.bsm" 85 :key="item.bsm"
87 :label="item.mc" 86 :label="item.mc"
88 :value="item.bsm" 87 :value="item.bsm"
...@@ -96,7 +95,7 @@ ...@@ -96,7 +95,7 @@
96 <td colspan="4"> 95 <td colspan="4">
97 <el-select class="formSelect" v-model="formData.qlsdfs"> 96 <el-select class="formSelect" v-model="formData.qlsdfs">
98 <el-option 97 <el-option
99 v-for="item in qlsdfsList" 98 v-for="item in $store.state.qlsdfsList"
100 :key="item.bsm" 99 :key="item.bsm"
101 :label="item.mc" 100 :label="item.mc"
102 :value="item.bsm" 101 :value="item.bsm"
...@@ -152,7 +151,7 @@ ...@@ -152,7 +151,7 @@
152 <td colspan="4"> 151 <td colspan="4">
153 <el-select class="formSelect" v-model="formData.gmjjhyfl"> 152 <el-select class="formSelect" v-model="formData.gmjjhyfl">
154 <el-option 153 <el-option
155 v-for="item in gmjjhyflList" 154 v-for="item in $store.state.sshyList"
156 :key="item.value" 155 :key="item.value"
157 :label="item.label" 156 :label="item.label"
158 :value="item.value" 157 :value="item.value"
...@@ -180,8 +179,8 @@ ...@@ -180,8 +179,8 @@
180 </tr> 179 </tr>
181 <tr> 180 <tr>
182 <td colspan="2">容积率</td> 181 <td colspan="2">容积率</td>
183 <td colspan="4"> 182 <td colspan="2">
184 <el-select class="formSelect percent30" v-model="formData.rjl"> 183 <el-select class="formSelect" v-model="formData.rjl">
185 <el-option 184 <el-option
186 v-for="item in compareList" 185 v-for="item in compareList"
187 :key="item.value" 186 :key="item.value"
...@@ -190,7 +189,9 @@ ...@@ -190,7 +189,9 @@
190 > 189 >
191 </el-option> 190 </el-option>
192 </el-select> 191 </el-select>
193 <input type="text" class="formInput percent68"/> 192 </td>
193 <td colspan="2">
194 <input type="text" class="formInput"/>
194 </td> 195 </td>
195 <td colspan="2">容积说明</td> 196 <td colspan="2">容积说明</td>
196 <td colspan="4" class="psr"> 197 <td colspan="4" class="psr">
...@@ -199,8 +200,8 @@ ...@@ -199,8 +200,8 @@
199 </tr> 200 </tr>
200 <tr> 201 <tr>
201 <td colspan="2">建筑密度</td> 202 <td colspan="2">建筑密度</td>
202 <td colspan="4"> 203 <td colspan="2">
203 <el-select class="formSelect percent30" v-model="formData.jzmd"> 204 <el-select class="formSelect" v-model="formData.jzmd">
204 <el-option 205 <el-option
205 v-for="item in compareList" 206 v-for="item in compareList"
206 :key="item.value" 207 :key="item.value"
...@@ -209,7 +210,9 @@ ...@@ -209,7 +210,9 @@
209 > 210 >
210 </el-option> 211 </el-option>
211 </el-select> 212 </el-select>
212 <input type="text" class="formInput percent68"/> 213 </td>
214 <td colspan="2">
215 <input type="text" class="formInput"/>
213 </td> 216 </td>
214 <td colspan="2">建筑密度说明</td> 217 <td colspan="2">建筑密度说明</td>
215 <td colspan="4" class="psr"> 218 <td colspan="4" class="psr">
...@@ -218,8 +221,8 @@ ...@@ -218,8 +221,8 @@
218 </tr> 221 </tr>
219 <tr> 222 <tr>
220 <td colspan="2">建筑限高</td> 223 <td colspan="2">建筑限高</td>
221 <td colspan="4"> 224 <td colspan="2">
222 <el-select class="formSelect percent30" v-model="formData.jzxg"> 225 <el-select class="formSelect" v-model="formData.jzxg">
223 <el-option 226 <el-option
224 v-for="item in compareList" 227 v-for="item in compareList"
225 :key="item.value" 228 :key="item.value"
...@@ -228,6 +231,8 @@ ...@@ -228,6 +231,8 @@
228 > 231 >
229 </el-option> 232 </el-option>
230 </el-select> 233 </el-select>
234 </td>
235 <td colspan="2">
231 <input type="text" class="formInput percent68"/> 236 <input type="text" class="formInput percent68"/>
232 </td> 237 </td>
233 <td colspan="2">建筑限高说明</td> 238 <td colspan="2">建筑限高说明</td>
...@@ -321,14 +326,9 @@ ...@@ -321,14 +326,9 @@
321 props: {}, 326 props: {},
322 data() { 327 data() {
323 return { 328 return {
324 qllxList: [],
325 zdtzmList: [],
326 qlsdfsList: [],
327 gmjjhyflList: [],
328 xzqList: this.$store.state.xzqList,
329 djqList: this.$store.state.djqList,
330 djzqList: this.$store.state.djzqList,
331 compareList: [ 329 compareList: [
330 {label: "<", value: "<"},
331 {label: ">", value: ">"},
332 {label: "=", value: "="}, 332 {label: "=", value: "="},
333 {label: "<=", value: "<="}, 333 {label: "<=", value: "<="},
334 {label: ">=", value: ">="}, 334 {label: ">=", value: ">="},
...@@ -369,7 +369,6 @@ ...@@ -369,7 +369,6 @@
369 }; 369 };
370 }, 370 },
371 created() { 371 created() {
372 this.getDicData();
373 this.getZdjbxxData(); 372 this.getZdjbxxData();
374 }, 373 },
375 mounted() { 374 mounted() {
...@@ -407,37 +406,6 @@ ...@@ -407,37 +406,6 @@
407 getQlxzData() { 406 getQlxzData() {
408 console.log(this.$refs.qlxzModule.getQlxzDataList()); //权利性质数据 407 console.log(this.$refs.qlxzModule.getQlxzDataList()); //权利性质数据
409 }, 408 },
410 //获取字典数据信息
411 getDicData() {
412 getDdicByMC("权利类型")
413 .then((res) => {
414 console.log(res.result);
415 this.qllxList = res.result;
416 })
417 .catch((error) => {
418 });
419 getDdicByMC("宗地（宗海）特征码")
420 .then((res) => {
421 console.log(res.result);
422 this.zdtzmList = res.result;
423 })
424 .catch((error) => {
425 });
426 getDdicByMC("权利设定方式")
427 .then((res) => {
428 console.log(res.result);
429 this.qlsdfsList = res.result;
430 })
431 .catch((error) => {
432 });
433 getDdicByMC("国民经济行业分类代码")
434 .then((res) => {
435 console.log(res.result);
436 this.gmjjhyflList = res.result;
437 })
438 .catch((error) => {
439 });
440 },
441 //行政区划选择 409 //行政区划选择
442 changeXzq(id) { 410 changeXzq(id) {
443 getListByXzqbsm(id) 411 getListByXzqbsm(id)
......
1 <template> 1 <template>
2 <div class="zrz content-form" v-loading="loading"> 2 <div class="zrz content-form" v-loading="loading">
3 <el-form ref="form" :model="form" label-width="160px"> 3 <el-form ref="form" :model="form" label-width="160px">
4 <Qlr ref="qlrxxModule"></Qlr> 4 <Qlr ref="qlrxxModule" :lx="lx" :bsm="zrzbsm"></Qlr>
5 <table border="1" width="100%" cellspacing="0" cellpadding="0" class="zrzTable"> 5 <table border="1" width="100%" cellspacing="0" cellpadding="0" class="zrzTable">
6 <tbody> 6 <tbody>
7 <tr height="30"> 7 <tr height="30">
...@@ -280,6 +280,8 @@ ...@@ -280,6 +280,8 @@
280 }, 280 },
281 data () { 281 data () {
282 return { 282 return {
283 lx:"zrz",
284 zrzbsm:'',
283 form:{ 285 form:{
284 zrzbsm:'', //自然幢标识码 286 zrzbsm:'', //自然幢标识码
285 zdbsm:'', //宗地标识码 287 zdbsm:'', //宗地标识码
...@@ -395,7 +397,6 @@ ...@@ -395,7 +397,6 @@
395 } 397 }
396 }, 398 },
397 onSave(){ 399 onSave(){
398 console.log(this.form)
399 this.loading=true; 400 this.loading=true;
400 // this.form.qlxzList=this.$refs.qlxzModule.getQlxzDataList(); 401 // this.form.qlxzList=this.$refs.qlxzModule.getQlxzDataList();
401 this.form.qlxzList= 402 this.form.qlxzList=
...@@ -532,16 +533,17 @@ ...@@ -532,16 +533,17 @@
532 getZrzDetailByBsm(data){ 533 getZrzDetailByBsm(data){
533 getZrzDetailByBsm(data).then((res)=>{ 534 getZrzDetailByBsm(data).then((res)=>{
534 if(res.code===200){ 535 if(res.code===200){
535 console.log(res.result)
536 this.form=res.result; 536 this.form=res.result;
537 } 537 }
538 }) 538 })
539 }
540 }, 539 },
541 created(){ 540 consoleLog(data){
541 console.log("============================")
542 console.log(data)
543 }
542 544
543 }, 545 },
544 mounted() { 546 created(){
545 this.getDDic(); 547 this.getDDic();
546 //todo 怎么判断进入到该页面是从新建处进来的，还是从右键宗地进来的！如果是从新建进来的就需要把虚拟宗标识码带过来； 548 //todo 怎么判断进入到该页面是从新建处进来的，还是从右键宗地进来的！如果是从新建进来的就需要把虚拟宗标识码带过来；
547 this.source = this.$route.query.source; 549 this.source = this.$route.query.source;
...@@ -551,10 +553,14 @@ ...@@ -551,10 +553,14 @@
551 this.getZddm(this.$store.zdbsm); 553 this.getZddm(this.$store.zdbsm);
552 this.form.xmmc=this.$store.xmmc; 554 this.form.xmmc=this.$store.xmmc;
553 this.form.zrzbsm=this.$store.zrzbsm; 555 this.form.zrzbsm=this.$store.zrzbsm;
556
554 }else { 557 }else {
558 this.zrzbsm=this.$route.query.bsm;
555 this.getZrzDetailByBsm(this.$route.query.bsm) 559 this.getZrzDetailByBsm(this.$route.query.bsm)
560 this.consoleLog(this.zrzbsm)
556 } 561 }
557 562 },
563 mounted() {
558 } 564 }
559 } 565 }
560 </script> 566 </script>
......