{{cell.title}} | -
@@ -60,54 +46,57 @@
+
+
以下功能用于测试使用
+ + ++ + {{selectedCell}}
+ + {{selectedRow}}
+ +
diff --git a/.prettierrc b/.prettierrc index a20502b..6d058ca 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,4 +1,5 @@ { "singleQuote": true, - "trailingComma": "all" + "trailingComma": "all", + "arrowParens": "always" } diff --git a/src/assets/data.ts b/src/assets/data.ts index be125c6..3899350 100644 --- a/src/assets/data.ts +++ b/src/assets/data.ts @@ -1,8 +1,7 @@ - const data = { orderNo: '101808023922', clientName: 'SongQingyang3', - soldData: '2018-08-23', + soldDate: '2018-08-23', contactName: 'K01', contactNo: '12345678901', deliveryAddress: 'D01', @@ -10,12 +9,12 @@ const data = { boards: [ { id: 1234, - matierial: '颗粒板', + material: '颗粒板', color: '暖白', boardInfos: [ { houseName: 'F01', - closetName: 'F01', + closetName: 'G01', boardNo: 'B1816478862', boardName: '背板', length: 944, @@ -26,12 +25,12 @@ const data = { mutation: '', shape: '', direction: '1/1/1/1 ', - strip: '正纹', - addOn: '', + stripe: '正纹', + boardAddOn: '', }, { houseName: 'F01', - closetName: 'F01', + closetName: 'G01', boardNo: 'B1816478862', boardName: '层板', length: 944, @@ -42,12 +41,12 @@ const data = { mutation: '', shape: '造型', direction: '1/1/1/1 ', - strip: '正纹', - addOn: '', + stripe: '正纹', + boardAddOn: '', }, { houseName: 'F01', - closetName: 'F01', + closetName: 'G01', boardNo: 'B1816478875', boardName: '右侧板', length: 1198, @@ -58,19 +57,24 @@ const data = { mutation: '', shape: '造型', direction: '1/1/1/1 ', - strip: '正纹', - addOn: '', + stripe: '正纹', + boardAddOn: '', }, ], }, - { + ], +}; + +export default data; +/* + { id: 1235, matierial: '生态板 ', color: '暖白', boardInfos: [ { houseName: 'F01', - closetName: 'F01', + closetName: 'G01', boardNo: 'B1816478862', boardName: '背板', length: 944, @@ -81,13 +85,14 @@ const data = { mutation: '', shape: '', direction: '1/1/1/1 ', - strip: '正纹', - addOn: '', + stripe: '正纹', + boardAddOn: '', }, { houseName: 'F01', - closetName: 'F01', + closetName: 'G01', boardNo: 'B1816478861', + boardName: '背板', length: 944, width: 598, @@ -97,12 +102,10 @@ const data = { mutation: '', shape: '', direction: '1/1/1/1 ', - strip: '正纹', - addOn: '', + stripe: '正纹', + boardAddOn: '', }, ], }, - ], -}; -export default data; +*/ diff --git a/src/assets/startUpRowColumn.ts b/src/assets/startUpRowColumn.ts new file mode 100644 index 0000000..de822c1 --- /dev/null +++ b/src/assets/startUpRowColumn.ts @@ -0,0 +1,391 @@ +const startUpRowColumn = [ + { + rowId: 0, + rowTitle: 0, + cells: [ + { + cellId: 1, + title: '1', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 2, + title: '2', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 3, + title: '3', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 4, + title: '4', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 5, + title: '5', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 6, + title: '6', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 7, + title: '7', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 8, + title: '8', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 9, + title: '9', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 10, + title: '10', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 11, + title: '11', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 12, + title: '12', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 13, + title: '13', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 14, + title: '14', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 15, + title: '15', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 16, + title: '16', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 17, + title: '17', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 18, + title: '18', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 19, + title: '19', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 20, + title: '20', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 21, + title: '21', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 22, + title: '22', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 23, + title: '23', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 24, + title: '24', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + ], + }, + { + rowId: 1, + + rowTitle: 1, + cells: [], + }, + { + rowId: 2, + + rowTitle: 2, + cells: [], + }, + { + rowId: 3, + + rowTitle: 3, + cells: [], + }, + { + rowId: 4, + + rowTitle: 4, + cells: [], + }, + { + rowId: 6, + + rowTitle: 6, + cells: [], + }, + { + rowId: 8, + + rowTitle: 8, + cells: [], + }, + { + rowId: 9, + rowTitle: 9, + cells: [], + }, + { + rowId: 10, + rowTitle: 10, + cells: [], + }, + { + rowId: 11, + rowTitle: 11, + cells: [], + }, + { + rowId: 12, + rowTitle: 12, + cells: [], + }, + { + rowId: 13, + rowTitle: 13, + cells: [], + }, + { + rowId: 14, + rowTitle: 14, + cells: [], + }, + { + rowId: 15, + rowTitle: 15, + cells: [], + }, + { + rowId: 16, + rowTitle: 16, + cells: [], + }, + { + rowId: 17, + rowTitle: 17, + cells: [], + }, + { + rowId: 18, + rowTitle: 18, + cells: [], + }, + { + rowId: 19, + rowTitle: 19, + cells: [], + }, + { + rowId: 20, + rowTitle: 20, + cells: [], + }, + { + rowId: 21, + rowTitle: 21, + cells: [], + }, + { + rowId: 22, + rowTitle: 22, + cells: [], + }, + { + rowId: 23, + rowTitle: 23, + cells: [], + }, + { + rowId: 24, + rowTitle: 24, + cells: [], + }, + { + rowId: 25, + rowTitle: 25, + cells: [], + }, + { + rowId: 26, + rowTitle: 26, + cells: [], + }, + { + rowId: 27, + rowTitle: 27, + cells: [], + }, + { + rowId: 28, + rowTitle: 28, + cells: [], + }, + { + rowId: 29, + rowTitle: 29, + cells: [], + }, +]; + +export default startUpRowColumn; diff --git a/src/assets/templateInitialData.ts b/src/assets/templateInitialData.ts new file mode 100644 index 0000000..bf00bc3 --- /dev/null +++ b/src/assets/templateInitialData.ts @@ -0,0 +1,647 @@ +const initialTemplateData = [ + { + rowId: 0, + rowTitle: 0, + cells: [ + { + cellId: 1, + title: '1', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 2, + title: '2', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 3, + title: '3', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 4, + title: '4', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 5, + title: '5', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 6, + title: '6', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 7, + title: '7', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 8, + title: '8', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 9, + title: '9', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 10, + title: '10', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 11, + title: '11', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 12, + title: '12', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 13, + title: '13', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 14, + title: '14', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 15, + title: '15', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 16, + title: '16', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 17, + title: '17', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 18, + title: '18', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 19, + title: '19', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 20, + title: '20', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 21, + title: '21', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 22, + title: '22', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 23, + title: '23', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 24, + title: '24', + colspan: 1, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + ], + }, + { + rowId: 1, + + rowTitle: 1, + cells: [ + { + cellId: 9001, + title: '板材明细单', + colspan: 24, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'bold', + }, + ], + }, + { + rowId: 2, + + rowTitle: 2, + cells: [ + { + cellId: 9002, + title: 'orderNo:', + colspan: 8, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 9003, + title: 'clientName:', + colspan: 8, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 9004, + title: 'soldDate:', + colspan: 8, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + ], + }, + { + rowId: 3, + + rowTitle: 3, + cells: [ + { + cellId: 9005, + title: 'contactName:', + colspan: 8, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 9006, + title: 'contactNo:', + colspan: 8, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + { + cellId: 9007, + title: 'deliveryAddress:', + colspan: 8, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + ], + }, + { + rowId: 4, + + rowTitle: 4, + cells: [ + { + cellId: 9008, + title: 'addOn:', + colspan: 8, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'normal', + }, + ], + }, + { + rowId: 6, + + rowTitle: 6, + cells: [ + { + cellId: 9009, + title: 'material:', + colspan: 8, + + height: 30, + textAlign: 'left', + fontSize: 16, + fontStyle: 'bold', + }, + { + cellId: 9010, + title: 'color:', + colspan: 8, + + height: 30, + textAlign: 'left', + fontSize: 16, + fontStyle: 'bold', + }, + { + cellId: 9011, + title: '共15条记录', + colspan: 8, + + height: 30, + textAlign: 'left', + fontSize: 16, + fontStyle: 'bold', + }, + ], + }, + { + rowId: 8, + + rowTitle: 8, + cells: [ + { + cellId: 9012, + title: 'houseName', + colspan: 2, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'bold', + }, + { + cellId: 9013, + title: 'closetName', + colspan: 0, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'bold', + }, + { + cellId: 9014, + title: 'boardNo', + colspan: 2, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'bold', + }, + { + cellId: 9015, + title: 'boardName', + colspan: 2, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'bold', + }, + { + cellId: 9016, + title: 'length', + colspan: 0, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'bold', + }, + { + cellId: 9017, + title: 'width', + colspan: 0, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'bold', + }, + { + cellId: 9018, + title: 'thickness', + colspan: 0, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'bold', + }, + { + cellId: 9019, + title: 'quantity', + colspan: 0, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'bold', + }, + { + cellId: 9020, + title: 'area', + colspan: 0, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'bold', + }, + { + cellId: 9021, + title: 'mutation', + colspan: 0, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'bold', + }, + { + cellId: 9022, + title: 'shape', + colspan: 0, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'bold', + }, + { + cellId: 9023, + title: 'direction', + colspan: 3, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'bold', + }, + { + cellId: 9024, + title: 'stripe', + colspan: 2, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'bold', + }, + { + cellId: 9025, + title: 'boardAddOn', + colspan: 5, + + height: 30, + textAlign: 'center', + fontSize: 16, + fontStyle: 'bold', + }, + ], + }, + { + rowId: 9, + rowTitle: 9, + cells: [], + }, + { + rowId: 10, + rowTitle: 10, + cells: [], + }, + { + rowId: 11, + rowTitle: 11, + cells: [], + }, + { + rowId: 12, + rowTitle: 12, + cells: [], + }, + { + rowId: 13, + rowTitle: 13, + cells: [], + }, + { + rowId: 14, + rowTitle: 14, + cells: [], + }, + { + rowId: 15, + rowTitle: 15, + cells: [], + }, + { + rowId: 16, + rowTitle: 16, + cells: [], + }, + { + rowId: 17, + rowTitle: 17, + cells: [], + }, + { + rowId: 18, + rowTitle: 18, + cells: [], + }, + { + rowId: 19, + rowTitle: 19, + cells: [], + }, + { + rowId: 20, + rowTitle: 20, + cells: [], + }, + { + rowId: 21, + rowTitle: 21, + cells: [], + }, + { + rowId: 22, + rowTitle: 22, + cells: [], + }, + { + rowId: 23, + rowTitle: 23, + cells: [], + }, + { + rowId: 24, + rowTitle: 24, + cells: [], + }, + { + rowId: 25, + rowTitle: 25, + cells: [], + }, + { + rowId: 26, + rowTitle: 26, + cells: [], + }, + { + rowId: 27, + rowTitle: 27, + cells: [], + }, + { + rowId: 28, + rowTitle: 28, + cells: [], + }, + { + rowId: 29, + rowTitle: 29, + cells: [], + }, +]; + +export default initialTemplateData; diff --git a/src/components/reportTemplate/ReportTemplate.vue b/src/components/reportTemplate/ReportTemplate.vue index 7b0ada8..467f829 100644 --- a/src/components/reportTemplate/ReportTemplate.vue +++ b/src/components/reportTemplate/ReportTemplate.vue @@ -2,39 +2,25 @@
{{cell.title}} | -
以下功能用于测试使用
+ + +