From 1022826db3084755348fa4169fe0d703ad3bb443 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期一, 30 三月 2026 15:20:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材
---
src/views/productionManagement/productionOrder/ClearanceRecordDialog.vue | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/ClearanceRecordDialog.vue b/src/views/productionManagement/productionOrder/ClearanceRecordDialog.vue
index 0b8d3af..80a9211 100644
--- a/src/views/productionManagement/productionOrder/ClearanceRecordDialog.vue
+++ b/src/views/productionManagement/productionOrder/ClearanceRecordDialog.vue
@@ -12,13 +12,15 @@
<table class="info-table">
<tr>
<td class="label">浜у搧鍚嶇О</td>
- <td class="value" colspan="3">{{ formData.productName }}</td>
+ <td class="value" colspan="5">{{ formData.productName }}</td>
<td class="label">鐢熶骇鏃ユ湡</td>
<td class="value">{{ formData.productionDate }}</td>
</tr>
<tr>
<td class="label">瑙勬牸</td>
<td class="value">{{ formData.spec }}</td>
+ <td class="label">UID鐮�</td>
+ <td class="value">{{ formData.uidNo }}</td>
<td class="label">鎵瑰彿</td>
<td class="value">{{ formData.batchNo }}</td>
<td class="label">鐢熶骇杞﹂棿</td>
@@ -145,6 +147,7 @@
productName: '',
productionDate: '',
spec: '',
+ uidNo: '',
batchNo: '',
workshop: '',
checkItems: JSON.parse(JSON.stringify(defaultCheckItems)),
@@ -176,7 +179,8 @@
formData.productName = record.productName || order.productCategory || '';
formData.productionDate = record.productionDate || (order.startTime ? dayjs(order.startTime).format('YYYY-MM-DD') : dayjs().format('YYYY-MM-DD'));
formData.spec = record.spec || order.specificationModel || '';
- formData.batchNo = record.batchNo || order.batchNo || order.uidNo || '';
+ formData.uidNo = record.uidNo || order.uidNo || '';
+ formData.batchNo = record.batchNo || order.batchNo || '';
formData.workshop = record.workshop || order.workshop || order.manufacturingTeam || '';
// 鍔犺浇妫�鏌ラ」鐩紝淇濇寔榛樿缁撴瀯浣嗘洿鏂扮粨鏋�
@@ -216,7 +220,8 @@
formData.productName = order.productCategory || '';
formData.productionDate = order.startTime ? dayjs(order.startTime).format('YYYY-MM-DD') : dayjs().format('YYYY-MM-DD');
formData.spec = order.specificationModel || '';
- formData.batchNo = order.batchNo || order.uidNo || '';
+ formData.uidNo = order.uidNo || '';
+ formData.batchNo = order.batchNo || '';
formData.workshop = order.workshop || order.manufacturingTeam || '';
// 娓呭満浜哄拰妫�鏌ヤ汉榛樿涓虹┖锛屾棩鏈熼粯璁や负褰撳墠鏃堕棿
@@ -253,6 +258,7 @@
const saveData = {
orderId: formData.orderId,
productName: formData.productName,
+ uidNo: formData.uidNo,
productionDate: formData.productionDate,
spec: formData.spec,
batchNo: formData.batchNo,
--
Gitblit v1.9.3