Authored by htoooth

Merge remote-tracking branch 'origin/release/1.0' into release/1.0

<template>
<div class="cell-info">
<div class="img">
<img src=""></img>
</div>
<div class="detail">
<p>SKU:{{sku}}</p>
<p>SKN:{{skn}}</p>
... ...
... ... @@ -142,7 +142,7 @@ export default () => {
className: 'status-cell'
},
{
title: '入库单号',
title: '调拨单号',
key: 'proRequisitionFormId',
align: 'center',
}
... ...
... ... @@ -149,7 +149,7 @@ export default () => {
className: 'status-cell'
},
{
title: '入库单号',
title: '调拨单号',
key: 'proRequisitionFormId',
align: 'center',
}
... ...
... ... @@ -96,7 +96,7 @@
let params = {
pageNo: 1,
pageSize: 20,
statusList: [1, 2]
statusList: [1]
};
if (!this.useFilter) {
... ...
... ... @@ -88,7 +88,7 @@
const fmt = 'YYYY-MM-DD HH:mm:ss';
this.table.list = data;
this.expressTime = moment.unix(data.createTime).format(fmt);
this.expressTime = moment.unix(data[0].createTime).format(fmt);
}
},
components: {
... ...