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

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

This commit is contained in:
duan 2024-10-17 09:47:37 +08:00
parent 2c2811f65a 9326712b3e
commit 469c26fe7f
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pageWorkControl/index/index.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="top fixed-top bg-fff"> <view class="top fixed-top bg-fff">
<my-tabs :list="tabs.list" @change="tabsChange"></my-tabs> <!-- <my-tabs :list="tabs.list" @change="tabsChange"></my-tabs> -->
<view class="u-flex color-main u-m-t-32 " v-if="tabs.current===1"> <view class="u-flex color-main u-m-t-32 " v-if="tabs.current===1">
<!-- <view class="u-flex u-p-l-20 " @tap="showJiaobanPickerView"> <!-- <view class="u-flex u-p-l-20 " @tap="showJiaobanPickerView">
<view class=" u-flex u-row-between "> <view class=" u-flex u-row-between ">
@ -34,7 +34,7 @@
</view> </view>
</view> </view>
<template v-if="tabs.current===0"> <template v-if="tabs.current===0">
<view class="color-333 u-font-28 min-page bg-gray default-box-padding" style="padding-top: 83px;"> <view class="color-333 u-font-28 min-page bg-gray default-box-padding" style="padding-top: 43px;">
<view class="bg-fff border-r-12 default-box-padding"> <view class="bg-fff border-r-12 default-box-padding">
<view> <view>
<view class="font-bold">是否打印销售区间的商品数据</view> <view class="font-bold">是否打印销售区间的商品数据</view>
@ -104,7 +104,7 @@
</view> </view>
</template> </template>
<template v-if="tabs.current===1"> <template v-if="tabs.current===1">
<view class="color-333 u-font-28 min-page bg-gray default-box-padding" style="padding-top: 116px;"> <view class="color-333 u-font-28 min-page bg-gray default-box-padding" style="padding-top:80px;">
<scroll-view :scroll-x="true" class="bg-fff table u-text-center"> <scroll-view :scroll-x="true" class="bg-fff table u-text-center">
<view class="bg-fff border-r-12 u-flex no-wrap u-col-top"> <view class="bg-fff border-r-12 u-flex no-wrap u-col-top">
<view class="constantbox"> <view class="constantbox">
@ -312,7 +312,7 @@
const tabs = reactive({ const tabs = reactive({
list: ['交班', '交班记录'], list: ['交班', '交班记录'],
current: 0 current: 1
}) })
// 切换tab // 切换tab
@ -323,9 +323,7 @@
clearTime() clearTime()
if (tabs.current == 1) { if (tabs.current == 1) {
resetHandle() resetHandle()
} else { } else {}
}
} }
const filters = reactive({ const filters = reactive({
@ -394,7 +392,7 @@
onShow(() => { onShow(() => {
form.jiaobanTime = new Date() form.jiaobanTime = new Date()
updateJiaoban() updateJiaoban()
resetHandle()
}) })
onHide(() => { onHide(() => {
clearInterval(timer) clearInterval(timer)