From 0a7f44b8479f5fcc8d77a1b602cc5cf02334874d Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Wed, 11 Dec 2024 18:09:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E5=90=88?= =?UTF-8?q?=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 4 - env/.env.dev | 2 +- src/http/api/rent-termination/index.ts | 4 +- src/views/user/lessor/tag-manage/index.vue | 12 +- .../orderManagement/components/order-home.vue | 102 ----- .../components/order-home.vue | 395 +++++++++--------- .../components/rent-termination-model.vue | 22 +- 7 files changed, 227 insertions(+), 314 deletions(-) diff --git a/components.d.ts b/components.d.ts index bc01e0b..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'] @@ -33,13 +32,10 @@ declare module 'vue' { ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm'] ElProgress: typeof import('element-plus/es')['ElProgress'] - ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] - ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] ElRow: typeof import('element-plus/es')['ElRow'] ElSelect: typeof import('element-plus/es')['ElSelect'] ElStep: typeof import('element-plus/es')['ElStep'] ElSteps: typeof import('element-plus/es')['ElSteps'] - ElSwitch: typeof import('element-plus/es')['ElSwitch'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] ElTag: typeof import('element-plus/es')['ElTag'] diff --git a/env/.env.dev b/env/.env.dev index 1aed2b5..07b1fab 100644 --- a/env/.env.dev +++ b/env/.env.dev @@ -11,7 +11,7 @@ VITE_API_URL = '/proxyApi' # VITE_proxyTarget = 'http://192.168.2.127:28080' # 梁超 # VITE_proxyTarget = 'http://36.33.26.201:17788/proxyApi' # 测试服务 # VITE_proxyTarget = 'http://192.168.0.244:28580' # 测试服务 -VITE_proxyTarget = 'http://192.168.2.72:28080' # 马帅j +VITE_proxyTarget = 'http://192.168.2.72:28080' # 盛旭 # VITE_proxyTarget = 'http://10.40.92.185:9206' # 赵福海 ( 设备类型) # VITE_proxyTarget = 'http://10.40.92.16:9502' # 牛 (个人中心 基础信息企业申请认证) diff --git a/src/http/api/rent-termination/index.ts b/src/http/api/rent-termination/index.ts index 71cd056..fd9f228 100644 --- a/src/http/api/rent-termination/index.ts +++ b/src/http/api/rent-termination/index.ts @@ -15,8 +15,8 @@ export const getRentTerminationListApi = (data: any = {}) => { * @param orderId 查询参数 获取退租详情 订单ID * @returns */ -export const getOrderDetailsByIdApi = (orderId: any) => { - return get(`/material-mall/order/getOrderDetailsById`, { orderId }) +export const getOrderDetailsByIdApi = (data: any) => { + return get(`/material-mall/order/getOrderDetailsById`, data) } /** * @param data 退租检修提交 获取退租详情 data参数 diff --git a/src/views/user/lessor/tag-manage/index.vue b/src/views/user/lessor/tag-manage/index.vue index 2c04297..11dfd29 100644 --- a/src/views/user/lessor/tag-manage/index.vue +++ b/src/views/user/lessor/tag-manage/index.vue @@ -149,7 +149,7 @@ > - + - + + 下载标签 + + - + --> @@ -2129,9 +2098,15 @@ const handleViewWord = () => { } .order-title-info { - padding: 6px 4px; + position: relative; + padding: 14px 4px; font-size: 14px; color: #999; + .order-type-box { + position: absolute; + top: 0; + right: 0; + } } .order-items { @@ -2141,6 +2116,8 @@ const handleViewWord = () => { .order-info { display: flex; padding: 10px 0; + align-items: center; + justify-content: center; } .order-items-info { @@ -2158,8 +2135,10 @@ const handleViewWord = () => { } .handle-btn { + width: 100%; display: flex; flex-wrap: wrap; + align-items: center; .el-button { width: calc((100% - 50px) / 4); @@ -2167,6 +2146,30 @@ const handleViewWord = () => { margin-left: 10px !important; } } +.handle-btn-4 { + width: 100%; + display: flex; + flex-wrap: wrap; + + align-items: center; + .el-button { + width: calc((100% - 20px) / 2); + margin-left: 10px !important; + margin-bottom: 10px; + } +} +.handle-btn-1 { + width: 100%; + display: flex; + flex-wrap: wrap; + justify-content: center; + + .el-button { + width: 90%; + margin-bottom: 10px; + margin-left: 5% !important; + } +} .app-container-content { :deep(.el-dialog) { display: flex !important; diff --git a/src/views/user/orderManagementCz/components/rent-termination-model.vue b/src/views/user/orderManagementCz/components/rent-termination-model.vue index ed6a4a6..2999e83 100644 --- a/src/views/user/orderManagementCz/components/rent-termination-model.vue +++ b/src/views/user/orderManagementCz/components/rent-termination-model.vue @@ -585,6 +585,10 @@ const props = defineProps({ type: [String, Number], default: '', }, + maId: { + type: [String, Number], + default: '', + }, type: { type: Number, default: 1, @@ -800,11 +804,20 @@ const getOrderDetailsData = async () => { props.type == 1 ? (dialogTitle.value = '退租检修') : (dialogTitle.value = '检修明细') if (props.type === 1) { - const { data: res }: any = await getOrderDetailsByIdApi(props.orderId) + const { data: res }: any = await getOrderDetailsByIdApi({ + orderId: props.orderId, + maId: props.maId, + }) orderDetails.value = res - repairSelect.value = JSON.parse(JSON.stringify(res.detailsList)) - lossSelect.value = JSON.parse(JSON.stringify(res.detailsList)) - scrapSelect.value = JSON.parse(JSON.stringify(res.detailsList)) + repairSelect.value = JSON.parse(JSON.stringify(res.detailsList)).filter( + (e: any) => e.maId == props.maId, + ) + lossSelect.value = JSON.parse(JSON.stringify(res.detailsList)).filter( + (e: any) => e.maId == props.maId, + ) + scrapSelect.value = JSON.parse(JSON.stringify(res.detailsList)).filter( + (e: any) => e.maId == props.maId, + ) orderDetails.value.orderId = props.orderId } else { const { data: res }: any = await getOverhaulApi(props.orderId) @@ -868,6 +881,7 @@ const onSubmit = async (type: boolean) => { const res: any = await setAddLeaseRepairApi({ orderId, code, + maId: props.maId, repairRecordList: repairFormList.value, scrapRecordList: scrapFormList.value, lossRecordList: lossFormList.value,