Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini

pages/Warehouse/picking.vue

@@ -556,7 +556,7 @@
 							</view>
 							<view class="pls-card-middle-one">
 								<view class="middle-title">
-									{{ v.jhTime.slice(0,10) }}
+									{{ v.jhTime?v.jhTime.slice(0,10):'' }}
 								</view>
 								<view class="middle-heng-father">
 									<view class="middle-heng"></view>

pages/procurement/components/carditem.vue

@@ -92,6 +92,13 @@
 	})
 	const caigouobj = ref({})
 	const addcar = (v : any,i:number) => {
+		if(v.kcsl>=v.upperLimit){
+			uni.showToast({
+				title:'库存数量已满，不可添加购物车！',
+				icon:'none'
+			})
+			return
+		}
 		caigouobj.value = v;
 		caigouobj.value.index = i;
 		caigouobj.value.yj = false;