From 3069b34763c83f84fae78d98d738de708a118a49 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 25 Sep 2024 17:41:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=92=8C=E9=A1=B5=E9=9D=A2=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E5=92=8C=E8=AE=A2=E5=8D=95=E8=8E=B7=E5=8F=96=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/store_order_cart_info.js       |   9 ++
 api/system_store_storage.js        |   9 ++
 pagesOrder/deliveryOrder/count.vue | 220 ++++++++---------------------
 pagesOrder/deliveryOrder/index.vue | 123 +++++++++-------
 pagesOrder/productSales/count.vue  | 216 +++++++++-------------------
 pagesOrder/productSales/index.vue  | 216 +++++++++-------------------
 pagesOrder/store_product/index.vue |  12 --
 7 files changed, 279 insertions(+), 526 deletions(-)
 create mode 100644 api/store_order_cart_info.js
 create mode 100644 api/system_store_storage.js

diff --git a/api/store_order_cart_info.js b/api/store_order_cart_info.js
new file mode 100644
index 0000000..36e7664
--- /dev/null
+++ b/api/store_order_cart_info.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request';
+
+export const StoreOrderCartInfoLists = (data) => {
+	return request.get('/store_order_cart_info/StoreOrderCartInfo/lists', data);
+}
+
+export const StoreOrderCartInfoGroupLists = (data) => {
+	return request.get('/store_order_cart_info/StoreOrderCartInfo/group_lists', data);
+}
\ No newline at end of file
diff --git a/api/system_store_storage.js b/api/system_store_storage.js
new file mode 100644
index 0000000..fdaf20b
--- /dev/null
+++ b/api/system_store_storage.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request';
+
+export const SystemStoreStorageLists = (data) => {
+	return request.get('/system_store_storage/SystemStoreStorage/lists', data);
+}
+
+export const SystemStoreStorageGroupLists = (data) => {
+	return request.get('/system_store_storage/SystemStoreStorage/group_lists', data);
+}
\ No newline at end of file
diff --git a/pagesOrder/deliveryOrder/count.vue b/pagesOrder/deliveryOrder/count.vue
index f56587d..db417a6 100644
--- a/pagesOrder/deliveryOrder/count.vue
+++ b/pagesOrder/deliveryOrder/count.vue
@@ -1,23 +1,24 @@
 <template>
 	<view style="background-color: #ffffff;">
-		<up-sticky offset-top="0">
-		<view class="navbar">
-			<view style="width: 580rpx;">
-				<up-search placeholder="请输入商品" @search="searchKeyword" @clear="searchKeyword" v-model="keyword"
-					:showAction="false"></up-search>
-			</view>
-			<view class="nav-item" @click="calendarShow=true">
-				<up-icon name="calendar" color="#2979ff" size="28"></up-icon>
+		<up-sticky offset-top="0" style="background-color: #ffffff;">
+			<view class="navbar">
+				<view style="width: 580rpx;">
+					<up-search placeholder="请输入商品" @search="searchKeyword" @clear="searchKeyword" v-model="keyword"
+						:showAction="false"></up-search>
+				</view>
+				<view class="nav-item" @click="calendarShow=true">
+					<up-icon name="calendar" color="#2979ff" size="28"></up-icon>
 
-				<text>筛选日期</text>
+					<text>筛选日期</text>
+				</view>
 			</view>
-		</view>		</up-sticky>
+		</up-sticky>
 
 		<view class="content">
 			<up-transition :show="true" mode="slide-left">
-				<view v-if="goodsList1.length>0">
-					<view class="card" v-for="(item,index) in goodsList1" :key='index'>
-		
+				<up-list @scrolltolower="scrolltolower" v-if="goodsList1.length>0">
+					<up-list-item class="card" v-for="(item,index) in goodsList1" :key='index'>
+
 						<view class="card-content">
 							<view class="card-content-l" style="width: 152rpx;height: 152rpx;">
 								<image style="width: 152rpx;height: 152rpx;" :src="item.image" mode=""></image>
@@ -33,118 +34,78 @@
 									规格:{{item.store_info}}
 								</view>
 								<view style="color: red;">
-									需求量： {{item.need_num}}
+									数量： {{item.nums}}
+								</view>
+								<view style="color: red;" v-if="item.staff_id>0">
+									确认人： {{item.nums}}
 								</view>
 							</view>
 
 						</view>
-
-						<view class="card-footer">
-							<up-button size="small" type="primary" shape="circle"
-								@click="cancleOrder(item)" v-if="item.buyer_confirm==0">确认已采购</up-button>
-								<up-button size="small" type="success" shape="circle"
-								v-else disabled	>{{item.buyer_confirm_name}}</up-button>
-						</view>
 						<up-line style="margin-top: 30rpx;" color="#F3F3F3"></up-line>
-					</view>
-				</view>
+					</up-list-item>
+				</up-list>
 				<up-empty @click='test2' v-else mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
 				</up-empty>
 			</up-transition>
