zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 生产日志详情展示 wm_in 库存状态与缺陷标识 

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

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
caoqianming 2026-04-30 14:04:24 +08:00
parent 2651ca5633
commit 17127c352b
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/wpm_bx/mlog_detail.vue
View File

@ -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,
//表单数据

13
src/views/wpm_gx/mlog_detail.vue
View File

@ -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: {},