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

@@ -6,6 +6,10 @@
 
 
 import timeFormat from 'filters/time-format';
 import timeFormat from 'filters/time-format';
 
 
+const statusMap = {
+    10: 'todo'
+};
+
 export default function() {
 export default function() {
     return {
     return {
         filters: {
         filters: {
@@ -84,7 +88,12 @@ export default function() {
             },
             },
             {
             {
                 title: '物流信息',
                 title: '物流信息',
-                align: 'center'
+                align: 'center',
+                render() {
+                    return (
+                        <span>-</span>
+                    );
+                }
             },
             },
             {
             {
                 title: '备注',
                 title: '备注',
@@ -93,7 +102,12 @@ export default function() {
             },
             },
             {
             {
                 title: '审核状态',
                 title: '审核状态',
-                align: 'center'
+                align: 'center',
+                render(h, params) {
+                    return (
+                        <span>{statusMap[params.row.status]}</span>
+                    );
+                }
             },
             },
             {
             {
                 title: '请退/退库时间',
                 title: '请退/退库时间',
@@ -106,7 +120,8 @@ export default function() {
             },
             },
             {
             {
                 title: '申请人',
                 title: '申请人',
-                align: 'center'
+                align: 'center',
+                key: 'founderName'
             },
             },
             {
             {
                 title: '操作',
                 title: '操作',