-			<up-modal :show="show" title="采购确认" showCancelButton @cancel="show=false" @confirm="offerUpdate()">
-				<up-form labelPosition="left">
-					<up-form-item label="名称">
-						<up-input v-model="formData.store_name" border="none"></up-input>
-					</up-form-item>
-					<up-form-item label="数量">
-						<up-input v-model="formData.nums" border="none" @change='changeInputPrice'></up-input>
-					</up-form-item>
-					<up-form-item label="单价">
-						<up-input v-model="formData.price" border="none" @change='changeInputPrice'></up-input>
-					</up-form-item>
-					<up-form-item label="总价">
-						<up-input v-model="formData.total_price" border="none"></up-input>
-					</up-form-item>
-				</up-form>
-			</up-modal>
-
 		</view>
 	</view>
-	<up-calendar :show="calendarShow" @confirm="calendarConfirm" @close="calendarShow=false" :closeOnClickOverlay="true"></up-calendar>
+	<up-calendar :show="calendarShow" @confirm="calendarConfirm" @close="calendarShow=false"
+		:closeOnClickOverlay="true" mode="range"></up-calendar>
+
 </template>
 
 
 <script setup>
+	import {
+		timeFrom
+	} from '@/uni_modules/uview-plus';
+
 	import {
 		ref,
 		reactive,
 	} from "vue"
 	import {
-		purchaseProductOfferLists,
-		purchaseProductOfferUpdate
-	} from "@/api/purchase_product_offer.js"
+		SystemStoreStorageGroupLists,
+	} from "@/api/system_store_storage.js"
 
-	const test2 = () => {
-		console.log("点解")
-		uni.navigateTo({
-			url: '/pages/index/index'
-		})
-	}
 	const show = ref(false)
-	const calendarShow=ref(false)
-	const formData = ref({
-		"id": '',
-		"store_name": '',
-		'product_id': '',
-		'nums': '',
-		'price': '',
-		'total_price':''
+	const where = ref({
+		store_name: '',
+		page_no: 1,
+		start_time: timeFrom(new Date()),
+		end_time: timeFrom(new Date())
 	})
-	const calendarConfirm=(e)=>{
-		console.log(e[0])
-	}
-	// tabsindex
-	const tabIndex = ref(1)
-	const {
-		windowWidth
-	} = uni.getSystemInfoSync();
-	const tabsLeft = ref(((windowWidth / 2) - 26) / 2)
-	const tabsRight = ref(tabsLeft.value + (windowWidth / 2))
-	// tabsindex结束
+	const calendarShow = ref(false)
 
-	const priceBlur = (index, goodsList) => {
-		goodsList[index].price = Number(goodsList[index].price).toFixed(2)
+	const calendarConfirm = (e) => {
+		where.value.start_time = e[0];
+		where.value.end_time = e[(e.length)-1];
+		goodsList1.value=[]
+		getGoodsList()
+		calendarShow.value = false
 	}
 
 	// 列表
-	const showGoods = ref(false)
-	const showGoods1 = ref(false)
 	const goodsList = ref([])
 	const goodsList1 = ref([])
 
 	const getGoodsList = async () => {
-		let res = await purchaseProductOfferLists({})
-		goodsList1.value = res.data.lists
+		let res = await SystemStoreStorageGroupLists(where.value)
+		goodsList1.value.push(...res.data.lists)
 	}
-	const cancleOrder = (item) => {
-		show.value = true
-		formData.value.store_name = item['store_name']
-		formData.value.id = item['id']
-		formData.value.nums = item['need_num']
-		formData.value.product_id = item['product_id']
+
+	const keyword = ref('');
+
+	const searchKeyword = () => {
+		where.value.store_name = keyword.value;
+		goodsList1.value=[]
+		getGoodsList();
 	}
-	const offerUpdate = () => {
-		purchaseProductOfferUpdate(formData.value).then(res=>{
-				uni.$u.toast(res.msg);
-				show.value=false
-				getGoodsList()
-		})
+	const scrolltolower = () => {
+		where.value.page_no += 1
+		getGoodsList()
 	}
- const changeInputPrice=(e)=>{
-	 if(formData.value.nums>0 && formData.value.price>0){
-		 formData.value.total_price=formData.value.nums*formData.value.price
-	 }
- }
 	getGoodsList()
 </script>
 
@@ -156,19 +117,19 @@
 		justify-content: space-between;
 		font-size: 22rpx;
 		color: #777;
-	
+
 		.nav-item {
 			display: flex;
 			flex-direction: column;
 			align-items: center;
 			justify-content: center;
 			position: relative;
-	
+
 			image {
 				height: 40rpx;
 				width: 40rpx;
 			}
-	
+
 			.badge {
 				position: absolute;
 				top: -10rpx;
@@ -181,25 +142,7 @@
 				border-radius: 30rpx;
 				font-size: 18rpx;
 			}
-	
-		}
-	}
-	.head {
-		padding: 20rpx;
-		background-color: white;
-		position: relative;
 
-		.act {
-			color: #20B128;
-		}
-
-		.line {
-			width: 26px;
-			height: 5rpx;
-			background-color: #20B128;
-			border-radius: 50rpx;
-			position: absolute;
-			transition: 300ms;
 		}
 	}
 
@@ -223,18 +166,6 @@
 				.card-content-l {
 					margin-right: 20rpx;
 					position: relative;
-
-					.status {
-						width: 152rpx;
-						height: 40rpx;
-						background-color: rgba(0, 0, 0, .3);
-						text-align: center;
-						color: white;
-						font-size: 24rpx;
-						line-height: 40rpx;
-						position: absolute;
-						bottom: 0;
-					}
 				}
 
 				.card-content-r {
@@ -246,54 +177,21 @@
 						font-size: 30rpx;
 						width: 500rpx;
 					}
-
-					.need {
-						color: #777777;
-						font-size: 24rpx;
-					}
-
 					.ipt {
 						display: flex;
 						height: 56rpx;
 
 					}
 				}
-
-				.status-png {
-					position: absolute;
-					right: 20rpx;
-				}
-
 			}
 
-			.card-footer {
-				margin-top: 30rpx;
-				text-align: right;
-				font-size: 28rpx;
-				color: #060606;
-			}
+		
 		}
 
-		.submit-btn {
-			position: fixed;
-			bottom: 50rpx;
-			width: 710rpx;
-			margin: 0 auto;
-		}
+
 	}
 
