From 98d2bce89cc85f1e69c919d2a0e64b9609769c76 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Mon, 16 Dec 2024 18:15:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 1 - .../components/order-details.vue | 21 ++++++-- .../orderManagement/components/order-home.vue | 25 ++++++++-- .../components/order-details.vue | 50 ++++++++++++++++--- .../components/order-home.vue | 24 +++++++-- 5 files changed, 103 insertions(+), 18 deletions(-) diff --git a/components.d.ts b/components.d.ts index 304ad97..a1551a3 100644 --- a/components.d.ts +++ b/components.d.ts @@ -20,7 +20,6 @@ declare module 'vue' { ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ElDialog: typeof import('element-plus/es')['ElDialog'] - ElEmpty: typeof import('element-plus/es')['ElEmpty'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElIcon: typeof import('element-plus/es')['ElIcon'] diff --git a/src/views/user/orderManagement/components/order-details.vue b/src/views/user/orderManagement/components/order-details.vue index 44e3406..bb4614e 100644 --- a/src/views/user/orderManagement/components/order-details.vue +++ b/src/views/user/orderManagement/components/order-details.vue @@ -13,6 +13,9 @@ const fileListAll = ref([]) const viewFileInfoList = ref([]) const overhaulDetails = ref({}) const innerVisible = ref(false) +import moment from 'moment' + +const momentInit = moment const orderStatusTemp = ref(0) const idTemp = ref('') @@ -301,7 +304,17 @@ const isOrderComplete = computed(() => { {{ goods.days }}{{ ' ' + '天' }} - {{ 3 }}{{ ' ' + '天' }} + {{ + momentInit(goods.takeOverTime).diff( + goods.rentOverTime, + 'day', + ) == 0 + ? 1 + : momentInit(goods.takeOverTime).diff( + goods.rentOverTime, + 'day', + ) + }}{{ ' ' + '天' }} @@ -358,9 +371,11 @@ const isOrderComplete = computed(() => { -
租赁总费用
+
总费用
{{ orderDetails.cost }} 元
-
{{ 800 }} 元
+
+ {{ overhaulDetails.totalCost }} 元 +
diff --git a/src/views/user/orderManagement/components/order-home.vue b/src/views/user/orderManagement/components/order-home.vue index 9c21fce..f435505 100644 --- a/src/views/user/orderManagement/components/order-home.vue +++ b/src/views/user/orderManagement/components/order-home.vue @@ -554,10 +554,7 @@ const costSubmit = () => { - + 出租方联系电话： @@ -578,6 +575,26 @@ const costSubmit = () => { + + + 出租方姓名： + {{ item.sellerName }} + + + 承租方姓名： + {{ item.buyerName }} + + + 承租方所属单位： + + {{ item.companyName }} + + + +
([]) const viewFileInfoList = ref([]) const overhaulDetails = ref({}) const innerVisible = ref(false) +import moment from 'moment' + +const momentInit = moment const orderStatusTemp = ref(0) const idTemp = ref('') @@ -160,6 +163,10 @@ const onViewFileImg = (row: any, index: number) => { viewFileInfoList.value = fileListAll.value.filter((e: any) => e.fileType == index) innerVisible.value = true } + +const isOrderComplete = computed(() => { + if (props.orderStatus == 20) return 'text-decoration: line-through' +})