Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
000e2cd7 by zhaoqian
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/App.vue
#	src/components/formMenu/qlr.vue
2 parents debb055d 960a2a53
Inline Side-by-side
Showing 9 changed files with 219 additions and 164 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 window.addEventListener("unload", this.saveState); 10 window.addEventListener("unload", this.saveState);
12 this.getDic();
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>
......
...@@ -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 qllxList" 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 zjlxList" 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 zjlxList" 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"
...@@ -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 zjlxList" 225 v-for="item in $store.state.zjlxList"
226 :key="item.bsm" 226 :key="item.bsm"
227 :label="item.mc" 227 :label="item.mc"
228 :value="item.bsm" 228 :value="item.bsm"
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
252 <td colspan="3"> 252 <td colspan="3">
253 <el-select class="formSelect" v-model="formData.gyfsbsm"> 253 <el-select class="formSelect" v-model="formData.gyfsbsm">
254 <el-option 254 <el-option
255 v-for="item in gyfsList" 255 v-for="item in $store.state.gyfsList"
256 :key="item.bsm" 256 :key="item.bsm"
257 :label="item.mc" 257 :label="item.mc"
258 :value="item.bsm" 258 :value="item.bsm"
......
...@@ -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) => {});
......
1 <template> 1 <template>
2 <el-form :inline="true" :model="formData" class="demo-form-inline"> 2 <el-row>
3 <el-form-item label="宗地编码"> 3 <el-col :span="18">
4 <el-input v-model="formData.zdbm" placeholder="输入宗地编码"></el-input> 4 <el-row>
5 <el-col :span="22">
6 <el-form :inline="true" class="demo-form-inline">
7 <el-form-item label="宗地编码:">
8 <el-input v-model="queryData.zddm" placeholder="输入宗地编码" @change="query"></el-input>
5 </el-form-item> 9 </el-form-item>
6 <el-form-item label="坐落"> 10 <el-form-item label="坐落:">
7 <el-input v-model="formData.zl" placeholder="输入坐落地址"></el-input> 11 <el-input v-model="queryData.zl" placeholder="输入坐落地址" @change="query"></el-input>
8 </el-form-item> 12 </el-form-item>
9 <el-form-item label="不动产单元号"> 13 </el-form>
14 </el-col>
15 <el-col :span="2">
16 <el-button type="primary" @click="query">查询</el-button>
17 </el-col>
18 </el-row>
19 <el-row>
20 <el-col :span="22">
21 <el-form :inline="true" :model="queryData" class="demo-form-inline">
22 <el-form-item label="不动产单元号:">
10 <el-input 23 <el-input
11 v-model="formData.bdcdyh" 24 v-model="queryData.bdcdyh"
12 placeholder="输入不动产单元号" 25 placeholder="输入不动产单元号"
26 @change="query"
13 ></el-input> 27 ></el-input>
14 </el-form-item> 28 </el-form-item>
15 <el-form-item> 29 <el-form-item class="demo-form-inline" label="单元类型:">
16 <el-button type="primary" @click="onSubmit">查询</el-button> 30 <el-checkbox-group v-model="queryData.dylxs" @change="query">
17 <el-button type="warning" @click="onSubmit">重置</el-button> 31 <el-checkbox label="zd" name="type">宗地</el-checkbox>
18 <el-button type="primary" class="moreSearchBtn" @click="onSubmit" 32 <el-checkbox label="zrz" name="type">自然幢</el-checkbox>
19 >更多查询</el-button 33 <el-checkbox label="h" name="type">户</el-checkbox>
20 > 34 <el-checkbox label="gzw" name="type">构筑物</el-checkbox>
21 </el-form-item> 35 <el-checkbox label="lq" name="type">林权</el-checkbox>
22 <el-form-item class="db" label="查询范围"> 36 <el-checkbox label="zh" name="type">宗海</el-checkbox>
23 <el-checkbox-group v-model="formData.type">
24 <el-checkbox label="宗地" name="type"></el-checkbox>
25 <el-checkbox label="自然幢" name="type"></el-checkbox>
26 <el-checkbox label="户" name="type"></el-checkbox>
27 <el-checkbox label="构筑物" name="type"></el-checkbox>
28 <el-checkbox label="林权" name="type"></el-checkbox>
29 <el-checkbox label="宗海" name="type"></el-checkbox>
30 </el-checkbox-group> 37 </el-checkbox-group>
31 </el-form-item> 38 </el-form-item>
32 </el-form> 39 </el-form>
40 </el-col>
41 <el-col :span="2">
42 <el-button type="warning" @click="reset">重置</el-button>
43 </el-col>
44 </el-row>
45 <el-row class="row3">
46 <el-col :span="22" v-show="ismore">
47 <el-form :inline="true" class="demo-form-inline">
48 <el-form-item label="权利人名称:">
49 <el-input placeholder="输入权利人名称" v-model="queryData.qlrmc" @change="query"></el-input>
50 </el-form-item>
51 <el-form-item label="项目名称:">
52 <el-input placeholder="输入项目名称" v-model="queryData.xmmc" @change="query"></el-input>
53 </el-form-item>
54 <el-form-item label="不动产权证号:">
55 <el-input placeholder="输入不动产权证号" v-model="queryData.bdcqzh" @change="query"></el-input>
56 </el-form-item>
57 </el-form>
58 </el-col>
59 <el-col :span="2" :offset="offset">
60 <el-button type="primary" class="moreSearchBtn" @click="ismore=!ismore">更多查询
61 </el-button>
62 </el-col>
63 </el-row>
64 </el-col>
65 </el-row>
66
33 </template> 67 </template>
34 68
35 <script> 69 <script>
36 export default { 70 export default {
37 name: "", 71 name: "",
38 components: {}, 72 components: {},
39 props: {}, 73 props: {},
40 data() { 74 data() {
41 return { 75 return {
42 formData: { 76 offset: 22,
43 zdbm: "", 77 ismore: false,
44 zl: "", 78 queryData: {
45 bdcdyh: "", 79 bdcdyh: "",
46 type: [], 80 bdcqzh: "",
47 }, 81 dylxs: [],
82 qlrmc: "",
83 qszt: "",
84 xmmc: "",
85 zddm: "",
86 zl: ""
87 }
48 }; 88 };
49 }, 89 },
50 created() { 90 created() {
51 let self = this; 91 let self = this;
52 document.onkeydown = function(e) { 92 document.onkeydown = function (e) {
53 //按下回车提交 93 //按下回车提交
54 let key = window.event.keyCode; 94 let key = window.event.keyCode;
55 //事件中keycode=13为回车事件 95 //事件中keycode=13为回车事件
...@@ -58,15 +98,47 @@ export default { ...@@ -58,15 +98,47 @@ export default {
58 } 98 }
59 }; 99 };
60 }, 100 },
61 mounted() {}, 101 mounted() {
102 },
62 methods: { 103 methods: {
63 onSubmit() { 104 reset() {
105 this.queryData = {
106 bdcdyh: "",
107 bdcqzh: "",
108 dylxs: [],
109 qlrmc: "",
110 qszt: "",
111 xmmc: "",
112 zddm: "",
113 zl: ""
114 };
115 this.query()
116 },
117 query() {
64 //子组件点击查询时将表单数据发送给父组件 118 //子组件点击查询时将表单数据发送给父组件
65 this.$emit("getSearchCondition", this.formData); 119 this.$emit("getSearchCondition", this.queryData);
66 }, 120 },
67 }, 121 },
68 computed: {}, 122 computed: {},
69 watch: {}, 123 watch: {
70 }; 124 "ismore": function (val) {
125 if (val) {
126 this.offset = 0
127 } else {
128 this.offset = 22
129 this.queryData.qlrmc = "";
130 this.queryData.xmmc = "";
131 this.queryData.bdcqzh = "";
132 }
133 }
134 },
135 };
71 </script> 136 </script>
72 <style scoped lang="less"></style> 137 <style scoped lang="less">
138 .el-button {
139 width: 100px;
140 }
141 .row3{
142 height: 55px;
143 }
144 </style>
......
...@@ -10,15 +10,15 @@ Vue.use(Vuex) ...@@ -10,15 +10,15 @@ Vue.use(Vuex)
10 const store = new Vuex.Store({ 10 const store = new Vuex.Store({
11 state: sessionStorage.getItem('state') ? JSON.parse(sessionStorage.getItem('state')) : { 11 state: sessionStorage.getItem('state') ? JSON.parse(sessionStorage.getItem('state')) : {
12 zdbsm: '', 12 zdbsm: '',
13 xzqList: [],
14 djqList: [],
15 djzqList: [],
16 zjzlList:[], 13 zjzlList:[],
17 gjList:[], 14 gjList:[],
18 ssList:[], 15 ssList:[],
19 qlrlxList:[], 16 qlrlxList:[],
20 xbList:[], 17 xbList:[],
21 sshyList:[], 18 sshyList:[],
19 xzqList: [],
20 djqList: [],
21 djzqList: [],
22 //创建自然幢时需要用到的临时存储信息 22 //创建自然幢时需要用到的临时存储信息
23 zrzbsm: '', 23 zrzbsm: '',
24 xmmc: '', 24 xmmc: '',
......
...@@ -35,30 +35,26 @@ ...@@ -35,30 +35,26 @@
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,
...@@ -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,30 @@ ...@@ -243,14 +239,30 @@
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 },
255 async getDicData(name) {
256 return await getDdicByMC(name).then((res)=> {
257 return res.result
258 });
259 },
248 getRightTree(bsm) { 260 getRightTree(bsm) {
249 getTree(bsm).then(res => { 261 getTree(bsm).then((res) => {
250 if (res.success) { 262 if (res.success) {
251 this.pd=res.result 263 this.pd = res.result;
252 } 264 }
253 }) 265 });
254 }, 266 },
255 sortNavigation(data, selectId) { 267 sortNavigation(data, selectId) {
256 let headTop = this.headTop; 268 let headTop = this.headTop;
...@@ -309,12 +321,12 @@ ...@@ -309,12 +321,12 @@
309 //关闭新建子组件弹框 321 //关闭新建子组件弹框
310 closeDialog() { 322 closeDialog() {
311 this.dialogVisible = false; 323 this.dialogVisible = false;
312 }
313 }, 324 },
314 }; 325 },
326 };
315 </script> 327 </script>
316 <style lang="less" scoped> 328 <style lang="less" scoped>
317 .home-box { 329 .home-box {
318 width: 100%; 330 width: 100%;
319 height: 100vh; 331 height: 100vh;
320 .el-container { 332 .el-container {
...@@ -419,5 +431,5 @@ ...@@ -419,5 +431,5 @@
419 // line-height: 160px; 431 // line-height: 160px;
420 padding: 0; 432 padding: 0;
421 } 433 }
422 } 434 }
423 </style> 435 </style>
......
...@@ -83,8 +83,9 @@ ...@@ -83,8 +83,9 @@
83 </el-form-item> 83 </el-form-item>
84 <el-form-item label="特征码"> 84 <el-form-item label="特征码">
85 <el-select 85 <el-select
86 v-model="tzmCode" 86 v-model="zdtzm.value"
87 placeholder="地籍子区" 87 placeholder="宗地特征码"
88 @change="changeZdtzm(zdtzm.value)"
88 style="width:200px;" 89 style="width:200px;"
89 > 90 >
90 <el-option 91 <el-option
...@@ -203,8 +204,8 @@ export default { ...@@ -203,8 +204,8 @@ export default {
203 djzqbsm: this.djzqValue, 204 djzqbsm: this.djzqValue,
204 syqlxbsm: this.syqlxCode, 205 syqlxbsm: this.syqlxCode,
205 xmmc: this.zdProjectName, 206 xmmc: this.zdProjectName,
206 // zdtzmbsm: this.tzmCode, 207 zdtzmbsm: this.tzmCode,
207 zdtzmbsm: "PSHGSBDCQJDC000000000000DC440010", 208 //zdtzmbsm: "PSHGSBDCQJDC000000000000DC440010",
208 }; 209 };
209 insertQjZdjbxx(data) 210 insertQjZdjbxx(data)
210 .then((res) => { 211 .then((res) => {
...@@ -310,6 +311,12 @@ export default { ...@@ -310,6 +311,12 @@ export default {
310 this.syqlxCode = id; 311 this.syqlxCode = id;
311 console.log(this.syqlxCode); 312 console.log(this.syqlxCode);
312 }, 313 },
314 changeZdtzm(id){
315
316 this.tzmCode=id;
317 console.log(this.tzmCode);
318
319 },
313 close() { 320 close() {
314 this.$emit("closeDialog"); 321 this.$emit("closeDialog");
315 }, 322 },
......
...@@ -12,7 +12,8 @@ ...@@ -12,7 +12,8 @@
12 <el-table-column label="操作" width="100"> 12 <el-table-column label="操作" width="100">
13 <template slot-scope="scope"> 13 <template slot-scope="scope">
14 <el-button @click="handleClick(scope.row)" type="text" size="small" 14 <el-button @click="handleClick(scope.row)" type="text" size="small"
15 >办理</el-button 15 >办理
16 </el-button
16 > 17 >
17 <el-button type="text" size="small">定位</el-button> 18 <el-button type="text" size="small">定位</el-button>
18 </template> 19 </template>
...@@ -27,7 +28,7 @@ ...@@ -27,7 +28,7 @@
27 </el-table-column> 28 </el-table-column>
28 <el-table-column prop="qlr" align="left" width="120" label="权利人"> 29 <el-table-column prop="qlr" align="left" width="120" label="权利人">
29 </el-table-column> 30 </el-table-column>
30 <el-table-column prop="zl" align="left" label="坐落"> </el-table-column> 31 <el-table-column prop="zl" align="left" label="坐落"></el-table-column>
31 <el-table-column prop="zrsj" align="left" width="120" label="转入时间"> 32 <el-table-column prop="zrsj" align="left" width="120" label="转入时间">
32 </el-table-column> 33 </el-table-column>
33 <el-table-column prop="cjr" align="left" width="120" label="创建人"> 34 <el-table-column prop="cjr" align="left" width="120" label="创建人">
...@@ -42,10 +43,11 @@ ...@@ -42,10 +43,11 @@
42 </template> 43 </template>
43 44
44 <script> 45 <script>
45 import SearchHead from "../../../components/searchHead/searchHead"; 46 import SearchHead from "../../../components/searchHead/searchHead";
46 export default { 47
48 export default {
47 name: "", 49 name: "",
48 components: { SearchHead }, 50 components: {SearchHead},
49 props: {}, 51 props: {},
50 data() { 52 data() {
51 return { 53 return {
...@@ -69,7 +71,8 @@ export default { ...@@ -69,7 +71,8 @@ export default {
69 tableHeight: "", 71 tableHeight: "",
70 }; 72 };
71 }, 73 },
72 created() {}, 74 created() {
75 },
73 mounted() { 76 mounted() {
74 for (let i = 0; i < 11; i++) { 77 for (let i = 0; i < 11; i++) {
75 let obj = { 78 let obj = {
...@@ -87,8 +90,9 @@ export default { ...@@ -87,8 +90,9 @@ export default {
87 this.tableHeight = this.$refs.dataGrid.offsetHeight - 68; 90 this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
88 }, 91 },
89 methods: { 92 methods: {
90 onSubmit() {}, 93 onSubmit() {
91 tableRowClassName({ row, rowIndex }) { 94 },
95 tableRowClassName({row, rowIndex}) {
92 if (rowIndex % 2 !== 0) { 96 if (rowIndex % 2 !== 0) {
93 return "even-row"; 97 return "even-row";
94 } else { 98 } else {
...@@ -99,7 +103,6 @@ export default { ...@@ -99,7 +103,6 @@ export default {
99 //获取子组件点击查询触发的事件 103 //获取子组件点击查询触发的事件
100 getData(obj) { 104 getData(obj) {
101 console.log(obj); 105 console.log(obj);
102 //将obj作为参数调用接口查询表格数据
103 }, 106 },
104 //点击办理 107 //点击办理
105 handleClick(row) { 108 handleClick(row) {
...@@ -119,10 +122,10 @@ export default { ...@@ -119,10 +122,10 @@ export default {
119 }, 122 },
120 computed: {}, 123 computed: {},
121 watch: {}, 124 watch: {},
122 }; 125 };
123 </script> 126 </script>
124 <style scoped lang="less"> 127 <style scoped lang="less">
125 .main { 128 .main {
126 width: 100%; 129 width: 100%;
127 height: 100%; 130 height: 100%;
128 box-sizing: border-box; 131 box-sizing: border-box;
...@@ -143,9 +146,10 @@ export default { ...@@ -143,9 +146,10 @@ export default {
143 } 146 }
144 .dataGrid { 147 .dataGrid {
145 flex: 1; 148 flex: 1;
149 margin-top: 20px;
146 .pagination { 150 .pagination {
147 padding: 18px 0; 151 padding: 18px 0;
148 } 152 }
149 } 153 }
150 } 154 }
151 </style> 155 </style>
......
...@@ -12,7 +12,8 @@ ...@@ -12,7 +12,8 @@
12 <el-table-column label="操作" width="100"> 12 <el-table-column label="操作" width="100">
13 <template slot-scope="scope"> 13 <template slot-scope="scope">
14 <el-button @click="handleClick(scope.row)" type="text" size="small" 14 <el-button @click="handleClick(scope.row)" type="text" size="small"
15 >办理</el-button 15 >办理
16 </el-button
16 > 17 >
17 <el-button type="text" size="small">定位</el-button> 18 <el-button type="text" size="small">定位</el-button>
18 </template> 19 </template>
...@@ -27,14 +28,14 @@ ...@@ -27,14 +28,14 @@
27 </el-table-column> 28 </el-table-column>
28 <el-table-column prop="qlr" align="left" width="120" label="权利人"> 29 <el-table-column prop="qlr" align="left" width="120" label="权利人">
29 </el-table-column> 30 </el-table-column>
30 <el-table-column prop="zl" align="left" label="坐落"> </el-table-column> 31 <el-table-column prop="zl" align="left" label="坐落"></el-table-column>
31 <el-table-column prop="zrsj" align="left" width="120" label="转入时间"> 32 <el-table-column prop="zrsj" align="left" width="120" label="转入时间">
32 </el-table-column> 33 </el-table-column>
33 <el-table-column prop="cjr" align="left" width="120" label="创建人"> 34 <el-table-column prop="cjr" align="left" width="120" label="创建人">
34 </el-table-column> 35 </el-table-column>
35 </el-table> 36 </el-table>
36 <div class="pagination"> 37 <div class="pagination">
37 <el-pagination background layout="prev, pager, next" :total="1000" 38 <el-pagination background layout="prev, pager, next" :total="total"
38 @current-change="handleCurrentChange" 39 @current-change="handleCurrentChange"
39 :current-page.sync="currentPage"> 40 :current-page.sync="currentPage">
40 </el-pagination> 41 </el-pagination>
...@@ -44,55 +45,53 @@ ...@@ -44,55 +45,53 @@
44 </template> 45 </template>
45 46
46 <script> 47 <script>
47 import SearchHead from "../../../components/searchHead/searchHead"; 48 import SearchHead from "../../../components/searchHead/searchHead";
48 import {getSearchList} from "../../../api/search"; 49 import {getSearchList} from "../../../api/search";
49 export default { 50
51 export default {
50 name: "", 52 name: "",
51 components: { SearchHead }, 53 components: {SearchHead},
52 props: {}, 54 props: {},
53 data() { 55 data() {
54 return { 56 return {
55 pageNo:1, 57 total:0,
56 pageSize:10, 58 pageNo: 1,
57 zddm:'', 59 pageSize: 10,
58 zl:'',
59 bdcdyh:'',
60 dylx:'',
61 qlrmc:'',
62 xmmc:'',
63 bdcqzh:'',
64 formData: {
65 user: "",
66 region: "",
67 type: [],
68 },
69 tableData: [], 60 tableData: [],
70 tableHeight: "", 61 tableHeight: "",
71 }; 62 };
72 }, 63 },
73 created() {}, 64 created() {
65 },
74 mounted() { 66 mounted() {
75 this.loadList(); 67 this.getData({})
76 this.tableHeight = this.$refs.dataGrid.offsetHeight - 68; 68 this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
77 }, 69 },
78 methods: { 70 methods: {
79 onSubmit() {}, 71 onSubmit() {
80 tableRowClassName({ row, rowIndex }) { 72 },
73 tableRowClassName({row, rowIndex}) {
81 if (rowIndex % 2 !== 0) { 74 if (rowIndex % 2 !== 0) {
82 return "even-row"; 75 return "even-row";
83 } else { 76 } else {
84 return ""; 77 return "";
85 } 78 }
86 }, 79 },
87 handleCurrentChange(val){ 80 handleCurrentChange(val) {
88 console.log(`当前页: ${val}`); 81 console.log(`当前页: ${val}`);
89 this.pageNo=val; 82 this.pageNo = val;
90 this.loadList(); 83 this.getData({});
91 }, 84 },
92 //获取子组件点击查询触发的事件 85 //获取子组件点击查询触发的事件
93 getData(obj) { 86 getData(obj) {
94 console.log(obj); 87 console.log(obj);
95 //将obj作为参数调用接口查询表格数据 88 //将obj作为参数调用接口查询表格数据
89 obj['pageNo'] = this.pageNo
90 obj['pageSize'] = this.pageSize
91 getSearchList(obj).then(res => {
92 this.tableData = res.result.records
93 this.total=res.result.total
94 })
96 }, 95 },
97 //点击办理 96 //点击办理
98 handleClick(row) { 97 handleClick(row) {
...@@ -108,40 +107,20 @@ export default { ...@@ -108,40 +107,20 @@ export default {
108 break; 107 break;
109 } 108 }
110 this.$router.push({ 109 this.$router.push({
111 path:path, 110 path: path,
112 query:{ 111 query: {
113 bsm:row.glbsm, 112 bsm: row.glbsm,
114 source:2 113 source: 2
115 } 114 }
116 }); 115 });
117 }, 116 },
118 loadList(){
119 let params={
120 zddm:this.zddm,
121 zl:this.zl,
122 bdcdyh:this.bdcdyh,
123 dylx:this.dylx,
124 qlrmc:this.qlrmc,
125 xmmc:this.xmmc,
126 bdcqzh:this.bdcqzh,
127 pageNo:this.pageNo,
128 pageSize:this.pageSize,
129 }
130 getSearchList(params).then((res)=>{
131 console.log(res)
132 if(res.code===200){
133 this.tableData=res.result.records;
134 console.log(this.tableData)
135 }
136 })
137 }
138 }, 117 },
139 computed: {}, 118 computed: {},
140 watch: {}, 119 watch: {},
141 }; 120 };
142 </script> 121 </script>
143 <style scoped lang="less"> 122 <style scoped lang="less">
144 .main { 123 .main {
145 width: 100%; 124 width: 100%;
146 height: 100%; 125 height: 100%;
147 box-sizing: border-box; 126 box-sizing: border-box;
...@@ -166,5 +145,5 @@ export default { ...@@ -166,5 +145,5 @@ export default {
166 padding: 18px 0; 145 padding: 18px 0;
167 } 146 }
168 } 147 }
169 } 148 }
170 </style> 149 </style>
......