From 533d1e4ae9ffeafdd9ff65ddcefd7bd005f7d78c Mon Sep 17 00:00:00 2001
From: ZN <zhang_12370@163.com>
Date: 星期三, 01 四月 2026 15:13:33 +0800
Subject: [PATCH] feat(生产管理): 增强BOM信息展示并调整工序配置
---
src/views/productionManagement/productionProcess/index.vue | 14 +++++++-------
src/views/productionManagement/processRoute/index.vue | 5 +++++
src/views/productionManagement/processRoute/New.vue | 2 +-
src/views/productionManagement/processRoute/processRouteItem/index.vue | 9 +++++++++
src/views/productionManagement/processRoute/Edit.vue | 2 +-
src/views/productionManagement/productStructure/index.vue | 12 ++++++++++++
src/views/productionManagement/productionProcess/New.vue | 8 ++++++--
7 files changed, 41 insertions(+), 11 deletions(-)
diff --git a/src/views/productionManagement/processRoute/Edit.vue b/src/views/productionManagement/processRoute/Edit.vue
index 0c0fe0f..ec93983 100644
--- a/src/views/productionManagement/processRoute/Edit.vue
+++ b/src/views/productionManagement/processRoute/Edit.vue
@@ -46,7 +46,7 @@
<el-option
v-for="item in bomOptions"
:key="item.id"
- :label="item.bomNo || `BOM-${item.id}`"
+ :label="(item.bomNo || '') + (item.bomName ? ' - ' + item.bomName : '') || `BOM-${item.id}`"
:value="item.id"
/>
</el-select>
diff --git a/src/views/productionManagement/processRoute/New.vue b/src/views/productionManagement/processRoute/New.vue
index 62c6873..a5e1648 100644
--- a/src/views/productionManagement/processRoute/New.vue
+++ b/src/views/productionManagement/processRoute/New.vue
@@ -46,7 +46,7 @@
<el-option
v-for="item in bomOptions"
:key="item.id"
- :label="item.bomNo || `BOM-${item.id}`"
+ :label="(item.bomNo || '') + (item.bomName ? ' - ' + item.bomName : '') || `BOM-${item.id}`"
:value="item.id"
/>
</el-select>
diff --git a/src/views/productionManagement/processRoute/index.vue b/src/views/productionManagement/processRoute/index.vue
index 41103f9..ead2984 100644
--- a/src/views/productionManagement/processRoute/index.vue
+++ b/src/views/productionManagement/processRoute/index.vue
@@ -84,6 +84,10 @@
prop: "bomNo",
},
{
+ label: "BOM鍚嶇О",
+ prop: "bomName",
+ },
+ {
label: "鎻忚堪",
prop: "description",
},
@@ -175,6 +179,7 @@
productName: row.productName || '',
model: row.model || '',
bomNo: row.bomNo || '',
+ bomName: row.bomName || '',
description: row.description || '',
type: 'route',
}
diff --git a/src/views/productionManagement/processRoute/processRouteItem/index.vue b/src/views/productionManagement/processRoute/processRouteItem/index.vue
index c1c490c..51271b2 100644
--- a/src/views/productionManagement/processRoute/processRouteItem/index.vue
+++ b/src/views/productionManagement/processRoute/processRouteItem/index.vue
@@ -37,6 +37,14 @@
<span class="info-value">{{ routeInfo.bomNo || '-' }}</span>
</div>
</div>
+ <div class="info-item">
+ <div class="info-label-wrapper">
+ <span class="info-label">BOM鍚嶇О</span>
+ </div>
+ <div class="info-value-wrapper">
+ <span class="info-value">{{ routeInfo.bomName || '-' }}</span>
+ </div>
+ </div>
<div class="info-item full-width" v-if="routeInfo.description">
<div class="info-label-wrapper">
<span class="info-label">鎻忚堪</span>
@@ -329,6 +337,7 @@
productName: route.query.productName || '',
model: route.query.model || '',
bomNo: route.query.bomNo || '',
+ bomName: route.query.bomName || '',
description: route.query.description || ''
};
};
diff --git a/src/views/productionManagement/productStructure/index.vue b/src/views/productionManagement/productStructure/index.vue
index 2c109cd..2ed2930 100644
--- a/src/views/productionManagement/productStructure/index.vue
+++ b/src/views/productionManagement/productStructure/index.vue
@@ -21,6 +21,9 @@
<el-dialog v-model="dialogVisible" :title="operationType === 'add' ? '鏂板BOM' : '缂栬緫BOM'" width="600px"
@close="closeDialog">
<el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
+ <el-form-item label="BOM鍚嶇О" prop="bomName">
+ <el-input v-model="form.bomName" placeholder="璇疯緭鍏OM鍚嶇О" clearable />
+ </el-form-item>
<el-form-item label="浜у搧鍚嶇О" prop="productModelId">
<el-button type="primary" @click="showProductSelectDialog = true">
{{ form.productName || '閫夋嫨浜у搧' }}
@@ -70,6 +73,11 @@
dataType: 'slot',
slot: "detail",
minWidth: 140
+ },
+ {
+ label: "BOM鍚嶇О",
+ prop: "bomName",
+ minWidth: 160
},
{
label: "浜у搧鍚嶇О",
@@ -151,6 +159,7 @@
const data = reactive({
form: {
id: undefined,
+ bomName: "",
productName: "",
productModelName: "",
productModelId: "",
@@ -158,6 +167,7 @@
version: ""
},
rules: {
+ bomName: [{ required: true, message: "璇疯緭鍏OM鍚嶇О", trigger: "blur" }],
productModelId: [{ required: true, message: "璇烽�夋嫨浜у搧", trigger: "change" }],
version: [{ required: true, message: "璇疯緭鍏ョ増鏈彿", trigger: "blur" }]
}
@@ -202,6 +212,7 @@
operationType.value = 'add';
Object.assign(form.value, {
id: undefined,
+ bomName: "",
productName: "",
productModelName: "",
productModelId: "",
@@ -216,6 +227,7 @@
operationType.value = 'edit';
Object.assign(form.value, {
id: row.id,
+ bomName: row.bomName || "",
productName: row.productName || "",
productModelName: row.productModelName || "",
productModelId: row.productModelId || "",
diff --git a/src/views/productionManagement/productionProcess/New.vue b/src/views/productionManagement/productionProcess/New.vue
index a5f00aa..ded03d9 100644
--- a/src/views/productionManagement/productionProcess/New.vue
+++ b/src/views/productionManagement/productionProcess/New.vue
@@ -45,9 +45,12 @@
<template #append>鍏�</template>
</el-input>
</el-form-item>
- <el-form-item label="鏄惁璐ㄦ" prop="isQuality">
- <el-switch v-model="formState.isQuality" :active-value="true" inactive-value="false"/>
+ <el-form-item label="鏄惁鎶ュ伐" prop="isReportWork">
+ <el-switch v-model="formState.isReportWork" :active-value="true" :inactive-value="false"/>
</el-form-item>
+ <!-- <el-form-item label="鏄惁璐ㄦ" prop="isQuality">
+ <el-switch v-model="formState.isQuality" :active-value="true" inactive-value="false"/>
+ </el-form-item> -->
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formState.remark" type="textarea" />
</el-form-item>
@@ -82,6 +85,7 @@
remark: '',
salaryQuota: '',
isQuality: false,
+ isReportWork: false,
});
const isShow = computed({
diff --git a/src/views/productionManagement/productionProcess/index.vue b/src/views/productionManagement/productionProcess/index.vue
index ffe13fc..9204c32 100644
--- a/src/views/productionManagement/productionProcess/index.vue
+++ b/src/views/productionManagement/productionProcess/index.vue
@@ -106,13 +106,13 @@
label: "宸ヨ祫瀹氶",
prop: "salaryQuota",
},
- {
- label: "鏄惁璐ㄦ",
- prop: "isQuality",
- formatData: (params) => {
- return params ? "鏄�" : "鍚�";
- },
- },
+ // {
+ // label: "鏄惁鎶ュ伐",
+ // prop: "isReportWork",
+ // formatData: (params) => {
+ // return params ? "鏄�" : "鍚�";
+ // },
+ // },
{
label: "澶囨敞",
prop: "remark",
--
Gitblit v1.9.3