From 4f3ed15ab21677f3b8ac41b825549daff9ed44e6 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期一, 30 三月 2026 15:07:08 +0800
Subject: [PATCH] Merge branch 'dev_长治_健齿齿科器材' of http://114.132.189.42:9002/r/product-inventory-management into dev_长治_健齿齿科器材
---
src/views/qualityManagement/processInspection/components/formDia.vue | 19 ++++--
src/views/productionManagement/processRoute/index.vue | 3
src/views/basicData/product/ProductSelectDialog.vue | 1
src/views/productionManagement/workOrder/index.vue | 13 ----
src/views/qualityManagement/finalInspection/components/formDia.vue | 9 +++
src/views/productionManagement/processRoute/processRouteItem/index.vue | 22 +++++++
src/views/productionManagement/productionCosting/index.vue | 5 +
src/views/qualityManagement/rawMaterialInspection/index.vue | 2
src/views/salesManagement/salesLedger/index.vue | 11 +++
src/views/productionManagement/productionReporting/Input.vue | 4
src/views/productionManagement/productStructure/Detail/index.vue | 12 +++
src/views/procurementManagement/procurementLedger/index.vue | 14 ++++
src/views/productionManagement/productionOrder/ClearanceRecordDialog.vue | 12 +++-
src/views/qualityManagement/nonconformingManagement/components/formDia.vue | 30 +++++++--
src/views/qualityManagement/rawMaterialInspection/components/formDia.vue | 13 +++
src/views/productionManagement/productionOrder/index.vue | 2
src/views/inventoryManagement/stockReport/index.vue | 2
src/views/inventoryManagement/receiptManagement/Record.vue | 2
18 files changed, 138 insertions(+), 38 deletions(-)
diff --git a/src/views/basicData/product/ProductSelectDialog.vue b/src/views/basicData/product/ProductSelectDialog.vue
index ded23cc..760991c 100644
--- a/src/views/basicData/product/ProductSelectDialog.vue
+++ b/src/views/basicData/product/ProductSelectDialog.vue
@@ -22,6 +22,7 @@
<el-table-column type="index" label="搴忓彿" width="60" />
<el-table-column prop="productName" label="浜у搧澶х被" min-width="160" />
<el-table-column prop="model" label="鍨嬪彿鍚嶇О" min-width="200" />
+ <el-table-column prop="uidNo" label="UID鐮�" min-width="200" />
<el-table-column prop="unit" label="鍗曚綅" min-width="160" />
</el-table>
diff --git a/src/views/inventoryManagement/receiptManagement/Record.vue b/src/views/inventoryManagement/receiptManagement/Record.vue
index fc35691..6e904ec 100644
--- a/src/views/inventoryManagement/receiptManagement/Record.vue
+++ b/src/views/inventoryManagement/receiptManagement/Record.vue
@@ -68,7 +68,7 @@
prop="model"
show-overflow-tooltip/>
<el-table-column label="UID鐮�"
- prop="uidNO"
+ prop="uidNo"
show-overflow-tooltip/>
<el-table-column label="鍗曚綅"
prop="unit"
diff --git a/src/views/inventoryManagement/stockReport/index.vue b/src/views/inventoryManagement/stockReport/index.vue
index 02689e9..90198ef 100644
--- a/src/views/inventoryManagement/stockReport/index.vue
+++ b/src/views/inventoryManagement/stockReport/index.vue
@@ -187,7 +187,7 @@
/>
<el-table-column
label="UID鐮�"
- prop="uid鐮�"
+ prop="uidNo"
show-overflow-tooltip
/>
<el-table-column
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index 20c6b1c..d69c73e 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -408,6 +408,7 @@
<el-table-column label="鍗曚綅"
prop="unit"
width="70" />
+ <el-table-column label="UID鐮�" prop="uidNo" />
<el-table-column label="鏁伴噺"
prop="quantity"
width="70" />
@@ -565,6 +566,16 @@
:label="item.model"
:value="item.id" />
</el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="24">
+ <el-form-item label="UID鐮侊細"
+ prop="uidNo">
+ <el-input v-model="productForm.uidNo"
+ placeholder="璇疯緭鍏�"
+ disabled />
</el-form-item>
</el-col>
</el-row>
@@ -951,6 +962,7 @@
productId: "",
productCategory: "",
productModelId: "",
+ uidNo: "",
specificationModel: "",
unit: "",
quantity: "",
@@ -1555,9 +1567,11 @@
if (index !== -1) {
productForm.value.specificationModel = modelOptions.value[index].model;
productForm.value.unit = modelOptions.value[index].unit;
+ productForm.value.uidNo = modelOptions.value[index].uidNo || "";
} else {
productForm.value.specificationModel = null;
productForm.value.unit = null;
+ productForm.value.uidNo = "";
}
};
const findNodeById = (nodes, productId) => {
diff --git a/src/views/productionManagement/processRoute/index.vue b/src/views/productionManagement/processRoute/index.vue
index 6672ca0..9e9f2b1 100644
--- a/src/views/productionManagement/processRoute/index.vue
+++ b/src/views/productionManagement/processRoute/index.vue
@@ -81,7 +81,7 @@
},
{
label: "UID鐮�",
- prop: "uid鐮�",
+ prop: "uidNo",
},
{
label: "BOM缂栧彿",
@@ -178,6 +178,7 @@
processRouteCode: row.processRouteCode || '',
productName: row.productName || '',
model: row.model || '',
+ uidNo: row.uidNo || '',
bomNo: row.bomNo || '',
description: row.description || '',
type: 'route',
diff --git a/src/views/productionManagement/processRoute/processRouteItem/index.vue b/src/views/productionManagement/processRoute/processRouteItem/index.vue
index c1c490c..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,6 +89,7 @@
</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">
@@ -186,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
@@ -271,6 +288,7 @@
productModelId: undefined,
productName: "",
model: "",
+ uidNo: "",
unit: "",
isQuality: false,
});
@@ -328,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 || ''
};
@@ -348,6 +367,7 @@
routeId: routeId.value,
processId: row.processId,
productModelId: row.productModelId,
+ uidNo: row.uidNo || "",
productName: row.productName || "",
model: row.model || "",
unit: row.unit || "",
@@ -389,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;
// 瑙﹀彂琛ㄥ崟楠岃瘉
@@ -480,6 +501,7 @@
routeId: routeId.value,
processId: undefined,
productModelId: undefined,
+ uidNo: "",
productName: "",
model: "",
unit: "",
diff --git a/src/views/productionManagement/productStructure/Detail/index.vue b/src/views/productionManagement/productStructure/Detail/index.vue
index cf1e3a7..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 }">
@@ -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: "",
},
]);
@@ -277,7 +283,8 @@
item =>
(item as any).tempId !== dataValue.currentRowName &&
(item as any).productName === tableData[0].productName &&
- (item as any).model === tableData[0].model
+ (item as any).model === tableData[0].model &&
+ (item as any).uidNo === tableData[0].uidNo
);
if (hasOther) {
ElMessage.warning("鏈�澶栧眰鍜屽綋鍓嶄骇鍝佷竴鏍风殑涓�绾у彧鑳芥湁涓�涓�");
@@ -294,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;
@@ -306,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;
@@ -507,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;
// 璁㈠崟鎯呭喌涓嬬鐢ㄧ紪杈�
diff --git a/src/views/productionManagement/productionCosting/index.vue b/src/views/productionManagement/productionCosting/index.vue
index 8e1d40b..fc9dc39 100644
--- a/src/views/productionManagement/productionCosting/index.vue
+++ b/src/views/productionManagement/productionCosting/index.vue
@@ -102,6 +102,11 @@
prop: "productModelName",
minWidth: 100,
},
+ {
+ label: "UID鐮�",
+ prop: "uidNo",
+ minWidth: 100,
+ },
{
label: "鍗曚綅",
prop: "unit",
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,
diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index 49624b6..3b4adc7 100644
--- a/src/views/productionManagement/productionOrder/index.vue
+++ b/src/views/productionManagement/productionOrder/index.vue
@@ -430,6 +430,7 @@
processRouteCode: data.processRouteCode || "",
productName: data.productName || "",
model: data.model || "",
+ uidNo: data.uidNo || "",
bomNo: data.bomNo || "",
description: data.description || "",
orderId,
@@ -450,6 +451,7 @@
bomNo: row.bomNo || "",
productName: row.productCategory || "",
productModelName: row.specificationModel || "",
+ uidNo: row.uidNo || "",
orderId: row.id,
type: "order",
},
diff --git a/src/views/productionManagement/productionReporting/Input.vue b/src/views/productionManagement/productionReporting/Input.vue
index eed9624..d605333 100644
--- a/src/views/productionManagement/productionReporting/Input.vue
+++ b/src/views/productionManagement/productionReporting/Input.vue
@@ -67,8 +67,8 @@
prop: 'model',
},
{
- label: 'UID鍚�',
- prop: 'uid_no',
+ label: 'UID鐮�',
+ prop: 'uidNo',
},
{
label: '鎶曞叆鏁伴噺',
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index 90003cc..1d3c8a5 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -618,7 +618,6 @@
const handleQuantityInput = value => {
if (value === "" || value === null || value === undefined) {
reportForm.quantity = null;
- reportForm.scrapQty = null;
return;
}
const num = Number(value);
@@ -627,29 +626,17 @@
}
if (num < 1) {
reportForm.quantity = null;
- reportForm.scrapQty = null;
return;
}
if (!Number.isInteger(num)) {
const intValue = Math.floor(num);
if (intValue < 1) {
reportForm.quantity = null;
- reportForm.scrapQty = null;
return;
}
reportForm.quantity = intValue;
} else {
reportForm.quantity = num;
- }
- // 濡傛灉 totalInvestment 鏈夊�硷紝鑷姩璁＄畻 scrapQty = totalInvestment - quantity
- if (reportForm.totalInvestment !== null && reportForm.totalInvestment !== undefined && reportForm.totalInvestment !== "") {
- const total = Number(reportForm.totalInvestment);
- const qty = Number(reportForm.quantity);
- if (total > qty) {
- reportForm.scrapQty = total - qty;
- } else {
- reportForm.scrapQty = null;
- }
}
};
diff --git a/src/views/qualityManagement/finalInspection/components/formDia.vue b/src/views/qualityManagement/finalInspection/components/formDia.vue
index 93abe9a..332b3fd 100644
--- a/src/views/qualityManagement/finalInspection/components/formDia.vue
+++ b/src/views/qualityManagement/finalInspection/components/formDia.vue
@@ -49,6 +49,11 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="UID鐮侊細" prop="uidNo">
+ <el-input v-model="form.uidNo" placeholder="璇疯緭鍏�" disabled/>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
@@ -180,6 +185,7 @@
model: "",
testStandardId: "",
unit: "",
+ uidNo: "",
quantity: "",
checkCompany: "",
checkResult: "",
@@ -316,6 +322,7 @@
if (selectedModel) {
form.value.model = selectedModel.model || '';
form.value.unit = selectedModel.unit || '';
+ form.value.uidNo = selectedModel.uidNo || '';
}
}
@@ -355,6 +362,7 @@
const getModels = (value) => {
form.value.productModelId = undefined;
form.value.unit = undefined;
+ form.value.uidNo = undefined;
modelOptions.value = [];
currentProductId.value = value
form.value.productName = findNodeById(productOptions.value, value);
@@ -369,6 +377,7 @@
const handleChangeModel = (value) => {
form.value.model = modelOptions.value.find(item => item.id == value)?.model || '';
form.value.unit = modelOptions.value.find(item => item.id == value)?.unit || '';
+ form.value.uidNo = modelOptions.value.find(item => item.id == value)?.uidNo || '';
}
const findNodeById = (nodes, productId) => {
diff --git a/src/views/qualityManagement/nonconformingManagement/components/formDia.vue b/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
index 0c6562c..2301cee 100644
--- a/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
+++ b/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
@@ -44,8 +44,13 @@
</el-row>
<el-row :gutter="30">
<el-col :span="12">
+ <el-form-item label="UID鐮侊細" prop="uidNo">
+ <el-input v-model="form.uidNo" placeholder="璇疯緭鍏�" disabled/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="鍗曚綅锛�" prop="unit">
- <el-input v-model="form.unit" placeholder="璇疯緭鍏�" clearable/>
+ <el-input v-model="form.unit" placeholder="璇疯緭鍏�" disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -53,8 +58,6 @@
<el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="璇疯緭鍏�" clearable :precision="2"/>
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="30">
<el-col :span="12">
<el-form-item label="妫�楠屽憳锛�" prop="checkName">
<el-select v-model="form.checkName" placeholder="璇烽�夋嫨" clearable style="width: 100%">
@@ -75,8 +78,7 @@
/>
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="30">
+
<el-col :span="12">
<el-form-item label="涓嶅悎鏍肩幇璞★細" prop="defectivePhenomena">
<el-input v-model="form.defectivePhenomena" placeholder="璇疯緭鍏�" clearable/>
@@ -89,8 +91,7 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="30">
+
<el-col :span="12">
<el-form-item label="澶勭悊浜猴細" prop="dealName">
<el-select v-model="form.dealName" placeholder="璇烽�夋嫨" clearable style="width: 100%">
@@ -148,6 +149,7 @@
productName: "",
productId: "",
model: "",
+ uidNo: "",
unit: "",
quantity: "",
checkCompany: "",
@@ -198,6 +200,7 @@
checkTime: '',
productId: '',
model: '',
+ uidNo: '',
unit: '',
quantity: '',
productName: '',
@@ -213,17 +216,30 @@
})
}
}
+
+const handleChangeModel = (value) => {
+ form.value.model = modelOptions.value.find(item => item.id == value)?.model || '';
+ form.value.unit = modelOptions.value.find(item => item.id == value)?.unit || '';
+ form.value.uidNo = modelOptions.value.find(item => item.id == value)?.uidNo || '';
+}
+
const getProductOptions = () => {
productTreeList().then((res) => {
productOptions.value = convertIdToValue(res);
});
};
+
const getModels = (value) => {
+ form.value.model = undefined;
+ form.value.unit = undefined;
+ form.value.uidNo = undefined;
+ modelOptions.value = [];
form.value.productName = findNodeById(productOptions.value, value);
modelList({ id: value }).then((res) => {
modelOptions.value = res;
})
};
+
const findNodeById = (nodes, productId) => {
for (let i = 0; i < nodes.length; i++) {
if (nodes[i].value === productId) {
diff --git a/src/views/qualityManagement/processInspection/components/formDia.vue b/src/views/qualityManagement/processInspection/components/formDia.vue
index e580aef..1a40a9c 100644
--- a/src/views/qualityManagement/processInspection/components/formDia.vue
+++ b/src/views/qualityManagement/processInspection/components/formDia.vue
@@ -73,6 +73,11 @@
</el-row>
<el-row :gutter="30">
<el-col :span="12">
+ <el-form-item label="UID鐮侊細" prop="uidNo">
+ <el-input v-model="form.uidNo" placeholder="璇疯緭鍏�" disabled/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="妫�娴嬪崟浣嶏細" prop="checkCompany">
<el-input v-model="form.checkCompany" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
@@ -85,14 +90,12 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="30">
<el-col :span="12">
<el-form-item label="妫�楠屽憳锛�" prop="checkName">
- <el-select v-model="form.checkName" placeholder="璇烽�夋嫨" clearable>
- <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
- :value="item.nickName"/>
- </el-select>
+ <el-select v-model="form.checkName" placeholder="璇烽�夋嫨" clearable>
+ <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
+ :value="item.nickName"/>
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -190,6 +193,7 @@
productId: "",
productModelId: "",
model: "",
+ uidNo: "",
testStandardId: "",
unit: "",
quantity: "",
@@ -300,6 +304,7 @@
model: "",
testStandardId: "",
unit: "",
+ uidNo: "",
quantity: "",
checkCompany: "",
checkResult: "",
@@ -384,6 +389,7 @@
const getModels = (value) => {
form.value.productModelId = undefined;
form.value.unit = undefined;
+ form.value.uidNo = undefined;
modelOptions.value = [];
currentProductId.value = value
form.value.productName = findNodeById(productOptions.value, value);
@@ -398,6 +404,7 @@
const handleChangeModel = (value) => {
form.value.model = modelOptions.value.find(item => item.id == value)?.model || '';
form.value.unit = modelOptions.value.find(item => item.id == value)?.unit || '';
+ form.value.uidNo = modelOptions.value.find(item => item.id == value)?.uidNo || '';
}
const findNodeById = (nodes, productId) => {
diff --git a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
index 7362235..daa4712 100644
--- a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
@@ -84,10 +84,17 @@
</el-row>
<el-row :gutter="30">
<el-col :span="12">
+ <el-form-item label="UID鐮侊細" prop="uidNo">
+ <el-input v-model="form.uidNo" disabled/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="妫�娴嬪崟浣嶏細" prop="checkCompany">
<el-input v-model="form.checkCompany" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row :gutter="30">
<el-col :span="12">
<el-form-item label="妫�娴嬬粨鏋滐細" prop="checkResult">
<el-select v-model="form.checkResult">
@@ -96,8 +103,6 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="30">
<el-col :span="12">
<el-form-item label="妫�楠屽憳锛�" prop="checkName">
<el-select v-model="form.checkName" placeholder="璇烽�夋嫨" clearable style="width: 100%">
@@ -201,6 +206,7 @@
productId: "",
productModelId: "",
model: "",
+ uidNo: "",
testStandardId: "",
unit: "",
quantity: "",
@@ -309,6 +315,7 @@
productId: "",
productModelId: "",
model: "",
+ uidNo: "",
testStandardId: "",
unit: "",
quantity: "",
@@ -393,6 +400,7 @@
const getModels = (value) => {
form.value.productModelId = undefined;
form.value.unit = undefined;
+ form.value.uidNo = undefined;
modelOptions.value = [];
currentProductId.value = value
form.value.productName = findNodeById(productOptions.value, value);
@@ -407,6 +415,7 @@
const handleChangeModel = (value) => {
form.value.model = modelOptions.value.find(item => item.id == value)?.model || '';
form.value.unit = modelOptions.value.find(item => item.id == value)?.unit || '';
+ form.value.uidNo = modelOptions.value.find(item => item.id == value)?.uidNo || '';
}
const findNodeById = (nodes, productId) => {
diff --git a/src/views/qualityManagement/rawMaterialInspection/index.vue b/src/views/qualityManagement/rawMaterialInspection/index.vue
index 9751a86..c03608a 100644
--- a/src/views/qualityManagement/rawMaterialInspection/index.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/index.vue
@@ -121,7 +121,7 @@
},
{
label: "UID鐮�",
- prop: "uidNO",
+ prop: "uidNo",
},
{
label: "鍗曚綅",
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 884582d..ca1530f 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -367,6 +367,13 @@
</el-row>
<el-row :gutter="30">
<el-col :span="24">
+ <el-form-item label="UID鐮侊細" prop="uidNo">
+ <el-input v-model="productForm.uidNo" placeholder="璇疯緭鍏�" disabled />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="24">
<el-form-item label="鎵瑰彿锛�" prop="batchNo">
<el-select v-model="productForm.batchNo" placeholder="璇烽�夋嫨" clearable filterable>
<el-option v-for="item in batchNoOptions" :key="item.value" :label="item.label" :value="item.value" />
@@ -755,6 +762,7 @@
productForm: {
productCategory: "",
specificationModel: "",
+ uidNo: "",
unit: "",
quantity: "",
taxInclusiveUnitPrice: "",
@@ -959,9 +967,11 @@
if (index !== -1) {
productForm.value.specificationModel = modelOptions.value[index].model;
productForm.value.unit = modelOptions.value[index].unit;
+ productForm.value.uidNo = modelOptions.value[index].uidNo || "";
} else {
productForm.value.specificationModel = null;
productForm.value.unit = null;
+ productForm.value.uidNo = null;
}
};
const findNodeById = (nodes, productId) => {
@@ -1186,6 +1196,7 @@
// 鍙拌处瀛楁
productCategory: p.product || p.productName || "",
specificationModel: p.specification || "",
+ uidNo: p.uidNo || "",
unit: p.unit || "",
quantity: quantity,
taxRate: taxRate,
--
Gitblit v1.9.3