Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

src/views/qm/products_form.vue

@@ -21,8 +21,8 @@
 									v-model="form.batch"
 									placeholder="物料批次"
 									clearable
+									filterable
 									:disabled="mode=='sizeShow'||mode=='facadeShow'"
-									style="width: 100%"
 									@change="handleChange"
 								>
 									<el-option
@@ -35,6 +35,7 @@
 										<span style="float:right">({{item.count}})</span>
 									</el-option>
 								</el-select>
+								<scan-dialog ref="scanDialog" @closed="scanClose"> </scan-dialog>
 							</el-form-item>
 						</el-col>
 						<el-col :md="12" :sm="24">
@@ -407,8 +408,12 @@
 	</el-dialog>
 </template>
 <script>
+import scanDialog from "./../template/scan.vue";
 export default {
 	emits: ["success", "closed"],
+	components: {
+		scanDialog
+	},
 	data() {
 		return {
 			mode:'sizeAdd',
@@ -657,6 +662,11 @@ export default {
 			this.form.count_notok = data.count_notok;
 			this.count_notok_json = data.count_notok_json;
 		},
+		scanClose(data){
+			let id = data.split('#')[1];
+			console.log('id',id);
+			this.form.batch = id;
+		},
 		//设置过滤项
 		setFilters(filters) {
 			this.selectionFilters = filters;

src/views/wpm_gx/inm.vue

@@ -16,6 +16,20 @@
 				<!-- <el-button type="primary" @click="materialsChoses('wm')"
 					>选择物料</el-button
 				> -->
+				<el-select
+					v-model="query.state"
+					placeholder="物料状态"
+					clearable
+					@change="searchStateChange"
+					style="width: 250px"
+				>
+					<el-option
+						v-for="item in stateOptions"
+						:key="item.value"
+						:label="item.name"
+						:value="item.value"
+					/>
+				</el-select>
 				<el-input
 					style="margin-right: 5px"
 					v-model="query.search"
@@ -202,7 +216,10 @@ export default {
 				belong_dept:''
 			},
 			wmtype:0,
-			query: {},
+			query: {
+				search: "",
+				state: null,
+			},
 			dialog: {
 				save: false,
 				scrap: false,
@@ -212,6 +229,13 @@ export default {
 			},
 			tableData: [],
 			selection: [],
+			stateOptions:[
+				{ value: 10, name: "合格"},
+				{ value: 20, name: "不合格"},
+				{ value: 30, name: "返修"},
+				// { value: 40, name: "检验"},
+				// { value: 50, name: "报废"},
+			],
 			queryWm: {
 				search: "",
 				material: "",

src/views/wpm_gx/inm_record_form.vue

@@ -44,7 +44,6 @@
 				<el-select
 					v-model="form.batch"
 					filterable
-					style="width: 100%"
 					@change="selectwmChange"
 				>
 					<el-option
@@ -63,13 +62,13 @@
 						>
 					</el-option>
 				</el-select>
+				<scan-dialog ref="scanDialog" @closed="scanClose"> </scan-dialog>
 			</el-form-item>
 			<el-form-item label="批次" v-if="cate == 'do_out'">
 				<el-select
 					v-model="selectBatch"
 					value-key="id"
 					clearable
-					style="width: 100%"
 					@change="selectBatchChange"
 					@clear="selectBatchClear"
 				>
@@ -90,6 +89,7 @@
 						>
 					</el-option>
 				</el-select>
+				<scan-dialog ref="scanDialog" @closed="scanClose"> </scan-dialog>
 			</el-form-item>
 			<el-form-item label="仓库">
 				<el-select
@@ -123,6 +123,7 @@
 	</el-dialog>
 </template>
 <script>
+import scanDialog from "./../template/scan.vue";
 export default {
 	emits: ["success", "closed"],
 	props: {
@@ -131,6 +132,9 @@ export default {
 		mgroupId: { type: String, default: "" },
 		process: { type: String, default: "" },
 	},
+	components: {
+		scanDialog
+	},
 	data() {
 		return {
 			type: "do_in",
@@ -219,6 +223,12 @@ export default {
 					this.batchOptions = res;
 				});
 		},
+		scanClose(data){
+			let that = this;
+			let id = data.split('#')[1];
+			console.log('id',id);
+			that.form.batch = id;
+		},
 		selectMaterialChange() {
 			this.getBatchOptions();
 		},