入库差异修改

@@ -28,7 +28,7 @@
                     <Col span="20"><Input v-model="expressNumber"></Input></Col>
                 </Row>
                 <p class="info-tip">
-                    发往：{{houseInfo.storehouseName}}{{houseInfo.address}}{{houseInfo.adminName}}
+                    发往：{{houseInfo.storehouseName}}{{houseInfo.address}}{{houseInfo.adminName}}{{houseInfo.phone}}
                 </p>
             </div>
         </div>

+<template>
+    <layout-body>
+        hehe
+    </layout-body>
+</template>
+
+<script>
+    import {detail as diffDetail} from '../store';
+    import {DiffService} from 'services/repository';
+
+    export default {
+        data() {
+            return diffDetail.apply(this);
+        },
+        created() {
+            this.DiffService = new DiffService();
+
+            this.DiffService.list().then(res => {
+                this.$Loading.finish();
+                this.dataList = res.records;
+            });
+        },
+        methods: {
+        }
+    };
+</script>
+
+<style lang="scss">
+</style>

+<template>
+    <layout-body>
+        <Table border :data="dataList"></Table>
+    </layout-body>
+</template>
+
+<script>
+    export default {
+        props: {
+            dataList: {
+                type: Array
+            }
+        },
+        created() {
+
+        },
+        methods: {
+        }
+    };
+</script>
+
+<style lang="scss">
+</style>

 <template>
     <layout-body>
-        <layout-filter>
-            <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="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>
-            </filter-item>
-            <filter-item>
-                <Button type="primary" @click="filterSearch">筛选</Button>
-                <Button @click="clearFilter">清空条件</Button>
-            </filter-item>
-        </layout-filter>
-
-        <layout-list>
-            <Table border :columns="columns" :data="dataList"></Table>
-            <Page :total="page.total" :current="page.current"
-                  @on-change="pageChange" :page-size="20" show-total></Page>
-        </layout-list>
+        <Tabs type="card" :animated="false">
+            <Tab-pane label="工单信息">
+                <order-info :data-list="orderInfo"></order-info>
+            </Tab-pane>
+            <Tab-pane label="工单差异">
+                <order-diff></order-diff>
+            </Tab-pane>
+        </Tabs>
     </layout-body>
 </template>
 
 <script>
-import diffData from './store';
+import {detail as diffDetail} from './store';
 import {DiffService} from 'services/repository';
-import {SelectBrand} from 'components/select';
+import OrderInfo from './components/order-info';
+import OrderDiff from './components/order-diff';
 
 export default {
     data() {
-        return diffData.apply(this);
+        return diffDetail.apply(this);
     },
     created() {
         this.DiffService = new DiffService();
@@ -63,7 +39,8 @@ export default {
         }
     },
     components: {
-        SelectBrand
+        OrderInfo,
+        OrderDiff
     }
 };
 </script>

@@ -18,6 +18,6 @@ export default [{
     name: 'detail',
     component: detail,
     meta: {
-        pageName: '差异库存'
+        pageName: '工单详情'
     }
 }];

@@ -37,13 +37,13 @@
 </template>
 
 <script>
