fix

 import SelectBrand from './select-brand';
 import SelectCategory from './select-category';
 import SelectSeason from './select-season';
+import SelectRoom from './select-room';
+import SelectExpress from './select-express';
 
 export {
     SelectBrand,
     SelectCategory,
-    SelectSeason
+    SelectSeason,
+    SelectRoom,
+    SelectExpress
 };

+<template>
+    <Select :value="value" @input="handleChange">
+        <Option v-for="i in list" :value="i.id" :key="item">{{ i.companyName }}</Option>
+    </Select>
+</template>
+
+<script>
+    import service from 'services/supplier-service';
+
+    export default {
+        name: 'SelectExpress',
+        props: ['value'],
+        data() {
+            return {
+                list: []
+            };
+        },
+        mounted() {
+            this.getExpressList();
+        },
+        methods: {
+            getExpressList() {
+                return service.listExpress().then((result) => {
+                    this.list = result.data;
+                });
+            },
+            handleChange(value) {
+                this.$emit('input', value);
+            }
+        }
+    };
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

+<template>
+    <Select :value="value" @input="handleChange">
+        <Option v-for="i in list" :value="i.id" :key="item">{{ i.storehouseName }}</Option>
+    </Select>
+</template>
+
+<script>
+    import service from 'services/supplier-service';
+
+    export default {
+        name: 'StorageList',
+        props: ['value'],
+        data() {
+            return {
+                list: []
+            };
+        },
+        mounted() {
+            this.getStoreList();
+        },
+        methods: {
+            getStoreList() {
+                return service.getStorageList().then((result) => {
+                    this.list = result.data;
+                });
+            },
+            handleChange(value) {
+                this.$emit('input', value);
+            }
+        }
+    };
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

+/**
+ * Created by TaoHuang on 2017/5/26.
+ */
+
+/**
+ * Created by TaoHuang on 2017/5/25.
+ */
+
+const list = r => require.ensure([], () => r(require('./list')), 'repository.express');
+const info = r => require.ensure([], () => r(require('./info')), 'repository.express');
+
+export default [{
+    path: '/list.html',
+    name: 'list',
+    component: list,
+    meta: {
+        pageName: '发货入库物流管理'
+    }
+}, {
+    path: '/info/:id.html',
+    name: 'info',
+    component: info,
+    meta: {
+        pageName: '发货入库物流详情'
+    }
+}];
\ No newline at end of file

