|
|
@@ -229,27 +229,31 @@ export default {
|
|
|
// 查询物流
|
|
|
if (res.data.transport) {
|
|
|
// 快递数据回显
|
|
|
- let arr = await this.dictQuery({ code: 'transport_type', value: res.data.transport.shop_transport_type });
|
|
|
- if (this.$checkRes(arr)) {
|
|
|
- let type = arr.data.find((i) => i.value == res.data.transport.shop_transport_type);
|
|
|
- if (type) {
|
|
|
- res.data.transport.shop_transport_name = type.label;
|
|
|
- this.querySearch(type.label);
|
|
|
+ if (res.data.transport.customer_transport_type) {
|
|
|
+ let arr = await this.dictQuery({ code: 'transport_type', value: res.data.transport.customer_transport_type });
|
|
|
+ if (this.$checkRes(arr)) {
|
|
|
+ let type = arr.data.find((i) => i.value == res.data.transport.customer_transport_type);
|
|
|
+ if (type) {
|
|
|
+ res.data.transport.customer_transport_name = type.label;
|
|
|
+ this.querySearch(type.label);
|
|
|
+ }
|
|
|
+ this.$set(this, `transport`, res.data.transport);
|
|
|
+ this.$set(this.customerForm, `customer_transport_type`, this.transport.customer_transport_type);
|
|
|
+ this.$set(this.customerForm, `customer_transport_no`, this.transport.customer_transport_no);
|
|
|
}
|
|
|
- this.$set(this, `transport`, res.data.transport);
|
|
|
- this.$set(this.form, `shop_transport_type`, this.transport.shop_transport_type);
|
|
|
- this.$set(this.form, `shop_transport_no`, this.transport.shop_transport_no);
|
|
|
}
|
|
|
- arr = await this.dictQuery({ code: 'transport_type', value: res.data.transport.customer_transport_type });
|
|
|
- if (this.$checkRes(arr)) {
|
|
|
- let type = arr.data.find((i) => i.value == res.data.transport.customer_transport_type);
|
|
|
- if (type) {
|
|
|
- res.data.transport.customer_transport_name = type.label;
|
|
|
- this.querySearch(type.label);
|
|
|
+ if (res.data.transport.shop_transport_type) {
|
|
|
+ let aee = await this.dictQuery({ code: 'transport_type', value: res.data.transport.shop_transport_type });
|
|
|
+ if (this.$checkRes(aee)) {
|
|
|
+ let type = aee.data.find((i) => i.value == res.data.transport.shop_transport_type);
|
|
|
+ if (type) {
|
|
|
+ res.data.transport.shop_transport_name = type.label;
|
|
|
+ this.querySearch(type.label);
|
|
|
+ }
|
|
|
+ this.$set(this, `transport`, res.data.transport);
|
|
|
+ this.$set(this.form, `shop_transport_type`, this.transport.shop_transport_type);
|
|
|
+ this.$set(this.form, `shop_transport_no`, this.transport.shop_transport_no);
|
|
|
}
|
|
|
- this.$set(this, `transport`, res.data.transport);
|
|
|
- this.$set(this.customerForm, `customer_transport_type`, this.transport.customer_transport_type);
|
|
|
- this.$set(this.customerForm, `customer_transport_no`, this.transport.customer_transport_no);
|
|
|
}
|
|
|
// 显示物流
|
|
|
res = await this.getFetch(this.id);
|
|
|
@@ -263,7 +267,7 @@ export default {
|
|
|
if (res.data.customer.is_check == '已签收' && this.info.status == '2') this.$set(this, `active`, 3);
|
|
|
}
|
|
|
if (res.data.shop) {
|
|
|
- if (res.data.status == '3') this.$set(this, `active`, 4);
|
|
|
+ if (this.info.status == '3') this.$set(this, `active`, 4);
|
|
|
let shopList = res.data.shop.list;
|
|
|
this.$set(this, `shopList`, shopList);
|
|
|
shopList[0].color = '#0bbd87';
|
|
|
@@ -368,6 +372,9 @@ export default {
|
|
|
return this.$route.query.id;
|
|
|
},
|
|
|
},
|
|
|
+ computed: {
|
|
|
+ ...mapState(['user']),
|
|
|
+ },
|
|
|
metaform() {
|
|
|
return { title: this.$route.meta.title };
|
|
|
},
|