-	.detail {
-		width: 88rpx;
-		height: 88rpx;
-		border-radius: 88rpx;
-		text-align: center;
-		line-height: 88rpx;
-		background-color: #50C758;
-		color: white;
-		position: absolute;
-		bottom: 300rpx;
-		right: 20rpx;
-	}
+
 
 	.ellipsis {
 		white-space: nowrap;
diff --git a/pagesOrder/deliveryOrder/index.vue b/pagesOrder/deliveryOrder/index.vue
index f56587d..23257f3 100644
--- a/pagesOrder/deliveryOrder/index.vue
+++ b/pagesOrder/deliveryOrder/index.vue
@@ -1,23 +1,24 @@
 <template>
 	<view style="background-color: #ffffff;">
-		<up-sticky offset-top="0">
-		<view class="navbar">
-			<view style="width: 580rpx;">
-				<up-search placeholder="请输入商品" @search="searchKeyword" @clear="searchKeyword" v-model="keyword"
-					:showAction="false"></up-search>
-			</view>
-			<view class="nav-item" @click="calendarShow=true">
-				<up-icon name="calendar" color="#2979ff" size="28"></up-icon>
+		<up-sticky offset-top="0" style="background-color: #ffffff;">
+			<view class="navbar">
+				<view style="width: 580rpx;">
+					<up-search placeholder="请输入商品" @search="searchKeyword" @clear="searchKeyword" v-model="keyword"
+						:showAction="false"></up-search>
+				</view>
+				<view class="nav-item" @click="calendarShow=true">
+					<up-icon name="calendar" color="#2979ff" size="28"></up-icon>
 
-				<text>筛选日期</text>
+					<text>筛选日期</text>
+				</view>
 			</view>
-		</view>		</up-sticky>
+		</up-sticky>
 
 		<view class="content">
 			<up-transition :show="true" mode="slide-left">
-				<view v-if="goodsList1.length>0">
-					<view class="card" v-for="(item,index) in goodsList1" :key='index'>
-		
+				<up-list @scrolltolower="scrolltolower" v-if="goodsList1.length>0">
+					<up-list-item class="card" v-for="(item,index) in goodsList1" :key='index'>
+
 						<view class="card-content">
 							<view class="card-content-l" style="width: 152rpx;height: 152rpx;">
 								<image style="width: 152rpx;height: 152rpx;" :src="item.image" mode=""></image>
@@ -33,21 +34,22 @@
 									规格:{{item.store_info}}
 								</view>
 								<view style="color: red;">
-									需求量： {{item.need_num}}
+									数量： {{item.nums}}
+								</view>
+								<view style="color: red;" v-if="item.staff_id>0">
+									确认人： {{item.nums}}
 								</view>
 							</view>
 
 						</view>
 
 						<view class="card-footer">
-							<up-button size="small" type="primary" shape="circle"
-								@click="cancleOrder(item)" v-if="item.buyer_confirm==0">确认已采购</up-button>
-								<up-button size="small" type="success" shape="circle"
-								v-else disabled	>{{item.buyer_confirm_name}}</up-button>
+							<up-button size="small" type="primary" shape="circle" @click="cancleOrder(item)"
+								v-if="item.status==0">确认已采购</up-button>
 						</view>
 						<up-line style="margin-top: 30rpx;" color="#F3F3F3"></up-line>
-					</view>
-				</view>
+					</up-list-item>
+				</up-list>
 				<up-empty @click='test2' v-else mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
 				</up-empty>
 			</up-transition>
@@ -70,19 +72,24 @@
 
 		</view>
 	</view>
-	<up-calendar :show="calendarShow" @confirm="calendarConfirm" @close="calendarShow=false" :closeOnClickOverlay="true"></up-calendar>
+	<up-calendar :show="calendarShow" @confirm="calendarConfirm" @close="calendarShow=false"
+		:closeOnClickOverlay="true"></up-calendar>
+
 </template>
 
 
 <script setup>
+	import {
+		timeFrom
+	} from '@/uni_modules/uview-plus';
+
 	import {
 		ref,
 		reactive,
 	} from "vue"
 	import {
-		purchaseProductOfferLists,
-		purchaseProductOfferUpdate
-	} from "@/api/purchase_product_offer.js"
+		SystemStoreStorageLists,
+	} from "@/api/system_store_storage.js"
 
 	const test2 = () => {
 		console.log("点解")
@@ -91,26 +98,28 @@
 		})
 	}
 	const show = ref(false)