+<template>
+    <LayoutBody>
+        <LayoutFilter>
+            <FilterItem :label="filters.id.label">
+                <Input v-model.trim="filters.id.model" :number="true"
+                       :placeholder="filters.id.holder" :maxlength="9"></Input>
+            </FilterItem>
+
+            <FilterItem :label="filters.expressNumber.label">
+                <Input v-model.trim="filters.expressNumber.model" :number="true"
+                       :placeholder="filters.expressNumber.holder" :maxlength="9"></Input>
+            </FilterItem>
+
+            <FilterItem :label="filters.productSkn.label">
+                <Input v-model.trim="filters.productSkn.model" :number="true"
+                       :placeholder="filters.productSkn.holder" :maxlength="9"></Input>
+            </FilterItem>
+
+            <FilterItem :label="filters.sknFactoryCode.label">
+                <Input v-model.trim="filters.sknFactoryCode.model" :number="true"
+                       :placeholder="filters.sknFactoryCode.holder" :maxlength="9"></Input>
+            </FilterItem>
+
+            <FilterItem :label="filters.skuFactoryCode.label">
+                <Input v-model.trim="filters.skuFactoryCode.model" :number="true"
+                       :placeholder="filters.skuFactoryCode.holder" :maxlength="9"></Input>
+            </FilterItem>
+
+            <FilterItem :label="filters.createTime.label">
+                <Date-picker v-model="filters.createTime.model"
+                             type="datetimerange" format="yyyy-MM-dd" placeholder="选择日期和时间">
+                </Date-picker>
+            </FilterItem>
+
+            <FilterItem :label="filters.auditStatus.label">
+                <Select v-model.trim="filters.auditStatus.model">
+                    <Option v-for="option in filters.auditStatus.options"
+                            :value="option.value"
+                            :key="option.value">{{option.label}}</Option>
+                </Select>
+            </FilterItem>
+
+            <FilterItem>
+                <Button type="primary">筛选</Button>
+                <Button @click="clearFilters">清空条件</Button>
+            </FilterItem>
+        </LayoutFilter>
+
+        <LayoutAction>
+            <Button type="ghost" @click="onClickCreate">创建入库单</Button>
+        </LayoutAction>
+
+        <LayoutList>
+            <Table border :columns="tableCols" :data="tableData"></Table>
+            <Page :total="pageData.total" :current="pageData.current"
+                  @on-change="pageChange" :page-size="20" show-total></Page>
+        </LayoutList>
+
+    </LayoutBody>
+</template>
+
+<script>
+    import _ from 'lodash';
+    import {tableCols, tableData, pageData} from './store/list-table';
+    import service from 'services/supplier-service';
+
+    export default {
+        data() {
+            return {
+                tableCols: tableCols.call(this),
+                tableData,
+                pageData,
+                filters: {
+                    id: {
+                        label: '入库单号',
+                        labelSpan: 6,
+                        model: '',
+                        holder: '',
+                        fieldSpan: 18
+                    },
+                    expressNumber: {
+                        label: '物流单号',
+                        labelSpan: 6,
+                        model: '',
+                        holder: '',
+                        fieldSpan: 18
+                    },
+                    productSkn: {
+                        label: 'SKN编码',
+                        labelSpan: 6,
+                        model: '',
+                        holder: '',
+                        fieldSpan: 18
+                    },
+                    sknFactoryCode: {
+                        label: '商家编码',
+                        labelSpan: 6,
+                        model: '',
+                        holder: '',
+                        fieldSpan: 18
+                    },
+                    skuFactoryCode: {
+                        label: '商品条码',
+                        labelSpan: 6,
+                        model: '',
+                        holder: '',
+                        fieldSpan: 18
+                    },
+                    createTime: {
+                        label: '创建时间',
+                        labelSpan: 6,
+                        model: '',
+                        holder: '',
+                        fieldSpan: 18
+                    },
+                    auditStatus: {
+                        label: '审核状态',
+                        labelSpan: 6,
+                        model: '',
+                        holder: '',
+                        fieldSpan: 18,
+                        options: [
+                            {
+                                value: -1,
+                                label: '全部'
+                            },
+                            {
+                                value: 10,
+                                label: '未提交'
+                            },
+                            {
+                                value: 20,
+                                label: '待审核'
+                            },
+                            {
+                                value: 41,
+                                label: '驳回'
+                            },
+                            {
+                                value: 40,
+                                label: '通过'
+                            }
+                        ]
+                    }
+                }
+            };
+        },
+        mounted() {
+            this.getOrders();
+        },
+        methods: {
+            onClickCreate() {
+                this.$refs.createModal.show();
+            },
+            onClickEdit() {
+
+            },
+            clearFilters() {
+                this.filters.id.model = null;
+                this.filters.expressNumber.model = null;
+                this.filters.productSkn.model = null;
+                this.filters.sknFactoryCode.model = null;
+                this.filters.skuFactoryCode.model = null;
+                this.filters.createTime.model = null;
+                this.filters.auditStatus.model = -1;
+                this.pageData.current = 1;
+                this.pageData.total = 0;
+
+                this.getOrders();
+            },
+            filtersParams() {
+                let params = {};
+
+                if (this.filters.id.model) {
+                    params.id = this.filters.id.model;
+                }
+
+                if (this.filters.expressNumber.model) {
+                    params.expressNumber = this.filters.expressNumber.model;
+                }
+
+                if (this.filters.productSkn.model) {
+                    params.productSkn = this.filters.productSkn.model;
+                }
+
+                if (this.filters.sknFactoryCode.model) {
+                    params.sknFactoryCode = this.filters.sknFactoryCode.model;
+                }
+
+                if (this.filters.skuFactoryCode.model) {
+                    params.skuFactoryCode = this.filters.skuFactoryCode.model;
+                }
+
+                if (this.filters.auditStatus.model !== -1) {
+                    params.auditStatus = this.filters.auditStatus.model;
+                }
+
+                if (this.startTime && this.endTime) {
+                    params.startTime = this.startTime();
+                    params.endTime = this.endTime();
+                }
+
+                params.pageSize = this.pageData.pageSize;
+                params.pageNo = this.pageData.current;
+
+                return Promise.resolve(params);
+            },
+            getOrders() {
+                return this.filtersParams().then((params) => {
+                    return service.listOrder(params);
+                }).then((result) => {
+                    if (result.code === 200) {
+                        this.pageData.total = result.data.totalCount;
+                        this.pageData.current = result.data.pageNo;
+                        this.tableData = result.data.records;
+                    }
+                });
+            },
+            showAuditStatus(status) {
+                switch (status) {
+                    case 10:
+                        return '未提交';
+                    case 20:
+                        return '待审核';
+                    case 40:
+                        return '通过';
+                    case 41:
+                        return '驳回';
+                    default:
+                        return '未提交';
+                }
+            }
+        },
+        computed: {
+            startTime() {
+                let createTime = this.filters.createTime.model;
+
+                if (_.isEmpty(createTime)) {
+                    return 0;
+                } else {
+                    return createTime[0] ? createTime[0].getTime() / 1000 : 0;
+                }
+            },
+            endTime() {
+                let createTime = this.filters.createTime.model;
+
+                if (_.isEmpty(createTime)) {
+                    return 0;
+                } else {
+                    return createTime[1] ? createTime[1].getTime() / 1000 : 0;
+                }
+            }
+        },
+        watch: {
+        },
+        components: {
+        }
+    };
+</script>
+
+<style lang="scss">
+    .action-btn-row {
+        display: inline-block;
+
+        button {
+            margin-top: 10px;
+
+            &:last-child {
+                margin-bottom: 10px;
+            }
+        }
+    }
+</style>
\ No newline at end of file