-import diffData from './store';
+import {list as diffList} from './store';
 import {DiffService} from 'services/repository';
 import {SelectBrand} from 'components/select';
 
 export default {
     data() {
-        return diffData.apply(this);
+        return diffList.apply(this);
     },
     created() {
         this.DiffService = new DiffService();
@@ -60,6 +60,14 @@ export default {
 
         },
         pageChange() {
+        },
+        goDetail(id) {
+            this.$router.push({
+                query: {
+                    id
+                },
+                name: 'repository.diff.detail',
+            });
         }
     },
     components: {

+/**
+ * 差异工单列表
+ * @author: qi.li <qi.li@yoho.cn>
+ * @date: 2017/06/08
+ */
+export default function() {
+    return {
+        columns: [
+            {
+                title: '工单号',
+                align: 'center',
+                key: 'id'
+            },
+            {
+                title: '紧急程度',
+                align: 'center',
+                key: 'emergencyDegreeName'
+            },
+            {
+                title: '品牌',
+                align: 'center',
+                key: 'brandName'
+            },
+            {
+                title: '主题',
+                align: 'center',
+                key: 'subject'
+            },
+            {
+                title: '品牌经理',
+                align: 'center',
+                key: 'claimName'
+            },
+            {
+                title: '状态',
+                align: 'center',
+                key: 'statusName'
+            },
+            {
+                title: '操作',
+                align: 'center',
+                render: () => {
+                    return (
+                        <i-button type="success" size="small">查看</i-button>
+                    );
+                }
+            }
+        ],
+        dataList: [],
+        page: {
+            total: 0,
+            current: 1
+        },
+        filters: {
+            subject: {
+                label: '主题',
+                model: ''
+            },
+            emergency: {
+                label: '紧急程度',
+                model: '',
+                options: [
+                    {
+                        value: 1,
+                        label: '一般'
+                    },
+                    {
+                        value: 2,
+                        label: '特别紧急'
+                    },
+                    {
+                        value: 3,
+                        label: '紧急'
+                    },
+                    {
+                        value: 4,
+                        label: '不紧急'
+                    }
+                ]
+            },
+            brand: {
+                label: '选择品牌',
+                model: ''
+            },
+            status: {
+                label: '状态',
+                model: '',
+                options: [
+                    {
+                        value: 1,
+                        label: '完成'
+                    },
+                    {
+                        value: 2,
+                        label: '处理中-待确认'
+                    },
+                    {
+                        value: 3,
+                        label: '处理中-已确认'
+                    }
+                ]
+            },
+        }
+    };
+}

 /**
- * 入库差异
+ * 入库差异单
  * @author: qi.li <qi.li@yoho.cn>
  * @date: 2017/06/08
  */
-export default function() {
-    return {
-        columns: [
-            {
-                title: '工单号',
-                align: 'center',
-                key: 'id'
-            },
-            {
-                title: '紧急程度',
-                align: 'center',
-                key: 'emergencyDegreeName'
-            },
-            {
-                title: '品牌',
-                align: 'center',
-                key: 'brandName'
-            },
-            {
-                title: '主题',
-                align: 'center',
-                key: 'subject'
-            },
-            {
-                title: '品牌经理',
-                align: 'center',
-                key: 'claimName'
-            },
-            {
-                title: '状态',
-                align: 'center',
-                key: 'statusName'
-            },
-            {
-                title: '操作',
-                align: 'center',
-                render: () => {
-                    return (
-                        <i-button type="success" size="small">查看</i-button>
-                    );
-                }
-            }
-        ],
-        dataList: [],
-        page: {
-            total: 0,
-            current: 1
-        },
-        filters: {
-            subject: {
-                label: '主题',
-                model: ''
-            },
-            emergency: {
-                label: '紧急程度',
-                model: '',
-                options: [
-                    {
-                        value: 1,
-                        label: '一般'
-                    },
-                    {
-                        value: 2,
-                        label: '特别紧急'
-                    },
-                    {
-                        value: 3,
-                        label: '紧急'
-                    },
-                    {
-                        value: 4,
-                        label: '不紧急'
-                    }
-                ]
-            },
-            brand: {
-                label: '选择品牌',
-                model: ''
-            },
-            status: {
-                label: '状态',
-                model: '',
-                options: [
-                    {
-                        value: 1,
-                        label: '完成'
-                    },
-                    {
-                        value: 2,
-                        label: '处理中-待确认'
-                    },
-                    {
-                        value: 3,
-                        label: '处理中-已确认'
-                    }
-                ]
-            },
-        }
-    };
-}
+import list from './list';
+import detail from './detail';
+
+export {
+    list,
+    detail
+};

+/**
+ * 差异工单详情
+ * @author: qi.li <qi.li@yoho.cn>
+ * @date: 2017/06/08
+ */
+export default function() {
+    return {
+        columns: [
+            {
+                title: '工单号',
+                align: 'center',
+                key: 'id'
+            },
+            {
+                title: '紧急程度',
+                align: 'center',
+                key: 'emergencyDegreeName'
+            },
+            {
+                title: '品牌',
+                align: 'center',
+                key: 'brandName'
+            },
+            {
+                title: '主题',
+                align: 'center',
+                key: 'subject'
+            },
+            {
+                title: '品牌经理',
+                align: 'center',
+                key: 'claimName'
+            },
+            {
+                title: '状态',
+                align: 'center',
+                key: 'statusName'
+            },
+            {
+                title: '操作',
+                align: 'center',
+                render: (h, params) => {
+                    return (
+                        <i-button type="success" size="small"
+                        onClick={() => this.goDetail(params.row.id)}>查看</i-button>
+                    );
+                }
+            }
+        ],
+        dataList: [],
+        page: {
+            total: 0,
+            current: 1
+        },
+        filters: {
+            subject: {
+                label: '主题',
+                model: ''
+            },
+            emergency: {
+                label: '紧急程度',
+                model: '',
+                options: [
+                    {
+                        value: 1,
+                        label: '一般'
+                    },
+                    {
+                        value: 2,
+                        label: '特别紧急'
+                    },
+                    {
+                        value: 3,
+                        label: '紧急'
+                    },
+                    {
+                        value: 4,
+                        label: '不紧急'
+                    }
+                ]
+            },
+            brand: {
+                label: '选择品牌',
+                model: ''
+            },
+            status: {
+                label: '状态',
+                model: '',
+                options: [
+                    {
+                        value: 1,
+                        label: '完成'
+                    },
+                    {
+                        value: 2,
+                        label: '处理中-待确认'
+                    },
+                    {
+                        value: 3,
+                        label: '处理中-已确认'
+                    }
+                ]
+            },
+        }
+    };
+}

@@ -6,12 +6,22 @@
 import Service from '../service';
 
 const apiUrl = {
-    list: '/erp/diffWorkOrderList'
+    list: '/erp/diffWorkOrderList',
+    detail: '/erp/diffWorkOrderDetail',
+    diffInfo: '/erp/diffWorkOrderInfo',
 };
 
 class ReturnService extends Service {
     list(params) {
         return this.post(apiUrl.list, params);
     }
+
+    detail(params) {
+        return this.post(apiUrl.detail, params);
+    }
+
+    diffInfo(params) {
+        return this.post(apiUrl.diffInfo, params);
+    }
 }
 export default ReturnService;

@@ -17,6 +17,8 @@ let domainApis = {
         allotExportList: '/erp-shop-web/export/exportForPurchaseForm',
         allotPrintExpressDetail: '/erp-shop-web/purchase/queryExpressListByExpressNumber',
         diffWorkOrderList: '/erp-shop-web/logistics/workOrder/queryPage',
+        diffWorkOrderDetail: '/erp-shop-web/logistics/workOrder/queryDetail',
+        diffWorkOrderInfo: '/erp-shop-web/logistics/workOrder/queryDiff',
         returnSupplierList: '/erp-shop-web/logistics/returnedSupplier/list',
         returnSupplierDetail: '/erp-shop-web/logistics/returnedSupplier/detail',
         exportProductReturnList: '/erp-shop-web/export/exportReturnForInvoice',