fe / yoho-shop-manage · Commits

Go to a project

Authored by 李奇
Commit 49799c6d3fe5c4e554d4cd8c0aa27d82d062e514 1 parent 40ed122d

入库差异修改

Inline Side-by-side
Showing 11 changed files with 310 additions and 143 deletions
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 <Col span="20"><Input v-model="expressNumber"></Input></Col> 28 <Col span="20"><Input v-model="expressNumber"></Input></Col>
29 </Row> 29 </Row>
30 <p class="info-tip"> 30 <p class="info-tip">
31 - 发往：{{houseInfo.storehouseName}}{{houseInfo.address}}{{houseInfo.adminName}} 31 + 发往：{{houseInfo.storehouseName}}{{houseInfo.address}}{{houseInfo.adminName}}{{houseInfo.phone}}
32 </p> 32 </p>
33 </div> 33 </div>
34 </div> 34 </div>
  1 +<template>
  2 + <layout-body>
  3 + hehe
  4 + </layout-body>
  5 +</template>
  6 +
  7 +<script>
  8 + import {detail as diffDetail} from '../store';
  9 + import {DiffService} from 'services/repository';
  10 +
  11 + export default {
  12 + data() {
  13 + return diffDetail.apply(this);
  14 + },
  15 + created() {
  16 + this.DiffService = new DiffService();
  17 +
  18 + this.DiffService.list().then(res => {
  19 + this.$Loading.finish();
  20 + this.dataList = res.records;
  21 + });
  22 + },
  23 + methods: {
  24 + }
  25 + };
  26 +</script>
  27 +
  28 +<style lang="scss">
  29 +</style>
  1 +<template>
  2 + <layout-body>
  3 + <Table border :data="dataList"></Table>
  4 + </layout-body>
  5 +</template>
  6 +
  7 +<script>
  8 + export default {
  9 + props: {
  10 + dataList: {
  11 + type: Array
  12 + }
  13 + },
  14 + created() {
  15 +
  16 + },
  17 + methods: {
  18 + }
  19 + };
  20 +</script>
  21 +
  22 +<style lang="scss">
  23 +</style>
1 <template> 1 <template>
2 <layout-body> 2 <layout-body>
3 - <layout-filter>  
4 - <filter-item :label="filters.subject.label">  
5 - <Input v-model.trim="filters.subject.model"  
6 - :placeholder="filters.subject.holder"></Input>  
7 - </filter-item>  
8 - <filter-item :label="filters.emergency.label">  
9 - <Select v-model.trim="filters.emergency.model">  
10 - <Option v-for="option in filters.emergency.options"  
11 - :value="option.value"  
12 - :key="option.value">{{option.label}}</Option>  
13 - </Select>  
14 - </filter-item>  
15 - <filter-item :label="filters.brand.label">  
16 - <select-brand v-model="filters.brand.model"></select-brand>  
17 - </filter-item>  
18 - <filter-item :label="filters.status.label">  
19 - <Select v-model.trim="filters.status.model">  
20 - <Option v-for="option in filters.status.options"  
21 - :value="option.value"  
22 - :key="option.value">{{option.label}}</Option>  
23 - </Select>  
24 - </filter-item>  
25 - <filter-item>  
26 - <Button type="primary" @click="filterSearch">筛选</Button>  
27 - <Button @click="clearFilter">清空条件</Button>  
28 - </filter-item>  
29 - </layout-filter>  
30 -  
31 - <layout-list>  
32 - <Table border :columns="columns" :data="dataList"></Table>  
33 - <Page :total="page.total" :current="page.current"  
34 - @on-change="pageChange" :page-size="20" show-total></Page>  
35 - </layout-list> 3 + <Tabs type="card" :animated="false">
  4 + <Tab-pane label="工单信息">
  5 + <order-info :data-list="orderInfo"></order-info>
  6 + </Tab-pane>
  7 + <Tab-pane label="工单差异">
  8 + <order-diff></order-diff>
  9 + </Tab-pane>
  10 + </Tabs>
