Merge remote-tracking branch 'origin/master'

@@ -175,9 +175,31 @@ export default {
 		// 左键双击事件
 		// 左键双击事件
 		dbclick(item) {
 		dbclick(item) {
 			clearTimeout(this.time);
 			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() {
 		closeMenu() {
 			this.$emit("changeVisible", false);
 			this.$emit("changeVisible", false);

@@ -112,7 +112,7 @@
 							class="formInput percent80"
 							class="formInput percent80"
 							v-model="formData.zddm"
 							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>
 						</el-button>
 					</td>
 					</td>
@@ -130,7 +130,7 @@
 							class="formInput percent80"
 							class="formInput percent80"
 							v-model="formData.bdcdyh"
 							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>
 					</td>
 				</tr>
 				</tr>
 				<tr>
 				<tr>
@@ -705,7 +705,7 @@ export default {
 			return this.formData.zddm;
 			return this.formData.zddm;
 		},
 		},
 		zdbsm() {
 		zdbsm() {
-			return this.$store.state.zdbsm;
+			return this.$route.query.bsm;
 		},
 		},
 	},
 	},
 	watch: {
 	watch: {
@@ -720,7 +720,7 @@ export default {
 		},
 		},
 		zdbsm:function (val) {
 		zdbsm:function (val) {
 			this.getZdjbxxData(val)		
 			this.getZdjbxxData(val)		
-			this.curZdbsm = this.$route.query.bsm;
+			this.curZdbsm = val;
 		}
 		}
 	},
 	},
 };
 };