商品退库和品牌组件默认选项全部去除

 <template>
-    <Select v-model="brandId" @on-change="selectChange">
-        <Option :value="-1">全部</Option>
+    <Select v-model="brandId" @on-change="selectChange" clearable>
         <Option v-for="option in optionList" :value="option.brandId" :key="option.brandId">
             {{option.brandName}}
         </Option>

@@ -74,7 +74,7 @@ export default function() {
                 label: '选择品牌',
                 labelSpan: 6,
                 fieldSpan: 18,
-                model: -1
+                model: ''
             },
 
             verifyStatus: {

@@ -209,7 +209,7 @@ export default function() {
                 label: '选择品牌',
                 labelSpan: 6,
                 fieldSpan: 18,
-                model: -1
+                model: ''
             },
             verifyStatus: {
                 label: '审核状态',

@@ -61,7 +61,7 @@
 <script>
     import _ from 'lodash';
     import service from 'product-service';
-    import {SelectBrand, SelectCategory} from 'components/select';
+    import {SelectCategory} from 'components/select';
     import {CellImage, CellInfo, CellPrice} from 'components/cell';
     import vipStore from './store';
 
@@ -270,7 +270,6 @@
             }
         },
         components: {
-            SelectBrand,
             SelectCategory,
             CellImage,
             CellInfo,

@@ -149,5 +149,9 @@
 </script>
 
 <style lang="scss">
-
+    .action-column {
+        .action-btn {
+            margin-right: 10px;
+        }
+    }
 </style>

@@ -11,71 +11,100 @@ export default function() {
         columns: [
             {
                 title: 'SKN',
-                align: 'center'
+                align: 'center',
+                key: 'productSkn'
             },
             {
                 title: 'SKC(颜色)',
-                align: 'center'
+                align: 'center',
+                render: (h, params) => {
+                    const row = params.row;
+
+                    return (
+                        <span>{row.productSkc}({row.colorName})</span>
+                    );
+                }
             },
             {
                 title: 'SKU(尺码)',
-                align: 'center'
+                align: 'center',
+                render: (h, params) => {
+                    const row = params.row;
+
+                    return (
+                        <span>{row.productSku}({row.sizeName})</span>
+                    );
+                }
             },
             {
                 title: '条码',
-                align: 'center'
+                align: 'center',
+                key: 'factoryCode'
             },
             {
                 title: '品牌',
-                align: 'center'
+                align: 'center',
+                key: 'brandName'
             },
             {
                 title: '库存',
-                align: 'center'
+                align: 'center',
+                key: 'stockNum'
             },
             {
                 title: '占用库存',
-                align: 'center'
+                align: 'center',
+                key: 'occupiedNum'
             },
             {
                 title: '请退数量',
-                align: 'center'
+                align: 'center',
+                key: 'nums'
             },
             {
                 title: '已退数量',
-                align: 'center'
+                align: 'center',
+                key: 'outNums'
             },
             {
                 title: '货位',
-                align: 'center'
+                align: 'center',
+                key: 'seatCodeString'
             },
             {
                 title: '批次',
-                align: 'center'
+                align: 'center',
+                key: 'batchId'
             },
             {
                 title: '库存类型',
-                align: 'center'
+                align: 'center',
+                key: 'propertyName'
             },
             {
                 title: '退货原因',
-                align: 'center'
+                align: 'center',
+                key: 'returndReason'
             },
             {
                 title: '物流单号',
-                align: 'center'
+                align: 'center',
+                key: 'expressCode'
             },
             {
                 title: '承担方',
-                align: 'center'
+                align: 'center',
+                key: 'feeTypeCn'
             },
             {
                 title: '请退时间',
-                align: 'center'
+                align: 'center',
+                key: 'createTime'
             },
             {
                 title: '退库时间',
-                align: 'center'
+                align: 'center',
+                key: 'outTime'
             }
         ],
         dataList: []

@@ -50,13 +50,35 @@ export default function() {
                 key: 'returnedSupplierId'
             },
             {
+                title: '供应商',
+                align: 'center',
+                key: 'supplierName'
+            },
+            {
                 title: '品牌',
                 align: 'center',
                 key: 'brandName'
             },
             {
                 title: '已退/请退数量',
-                align: 'center'
+                align: 'center',
+                render: (h, params) => {
+                    const row = params.row;
+                    const outNum = row.totalOutNums;
+                    const num = row.totalNums;
+                    let percent = 100;
+
+                    if (num) {
+                        percent = outNum / num * 100;
+                    }
+
+                    return (
+                        <div>
+                            <i-progress percent={percent} hide-info></i-progress>
+                            <span>{outNum}/{num}</span>
+                        </div>
+                    );
+                }
             },
             {
                 title: '物流信息',
@@ -82,19 +104,23 @@ export default function() {
             {
                 title: '操作',
                 align: 'center',
+                width: 140,
                 render: (h, params) => {
                     const row = params.row;
 
                     return (
                         <div>
-                            <i-button type="primary"
-                                onClick={() => this.goDetail(row)}>
-                                详情
-                            </i-button>
-                            <i-button type="primary">导出</i-button>
+                            <span class="action-btn">
+                                <i-button type="success" size="small"
+                                    onClick={() => this.goDetail(row)}>
+                                    详情
+                                </i-button>
+                            </span>
+                            <span><i-button type="primary" size="small">导出</i-button></span>
                         </div>
                     );
-                }
+                },
+                className: 'action-column'
             }
         ],
         dataList: [],