diff --git a/src/components/DepTree/index.vue b/src/components/DepTree/index.vue index 7949122..4883733 100644 --- a/src/components/DepTree/index.vue +++ b/src/components/DepTree/index.vue @@ -190,9 +190,10 @@ defineExpose({ align-items: center; padding-top: 10px; box-shadow: 0 -8px 8px -8px rgba(0, 0, 0, 0.1); - z-index: 10; + z-index: 999; position: sticky; bottom: 0; + overflow: hidden; } } diff --git a/src/views/admin/system/user/index.vue b/src/views/admin/system/user/index.vue index 7954a28..6119f09 100644 --- a/src/views/admin/system/user/index.vue +++ b/src/views/admin/system/user/index.vue @@ -1,40 +1,48 @@ + - + + (20) // 多选rows const selectObjs = ref([]) as any @@ -360,4 +371,26 @@ const changePassword = async (row: any) => { useMessage().success(t("common.optSuccessText")) getDataList() } + +const isOpen = ref(true) +const temp = ref() +const handleClickDepTreeDrawer = (isDrawerOpen: boolean) => { + if (isDrawerOpen) { + temp.value = depTreeWidth.value + depTreeWidth.value = 0.5 + } else { + depTreeWidth.value = temp.value + } + isOpen.value = !isOpen.value +} + + diff --git a/src/views/hard/components/shop-car.vue b/src/views/hard/components/shop-car.vue index 2030b6d..133de39 100644 --- a/src/views/hard/components/shop-car.vue +++ b/src/views/hard/components/shop-car.vue @@ -79,7 +79,22 @@ const getSummaries = (param: SummaryMethodProps) => { sums[index] = "合计" return } - if (column.property === "productPrice" || column.property === "totalPrice") { + if (column.property === "productCount") { + const values = data.map((item) => Number(item[column.property])) + if (!values.every((value) => Number.isNaN(value))) { + sums[index] = + values.reduce((prev, curr) => { + const value = Number(curr) + if (!Number.isNaN(value)) { + return prev + curr + } else { + return prev + } + }, 0) + "份" + } else { + sums[index] = "N/A" + } + } else if (column.property === "totalPrice") { const values = data.map((item) => Number(item[column.property])) if (!values.every((value) => Number.isNaN(value))) { sums[index] = displayPrice(