-	const calendarShow=ref(false)
+	const where = ref({
+		store_name: '',
+		page_no: 1,
+		start_time: timeFrom(new Date()),
+		end_time: timeFrom(new Date())
+	})
+	const calendarShow = ref(false)
 	const formData = ref({
 		"id": '',
 		"store_name": '',
 		'product_id': '',
 		'nums': '',
 		'price': '',
-		'total_price':''
+		'total_price': ''
 	})
-	const calendarConfirm=(e)=>{
-		console.log(e[0])
+	const calendarConfirm = (e) => {
+		where.value.start_time = e[0];
+		where.value.end_time = e[0];
+		goodsList1.value=[]
+		getGoodsList()
+		calendarShow.value = false
 	}
-	// tabsindex
-	const tabIndex = ref(1)
-	const {
-		windowWidth
-	} = uni.getSystemInfoSync();
-	const tabsLeft = ref(((windowWidth / 2) - 26) / 2)
-	const tabsRight = ref(tabsLeft.value + (windowWidth / 2))
-	// tabsindex结束
 
 	const priceBlur = (index, goodsList) => {
 		goodsList[index].price = Number(goodsList[index].price).toFixed(2)
@@ -123,8 +132,8 @@
 	const goodsList1 = ref([])
 
 	const getGoodsList = async () => {
-		let res = await purchaseProductOfferLists({})
-		goodsList1.value = res.data.lists
+		let res = await SystemStoreStorageLists(where.value)
+		goodsList1.value.push(...res.data.lists)
 	}
 	const cancleOrder = (item) => {
 		show.value = true
@@ -134,17 +143,28 @@
 		formData.value.product_id = item['product_id']
 	}
 	const offerUpdate = () => {
-		purchaseProductOfferUpdate(formData.value).then(res=>{
-				uni.$u.toast(res.msg);
-				show.value=false
-				getGoodsList()
+		purchaseProductOfferUpdate(formData.value).then(res => {
+			uni.$u.toast(res.msg);
+			show.value = false
+			getGoodsList()
 		})
 	}
- const changeInputPrice=(e)=>{
-	 if(formData.value.nums>0 && formData.value.price>0){
-		 formData.value.total_price=formData.value.nums*formData.value.price
-	 }
- }
+	const changeInputPrice = (e) => {
+		if (formData.value.nums > 0 && formData.value.price > 0) {
+			formData.value.total_price = formData.value.nums * formData.value.price
+		}
+	}
+	const keyword = ref('');
+
+	const searchKeyword = () => {
+		where.value.store_name = keyword.value;
+		goodsList1.value=[]
+		getGoodsList();
+	}
+	const scrolltolower = () => {
+		where.value.page_no += 1
+		getGoodsList()
+	}
 	getGoodsList()
 </script>
 
@@ -156,19 +176,19 @@
 		justify-content: space-between;
 		font-size: 22rpx;
 		color: #777;
-	
+
 		.nav-item {
 			display: flex;
 			flex-direction: column;
 			align-items: center;
 			justify-content: center;
 			position: relative;
-	
+
 			image {
 				height: 40rpx;
 				width: 40rpx;
 			}
-	
+
 			.badge {
 				position: absolute;
 				top: -10rpx;
@@ -181,9 +201,10 @@
 				border-radius: 30rpx;
 				font-size: 18rpx;
 			}
-	
+
 		}
 	}
+
 	.head {
 		padding: 20rpx;
 		background-color: white;
diff --git a/pagesOrder/productSales/count.vue b/pagesOrder/productSales/count.vue
index f56587d..ecb7bfd 100644
--- a/pagesOrder/productSales/count.vue
+++ b/pagesOrder/productSales/count.vue
@@ -1,23 +1,24 @@
 <template>
 	<view style="background-color: #ffffff;">
-		<up-sticky offset-top="0">
-		<view class="navbar">
-			<view style="width: 580rpx;">
-				<up-search placeholder="请输入商品" @search="searchKeyword" @clear="searchKeyword" v-model="keyword"
-					:showAction="false"></up-search>
-			</view>
-			<view class="nav-item" @click="calendarShow=true">
-				<up-icon name="calendar" color="#2979ff" size="28"></up-icon>
+		<up-sticky offset-top="0" style="background-color: #ffffff;">
+			<view class="navbar">
+				<view style="width: 580rpx;">
+					<up-search placeholder="请输入商品" @search="searchKeyword" @clear="searchKeyword" v-model="keyword"
+						:showAction="false"></up-search>
+				</view>
+				<view class="nav-item" @click="calendarShow=true">
+					<up-icon name="calendar" color="#2979ff" size="28"></up-icon>
 
-				<text>筛选日期</text>
+					<text>筛选日期</text>
+				</view>
 			</view>
-		</view>		</up-sticky>
+		</up-sticky>
 
 		<view class="content">
 			<up-transition :show="true" mode="slide-left">
-				<view v-if="goodsList1.length>0">
-					<view class="card" v-for="(item,index) in goodsList1" :key='index'>
-		
+				<up-list @scrolltolower="scrolltolower" v-if="goodsList1.length>0">
+					<up-list-item class="card" v-for="(item,index) in goodsList1" :key='index'>
+
 						<view class="card-content">
 							<view class="card-content-l" style="width: 152rpx;height: 152rpx;">
 								<image style="width: 152rpx;height: 152rpx;" :src="item.image" mode=""></image>
@@ -27,62 +28,46 @@
 									{{item.store_name}}
 								</view>
 								<view>
-									单位:{{item.unit_name}}
+									时间:{{item.create_time}}
 								</view>
 								<view>
 									规格:{{item.store_info}}
 								</view>
-								<view style="color: red;">
-									需求量： {{item.need_num}}
+
+								<view>
+									单价:<span style="margin-right: 20rpx;color: red;">{{item.price}}</span>
+									数量:<span style="margin-right: 20rpx;color: red;">{{item.cart_num}}/{{item.unit_name}}</span>
+									总价:<span style="margin-right: 20rpx;color: red;">{{item.total_price}}</span>
 								</view>
 							</view>
 
 						</view>
-
-						<view class="card-footer">
-							<up-button size="small" type="primary" shape="circle"
-								@click="cancleOrder(item)" v-if="item.buyer_confirm==0">确认已采购</up-button>
-								<up-button size="small" type="success" shape="circle"
-								v-else disabled	>{{item.buyer_confirm_name}}</up-button>
-						</view>
 						<up-line style="margin-top: 30rpx;" color="#F3F3F3"></up-line>
-					</view>
-				</view>
+					</up-list-item>
+				</up-list>
 				<up-empty @click='test2' v-else mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
 				</up-empty>
 			</up-transition>
-			<up-modal :show="show" title="采购确认" showCancelButton @cancel="show=false" @confirm="offerUpdate()">
-				<up-form labelPosition="left">
-					<up-form-item label="名称">
-						<up-input v-model="formData.store_name" border="none"></up-input>
-					</up-form-item>
-					<up-form-item label="数量">
-						<up-input v-model="formData.nums" border="none" @change='changeInputPrice'></up-input>
-					</up-form-item>
-					<up-form-item label="单价">
-						<up-input v-model="formData.price" border="none" @change='changeInputPrice'></up-input>
-					</up-form-item>
-					<up-form-item label="总价">
-						<up-input v-model="formData.total_price" border="none"></up-input>
-					</up-form-item>
-				</up-form>
-			</up-modal>
-
 		</view>
 	</view>
-	<up-calendar :show="calendarShow" @confirm="calendarConfirm" @close="calendarShow=false" :closeOnClickOverlay="true"></up-calendar>
+	<up-calendar :show="calendarShow" @confirm="calendarConfirm" @close="calendarShow=false"
+		:closeOnClickOverlay="true" :min-date="min_date" monthNum="13" mode="range"></up-calendar>
+
 </template>
 
 
 <script setup>
+	import {
+		timeFrom
+	} from '@/uni_modules/uview-plus';
+
 	import {
 		ref,
 		reactive,
 	} from "vue"
 	import {
-		purchaseProductOfferLists,
-		purchaseProductOfferUpdate
-	} from "@/api/purchase_product_offer.js"
+		StoreOrderCartInfoGroupLists,
+	} from "@/api/store_order_cart_info.js"
 
 	const test2 = () => {
 		console.log("点解")
@@ -91,60 +76,44 @@
 		})
 	}
 	const show = ref(false)
-	const calendarShow=ref(false)
-	const formData = ref({
-		"id": '',
-		"store_name": '',
-		'product_id': '',
-		'nums': '',
-		'price': '',
-		'total_price':''
+	const min_date = ref('')
+	const where = ref({
+		store_name: '',
+		page_no: 1,
+		start_time: timeFrom(new Date()),
+		end_time: timeFrom(new Date())
 	})
-	const calendarConfirm=(e)=>{
-		console.log(e[0])
-	}
-	// tabsindex
-	const tabIndex = ref(1)
-	const {
-		windowWidth
-	} = uni.getSystemInfoSync();
-	const tabsLeft = ref(((windowWidth / 2) - 26) / 2)
-	const tabsRight = ref(tabsLeft.value + (windowWidth / 2))
-	// tabsindex结束
+	const calendarShow = ref(false)
 
-	const priceBlur = (index, goodsList) => {
-		goodsList[index].price = Number(goodsList[index].price).toFixed(2)
+	const calendarConfirm = (e) => {
+		where.value.start_time = e[0];
+		where.value.end_time = e[(e.length)-1];
+		goodsList1.value = []
+		getGoodsList()
+		calendarShow.value = false
 	}
-
+	let currentDate = new Date();
+	min_date.value=currentDate.setFullYear(currentDate.getFullYear() - 1);
 	// 列表
-	const showGoods = ref(false)
-	const showGoods1 = ref(false)
-	const goodsList = ref([])
+
 	const goodsList1 = ref([])
 
 	const getGoodsList = async () => {
-		let res = await purchaseProductOfferLists({})
-		goodsList1.value = res.data.lists
+		let res = await StoreOrderCartInfoGroupLists(where.value)
+		goodsList1.value.push(...res.data.lists)
 	}
-	const cancleOrder = (item) => {
-		show.value = true
-		formData.value.store_name = item['store_name']
-		formData.value.id = item['id']
-		formData.value.nums = item['need_num']
-		formData.value.product_id = item['product_id']
+
+	const keyword = ref('');
+
+	const searchKeyword = () => {
+		where.value.store_name = keyword.value;
+		goodsList1.value = []
+		getGoodsList();
 	}
-	const offerUpdate = () => {
-		purchaseProductOfferUpdate(formData.value).then(res=>{
-				uni.$u.toast(res.msg);
-				show.value=false
-				getGoodsList()
-		})
+	const scrolltolower = () => {
+		where.value.page_no += 1
+		getGoodsList()
 	}
- const changeInputPrice=(e)=>{
-	 if(formData.value.nums>0 && formData.value.price>0){
-		 formData.value.total_price=formData.value.nums*formData.value.price
-	 }
- }
 	getGoodsList()
 </script>
 
@@ -156,19 +125,19 @@
 		justify-content: space-between;
 		font-size: 22rpx;
 		color: #777;
-	
+
 		.nav-item {
 			display: flex;
 			flex-direction: column;
 			align-items: center;
 			justify-content: center;
 			position: relative;
-	
+
 			image {
 				height: 40rpx;
 				width: 40rpx;
 			}
-	
+
 			.badge {
 				position: absolute;
 				top: -10rpx;
@@ -181,27 +150,10 @@
 				border-radius: 30rpx;
 				font-size: 18rpx;
 			}
-	
+
 		}
 	}
-	.head {
-		padding: 20rpx;
-		background-color: white;
-		position: relative;
 
-		.act {
-			color: #20B128;
-		}
-
-		.line {
-			width: 26px;
-			height: 5rpx;
-			background-color: #20B128;
-			border-radius: 50rpx;
-			position: absolute;
-			transition: 300ms;
-		}
-	}
 
 	.content {
 		padding: 20rpx;
@@ -224,17 +176,6 @@
 					margin-right: 20rpx;
 					position: relative;
 
-					.status {
-						width: 152rpx;
-						height: 40rpx;
-						background-color: rgba(0, 0, 0, .3);
-						text-align: center;
-						color: white;
-						font-size: 24rpx;
-						line-height: 40rpx;
-						position: absolute;
-						bottom: 0;
-					}
 				}
 
 				.card-content-r {
@@ -259,41 +200,14 @@
 					}
 				}
 
-				.status-png {
-					position: absolute;
-					right: 20rpx;
-				}
-
 			}
 
-			.card-footer {
-				margin-top: 30rpx;
-				text-align: right;
-				font-size: 28rpx;
-				color: #060606;
-			}
+
 		}
 
-		.submit-btn {
-			position: fixed;
-			bottom: 50rpx;
-			width: 710rpx;
-			margin: 0 auto;
-		}
 	}
 
-	.detail {
-		width: 88rpx;
-		height: 88rpx;
-		border-radius: 88rpx;
-		text-align: center;
-		line-height: 88rpx;
-		background-color: #50C758;
-		color: white;
-		position: absolute;
-		bottom: 300rpx;
-		right: 20rpx;
-	}
+
 
 	.ellipsis {
 		white-space: nowrap;
diff --git a/pagesOrder/productSales/index.vue b/pagesOrder/productSales/index.vue
index f56587d..4be1009 100644
--- a/pagesOrder/productSales/index.vue
+++ b/pagesOrder/productSales/index.vue
@@ -1,23 +1,24 @@
 <template>
 	<view style="background-color: #ffffff;">
-		<up-sticky offset-top="0">
-		<view class="navbar">
-			<view style="width: 580rpx;">
-				<up-search placeholder="请输入商品" @search="searchKeyword" @clear="searchKeyword" v-model="keyword"
-					:showAction="false"></up-search>
-			</view>
-			<view class="nav-item" @click="calendarShow=true">
-				<up-icon name="calendar" color="#2979ff" size="28"></up-icon>
+		<up-sticky offset-top="0" style="background-color: #ffffff;">
+			<view class="navbar">
+				<view style="width: 580rpx;">
+					<up-search placeholder="请输入商品" @search="searchKeyword" @clear="searchKeyword" v-model="keyword"
+						:showAction="false"></up-search>
+				</view>
+				<view class="nav-item" @click="calendarShow=true">
+					<up-icon name="calendar" color="#2979ff" size="28"></up-icon>
 
-				<text>筛选日期</text>
+					<text>筛选日期</text>
+				</view>
 			</view>
-		</view>		</up-sticky>
+		</up-sticky>
 
 		<view class="content">
 			<up-transition :show="true" mode="slide-left">
-				<view v-if="goodsList1.length>0">
-					<view class="card" v-for="(item,index) in goodsList1" :key='index'>
-		
+				<up-list @scrolltolower="scrolltolower" v-if="goodsList1.length>0">
+					<up-list-item class="card" v-for="(item,index) in goodsList1" :key='index'>
+
 						<view class="card-content">
 							<view class="card-content-l" style="width: 152rpx;height: 152rpx;">
 								<image style="width: 152rpx;height: 152rpx;" :src="item.image" mode=""></image>
@@ -27,62 +28,46 @@
 									{{item.store_name}}
 								</view>
 								<view>
-									单位:{{item.unit_name}}
+									时间:{{item.create_time}}
 								</view>
 								<view>
 									规格:{{item.store_info}}
 								</view>
-								<view style="color: red;">
-									需求量： {{item.need_num}}
+
+								<view>
+									单价:<span style="margin-right: 20rpx;color: red;">{{item.price}}</span>
+									数量:<span style="margin-right: 20rpx;color: red;">{{item.cart_num}}/{{item.unit_name}}</span>
+									总价:<span style="margin-right: 20rpx;color: red;">{{item.total_price}}</span>
 								</view>
 							</view>
 
 						</view>
-
-						<view class="card-footer">
-							<up-button size="small" type="primary" shape="circle"
-								@click="cancleOrder(item)" v-if="item.buyer_confirm==0">确认已采购</up-button>
-								<up-button size="small" type="success" shape="circle"
-								v-else disabled	>{{item.buyer_confirm_name}}</up-button>
-						</view>
 						<up-line style="margin-top: 30rpx;" color="#F3F3F3"></up-line>
-					</view>
-				</view>
+					</up-list-item>
+				</up-list>
 				<up-empty @click='test2' v-else mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
 				</up-empty>
 			</up-transition>
-			<up-modal :show="show" title="采购确认" showCancelButton @cancel="show=false" @confirm="offerUpdate()">
-				<up-form labelPosition="left">
-					<up-form-item label="名称">
-						<up-input v-model="formData.store_name" border="none"></up-input>
-					</up-form-item>
-					<up-form-item label="数量">
-						<up-input v-model="formData.nums" border="none" @change='changeInputPrice'></up-input>
-					</up-form-item>
-					<up-form-item label="单价">
-						<up-input v-model="formData.price" border="none" @change='changeInputPrice'></up-input>
-					</up-form-item>
-					<up-form-item label="总价">
-						<up-input v-model="formData.total_price" border="none"></up-input>
-					</up-form-item>
-				</up-form>
-			</up-modal>
-
 		</view>
 	</view>
-	<up-calendar :show="calendarShow" @confirm="calendarConfirm" @close="calendarShow=false" :closeOnClickOverlay="true"></up-calendar>
+	<up-calendar :show="calendarShow" @confirm="calendarConfirm" @close="calendarShow=false"
+		:closeOnClickOverlay="true" :min-date="min_date" monthNum="13"></up-calendar>
+
 </template>
 
 
 <script setup>
+	import {
+		timeFrom
+	} from '@/uni_modules/uview-plus';
+
 	import {
 		ref,
 		reactive,
 	} from "vue"
 	import {
-		purchaseProductOfferLists,
-		purchaseProductOfferUpdate
-	} from "@/api/purchase_product_offer.js"
+		StoreOrderCartInfoLists,
+	} from "@/api/store_order_cart_info.js"
 
 	const test2 = () => {
 		console.log("点解")
@@ -91,60 +76,44 @@
 		})
 	}
 	const show = ref(false)
