diff --git a/src/utils/index.ts b/src/utils/index.ts index 771bb7a4..90e1f06c 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -194,10 +194,10 @@ export const copyValueToTarget = (target, source) => { * 将一个整数转换为分数保留两位小数 * @param num */ -export const formatToFraction = (num: number | string | undefined): number => { - if (typeof num === 'undefined') return 0 +export const formatToFraction = (num: number | string | undefined): string => { + if (typeof num === 'undefined') return '0.00' const parsedNumber = typeof num === 'string' ? parseFloat(num) : num - return parseFloat((parsedNumber / 100).toFixed(2)) + return (parsedNumber / 100.0).toFixed(2) } /** @@ -249,7 +249,7 @@ export const yuanToFen = (amount: string | number): number => { /** * 分转元 */ -export const fenToYuan = (price: string | number): number => { +export const fenToYuan = (price: string | number): string => { return formatToFraction(price) } diff --git a/src/views/mall/product/spu/index.vue b/src/views/mall/product/spu/index.vue index 27a4bd2d..6817323b 100644 --- a/src/views/mall/product/spu/index.vue +++ b/src/views/mall/product/spu/index.vue @@ -1,3 +1,4 @@ + - - + + - - - + + - - + @@ -236,48 +243,41 @@ defineOptions({ name: 'ProductSpu' }) const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 -const { currentRoute, push } = useRouter() // 路由跳转 +const { push } = useRouter() // 路由跳转 const loading = ref(false) // 列表的加载中 const exportLoading = ref(false) // 导出的加载中 const total = ref(0) // 列表的总页数 -const list = ref([]) // 列表的数据 +const list = ref([]) // 列表的数据 // tabs 数据 const tabsData = ref([ { - count: 0, - name: '出售中商品', - type: 0 + name: '出售中', + type: 0, + count: 0 }, { - count: 0, - name: '仓库中商品', - type: 1 + name: '仓库中', + type: 1, + count: 0 }, { - count: 0, - name: '已售罄商品', - type: 2 + name: '已售罄', + type: 2, + count: 0 }, { - count: 0, name: '警戒库存', - type: 3 + type: 3, + count: 0 }, { - count: 0, - name: '商品回收站', - type: 4 + name: '回收站', + type: 4, + count: 0 } ]) -/** 获得每个 Tab 的数量 */ -const getTabsCount = async () => { - const res = await ProductSpuApi.getTabsCount() - for (let objName in res) { - tabsData.value[Number(objName)].count = res[objName] - } -} const queryParams = ref({ pageNo: 1, pageSize: 10, @@ -288,11 +288,6 @@ const queryParams = ref({ }) // 查询参数 const queryFormRef = ref() // 搜索的表单Ref -const handleTabClick = (tab: TabsPaneContext) => { - queryParams.value.tabType = tab.paneName as number - getList() -} - /** 查询列表 */ const getList = async () => { loading.value = true @@ -305,8 +300,22 @@ const getList = async () => { } } +/** 切换 Tab */ +const handleTabClick = (tab: TabsPaneContext) => { + queryParams.value.tabType = tab.paneName as number + getList() +} + +/** 获得每个 Tab 的数量 */ +const getTabsCount = async () => { + const res = await ProductSpuApi.getTabsCount() + for (let objName in res) { + tabsData.value[Number(objName)].count = res[objName] + } +} + /** 添加到仓库 / 回收站的状态 */ -const handleStatus02Change = async (row, newStatus: number) => { +const handleStatus02Change = async (row: any, newStatus: number) => { try { // 二次确认 const text = newStatus === ProductSpuStatusEnum.RECYCLE.status ? '加入到回收站' : '恢复到仓库' @@ -322,7 +331,7 @@ const handleStatus02Change = async (row, newStatus: number) => { } /** 更新上架/下架状态 */ -const handleStatusChange = async (row) => { +const handleStatusChange = async (row: any) => { try { // 二次确认 const text = row.status ? '上架' : '下架' @@ -407,19 +416,16 @@ const handleExport = async () => { } } -const categoryList = ref() // 分类树 /** 获取分类的节点的完整结构 */ -const formatCategoryName = (categoryId) => { +const categoryList = ref() // 分类树 +const formatCategoryName = (categoryId: number) => { return treeToString(categoryList.value, categoryId) } -// 监听路由变化更新列表，解决商品保存后，列表不刷新的问题。 -watch( - () => currentRoute.value, - () => { - getList() - } -) +/** 激活时 */ +onActivated(() => { + getList() +}) /** 初始化 **/ onMounted(async () => {