From 17127c352bf2d834d2dca82882f0329d52eabdf8 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 30 Apr 2026 14:04:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=94=9F=E4=BA=A7=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=B1=95=E7=A4=BA=20wm=5Fin=20=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E7=8A=B6=E6=80=81=E4=B8=8E=E7=BC=BA=E9=99=B7=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

输入物料表新增"库存状态"列；mlog 头部基本信息新增"投入库存缺陷"与"投入库存状态"描述项，仅在有值时显示。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 src/views/wpm_bx/mlog_detail.vue | 14 +++++++++++++-
 src/views/wpm_gx/mlog_detail.vue | 13 +++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue
index 513ffd1d..628dbf0e 100644
--- a/src/views/wpm_bx/mlog_detail.vue
+++ b/src/views/wpm_bx/mlog_detail.vue
@@ -51,7 +51,12 @@
 						<span v-if="nextProcessName!==''">—></span>
 						<el-tag v-if="nextProcessName!==''" type="primary">{{ nextProcessName }}</el-tag>
 					</el-descriptions-item>
-					
+					<el-descriptions-item label="投入库存缺陷" v-if="mlogItem.wm_in_defect_name">
+						<el-tag type="warning">{{ mlogItem.wm_in_defect_name }}</el-tag>
+					</el-descriptions-item>
+					<el-descriptions-item label="投入库存状态" v-if="mlogItem.wm_in_state">
+						<el-tag :type="wmState[mlogItem.wm_in_state]?.type">{{ wmState[mlogItem.wm_in_state]?.text }}</el-tag>
+					</el-descriptions-item>
 				</el-descriptions>
 				<div style="padding: 5px 10px;display: flex;justify-content: end;">
 					<el-button
@@ -224,6 +229,11 @@
 							<el-tag v-if="scope.row.wm_in_defect_name" type="warning">{{ scope.row.wm_in_defect_name }}</el-tag>
 						</template>
 					</el-table-column>
+					<el-table-column label="库存状态" prop="wm_in_state" width="100">
+						<template #default="scope">
+							<el-tag v-if="scope.row.wm_in_state" :type="wmState[scope.row.wm_in_state]?.type">{{ wmState[scope.row.wm_in_state]?.text }}</el-tag>
+						</template>
+					</el-table-column>
 					<el-table-column label="领用数量" prop="count_use">
 					</el-table-column>
 					<el-table-column label="主要批次" prop="is_main_batchin">
@@ -447,6 +457,7 @@ import checkDialog from "./mlogb_check.vue";
 import scheckDialog from "./mlogbw_check.vue";
 import checkTable from "./mlogbw_check_table.vue";
 import print from "./../setting/print/A4.vue";
+import { wmState } from "@/utils/enum.js";
 export default {
 	props: {
 		mlogId: {
@@ -481,6 +492,7 @@ export default {
 	emits: ["success", "closed"],
 	data() {
 		return {
+			wmState,
 			base_code: this.$TOOL.data.get('BASE_INFO').base.base_code,
 			loading: false,
 			//表单数据
diff --git a/src/views/wpm_gx/mlog_detail.vue b/src/views/wpm_gx/mlog_detail.vue
index 72a48d33..b1ffa599 100644
--- a/src/views/wpm_gx/mlog_detail.vue
+++ b/src/views/wpm_gx/mlog_detail.vue
@@ -51,6 +51,12 @@
 					<el-descriptions-item label="结束时间">{{
 						mlogItem.work_end_time
 					}}</el-descriptions-item>
+					<el-descriptions-item label="投入库存缺陷" v-if="mlogItem.wm_in_defect_name">
+						<el-tag type="warning">{{ mlogItem.wm_in_defect_name }}</el-tag>
+					</el-descriptions-item>
+					<el-descriptions-item label="投入库存状态" v-if="mlogItem.wm_in_state">
+						<el-tag :type="wmState[mlogItem.wm_in_state]?.type">{{ wmState[mlogItem.wm_in_state]?.text }}</el-tag>
+					</el-descriptions-item>
 					<el-descriptions-item label="检验表单" v-if="mlogItem.mgroup_name=='黑化'">
 						<el-link :href="mlogItem.test_file" target="_blank" type="primary" :underline="false">{{mlogItem.test_file}}</el-link>
 					</el-descriptions-item>
@@ -119,6 +125,11 @@
 							<el-tag v-if="scope.row.wm_in_defect_name" type="warning">{{ scope.row.wm_in_defect_name }}</el-tag>
 						</template>
 					</el-table-column>
+					<el-table-column label="库存状态" prop="wm_in_state" width="100">
+						<template #default="scope">
+							<el-tag v-if="scope.row.wm_in_state" :type="wmState[scope.row.wm_in_state]?.type">{{ wmState[scope.row.wm_in_state]?.text }}</el-tag>
+						</template>
+					</el-table-column>
 					<el-table-column label="领用数量" prop="count_use">
 					</el-table-column>
 					<el-table-column label="加工前不良" prop="count_pn_jgqbl">
@@ -367,6 +378,7 @@ import saveDialog from "./mlogb_form.vue";
 import checkDialog from "./mlogb_check.vue";
 import print from "./../setting/print/A4.vue";
 import printDialog from "./../template/printmaterial.vue";
+import { wmState } from "@/utils/enum.js";
 export default {
 	props: {
 		mlogId: {
@@ -392,6 +404,7 @@ export default {
 	emits: ["success", "closed"],
 	data() {
 		return {
+			wmState,
 			loading: false,
 			//表单数据
 			form: {},