From 7d1924d1924e2cafd77ca1ce3b7d5ca9336edb9c Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 31 三月 2026 10:08:53 +0800
Subject: [PATCH] Merge branch 'dev_长治_健齿齿科器材' of http://114.132.189.42:9002/r/product-inventory-management into dev_长治_健齿齿科器材
---
src/views/productionManagement/productStructure/Detail/index.vue | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/src/views/productionManagement/productStructure/Detail/index.vue b/src/views/productionManagement/productStructure/Detail/index.vue
index 3a76e48..eb8d664 100644
--- a/src/views/productionManagement/productStructure/Detail/index.vue
+++ b/src/views/productionManagement/productStructure/Detail/index.vue
@@ -53,6 +53,8 @@
</el-form-item>
</template>
</el-table-column>
+ <el-table-column prop="uidNo"
+ label="UID鐮�" />
<el-table-column prop="processName"
label="娑堣�楀伐搴�">
<template #default="{ row, $index }">
@@ -91,10 +93,10 @@
</el-table-column>
<el-table-column v-if="isOrderPage"
prop="demandedQuantity"
- label="闇�姹傛�婚噺">
+ label="棰勮鐢熶骇鏁伴噺">
<template #default="{ row, $index }">
<el-form-item v-if="dataValue.isEdit"
- :rules="[{ required: true, message: '璇疯緭鍏ラ渶姹傛�婚噺', trigger: ['blur','change'] }]"
+ :rules="[{ required: true, message: '璇疯緭鍏ラ璁＄敓浜ф暟閲�', trigger: ['blur','change'] }]"
style="margin: 0">
<el-input-number v-model="row.demandedQuantity"
:min="0"
@@ -115,7 +117,7 @@
<el-input v-model="row.unit"
placeholder="璇疯緭鍏ュ崟浣�"
clearable
- :disabled="!dataValue.isEdit || dataValue.dataList.some(item => (item as any).tempId === row.tempId)" />
+ :disabled="!dataValue.isEdit || dataValue.dataList.some(item => (item as any).tempId === row.tempId)" />
</el-form-item>
</template>
</el-table-column>
@@ -145,6 +147,8 @@
prop="productName" />
<el-table-column label="瑙勬牸鍨嬪彿"
prop="model" />
+ <el-table-column label="UID鐮�"
+ prop="uidNo" />
</el-table>
<product-select-dialog v-if="dataValue.showProductDialog"
v-model:model-value="dataValue.showProductDialog"
@@ -195,6 +199,7 @@
const routeProductModelName = computed(
() => route.query.productModelName || ""
);
+ const routeUidNo = computed(() => route.query.uidNo || "");
const routeOrderId = computed(() => route.query.orderId);
const pageType = computed(() => route.query.type);
const isOrderPage = computed(
@@ -216,6 +221,7 @@
{
productName: "",
model: "",
+ uidNo: "",
bomNo: "",
},
]);
@@ -264,15 +270,21 @@
const productData = row[0];
// 鏈�澶栧眰缁勪欢涓紝涓庡綋鍓嶄骇鍝佺浉鍚岀殑浜у搧鍙兘鏈変竴涓�
- const isTopLevel = dataValue.dataList.some(item => (item as any).tempId === dataValue.currentRowName);
+ const isTopLevel = dataValue.dataList.some(
+ item => (item as any).tempId === dataValue.currentRowName
+ );
if (isTopLevel) {
- if (productData.productName === tableData[0].productName &&
- productData.model === tableData[0].model) {
+ if (
+ productData.productName === tableData[0].productName &&
+ productData.model === tableData[0].model
+ ) {
// 鏌ユ壘鏄惁宸茬粡鏈夊叾浠栭《灞傝宸茬粡鏄繖涓骇鍝�
- const hasOther = dataValue.dataList.some(item =>
- (item as any).tempId !== dataValue.currentRowName &&
- (item as any).productName === tableData[0].productName &&
- (item as any).model === tableData[0].model
+ const hasOther = dataValue.dataList.some(
+ item =>
+ (item as any).tempId !== dataValue.currentRowName &&
+ (item as any).productName === tableData[0].productName &&
+ (item as any).model === tableData[0].model &&
+ (item as any).uidNo === tableData[0].uidNo
);
if (hasOther) {
ElMessage.warning("鏈�澶栧眰鍜屽綋鍓嶄骇鍝佷竴鏍风殑涓�绾у彧鑳芥湁涓�涓�");
@@ -289,6 +301,7 @@
if (item.tempId === dataValue.currentRowName) {
item.productName = productData.productName;
item.model = productData.model;
+ item.uidNo = productData.uidNo;
item.productModelId = productData.id;
item.unit = productData.unit || "";
return;
@@ -301,6 +314,7 @@
if (item.tempId === tempId) {
item.productName = productData.productName;
item.model = productData.model;
+ item.uidNo = productData.uidNo;
item.productModelId = productData.id;
item.unit = productData.unit || "";
return true;
@@ -390,7 +404,7 @@
}
};
- const removeItem = (tempId:string) => {
+ const removeItem = (tempId: string) => {
// 鍏堝皾璇曚粠椤跺眰鍒犻櫎
const topIndex = dataValue.dataList.findIndex(item => item.tempId === tempId);
if (topIndex !== -1) {
@@ -502,6 +516,7 @@
// 浠庤矾鐢卞弬鏁板洖鏄炬暟鎹�
tableData[0].productName = routeProductName.value as string;
tableData[0].model = routeProductModelName.value as string;
+ tableData[0].uidNo = routeUidNo.value as string;
tableData[0].bomNo = routeBomNo.value as string;
// 璁㈠崟鎯呭喌涓嬬鐢ㄧ紪杈�
--
Gitblit v1.9.3