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 dwb

Browse Source
This commit is contained in:
duan
2024-11-01 13:37:03 +08:00
parent 88d2816946 110e6a0076
commit 1a2efdf804
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/my-components/my-date-pickerview.vue
View File

@@ -467,14 +467,19 @@
const startTotal = returnDateString(e.detail.value, true).getTime() const startTotal = returnDateString(e.detail.value, true).getTime()
const endTotal = returnDateString(value1.value, true).getTime() const endTotal = returnDateString(value1.value, true).getTime()
value.value = e.detail.value value.value = e.detail.value
setTimeout(()=>{
nextTick(() => {
if (props.isArea) { if (props.isArea) {
value.value = startTotal > endTotal ? value1.value : e.detail.value value.value = startTotal > endTotal ? value1.value : e.detail.value
} }
console.log(value.value);
debounce(changeDays(false, value.value), 100) debounce(changeDays(false, value.value), 100)
}) },10)
// nextTick(() => {
// if (props.isArea) {
// value.value = startTotal > endTotal ? value1.value : e.detail.value
// }
// console.log(value.value);
// debounce(changeDays(false, value.value), 100)
// })
} }
function bindChange1(e) { function bindChange1(e) {

16
pageStaff/index.vue
View File

@@ -1,6 +1,6 @@
<template> <template>
<ul class="liststyle"> <view class="liststyle">
<li v-for="item in datas.list " :key="item.id"> <view v-for="item in datas.list " :key="item.id">
<view class=""> <view class="">
<view class=""> <view class="">
<span style="font-size: 28rpx;color: #333333; ">{{item.name}}&nbsp;</span> <span style="font-size: 28rpx;color: #333333; ">{{item.name}}&nbsp;</span>
@@ -24,9 +24,9 @@
text="编辑"></up-button> text="编辑"></up-button>
</view> </view>
</view> </view>
</li> </view>
<li style="background-color: rgba(0,0,0,0);"></li> <view style="background-color: rgba(0,0,0,0);"></view>
</ul> </view>
<view v-if="datas.list.length==0" style="text-align: center;"> <view v-if="datas.list.length==0" style="text-align: center;">
<image src="./bg.png" style="width: 325rpx;height: 335rpx;" mode=""></image> <image src="./bg.png" style="width: 325rpx;height: 335rpx;" mode=""></image>
<view style="font-size: 28rpx;color: #999;">暂无员工</view> <view style="font-size: 28rpx;color: #999;">暂无员工</view>
@@ -124,13 +124,9 @@
ul,
li {
list-style: none;
}
.liststyle { .liststyle {
>li { >view {
// width: 694rpx; // width: 694rpx;
height: 192rpx; height: 192rpx;
background: #FFFFFF; background: #FFFFFF;

2
pagesOrder/index/compoents/filter.vue
View File

@@ -49,7 +49,7 @@
<uni-dateformat format="yyyy-MM-dd hh:mm:ss" :date="time[1]"></uni-dateformat> <uni-dateformat format="yyyy-MM-dd hh:mm:ss" :date="time[1]"></uni-dateformat>
</view> </view>
</view> --> </view> -->
<my-date-pickerview @confirm="datePickerConfirm" ref="datePicker"></my-date-pickerview> <my-date-pickerview @confirm="datePickerConfirm" ref="datePicker" mode="all"></my-date-pickerview>
<!-- 更多状态选择筛选 --> <!-- 更多状态选择筛选 -->
<up-popup :round="10" :show="statusData.moreShow" :closeable="true" @close="moreShowHide"> <up-popup :round="10" :show="statusData.moreShow" :closeable="true" @close="moreShowHide">
<view class="u-text-center font-bold u-font-32 u-p-t-30">选择状态</view> <view class="u-text-center font-bold u-font-32 u-p-t-30">选择状态</view>