diff --git a/env/.env.dev b/env/.env.dev index b7fd2d0..f3597b0 100644 --- a/env/.env.dev +++ b/env/.env.dev @@ -7,7 +7,7 @@ VITE_API_URL = '/proxyApi' # 开发环境接口地址 # VITE_proxyTarget = 'http://10.40.92.74:8080' #盛旭 -VITE_proxyTarget = 'http://192.168.2.246:28080' # 马帅 +VITE_proxyTarget = 'http://localhost:18080' # 马帅 # VITE_proxyTarget = 'http://192.168.0.244:28580' # 马帅 # VITE_proxyTarget = 'http://192.168.2.129:18080' # 马帅 diff --git a/src/router/index.ts b/src/router/index.ts index 5747032..ef4d61a 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -228,6 +228,18 @@ const routes: Array = [ isLogin: true }, }, + /* 订单管理(订单详情) */ + { + path: 'orderManagementInfo', + name: 'orderManagementInfo', + component: () => import('@/views/user/orderManagement/detail.vue'), + meta: { + title: '订单详情', + keepAlive: true, + AuthFlag: false, + isLogin: false + }, + }, /* 订单管理(退租) */ { path: 'rentinTermination', diff --git a/src/views/user/orderManagement/index.vue b/src/views/user/orderManagement/index.vue index 0250417..5d20640 100644 --- a/src/views/user/orderManagement/index.vue +++ b/src/views/user/orderManagement/index.vue @@ -115,7 +115,7 @@ const clickConfirmReceipt = (row: any) => { const settleinTitle = ref('') /* 编辑 */ const isEditDisabled = ref(false) -// 装备入驻弹框显示隐藏 +// 退租检修弹框显示隐藏 const dialogFormVisibleSettlein: any = ref(false) const equipmentDeploymentParams: any = ref({ /* 设备名称 */ @@ -263,10 +263,33 @@ const equipmentDeploymentParams: any = ref({ insureList: [], picList: [] } - // 打开入驻弹框 + // 打开退组检修弹框 dialogFormVisibleSettlein.value = true } +const settlemoneyTitle = ref('') +const moneParams: any = ref({ + /* 设备名称 */ + deviceName: '', + deviceTypeList: [], + deviceCount: 1, + unitName: '', +}) +// 退租检修弹框显示隐藏 +const dialogFormVisibleSettlemoney: any = ref(false) +//费用结算 + const handleViewMoney = () => { + settlemoneyTitle.value = '费用结算' + moneParams.value = { + /* 设备状态 */ + maStatus: 15, + detectionList: [], + insureList: [], + picList: [] + } + // 打开退组检修弹框 + dialogFormVisibleSettlemoney.value = true + } @@ -500,7 +523,7 @@ const equipmentDeploymentParams: any = ref({ 退租检修 + + +
+
+
+ 订单编号:10000212135656 +
+ +
+ 装备套数:2套 +
+ +
+ 退租时间:2024-10-10 10:00:00 +
+ +
+
+
+ 结算单位:安徽送变电公司 +
+
+ 租赁天数:30{{"/天"}} +
+ +
+ 租赁费用(元):1800 +
+
+
+ + 退租检测信息 + +
+
+