fe / yoho-shop-manage · Commits

Go to a project

Authored by zhangwenxue
Commit 817d9aa028e2577b622819394e30c6f928dea2ae 1 parent 21421c89

feature(finance): table-btn style

Inline Side-by-side
Showing 7 changed files with 60 additions and 36 deletions
@@ -27,11 +27,9 @@ @@ -27,11 +27,9 @@
27 <filter-item> 27 <filter-item>
28 <Button type="primary" @click="search">筛选</Button> 28 <Button type="primary" @click="search">筛选</Button>
29 <Button @click="reset">清空条件</Button> 29 <Button @click="reset">清空条件</Button>
  30 + <Button type="warning" class="table-btn" @click="exportData">导出</Button>
30 </filter-item> 31 </filter-item>
31 </layout-filter> 32 </layout-filter>
32 - <layout-action>  
33 - <Button type="warning" class="table-btn" @click="exportData">导出</Button>  
34 - </layout-action>  
35 <layout-list> 33 <layout-list>
36 <Table border :columns="tableCols" :data="tableData"></Table> 34 <Table border :columns="tableCols" :data="tableData"></Table>
37 <Page 35 <Page
@@ -157,3 +155,9 @@ export default { @@ -157,3 +155,9 @@ export default {
157 }, 155 },
158 }; 156 };
159 </script> 157 </script>
  158 +
  159 +<style scoped lang="scss">
  160 +.table-btn {
  161 + margin-left: 15px;
  162 +}
  163 +</style>
@@ -24,11 +24,9 @@ @@ -24,11 +24,9 @@
24 <Button @click="returnPage">返回对账单列表</Button> 24 <Button @click="returnPage">返回对账单列表</Button>
25 <Button type="primary" @click="search">筛选</Button> 25 <Button type="primary" @click="search">筛选</Button>
26 <Button @click="reset">清空条件</Button> 26 <Button @click="reset">清空条件</Button>
  27 + <Button type="warning" class="table-btn" @click="exportData">导出</Button>
27 </filter-item> 28 </filter-item>
28 </layout-filter> 29 </layout-filter>
29 - <layout-action>  
30 - <Button type="warning" class="table-btn" @click="exportData">导出</Button>  
31 - </layout-action>  
32 <layout-list> 30 <layout-list>
33 <Table border :columns="tableCols" :data="tableData"></Table> 31 <Table border :columns="tableCols" :data="tableData"></Table>
34 <Page 32 <Page
@@ -123,3 +121,9 @@ export default { @@ -123,3 +121,9 @@ export default {
123 }, 121 },
124 }; 122 };
125 </script> 123 </script>
  124 +
  125 +<style scoped lang="scss">
  126 +.table-btn {
  127 + margin-left: 15px;
  128 +}
  129 +</style>
@@ -12,12 +12,10 @@ @@ -12,12 +12,10 @@
12 <Button @click="returnPage">返回对账单列表</Button> 12 <Button @click="returnPage">返回对账单列表</Button>
13 <Button type="primary" @click="search">筛选</Button> 13 <Button type="primary" @click="search">筛选</Button>
14 <Button @click="reset">清空条件</Button> 14 <Button @click="reset">清空条件</Button>
  15 + <Button type="warning" class="table-btn" @click="exportData">导出</Button>
  16 + <Button type="success" @click="print">打印</Button>
15 </filter-item> 17 </filter-item>
16 </layout-filter> 18 </layout-filter>
17 - <layout-action>  
18 - <Button type="warning" class="table-btn" @click="exportData">导出</Button>  
19 - <Button type="success" class="table-btn" @click="print">打印</Button>  
20 - </layout-action>  
21 <layout-list> 19 <layout-list>
22 <Table border :columns="tableCols" :data="tableData"></Table> 20 <Table border :columns="tableCols" :data="tableData"></Table>
23 <Page 21 <Page
@@ -133,3 +131,9 @@ export default { @@ -133,3 +131,9 @@ export default {
133 }, 131 },
134 }; 132 };
135 </script> 133 </script>
  134 +
  135 +<style scoped lang="scss">
  136 +.table-btn {
  137 + margin-left: 15px;
  138 +}
  139 +</style>
