diff --git a/src/pages/guide/judge.vue b/src/pages/guide/judge.vue index 6ea695b..0d8ced6 100644 --- a/src/pages/guide/judge.vue +++ b/src/pages/guide/judge.vue @@ -1,17 +1,80 @@ + + diff --git a/src/pages/revert/admin.vue b/src/pages/revert/admin.vue new file mode 100644 index 0000000..17d0bb4 --- /dev/null +++ b/src/pages/revert/admin.vue @@ -0,0 +1,225 @@ + + + diff --git a/src/pages/revert/base.vue b/src/pages/revert/base.vue index 2552316..2e20871 100644 --- a/src/pages/revert/base.vue +++ b/src/pages/revert/base.vue @@ -366,7 +366,11 @@ const onSubmit = async () => { } const getData = async () => { - const resData = await http.get(`/ledgers/${form.date}`) + const resData = await http.get(`/ledgers/${form.date}`, { + params: { + store_id: store.value?.id, + }, + }) Object.assign(form, resData, { photos: diff --git a/src/pages/revert/index.vue b/src/pages/revert/index.vue index e320c13..a0253a7 100644 --- a/src/pages/revert/index.vue +++ b/src/pages/revert/index.vue @@ -1,9 +1,12 @@ diff --git a/src/pages/statement/index.vue b/src/pages/statement/index.vue index 7cd0fa1..ee634d4 100644 --- a/src/pages/statement/index.vue +++ b/src/pages/statement/index.vue @@ -26,12 +26,12 @@ - + 销售金额 {{ ledger.sales }} - + 明细 金额 - - - 体彩 - {{item}} + + + {{item.name}} + {{item[activeName]}} @@ -190,9 +190,11 @@ const ledger = ref({ expenditure: '0', sales: '0', sales_growth_rate: '0', + lottery_types:[] }) -const activeName = ref('area') +const activeName = ref('lottery_types') +const lottery_types = computed(()=> ledger.value?.lottery_types || []) onShow(() => { getCount() @@ -204,7 +206,9 @@ onReady(() => { }) const openLogPopup = (type) => { - logPopup.value.open() + activeName.value = type + if(checkPermission(['admin']) || isLotteryStore.value) logPopup.value.open() + } const confirm = ({ range }) => { isCalendar.value = true