From f126d3c90d3f146b6d578161154a1f4bef0f483d Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 21 Apr 2025 11:28:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=87=BA=E5=85=A5=E5=BA=93i=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=B7=BB=E5=8A=A0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inm/mioitem.vue      |  4 +-
 src/views/inm/mioitem_form.vue | 70 ++++++++++------------------------
 2 files changed, 21 insertions(+), 53 deletions(-)

diff --git a/src/views/inm/mioitem.vue b/src/views/inm/mioitem.vue
index 82f5dd2f..699d35e3 100644
--- a/src/views/inm/mioitem.vue
+++ b/src/views/inm/mioitem.vue
@@ -51,9 +51,6 @@
 							>{{ mioObj.customer_name }}</el-descriptions-item
 						>
 					</el-descriptions>
-					<!-- <el-button type="primary" @click="mioSubmit" v-auth="'mio.submit'" v-if="mioObj.state == 10">
-                    提交
-                </el-button> -->
 				</el-card>
 			</div>
 			<div style="height: 8px"></div>
@@ -213,6 +210,7 @@
 		v-if="dialog.save"
 		ref="saveDialog"
 		:mioId="mioId"
+		:mgroup="mioObj.mgroup"
 		:belongDeptId="belongDeptId"
 		:belongDeptName="mioObj.belong_dept_name"
 		:mioObj="mioObj"
diff --git a/src/views/inm/mioitem_form.vue b/src/views/inm/mioitem_form.vue
index 14b818ea..1b6ee82b 100644
--- a/src/views/inm/mioitem_form.vue
+++ b/src/views/inm/mioitem_form.vue
@@ -13,7 +13,7 @@
 			label-width="120px"
 		>
 			<el-row>
-				<el-col :md="12" :sm="24">
+				<el-col>
 					<el-form-item label="物料" prop="material">
 						<xtSelect
 							:apiObj="apiObj"
@@ -26,38 +26,18 @@
 						>
 							<el-table-column label="物料" prop="full_name"></el-table-column>
 						</xtSelect>
-						<!-- <el-select
-							v-model="selectMaterial"
-							value-key="id"
-							clearable
-							filterable
-							style="width: 100%"
-							@change="selectMaterialChange"
-						>
-							<el-option
-								v-for="item in materialOptions"
-								:key="item.id"
-								:label="item.full_name"
-								:value="item"
-							>
-								<span style="float: left">{{ item.full_name }}</span>
-								<span
-									style="
-										float: right;
-										color: '#E6A23C';
-										font-size: 13px;
-									"
-									v-if="item.is_hidden"
-									>隐</span
-								>
-							</el-option>
-						</el-select> -->
 					</el-form-item>
 				</el-col>
-				<el-col :md="12" :sm="24">
+				<el-col>
 					<el-form-item label="批次号" prop="batch">
-						<!-- <el-input v-model="form.batch" placeholder="手动输入批次号" :disabled="inputBatchDisable" /> -->
+						<el-input 
+							v-if="form.type == 'pur_in'||form.type == 'other_in'"
+							v-model="form.batch" 
+							placeholder="手动输入批次号" 
+							:disabled="inputBatchDisable" 
+						/>
 						<el-select
+							v-else
 							v-model="form.batch"
 							filterable
 							allow-create
@@ -85,7 +65,7 @@
 						</el-select>
 					</el-form-item>
 				</el-col>
-				<el-col :md="12" :sm="24">
+				<el-col v-if="form.type == 'pur_in'||form.type == 'other_in'||form.type == 'do_out'||form.type=='sale_out'">
 					<el-form-item label="仓库已有批次">
 						<el-select
 							v-model="selectBatch"
@@ -222,10 +202,11 @@ const defaultForm = {
 export default {
 	emits: ["success", "closed"],
 	props: {
-		cate: { type: String, default: "" },
-		mioId: { type: String, default: "" },
-		belongDeptName: { type: String, default: "" },
+		cate: { type: String, default: null },
+		mioId: { type: String, default: null },
+		belongDeptName: { type: String, default: null },
 		belongDeptId: { type: String, default: null },
+		mgroup: { type: String, default: null },
 		mioObj: { type: Object },
 	},
 	data() {
@@ -311,21 +292,11 @@ export default {
 		},
 		//获取车间物料批次号
 		getWBatchs() {
-			//
-			if (
-				this.belongDeptId != null &&
-				this.belongDeptId != undefined &&
-				this.belongDeptId != ""
-			) {
-				this.$API.wpm.wmaterial.list
-					.req({
-						belong_dept: this.belongDeptId,
-						material: this.form.material,
-						page: 0,
-					})
-					.then((res) => {
-						this.wbatchOptions = res;
-					});
+			let that = this;
+			if (this.mgroup != null) {
+				this.$API.wpm.wmaterial.list.req({mgroup: this.mgroup,material: this.form.material,state:10,page: 0}).then((res) => {
+					this.wbatchOptions = res;
+				});
 			}
 		},
 		getMaterialOptions() {
@@ -435,7 +406,6 @@ export default {
 					that.form.wm = item.id;
 				}
 			})
-			
 		},
 		selectMaterialChange() {
 			var that = this;
@@ -465,7 +435,7 @@ export default {
 		selectBatchChange(item) {
 			this.form.batch = item.batch;
 			this.form.mb = item.id;
-			this.form.count = item.count;
+			this.form.count = 0;
 			this.form.warehouse = item.warehouse;
 			this.warehouseDisable = true;
 			this.inputBatchDisable = true;