36 </layout-body> 11 </layout-body>
37 </template> 12 </template>
38 13
39 <script> 14 <script>
40 -import diffData from './store'; 15 +import {detail as diffDetail} from './store';
41 import {DiffService} from 'services/repository'; 16 import {DiffService} from 'services/repository';
42 -import {SelectBrand} from 'components/select'; 17 +import OrderInfo from './components/order-info';
  18 +import OrderDiff from './components/order-diff';
43 19
44 export default { 20 export default {
45 data() { 21 data() {
46 - return diffData.apply(this); 22 + return diffDetail.apply(this);
47 }, 23 },
48 created() { 24 created() {
49 this.DiffService = new DiffService(); 25 this.DiffService = new DiffService();
@@ -63,7 +39,8 @@ export default { @@ -63,7 +39,8 @@ export default {
63 } 39 }
64 }, 40 },
65 components: { 41 components: {
66 - SelectBrand 42 + OrderInfo,
  43 + OrderDiff
67 } 44 }
68 }; 45 };
69 </script> 46 </script>
@@ -18,6 +18,6 @@ export default [{ @@ -18,6 +18,6 @@ export default [{
18 name: 'detail', 18 name: 'detail',
19 component: detail, 19 component: detail,
20 meta: { 20 meta: {
21 - pageName: '差异库存' 21 + pageName: '工单详情'
22 } 22 }
23 }]; 23 }];
@@ -37,13 +37,13 @@ @@ -37,13 +37,13 @@
37 </template> 37 </template>
38 38
39 <script> 39 <script>
40 -import diffData from './store'; 40 +import {list as diffList} from './store';
41 import {DiffService} from 'services/repository'; 41 import {DiffService} from 'services/repository';
42 import {SelectBrand} from 'components/select'; 42 import {SelectBrand} from 'components/select';
43 43
44 export default { 44 export default {
45 data() { 45 data() {
46 - return diffData.apply(this); 46 + return diffList.apply(this);
47 }, 47 },
48 created() { 48 created() {
49 this.DiffService = new DiffService(); 49 this.DiffService = new DiffService();
@@ -60,6 +60,14 @@ export default { @@ -60,6 +60,14 @@ export default {
60 60
61 }, 61 },
62 pageChange() { 62 pageChange() {
  63 + },
  64 + goDetail(id) {
  65 + this.$router.push({
  66 + query: {
  67 + id
  68 + },
  69 + name: 'repository.diff.detail',
  70 + });
63 } 71 }
64 }, 72 },
65 components: { 73 components: {
  1 +/**
  2 + * 差异工单列表
  3 + * @author: qi.li <qi.li@yoho.cn>
  4 + * @date: 2017/06/08
  5 + */
  6 +export default function() {
  7 + return {
  8 + columns: [
  9 + {
  10 + title: '工单号',
  11 + align: 'center',
  12 + key: 'id'
  13 + },
  14 + {
  15 + title: '紧急程度',
  16 + align: 'center',
  17 + key: 'emergencyDegreeName'
  18 + },
  19 + {
  20 + title: '品牌',
  21 + align: 'center',
  22 + key: 'brandName'
  23 + },
  24 + {
  25 + title: '主题',
  26 + align: 'center',
  27 + key: 'subject'
  28 + },
  29 + {
  30 + title: '品牌经理',
  31 + align: 'center',
  32 + key: 'claimName'
  33 + },
  34 + {
  35 + title: '状态',
  36 + align: 'center',
  37 + key: 'statusName'
  38 + },
  39 + {
  40 + title: '操作',
  41 + align: 'center',
  42 + render: () => {
  43 + return (
  44 + <i-button type="success" size="small">查看</i-button>
  45 + );
  46 + }
  47 + }
  48 + ],
  49 + dataList: [],
  50 + page: {
  51 + total: 0,
  52 + current: 1
  53 + },
  54 + filters: {
  55 + subject: {
  56 + label: '主题',
  57 + model: ''
  58 + },
  59 + emergency: {
  60 + label: '紧急程度',
  61 + model: '',
  62 + options: [
  63 + {
  64 + value: 1,
  65 + label: '一般'
  66 + },
  67 + {
  68 + value: 2,
  69 + label: '特别紧急'
  70 + },
  71 + {
  72 + value: 3,
  73 + label: '紧急'
  74 + },
  75 + {
  76 + value: 4,
  77 + label: '不紧急'
  78 + }
  79 + ]
  80 + },
  81 + brand: {
  82 + label: '选择品牌',
  83 + model: ''
  84 + },
  85 + status: {
  86 + label: '状态',
  87 + model: '',
  88 + options: [
  89 + {
  90 + value: 1,
  91 + label: '完成'
  92 + },
  93 + {
  94 + value: 2,
  95 + label: '处理中-待确认'
  96 + },
  97 + {
  98 + value: 3,
  99 + label: '处理中-已确认'
  100 + }
  101 + ]
  102 + },
  103 + }
  104 + };
  105 +}
1 /** 1 /**
2 - * 入库差异 2 + * 入库差异单
3 * @author: qi.li <qi.li@yoho.cn> 3 * @author: qi.li <qi.li@yoho.cn>
4 * @date: 2017/06/08 4 * @date: 2017/06/08
5 */ 5 */
6 -export default function() {  
7 - return {  
8 - columns: [  
9 - {  
10 - title: '工单号',  
11 - align: 'center',  
12 - key: 'id'  
13 - },  
14 - {  
15 - title: '紧急程度',  
16 - align: 'center',  
17 - key: 'emergencyDegreeName'  
18 - },  
19 - {  
20 - title: '品牌',  
21 - align: 'center',  
22 - key: 'brandName'  
23 - },  
24 - {  
25 - title: '主题',  
26 - align: 'center',  
27 - key: 'subject'  
28 - },  
29 - {  
30 - title: '品牌经理',  
31 - align: 'center',  
32 - key: 'claimName'  
33 - },  
34 - {  
35 - title: '状态',  
36 - align: 'center',  
37 - key: 'statusName'  
38 - },  
39 - {  
40 - title: '操作',  
41 - align: 'center',  
42 - render: () => {  
43 - return (  
44 - <i-button type="success" size="small">查看</i-button>  
45 - );  
46 - }  
47 - }  
48 - ],  
49 - dataList: [],  
50 - page: {  
51 - total: 0,  
52 - current: 1  
53 - },  
54 - filters: {  
55 - subject: {  
56 - label: '主题',  
57 - model: ''  
58 - },  
59 - emergency: {  
60 - label: '紧急程度',  
61 - model: '',  
62 - options: [  
63 - {  
64 - value: 1,  
65 - label: '一般'  
66 - },  
67 - {  
68 - value: 2,  
69 - label: '特别紧急'  
70 - },  
71 - {  
72 - value: 3,  
73 - label: '紧急'  
74 - },  
75 - {  
76 - value: 4,  
77 - label: '不紧急'  
78 - }  
79 - ]  
80 - },  
81 - brand: {  
82 - label: '选择品牌',  
83 - model: ''  
84 - },  
85 - status: {  
86 - label: '状态',  
87 - model: '',  
88 - options: [  
89 - {  
90 - value: 1,  
91 - label: '完成'  
92 - },  
93 - {  
94 - value: 2,  
95 - label: '处理中-待确认'  
96 - },  
97 - {  
98 - value: 3,  
99 - label: '处理中-已确认'  
100 - }  
101 - ]  
102 - },  
103 - }  
104 - };  
105 -} 6 +import list from './list';
  7 +import detail from './detail';
  8 +
  9 +export {
  10 + list,
  11 + detail
  12 +};
  1 +/**
  2 + * 差异工单详情
  3 + * @author: qi.li <qi.li@yoho.cn>
  4 + * @date: 2017/06/08
  5 + */
  6 +export default function() {
  7 + return {
  8 + columns: [
  9 + {
  10 + title: '工单号',
  11 + align: 'center',
  12 + key: 'id'
  13 + },
  14 + {
  15 + title: '紧急程度',
  16 + align: 'center',
  17 + key: 'emergencyDegreeName'
  18 + },
  19 + {
  20 + title: '品牌',
  21 + align: 'center',
  22 + key: 'brandName'
  23 + },
  24 + {
  25 + title: '主题',
  26 + align: 'center',
  27 + key: 'subject'
  28 + },
  29 + {
  30 + title: '品牌经理',
  31 + align: 'center',
  32 + key: 'claimName'
  33 + },
  34 + {
  35 + title: '状态',
  36 + align: 'center',
  37 + key: 'statusName'
  38 + },
  39 + {
  40 + title: '操作',
  41 + align: 'center',
  42 + render: (h, params) => {
  43 + return (
  44 + <i-button type="success" size="small"
  45 + onClick={() => this.goDetail(params.row.id)}>查看</i-button>
  46 + );
  47 + }
  48 + }
  49 + ],
  50 + dataList: [],
  51 + page: {
  52 + total: 0,
  53 + current: 1
  54 + },
  55 + filters: {
  56 + subject: {
  57 + label: '主题',
  58 + model: ''
  59 + },
  60 + emergency: {
  61 + label: '紧急程度',
  62 + model: '',
  63 + options: [
  64 + {
  65 + value: 1,
  66 + label: '一般'
  67 + },
  68 + {
  69 + value: 2,
  70 + label: '特别紧急'
  71 + },
  72 + {
  73 + value: 3,
  74 + label: '紧急'
  75 + },
  76 + {
  77 + value: 4,
  78 + label: '不紧急'
  79 + }
  80 + ]
  81 + },
  82 + brand: {
  83 + label: '选择品牌',
  84 + model: ''
  85 + },
  86 + status: {
  87 + label: '状态',
  88 + model: '',
  89 + options: [
  90 + {
  91 + value: 1,
  92 + label: '完成'
  93 + },
  94 + {
  95 + value: 2,
  96 + label: '处理中-待确认'
  97 + },
  98 + {
  99 + value: 3,
  100 + label: '处理中-已确认'
  101 + }
  102 + ]
  103 + },
  104 + }
  105 + };
  106 +}
@@ -6,12 +6,22 @@ @@ -6,12 +6,22 @@
6 import Service from '../service'; 6 import Service from '../service';
7 7
8 const apiUrl = { 8 const apiUrl = {
9 - list: '/erp/diffWorkOrderList' 9 + list: '/erp/diffWorkOrderList',
  10 + detail: '/erp/diffWorkOrderDetail',
  11 + diffInfo: '/erp/diffWorkOrderInfo',
10 }; 12 };
11 13
12 class ReturnService extends Service { 14 class ReturnService extends Service {
13 list(params) { 15 list(params) {
14 return this.post(apiUrl.list, params); 16 return this.post(apiUrl.list, params);
15 } 17 }
  18 +
  19 + detail(params) {
  20 + return this.post(apiUrl.detail, params);
  21 + }
  22 +
  23 + diffInfo(params) {
  24 + return this.post(apiUrl.diffInfo, params);
  25 + }
16 } 26 }
17 export default ReturnService; 27 export default ReturnService;
@@ -17,6 +17,8 @@ let domainApis = { @@ -17,6 +17,8 @@ let domainApis = {
17 allotExportList: '/erp-shop-web/export/exportForPurchaseForm', 17 allotExportList: '/erp-shop-web/export/exportForPurchaseForm',
18 allotPrintExpressDetail: '/erp-shop-web/purchase/queryExpressListByExpressNumber', 18 allotPrintExpressDetail: '/erp-shop-web/purchase/queryExpressListByExpressNumber',
19 diffWorkOrderList: '/erp-shop-web/logistics/workOrder/queryPage', 19 diffWorkOrderList: '/erp-shop-web/logistics/workOrder/queryPage',
  20 + diffWorkOrderDetail: '/erp-shop-web/logistics/workOrder/queryDetail',
  21 + diffWorkOrderInfo: '/erp-shop-web/logistics/workOrder/queryDiff',
20 returnSupplierList: '/erp-shop-web/logistics/returnedSupplier/list', 22 returnSupplierList: '/erp-shop-web/logistics/returnedSupplier/list',
21 returnSupplierDetail: '/erp-shop-web/logistics/returnedSupplier/detail', 23 returnSupplierDetail: '/erp-shop-web/logistics/returnedSupplier/detail',
22 exportProductReturnList: '/erp-shop-web/export/exportReturnForInvoice', 24 exportProductReturnList: '/erp-shop-web/export/exportReturnForInvoice',