feat: 多页面功能优化与新增
This commit is contained in:
@@ -65,6 +65,14 @@
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="镀层表面结构" prop="coatingSurfaceStructure">
|
||||
<el-input
|
||||
v-model="queryParams.coatingSurfaceStructure"
|
||||
placeholder="请输入镀层表面结构"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
@@ -135,10 +143,13 @@
|
||||
<el-table-column label="屈服强度(MPa)" align="center" prop="yieldStrength" />
|
||||
<el-table-column label="抗拉强度(MPa)" align="center" prop="tensileStrength" />
|
||||
<el-table-column label="伸长率(%)" align="center" prop="elongation" />
|
||||
<el-table-column label="规定塑性延伸强度(MPa)" align="center" prop="plasticExtensionStrength" />
|
||||
<el-table-column label="硬度实验(HRB)" align="center" prop="hardness" />
|
||||
<el-table-column label="镀层重量(g/m²)" align="center" prop="coatingMass" />
|
||||
<el-table-column label="弯曲试验" align="center" prop="bendingTest" />
|
||||
<el-table-column label="表面质量" align="center" prop="surfaceQuality" />
|
||||
<el-table-column label="表面结构" align="center" prop="surfaceStructure" />
|
||||
<el-table-column label="镀层表面结构" align="center" prop="coatingSurfaceStructure" />
|
||||
<el-table-column label="边缘状态" align="center" prop="edgeStatus" />
|
||||
<el-table-column label="备注" align="center" prop="remark" />
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
@@ -189,9 +200,15 @@
|
||||
<el-form-item label="伸长率(%)" prop="elongation">
|
||||
<el-input v-model="form.elongation" placeholder="请输入伸长率(%)" />
|
||||
</el-form-item>
|
||||
<el-form-item label="规定塑性延伸强度(MPa)" prop="plasticExtensionStrength">
|
||||
<el-input v-model="form.plasticExtensionStrength" placeholder="请输入规定塑性延伸强度(MPa)" />
|
||||
</el-form-item>
|
||||
<el-form-item label="硬度实验(HRB)" prop="hardness">
|
||||
<el-input v-model="form.hardness" placeholder="请输入硬度实验(HRB)" />
|
||||
</el-form-item>
|
||||
<el-form-item label="镀层重量(g/m²)" prop="coatingMass">
|
||||
<el-input v-model="form.coatingMass" placeholder="请输入镀层重量(g/m²)" />
|
||||
</el-form-item>
|
||||
<el-form-item label="弯曲试验" prop="bendingTest">
|
||||
<el-input v-model="form.bendingTest" placeholder="请输入弯曲试验" />
|
||||
</el-form-item>
|
||||
@@ -201,6 +218,9 @@
|
||||
<el-form-item label="表面结构" prop="surfaceStructure">
|
||||
<el-input v-model="form.surfaceStructure" placeholder="请输入表面结构" />
|
||||
</el-form-item>
|
||||
<el-form-item label="镀层表面结构" prop="coatingSurfaceStructure">
|
||||
<el-input v-model="form.coatingSurfaceStructure" placeholder="请输入镀层表面结构" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" placeholder="请输入备注" />
|
||||
</el-form-item>
|
||||
@@ -269,10 +289,13 @@
|
||||
<el-table-column prop="yieldStrength" label="屈服强度(MPa)" width="110" align="center" />
|
||||
<el-table-column prop="tensileStrength" label="抗拉强度(MPa)" width="110" align="center" />
|
||||
<el-table-column prop="elongation" label="伸长率(%)" width="80" align="center" />
|
||||
<el-table-column prop="plasticExtensionStrength" label="规定塑性延伸强度(MPa)" width="120" align="center" />
|
||||
<el-table-column prop="hardness" label="硬度(HRB)" width="80" align="center" />
|
||||
<el-table-column prop="coatingMass" label="镀层重量(g/m²)" width="100" align="center" />
|
||||
<el-table-column prop="bendingTest" label="弯曲试验" width="80" align="center" />
|
||||
<el-table-column prop="surfaceQuality" label="表面质量" width="80" align="center" />
|
||||
<el-table-column prop="surfaceStructure" label="表面结构" width="80" align="center" />
|
||||
<el-table-column prop="coatingSurfaceStructure" label="镀层表面结构" width="90" align="center" />
|
||||
<el-table-column prop="edgeStatus" label="边缘状态" width="80" align="center" />
|
||||
|
||||
</el-table>
|
||||
@@ -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');
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user