+/**
+ * on sale page store
+ * @author: qi.li <qi.li@yoho.cn>
+ * @date: 2017/04/13
+ */
+
+let tableCols = function() {
+    return [
+        {
+            title: '入库单号',
+            key: 'id',
+            align: 'center'
+        },
+        {
+            title: '创建时间',
+            key: 'createTime',
+            align: 'center'
+        },
+        {
+            title: '到货仓库',
+            key: 'storeroomName',
+            align: 'center',
+        },
+        {
+            title: '税率',
+            key: 'inputTaxRate',
+            align: 'center',
+        },
+        {
+            title: '总进货金额存',
+            key: 'totalPurchasePrice',
+            align: 'center'
+        },
+        {
+            title: '总吊牌金额',
+            key: 'totalRetailPrice',
+            align: 'center'
+        },
+        {
+            title: '发货进度',
+            align: 'center',
+            render: function(h, params) {
+                return (
+                    <div>{params.row.sendNum} / {params.row.totalNum}</div>
+                );
+            },
+            renderHeader() {
+                return '发货进度<br/> 已发数/采购数 ';
+            }
+        },
+
+        {
+            title: '入库进度',
+            align: 'center',
+            render: function(h, params) {
+                return (
+                    <div>{ params.row.inStoreNum } / {params.row.totalNum}</div>
+                );
+            },
+            renderHeader() {
+                return '入库进度<br/> 已入库数/采购数';
+            }
+        },
+
+        {
+            title: '审核状态',
+            key: 'auditStatus',
+            align: 'center',
+            render: (h, params) => {
+                return (
+                    <div>{ this.showAuditStatus(params.row.auditStatus) } </div>
+                );
+            },
+        },
+        {
+            title: '操作',
+            key: 'action',
+            align: 'center',
+            render: function(h, params) {
+                return (
+                    <div class="action-btn-row">
+                        <i-button type="primary" size="small">编辑</i-button>
+                        <i-button type="primary" size="small">查看</i-button>
+                        <i-button type="primary" size="small">提交</i-button>
+                        <i-button type="primary" size="small">删除</i-button>
+                        <i-button type="primary" size="small">发货</i-button>
+                    </div>
+                );
+            }
+        }
+    ];
+};
+
+let tableData = [
+    {
+        "shop": 226,//店铺id
+        "supplierId": 1351,//供应商id
+        "shopName": "A.Dorad",//店铺名称
+        "inStoreNum": 60,//入库数
+        "sendNum":60,//已发数
+        "totalNum": 60,//采购数采购数
+        "expressNumber": "sdfwerfsdfwef",//物流单号
+        "storeroomId": 3,//仓库id
+        "storeroomName":"南京1号仓库",//到货仓库
+        "totalPurchasePrice": 6444.0000,//总进货金额
+        "totalRetailPrice": 21480.00,//总吊牌金额
+        "id": 201314,//入库单号
+        "auditStatus": 40, //审核状态
+        "auditStatusName": "审核通过",//审核状态名称
+        "supplierName": "广州天戈贸易有限公司",
+        "brandName": "A.Dorad",//品牌名称
+        "inputTaxRate": 0.0300,//税率
+        "founder": 10083,
+        "founderName": "陈海燕",
+        "predictSalesCycle": 90,//预计销售周期
+        "createTime": 1492588818,//创建时间
+        "brandId": 717,//品牌id
+        "predictArrivalTime": 1492531200,
+        "sellType": 5,
+        "sellTypeName": "代销(销售价结算)",
+        "remarks": "代销",
+    }
+];
+
+let pageData = {
+    total: 0,
+    current: 1,
+    pageSize: 20
+};
+
+export {
+    tableCols,
+    tableData,
+    pageData
+};

