czg_team
/
cashier_admin_app
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev_1.0.0

This commit is contained in:
YeMingfei666 2024-11-04 10:56:40 +08:00
parent 76d844274a 4b0882bbd4
commit 3fb3d89ae3
7 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pageConsumables/outbound.vue
View File

@ -100,6 +100,9 @@
onMounted,
getCurrentInstance
} from 'vue';
import {
onShow,
} from '@dcloudio/uni-app';
import color from '@/commons/color.js';
import go from '@/commons/utils/go.js';
import {
@ -131,10 +134,11 @@
}
})
onMounted(() => {
getList()
datas.item = JSON.parse(props.item)
})
onShow(() => {
getList()
})
function toggle() {
go.to('PAGES_ADD_SUPPLIER')
}

7
pageConsumables/warehouseEntry.vue
View File

@ -104,6 +104,9 @@
onMounted,
getCurrentInstance
} from 'vue';
import {
onShow,
} from '@dcloudio/uni-app';
import color from '@/commons/color.js';
import go from '@/commons/utils/go.js';
import {
@ -134,10 +137,12 @@
}
})
onMounted(() => {
getList()
datas.item = JSON.parse(props.item)
datas.form = assign(datas.form, ...datas.item)
})
onShow(() => {
getList()
})
const refs = getCurrentInstance()
function toggle() {

8
pageSalesSummary/components/my-date-pickerview.vue
View File

@ -24,7 +24,7 @@
<picker-view-column>
<view class="item" v-for="(item,index) in days" :key="index">{{item}}日</view>
</picker-view-column>
<picker-view-column>
<!-- <picker-view-column>
<view class="item" v-for="(item,index) in hours" :key="index">{{item}}时</view>
</picker-view-column>
<picker-view-column>
@ -32,7 +32,7 @@
</picker-view-column>
<picker-view-column>
<view class="item" v-for="(item,index) in seconds" :key="index">{{item}}秒</view>
</picker-view-column>
</picker-view-column> -->
</picker-view>
<view class="u-text-center color-999">至</view>
<picker-view :immediate-change="true" :value="value1" @pickend="pickend1" @change="bindChange1"
@ -46,7 +46,7 @@
<picker-view-column>
<view class="item" v-for="(item,index) in days1" :key="index">{{item}}日</view>
</picker-view-column>
<picker-view-column>
<!-- <picker-view-column>
<view class="item" v-for="(item,index) in hours" :key="index">{{item}}时</view>
</picker-view-column>
<picker-view-column>
@ -54,7 +54,7 @@
</picker-view-column>
<picker-view-column>
<view class="item" v-for="(item,index) in seconds" :key="index">{{item}}秒</view>
</picker-view-column>
</picker-view-column> -->
</picker-view>
<!-- 站位 -->

6
pageSalesSummary/index.vue
View File

@ -192,8 +192,10 @@
startTime = dayjs().startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
endTime = dayjs().endOf('month').format('YYYY-MM-DD') + ' 23:59:59'
} else if (selected.value == 'custom') {
startTime = start
endTime = end
let s = start.substring(0, start.indexOf(' '))
let e = end.substring(0, end.indexOf(' '))
startTime = s + ' 00:00:00'
endTime = e + ' 23:59:59'
}
summaryTrade({
shopId: uni.getStorageSync('shopId'),

1
pageUser/add-user/add-user.vue
View File

@ -202,6 +202,7 @@
onLoad(params => {
console.log(params,'调试111')
if (params.id) {
let items = params
uni.setNavigationBarTitle({

5
pageUser/index/index.vue
View File

@ -283,7 +283,10 @@
activeUser: null
})
let close = () => {
datas.form = {}
datas.form = {
operationType: 'in',
type: 'inMoney'
}
}
const confirm = () => {
datas.show = false;

17
pages/index/components/statistics.vue
View File

@ -49,13 +49,15 @@
} from '@dcloudio/uni-app';
let selected = ref('today')
let showAll = ref(false);
let $list=[]
let $list = []
function toggleShowAll() {
showAll.value = !showAll.value
setList()
}
function setList(){
list.value=showAll.value?$list:$list.slice(0,4)
function setList() {
list.value = showAll.value ? $list : $list.slice(0, 4)
}
let list = ref()
const emit = defineEmits(['totalRevenue'])
@ -90,6 +92,7 @@
})
}
});
function getlist(start, end) {
let startTime, endTime;
if (selected.value == 'today') {
@ -113,15 +116,17 @@
startTime = dayjs().startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
endTime = dayjs().endOf('month').format('YYYY-MM-DD') + ' 23:59:59'
} else if (selected.value == 'custom') {
startTime = start
endTime = end
let s = start.substring(0, start.indexOf(' '))
let e = end.substring(0, end.indexOf(' '))
startTime = s + ' 00:00:00'
endTime = e + ' 23:59:59'
}
summaryTrade({
shopId: uni.getStorageSync('shopId'),
startTime,
endTime,
}).then((res) => {
$list=res.sale.payCount
$list = res.sale.payCount
setList()
emit('totalRevenue', res.sale.incomeAmountAll)
})