From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
minipro_standard/pages_adjust/pages/warehousingList/warehousingList.vue | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/minipro_standard/pages_adjust/pages/warehousingList/warehousingList.vue b/minipro_standard/pages_adjust/pages/warehousingList/warehousingList.vue
index 8999981..5f4fa12 100644
--- a/minipro_standard/pages_adjust/pages/warehousingList/warehousingList.vue
+++ b/minipro_standard/pages_adjust/pages/warehousingList/warehousingList.vue
@@ -89,21 +89,18 @@
</scroll-view>
</view>
<!-- 閫夋嫨鏃ユ湡 -->
- <u-calendar :show="timeShow" mode="range" :minDate="minDate" :maxDate="maxDate" @close="timeShow = false"
- @confirm="timeConfirm"></u-calendar>
+ <!-- <u-calendar :show="timeShow" mode="range" :minDate="minDate" :maxDate="maxDate" @close="timeShow = false"
+ @confirm="timeConfirm"></u-calendar> -->
+ <l-calendar :lunar="false" v-model="timeShow" @change="timeConfirm" :isRange="true" activeBgColor="#305ED5"
+ rangeColor="#305ED5" rangeBgColor="rgba(48, 80, 213, 0.1)"></l-calendar>
</view>
</template>
<script>
import Search from '@/components/Search.vue'
import LabelSelection from '@/components/LabelSelection.vue'
- import {
- orderTyepToStr
- } from '@/util/constData.js'
- import {
- getBoundList,
- pageCount
- } from "@/util/api/materialStorage";
+ import { getBoundList, pageCount } from "@/util/api/materialStorage";
+ import { orderTyepToStr } from '@/util/constData.js'
export default {
components: {
Search,
@@ -390,8 +387,8 @@
},
// 鏃ユ湡纭畾
timeConfirm(val) {
- this.listData.planDateStart = val[0]
- this.listData.planDateEnd = val[val.length - 1]
+ this.listData.planDateStart = val.startDate
+ this.listData.planDateEnd = val.endDate
this.timeShow = false
},
// 鍒囨崲鍗曟嵁绫诲瀷
--
Gitblit v1.9.3