Merge remote-tracking branch 'origin/release/1.0' into release/1.0
Showing
5 changed files
with
4 additions
and
7 deletions
@@ -142,7 +142,7 @@ export default () => { | @@ -142,7 +142,7 @@ export default () => { | ||
142 | className: 'status-cell' | 142 | className: 'status-cell' |
143 | }, | 143 | }, |
144 | { | 144 | { |
145 | - title: '入库单号', | 145 | + title: '调拨单号', |
146 | key: 'proRequisitionFormId', | 146 | key: 'proRequisitionFormId', |
147 | align: 'center', | 147 | align: 'center', |
148 | } | 148 | } |
@@ -149,7 +149,7 @@ export default () => { | @@ -149,7 +149,7 @@ export default () => { | ||
149 | className: 'status-cell' | 149 | className: 'status-cell' |
150 | }, | 150 | }, |
151 | { | 151 | { |
152 | - title: '入库单号', | 152 | + title: '调拨单号', |
153 | key: 'proRequisitionFormId', | 153 | key: 'proRequisitionFormId', |
154 | align: 'center', | 154 | align: 'center', |
155 | } | 155 | } |
@@ -88,7 +88,7 @@ | @@ -88,7 +88,7 @@ | ||
88 | const fmt = 'YYYY-MM-DD HH:mm:ss'; | 88 | const fmt = 'YYYY-MM-DD HH:mm:ss'; |
89 | 89 | ||
90 | this.table.list = data; | 90 | this.table.list = data; |
91 | - this.expressTime = moment.unix(data.createTime).format(fmt); | 91 | + this.expressTime = moment.unix(data[0].createTime).format(fmt); |
92 | } | 92 | } |
93 | }, | 93 | }, |
94 | components: { | 94 | components: { |
-
Please register or login to post a comment