fe / yoho-shop-manage · Commits

Go to a project

Authored by lzhy
Commit ba11ec6fe67d087a98b4be20c17af0d94b7bbdde 1 parent 7158029a

一件代发

Inline Side-by-side
Showing 10 changed files with 47 additions and 58 deletions
  1 +import orderGoodsInfo from './order-goods-info';
  2 +import orderUserInfo from './order-user-info.vue';
  3 +
  4 +export { orderGoodsInfo, orderUserInfo };
@@ -89,7 +89,7 @@ @@ -89,7 +89,7 @@
89 89
90 <script> 90 <script>
91 export default { 91 export default {
92 - name: 'orderGoodsInfo', 92 + name: 'OrderGoodsInfo',
93 props: ['orderInfo', 'tableData', 'couponsData', 'goodsPromos', 'orderPromos'], 93 props: ['orderInfo', 'tableData', 'couponsData', 'goodsPromos', 'orderPromos'],
94 data() { 94 data() {
95 return { 95 return {
@@ -34,7 +34,7 @@ export default { @@ -34,7 +34,7 @@ export default {
34 name: 'OrderUserInfo', 34 name: 'OrderUserInfo',
35 props: ['orderInfo'], 35 props: ['orderInfo'],
36 data() { 36 data() {
37 - return {} 37 + return {};
38 }, 38 },
39 }; 39 };
40 </script> 40 </script>
@@ -26,4 +26,13 @@ export default { @@ -26,4 +26,13 @@ export default {
26 1: '已支付', 26 1: '已支付',
27 2: '部分支付', 27 2: '部分支付',
28 }, 28 },
  29 + //费用分摊类型
  30 + feeSharingType: {
  31 + 0: '未知',
  32 + 1: '我司承担',
  33 + 2: '供应商承担',
  34 + 3: '分摊-合同结算',
  35 + 4: '分摊-我司承担比例',
  36 + 5: '会员营销券-阶梯折扣',
  37 + },
29 }; 38 };
@@ -15,18 +15,19 @@ @@ -15,18 +15,19 @@
15 </template> 15 </template>
16 16
17 <script> 17 <script>
18 -import {orderGoodsInfo} from '../../components'; 18 +import { orderGoodsInfo } from '../../components';
19 import OrderService from 'services/order/order-service'; 19 import OrderService from 'services/order/order-service';
  20 +import _ from 'lodash';
20 export default { 21 export default {
  22 + components: { orderGoodsInfo },
21 props: ['current', 'orderCode', 'orderInfo'], 23 props: ['current', 'orderCode', 'orderInfo'],
22 - components: {orderGoodsInfo},  
23 data() { 24 data() {
24 return { 25 return {
25 couponsData: [], 26 couponsData: [],
26 tableData: [], 27 tableData: [],
27 goodsPromos: [], 28 goodsPromos: [],
28 orderPromos: [], 29 orderPromos: [],
29 - } 30 + };
30 }, 31 },
31 created() { 32 created() {
32 this.$emit('nextStep', 0); 33 this.$emit('nextStep', 0);
@@ -74,6 +75,5 @@ export default { @@ -74,6 +75,5 @@ export default {
74 }); 75 });
75 }, 76 },
76 }, 77 },
77 -  
78 }; 78 };
79 </script> 79 </script>
@@ -33,10 +33,13 @@ @@ -33,10 +33,13 @@
33 <script> 33 <script>
34 import { orderUserInfo } from '../../components'; 34 import { orderUserInfo } from '../../components';
35 export default { 35 export default {
36 - props: ['current', 'orderCode', 'orderInfo'],  
37 components: { orderUserInfo }, 36 components: { orderUserInfo },
  37 + props: ['current', 'orderCode', 'orderInfo'],
38 data() { 38 data() {
39 - return {} 39 + return {};
  40 + },
  41 + created() {
  42 + this.$emit('nextStep', 1);
40 }, 43 },
41 methods: { 44 methods: {
42 nextStep(code) { 45 nextStep(code) {
@@ -56,15 +59,7 @@ export default { @@ -56,15 +59,7 @@ export default {
56 orderCode: code, 59 orderCode: code,
57 }, 60 },
58 }); 61 });
59 - }  
60 }, 62 },
61 - created() {  
62 -  
63 - this.$emit('nextStep', 1);  
64 - } 63 + },
65 }; 64 };
66 </script> 65 </script>
67 -  
68 -<style lang="scss" scoped>  
69 -  
70 -</style>  
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 <p slot="title" style="height: 35px"> 5 <p slot="title" style="height: 35px">
6 当前订单状态：{{ orderStatus[orderInfo.orderStatus] }} 6 当前订单状态：{{ orderStatus[orderInfo.orderStatus] }}
7 <template v-if="orderInfo.orderStatus >= 100 && orderInfo.orderStatus < 600"> 7 <template v-if="orderInfo.orderStatus >= 100 && orderInfo.orderStatus < 600">
8 - <i-button size="large" type="success" style="margin-left: 50px;" @click="deliver(123)">发货</i-button> 8 + <i-button size="large" type="success" style="margin-left: 50px;" @click="deliver(orderCode)">发货</i-button>
9 </template> 9 </template>
10 </p> 10 </p>
11 </div> 11 </div>
@@ -36,61 +36,33 @@ @@ -36,61 +36,33 @@
36 </Row> 36 </Row>
37 </div> 37 </div>
38 </div> 38 </div>
39 - <div class="ivu-card">  
40 - <div class="ivu-card-head">  
41 - <p slot="title">物流信息</p>  
42 - </div>  
43 - <div class="ivu-card-body">  
44 - <Row>  
45 - <i-col span="4">收货人：{{ orderInfo.consigneeName }}</i-col>  
46 - <i-col span="4">手机号：{{ orderInfo.mobile }} </i-col>  
47 - </Row>  
48 - <Row>  
49 - <i-col span="24">  
50 - 送货地址：{{ orderInfo.province }} {{ orderInfo.city }} {{ orderInfo.district }}  
51 - {{ orderInfo.street }}  
52 - </i-col>  
53 - </Row>  
54 - <Row>  
55 - <i-col span="24">详细地址：{{ orderInfo.address }}</i-col>  
56 - </Row>  
57 - <Row>  
58 - <i-col span="24">邮政编码：{{ orderInfo.zipCode }}</i-col>  
59 - </Row>  
60 - <Row>  
61 - <i-col span="24">物流公司：{{ orderInfo.expressName }} </i-col>  
62 - </Row>  
63 - <Row>  
64 - <i-col span="24">运单号：{{ orderInfo.expressNumber }} </i-col>  
65 - </Row>  
66 - </div>  
67 - </div> 39 + <order-user-info :order-info="orderInfo"></order-user-info>
68 <div class="ivu-card"> 40 <div class="ivu-card">
69 <div class="ivu-card-head"> 41 <div class="ivu-card-head">
70 <p slot="title">商品信息</p> 42 <p slot="title">商品信息</p>
71 </div> 43 </div>
72 <div class="ivu-card-body"> 44 <div class="ivu-card-body">
73 - <goods-info 45 + <order-goods-info
74 :table-data="tableData" 46 :table-data="tableData"
75 :coupons-data="couponsData" 47 :coupons-data="couponsData"
76 :goods-promos="goodsPromos" 48 :goods-promos="goodsPromos"
77 :order-info="orderInfo" 49 :order-info="orderInfo"
78 :order-promos="orderPromos" 50 :order-promos="orderPromos"
79 > 51 >
80 - </goods-info> 52 + </order-goods-info>
81 </div> 53 </div>
82 </div> 54 </div>
83 </div> 55 </div>
84 </template> 56 </template>
85 57
86 <script> 58 <script>
87 -import { GoodsInfo } from './components'; 59 +import { orderGoodsInfo, orderUserInfo } from '../components';
88 import { OrderConfig } from '../configs'; 60 import { OrderConfig } from '../configs';
89 import OrderService from 'services/order/order-service'; 61 import OrderService from 'services/order/order-service';
90 import _ from 'lodash'; 62 import _ from 'lodash';
91 63
92 export default { 64 export default {
93 - components: { GoodsInfo }, 65 + components: { orderGoodsInfo, orderUserInfo },
94 data() { 66 data() {
95 return { 67 return {
96 orderCode: this.$route.query.orderCode, 68 orderCode: this.$route.query.orderCode,
@@ -17,23 +17,23 @@ export default { @@ -17,23 +17,23 @@ export default {
17 return { 17 return {
18 tab1: { 18 tab1: {
19 label: '全部订单', 19 label: '全部订单',
20 - name: '1', 20 + name: '0',
21 }, 21 },
22 tab2: { 22 tab2: {
23 label: '待发货订单', 23 label: '待发货订单',
24 - name: '2', 24 + name: '1',
25 }, 25 },
26 tab3: { 26 tab3: {
27 label: '已发货订单', 27 label: '已发货订单',
28 - name: '3', 28 + name: '2',
29 }, 29 },
30 tab4: { 30 tab4: {
31 label: '已完成订单', 31 label: '已完成订单',
32 - name: '4', 32 + name: '3',
33 }, 33 },
34 tab5: { 34 tab5: {
35 label: '换货订单', 35 label: '换货订单',
36 - name: '5', 36 + name: '4',
37 }, 37 },
38 activate: '', 38 activate: '',
39 }; 39 };
@@ -63,7 +63,7 @@ export default { @@ -63,7 +63,7 @@ export default {
63 pageSize: 20, 63 pageSize: 20,
64 pageNo: 1, 64 pageNo: 1,
65 orderStatusStr: '', 65 orderStatusStr: '',
66 - queryType: 1, 66 + orderStatusType: 0,
67 }, 67 },
68 tableData: [], 68 tableData: [],
69 orderStatusArr: OrderConfig.orderStatus, 69 orderStatusArr: OrderConfig.orderStatus,
@@ -79,7 +79,7 @@ export default { @@ -79,7 +79,7 @@ export default {
79 }, 79 },
80 methods: { 80 methods: {
81 onChangeTabs(type) { 81 onChangeTabs(type) {
82 - this.query.queryType = +type; 82 + this.query.orderStatusType = +type;
83 this.reset(); 83 this.reset();
84 }, 84 },
85 search() { 85 search() {
@@ -7,6 +7,7 @@ const apiUrl = { @@ -7,6 +7,7 @@ const apiUrl = {
7 orderGoodsPromos: '/erp/queryOrderGoodsPromos', 7 orderGoodsPromos: '/erp/queryOrderGoodsPromos',
8 orderCoupons: '/erp/queryOrderCoupons', 8 orderCoupons: '/erp/queryOrderCoupons',
9 orderPromos: '/erp/queryOrderPromos', 9 orderPromos: '/erp/queryOrderPromos',
  10 + confirmExpress: '/erp/confirmExpress',
10 }; 11 };
11 12
12 class OrderService extends Service { 13 class OrderService extends Service {
@@ -60,6 +61,14 @@ class OrderService extends Service { @@ -60,6 +61,14 @@ class OrderService extends Service {
60 queryOrderPromos(params) { 61 queryOrderPromos(params) {
61 return this.post(apiUrl.orderPromos, params); 62 return this.post(apiUrl.orderPromos, params);
62 } 63 }
  64 +
  65 + /**
  66 + * 订单确认物流信息
  67 + * @param params
  68 + */
  69 + confirmExpress(params) {
  70 + return this.post(apiUrl.confirmExpress, params);
  71 + }
63 } 72 }
64 73
65 export default OrderService; 74 export default OrderService;