Skip to content

任超 / js.CadastralSystem

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

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

2 parents ae2bc74a 5028f767
Inline Side-by-side
Showing 5 changed files with 38 additions and 18 deletions
...@@ -175,9 +175,31 @@ export default { ...@@ -175,9 +175,31 @@ export default {
175 // 左键双击事件 175 // 左键双击事件
176 dbclick(item) { 176 dbclick(item) {
177 clearTimeout(this.time); 177 clearTimeout(this.time);
178 if (item.zdbsm || item.zrzbsm) { 178 if(item.type == 'zd' || item.type == 'zrz' ||item.type == 'dz'){
179 this.$router.push("/zd"); 179 this.$router.push({
180 path: '/'+item.type,
181 query:{
182 source: 2,
183 bsm:item.bsm
184 }
185 });
180 } 186 }
187 // if (item.type == 'zd') {
188 // this.$router.push({
189 // path: '/zd',
190 // query:{
191 // source: 2,
192 // bsm:item.bsm
193 // }
194 // });
195 // }else if(item.type == 'zrz'){
196 // this.$router.push({
197 // path: '/zrz',
198 // query:{
199 // bsm:item.bsm
200 // }
201 // });
202 // }
181 }, 203 },
182 closeMenu() { 204 closeMenu() {
183 this.$emit("changeVisible", false); 205 this.$emit("changeVisible", false);
......
...@@ -41,7 +41,8 @@ ...@@ -41,7 +41,8 @@
41 </el-table-column> 41 </el-table-column>
42 </el-table> 42 </el-table>
43 <div class="pagination"> 43 <div class="pagination">
44 <el-pagination background layout="prev, pager, next,total" :total="total"> 44 <el-pagination background layout="prev, pager, next,total" :total="total"
45 :current-page="pageNo" :page-size="pageSize" @current-change="handleCurrentChange">
45 </el-pagination> 46 </el-pagination>
46 </div> 47 </div>
47 </div> 48 </div>
...@@ -75,17 +76,14 @@ ...@@ -75,17 +76,14 @@
75 created() { 76 created() {
76 }, 77 },
77 mounted() { 78 mounted() {
78 this.getData({ 79 this.queryData.pageSize=this.pageSize
79 pageNo: this.pageNo, 80 this.getData(this.queryData);
80 pageSize: this.pageSize,
81 })
82 this.$nextTick(() => { 81 this.$nextTick(() => {
83 this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 255; 82 this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 255;
84 }); 83 });
85 }, 84 },
86 methods: { 85 methods: {
87 handleCurrentChange(val) { 86 handleCurrentChange(val) {
88 console.log(`当前页: ${val}`);
89 this.pageNo = val; 87 this.pageNo = val;
90 this.queryData.pageNo = val; 88 this.queryData.pageNo = val;
91 this.getData(this.queryData); 89 this.getData(this.queryData);
...@@ -118,7 +116,6 @@ ...@@ -118,7 +116,6 @@
118 //点击办理 116 //点击办理
119 handleClick(row) { 117 handleClick(row) {
120 let path = ""; 118 let path = "";
121 console.log(row)
122 switch (row.dylx) { 119 switch (row.dylx) {
123 case "zrz": 120 case "zrz":
124 path = "/zrz"; 121 path = "/zrz";
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
41 </el-table-column> 41 </el-table-column>
42 </el-table> 42 </el-table>
43 <div class="pagination"> 43 <div class="pagination">
44 <el-pagination background layout="prev, pager, next,total" :total="total" 44 <el-pagination background layout="prev, pager, next,total" :total="total" :page-size="pageSize"
45 :current-page="pageNo" @current-change="handleCurrentChange"> 45 :current-page="pageNo" @current-change="handleCurrentChange">
46 </el-pagination> 46 </el-pagination>
47 </div> 47 </div>
...@@ -77,7 +77,8 @@ ...@@ -77,7 +77,8 @@
77 created() { 77 created() {
78 }, 78 },
79 mounted() { 79 mounted() {
80 this.getData({}) 80 this.queryData.pageSize=this.pageSize
81 this.getData(this.queryData)
81 this.$nextTick(() => { 82 this.$nextTick(() => {
82 this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 255; 83 this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 255;
83 }); 84 });
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
42 </el-table> 42 </el-table>
43 <div class="pagination"> 43 <div class="pagination">
44 <el-pagination background layout="prev, pager, next,total" :total="total" 44 <el-pagination background layout="prev, pager, next,total" :total="total"
45 :current-page="pageNo" @current-change="handleCurrentChange"> 45 :current-page="pageNo" :page-size="pageSize" @current-change="handleCurrentChange">
46 </el-pagination> 46 </el-pagination>
47 </div> 47 </div>
48 48
...@@ -83,7 +83,8 @@ ...@@ -83,7 +83,8 @@
83 created() { 83 created() {
84 }, 84 },
85 mounted() { 85 mounted() {
86 this.getData({pageSize:15}); 86 this.queryData.pageSize=this.pageSize
87 this.getData(this.queryData);
87 this.$nextTick(()=>{ 88 this.$nextTick(()=>{
88 this.tableHeight = this.$refs.dataGrid.offsetHeight - 68; 89 this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
89 }) 90 })
...@@ -108,7 +109,6 @@ ...@@ -108,7 +109,6 @@
108 this.$refs.hbj.onReset(); 109 this.$refs.hbj.onReset();
109 }, 110 },
110 handleCurrentChange(val) { 111 handleCurrentChange(val) {
111 console.log(`当前页: ${val}`);
112 this.pageNo = val; 112 this.pageNo = val;
113 this.queryData.pageNo = val; 113 this.queryData.pageNo = val;
114 this.getData(this.queryData); 114 this.getData(this.queryData);
......
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
112 class="formInput percent80" 112 class="formInput percent80"
113 v-model="formData.zddm" 113 v-model="formData.zddm"
114 /> 114 />
115 <el-button type="warning" class="createBtn" @click="generatorCode" 115 <el-button type="warning" :disabled="formData.qszt!='0'" class="createBtn" @click="generatorCode"
116 >生成 116 >生成
117 </el-button> 117 </el-button>
118 </td> 118 </td>
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
130 class="formInput percent80" 130 class="formInput percent80"
131 v-model="formData.bdcdyh" 131 v-model="formData.bdcdyh"
132 /> 132 />
133 <el-button type="warning" class="createBtn">生成</el-button> 133 <!-- <el-button type="warning" :disabled="formData.qszt!='0'" class="createBtn">生成</el-button> -->
134 </td> 134 </td>
135 </tr> 135 </tr>
136 <tr> 136 <tr>
...@@ -705,7 +705,7 @@ export default { ...@@ -705,7 +705,7 @@ export default {
705 return this.formData.zddm; 705 return this.formData.zddm;
706 }, 706 },
707 zdbsm() { 707 zdbsm() {
708 return this.$store.state.zdbsm; 708 return this.$route.query.bsm;
709 }, 709 },
710 }, 710 },
711 watch: { 711 watch: {
...@@ -720,7 +720,7 @@ export default { ...@@ -720,7 +720,7 @@ export default {
720 }, 720 },
721 zdbsm:function (val) { 721 zdbsm:function (val) {
722 this.getZdjbxxData(val) 722 this.getZdjbxxData(val)
723 this.curZdbsm = this.$route.query.bsm; 723 this.curZdbsm = val;
724 } 724 }
725 }, 725 },
726 }; 726 };
......