From 852539478bff66b79c11e9c6908688acbee0c00b Mon Sep 17 00:00:00 2001 From: songyang <972986197@qq.com> Date: Fri, 8 Dec 2023 17:38:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 2 +- env.d.ts | 3 +- src/components/Navmenu/index.vue | 2 +- src/router/index.ts | 3 +- src/views/EnterpriseCertification.vue | 10 +- src/views/user/orderManagement/index.vue | 27 ++- .../orderCom/renewalOfLease.vue | 2 +- .../orderCom/timeLineHorizontal.vue | 146 ++++++++-------- src/views/user/orderManagementCz/index.vue | 158 ++++++++++-------- 9 files changed, 188 insertions(+), 165 deletions(-) diff --git a/components.d.ts b/components.d.ts index 16c4173..d0d5e8e 100644 --- a/components.d.ts +++ b/components.d.ts @@ -10,13 +10,13 @@ declare module 'vue' { ElButton: typeof import('element-plus/es')['ElButton'] ElCarousel: typeof import('element-plus/es')['ElCarousel'] ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] - ElCascader: typeof import('element-plus/es')['ElCascader'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCol: typeof import('element-plus/es')['ElCol'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ElDialog: typeof import('element-plus/es')['ElDialog'] ElDivider: typeof import('element-plus/es')['ElDivider'] + 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/env.d.ts b/env.d.ts index f218ff3..d959db4 100644 --- a/env.d.ts +++ b/env.d.ts @@ -1,2 +1,3 @@ /// -declare module "nprogress" \ No newline at end of file +declare module "nprogress" + diff --git a/src/components/Navmenu/index.vue b/src/components/Navmenu/index.vue index dde9197..5d73515 100644 --- a/src/components/Navmenu/index.vue +++ b/src/components/Navmenu/index.vue @@ -11,7 +11,7 @@ { name: '企业专区', routerName: '/home' } ] - const navMenuClick = (name) => { + const navMenuClick = (name: any) => { router.push({ name }) } diff --git a/src/router/index.ts b/src/router/index.ts index fa4c6af..bf18401 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -1,5 +1,4 @@ import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router' -import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router' import test from './module/test' import myInfo from './module/myInfo' @@ -81,7 +80,7 @@ const routes: Array = [ { path: '/equipList', name: 'equipList', - component: () => import('@/views/equip/list.vue'), + component: () => import('views/equip/list.vue'), meta: { title: '' } diff --git a/src/views/EnterpriseCertification.vue b/src/views/EnterpriseCertification.vue index 7e1bcd7..8e6baf5 100644 --- a/src/views/EnterpriseCertification.vue +++ b/src/views/EnterpriseCertification.vue @@ -327,7 +327,7 @@ - + > @@ -405,14 +405,14 @@
-
+ + --> +
提 交 diff --git a/src/views/user/orderManagement/index.vue b/src/views/user/orderManagement/index.vue index 2615c5f..f150a8f 100644 --- a/src/views/user/orderManagement/index.vue +++ b/src/views/user/orderManagement/index.vue @@ -44,9 +44,14 @@ } /* 续租按钮 */ - const clickRenewalOfLease = () => { - console.log('续租') - router.push({ name: 'renewalOfLease' }) + const clickRenewalOfLease = ({ row }: any) => { + console.log('续租', row) + router.push({ + name: 'renewalOfLease', + query: { + orderId: row.orderId + } + }) } /* 确认收货 */ @@ -108,12 +113,14 @@ - + @@ -122,7 +129,9 @@ 退租 - 续租 + + 续租 + 确认收货 diff --git a/src/views/user/orderManagement/orderCom/renewalOfLease.vue b/src/views/user/orderManagement/orderCom/renewalOfLease.vue index 4450c64..e4b9e9b 100644 --- a/src/views/user/orderManagement/orderCom/renewalOfLease.vue +++ b/src/views/user/orderManagement/orderCom/renewalOfLease.vue @@ -19,7 +19,7 @@ diff --git a/src/views/user/orderManagement/orderCom/timeLineHorizontal.vue b/src/views/user/orderManagement/orderCom/timeLineHorizontal.vue index 8d5f0bf..1d6112b 100644 --- a/src/views/user/orderManagement/orderCom/timeLineHorizontal.vue +++ b/src/views/user/orderManagement/orderCom/timeLineHorizontal.vue @@ -3,9 +3,13 @@
工程进度
- - + +
{{ item.title }}
@@ -15,86 +19,84 @@
\ No newline at end of file + + :deep(.el-timeline-item__timestamp) { + font-size: 14px; + font-weight: normal; + } + + .active { + border: none !important; + + :deep(.el-timeline-item__node) { + // background-color: $main-color; + background-color: v-bind('props.themeColor'); + } + + :deep(.el-timeline-item__tail) { + // border-color: $main-color; + // background-color: v-bind('props.themeColor'); + } + } + + // 有active样式的下一个li + .active + li { + :deep(.el-timeline-item__node) { + background-color: v-bind('props.themeColor'); + } + } + diff --git a/src/views/user/orderManagementCz/index.vue b/src/views/user/orderManagementCz/index.vue index 5696ec9..8407a4b 100644 --- a/src/views/user/orderManagementCz/index.vue +++ b/src/views/user/orderManagementCz/index.vue @@ -3,12 +3,12 @@ const queryParams = ref({}) import PagingComponent from 'components/PagingComponent/index.vue' import { getOrderListApi } from 'http/api/usercenter/seekorder' - import zhCn from 'element-plus/dist/locale/zh-cn.mjs' + // import zhCn from 'element-plus/dist/locale/zh-cn.mjs' const router = useRouter() - const pageSize = ref(20) - const pageNumber = ref(1) + const pageSize: any = ref(20) + const pageNumber: any = ref(1) const total: any = ref(0) // 获取数据列表 @@ -27,19 +27,24 @@ } /* 确认按钮 */ - const confirmBtn = (row:any) => { - router.push({ name: 'orderConfirm',query:{ - orderId:row.orderId - } }) - + const confirmBtn = (row: any) => { + router.push({ + name: 'orderConfirm', + query: { + orderId: row.orderId + } + }) } /* 查看按钮 */ - const clickPreviewDetails = (row:any) => { + const clickPreviewDetails = (row: any) => { console.log('查看') - router.push({ name: 'orderDetails',query:{ - orderId:row.orderId - } }) + router.push({ + name: 'orderDetails', + query: { + orderId: row.orderId + } + }) } const tableData: any = ref([{ address: '客户单位' }]) @@ -50,69 +55,76 @@