fix

-sass_binary_site=https://npm.taobao.org/mirrors/node-sass/
\ No newline at end of file
+sass_binary_site=https://npm.taobao.org/mirrors/node-sass/
+registry=http://npm.yohops.com
+

@@ -3,6 +3,6 @@ export default {
     name: 'list',
     component: () => import(/* webpackChunkName: "kol.reconciliation" */'./list'),
     meta: {
-        pageName: '新建页面'
+        pageName: '对帐单管理'
     }
 };

 <template>
     <layout-body>
         <layout-filter ref="filter" :model="query">
+            <filter-item label="对帐单号">
+                <Input v-model.trim="query.reconciliationId" :maxlength="9"></Input>
+            </filter-item>
             <filter-item label="SKN编码">
                 <Input v-model.trim="query.sknCode" :maxlength="9"></Input>
             </filter-item>
-            <filter-item label="商家编码">
-                <Input v-model.trim="query.prodCode"></Input>
-            </filter-item>
             <filter-item label="商品名称">
                 <Input v-model.trim="query.prodName"></Input>
             </filter-item>
-            <filter-item label="商品条码">
-                <Input v-model.trim="query.prodBarCode"></Input>
+          <filter-item label="品牌">
+                <select-brand v-model="query.brand"></select-brand>
+            </filter-item>
+            <filter-item label="订单号">
+                <Input v-model.trim="query.orderId"></Input>
+            </filter-item>
+            <filter-item label="业务类型">
+                <Select v-model="query.reconciliationType" clearable>
+                    <Option value="1">销售出库</Option>
+                    <Option value="2">退货入库</Option>
+                </Select>
+            </filter-item>
+            <filter-item label="对帐单状态">
+                <Select v-model="query.reconciliationStatus" clearable>
+                    <Option value="1">未对帐</Option>
+                    <Option value="2">待结算</Option>
+                    <Option value="3">已结算</Option>
+                </Select>
             </filter-item>
             <filter-item>
                 <Button type="primary" @click="search">筛选</Button>
@@ -33,14 +49,13 @@ export default {
     data() {
         return {
             query: {
+                reconciliationId: '',
                 sknCode: '',
-                prodCode: '',
                 prodName: '',
-                prodBarCode: '',
-                category: [],
-                brand: 0,
-                saleStatus: 0,
-                stockStatus: 0
+                brand: null,
+                orderId: null,
+                reconciliationType: null,
+                reconciliationStatus: null,
             },
             pageData: {
                 total: 0,
@@ -57,18 +72,53 @@ export default {
                 col2: '6'
             }],
             tableCols: [{
-                title: '列1',
+                title: '订单号',
                 key: 'col1'
             }, {
-                title: '列2',
+                title: '帐单生成时间',
+                key: 'col2'
+            }, {
+                title: '对帐单号',
+                key: 'col2'
+            }, {
+                title: '对帐时间',
+                key: 'col2'
+            }, {
+                title: 'SKU',
+                key: 'col2'
+            }, {
+                title: '商品名称',
+                key: 'col2'
+            }, {
+                title: '品牌',
                 key: 'col2'
             }, {
+                title: '吊牌价',
+                key: 'col2'
+            }, {
+                title: '支付金额',
+                key: 'col2'
+            }, {
+                title: '结算比例',
+                key: 'col2'
+            }, {
+                title: '业务类型',
+                key: 'col2'
+            }, {
+                title: '数量',
+                key: 'col2'
+            }, {
+                title: '佣金',
+                key: 'col2'
+            }, {
+                title: '状态',
+                key: 'col21'
+            }, {
                 title: '操作',
                 render: (h, params) => {
                     return (
                         <action-group>
-                            <i-button type="primary" size="small" onClick={() => this.edit(params.row)}>编辑</i-button>
-                            <i-button type="error" size="small" onClick={() => this.del(params.row)}>删除</i-button>
+                            <i-button type="primary" size="small" onClick={() => this.edit(params.row)}>对帐</i-button>
                         </action-group>
                     );
                 }
@@ -88,7 +138,8 @@ export default {
         pageChange() {
             this.search();
         },
-        edit() {},
+        edit() {
+        },
         del() {}
     },
     components: {Demo}

@@ -3,6 +3,6 @@ export default {
     name: 'detail',
     component: () => import(/* webpackChunkName: "kol.settlement-detail" */'./settlement-detail'),
     meta: {
-        pageName: '新建页面'
+        pageName: '结算单详情'
     }
 };

@@ -3,6 +3,6 @@ export default {
     name: 'list',
     component: () => import(/* webpackChunkName: "kol.Settlement-list" */'./settlement-list'),
     meta: {
-        pageName: '新建页面'
+        pageName: '结算单管理'
     }
 };