Merge branch 'wwz' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test
This commit is contained in:
commit
151e12a0ff
|
|
@ -0,0 +1,29 @@
|
|||
import http from './http.js'
|
||||
const request = http.request
|
||||
|
||||
/**
|
||||
* 查询交班记录
|
||||
* @returns
|
||||
*/
|
||||
export function tbHandover(data) {
|
||||
return request({
|
||||
url: '/api/tbHandover?' + data,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 提交交班
|
||||
* @returns
|
||||
*/
|
||||
export function handoverData(data) {
|
||||
return request({
|
||||
url: '/api/tbHandover/handoverData',
|
||||
method: 'post',
|
||||
data: {
|
||||
shopId: uni.getStorageSync('shopId'),
|
||||
...data
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
<view class=" u-font-28 color-333 min-page bg-gray default-box-padding">
|
||||
|
||||
<view class="bg-fff border-r-18 default-box-padding u-flex">
|
||||
<view class="">交班人:</view>
|
||||
<view class="">交班人:{{form.staffName}}</view>
|
||||
<view class=" u-flex u-m-l-24 ">
|
||||
<text class="color-999" v-if="form.banciItem===''">暂未选择</text>
|
||||
<text v-else>
|
||||
|
|
@ -11,12 +11,12 @@
|
|||
</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
<view class="bg-fff u-m-t-32 border-r-18 u-flex default-box-padding">
|
||||
<view class="u-flex-1 border-r">
|
||||
<view>
|
||||
<view>班次号</view>
|
||||
<view class="color-666 u-font-24 u-m-t-8">10001</view>
|
||||
<view class="color-666 u-font-24 u-m-t-8">{{form.dutyId}}</view>
|
||||
</view>
|
||||
<view class="u-m-t-32">
|
||||
<view>班次</view>
|
||||
|
|
@ -26,21 +26,21 @@
|
|||
<view class="u-flex-1">
|
||||
<view>
|
||||
<view>开班时间</view>
|
||||
<view class="color-666 u-font-24 u-m-t-8">2024-05-17 14:44:50</view>
|
||||
<view class="color-666 u-font-24 u-m-t-8">{{form.startTime}}</view>
|
||||
</view>
|
||||
<view class="u-m-t-32">
|
||||
<view>交班时间</view>
|
||||
<view class="color-666 u-font-24 u-m-t-8">2024-05-17 14:44:56</view>
|
||||
<view class="color-666 u-font-24 u-m-t-8">{{form.endTime}}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
<view class="u-font-32 u-m-t-32 u-m-b-32">数据统计</view>
|
||||
<view class="bg-fff u-m-t-32 border-r-18 default-box-padding">
|
||||
<view class="u-flex list u-text-center u-flex-wrap">
|
||||
<view class="item u-m-b-32" v-for="(item,index) in form.infolists" :key="index">
|
||||
<view class="color-666 u-font-24">{{item.name}}</view>
|
||||
<view class="u-m-t-8 color-333">{{item.value}}</view>
|
||||
<view class="item u-m-b-32" v-for="(item,index) in form.memberData" :key="index">
|
||||
<view class="color-666 u-font-24">{{item.deposit}}</view>
|
||||
<view class="u-m-t-8 color-333">{{item.amount}}</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
|
@ -53,17 +53,31 @@
|
|||
</template>
|
||||
|
||||
<script setup>
|
||||
import {
|
||||
onLoad,
|
||||
} from '@dcloudio/uni-app';
|
||||
import {
|
||||
reactive
|
||||
} from 'vue';
|
||||
import myButton from '@/components/my-components/my-button';
|
||||
onLoad((e) => {
|
||||
form.dutyId = e.dutyId
|
||||
form.staffName = e.staffName
|
||||
form.startTime = e.startTime
|
||||
form.endTime = e.endTime
|
||||
form.memberData = JSON.parse(e.memberData)
|
||||
console.log(e)
|
||||
})
|
||||
|
||||
const form = reactive({
|
||||
isDayin: false,
|
||||
kaibanTime: '2024-07-29 11:47:28',
|
||||
jiaobanTime: '2024-07-29 11:47:28',
|
||||
startTime: '2024-07-29 11:47:28',
|
||||
endTime: '2024-07-29 11:47:28',
|
||||
banciItem: {
|
||||
name: '班次'
|
||||
},
|
||||
staffName: '',
|
||||
memberData: [],
|
||||
infolists: [{
|
||||
name: '订单数',
|
||||
value: 0
|
||||
|
|
@ -84,162 +98,162 @@
|
|||
{
|
||||
name: '订单线下支付金额',
|
||||
value: 0
|
||||
|
||||
|
||||
},
|
||||
{
|
||||
name: '订单支付宝支付额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'堂食订单数',
|
||||
name: '堂食订单数',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'堂食订单金额',
|
||||
name: '堂食订单金额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'自取订单数',
|
||||
name: '自取订单数',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'自取订单金额',
|
||||
name: '自取订单金额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'外卖订单数',
|
||||
name: '外卖订单数',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'外卖订单金额',
|
||||
name: '外卖订单金额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'退款订单数',
|
||||
name: '退款订单数',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'成功退款金额',
|
||||
name: '成功退款金额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'微信成功退款金额',
|
||||
name: '微信成功退款金额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'余额成功退款金额',
|
||||
name: '余额成功退款金额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'线下成功退款金额',
|
||||
name: '线下成功退款金额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'支付宝成功退款金额',
|
||||
name: '支付宝成功退款金额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'充值数',
|
||||
name: '充值数',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'充值金额',
|
||||
name: '充值金额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'开通会员数',
|
||||
name: '开通会员数',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'开通会员金额',
|
||||
name: '开通会员金额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'配送费',
|
||||
name: '配送费',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'收银笔数',
|
||||
name: '收银笔数',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'收银金额',
|
||||
name: '收银金额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'订单满减优惠金额',
|
||||
name: '订单满减优惠金额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'订单积分兑换金额',
|
||||
name: '订单积分兑换金额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'订单优惠券减免金额',
|
||||
name: '订单优惠券减免金额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'订单会员优惠金额',
|
||||
name: '订单会员优惠金额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'充值赠送金额',
|
||||
name: '充值赠送金额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'堂食退款金额',
|
||||
name: '堂食退款金额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'外卖退款金额',
|
||||
name: '外卖退款金额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'自取退款金额',
|
||||
name: '自取退款金额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'堂食订单金额',
|
||||
name: '堂食订单金额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'外卖订单金额',
|
||||
name: '外卖订单金额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'配送费退款',
|
||||
name: '配送费退款',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'配送费总额',
|
||||
name: '配送费总额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'微信到账金额',
|
||||
name: '微信到账金额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'支付宝到账金额',
|
||||
name: '支付宝到账金额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'收银支付金额',
|
||||
name: '收银支付金额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'收银余额支付金额',
|
||||
name: '收银余额支付金额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'收银微信支付金额',
|
||||
name: '收银微信支付金额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'挂账金额',
|
||||
name: '挂账金额',
|
||||
value: 0
|
||||
},
|
||||
{
|
||||
name:'商家减免',
|
||||
name: '商家减免',
|
||||
value: 0
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<view class="top fixed-top bg-fff">
|
||||
<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 u-p-l-20 " @tap="showJiaobanPickerView">
|
||||
<!-- <view class="u-flex u-p-l-20 " @tap="showJiaobanPickerView">
|
||||
<view class=" u-flex u-row-between ">
|
||||
<view>
|
||||
<text class="" v-if="filters.jiaobanSelItem===''">暂未选择</text>
|
||||
|
|
@ -15,16 +15,14 @@
|
|||
class="icon-arrow-down-fill " mode=""></image>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="u-flex u-p-l-20 u-flex-1 u-row-center">
|
||||
<view @tap="timeToggle">
|
||||
<view class=" u-font-24 color-main u-flex" v-if="filters.time.start&&filters.time.end">
|
||||
<uni-dateformat format="yyyy-MM-dd" :date="filters.time.start"></uni-dateformat>
|
||||
<text>{{timeFormat(filters.time.start, 'yyyy年mm月dd日') || '开始'}}</text>
|
||||
<text class="u-p-l-10 u-p-r-10">至</text>
|
||||
<uni-dateformat format="yyyy-MM-dd" :date="filters.time.end"></uni-dateformat>
|
||||
<!-- <view class="u-m-l-10 u-flex" @tap="clearTime">
|
||||
<uni-icons type="clear" size="18" :color="color.ColorMain"></uni-icons>
|
||||
</view> -->
|
||||
<text>{{timeFormat(filters.time.end, 'yyyy年mm月dd日') || '结束'}}</text>
|
||||
|
||||
</view>
|
||||
<view class="" v-else>所有时间</view>
|
||||
</view>
|
||||
|
|
@ -39,7 +37,18 @@
|
|||
<view class="color-333 u-font-28 min-page bg-gray default-box-padding" style="padding-top: 83px;">
|
||||
<view class="bg-fff border-r-12 default-box-padding">
|
||||
<view>
|
||||
<view class="font-bold">班次</view>
|
||||
<view class="font-bold">是否打印销售区间的商品数据</view>
|
||||
<view class="u-m-t-16 u-flex u-row-between u-p-b-24 border-bottom">
|
||||
<view>
|
||||
<text>
|
||||
{{banci.switchvalue?'打印':'不打印'}}
|
||||
</text>
|
||||
</view>
|
||||
<view class="u-flex">
|
||||
<up-switch v-model="banci.switchvalue"></up-switch>
|
||||
</view>
|
||||
</view>
|
||||
<!--<view class="font-bold">班次</view>
|
||||
|
||||
<view class="u-m-t-16 u-flex u-row-between u-p-b-24 border-bottom" @tap="showJiaobanPickerView">
|
||||
<view>
|
||||
|
|
@ -51,7 +60,7 @@
|
|||
<view class="u-flex">
|
||||
<uni-icons type="right" color="#999" size="16"></uni-icons>
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
<!-- <picker @change="banciChange" :value="banci.current" range-key="name" :range="banci.list">
|
||||
<view class="u-m-t-16 u-flex u-row-between u-p-b-24 border-bottom">
|
||||
<view>
|
||||
|
|
@ -67,7 +76,7 @@
|
|||
</picker> -->
|
||||
|
||||
</view>
|
||||
<view class="u-m-t-24">
|
||||
<!-- <view class="u-m-t-24">
|
||||
<view class="font-bold">开班时间</view>
|
||||
<view class="u-m-t-16 u-flex u-row-between u-p-b-24 border-bottom" @tap="jiaobanStartShow">
|
||||
<view>
|
||||
|
|
@ -86,11 +95,11 @@
|
|||
<uni-dateformat format="yyyy-MM-dd hh:mm:ss" :date="form.jiaobanTime"></uni-dateformat>
|
||||
<text></text>
|
||||
</view>
|
||||
<!-- <view class="u-flex">
|
||||
<view class="u-flex">
|
||||
<uni-icons type="right" color="#999" size="16"></uni-icons>
|
||||
</view> -->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
|
@ -98,51 +107,42 @@
|
|||
<view class="color-333 u-font-28 min-page bg-gray default-box-padding" style="padding-top: 116px;">
|
||||
<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="">
|
||||
<view class="head">班次号</view>
|
||||
<view class="item" @tap="toDetail(item)" v-for="(item,index) in 10" :key="index">10002</view>
|
||||
</view>
|
||||
<view class="">
|
||||
<view class="head">班次</view>
|
||||
<view class="item" @tap="toDetail(item)" v-for="(item,index) in 10" :key="index">早班</view>
|
||||
</view>
|
||||
<view class="">
|
||||
<view class="head">交班人</view>
|
||||
<view class="item" @tap="toDetail(item)" v-for="(item,index) in 10" :key="index">交班人</view>
|
||||
</view>
|
||||
<view class="">
|
||||
<view class="head">开班时间</view>
|
||||
<view class="item" @tap="toDetail(item)" v-for="(item,index) in 10" :key="index">2024-05-29 11:15:18</view>
|
||||
</view>
|
||||
<view class="">
|
||||
<view class="head">交班时间</view>
|
||||
<view class="item" @tap="toDetail(item)" v-for="(item,index) in 10" :key="index">2024-05-29 11:15:18</view>
|
||||
</view>
|
||||
<view class="">
|
||||
<view class="head">订单数</view>
|
||||
<view class="item" @tap="toDetail(item)" v-for="(item,index) in 10" :key="index">0</view>
|
||||
</view>
|
||||
<view class="">
|
||||
<view class="head">订单金额（元）</view>
|
||||
<view class="item u-flex u-row-between" @tap="toDetail(item)" v-for="(item,index) in 10" :key="index">
|
||||
<text>0.00</text>
|
||||
<uni-icons type="right" color="#999" size="16"></uni-icons>
|
||||
<view class="constantbox">
|
||||
<view class="constantboxitem">
|
||||
<view class="head">班次号</view>
|
||||
<view class="head">班次</view>
|
||||
<view class="head">交班人</view>
|
||||
<view class="head">开班时间</view>
|
||||
<view class="head">交班时间</view>
|
||||
<view class="head">订单数</view>
|
||||
<view class="head">订单金额(元)</view>
|
||||
</view>
|
||||
<view class="constantboxitem" v-for="(item,index) in tableData.data" :key="index"
|
||||
@click="toDetail(item)">
|
||||
<view class="head">{{item.dutyId|| '无'}}</view>
|
||||
<view class="head">班次</view>
|
||||
<view class="head">{{item.staffName || '无'}}</view>
|
||||
<view class="head">{{item.startTime|| '无'}}</view>
|
||||
<view class="head">{{item.endTime|| '无'}}</view>
|
||||
<view class="head">{{item.orderNum|| '无'}}</view>
|
||||
<view class="head">{{item.totalAmount|| '无'}}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</scroll-view>
|
||||
<uni-load-more :status="table.status"></uni-load-more>
|
||||
<up-loadmore :status="tableData.status" />
|
||||
<view style="height: 100px;"></view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<view class="u-fixed bottom u-flex bg-fff ">
|
||||
<view class="u-flex-1">
|
||||
<!-- <view class="u-flex-1">
|
||||
<my-button bgColor="#333" color="#fff" borderRadius="100rpx 0 0 100rpx" shape="circle" plain type="primary"
|
||||
@tap="toSetting">设置</my-button>
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="u-flex-1">
|
||||
<my-button borderRadius="0 100rpx 100rpx 0" shape="circle" type="primary" @tap="jiaoban">开始交班</my-button>
|
||||
<!-- <my-button borderRadius="0 100rpx 100rpx 0" shape="circle" type="primary" @tap="jiaoban">开始交班</my-button> -->
|
||||
<my-button borderRadius="100rpx" shape="circle" type="primary" @tap="jiaoban">开始交班</my-button>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
|
@ -163,7 +163,8 @@
|
|||
onHide,
|
||||
onShow,
|
||||
onPageScroll,
|
||||
onPullDownRefresh
|
||||
onPullDownRefresh,
|
||||
onReachBottom,
|
||||
} from '@dcloudio/uni-app';
|
||||
import {
|
||||
computed,
|
||||
|
|
@ -176,24 +177,64 @@
|
|||
import color from '@/commons/color.js';
|
||||
import myDatePickerview from '@/components/my-components/my-date-pickerview'
|
||||
import myPickerview from '@/components/my-components/my-pickerview'
|
||||
import {
|
||||
timeFormat
|
||||
} from '@/node_modules/uview-plus';
|
||||
import go from '@/commons/utils/go.js'
|
||||
function toDetail(){
|
||||
go.to('PAGES_WORK_HANDOVER_DETAIL')
|
||||
import {
|
||||
tbHandover,
|
||||
handoverData
|
||||
} from '@/http/yskApi/pageWorkControl.js'
|
||||
|
||||
function toDetail(item) {
|
||||
go.to('PAGES_WORK_HANDOVER_DETAIL', item)
|
||||
}
|
||||
|
||||
function toSetting() {
|
||||
go.to('PAGES_WORK_SETTING')
|
||||
}
|
||||
|
||||
function jiaoban() {
|
||||
if (banci.selItem === '') {
|
||||
return uni.showToast({
|
||||
title: '请选择班次',
|
||||
icon: 'none'
|
||||
})
|
||||
}
|
||||
go.to('PAGES_WORK_HANDOVER_CONFIRM')
|
||||
const jiaoban = async () => {
|
||||
// if (banci.selItem === '') {
|
||||
// return uni.showToast({
|
||||
// title: '请选择班次',
|
||||
// icon: 'none'
|
||||
// })
|
||||
// }
|
||||
// go.to('PAGES_WORK_HANDOVER_CONFIRM')
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '确认交班吗？',
|
||||
success:async (res) => {
|
||||
if (res.confirm) {
|
||||
await handoverData({
|
||||
isprintProduct: banci.switchvalue
|
||||
})
|
||||
uni.clearStorageSync()
|
||||
uni.reLaunch({
|
||||
url: '/pages/login/index'
|
||||
});
|
||||
} else if (res.cancel) {
|
||||
console.log('用户点击取消');
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
const query = reactive({
|
||||
createdAt: [],
|
||||
proName: '',
|
||||
cateId: '',
|
||||
sort: 'id,desc'
|
||||
})
|
||||
const tableData = reactive({
|
||||
data: [],
|
||||
page: 0,
|
||||
size: 15,
|
||||
total: 0,
|
||||
status: 'loadmore'
|
||||
})
|
||||
|
||||
const jiaobanDatePicker = ref(null)
|
||||
|
||||
|
|
@ -212,9 +253,6 @@
|
|||
form.kaibanTime = e
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
const form = reactive({
|
||||
kaibanTime: new Date(),
|
||||
jiaobanTime: new Date()
|
||||
|
|
@ -255,7 +293,8 @@
|
|||
},
|
||||
],
|
||||
selItem: '',
|
||||
current: ''
|
||||
current: '',
|
||||
switchvalue: false
|
||||
})
|
||||
|
||||
function banciConfirm(e) {
|
||||
|
|
@ -276,16 +315,19 @@
|
|||
current: 0
|
||||
})
|
||||
|
||||
// 切换tab
|
||||
function tabsChange(i) {
|
||||
console.log(i)
|
||||
tabs.current = i
|
||||
// 清除时间
|
||||
clearTime()
|
||||
if (tabs.current == 1) {
|
||||
resetHandle()
|
||||
} else {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
const table = reactive({
|
||||
status: 'noMore'
|
||||
})
|
||||
|
||||
|
||||
const filters = reactive({
|
||||
jiaobanCurrent: '',
|
||||
jiaobanSelItem: '',
|
||||
|
|
@ -295,6 +337,7 @@
|
|||
}
|
||||
})
|
||||
|
||||
// 清除时间
|
||||
function clearTime() {
|
||||
filters.time.start = ''
|
||||
filters.time.end = ''
|
||||
|
|
@ -307,22 +350,63 @@
|
|||
const datePicker = ref(null)
|
||||
|
||||
function datePickerConfirm(e) {
|
||||
console.log(e);
|
||||
filters.time.start = e.start
|
||||
filters.time.end = e.end
|
||||
filters.time.start = new Date(e.start).getTime()
|
||||
filters.time.end = new Date(e.end).getTime()
|
||||
console.log(filters);
|
||||
getTableData()
|
||||
}
|
||||
|
||||
function filterBanciChange(e) {
|
||||
filters.jiaobanCurrent = e.detail.value
|
||||
// 重置列表
|
||||
function resetHandle() {
|
||||
query.sort = 'id,desc'
|
||||
tableData.data = []
|
||||
tableData.page = 0
|
||||
tableData.size = 15
|
||||
tableData.total = 0
|
||||
getTableData()
|
||||
}
|
||||
// 列表
|
||||
const getTableData = async () => {
|
||||
tableData.status = 'loading';
|
||||
let urlData = null
|
||||
if (!filters.time.start) {
|
||||
urlData =
|
||||
`page=${tableData.page}&size=${tableData.size}&shopId=${uni.getStorageSync('shopId')}&sort=${query.sort}`
|
||||
} else {
|
||||
urlData =
|
||||
`page=${tableData.page}&size=${tableData.size}&shopId=${uni.getStorageSync('shopId')}&tradeDay=${timeFormat(filters.time.start,'yyyymmdd')}&tradeDay=${timeFormat(filters.time.end,'yyyymmdd')}&sort=${query.sort}`
|
||||
}
|
||||
let res = await tbHandover(urlData)
|
||||
tableData.total = res.totalElements
|
||||
if (tableData.page == 0 && res.content.length < 10) {
|
||||
tableData.data = res.content
|
||||
tableData.status = 'nomore'
|
||||
return false;
|
||||
} else {
|
||||
setTimeout(() => {
|
||||
tableData.data = [...tableData.data, ...res.content]
|
||||
if (tableData.data.length >= tableData.total) tableData.status = 'nomore';
|
||||
else tableData.status = 'loadmore';
|
||||
}, 500)
|
||||
}
|
||||
}
|
||||
|
||||
onShow(() => {
|
||||
form.jiaobanTime = new Date()
|
||||
updateJiaoban()
|
||||
|
||||
})
|
||||
onHide(() => {
|
||||
clearInterval(timer)
|
||||
})
|
||||
|
||||
onReachBottom(() => {
|
||||
if (tableData.status != 'nomore') {
|
||||
tableData.page++
|
||||
getTableData()
|
||||
}
|
||||
})
|
||||
|
||||
watch(() => tabs.current, (newval) => {
|
||||
if (newval) {
|
||||
clearInterval(timer)
|
||||
|
|
@ -354,15 +438,44 @@
|
|||
overflow: hidden;
|
||||
font-size: 24rpx;
|
||||
|
||||
.head {
|
||||
padding: 24rpx;
|
||||
background: #AEBAD2;
|
||||
color: #fff;
|
||||
font-size: 24rpx;
|
||||
}
|
||||
.constantbox {
|
||||
.constantboxitem {
|
||||
display: flex;
|
||||
|
||||
.item {
|
||||
padding: 24rpx;
|
||||
.head {
|
||||
width: 200rpx;
|
||||
padding: 32rpx 24rpx;
|
||||
font-family: Source Han Sans CN, Source Han Sans CN;
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: #333333;
|
||||
overflow: hidden; //超出的文本隐藏
|
||||
text-overflow: ellipsis; //溢出用省略号显示
|
||||
white-space: nowrap; //溢出不换行
|
||||
}
|
||||
|
||||
.head:nth-child(4) {
|
||||
width: 300rpx;
|
||||
}
|
||||
|
||||
.head:nth-child(5) {
|
||||
width: 300rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.constantboxitem:nth-child(even) {
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
.constantboxitem:nth-child(odd) {
|
||||
background: #F7F6FB;
|
||||
}
|
||||
|
||||
.constantboxitem:nth-child(1) {
|
||||
background: #AEBAD2;
|
||||
color: #fff;
|
||||
font-size: 24rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.item:nth-of-type(2n+1) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue