Showing
3 changed files
with
8 additions
and
13 deletions
@@ -90,11 +90,10 @@ export default function() { | @@ -90,11 +90,10 @@ export default function() { | ||
90 | render: (h, params) => { | 90 | render: (h, params) => { |
91 | const row = params.row; | 91 | const row = params.row; |
92 | 92 | ||
93 | - row.answerTimeStr = ''; | ||
94 | return ( | 93 | return ( |
95 | <div> | 94 | <div> |
96 | <p>咨询:{row.askTimeStr.length > 0 ? row.askTimeStr : '—'}</p> | 95 | <p>咨询:{row.askTimeStr.length > 0 ? row.askTimeStr : '—'}</p> |
97 | - <p>回复:{row.answerTimeStr.length > 0 ? row.answerTimeStr : '—'}</p> | 96 | + <p>{row.answerTimeStr.length > 0 ? `回复:${row.answerTimeStr}` : ''}</p> |
98 | </div> | 97 | </div> |
99 | ); | 98 | ); |
100 | } | 99 | } |
@@ -111,7 +110,6 @@ export default function() { | @@ -111,7 +110,6 @@ export default function() { | ||
111 | if (status === 2) { | 110 | if (status === 2) { |
112 | return ( | 111 | return ( |
113 | <div class="cell-action-row"> | 112 | <div class="cell-action-row"> |
114 | - {status === 2 ? (<p></p>) : (<p>2</p>)} | ||
115 | <i-button type="error" size="small" | 113 | <i-button type="error" size="small" |
116 | onClick={() => this.editAnswer(row)}> | 114 | onClick={() => this.editAnswer(row)}> |
117 | 修改 | 115 | 修改 |
@@ -38,7 +38,8 @@ | @@ -38,7 +38,8 @@ | ||
38 | 38 | ||
39 | <layout-list> | 39 | <layout-list> |
40 | <Table border :columns="tableCols" :data="tableData" @on-selection-change="selectChange"></Table> | 40 | <Table border :columns="tableCols" :data="tableData" @on-selection-change="selectChange"></Table> |
41 | - <Page :total="pageData.total" :current="pageData.current" | 41 | + <Page :total="pageData.total" |
42 | + :current="pageData.current" | ||
42 | @on-change="pageChange" show-total></Page> | 43 | @on-change="pageChange" show-total></Page> |
43 | </layout-list> | 44 | </layout-list> |
44 | 45 | ||
@@ -92,7 +93,7 @@ | @@ -92,7 +93,7 @@ | ||
92 | endTime = fts.endTime.model; | 93 | endTime = fts.endTime.model; |
93 | 94 | ||
94 | let page = this.pageData.current; | 95 | let page = this.pageData.current; |
95 | - let size = this.pageData.size; | 96 | + let pageSize = this.pageData.pageSize; |
96 | 97 | ||
97 | if (this.filters.erpSkuId.model) { | 98 | if (this.filters.erpSkuId.model) { |
98 | if (this.isNumber(this.filters.erpSkuId.model)) { | 99 | if (this.isNumber(this.filters.erpSkuId.model)) { |
@@ -110,7 +111,7 @@ | @@ -110,7 +111,7 @@ | ||
110 | } | 111 | } |
111 | } | 112 | } |
112 | 113 | ||
113 | - params.size = this.pageData.size; | 114 | + params.pageSize = this.pageData.pageSize; |
114 | params.page = this.pageData.current; | 115 | params.page = this.pageData.current; |
115 | 116 | ||
116 | return Promise.resolve({ | 117 | return Promise.resolve({ |
@@ -123,7 +124,7 @@ | @@ -123,7 +124,7 @@ | ||
123 | beginTime, | 124 | beginTime, |
124 | endTime, | 125 | endTime, |
125 | page, | 126 | page, |
126 | - size | 127 | + pageSize |
127 | }); | 128 | }); |
128 | }, | 129 | }, |
129 | list() { | 130 | list() { |
@@ -11,11 +11,6 @@ export default function() { | @@ -11,11 +11,6 @@ export default function() { | ||
11 | return { | 11 | return { |
12 | tableCols: [ | 12 | tableCols: [ |
13 | { | 13 | { |
14 | - type: 'selection', | ||
15 | - width: 60, | ||
16 | - align: 'center' | ||
17 | - }, | ||
18 | - { | ||
19 | title: 'SKU', | 14 | title: 'SKU', |
20 | key: 'erpSkuId', | 15 | key: 'erpSkuId', |
21 | width: 100, | 16 | width: 100, |
@@ -99,7 +94,8 @@ export default function() { | @@ -99,7 +94,8 @@ export default function() { | ||
99 | tableData: [], | 94 | tableData: [], |
100 | pageData: { | 95 | pageData: { |
101 | total: 0, | 96 | total: 0, |
102 | - current: 1 | 97 | + current: 1, |
98 | + pageSize: 10 | ||
103 | }, | 99 | }, |
104 | filters: { | 100 | filters: { |
105 | erpSkuId: { | 101 | erpSkuId: { |
-
Please register or login to post a comment