diff --git a/components.d.ts b/components.d.ts index fc29266..fe405fa 100644 --- a/components.d.ts +++ b/components.d.ts @@ -10,7 +10,10 @@ declare module 'vue' { ElButton: typeof import('element-plus/es')['ElButton'] ElCarousel: typeof import('element-plus/es')['ElCarousel'] ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] - ElDivider: typeof import('element-plus/es')['ElDivider'] + 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'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElIcon: typeof import('element-plus/es')['ElIcon'] @@ -18,16 +21,16 @@ declare module 'vue' { ElInput: typeof import('element-plus/es')['ElInput'] ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] - ElOption: typeof import('element-plus/es')['ElOption'] ElPageHeader: typeof import('element-plus/es')['ElPageHeader'] ElPagination: typeof import('element-plus/es')['ElPagination'] - ElProgress: typeof import('element-plus/es')['ElProgress'] - ElSelect: typeof import('element-plus/es')['ElSelect'] + ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] + ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] + ElRow: typeof import('element-plus/es')['ElRow'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] + ElTag: typeof import('element-plus/es')['ElTag'] ElTimeline: typeof import('element-plus/es')['ElTimeline'] ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem'] - ElUpload: typeof import('element-plus/es')['ElUpload'] EquipCard: typeof import('./src/components/equipCard.vue')['default'] EquipDetailTable: typeof import('./src/components/equipDetailTable.vue')['default'] FooterInfo: typeof import('./src/components/FooterInfo/index.vue')['default'] diff --git a/src/views/user/orderManagement/orderCom/json/details.json b/src/views/user/orderManagement/orderCom/json/details.json index 76e27d9..51b4366 100644 --- a/src/views/user/orderManagement/orderCom/json/details.json +++ b/src/views/user/orderManagement/orderCom/json/details.json @@ -16,19 +16,19 @@ "description": "项目说明", "maId": 1, "leaseType": 1, - "leasePrice": "租赁单价", - "machinistPrice": null, + "leasePrice": "20000", + "machinistPrice": "3600", "orderContract": "https://hzgyp-prod-1259451974.cos.ap-guangzhou.myqcloud.com/enterprise/serviceAgreement.pdf", - "machinistName": "机手姓名张三", - "phone": "13866169999", - "logisticsPhone": "物流司机电话139", + "machinistName": "机手姓名", + "phone": "联系电话13899995555", + "logisticsPhone": "物流司机电话13899995555", "realStartTime": "设备实际进场时间", "renterName": null, "tenantName": null, "entryAttachment": null, "typeName": null, "groupName": null, - "deviceName": "null挖掘机械", + "deviceName": null, "code": "订单编号202311001", "orderTime": "2023-12-1", "orderStatus": "订单状态", diff --git a/src/views/user/orderManagement/orderCom/orderConfirm.vue b/src/views/user/orderManagement/orderCom/orderConfirm.vue index a30ca6c..24956b9 100644 --- a/src/views/user/orderManagement/orderCom/orderConfirm.vue +++ b/src/views/user/orderManagement/orderCom/orderConfirm.vue @@ -119,7 +119,7 @@ 下一步 - 确认发 + 确认发货 diff --git a/src/views/user/orderManagement/orderCom/orderDetails.vue b/src/views/user/orderManagement/orderCom/orderDetails.vue index 3a80474..37cca04 100644 --- a/src/views/user/orderManagement/orderCom/orderDetails.vue +++ b/src/views/user/orderManagement/orderCom/orderDetails.vue @@ -6,40 +6,42 @@ - {xxxxx} + {{ detailsInfo.code}} - xxxxx + {{ detailsInfo.needCompany}} - xxxxx + {{ detailsInfo.phone}} - xxxxx + + - xxxxx + + - xxxxx + - xxxxx + - xxxxx + - xxxxx + - xxxxx + - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + - xxxx-xx-xx ~ xxxx-xx-xx + @@ -54,16 +56,16 @@ - xxxxxxxxxxxx.pdf + - xxxxx + - xxxxx + - xxxxx + @@ -132,7 +134,7 @@ const activities = [ }, ] -const detailsInfo =reactive({ +const detailsInfo:any =reactive({ }) const initApiOrderDetails = async () => {