From 03f65b7129ee81e573a2cfcefdd8e0636504662e Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 19 Jun 2025 15:44:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=89=A9=E6=96=99=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=94=B9=E5=8A=A8=EF=BC=88=E8=BE=85=E6=96=99?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BD=8D=E5=8F=B7=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=BF=9B=E5=85=A5=E8=BD=A6=E9=97=B4=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mtm/materials_form_gx.vue | 16 ++++++++++++++++
 src/views/mtm/materials_gx.vue      |  2 ++
 2 files changed, 18 insertions(+)

diff --git a/src/views/mtm/materials_form_gx.vue b/src/views/mtm/materials_form_gx.vue
index 9990e240..a519a763 100644
--- a/src/views/mtm/materials_form_gx.vue
+++ b/src/views/mtm/materials_form_gx.vue
@@ -113,6 +113,13 @@
 							</el-form-item>
 						</el-col>
 						<!-- 光芯 -->
+						<el-col :md="12" :sm="24" v-if="form.type == 40">
+							<el-form-item label="仓库位号">
+								<el-input
+									v-model="form.bin_number_main"
+								/>
+							</el-form-item>
+						</el-col>
 						<el-col :md="12" :sm="24" v-if="form.type !== 20">
 							<el-form-item label="物料单价">
 								<el-input-number
@@ -127,6 +134,11 @@
 								<el-switch v-model="form.is_hidden" />
 							</el-form-item>
 						</el-col>
+						<el-col :md="12" :sm="24" v-if="form.type == 40">
+							<el-form-item label="是否进入车间库存">
+								<el-switch v-model="form.into_wm" />
+							</el-form-item>
+						</el-col>
 						<el-col :md="12" :sm="24" v-if="form.type==10||form.type==20">
 							<el-form-item label="产品图纸">
 								<sc-upload v-model="form.photo" :modelValue="form.photo" title="产品图纸"></sc-upload>
@@ -252,6 +264,9 @@ export default {
 		},
 		typeChange(val) {
 			this.getMaterial(val);
+			if(this.form.type == 40) {
+				this.form.into_wm = false;
+			}
 		},
 		//提交
 		submit() {
@@ -300,6 +315,7 @@ export default {
 				that.form.is_hidden = data.is_hidden;
 				that.form.unit_price = data.unit_price;
 				that.form.photo = data.photo;
+				that.form.into_wm = data.into_wm;
 				that.form.photo_number = data.photo_number;
 			}else{
 				Object.assign(this.form, data);
diff --git a/src/views/mtm/materials_gx.vue b/src/views/mtm/materials_gx.vue
index ee4b0cfa..b707e949 100644
--- a/src/views/mtm/materials_gx.vue
+++ b/src/views/mtm/materials_gx.vue
@@ -107,6 +107,8 @@
 							width="80"
 						>
 						</el-table-column>
+						<el-table-column label="仓库位号" prop="bin_number_main" v-if="project_code=='gx'">
+						</el-table-column>
 						<el-table-column label="追踪方式" prop="tracking" v-if="project_code=='bxerp'">
 							<template #default="scope">
 								<el-tag v-if="scope.row.tracking == 10">批次</el-tag>