@@ -5,9 +5,11 @@
 import diff from './diff-iframe';
 import jit from './jit';
 import supplier from './supplier';
+import express from './express';
 
 export default {
     diff,
     jit,
-    supplier
+    supplier,
+    express
 };

@@ -9,26 +9,22 @@
         <div style="text-align: center">
             <Form label-position="left" :label-width="100">
                 <Form-item label="到货仓库">
-                    <Select>
-                        <Option v-for="option in options"
-                                :value="option.value"
-                                :key="option.value">{{option.label}}</Option>
-                    </Select>
+                    <SelectRoom v-model="storageId"> </SelectRoom>
                 </Form-item>
 
                 <Form-item label="预计到货时间">
-                    <Date-picker type="date" placeholder="选择日期"></Date-picker>
+                    <Date-picker v-model="createDate" type="date" placeholder="选择日期"></Date-picker>
                 </Form-item>
 
                 <Form-item label="品牌">
-                    <SelectBrand></SelectBrand>
+                    <SelectBrand v-model="brandId"></SelectBrand>
                 </Form-item>
             </Form>
         </div>
 
         <div slot="footer" style="text-align: center">
             <Button type="primary" size="large" :loading="modal_loading" @click="submit">保存</Button>
-            <Button type="primary" size="large" :loading="modal_loading" @click="submit">保存并添加商品</Button>
+            <Button type="primary" size="large" :loading="modal_loading2" @click="submitAnd">保存并添加商品</Button>
             <Button type="primary" size="large"  @click="cancel">取消</Button>
         </div>
     </Modal>
@@ -36,32 +32,28 @@
 
 <script>
 
