From 9af5284ff3a1d7c02ff4f0483d839ad4d0a19e47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com>
Date: Sat, 30 May 2026 18:00:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A4=9A=E9=A1=B5=E9=9D=A2=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96=E4=B8=8E=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
klp-ui/src/views/cost/item.vue | 48 ++++++++++--
.../views/mes/qc/certificate/chemistry.vue | 74 +++++++++++++++++--
.../src/views/mes/qc/certificate/physics.vue | 42 +++++++++--
klp-ui/src/views/wms/coil/panels/base.vue | 8 +-
.../wms/delivery/components/DugeWayBill1.vue | 3 +-
.../wms/delivery/components/DugeWayBill2.vue | 3 +-
.../wms/delivery/components/ZincWayBill1.vue | 3 +-
.../wms/delivery/components/ZincWayBill2.vue | 21 +++---
.../views/wms/delivery/components/wayBill.vue | 3 +-
.../wms/delivery/components/wayBill2.vue | 3 +-
10 files changed, 172 insertions(+), 36 deletions(-)
diff --git a/klp-ui/src/views/cost/item.vue b/klp-ui/src/views/cost/item.vue
index 6cf80dcc..aacacbad 100644
--- a/klp-ui/src/views/cost/item.vue
+++ b/klp-ui/src/views/cost/item.vue
@@ -17,13 +17,22 @@
@keyup.enter.native="handleQuery"
/>
-
-
+
+ @change="handleQuery"
+ >
+
+
+
+
+
+
+
+
+
+
+
+
搜索
重置
@@ -86,9 +103,10 @@
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -133,6 +160,9 @@
+
+
+
@@ -264,7 +304,7 @@ import { listChemicalItem, getChemicalItem, delChemicalItem, addChemicalItem, up
import CoilSelector from "@/components/CoilSelector";
import { listMaterialCoil } from "@/api/wms/coil";
-const CHEMI_TEMPLATE_HEADERS = ['入场钢卷号', 'C(%)', 'Si(%)', 'Mn(%)', 'P(%)', 'S(%)', 'Als(%)'];
+const CHEMI_TEMPLATE_HEADERS = ['入场钢卷号', 'C(%)', 'Si(%)', 'Mn(%)', 'P(%)', 'S(%)', 'Als(%)', 'Al(%)', 'Ti(%)', 'Cr(%)', 'Ni(%)', 'Cu(%)', 'N(%)', 'Fe(%)', 'B(%)'];
const CHEMI_HEADER_MAP = {
'入场钢卷号': 'coilNo',
@@ -273,7 +313,15 @@ const CHEMI_HEADER_MAP = {
'Mn(%)': 'mn',
'P(%)': 'p',
'S(%)': 's',
- 'Als(%)': 'als'
+ 'Als(%)': 'als',
+ 'Al(%)': 'al',
+ 'Ti(%)': 'ti',
+ 'Cr(%)': 'cr',
+ 'Ni(%)': 'ni',
+ 'Cu(%)': 'cu',
+ 'N(%)': 'n',
+ 'Fe(%)': 'fe',
+ 'B(%)': 'b'
};
export default {
@@ -316,6 +364,14 @@ export default {
p: undefined,
s: undefined,
als: undefined,
+ al: undefined,
+ ti: undefined,
+ cr: undefined,
+ ni: undefined,
+ cu: undefined,
+ n: undefined,
+ fe: undefined,
+ b: undefined,
},
// 表单参数
form: {},
@@ -372,6 +428,14 @@ export default {
p: undefined,
s: undefined,
als: undefined,
+ al: undefined,
+ ti: undefined,
+ cr: undefined,
+ ni: undefined,
+ cu: undefined,
+ n: undefined,
+ fe: undefined,
+ b: undefined,
remark: undefined,
delFlag: undefined,
createTime: undefined,
@@ -523,7 +587,7 @@ export default {
try {
const payload = rows.map(row => {
const item = { coilId: null, coilNo: row.coilNo };
- ['c','si','mn','p','s','als'].forEach(f => { if (row[f]) item[f] = row[f]; });
+ ['c','si','mn','p','s','als','al','ti','cr','ni','cu','n','fe','b'].forEach(f => { if (row[f]) item[f] = row[f]; });
return item;
});
const addRes = await batchAddChemicalItem(payload);
@@ -553,10 +617,10 @@ export default {
this.$refs.importUpload?.clearFiles();
},
importDownloadTemplate() {
- const data = [CHEMI_TEMPLATE_HEADERS, ['示例卷号', '0.05', '0.02', '0.30', '0.015', '0.008', '0.040']];
+ const data = [CHEMI_TEMPLATE_HEADERS, ['示例卷号', '0.05', '0.02', '0.30', '0.015', '0.008', '0.040', '0.04', '0.05', '0.03', '0.02', '0.03', '0.005', '98', '0.001']];
const wb = XLSX.utils.book_new();
const ws = XLSX.utils.aoa_to_sheet(data);
- ws['!cols'] = [{ wch: 16 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }];
+ ws['!cols'] = [{ wch: 16 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }];
XLSX.utils.book_append_sheet(wb, ws, '导入模板');
XLSX.writeFile(wb, '化学成分导入模板.xlsx');
},
diff --git a/klp-ui/src/views/mes/qc/certificate/physics.vue b/klp-ui/src/views/mes/qc/certificate/physics.vue
index 4cfd5e18..f8d9479c 100644
--- a/klp-ui/src/views/mes/qc/certificate/physics.vue
+++ b/klp-ui/src/views/mes/qc/certificate/physics.vue
@@ -65,6 +65,14 @@
@keyup.enter.native="handleQuery"
/>
+
+
+
搜索
重置
@@ -135,10 +143,13 @@
+
+
+
@@ -189,9 +200,15 @@
+
+
+
+
+
+
@@ -201,6 +218,9 @@
+
+
+
@@ -269,10 +289,13 @@
+
+
+
@@ -320,8 +343,8 @@ import CoilSelector from "@/components/CoilSelector";
import { listMaterialCoil } from "@/api/wms/coil";
const PHYS_TEMPLATE_HEADERS = [
- '当前钢卷号', '屈服强度(MPa)', '抗拉强度(MPa)', '伸长率(%)', '硬度(HRB)', '弯曲试验',
- '表面质量', '表面结构', '边缘状态'
+ '当前钢卷号', '屈服强度(MPa)', '抗拉强度(MPa)', '伸长率(%)', '规定塑性延伸强度(MPa)', '硬度(HRB)',
+ '镀层重量(g/m²)', '弯曲试验', '表面质量', '表面结构', '镀层表面结构', '边缘状态'
];
const PHYS_HEADER_MAP = {
@@ -329,10 +352,13 @@ const PHYS_HEADER_MAP = {
'屈服强度(MPa)': 'yieldStrength',
'抗拉强度(MPa)': 'tensileStrength',
'伸长率(%)': 'elongation',
+ '规定塑性延伸强度(MPa)': 'plasticExtensionStrength',
'硬度(HRB)': 'hardness',
+ '镀层重量(g/m²)': 'coatingMass',
'弯曲试验': 'bendingTest',
'表面质量': 'surfaceQuality',
'表面结构': 'surfaceStructure',
+ '镀层表面结构': 'coatingSurfaceStructure',
'边缘状态': 'edgeStatus'
};
@@ -372,10 +398,13 @@ export default {
yieldStrength: undefined,
tensileStrength: undefined,
elongation: undefined,
+ plasticExtensionStrength: undefined,
hardness: undefined,
+ coatingMass: undefined,
bendingTest: undefined,
surfaceQuality: undefined,
surfaceStructure: undefined,
+ coatingSurfaceStructure: undefined,
edgeStatus: undefined,
},
// 表单参数
@@ -429,10 +458,13 @@ export default {
yieldStrength: undefined,
tensileStrength: undefined,
elongation: undefined,
+ plasticExtensionStrength: undefined,
hardness: undefined,
+ coatingMass: undefined,
bendingTest: undefined,
surfaceQuality: undefined,
surfaceStructure: undefined,
+ coatingSurfaceStructure: undefined,
edgeStatus: undefined,
remark: undefined,
delFlag: undefined,
@@ -585,7 +617,7 @@ export default {
try {
const payload = rows.map(row => {
const item = { coilId: null, coilNo: row.coilNo };
- ['yieldStrength','tensileStrength','elongation','hardness','bendingTest','surfaceQuality','surfaceStructure','edgeStatus'].forEach(f => { if (row[f]) item[f] = row[f]; });
+ ['yieldStrength','tensileStrength','elongation','plasticExtensionStrength','hardness','coatingMass','bendingTest','surfaceQuality','surfaceStructure','coatingSurfaceStructure','edgeStatus'].forEach(f => { if (row[f]) item[f] = row[f]; });
return item;
});
const addRes = await batchAddPhysicalItem(payload);
@@ -615,10 +647,10 @@ export default {
this.$refs.importUpload?.clearFiles();
},
importDownloadTemplate() {
- const data = [PHYS_TEMPLATE_HEADERS, ['示例卷号', '300', '420', '35', '85', '合格', '良好', '光面', '良好']];
+ const data = [PHYS_TEMPLATE_HEADERS, ['示例卷号', '300', '420', '35', '260', '85', '275', '合格', '良好', '光面', '无锌花', '良好']];
const wb = XLSX.utils.book_new();
const ws = XLSX.utils.aoa_to_sheet(data);
- ws['!cols'] = [{ wch: 16 }, { wch: 16 }, { wch: 16 }, { wch: 10 }, { wch: 10 }, { wch: 10 }, { wch: 10 }, { wch: 10 }, { wch: 10 }];
+ ws['!cols'] = [{ wch: 16 }, { wch: 16 }, { wch: 16 }, { wch: 10 }, { wch: 20 }, { wch: 10 }, { wch: 16 }, { wch: 10 }, { wch: 10 }, { wch: 10 }, { wch: 12 }, { wch: 10 }];
XLSX.utils.book_append_sheet(wb, ws, '导入模板');
XLSX.writeFile(wb, '物理性能导入模板.xlsx');
},
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index c2c86195..c27b546e 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -103,8 +103,8 @@
搜索
重置
导出
- 批量移出发货单
+ 批量移出发货单