From 23adf1910e44333bab26c95e24bfec01e26c6542 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Wed, 18 Dec 2024 12:18:40 +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 --- .../orderManagement/components/order-home.vue | 58 ++++++++++- .../components/order-home.vue | 96 +++++++++++++++---- 2 files changed, 131 insertions(+), 23 deletions(-) diff --git a/src/views/user/orderManagement/components/order-home.vue b/src/views/user/orderManagement/components/order-home.vue index c2020f4..58a06d5 100644 --- a/src/views/user/orderManagement/components/order-home.vue +++ b/src/views/user/orderManagement/components/order-home.vue @@ -21,6 +21,8 @@ const store = useStore() import { mainStore } from 'store/main' import jsPreviewDocx from '@js-preview/docx' import '@js-preview/docx/lib/index.css' +import moment from 'moment' +const momentInit = moment const store2 = mainStore() const overhaulDetails = ref({}) @@ -656,7 +658,33 @@ const costSubmit = () => { 租期 - {{ goods.days }}{{ ' ' + '天' }} + + + {{ goods.days }}{{ ' ' + '天' }} + + + {{ + momentInit(goods.takeOverTime).diff( + goods.rentOverTime, + 'day', + ) == 0 + ? 1 + : momentInit(goods.takeOverTime).diff( + goods.rentOverTime, + 'day', + ) + }}{{ ' ' + '天' }} + + + + 编号 {{ goods.code }} @@ -673,7 +701,16 @@ const costSubmit = () => {
总费用
-
{{ item.cost }} 元
+ +
+ {{ item.cost }} 元 +
+
+ {{ item.totalRealPrice }} 元 +
{ " >
租期
-
+
{{ goods.rentBeginTime }}至{{ goods.rentEndTime }}
+
+ {{ goods.takeOverTime.slice(0, 10) }}至{{ + goods.rentOverTime.slice(0, 10) + }} +
diff --git a/src/views/user/orderManagementCz/components/order-home.vue b/src/views/user/orderManagementCz/components/order-home.vue index ca55791..9f9f027 100644 --- a/src/views/user/orderManagementCz/components/order-home.vue +++ b/src/views/user/orderManagementCz/components/order-home.vue @@ -20,6 +20,8 @@ const store = useStore() import { mainStore } from 'store/main' import jsPreviewDocx from '@js-preview/docx' import '@js-preview/docx/lib/index.css' +import moment from 'moment' +const momentInit = moment const store2 = mainStore() /* 查询参数 *** **** @@ -423,7 +425,7 @@ const onRepairEnd = (orderId: any, code: any) => { type: 'warning', }) .then(async () => { - const res: any = await passApi({ orderStatus: 10, orderId, orderCode:code }) + const res: any = await passApi({ orderStatus: 10, orderId, orderCode: code }) if (res.code === 200) { ElMessage({ @@ -653,7 +655,7 @@ const dialogFormVisibleSettleWord: any = ref(false) // } //租赁协议 -const handleViewWord = async(index: Number, row: any) => { +const handleViewWord = async (index: Number, row: any) => { settleWordTitle.value = '租赁协议' moneyParams1.value = { /* 设备状态 */ @@ -666,23 +668,21 @@ const handleViewWord = async(index: Number, row: any) => { const res: any = await getContractDetailApi({ orderId }) // cardList.value = res.rows // 打开租赁协议弹框 - wordUrl.value = res.data.url + wordUrl.value = res.data.url dialogFormVisibleSettleWord.value = true setTimeout(() => { - const myDocxPreviewer = jsPreviewDocx.init(document.getElementById("mmm")); - //传递要预览的文件地址即可 - myDocxPreviewer - .preview( - wordUrl.value - ) - .then((res) => { - console.log("预览完成"); - }) - .catch((e) => { - console.log('1111', wordUrl.value) - console.log("预览失败", e); - }); - }, 1000); + const myDocxPreviewer = jsPreviewDocx.init(document.getElementById('mmm')) + //传递要预览的文件地址即可 + myDocxPreviewer + .preview(wordUrl.value) + .then((res) => { + console.log('预览完成') + }) + .catch((e) => { + console.log('1111', wordUrl.value) + console.log('预览失败', e) + }) + }, 1000) } const contract = ref({ @@ -908,7 +908,33 @@ const wordUrl = ref('') 租期 - {{ goods.days }}{{ ' ' + '天' }} + + + {{ goods.days }}{{ ' ' + '天' }} + + + {{ + momentInit(goods.takeOverTime).diff( + goods.rentOverTime, + 'day', + ) == 0 + ? 1 + : momentInit(goods.takeOverTime).diff( + goods.rentOverTime, + 'day', + ) + }}{{ ' ' + '天' }} + + + + 编号 {{ goods.code }} @@ -925,7 +951,21 @@ const wordUrl = ref('')
总费用
-
{{ item.cost }} 元
+ +
+ {{ item.cost }} 元 +
+
+ {{ item.totalRealPrice }} 元 +
+