From 2cdbad409e82d4354e4eca5cffa65c6bef7a4d20 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 16 三月 2026 13:36:37 +0800
Subject: [PATCH] bom添加产品编码
---
src/views/productionManagement/productStructure/Detail/index.vue | 3 +++
src/views/productionManagement/productionProcess/index.vue | 6 ++----
src/views/productionManagement/productStructure/index.vue | 6 ++++++
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/views/productionManagement/productStructure/Detail/index.vue b/src/views/productionManagement/productStructure/Detail/index.vue
index 59700af..7b2c7e5 100644
--- a/src/views/productionManagement/productStructure/Detail/index.vue
+++ b/src/views/productionManagement/productStructure/Detail/index.vue
@@ -141,6 +141,8 @@
</el-table-column>
<el-table-column label="BOM缂栧彿"
prop="bomNo" />
+ <el-table-column label="浜у搧缂栫爜"
+ prop="productCode" />
<el-table-column label="浜у搧鍚嶇О"
prop="productName" />
<el-table-column label="瑙勬牸鍨嬪彿"
@@ -192,6 +194,7 @@
// 浠庤矾鐢卞弬鏁拌幏鍙栦骇鍝佷俊鎭�
const routeBomNo = computed(() => route.query.bomNo || "");
+ const routeProductCode = computed(() => route.query.productCode || "");
const routeProductName = computed(() => route.query.productName || "");
const routeProductModelName = computed(
() => route.query.productModelName || ""
diff --git a/src/views/productionManagement/productStructure/index.vue b/src/views/productionManagement/productStructure/index.vue
index f17221c..96c0b8d 100644
--- a/src/views/productionManagement/productStructure/index.vue
+++ b/src/views/productionManagement/productStructure/index.vue
@@ -132,6 +132,12 @@
minWidth: 140,
},
{
+ label: "浜у搧缂栫爜",
+ prop: "productCode",
+
+ minWidth: 160,
+ },
+ {
label: "浜у搧鍚嶇О",
prop: "productName",
diff --git a/src/views/productionManagement/productionProcess/index.vue b/src/views/productionManagement/productionProcess/index.vue
index 37bb89c..af6bbfa 100644
--- a/src/views/productionManagement/productionProcess/index.vue
+++ b/src/views/productionManagement/productionProcess/index.vue
@@ -377,13 +377,11 @@
name: [{ required: true, message: "璇疯緭鍏ュ伐搴忓悕绉�", trigger: "blur" }],
salaryQuota: [
{
- required: true,
+ required: false,
message: "璇疯緭鍏ュ伐璧勫畾棰�",
trigger: "blur",
validator: (rule, value, callback) => {
- if (value === null || value === undefined || value === "") {
- callback(new Error("璇疯緭鍏ュ伐璧勫畾棰�"));
- } else if (isNaN(value) || value < 0) {
+ if (isNaN(value) || value < 0) {
callback(new Error("宸ヨ祫瀹氶蹇呴』鏄潪璐熸暟瀛�"));
} else {
callback();
--
Gitblit v1.9.3