-	const calendarShow=ref(false)
-	const formData = ref({
-		"id": '',
-		"store_name": '',
-		'product_id': '',
-		'nums': '',
-		'price': '',
-		'total_price':''
+	const min_date = ref('')
+	const where = ref({
+		store_name: '',
+		page_no: 1,
+		start_time: timeFrom(new Date()),
+		end_time: timeFrom(new Date())
 	})
-	const calendarConfirm=(e)=>{
-		console.log(e[0])
-	}
-	// tabsindex
-	const tabIndex = ref(1)
-	const {
-		windowWidth
-	} = uni.getSystemInfoSync();
-	const tabsLeft = ref(((windowWidth / 2) - 26) / 2)
-	const tabsRight = ref(tabsLeft.value + (windowWidth / 2))
-	// tabsindex结束
+	const calendarShow = ref(false)
 
-	const priceBlur = (index, goodsList) => {
-		goodsList[index].price = Number(goodsList[index].price).toFixed(2)
+	const calendarConfirm = (e) => {
+		where.value.start_time = e[0];
+		where.value.end_time = e[0];
+		goodsList1.value = []
+		getGoodsList()
+		calendarShow.value = false
 	}
-
+	let currentDate = new Date();
+	min_date.value=currentDate.setFullYear(currentDate.getFullYear() - 1);
 	// 列表
-	const showGoods = ref(false)
-	const showGoods1 = ref(false)
-	const goodsList = ref([])
+
 	const goodsList1 = ref([])
 
 	const getGoodsList = async () => {
-		let res = await purchaseProductOfferLists({})
-		goodsList1.value = res.data.lists
+		let res = await StoreOrderCartInfoLists(where.value)
+		goodsList1.value.push(...res.data.lists)
 	}
-	const cancleOrder = (item) => {
-		show.value = true
-		formData.value.store_name = item['store_name']
-		formData.value.id = item['id']
-		formData.value.nums = item['need_num']
-		formData.value.product_id = item['product_id']
+
+	const keyword = ref('');
+
+	const searchKeyword = () => {
+		where.value.store_name = keyword.value;
+		goodsList1.value = []
+		getGoodsList();
 	}
-	const offerUpdate = () => {
-		purchaseProductOfferUpdate(formData.value).then(res=>{
-				uni.$u.toast(res.msg);
-				show.value=false
-				getGoodsList()
-		})
+	const scrolltolower = () => {
+		where.value.page_no += 1
+		getGoodsList()
 	}
- const changeInputPrice=(e)=>{
-	 if(formData.value.nums>0 && formData.value.price>0){
-		 formData.value.total_price=formData.value.nums*formData.value.price
-	 }
- }
 	getGoodsList()
 </script>
 
@@ -156,19 +125,19 @@
 		justify-content: space-between;
 		font-size: 22rpx;
 		color: #777;
-	
+
 		.nav-item {
 			display: flex;
 			flex-direction: column;
 			align-items: center;
 			justify-content: center;
 			position: relative;
-	
+
 			image {
 				height: 40rpx;
 				width: 40rpx;
 			}
-	
+
 			.badge {
 				position: absolute;
 				top: -10rpx;
@@ -181,27 +150,10 @@
 				border-radius: 30rpx;
 				font-size: 18rpx;
 			}
-	
+
 		}
 	}
-	.head {
-		padding: 20rpx;
-		background-color: white;
-		position: relative;
 
-		.act {
-			color: #20B128;
-		}
-
-		.line {
-			width: 26px;
-			height: 5rpx;
-			background-color: #20B128;
-			border-radius: 50rpx;
-			position: absolute;
-			transition: 300ms;
-		}
-	}
 
 	.content {
 		padding: 20rpx;
@@ -224,17 +176,6 @@
 					margin-right: 20rpx;
 					position: relative;
 
-					.status {
-						width: 152rpx;
-						height: 40rpx;
-						background-color: rgba(0, 0, 0, .3);
-						text-align: center;
-						color: white;
-						font-size: 24rpx;
-						line-height: 40rpx;
-						position: absolute;
-						bottom: 0;
-					}
 				}
 
 				.card-content-r {
@@ -259,41 +200,14 @@
 					}
 				}
 
-				.status-png {
-					position: absolute;
-					right: 20rpx;
-				}
-
 			}
 
-			.card-footer {
-				margin-top: 30rpx;
-				text-align: right;
-				font-size: 28rpx;
-				color: #060606;
-			}
+
 		}
 
-		.submit-btn {
-			position: fixed;
-			bottom: 50rpx;
-			width: 710rpx;
-			margin: 0 auto;
-		}
 	}
 