-import {SelectBrand} from 'components/select';
+import {SelectBrand, SelectRoom} from 'components/select';
+import service from 'services/supplier-service';
 
 export default {
     data() {
         return {
             model: false,
             modal_loading: false,
-            options: [
-                {
-                    value: -1,
-                    label: '请选择'
-                },
-                {
-                    value: 1,
-                    label: '南京1号仓库'
-                },
-                {
-                    value: 2,
-                    label: '广州1号仓库'
-                }
-            ]
-
+            modal_loading2: false,
+            storageId: null,
+            createDate: null,
+            brandId: null
         };
     },
+    computed: {
+        hanldeDate() {
+            return this.createDate.getTime() / 1000;
+        }
+    },
     methods: {
         show() {
+            this.reset();
             this.model = true;
         },
         close() {
@@ -69,20 +61,45 @@ export default {
         },
         submit() {
             this.modal_loading = true;
+            this.save().then((result) => {
+                if (result.code === 200) {
+                    this.close();
+                    this.emitEvent();
+                }
+            });
+        },
+        submitAnd() {
+            this.modal_loading2 = true;
+            this.save().then((result) => {
+                if (result.code === 200) {
+                    this.close();
+                    this.emitEvent();
+                    this.$router.push({
+                        name: 'repository.supplier.edit',
+                        params: {
+                            id: this.storageId
+                        }
+                    });
+                }
+            });
         },
         cancel() {
             this.close();
         },
         reset() {
             this.modal_loading = false;
-        },
-        getData() {
+            this.modal_loading2 = false;
         },
         save() {
+            return service.createOrder(this.storageId, this.hanldeDate, this.brandId);
+        },
+        emitEvent() {
+            this.$emit('on-success');
         }
     },
     components: {
-        SelectBrand
+        SelectBrand,
+        SelectRoom
     }
 };
 

+<template>
+    <Modal
+            v-model="showModal"
+            @on-ok="deliver"
+            width="auto"
+            class-name="deliver-modal">
+        <div class="deliver-modal">
+            <div class="deliver-info">
+                <Row class-name="info-row">
+                    <Col span="4" class-name="info-col">收货仓库：</Col>
+                    <Col span="20">{{houseInfo.storehouseName}}</Col>
+                </Row>
+                <Row class-name="info-row">
+                    <Col span="4">物流公司：</Col>
+                    <Col span="20">
+                    <SelectExpress v-model="expressId"> </SelectExpress>
+                    </Col>
+                </Row>
+                <Row>
+                    <Col span="4">物流单号：</Col>
+                    <Col span="20"><Input v-model="expressNumber"></Input></Col>
+                </Row>
+                <p class="info-tip">
+                    发往：{{houseInfo.storehouseName}}{{houseInfo.address}}{{houseInfo.adminName}}
+                </p>
+            </div>
+        </div>
+        <div slot="footer">
+            <Button type="text" size="large" @click="cancel">取消</Button>
+            <Button type="primary" size="large" @click="deliver">保存</Button>
+        </div>
+    </Modal>
+</template>
+
+<script>
+    import _ from 'lodash';
+    import {SelectExpress} from 'components/select';
+    import service from 'services/supplier-service';
+
+    export default {
+        name: 'SendOrder',
+        props: ['context'],
+        data() {
+            return {
+                showModal: false,
+                showLoading: true,
+                submitting: false,
+                houseInfo: {},
+                expressId: '',
+                expressNumber: '',
+            };
+        },
+        watch: {
+        },
+        methods: {
+            show() {
+                this.showModal = true;
+                this.expressId = '';
+                this.expressNumber = '';
+            },
+            cancel() {
+                this.showModal = false;
+            },
+            deliver() {
+                if (this.submitting) {
+                    return;
+                }
+                this.submittiong = true;
+                const params = {
+                    expressId: this.expressId,
+                    expressNumber: this.expressNumber,
+                    expressGoodsMap: {}
+                };
+
+                if (!(params.expressId + '').length) {
+                    this.$Message.error('请选择物流公司');
+                    return;
+                }
+
+                if (!(params.expressNumber + '').length) {
+                    this.$Message.error('请填写物流单号');
+                    return;
+                }
+
+                service.sendOrder(params)
+            }
+        },
+        components: {
+            SelectExpress
+        }
+    };
+</script>
+
+<style lang="scss">
+
+    .deliver-modal {
+        padding: 30px;
+
+        .info-row {
+            margin-bottom: 20px;
+        }
+
+        .info-tip {
+            margin-top: 20px;
+            color: #ff0000;
+            text-align: center;
+        }
+
+        .ivu-modal {
+            width: 50%;
+        }
+    }
+
+
+</style>
\ No newline at end of file

@@ -8,7 +8,7 @@
         </LayoutFilter>
 
         <LayoutAction>
-            <Button type="primary" >发货</Button>
+            <Button type="primary" @click="onClickCreate">发货</Button>
         </LayoutAction>
 
         <LayoutList>
@@ -17,13 +17,13 @@
                   @on-change="pageChange" :page-size="20" show-total></Page>
         </LayoutList>
 
-        <CreateModal ref="createModal"></CreateModal>
+        <SendModal ref="sendModal"></SendModal>
     </LayoutBody>
 </template>
 
 <script>
     import {tableCols, tableData, pageData} from './store/deliver-table';
-    import CreateModal from './components/create-modal';
+    import SendModal from './components/send-modal';
 
     export default {
         data() {
@@ -38,11 +38,11 @@
         },
         methods: {
             onClickCreate() {
-                this.$refs.createModal.show();
+                this.$refs.sendModal.show();
             }
         },
         components: {
-            CreateModal
+            SendModal
         }
     };
 </script>

 <template>
     <LayoutBody>
         <LayoutFilter>
+            <FilterItem label="到货仓库">
+                <Select>
+                    <Option v-for="option in options"
+                            :value="option.value"
+                            :key="option.value">{{option.label}}</Option>
+                </Select>
+            </FilterItem>
+
+            <FilterItem label="预计到货">
+                <Date-picker type="date" placeholder="选择日期"></Date-picker>
+            </FilterItem>
+
+            <FilterItem label="   ">
+                <Button type="primary">保存</Button>
+                <Button type="primary">返回</Button>
+            </FilterItem>
+
             <FilterItem>
                 <div>单号：173520 | 发往：北京1号仓库 北京顺义区 吴康</div>
                 <div>品牌：中国阿迪 | 店铺：得宝纸巾单品专卖店【测试】 | 供应商：阿迪供应商 | 进项税率:0.0300 | 数量:0 | 总吊牌金额:0 | 总进货金额:0</div>
@@ -26,39 +43,31 @@
 <script>
 
     import ProductList from './components/product-list';
-    import service from 'shop-category-service';
+    import service from 'supplier-service';
 
     export default {
+        props: ['isEdit'],
         data() {
             return {
                 count: 0,
-                categoryId: '',
+                id: '',
+                info: null
             };
         },
         created() {
-            this.categoryId = this.$route.query.categoryId;
-            this.getCount();
+            this.id = this.$route.params.id;
+            this.getOrderInfo();
         },
         methods: {
             back() {
                 this.$router.push({name: 'shop.category.list'});
             },
             onCountChange() {
-                this.getCount();
             },
-            getCount() {
-                service.countBindProduct(this.categoryId).then((result) => {
-                    if (result.code === 200) {
-                        this.count = result.data;
-                    }
+            getOrderInfo() {
+                return service.orderInfo(this.id).then((result) =>{
+                    console.log(result);
                 });
-            },
-            onTabsClick(tabIndex) {
-                if (tabIndex === 0) {
-                    this.$refs.allProduct.search();
-                } else {
-                    this.$refs.selectProduct.search();
-                }
             }
         },
         computed: {

@@ -47,7 +47,7 @@
         </LayoutFilter>
 
         <LayoutAction>
-            <Button type="ghost" @click="onClickCreate">创建发货单</Button>
+            <Button type="ghost" @click="onClickCreate">创建入库单</Button>
         </LayoutAction>
 
         <LayoutList>
@@ -56,7 +56,7 @@
                   @on-change="pageChange" :page-size="20" show-total></Page>
         </LayoutList>
 
-        <CreateModal ref="createModal"></CreateModal>
+        <CreateModal ref="createModal" @on-success="getOrders"></CreateModal>
     </LayoutBody>
 </template>
 
@@ -154,6 +154,35 @@
             onClickCreate() {
                 this.$refs.createModal.show();
             },
+            onClickEdit(params) {
+                this.$router.push({
+                    name: 'repository.supplier.edit',
+                    params: {
+                        id: params.row.id
+                    }
+                });
+            },
+            onClickInfo(params) {
+
+            },
+            onClickCommit(params) {
+                service.commitOrder(params.row.id).then(() => {
+                    this.getOrders();
+                });
+            },
+            onClickDelete(params) {
+                service.deleteOrder(params.row.id).then(() => {
+                    this.getOrders();
+                });
+            },
+            onClickDeliver(params) {
+                this.$router.push({
+                    name: 'repository.supplier.deliver',
+                    params: {
+                        id: params.row.id
+                    }
+                });
+            },
             clearFilters() {
                 this.filters.id.model = null;
                 this.filters.expressNumber.model = null;
@@ -210,7 +239,7 @@
                 }).then((result) => {
                     if (result.code === 200) {
                         this.pageData.total = result.data.totalCount;
-                        this.pageData.current = result.data.pageNo;
+                        this.pageData.current = result.data.pageNo + 1;
                         this.tableData = result.data.records;
                     }
                 });

@@ -76,14 +76,14 @@ let tableCols = function() {
             title: '操作',
             key: 'action',
             align: 'center',
-            render: function(h, params) {
+            render: (h, params) => {
                 return (
                     <div class="action-btn-row">
-                        <i-button type="primary" size="small">编辑</i-button>
+                        <i-button type="primary" size="small" onClick={() => this.onClickEdit(params)}>编辑</i-button>
                         <i-button type="primary" size="small">查看</i-button>
-                        <i-button type="primary" size="small">提交</i-button>
-                        <i-button type="primary" size="small">删除</i-button>
-                        <i-button type="primary" size="small">发货</i-button>
+                        <i-button type="primary" size="small" onClick={() => this.onClickCommit(params)}>提交</i-button>
+                        <i-button type="primary" size="small" onClick={() => this.onClickDelete(params)}>删除</i-button>
+                        <i-button type="primary" size="small" onClick={() => this.onClickDeliver(params)}>发货</i-button>
                     </div>
                 );
             }
@@ -91,36 +91,7 @@ let tableCols = function() {
     ];
 };
 
-let tableData = [
-    {
-        "shop": 226,//店铺id
-        "supplierId": 1351,//供应商id
-        "shopName": "A.Dorad",//店铺名称
-        "inStoreNum": 60,//入库数
-        "sendNum":60,//已发数
-        "totalNum": 60,//采购数采购数
-        "expressNumber": "sdfwerfsdfwef",//物流单号
-        "storeroomId": 3,//仓库id
-        "storeroomName":"南京1号仓库",//到货仓库
-        "totalPurchasePrice": 6444.0000,//总进货金额
-        "totalRetailPrice": 21480.00,//总吊牌金额
-        "id": 201314,//入库单号
-        "auditStatus": 40, //审核状态
-        "auditStatusName": "审核通过",//审核状态名称
-        "supplierName": "广州天戈贸易有限公司",
-        "brandName": "A.Dorad",//品牌名称
-        "inputTaxRate": 0.0300,//税率
-        "founder": 10083,
-        "founderName": "陈海燕",
-        "predictSalesCycle": 90,//预计销售周期
-        "createTime": 1492588818,//创建时间
-        "brandId": 717,//品牌id
-        "predictArrivalTime": 1492531200,
-        "sellType": 5,
-        "sellTypeName": "代销(销售价结算)",
-        "remarks": "代销",
-    }
-];
+let tableData = [];
 
 let pageData = {
     total: 0,

@@ -6,12 +6,19 @@ import request from 'axios';
 
 const apiUrl = {
     listOrder: '/erp/invoiceList',
-    listProduct: '/erp/goodsList'
+    listProduct: '/erp/goodsList',
+    orderInfo: '/erp/invoiceInfo',
+    storageList: '/erp/storerooms',
+    createOrder: '/erp/invoiceCreate',
+    deleteOrder: '/erp/invoiceDelete',
+    commitOrder: '/erp/invoiceCommit',
+    sendOrder: '/erp/invoiceSend',
+    listExpress: '/erp/allotExpressCompList'
 };
 
 function listOrder(params) {
     return request.post(apiUrl.listOrder, Object.assign({
-        authLevel: false,
+        authLevel: true,
         allowedSellTypes: [2, 5, 6]
     }, params)).then(res => res.data);
 }
@@ -21,7 +28,56 @@ function listProduct(params) {
         .then(res => res.data);
 }
 
+function orderInfo(orderId) {
+    return request.post(apiUrl.orderInfo, {
+        id: orderId
+    }).then(res => res.data);
+}
+
+function getStorageList() {
+    return request.post(apiUrl.storageList, {})
+        .then(res => res.data);
+}
+
+function createOrder(storeroomId, predictArrivalTime, brandId) {
+    return request.post(apiUrl.createOrder, {
+        storeroomId, predictArrivalTime, brandId
+    }).then(res => res.data);
+}
+
+function deleteOrder(storeId) {
+    return request.post(apiUrl.deleteOrder, {
+        ids: [storeId]
+    }).then(res => res.data);
+}
+
+function commitOrder(storeId) {
+    return request.post(apiUrl.commitOrder, {
+        id: storeId
+    }).then(res => res.data);
+}
+
+function listExpress() {
+    return request.get(apiUrl.listExpress, {})
+        .then(res => res.data);
+}
+
+/**
+ * 发货
+ */
+function sendOrder(params) {
+    return request.post(apiUrl.sendOrder, params)
+        .then(res => res.data);
+}
+
 export default {
     listProduct,
-    listOrder
+    listOrder,
+    orderInfo,
+    getStorageList,
+    createOrder,
+    deleteOrder,
+    commitOrder,
+    sendOrder,
+    listExpress
 };

@@ -19,7 +19,13 @@ let domainApis = {
         getJitStorageListBySkn: '/erp-shop-web/product/getJitStorageListBySkn',
         importJitStorage: '/erp-shop-web/product/importJitStorage',
         invoiceList: '/erp-shop-web/invoice/list',
-        goodsList: '/erp-shop-web/invoice/goods/list'
+        goodsList: '/erp-shop-web/invoice/goods/list',
+        invoiceInfo: '/erp-shop-web/invoice/info',
+        storerooms: '/erp-shop-web/invoice/storerooms',
+        invoiceCreate: '/erp-shop-web/invoice/create',
+        invoiceDelete: '/erp-shop-web/invoice/delete',
+        invoiceCommit: '/erp-shop-web/invoice/commit',
+        invoiceSend: '/erp-shop-web/invoice/goods/sendExpress'
     },
     platform: {
         queryShopsByAdminPid: '/SellerShopController/queryShopsByAdminPid',

@@ -52,6 +52,7 @@ module.exports = (req, res, next) => {
                 pid: req.session.LOGIN_UID,
                 founder: req.session.LOGIN_UID,
                 shopId: currentShop.shopsId,
+                shop: currentShop.shopsId,
                 supplierId: currentShop.shopsBrands.length ? _.first(currentShop.shopsBrands).supplierId : 0,
                 platform_id: config.platform
             };