diff --git a/components.d.ts b/components.d.ts index f517de2..c0382ba 100644 --- a/components.d.ts +++ b/components.d.ts @@ -11,16 +11,42 @@ declare module 'vue' { EditorModel: typeof import('./src/components/EditorModel/index.vue')['default'] ElAvatar: typeof import('element-plus/es')['ElAvatar'] ElBadge: typeof import('element-plus/es')['ElBadge'] + ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] + ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] 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'] + ElCollapse: typeof import('element-plus/es')['ElCollapse'] + ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem'] 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'] + ElImage: typeof import('element-plus/es')['ElImage'] ElInput: typeof import('element-plus/es')['ElInput'] + ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] + ElMenu: typeof import('element-plus/es')['ElMenu'] + ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] + ElOption: typeof import('element-plus/es')['ElOption'] 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'] + ElTable: typeof import('element-plus/es')['ElTable'] + ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] ElTag: typeof import('element-plus/es')['ElTag'] + ElUpload: typeof import('element-plus/es')['ElUpload'] Empty: typeof import('./src/components/Empty/index.vue')['default'] EquipCard: typeof import('./src/components/equipCard.vue')['default'] EquipCardHall: typeof import('./src/components/equipCardHall/index.vue')['default'] diff --git a/src/views/user/orderManagement/components/order-home.vue b/src/views/user/orderManagement/components/order-home.vue index fc89243..c8f9dd8 100644 --- a/src/views/user/orderManagement/components/order-home.vue +++ b/src/views/user/orderManagement/components/order-home.vue @@ -108,8 +108,8 @@ const getList = async () => { queryParams.value.endTime = undefined } const res: any = await getOrderListApi(queryParams.value) - cardList.value = res.rows - total.value = res.total + cardList.value = res.data.rows + total.value = res.data.total } const emit = defineEmits(['onOpenOrderDetails']) @@ -1255,9 +1255,9 @@ const pickUpCodeForm = reactive({ diff --git a/src/views/user/orderManagementCz/components/order-home.vue b/src/views/user/orderManagementCz/components/order-home.vue index b5b5c30..8cdcde9 100644 --- a/src/views/user/orderManagementCz/components/order-home.vue +++ b/src/views/user/orderManagementCz/components/order-home.vue @@ -95,8 +95,8 @@ const getList = async () => { queryParams.value.endTime = undefined } const res: any = await getOrderListApi(queryParams.value) - cardList.value = res.rows - total.value = res.total + cardList.value = res.data.rows + total.value = res.data.total } const emit = defineEmits(['onOpenOrderDetails']) @@ -732,6 +732,19 @@ const downloadContract = () => { } const wordUrl = ref('') + +//取件码弹窗参数 +const dialogVisiblePickUpCode = ref(false); +// 新增变量来存储取件码 +const pickUpCode = ref(''); +const pickUpView = async(item: any) => { + console.log('item',item) + const res: any = await getOrderCodeApi({orderId:item.orderId}) + console.log('res',res) + pickUpCode.value = res.data + dialogVisiblePickUpCode.value = true; +}; +