From ce6a2bac234c48dce836f6c5d45c63da7c1e7424 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 31 三月 2026 11:48:16 +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 | 52 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 47 insertions(+), 5 deletions(-)
diff --git a/src/views/productionManagement/processRoute/processRouteItem/index.vue b/src/views/productionManagement/processRoute/processRouteItem/index.vue
index 18e21e8..76ac092 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">UID鐮�</span>
+ </div>
+ <div class="info-value-wrapper">
+ <span class="info-value">{{ routeInfo.uidNo || '-' }}</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,11 +89,17 @@
</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="UID鐮�" prop="uidNo"/>
<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)">缂栬緫</el-button>
- <el-button type="danger" link size="small" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
+ <el-button type="primary" link size="small" @click="handleEdit(scope.row)" :disabled="scope.row.isComplete">缂栬緫</el-button>
+ <el-button type="danger" link size="small" @click="handleDelete(scope.row)" :disabled="scope.row.isComplete">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -130,14 +144,15 @@
{{ 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>
<!-- 鎿嶄綔鎸夐挳 -->
<div class="card-footer">
- <el-button type="primary" link size="small" @click="handleEdit(item)">缂栬緫</el-button>
- <el-button type="danger" link size="small" @click="handleDelete(item)">鍒犻櫎</el-button>
+ <el-button type="primary" link size="small" @click="handleEdit(item)" :disabled="item.isComplete">缂栬緫</el-button>
+ <el-button type="danger" link size="small" @click="handleDelete(item)" :disabled="item.isComplete">鍒犻櫎</el-button>
</div>
</div>
</div>
@@ -180,6 +195,14 @@
: '閫夋嫨浜у搧' }}
</el-button>
</el-form-item>
+ <el-form-item label="UID鐮�" prop="uidNo">
+ <el-input
+ v-model="form.uidNo"
+ :placeholder="form.productModelId ? '鏍规嵁閫夋嫨鐨勪骇鍝佽嚜鍔ㄥ甫鍑�' : '璇峰厛閫夋嫨浜у搧'"
+ clearable
+ :disabled="true"
+ />
+ </el-form-item>
<el-form-item label="鍗曚綅" prop="unit">
<el-input
@@ -189,11 +212,15 @@
: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>
- <el-button @click="closeDialog">鍙栨秷</el-button>
<el-button type="primary" @click="handleSubmit" :loading="submitLoading">纭畾</el-button>
+ <el-button @click="closeDialog">鍙栨秷</el-button>
</template>
</el-dialog>
@@ -261,7 +288,9 @@
productModelId: undefined,
productName: "",
model: "",
+ uidNo: "",
unit: "",
+ isQuality: false,
});
const rules = {
@@ -317,6 +346,7 @@
processRouteCode: route.query.processRouteCode || '',
productName: route.query.productName || '',
model: route.query.model || '',
+ uidNo: route.query.uidNo || '',
bomNo: route.query.bomNo || '',
description: route.query.description || ''
};
@@ -337,9 +367,11 @@
routeId: routeId.value,
processId: row.processId,
productModelId: row.productModelId,
+ uidNo: row.uidNo || "",
productName: row.productName || "",
model: row.model || "",
unit: row.unit || "",
+ isQuality: row.isQuality,
};
dialogVisible.value = true;
};
@@ -377,6 +409,7 @@
form.value.productModelId = product.id;
form.value.productName = product.productName;
form.value.model = product.model;
+ form.value.uidNo = product.uidNo;
form.value.unit = product.unit || "";
showProductSelectDialog.value = false;
// 瑙﹀彂琛ㄥ崟楠岃瘉
@@ -402,12 +435,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 +467,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
@@ -464,6 +501,7 @@
routeId: routeId.value,
processId: undefined,
productModelId: undefined,
+ uidNo: "",
productName: "",
model: "",
unit: "",
@@ -733,6 +771,10 @@
color: #409eff;
}
+.product-tag {
+ margin: 10px 0;
+}
+
.card-footer {
display: flex;
justify-content: space-around;
--
Gitblit v1.9.3