@@ -14,12 +14,10 @@ @@ -14,12 +14,10 @@
14 <Button @click="returnPage">返回结算单列表</Button> 14 <Button @click="returnPage">返回结算单列表</Button>
15 <Button type="primary" @click="search">筛选</Button> 15 <Button type="primary" @click="search">筛选</Button>
16 <Button @click="reset">清空条件</Button> 16 <Button @click="reset">清空条件</Button>
  17 + <Button type="warning" class="table-btn" @click="exportData">导出</Button>
  18 + <Button type="success" @click="print">打印</Button>
17 </filter-item> 19 </filter-item>
18 </layout-filter> 20 </layout-filter>
19 - <layout-action>  
20 - <Button type="warning" class="table-btn" @click="exportData">导出</Button>  
21 - <Button type="success" class="table-btn" @click="print">打印</Button>  
22 - </layout-action>  
23 <layout-list> 21 <layout-list>
24 <Table border :columns="tableCols" :data="tableData"></Table> 22 <Table border :columns="tableCols" :data="tableData"></Table>
25 <Page 23 <Page
@@ -127,3 +125,9 @@ export default { @@ -127,3 +125,9 @@ export default {
127 }, 125 },
128 }; 126 };
129 </script> 127 </script>
  128 +
  129 +<style scoped lang="scss">
  130 +.table-btn {
  131 + margin-left: 15px;
  132 +}
  133 +</style>
@@ -14,11 +14,9 @@ @@ -14,11 +14,9 @@
14 <filter-item> 14 <filter-item>
15 <Button type="primary" @click="search">筛选</Button> 15 <Button type="primary" @click="search">筛选</Button>
16 <Button @click="reset">清空条件</Button> 16 <Button @click="reset">清空条件</Button>
  17 + <Button type="warning" class="table-btn" @click="exportData">导出</Button>
17 </filter-item> 18 </filter-item>
18 </layout-filter> 19 </layout-filter>
19 - <layout-action>  
20 - <Button type="warning" class="table-btn" @click="exportData">导出</Button>  
21 - </layout-action>  
22 <layout-list> 20 <layout-list>
23 <Table border :columns="tableCols" :data="tableData"></Table> 21 <Table border :columns="tableCols" :data="tableData"></Table>
24 <Page 22 <Page
@@ -139,3 +137,9 @@ export default { @@ -139,3 +137,9 @@ export default {
139 }, 137 },
140 }; 138 };
141 </script> 139 </script>
  140 +
  141 +<style scoped lang="scss">
  142 +.table-btn {
  143 + margin-left: 15px;
  144 +}
  145 +</style>
@@ -12,12 +12,10 @@ @@ -12,12 +12,10 @@
12 <Button @click="returnPage">返回结算单列表</Button> 12 <Button @click="returnPage">返回结算单列表</Button>
13 <Button type="primary" @click="search">筛选</Button> 13 <Button type="primary" @click="search">筛选</Button>
14 <Button @click="reset">清空条件</Button> 14 <Button @click="reset">清空条件</Button>
  15 + <Button type="warning" class="table-btn" @click="exportData">导出</Button>
  16 + <Button type="success" @click="print">打印</Button>
15 </filter-item> 17 </filter-item>
16 </layout-filter> 18 </layout-filter>
17 - <layout-action>  
18 - <Button type="warning" class="table-btn" @click="exportData">导出</Button>  
19 - <Button type="success" class="table-btn" @click="print">打印</Button>  
20 - </layout-action>  
21 <layout-list> 19 <layout-list>
22 <Table border :columns="tableCols" :data="tableData"></Table> 20 <Table border :columns="tableCols" :data="tableData"></Table>
23 <Page 21 <Page
@@ -133,3 +131,9 @@ export default { @@ -133,3 +131,9 @@ export default {
133 }, 131 },
134 }; 132 };
135 </script> 133 </script>
  134 +
  135 +<style scoped lang="scss">
  136 +.table-btn {
  137 + margin-left: 15px;
  138 +}
  139 +</style>
