From 5adfe9cd36a4739c9db559fadafd3bead8398bc3 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 27 Feb 2025 10:31:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E4=B8=AD=E4=B8=8D=E6=98=BE=E7=A4=BA=E8=BE=85?=
 =?UTF-8?q?=E5=8A=A9=E6=9D=90=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mtm/materials_form_gx.vue |  6 +++++-
 src/views/mtm/materials_gx.vue      | 16 +++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/views/mtm/materials_form_gx.vue b/src/views/mtm/materials_form_gx.vue
index debcd0ed..81fdf5a7 100644
--- a/src/views/mtm/materials_form_gx.vue
+++ b/src/views/mtm/materials_form_gx.vue
@@ -192,7 +192,7 @@ export default {
 				{ id: 10, name: "成品" },
 				{ id: 20, name: "半成品" },
 				{ id: 30, name: "主要原料" },
-				{ id: 40, name: "辅助材料" },
+				// { id: 40, name: "辅助材料" },
 			],
 			handle_user: [],
 			selectionFilters: [],
@@ -200,9 +200,13 @@ export default {
 			setFiltersVisible: false,
 			processOptions: [],
 			componentList: [{ id: "", count: 1 }],
+			project_code : this.$TOOL.data.get("BASE_INFO").base.base_code,
 		};
 	},
 	mounted() {
+		if(this.project_code !== 'bxerp'){
+			this.options.push({ name: "辅助材料", id: 40 });
+		}
 		this.getProcessOptions();
 	},
 	methods: {
diff --git a/src/views/mtm/materials_gx.vue b/src/views/mtm/materials_gx.vue
index a79baa52..ee4b0cfa 100644
--- a/src/views/mtm/materials_gx.vue
+++ b/src/views/mtm/materials_gx.vue
@@ -196,13 +196,14 @@ export default {
 	},
 	data() {
 		return {
+			project_code : this.$TOOL.data.get("BASE_INFO").base.base_code,
 			materialTemplate: " /media/default/template/material.xlsx",
 			dialog: {
 				save: false,
 			},
 			apiObj: null,
 			query: { type: 10, is_hidden: false },
-			activeName: "主要原料",
+			activeName: 10,
 			selection: [],
 			state_: {
 				10: "完好",
@@ -214,30 +215,31 @@ export default {
 				{ label: "成品", name: 10 },
 				{ label: "半成品", name: 20 },
 				{ label: "主要原料", name: 30 },
-				{ label: "辅助材料", name: 40 },
+				// { label: "辅助材料", name: 40 },//光芯显示，玻纤不显示
 			],
 			typeOptions: {
 				10: "成品",
 				20: "半成品",
 				30: "主要原料",
-				40: "辅助材料",
+				// 40: "辅助材料",//光芯显示，玻纤不显示
 			},
-			project_code:"",
 			materialId: "",
 			materialName: "",
 			showHidden: false,
 		};
 	},
 	mounted() {
-		// console.log("materialType", this.materialType);
+		this.query.type = 10;
 		this.apiObj = this.$API.mtm.material.list;
 		this.$refs.table.queryData(this.query);
 		this.materialTemplate = this.materialTemplate+"?t=" + new Date().getTime();
-		this.project_code = this.$TOOL.data.get("BASE_INFO").base.base_code;
+		if(this.project_code !== 'bxerp'){
+			this.tabOptions.push({ label: "辅助材料", name: 40 });
+			this.typeOptions[40] = "辅助材料";
+		}
 	},
 	methods: {
 		rowClick(row) {
-			// console.log("rowClick", row);
 			this.materialId = row.id;
 			this.materialName = row.full_name;
 			this.$emit("choseChange", row.id);