diff --git a/src/assets/data.ts b/src/assets/data.ts
index 6705e4d..b6e84d4 100644
--- a/src/assets/data.ts
+++ b/src/assets/data.ts
@@ -102,6 +102,101 @@ const data = {
},
],
},
+ {
+ id: 1234,
+ material: '颗粒板',
+ color: '暖白',
+ boardInfos: [
+ {
+ houseName: 'F01',
+ closetName: 'G01',
+ boardNo: 'B1816478862',
+ boardName: '背板',
+ length: 944,
+ width: 59,
+ thickness: 18,
+ quantity: 1,
+ area: 0.568,
+ mutation: '',
+ shape: '',
+ direction: '1/1/1/1 ',
+ stripe: '正纹',
+ boardAddOn: '1',
+ },
+ {
+ houseName: 'F01',
+ closetName: 'G01',
+ boardNo: 'B1816478862',
+ boardName: '层板',
+ length: 944,
+ width: 598,
+ thickness: 18,
+ quantity: 1,
+ area: 0.568,
+ mutation: '',
+ shape: '造型',
+ direction: '1/1/1/1 ',
+ stripe: '正纹',
+ boardAddOn: '2',
+ },
+ {
+ houseName: 'F01',
+ closetName: 'G01',
+ boardNo: 'B1816478875',
+ boardName: '右侧板',
+ length: 1198,
+ width: 548,
+ thickness: 18,
+ quantity: 1,
+ area: 0.66,
+ mutation: '',
+ shape: '造型',
+ direction: '1/1/1/1 ',
+ stripe: '正纹',
+ boardAddOn: '3',
+ },
+ ],
+ },
+ {
+ id: 1235,
+ material: '生态板 ',
+ color: '暖黑',
+ boardInfos: [
+ {
+ houseName: 'F01',
+ closetName: 'G01',
+ boardNo: 'B1816478862',
+ boardName: '背板',
+ length: 944,
+ width: 598,
+ thickness: 18,
+ quantity: 1,
+ area: 0.568,
+ mutation: '',
+ shape: '',
+ direction: '1/1/1/1 ',
+ stripe: '正纹',
+ boardAddOn: '4',
+ },
+ {
+ houseName: 'F01',
+ closetName: 'G01',
+ boardNo: 'B1816478861',
+
+ boardName: '背板',
+ length: 944,
+ width: 598,
+ thickness: 18,
+ quantity: 1,
+ area: 0.568,
+ mutation: '',
+ shape: '',
+ direction: '1/1/1/1 ',
+ stripe: '正纹',
+ boardAddOn: '5',
+ },
+ ],
+ },
],
};
diff --git a/src/assets/methodTool.ts b/src/assets/methodTool.ts
index 278d64f..5067b30 100644
--- a/src/assets/methodTool.ts
+++ b/src/assets/methodTool.ts
@@ -1,10 +1,10 @@
const Tool = {
- addRow: (that, rowId) => {
+ addRow: (that: any, rowId: number) => {
if (that.selectedRow) {
for (const index in that.infos) {
if (that.selectedRow === that.infos[index].rowId) {
that.infos.splice(Number(index), 0, {
- rowId: rowId,
+ rowId,
rowTitle: rowId.toString(),
cells: [],
});
@@ -20,21 +20,23 @@ const Tool = {
});
}
},
- deleteRow: (that) => {
+ deleteRow: (that: any) => {
if (!that.selectedRow) {
return alert('请选择要删除行');
}
- that.infos = that.infos.filter((item) => item.rowId !== that.selectedRow);
+ that.infos = that.infos.filter(
+ (item: any) => item.rowId !== that.selectedRow,
+ );
that.selectedRow = 0;
},
- addCell: (that, cellId) => {
+ addCell: (that: any, cellId: number) => {
if (!that.selectedRow) {
return alert('请选择要添加单元的行');
}
for (const row of that.infos) {
if (that.selectedRow === row.rowId) {
row.cells.push({
- cellId: cellId,
+ cellId,
title: '列' + cellId,
colspan: 0,
height: 30,
@@ -46,7 +48,7 @@ const Tool = {
}
},
- deleteCell: (that) => {
+ deleteCell: (that: any) => {
// 9000 is initial cell Id.
if (that.selectedCell === 9000) {
return alert('请选择要删除的单元');
diff --git a/src/assets/templateInitialData.ts b/src/assets/templateInitialData.ts
index 8bc8a69..80c9519 100644
--- a/src/assets/templateInitialData.ts
+++ b/src/assets/templateInitialData.ts
@@ -728,30 +728,7 @@ const initialTemplateData = [
},
],
},
- {
- rowId: 9,
- rowTitle: '9',
- cells: [
- {
- cellId: 9050,
- title: '总计:',
- colspan: '10',
- height: 30,
- textAlign: 'right',
- fontSize: 16,
- fontStyle: 'bold',
- },
- {
- cellId: 9051,
- title: 'totalquantity',
- colspan: '14',
- height: 30,
- textAlign: 'center',
- fontSize: 16,
- fontStyle: 'normal',
- },
- ],
- },
+
{ rowId: 10, rowTitle: '10', cells: [] },
{ rowId: 11, rowTitle: '11', cells: [] },
{ rowId: 12, rowTitle: '12', cells: [] },
diff --git a/src/components/reportTemplate/ReportTemplate.vue b/src/components/reportTemplate/ReportTemplate.vue
index a9187e1..3477d1e 100644
--- a/src/components/reportTemplate/ReportTemplate.vue
+++ b/src/components/reportTemplate/ReportTemplate.vue
@@ -42,16 +42,16 @@
-
以下功能用于测试使用
+ +