@@ -9,12 +9,12 @@ export default function() { @@ -9,12 +9,12 @@ export default function() {
9 { 9 {
10 title: '结算单号', 10 title: '结算单号',
11 key: 'balanceId', 11 key: 'balanceId',
12 - align: 'center' 12 + align: 'center',
13 }, 13 },
14 { 14 {
15 title: 'SKU', 15 title: 'SKU',
16 key: 'productSku', 16 key: 'productSku',
17 - align: 'center' 17 + align: 'center',
18 }, 18 },
19 { 19 {
20 title: '产品名称', 20 title: '产品名称',
@@ -29,44 +29,44 @@ export default function() { @@ -29,44 +29,44 @@ export default function() {
29 { 29 {
30 title: '尺码', 30 title: '尺码',
31 key: 'sizeName', 31 key: 'sizeName',
32 - align: 'center' 32 + align: 'center',
33 }, 33 },
34 { 34 {
35 title: '品牌', 35 title: '品牌',
36 key: 'brandName', 36 key: 'brandName',
37 - align: 'center' 37 + align: 'center',
38 }, 38 },
39 { 39 {
40 title: '业务类型', 40 title: '业务类型',
41 key: 'agencyTypeDesc', 41 key: 'agencyTypeDesc',
42 - align: 'center' 42 + align: 'center',
43 }, 43 },
44 { 44 {
45 title: '数量', 45 title: '数量',
46 key: 'salesNums', 46 key: 'salesNums',
47 - align: 'center' 47 + align: 'center',
48 }, 48 },
49 { 49 {
50 title: '结算金额', 50 title: '结算金额',
51 key: 'salesAmount', 51 key: 'salesAmount',
52 - align: 'center' 52 + align: 'center',
53 }, 53 },
54 { 54 {
55 title: '付款状态', 55 title: '付款状态',
56 key: 'payerStatusDesc', 56 key: 'payerStatusDesc',
57 - align: 'center' 57 + align: 'center',
58 }, 58 },
59 { 59 {
60 title: '对账起止日期', 60 title: '对账起止日期',
61 key: 'clearingInterval', 61 key: 'clearingInterval',
62 - align: 'center'  
63 - } 62 + align: 'center',
  63 + },
64 ], 64 ],
65 tableData: [], 65 tableData: [],
66 pageData: { 66 pageData: {
67 total: 0, 67 total: 0,
68 pageNo: 1, 68 pageNo: 1,
69 - pageSize: 20 69 + pageSize: 20,
70 }, 70 },
71 filters: { 71 filters: {
72 sku: { 72 sku: {
@@ -74,22 +74,22 @@ export default function() { @@ -74,22 +74,22 @@ export default function() {
74 labelSpan: 6, 74 labelSpan: 6,
75 model: '', 75 model: '',
76 holder: '', 76 holder: '',
77 - fieldSpan: 18 77 + fieldSpan: 18,
78 }, 78 },
79 balanceId: { 79 balanceId: {
80 label: '结算单号', 80 label: '结算单号',
81 labelSpan: 6, 81 labelSpan: 6,
82 model: this.$route.query.balanceId, 82 model: this.$route.query.balanceId,
83 holder: '', 83 holder: '',
84 - fieldSpan: 18 84 + fieldSpan: 18,
85 }, 85 },
86 brandId: { 86 brandId: {
87 label: '品牌', 87 label: '品牌',
88 labelSpan: 6, 88 labelSpan: 6,
89 model: this.$route.query.brandId, 89 model: this.$route.query.brandId,
90 holder: '', 90 holder: '',
91 - fieldSpan: 18 91 + fieldSpan: 18,
  92 + },
92 }, 93 },
93 - }  
94 }; 94 };
95 } 95 }