-	.detail {
-		width: 88rpx;
-		height: 88rpx;
-		border-radius: 88rpx;
-		text-align: center;
-		line-height: 88rpx;
-		background-color: #50C758;
-		color: white;
-		position: absolute;
-		bottom: 300rpx;
-		right: 20rpx;
-	}
+
 
 	.ellipsis {
 		white-space: nowrap;
diff --git a/pagesOrder/store_product/index.vue b/pagesOrder/store_product/index.vue
index 2fed9d2..74b9458 100644
--- a/pagesOrder/store_product/index.vue
+++ b/pagesOrder/store_product/index.vue
@@ -137,18 +137,6 @@
 									{{item.tag}}
 								</view>
 							</view>
-							<view class="shop-content-li" style="color: #999999;" v-if="priceKey.off_activity==1">
-								<view class="shop-content-li-l">原价</view>
-								<view class="shop-content-li-r line-through">￥{{item[priceKey.op_price]}}</view>
-							</view>
-
-							<view class="shop-content-li" v-else>
-								<view class="shop-content-li-l">售价</view>
-								<view class="shop-content-li-r" style="color:#FC452F ;">￥<text
-										style="font-size: 28rpx;">{{item[priceKey.op_price]}}</text>
-								</view>
-							</view>
-
 							<view class="shop-content-li" style="justify-content: space-between;"
 								v-if="item.store_info">
 								<view style="display: flex;">