Authored by htoooth

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

1 <template> 1 <template>
2 <div class="cell-info"> 2 <div class="cell-info">
3 - <div class="img">  
4 - <img src=""></img>  
5 - </div>  
6 <div class="detail"> 3 <div class="detail">
7 <p>SKU:{{sku}}</p> 4 <p>SKU:{{sku}}</p>
8 <p>SKN:{{skn}}</p> 5 <p>SKN:{{skn}}</p>
@@ -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 }
@@ -96,7 +96,7 @@ @@ -96,7 +96,7 @@
96 let params = { 96 let params = {
97 pageNo: 1, 97 pageNo: 1,
98 pageSize: 20, 98 pageSize: 20,
99 - statusList: [1, 2] 99 + statusList: [1]
100 }; 100 };
101 101
102 if (!this.useFilter) { 102 if (!this.useFilter) {
@@ -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: {