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:
duan 2024-11-01 13:36:39 +08:00
parent 82d9e44827 678c325fb6
commit 110e6a0076
2 changed files with 10 additions and 5 deletions
Show Stats 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) {

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>