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

@@ -175,9 +175,31 @@ export default {
 		// 左键双击事件
 		dbclick(item) {
 			clearTimeout(this.time);
-			if (item.zdbsm || item.zrzbsm) {
-				this.$router.push("/zd");
+			if(item.type == 'zd' || item.type == 'zrz' ||item.type == 'dz'){
+				this.$router.push({
+					path: '/'+item.type, 
+					query:{
+						source: 2,
+						bsm:item.bsm
+					}
+				});
 			}
+			// if (item.type == 'zd') {
+			// 	this.$router.push({
+			// 		path: '/zd', 
+			// 		query:{
+			// 			source: 2,
+			// 			bsm:item.bsm
+			// 		}
+			// 	});
+			// }else if(item.type == 'zrz'){
+			// 	this.$router.push({
+			// 		path: '/zrz', 
+			// 		query:{
+			// 			bsm:item.bsm
+			// 		}
+			// 	});
+			// }
 		},
 		closeMenu() {
 			this.$emit("changeVisible", false);

@@ -41,7 +41,8 @@
                 </el-table-column>
             </el-table>
             <div class="pagination">
-                <el-pagination background layout="prev, pager, next,total" :total="total">
+                <el-pagination background layout="prev, pager, next,total" :total="total"
+                               :current-page="pageNo"    :page-size="pageSize" @current-change="handleCurrentChange">
                 </el-pagination>
             </div>
         </div>
@@ -75,17 +76,14 @@
         created() {
         },
         mounted() {
-            this.getData({
-                pageNo: this.pageNo,
-                pageSize: this.pageSize,
-            })
+            this.queryData.pageSize=this.pageSize
+            this.getData(this.queryData);
             this.$nextTick(() => {
                 this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 255;
             });
         },
         methods: {
             handleCurrentChange(val) {
-                console.log(`当前页: ${val}`);
                 this.pageNo = val;
                 this.queryData.pageNo = val;
                 this.getData(this.queryData);
@@ -118,7 +116,6 @@
             //点击办理
             handleClick(row) {
                 let path = "";
-                console.log(row)
                 switch (row.dylx) {
                     case "zrz":
                         path = "/zrz";

@@ -41,7 +41,7 @@
                 </el-table-column>
             </el-table>
             <div class="pagination">
-                <el-pagination background layout="prev, pager, next,total" :total="total"
+                <el-pagination background layout="prev, pager, next,total" :total="total" :page-size="pageSize"
                                :current-page="pageNo" @current-change="handleCurrentChange">
                 </el-pagination>
             </div>
@@ -77,7 +77,8 @@
         created() {
         },
         mounted() {
-            this.getData({})
+            this.queryData.pageSize=this.pageSize
+            this.getData(this.queryData)
             this.$nextTick(() => {
 			    this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 255;
 		    });

@@ -42,7 +42,7 @@
             </el-table>
             <div class="pagination">
                 <el-pagination background layout="prev, pager, next,total" :total="total"
-                    :current-page="pageNo"           @current-change="handleCurrentChange">
+                    :current-page="pageNo"       :page-size="pageSize"    @current-change="handleCurrentChange">
                 </el-pagination>
             </div>
 
@@ -83,7 +83,8 @@
         created() {
         },
         mounted() {
-            this.getData({pageSize:15});
+            this.queryData.pageSize=this.pageSize
+            this.getData(this.queryData);
             this.$nextTick(()=>{
                 this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
             })
@@ -108,7 +109,6 @@
                 this.$refs.hbj.onReset();
             },
             handleCurrentChange(val) {
-                console.log(`当前页: ${val}`);
                 this.pageNo = val;
                 this.queryData.pageNo = val;
                 this.getData(this.queryData);

@@ -112,7 +112,7 @@
 							class="formInput percent80"
 							v-model="formData.zddm"
 						/>
-						<el-button type="warning" class="createBtn" @click="generatorCode"
+						<el-button type="warning"  :disabled="formData.qszt!='0'" class="createBtn" @click="generatorCode"
 							>生成
 						</el-button>
 					</td>
@@ -130,7 +130,7 @@
 							class="formInput percent80"
 							v-model="formData.bdcdyh"
 						/>
-						<el-button type="warning" class="createBtn">生成</el-button>
+						<!-- <el-button type="warning"  :disabled="formData.qszt!='0'" class="createBtn">生成</el-button> -->
 					</td>
 				</tr>
 				<tr>
@@ -705,7 +705,7 @@ export default {
 			return this.formData.zddm;
 		},
 		zdbsm() {
-			return this.$store.state.zdbsm;
+			return this.$route.query.bsm;
 		},
 	},
 	watch: {
@@ -720,7 +720,7 @@ export default {
 		},
 		zdbsm:function (val) {
 			this.getZdjbxxData(val)		
-			this.curZdbsm = this.$route.query.bsm;
+			this.curZdbsm = val;
 		}
 	},
 };