From de83f5112fecda011bce0192dce152e66bb56f87 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 31 三月 2026 17:37:24 +0800
Subject: [PATCH] Merge branch 'dev_衡阳_鹏创电子' of http://114.132.189.42:9002/r/product-inventory-management into dev_衡阳_鹏创电子
---
src/views/productionManagement/processRoute/processRouteItem/index.vue | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/src/views/productionManagement/processRoute/processRouteItem/index.vue b/src/views/productionManagement/processRoute/processRouteItem/index.vue
index 99d89a9..19e2165 100644
--- a/src/views/productionManagement/processRoute/processRouteItem/index.vue
+++ b/src/views/productionManagement/processRoute/processRouteItem/index.vue
@@ -31,6 +31,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.materialCode || '-' }}</span>
+ </div>
+ </div>
+ <div class="info-item">
+ <div class="info-label-wrapper">
<span class="info-label">BOM缂栧彿</span>
</div>
<div class="info-value-wrapper">
@@ -81,7 +89,13 @@
</el-table-column>
<el-table-column label="浜у搧鍚嶇О" prop="productName" min-width="160" />
<el-table-column label="瑙勬牸鍚嶇О" prop="model" min-width="140" />
+ <el-table-column label="鏂欏彿" prop="materialCode" min-width="140" />
<el-table-column label="鍗曚綅" prop="unit" width="100" />
+ <el-table-column label="鏄惁璐ㄦ" prop="isQuality" width="100">
+ <template #default="scope">
+ {{scope.row.isQuality ? "鏄�" : "鍚�"}}
+ </template>
+ </el-table-column>
<el-table-column label="鎿嶄綔" align="center" fixed="right" width="150">
<template #default="scope">
<el-button type="primary" link size="small" @click="handleEdit(scope.row)" :disabled="scope.row.isComplete">缂栬緫</el-button>
@@ -130,6 +144,7 @@
{{ item.model }}
<!-- <span v-if="item.unit" class="product-unit">{{ item.unit }}</span> -->
</div>
+ <el-tag type="primary" class="product-tag" v-if="item.isQuality">璐ㄦ</el-tag>
</div>
<div v-else class="product-info empty">鏆傛棤浜у搧淇℃伅</div>
</div>
@@ -189,6 +204,10 @@
:disabled="true"
/>
</el-form-item>
+
+ <el-form-item label="鏄惁璐ㄦ" prop="isQuality">
+ <el-switch v-model="form.isQuality" :active-value="true" inactive-value="false"/>
+ </el-form-item>
</el-form>
<template #footer>
@@ -236,6 +255,7 @@
processRouteCode: '',
productName: '',
model: '',
+ materialCode: '',
bomNo: '',
description: ''
});
@@ -262,6 +282,7 @@
productName: "",
model: "",
unit: "",
+ isQuality: false,
});
const rules = {
@@ -317,6 +338,7 @@
processRouteCode: route.query.processRouteCode || '',
productName: route.query.productName || '',
model: route.query.model || '',
+ materialCode: route.query.materialCode || '',
bomNo: route.query.bomNo || '',
description: route.query.description || ''
};
@@ -340,6 +362,7 @@
productName: row.productName || "",
model: row.model || "",
unit: row.unit || "",
+ isQuality: row.isQuality,
};
dialogVisible.value = true;
};
@@ -402,12 +425,14 @@
productRouteId: routeId.value,
processId: form.value.processId,
productModelId: form.value.productModelId,
+ isQuality: form.value.isQuality,
dragSort,
})
: addOrUpdateProcessRouteItem({
routeId: routeId.value,
processId: form.value.processId,
productModelId: form.value.productModelId,
+ isQuality: form.value.isQuality,
dragSort,
});
@@ -432,12 +457,14 @@
id: form.value.id,
processId: form.value.processId,
productModelId: form.value.productModelId,
+ isQuality: form.value.isQuality,
})
: addOrUpdateProcessRouteItem({
routeId: routeId.value,
processId: form.value.processId,
productModelId: form.value.productModelId,
id: form.value.id,
+ isQuality: form.value.isQuality,
});
updatePromise
@@ -733,6 +760,10 @@
color: #409eff;
}
+.product-tag {
+ margin: 10px 0;
+}
+
.card-footer {
display: flex;
justify-content: space-around;
--
Gitblit v1.9.3