From 3b28a3183baf6c4d864405dcfd5d8e7a52a3f046 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 05 二月 2026 17:51:37 +0800
Subject: [PATCH] 生产管控相关页面增加图纸编号
---
src/views/productionManagement/processRoute/index.vue | 5 ++
src/views/basicData/product/ProductSelectDialog.vue | 1
src/views/productionManagement/workOrder/index.vue | 4 ++
src/views/productionManagement/processRoute/processRouteItem/index.vue | 13 ++++++
src/views/productionManagement/productionCosting/index.vue | 5 ++
src/views/productionManagement/productStructure/StructureEdit.vue | 3 +
src/views/productionManagement/productionReporting/Input.vue | 4 ++
src/views/productionManagement/productStructure/index.vue | 6 +++
src/views/productionManagement/processRoute/ItemsForm.vue | 1
src/views/productionManagement/productStructure/Detail/index.vue | 9 ++++
src/views/productionManagement/productionOrder/New.vue | 10 +++++
src/views/productionManagement/productionReporting/index.vue | 5 ++
src/views/productionManagement/productionOrder/index.vue | 7 +++
13 files changed, 73 insertions(+), 0 deletions(-)
diff --git a/src/views/basicData/product/ProductSelectDialog.vue b/src/views/basicData/product/ProductSelectDialog.vue
index 70dbb16..69611a1 100644
--- a/src/views/basicData/product/ProductSelectDialog.vue
+++ b/src/views/basicData/product/ProductSelectDialog.vue
@@ -21,6 +21,7 @@
<el-table-column type="selection" width="55" />
<el-table-column type="index" label="搴忓彿" width="60" />
<el-table-column prop="productName" label="浜у搧澶х被" min-width="160" />
+ <el-table-column prop="drawingNumber" label="鍥剧焊缂栧彿" min-width="160" />
<el-table-column prop="model" label="鍨嬪彿鍚嶇О" min-width="200" />
<el-table-column prop="unit" label="鍗曚綅" min-width="160" />
</el-table>
diff --git a/src/views/productionManagement/processRoute/ItemsForm.vue b/src/views/productionManagement/processRoute/ItemsForm.vue
index ed6e499..9be0b44 100644
--- a/src/views/productionManagement/processRoute/ItemsForm.vue
+++ b/src/views/productionManagement/processRoute/ItemsForm.vue
@@ -190,6 +190,7 @@
const tableColumn = ref([
{ label: "浜у搧鍚嶇О", prop: "productName", width: 180 },
+ { label: "浜у搧鍥剧焊缂栧彿", prop: "drawingNumber", width: 150 },
{ label: "瑙勬牸鍚嶇О", prop: "model", width: 150 },
{ label: "鍗曚綅", prop: "unit", width: 80 },
{ label: "宸ュ簭鍚嶇О", prop: "processId", width: 180 },
diff --git a/src/views/productionManagement/processRoute/index.vue b/src/views/productionManagement/processRoute/index.vue
index 41103f9..44592d6 100644
--- a/src/views/productionManagement/processRoute/index.vue
+++ b/src/views/productionManagement/processRoute/index.vue
@@ -76,6 +76,10 @@
prop: "productName",
},
{
+ label: "浜у搧鍥剧焊缂栧彿",
+ prop: "drawingNumber",
+ },
+ {
label: "瑙勬牸鍚嶇О",
prop: "model",
},
@@ -172,6 +176,7 @@
query: {
id: row.id,
processRouteCode: row.processRouteCode || '',
+ drawingNumber: row.drawingNumber || "",
productName: row.productName || '',
model: row.model || '',
bomNo: row.bomNo || '',
diff --git a/src/views/productionManagement/processRoute/processRouteItem/index.vue b/src/views/productionManagement/processRoute/processRouteItem/index.vue
index 3aecfa0..f61afe9 100644
--- a/src/views/productionManagement/processRoute/processRouteItem/index.vue
+++ b/src/views/productionManagement/processRoute/processRouteItem/index.vue
@@ -23,6 +23,14 @@
</div>
<div class="info-item">
<div class="info-label-wrapper">
+ <span class="info-label">浜у搧鍥剧焊缂栧彿</span>
+ </div>
+ <div class="info-value-wrapper">
+ <span class="info-value">{{ routeInfo.drawingNumber || '-' }}</span>
+ </div>
+ </div>
+ <div class="info-item">
+ <div class="info-label-wrapper">
<span class="info-label">瑙勬牸鍚嶇О</span>
</div>
<div class="info-value-wrapper">
@@ -80,6 +88,7 @@
</template>
</el-table-column>
<el-table-column label="浜у搧鍚嶇О" prop="productName" min-width="160" />
+ <el-table-column label="鍥剧焊缂栧彿" prop="drawingNumber" min-width="160" />
<el-table-column label="瑙勬牸鍚嶇О" prop="model" min-width="140" />
<el-table-column label="鍗曚綅" prop="unit" width="100" />
<el-table-column label="鏄惁璐ㄦ" prop="isQuality" width="100">
@@ -131,6 +140,7 @@
<div class="card-content">
<div v-if="item.productName" class="product-info">
<div class="product-name">{{ item.productName }}</div>
+ <div class="product-model">{{ item.drawingNumber || '-' }}</div>
<div v-if="item.model" class="product-model">
{{ item.model }}
<!-- <span v-if="item.unit" class="product-unit">{{ item.unit }}</span> -->
@@ -245,6 +255,7 @@
const routeInfo = ref({
processRouteCode: '',
productName: '',
+ drawingNumber: '',
model: '',
bomNo: '',
description: ''
@@ -299,6 +310,7 @@
.then(res => {
tableData.value = res.data || [];
tableLoading.value = false;
+ routeInfo.value = tableData.value[0] || {}
// 鍒楄〃鍔犺浇瀹屾垚鍚庡垵濮嬪寲鎷栨嫿鎺掑簭
nextTick(() => {
initSortable();
@@ -327,6 +339,7 @@
routeInfo.value = {
processRouteCode: route.query.processRouteCode || '',
productName: route.query.productName || '',
+ drawingNumber: route.query.drawingNumber || '',
model: route.query.model || '',
bomNo: route.query.bomNo || '',
description: route.query.description || ''
diff --git a/src/views/productionManagement/productStructure/Detail/index.vue b/src/views/productionManagement/productStructure/Detail/index.vue
index 6734830..6d77d9b 100644
--- a/src/views/productionManagement/productStructure/Detail/index.vue
+++ b/src/views/productionManagement/productStructure/Detail/index.vue
@@ -34,6 +34,8 @@
style="width: 100%">
<el-table-column prop="productName"
label="浜у搧" />
+ <el-table-column prop="drawingNumber"
+ label="浜у搧鍥剧焊缂栧彿" />
<el-table-column prop="model"
label="瑙勬牸">
<template #default="{ row, $index }">
@@ -143,6 +145,8 @@
prop="bomNo" />
<el-table-column label="浜у搧鍚嶇О"
prop="productName" />
+ <el-table-column label="浜у搧鍥剧焊缂栧彿"
+ prop="drawingNumber" />
<el-table-column label="瑙勬牸鍨嬪彿"
prop="model" />
</el-table>
@@ -192,6 +196,7 @@
// 浠庤矾鐢卞弬鏁拌幏鍙栦骇鍝佷俊鎭�
const routeBomNo = computed(() => route.query.bomNo || "");
const routeProductName = computed(() => route.query.productName || "");
+ const routeDrawingNumber = computed(() => route.query.drawingNumber || "");
const routeProductModelName = computed(
() => route.query.productModelName || ""
);
@@ -215,6 +220,7 @@
const tableData = reactive([
{
productName: "",
+ drawingNumber: "",
model: "",
bomNo: "",
},
@@ -293,6 +299,7 @@
dataValue.dataList.map(item => {
if (item.tempId === dataValue.currentRowName) {
item.productName = productData.productName;
+ item.drawingNumber = productData.drawingNumber || "";
item.model = productData.model;
item.productModelId = productData.id;
item.unit = productData.unit || "";
@@ -305,6 +312,7 @@
const childItem = (item: any, tempId: any, productData: any) => {
if (item.tempId === tempId) {
item.productName = productData.productName;
+ item.drawingNumber = productData.drawingNumber || "";
item.model = productData.model;
item.productModelId = productData.id;
item.unit = productData.unit || "";
@@ -506,6 +514,7 @@
onMounted(async () => {
// 浠庤矾鐢卞弬鏁板洖鏄炬暟鎹�
tableData[0].productName = routeProductName.value as string;
+ tableData[0].drawingNumber = routeDrawingNumber.value as string;
tableData[0].model = routeProductModelName.value as string;
tableData[0].bomNo = routeBomNo.value as string;
diff --git a/src/views/productionManagement/productStructure/StructureEdit.vue b/src/views/productionManagement/productStructure/StructureEdit.vue
index 4d07f5d..c73a0bc 100644
--- a/src/views/productionManagement/productStructure/StructureEdit.vue
+++ b/src/views/productionManagement/productStructure/StructureEdit.vue
@@ -35,6 +35,9 @@
<el-table-column prop="productName"
label="浜у搧"
width="150" />
+ <el-table-column prop="drawingNumber"
+ label="鍥剧焊缂栧彿"
+ width="150" />
<el-table-column prop="model"
label="瑙勬牸"
width="150">
diff --git a/src/views/productionManagement/productStructure/index.vue b/src/views/productionManagement/productStructure/index.vue
index 1ae3f77..5d4dbe1 100644
--- a/src/views/productionManagement/productStructure/index.vue
+++ b/src/views/productionManagement/productStructure/index.vue
@@ -78,6 +78,11 @@
minWidth: 160
},
{
+ label: "浜у搧鍥剧焊缂栧彿",
+ prop: "drawingNumber",
+ minWidth: 160
+ },
+ {
label: "瑙勬牸鍨嬪彿",
prop: "productModelName",
minWidth: 140
@@ -420,6 +425,7 @@
path: '/productionManagement/productStructureDetail',
query: {
id: row.id,
+ drawingNumber: row.drawingNumber || "",
bomNo: row.bomNo || '',
productName: row.productName || '',
productModelName: row.productModelName || ''
diff --git a/src/views/productionManagement/productionCosting/index.vue b/src/views/productionManagement/productionCosting/index.vue
index d081ac7..bc78c38 100644
--- a/src/views/productionManagement/productionCosting/index.vue
+++ b/src/views/productionManagement/productionCosting/index.vue
@@ -97,6 +97,11 @@
prop: "productName",
minWidth: 100,
},
+ {
+ label: "浜у搧鍥剧焊缂栧彿",
+ prop: "drawingNumber",
+ minWidth: 100,
+ },
{
label: "瑙勬牸鍨嬪彿",
prop: "productModelName",
diff --git a/src/views/productionManagement/productionOrder/New.vue b/src/views/productionManagement/productionOrder/New.vue
index c9c478b..baa2578 100644
--- a/src/views/productionManagement/productionOrder/New.vue
+++ b/src/views/productionManagement/productionOrder/New.vue
@@ -24,6 +24,13 @@
</el-form-item>
<el-form-item
+ label="鍥剧焊缂栧彿"
+ prop="drawingNumber"
+ >
+ <el-input v-model="formState.drawingNumber" disabled />
+ </el-form-item>
+
+ <el-form-item
label="瑙勬牸"
prop="productModelName"
>
@@ -101,6 +108,7 @@
productName: "",
productModelName: "",
unit: "",
+ drawingNumber: "",
quantity: 0,
});
@@ -124,6 +132,7 @@
productModelId: undefined,
routeId: undefined,
productName: "",
+ drawingNumber: "",
productModelName: "",
quantity: '',
};
@@ -136,6 +145,7 @@
const product = products[0];
formState.value.productId = product.productId;
formState.value.productName = product.productName;
+ formState.value.drawingNumber = product.drawingNumber;
formState.value.productModelName = product.model;
formState.value.productModelId = product.id;
formState.value.unit = product.unit;
diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index 761139e..d181d51 100644
--- a/src/views/productionManagement/productionOrder/index.vue
+++ b/src/views/productionManagement/productionOrder/index.vue
@@ -140,6 +140,11 @@
width: '120px',
},
{
+ label: "鍥剧焊缂栧彿",
+ prop: "drawingNumber",
+ width: '160px',
+ },
+ {
label: "瑙勬牸",
prop: "specificationModel",
width: '120px',
@@ -374,6 +379,7 @@
id: data.id,
processRouteCode: data.processRouteCode || "",
productName: data.productName || "",
+ drawingNumber: data.drawingNumber || "",
model: data.model || "",
bomNo: data.bomNo || "",
description: data.description || "",
@@ -393,6 +399,7 @@
query: {
id: row.id,
bomNo: row.bomNo || "",
+ drawingNumber: row.drawingNumber || "",
productName: row.productCategory || "",
productModelName: row.specificationModel || "",
orderId: row.id,
diff --git a/src/views/productionManagement/productionReporting/Input.vue b/src/views/productionManagement/productionReporting/Input.vue
index 3ba68f7..800e02f 100644
--- a/src/views/productionManagement/productionReporting/Input.vue
+++ b/src/views/productionManagement/productionReporting/Input.vue
@@ -63,6 +63,10 @@
prop: 'productName',
},
{
+ label: '鎶曞叆浜у搧鍥剧焊缂栧彿',
+ prop: 'drawingNumber',
+ },
+ {
label: '鎶曞叆浜у搧鍨嬪彿',
prop: 'model',
},
diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index 08b515d..37e8665 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -178,6 +178,11 @@
width: 120,
},
{
+ label: "浜у搧鍥剧焊缂栧彿",
+ prop: "drawingNumber",
+ width: 160,
+ },
+ {
label: "浜у搧瑙勬牸鍨嬪彿",
prop: "productModelName",
width: 120,
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index fddcb30..cc41361 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -251,6 +251,10 @@
width: "140",
},
{
+ label: "鍥剧焊缂栧彿",
+ prop: "drawingNumber",
+ },
+ {
label: "瑙勬牸",
prop: "model",
},
--
Gitblit v1.9.3