入库差异修改

 <template>
     <layout-body>
         <layout-filter>
-            <filter-item :label="filterOptions.handleActions.label">
-                <Select v-model.trim="filters.handleActions">
-                    <Option v-for="option in filterOptions.handleActions.options"
+            <filter-item :label="filters.subject.label">
+                <Input v-model.trim="filters.subject.model"
+                       :placeholder="filters.subject.holder"></Input>
+            </filter-item>
+            <filter-item :label="filters.emergency.label">
+                <Select v-model.trim="filters.emergency.model">
+                    <Option v-for="option in filters.emergency.options"
                             :value="option.value"
                             :key="option.value">{{option.label}}</Option>
                 </Select>
             </filter-item>
-            <filter-item :label="filterOptions.handleStatus.label">
-                <Select v-model.trim="filters.handleStatus">
-                    <Option v-for="option in filterOptions.handleStatus.options"
+            <filter-item :label="filters.brand.label">
+                <select-brand v-model="filters.brand.model"></select-brand>
+            </filter-item>
+            <filter-item :label="filters.status.label">
+                <Select v-model.trim="filters.status.model">
+                    <Option v-for="option in filters.status.options"
                             :value="option.value"
                             :key="option.value">{{option.label}}</Option>
                 </Select>
@@ -22,54 +29,37 @@
         </layout-filter>
 
         <layout-list>
-            <Table border :columns="table.cols" :data="table.data"></Table>
-            <Page :total="pager.total" :current="pager.current"
+            <Table border :columns="tableColumns" :data="tableDataList"></Table>
+            <Page :total="page.total" :current="page.current"
                   @on-change="pageChange" :page-size="20" show-total></Page>
         </layout-list>
     </layout-body>
 </template>
 
 <script>
-import {filterFields, table} from './store';
+import diffData from './store';
+import {SelectBrand} from 'components/select';
 
 export default {
     data() {
-        return {
-            self: this,
-            filters: {
-                handleActions: '',
-                handleStatus: ''
-            },
-            filterOptions: filterFields,
-            table: {
-                cols: table.cols,
-                data: []
-            },
-            pager: {
-                total: 0,
-                current: 1
-            }
-        };
+        return diffData.apply(this);
     },
     created() {
     },
     methods: {
         clearFilter() {
-            this.filters.handleActions = '';
-            this.filters.handleStatus = '';
         },
         filterSearch() {
 
         },
         pageChange() {
-
         }
     },
+    components: {
+        SelectBrand
+    }
 };
 </script>
 
 <style lang="scss">
-    .btn-row-space {
-        margin-top: 10px;
-    }
 </style>

 /**
- * on sale page store
+ * 入库差异
  * @author: qi.li <qi.li@yoho.cn>
- * @date: 2017/04/13
+ * @date: 2017/06/08
  */
-
-let filterFields = {
-    handleActions: {
-        label: '处理方式',
-        labelSpan: 6,
-        fieldSpan: 18,
-        model: -1,
-        options: [
+export default function() {
+    return {
+        tableColumns: [
             {
-                value: -1,
-                label: '全部'
+                type: 'selection',
+                width: 60,
+                align: 'center'
             },
             {
-                value: 1,
-                label: '退回'
-            },
-            {
-                value: 2,
-                label: '补单入库'
-            },
-            {
-                value: 3,
-                label: '少货补库'
+                title: '商品图片',
+                key: 'image',
+                align: 'center',
+                render: (h, params) => {
+                    return (
+                        <img v-prod-img={params.row.productSKN}/>
+                    );
+                }
             }
-        ]
-    },
-    handleStatus: {
-        label: '状态',
-        labelSpan: 6,
-        fieldSpan: 18,
-        model: -1,
-        options: [
-            {
-                value: -1,
-                label: '全部'
+        ],
+        tableDataList: [],
+        page: {
+            total: 0,
+            current: 1
+        },
+        filters: {
+            subject: {
+                label: '主题',
+                model: ''
             },
-            {
-                value: 1,
-                label: '处理中-侍确认'
+            emergency: {
+                label: '紧急程度',
+                model: '',
+                options: [
+                    {
+                        value: 1,
+                        label: '启用'
+                    },
+                    {
+                        value: 2,
+                        label: '禁用'
+                    }
+                ]
             },
-            {
-                value: 2,
-                label: '处理中-已确认'
+            brand: {
+                label: '选择品牌',
+                model: ''
+            },
+            status: {
+                label: '状态',
+                model: '',
+                options: [
+                    {
+                        value: 1,
+                        label: '启用'
+                    },
+                    {
+                        value: 2,
+                        label: '禁用'
+                    }
+                ]
             },
-            {
-                value: 3,
-                label: '完成'
-            }
-        ]
-    }
-};
-
-const table = {
-    cols: [
-        {
-            title: '差异单号',
-            key: 'info',
-            align: 'center',
-        },
-        {
-            title: '差异来源',
-            key: 'info',
-            align: 'center',
-        },
-        {
-
-            title: '主题',
-            key: 'info',
-            align: 'center',
-        },
-        {
-
-            title: '处理方式',
-            key: 'info',
-            align: 'center',
-        },
-        {
-
-            title: '发起时间',
-            key: 'info',
-            align: 'center',
-        },
-        {
-            title: '品牌经理',
-            key: 'info',
-            align: 'center',
-        },
-        {
-            title: '操作',
-            key: 'info',
-            align: 'center',
         }
-
-    ]
-};
-
-export {
-    filterFields,
-    table
-};
-
+    };
+}

-import diff from './diff-iframe';
+import diff from './diff';
 import jit from './jit';
 import prodReturn from './return';
 import supplement from './supplement';