update 完成订单 订单详情tag
This commit is contained in:
parent
7a21e908a4
commit
3956a0c159
@ -5,8 +5,7 @@
|
|||||||
:fullscreen="fullscreen"
|
:fullscreen="fullscreen"
|
||||||
:visible="visible"
|
:visible="visible"
|
||||||
@close="handleClose"
|
@close="handleClose"
|
||||||
:destroy-on-close="false"
|
@closed="$emit('destroy')">
|
||||||
:close-on-click-modal="configs.clickModalToClose ?? false">
|
|
||||||
<div slot="title" style="background: #eee; padding: 8px; text-align: center; border-bottom: 1px solid #ccc">
|
<div slot="title" style="background: #eee; padding: 8px; text-align: center; border-bottom: 1px solid #ccc">
|
||||||
<el-checkbox-group v-model="activeTab" @change="handleTabClick">
|
<el-checkbox-group v-model="activeTab" @change="handleTabClick">
|
||||||
<el-checkbox-button :true-label="1">子订单进度</el-checkbox-button>
|
<el-checkbox-button :true-label="1">子订单进度</el-checkbox-button>
|
||||||
@ -21,7 +20,7 @@
|
|||||||
<SubOrderDetail v-if="activeTab === 1 && order !== null" :order="order" />
|
<SubOrderDetail v-if="activeTab === 1 && order !== null" :order="order" />
|
||||||
<CarDetail v-if="activeTab === 2 && order !== null" :order-id="order.id" :table-layout="carLayoutKey" />
|
<CarDetail v-if="activeTab === 2 && order !== null" :order-id="order.id" :table-layout="carLayoutKey" />
|
||||||
<TrayDetail v-if="activeTab === 3" />
|
<TrayDetail v-if="activeTab === 3" />
|
||||||
<OrderDetailWrapper v-if="activeTab === 4" :order="order" :order-detail-configs="configs" />
|
<OrderDetailWrapper v-if="activeTab === 4" :order="order" />
|
||||||
</transition>
|
</transition>
|
||||||
|
|
||||||
<!-- footer -->
|
<!-- footer -->
|
||||||
@ -41,10 +40,6 @@ export default {
|
|||||||
name: "DialogWithMenu--OrderVersion",
|
name: "DialogWithMenu--OrderVersion",
|
||||||
components: { CarDetail, OrderDetailWrapper, SubOrderDetail, TrayDetail },
|
components: { CarDetail, OrderDetailWrapper, SubOrderDetail, TrayDetail },
|
||||||
props: {
|
props: {
|
||||||
configs: {
|
|
||||||
type: Object,
|
|
||||||
default: () => null,
|
|
||||||
},
|
|
||||||
fullscreen: {
|
fullscreen: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: true,
|
default: true,
|
||||||
@ -102,10 +97,6 @@ export default {
|
|||||||
|
|
||||||
handleClose() {
|
handleClose() {
|
||||||
this.visible = false;
|
this.visible = false;
|
||||||
|
|
||||||
setTimeout(() => {
|
|
||||||
this.$emit("destroy-dialog");
|
|
||||||
}, 200);
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
@ -26,11 +26,9 @@
|
|||||||
|
|
||||||
<DialogWithMenu
|
<DialogWithMenu
|
||||||
ref="edit-dialog"
|
ref="edit-dialog"
|
||||||
v-if="!!dialogConfigs && dialogVisible"
|
v-if="dialogVisible"
|
||||||
:configs="dialogConfigs"
|
|
||||||
@refreshDataList="getList"
|
@refreshDataList="getList"
|
||||||
@destroy-dialog="dialogVisible = false" />
|
@destroy="dialogVisible = false" />
|
||||||
<!-- :dialog-visible.sync="dialogVisible" :configs="dialogConfigs" @refreshDataList="getList" /> -->
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<div style="height: 100%;">
|
<div style="height: 100%;">
|
||||||
<el-skeleton v-show="orderNotReady" />
|
<el-skeleton v-show="orderNotReady" />
|
||||||
<OrderDetail v-show="!orderNotReady" ref="order-detail-tag" :configs="orderDetailConfigs" @detail-loaded="orderNotReady = false" />
|
<OrderDetail v-show="!orderNotReady" ref="order-detail-tag" @detail-loaded="orderNotReady = false" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@ -12,10 +12,6 @@ export default {
|
|||||||
name: "OrderDetailWrapper",
|
name: "OrderDetailWrapper",
|
||||||
components: { OrderDetail },
|
components: { OrderDetail },
|
||||||
props: {
|
props: {
|
||||||
orderDetailConfigs: {
|
|
||||||
type: Object,
|
|
||||||
default: () => null,
|
|
||||||
},
|
|
||||||
order: {
|
order: {
|
||||||
type: Object,
|
type: Object,
|
||||||
default: () => null
|
default: () => null
|
||||||
|
Loading…
Reference in New Issue
Block a user