|
@@ -17,10 +17,8 @@
|
|
</el-tab-pane>
|
|
</el-tab-pane>
|
|
<el-tab-pane label="发货信息">
|
|
<el-tab-pane label="发货信息">
|
|
<card-2
|
|
<card-2
|
|
- :transport="transport"
|
|
|
|
:address="address"
|
|
:address="address"
|
|
:form="form"
|
|
:form="form"
|
|
- :list="list"
|
|
|
|
:activities="activities"
|
|
:activities="activities"
|
|
:shop_transport_typeList="shop_transport_typeList"
|
|
:shop_transport_typeList="shop_transport_typeList"
|
|
:transport_typeList="transport_typeList"
|
|
:transport_typeList="transport_typeList"
|
|
@@ -35,8 +33,6 @@
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script>
|
|
<script>
|
|
-const _ = require('lodash');
|
|
|
|
-const moment = require('moment');
|
|
|
|
import { mapState, mapGetters, createNamespacedHelpers } from 'vuex';
|
|
import { mapState, mapGetters, createNamespacedHelpers } from 'vuex';
|
|
const { mapActions } = createNamespacedHelpers('groupOrder');
|
|
const { mapActions } = createNamespacedHelpers('groupOrder');
|
|
const { mapActions: dictData } = createNamespacedHelpers('dictData');
|
|
const { mapActions: dictData } = createNamespacedHelpers('dictData');
|
|
@@ -61,14 +57,11 @@ export default {
|
|
spec: {}, //规格信息
|
|
spec: {}, //规格信息
|
|
pay: {}, //支付信息
|
|
pay: {}, //支付信息
|
|
total_detail: [],
|
|
total_detail: [],
|
|
- // 运单号
|
|
|
|
- transport: [],
|
|
|
|
// 快递公司
|
|
// 快递公司
|
|
shop_transport_typeList: [],
|
|
shop_transport_typeList: [],
|
|
// 快递类型
|
|
// 快递类型
|
|
transport_typeList: [],
|
|
transport_typeList: [],
|
|
activities: [], //物流信息
|
|
activities: [], //物流信息
|
|
- list: [],
|
|
|
|
};
|
|
};
|
|
},
|
|
},
|
|
async created() {
|
|
async created() {
|
|
@@ -94,7 +87,6 @@ export default {
|
|
let name = this.transport_typeList.find((i) => i.value == res.data.transport_type);
|
|
let name = this.transport_typeList.find((i) => i.value == res.data.transport_type);
|
|
if (name) res.data.transport_type_name = name.label;
|
|
if (name) res.data.transport_type_name = name.label;
|
|
}
|
|
}
|
|
- this.$set(this, `form`, res.data);
|
|
|
|
if (res.data.transport && res.data.transport.length > 0) {
|
|
if (res.data.transport && res.data.transport.length > 0) {
|
|
for (const p1 of res.data.transport) {
|
|
for (const p1 of res.data.transport) {
|
|
let arr = await this.dictQuery({ code: 'transport_company', value: p1.shop_transport_type });
|
|
let arr = await this.dictQuery({ code: 'transport_company', value: p1.shop_transport_type });
|
|
@@ -106,13 +98,11 @@ export default {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- this.$set(this, `transport`, res.data.transport);
|
|
|
|
let info = { order: this.id };
|
|
let info = { order: this.id };
|
|
- res = await this.sotCreate(info);
|
|
|
|
- if (this.$checkRes(res)) {
|
|
|
|
- if (res.errcode == '0') this.$set(this, `activities`, res.data);
|
|
|
|
- }
|
|
|
|
|
|
+ let aee = await this.sotCreate(info);
|
|
|
|
+ if (this.$checkRes(aee)) if (aee.errcode == '0') this.$set(this, `activities`, aee.data);
|
|
}
|
|
}
|
|
|
|
+ this.$set(this, `form`, res.data);
|
|
}
|
|
}
|
|
this.loadings = false;
|
|
this.loadings = false;
|
|
},
|
|
},
|