|
@@ -6,7 +6,7 @@ |
|
@@ -6,7 +6,7 @@ |
|
6
|
<layout-filter ref="filter">
|
6
|
<layout-filter ref="filter">
|
|
7
|
<Row>
|
7
|
<Row>
|
|
8
|
<filter-item label="快递公司">
|
8
|
<filter-item label="快递公司">
|
|
9
|
- <Select v-model.trim="expressId" clearable>
|
9
|
+ <Select v-model.trim="orderInfo.expressId" clearable>
|
|
10
|
<Option v-for="option in logisticsList" :key="option.id" :value="option.id">
|
10
|
<Option v-for="option in logisticsList" :key="option.id" :value="option.id">
|
|
11
|
{{ option.companyName }}
|
11
|
{{ option.companyName }}
|
|
12
|
</Option>
|
12
|
</Option>
|
|
@@ -15,7 +15,7 @@ |
|
@@ -15,7 +15,7 @@ |
|
15
|
</Row>
|
15
|
</Row>
|
|
16
|
<Row>
|
16
|
<Row>
|
|
17
|
<filter-item label="快递单号">
|
17
|
<filter-item label="快递单号">
|
|
18
|
- <Input v-model.trim="expressNumber" />
|
18
|
+ <Input v-model.trim="orderInfo.expressNumber" />
|
|
19
|
</filter-item>
|
19
|
</filter-item>
|
|
20
|
</Row>
|
20
|
</Row>
|
|
21
|
<filter-item>
|
21
|
<filter-item>
|
|
@@ -68,19 +68,8 @@ export default { |
|
@@ -68,19 +68,8 @@ export default { |
|
68
|
showExpressLoading: false,
|
68
|
showExpressLoading: false,
|
|
69
|
showDeliverLoading: false,
|
69
|
showDeliverLoading: false,
|
|
70
|
showNoExpressLoading: false,
|
70
|
showNoExpressLoading: false,
|
|
71
|
- newOrderInfo: [],
|
|
|
|
72
|
- expressId: 0,
|
|
|
|
73
|
- expressNumber: '',
|
|
|
|
74
|
};
|
71
|
};
|
|
75
|
},
|
72
|
},
|
|
76
|
- watch: {
|
|
|
|
77
|
- orderInfo: {
|
|
|
|
78
|
- handler(newValue) {
|
|
|
|
79
|
- this.expressId = newValue.expressId;
|
|
|
|
80
|
- this.expressNumber = newValue.expressNumber;
|
|
|
|
81
|
- },
|
|
|
|
82
|
- },
|
|
|
|
83
|
- },
|
|
|
|
84
|
created() {
|
73
|
created() {
|
|
85
|
this.LogisticsService = new LogisticsService();
|
74
|
this.LogisticsService = new LogisticsService();
|
|
86
|
this.OrderService = new OrderService();
|
75
|
this.OrderService = new OrderService();
|
|
@@ -100,8 +89,8 @@ export default { |
|
@@ -100,8 +89,8 @@ export default { |
|
100
|
this.showExpressLoading = true;
|
89
|
this.showExpressLoading = true;
|
|
101
|
this.OrderService.confirmExpress({
|
90
|
this.OrderService.confirmExpress({
|
|
102
|
orderCode: +this.orderCode,
|
91
|
orderCode: +this.orderCode,
|
|
103
|
- expressId: +this.expressId,
|
|
|
|
104
|
- expressNumber: this.expressNumber,
|
92
|
+ expressId: +this.orderInfo.expressId,
|
|
|
|
93
|
+ expressNumber: this.orderInfo.expressNumber,
|
|
105
|
}).then(ret => {
|
94
|
}).then(ret => {
|
|
106
|
this.showExpressLoading = false;
|
95
|
this.showExpressLoading = false;
|
|
107
|
if (ret.code === 200) {
|
96
|
if (ret.code === 200) {
|
|
@@ -117,8 +106,8 @@ export default { |
|
@@ -117,8 +106,8 @@ export default { |
|
117
|
this.showDeliverLoading = true;
|
106
|
this.showDeliverLoading = true;
|
|
118
|
this.LogisticsService.proxyOutStorage({
|
107
|
this.LogisticsService.proxyOutStorage({
|
|
119
|
orderCode: +this.orderCode,
|
108
|
orderCode: +this.orderCode,
|
|
120
|
- expressId: +this.expressId,
|
|
|
|
121
|
- expressNumber: this.expressNumber,
|
109
|
+ expressId: +this.orderInfo.expressId,
|
|
|
|
110
|
+ expressNumber: this.orderInfo.expressNumber,
|
|
122
|
}).then(ret => {
|
111
|
}).then(ret => {
|
|
123
|
if (ret.code === 200) {
|
112
|
if (ret.code === 200) {
|
|
124
|
this.$Message.info(ret.message);
|
113
|
this.$Message.info(ret.message);
|
