From 9df856613bc84cf3b2a7747a992a193ba6611748 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Fri, 6 Dec 2024 21:02:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/user/lessor/settlement/index.vue | 4 +- .../components/order-details.vue | 309 ++- .../orderManagement/components/order-home.vue | 44 +- src/views/user/orderManagement/index.vue | 16 +- .../components/order-details.vue | 653 +++++ .../components/order-home.vue | 2178 +++++++++++++++++ src/views/user/orderManagementCz/index.vue | 2136 +--------------- src/views/user/orderManagementCz/index_1.vue | 2118 ++++++++++++++++ 8 files changed, 5171 insertions(+), 2287 deletions(-) create mode 100644 src/views/user/orderManagementCz/components/order-details.vue create mode 100644 src/views/user/orderManagementCz/components/order-home.vue create mode 100644 src/views/user/orderManagementCz/index_1.vue diff --git a/src/views/user/lessor/settlement/index.vue b/src/views/user/lessor/settlement/index.vue index 6c1017a..88f1720 100644 --- a/src/views/user/lessor/settlement/index.vue +++ b/src/views/user/lessor/settlement/index.vue @@ -130,7 +130,7 @@ div type="primary" @click="onRepublish(row.orderStatus, row.orderId, row.isChangePrice)" > - {{ row.orderStatus == 6 || row.isChangePrice == 1 ? '费用详情' : '费用结算' }} + {{ row.orderStatus == 7 || row.isChangePrice == 1 ? '费用详情' : '费用结算' }} @@ -1179,7 +1179,7 @@ const onReset = () => { // 重新发布 const onRepublish = async (type: any, orderId: any, isChangePrice: any) => { - type == 6 || isChangePrice == 1 + type == 7 || isChangePrice == 1 ? (dialogTitle.value = '费用详情') : (dialogTitle.value = '费用结算') const { data: res }: any = await getOverhaulApi(orderId) diff --git a/src/views/user/orderManagement/components/order-details.vue b/src/views/user/orderManagement/components/order-details.vue index 5a39eb3..359591a 100644 --- a/src/views/user/orderManagement/components/order-details.vue +++ b/src/views/user/orderManagement/components/order-details.vue @@ -117,8 +117,9 @@ const getList = async () => { const res: any = await getOrderListInfoApi({ orderId: props.orderId }) - // orderDetails.value = res.data - console.log(res, '订单详情---') + orderDetails.value = res.data + // setStepType(res.data.orderStatus) + // console.log(res, '订单详情---') // cardList.value = res.data // operationDetails.value[1].preOutboundUser = res.data.detailsList[0].preOutboundUser // operationDetails.value[1].preOutboundTime = res.data.detailsList[0].preOutboundTime @@ -155,6 +156,66 @@ const onOrderManage = () => { console.log(props.orderStatus, 'orderStatus', props.orderId, 'orderId') const time = ref([]) +const currentActive = ref(0) +const stepList = ref([ + { + title: '待接单', + description: '', + }, + { + title: '已接单', + description: '', + }, + { + title: '已出库', + description: '', + }, + { + title: '已收货', + description: '', + }, + { + title: '租赁中', + description: '', + }, + { + title: '已退租', + description: '', + }, + { + title: '已结算', + description: '', + }, + { + title: '已完成', + description: '', + }, +]) + +// const setStepType = (status: any) => { + +// } +if (props.orderStatus == 1) { + currentActive.value = 0 +} +if (props.orderStatus == 2) { + currentActive.value = 1 +} +if (props.orderStatus == 3) { + currentActive.value = 3 +} +if (props.orderStatus == 4) { + currentActive.value = 5 +} +if (props.orderStatus == 5) { + currentActive.value = 6 +} +if (props.orderStatus == 6) { + currentActive.value = 7 +} +if (props.orderStatus == 7) { + currentActive.value = 8 +} diff --git a/src/views/user/orderManagementCz/components/order-details.vue b/src/views/user/orderManagementCz/components/order-details.vue new file mode 100644 index 0000000..a167e3f --- /dev/null +++ b/src/views/user/orderManagementCz/components/order-details.vue @@ -0,0 +1,653 @@ + + + + + diff --git a/src/views/user/orderManagementCz/components/order-home.vue b/src/views/user/orderManagementCz/components/order-home.vue new file mode 100644 index 0000000..89b25d5 --- /dev/null +++ b/src/views/user/orderManagementCz/components/order-home.vue @@ -0,0 +1,2178 @@ + + + + + diff --git a/src/views/user/orderManagementCz/index.vue b/src/views/user/orderManagementCz/index.vue index 13ede3d..8365cdc 100644 --- a/src/views/user/orderManagementCz/index.vue +++ b/src/views/user/orderManagementCz/index.vue @@ -1,2118 +1,38 @@ + + - - diff --git a/src/views/user/orderManagementCz/index_1.vue b/src/views/user/orderManagementCz/index_1.vue new file mode 100644 index 0000000..13ede3d --- /dev/null +++ b/src/views/user/orderManagementCz/index_1.vue @@ -0,0 +1,2118 @@ + + + + +