From 0fe3e273aeda887fd19ccaea8b1aee917251b5ea Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 4 Dec 2025 15:39:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=BA=9F=E5=93=81=E5=BA=93=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E5=B7=A5=E6=AE=B5=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/index.vue | 41 ++++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/views/wpm_bx/index.vue b/src/views/wpm_bx/index.vue
index 61ba9631..ca1c55f9 100644
--- a/src/views/wpm_bx/index.vue
+++ b/src/views/wpm_bx/index.vue
@@ -11,7 +11,7 @@
 		<el-main id="elMain" class="nopadding">
 			<!-- 日志 -->
 			<mlogs
-				v-if="values == '日志'&&componentsShow"
+				v-if="values == '日志'&&componentsShow&&!isFeiPinku"
 				:mgroupName="mgroupName"
 				:mgroupId="mgroupId"
 				:deptId="mgroupDept"
@@ -23,7 +23,7 @@
 				style="height: 100%"
 			></mlogs>
 			<!-- 隐藏任务 -->
-			<div v-if="values == '日志'&&componentsShow&&mtaskVisible"  class="iconWrap" @click="hiddenMtask">
+			<div v-if="values == '日志'&&componentsShow&&mtaskVisible&&!isFeiPinku"  class="iconWrap" @click="hiddenMtask">
 				<span class="iconSpan">
 					<el-icon>
 						<el-icon-arrow-down />
@@ -31,7 +31,7 @@
 				</span>
 			</div>
 			<!-- 显示任务 -->
-			<div v-if="values == '日志'&&componentsShow&&!mtaskVisible" class="iconWrap iconWrapBottom" @click="showMtask">
+			<div v-if="values == '日志'&&componentsShow&&!mtaskVisible&&!isFeiPinku" class="iconWrap iconWrapBottom" @click="showMtask">
 				<span class="iconSpan iconSpanBottom">
 					<el-icon>
 						<el-icon-arrow-up />
@@ -39,7 +39,7 @@
 				</span>
 			</div>
 			<mtask
-				v-if="values == '日志'&&componentsShow"
+				v-if="values == '日志'&&componentsShow&&!isFeiPinku"
 				:mgroupName="mgroupName"
 				:mgroupId="mgroupId"
 				:deptId="mgroupDept"
@@ -50,6 +50,15 @@
 				id="mtask"
 				style="height: 40%;display: none;"
 			></mtask>
+			<inm v-else-if="values == '库存'&&componentsShow&&isFeiPinku" 
+				:mgroupName="mgroupName"
+				:mgroupId="mgroupId"
+				:deptId="mgroupDept"
+				:process = "mgroupProcess"
+				:processType = "mgroupProcessType"
+				:mgroup_code="mgroup_code"
+				:mgroupMtype = "mgroupMtype"
+			></inm>
 			<!-- 交接记录 -->
 			<handover
 				v-else-if="values == '交接记录'&&componentsShow"
@@ -62,7 +71,7 @@
 				:mgroupMtype = "mgroupMtype"
 			></handover>
 			<!-- 未完成 -->
-			<inmIn v-else-if="values == '未完成'&&componentsShow" 
+			<inmIn v-else-if="values == '未完成'&&componentsShow&&!isFeiPinku" 
 				:mgroupName="mgroupName"
 				:mgroupId="mgroupId"
 				:deptId="mgroupDept"
@@ -72,7 +81,7 @@
 				:mgroupMtype = "mgroupMtype"
 			></inmIn>
 			<!-- 已完成 -->
-			<inmOut v-else-if="values == '已完成'&&componentsShow" 
+			<inmOut v-else-if="values == '已完成'&&componentsShow&&!isFeiPinku" 
 				:mgroupName="mgroupName"
 				:mgroupId="mgroupId"
 				:deptId="mgroupDept"
@@ -81,7 +90,7 @@
 				:mgroup_code="mgroup_code"
 				:mgroupMtype = "mgroupMtype"
 			></inmOut>
-			<record v-else-if="values == '出入库记录'" 
+			<record v-else-if="values == '出入库记录'&&componentsShow&&!isFeiPinku" 
 				:mgroupId="mgroupId"
 				:deptId = "mgroupDept"
 				:mgroupName="mgroupName"
@@ -92,6 +101,7 @@
 	</el-container>
 </template>
 <script>
+import inm from "../inm/inmScrap.vue";
 import inmIn from "./inmIn.vue";
 import inmOut from "./inmOut.vue";
 import mlogs from "./mlogs.vue";
@@ -100,13 +110,13 @@ import record from "./../wpm_gx/inmrecord.vue";
 import handover from "./handover.vue";
 export default {
 	name: "bx",
-	components: { inmIn, mlogs, mtask, handover,inmOut,record },
+	components: { inm,inmIn, mlogs, mtask, handover,inmOut,record },
 	data() {
 		return {
 			mgroups:[],
 			tableHieght: 200,
 			selectedIndex:0,
-			options: ["日志", "交接记录","未完成", "已完成"],
+			options: [ "交接记录"],
 			values: "日志",
 			mgroupName: "",
 			mgroupId: "",
@@ -116,7 +126,8 @@ export default {
 			mgroupProcess: '',
 			mgroupProcessType: '',
 			componentsShow:false,
-			mtaskVisible:false
+			mtaskVisible:false,
+			isFeiPinku:false,
 		};
 	},
 	mounted() {
@@ -126,6 +137,15 @@ export default {
 		let paths = this.$route.path;
 		let arr = paths.split("/");
 		this.mgroup_code = arr[2];
+		if(this.mgroup_code=='fpk'){
+			this.isFeiPinku = true;
+			this.options.unshift('库存');
+			this.values = '库存';
+		}else{
+			this.options.unshift('日志');
+			this.options.push('未完成');
+			this.options.push('已完成');
+		}
 		if(this.mgroup_code=='chengpingneiwaichujian'||this.mgroup_code=='guangzhuichengpjianc'||
 		this.mgroup_code=='chengpneizhifujian'||this.mgroup_code=='chengpingxinengjiance'||
 		this.mgroup_code=='chenpjianchicunjiance'||this.mgroup_code=='chengpwaiguanfujianyi'||
@@ -151,6 +171,7 @@ export default {
 				that.mgroupDept = res[0].belong_dept;
 				that.mgroupMtype = res[0].mtype;
 				that.componentsShow = true;
+				console.log('that.mgroupName',that.mgroupName);
 			});
 		},
 		showMtask(){