diff --git a/.gitignore b/.gitignore
index f0f507f..972b04a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /.hbuilderx
 /unpackage/dist/dev/app-plus
-/unpackage/dist/dev/mp-weixin
\ No newline at end of file
+/unpackage/dist/dev/mp-weixin
+/unpackage/dist/dev/cache
\ No newline at end of file
diff --git a/pages/procurement/components/Inventory.vue b/pages/procurement/components/Inventory.vue
index 995aeab..4c5bb55 100644
--- a/pages/procurement/components/Inventory.vue
+++ b/pages/procurement/components/Inventory.vue
@@ -2,19 +2,21 @@
 	<view>
 		<view class="qbkyj" v-if="show">
 			<view class="titletop">全部库存预警</view>
-			<scroll-view scroll-y="true" class="crdcroll"  scroll-with-animation :scroll-top="scrolltop"
+			<scroll-view scroll-y="true" class="crdcroll"  scroll-with-animation 
 					@scrolltolower="scrolltolower">
 					<view  class="fler">
-						<view class="carditem" v-for="(v,index) in InvoicingList" :key="index" >
+						<scroll-view class="carditem guodu" v-for="(v,index) in InvoicingList" :key="index"
+						 @touchend="handleTouchEnd($event,v,index)"  @touchstart="touchstart($event,v,index)"
+						  scroll-with-animation scroll-x="true" :scroll-left="v.scrollleft" @scroll="scroll($event,v)">
 								<view class="speitem guodu" :class="v.zk?'spleft':''">
 									<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"></image>
 									<view class="cardp">
 										<view v-if="v.categoryId_dictText">{{v.categoryId_dictText}}</view>
 										<view v-if="v.typeId_dictText">{{v.typeId_dictText}}</view>
-										<view v-if="v.medicationName">{{v.medicationName}}</view>
+										<view v-if="v.medicationId_dictText">{{v.medicationId_dictText}}</view>
 									</view>
 								</view>
-								<view class="msitem guodu" :style="v.zk?'margin-left:2.5vw':''">
+								<view class="msitem guodu">
 									<view>
 										<view>{{v.materialName}}</view><text>{{v.materialNo}}</text>
 									</view>
@@ -44,15 +46,20 @@
 										</view>
 									</view>
 								</view>
-								<view class="add" @click="clkzk(v,index)">
+								<view class="add" @click.stop="clkzk(v,index)">
 									<view v-if="v.isAdd==1">已添加</view>
 									<image class="guodu" :style="v.zk?'transform: rotate(180deg);':''" :src="'/static/index/procurement/l.png'" mode="aspectFill"></image>
 								</view>
-								<view class="zkadd guodu" :class="v.zk?'':'zkf'">
-									<view>出入库</view>
-									<view @click="addcar(v)">加购物车</view>
+								<view class="zkadd guodu" :class="v.isAdd==1?'zkf':''">
+									<view @click.stop   @touchend.stop>出入库</view>
+									<view @click.stop="addcar(v)"  v-if="v.isAdd!=1"  @touchend.stop>
+										<view>
+											<text>加购</text>
+											<text>物车</text>
+										</view>
+									 </view>
 								</view>
-						</view>
+						</scroll-view>
 					</view>
 					<view style="height:3vw;width: 100%;display: flex;align-items: center;justify-content: center;">
 						<u-loadmore :status="status" :loadText="{nomore:'暂无更多数据'}" v-if="InvoicingList.length>6"/>
@@ -65,16 +72,6 @@
 <script setup lang="ts">
 	 import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineProps ,defineComponent} from 'vue';
 	 import { queryInvoicingList,queryWlInfoByWlId,addShoppingCartList,queryShoppingCartList } from '../api/lunpan.js'
-	 const form = reactive({
-	 	nuId: uni.getStorageSync('nuId'),
-	 	pageNo: 1,
-	 	pageSize: 10,
-	 	categoryId: '',
-	 	typeId: '',
-	 	medicationId: '',
-	 	wlParamInfo: '',
-	 	isWaring: 1
-	 })
 	 const props = defineProps({
 		 InvoicingList: {
 		 	type: Array,
@@ -89,7 +86,7 @@
 		 	required: true,
 		 },
 	 })
-	 const emit = defineEmits(['addcartory','tolower'])
+	 const emit = defineEmits(['addcartory','tolower','solleft'])
 	 const serverUrl = ref('')
 	 onMounted(()=>{
 		 serverUrl.value = uni.getStorageSync('serverUrl') + '/sys/common/static/';
@@ -103,17 +100,67 @@
 	 	caigouobj.value = v;
 	 	caigouobj.value.Limitnum =  Number(caigouobj.value?.upperLimit)-Number(caigouobj.value.kcsl);
 		caigouobj.value.index = i;
-	 	props.InvoicingList.forEach((item,k)=>{
-	 		if(k==i){
-	 			item.zk = !item.zk;
-	 		}else{
-	 			item.zk = false;
-	 		}
-	 	})
+		caigouobj.value.yj = true;
+		if(v.zk==true){
+			v.zk = false;
+			v.scrollleft = 0
+		}else{
+			v.zk = true;
+			v.scrollleft = 150;
+		}
+		solleft(v,i)
 	 }
 	 const addcar = (v:any)=>{
 	 	emit('addcartory',caigouobj.value)
 	 }
+	 const pageX = ref(0);
+	 const pageY = ref(0);
+	 const touchstart = (event:any,v:any,i:number)=>{
+		 pageX.value = event.changedTouches[0].pageX;
+		 pageY.value = event.changedTouches[0].pageY;
+		 solleft(v,i)
+	 }
+	 const handleTouchEnd = (event:any,v:any,i:number)=>{
+		 let y =  event.changedTouches[0].pageY;
+		 let x =  event.changedTouches[0].pageX;
+		 let absx = Math.abs(x-pageX.value)
+		 let absy = Math.abs(y-pageY.value)
+		 if (absy > 30 && absx+10<absy&& absx<70) {
+			if(v.zk==false){
+				 setTimeout(()=>{
+					v.scrollleft = 0
+				 },20)
+			}
+		 	return
+		 }
+		 if (absx < 10 && absy < 10) {
+			 if(v.zk==false && absx > 2 && absy > 2){
+				 	v.scrollleft = 0;
+				 return
+			 }
+		 	return
+		 }
+		caigouobj.value = v;
+		caigouobj.value.Limitnum =  Number(caigouobj.value?.upperLimit)-Number(caigouobj.value.kcsl);
+		caigouobj.value.index = i;
+		v.zk = x>pageX.value?false:true;
+		v.scrollleft = v.zk?150 : 0;
+		
+	 }
+	 const solleft =(v:any,i:number)=>{
+		 
+		 props.InvoicingList.forEach((item,k)=>{
+		 	if(k!=i && item.zk==true){
+		 		item.zk = false;
+		 		item.scrollleft = 0;
+		 	} 
+		 })
+	 }
+	 // const scrollLeft = ref(0)
+	 // const scroll = (e)=>{
+	 // 	scrollLeft.value = e.detail.scrollLeft
+	 // 	// console.log(e.detail.scrollLeft)
+	 // }
 </script>
 
 <style scoped lang="less">
@@ -128,19 +175,18 @@
 			display: flex;
 			overflow: hidden;
 			justify-content: flex-start;
-			.zkf{
-				right:-10vw !important;
-			}
+			white-space: nowrap;
+			
 			.zkadd{
-				width: 10vw;
+				width: 14vw;
 				height: 100%;
-				display: flex;
+				display: inline-flex;
 				justify-content: flex-end;
 				position: absolute;
 				top: 0;
-				right: 0;
-				view{
-					width: 5vw;
+				right:-14vw;
+				>view{
+					width: 7vw;
 					height: 100%;
 					font-weight: 400;
 					font-size: 1.3vw;
@@ -151,7 +197,16 @@
 					&:nth-child(2){
 						background: #1083F8;
 						color: #fff;
-						padding: 1.1vw;
+						view{
+							width: 3.8vw;
+							height: 3.8vw;
+							display: flex;
+							justify-content: center;
+							align-items: center;
+							flex-wrap: wrap;
+							flex-direction: column;
+						}
+						
 					}
 					&:nth-child(1){
 						background: #C2C4C9;
@@ -159,13 +214,18 @@
 					}
 				}
 			}
+			.zkf{
+				width: 7vw;
+				right:-7vw ;
+			}
 			.add{
 				width: 6vw;
-				height: 100%;
-				display: flex;
+				height: 14.5vw;
+				display: inline-flex;
 				justify-content: center;
 				align-items: center;
 				position: relative;
+				top: -2vw;
 				>view{
 					width: 4.5vw;
 					height: 1.8vw;
@@ -175,21 +235,23 @@
 					font-weight: 400;
 					font-size: 1.1vw;
 					color: #1083F8;
-					text-align: center;
-					line-height: 1.75vw;
+					display: flex;
+					justify-content: center;
+					align-items: center;
 					position: absolute;
 					top: 0.8vw;
 					right: 0.8vw;
 				}
 				image{
-					width: 3.2vw;
-					height: 3.2vw;
+					width: 3vw;
+					height: 3vw;
 				}
 			}
 			.msitem{
 				width: 25vw;
 				height: 100%;
 				padding: 1vw;
+				display: inline-block;
 				>view{
 					margin-top: 0.5vw;
 					&:nth-child(4){
@@ -274,14 +336,16 @@
 					}
 				}
 			}
-			.spleft{
-				margin-left: -15vw !important;
-			}
+			// .spleft{
+			// 	margin-left: -15vw !important;
+			// }
 			.speitem{
 				width: 15vw;
 				height: 100%;
-				display: flex;
+				display: inline-flex;
 				flex-direction: column;
+				position: relative;
+				top: -2vw;
 				.cardp{
 					width: 12.5vw;
 					height: 4vw;
@@ -337,7 +401,7 @@
 }
 .titletop{
 	width: 100%;
-	height: 2.5vw;
+	height: 3.5vw;
 	font-weight: bold;
 	font-size: 1.8vw;
 	color: #333333;
diff --git a/pages/procurement/components/carditem.vue b/pages/procurement/components/carditem.vue
new file mode 100644
index 0000000..de97690
--- /dev/null
+++ b/pages/procurement/components/carditem.vue
@@ -0,0 +1,416 @@
+<template>
+	<view>
+		<scroll-view scroll-y="true" class="crdcroll" scroll-with-animation @scrolltolower="scrolltolower()" enable-back-to-top>
+			<view class="box">
+				<view class="fler" v-for="(v,index) in InvoicingList" :key="index">
+					<scroll-view class="carditem guodu" @touchend="handleTouchEnd($event,v,index)"
+						@touchstart="touchstart($event,v,index)" scroll-with-animation scroll-x="true"
+						:scroll-left="v.scrollleft" @scroll="scroll" >
+						<view class="speitem guodu" >
+							<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'"
+								mode="aspectFill">
+							</image>
+							<view class="cardp">
+								<view v-if="v.categoryId_dictText">{{v.categoryId_dictText}}</view>
+								<view v-if="v.typeId_dictText">{{v.typeId_dictText}}</view>
+								<view v-if="v.medicationId_dictText">{{v.medicationId_dictText}}</view>
+							</view>
+						</view>
+						<view class="msitem guodu" >
+							<view>
+								<view>{{v.materialName}}</view><text>{{v.materialNo}}</text>
+							</view>
+							<view>
+								<text> 规格型号: {{v.specificationModel}}</text>
+							</view>
+							<view>
+								<text v-if="v.multiUnitType=='1'">采购单价: ￥{{v.oneUnitPrice}} </text>
+								<text v-if="v.multiUnitType=='1'">采购单位: {{ v.oneUnit}}</text>
+								<text v-if="v.multiUnitType=='2'">采购单价: ￥{{v.twoUnitPrice}} </text>
+								<text v-if="v.multiUnitType=='2'">采购单位: {{ v.twoUnit}}</text>
+								<text v-if="v.multiUnitType=='3'">采购单价: ￥{{v.referenceUnitPrice}} </text>
+								<text v-if="v.multiUnitType=='3'">采购单位: {{ v.materialUnits}}</text>
+							</view>
+							<view>
+								<view>
+									<text>{{v.kcsl}}</text>
+									<text>库存数量</text>
+								</view>
+								<view>
+									<text>{{v.upperLimit}}</text>
+									<text>物料上限 ↑</text>
+								</view>
+								<view>
+									<text>{{v.lowerLimit}}</text>
+									<text>↓ 物料下限</text>
+								</view>
+							</view>
+						</view>
+						<view class="add" @click.stop="addcar(v,index)">
+							<view v-if="v.isAdd==1">已添加</view>
+							<image :src="'/static/index/procurement/+.png'" mode="aspectFill"></image>
+						</view>
+						<view class="zkadd guodu" :class="v.isAdd==1?'zkf':''">
+							<view @click.stop @touchend.stop>出入库</view>
+							<view @click.stop="addcar(v,index)" v-if="v.isAdd!=1" @touchend.stop>
+								<view>
+									<text>加购</text>
+									<text>物车</text>
+								</view>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+			<view style="height:3vw;width: 100%;display: flex;align-items: center;justify-content: center;">
+				<u-loadmore :status="status" :loadText="{nomore:'暂无更多数据'}" v-if="InvoicingList.length>6" />
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineProps, defineComponent } from 'vue';
+	const props = defineProps({
+		InvoicingList: {
+			type: Array,
+			required: true
+		},
+		status: {
+			type: String
+		},
+		show: {
+			type: Boolean,
+			default: false,
+			required: true,
+		},
+	})
+	const emit = defineEmits(['addcartory', 'scrolltolower','addcar'])
+	const serverUrl = ref('')
+	onMounted(() => {
+		serverUrl.value = uni.getStorageSync('serverUrl') + '/sys/common/static/';
+	})
+	const caigouobj = ref({})
+	const clkzk = (v : any, i : number) => {
+		caigouobj.value = v;
+		caigouobj.value.Limitnum = Number(caigouobj.value?.upperLimit) - Number(caigouobj.value.kcsl);
+		caigouobj.value.index = i;
+		caigouobj.value.yj = false;
+		
+		let n = caigouobj.value.suppliers_dictText.split(/[, ]+/);
+		let id = caigouobj.value.suppliers.split(/[, ]+/);
+		let obj = {id:id[0],name:n[0]}
+		emit('addcar', caigouobj.value,obj)
+		 
+	}
+	const addcar = (v : any) => {
+		caigouobj.value = v;
+		caigouobj.value.index = i;
+		caigouobj.value.yj = false;
+		emit('addcartory', caigouobj.value)
+	}
+	const pageX = ref(0);
+	const pageY = ref(0);
+	const touchstart = (event : any, v : any,i:number) => {
+		pageX.value = event.changedTouches[0].pageX;
+		pageY.value = event.changedTouches[0].pageY;
+		solleft(v, i)
+	}
+	const handleTouchEnd = (event : any, v : any, i : number) => {
+		let y = event.changedTouches[0].pageY;
+		let x = event.changedTouches[0].pageX;
+		let absx = Math.abs(x - pageX.value)
+		let absy = Math.abs(y - pageY.value)
+		if (absy > 30 && absx+10<absy) {
+			setTimeout(()=>{
+				v.scrollleft = 0
+			},20)
+			return
+		}
+		if (absx < 10 && absy < 10) {
+			 if(v.zk==false){
+				 setTimeout(()=>{
+					v.scrollleft = 0
+				 },20)
+			 }
+			return
+		}
+		caigouobj.value = v;
+		caigouobj.value.Limitnum = Number(caigouobj.value?.upperLimit) - Number(caigouobj.value.kcsl);
+		caigouobj.value.index = i;
+		caigouobj.value.yj = false;
+		v.zk = x > pageX.value ? false : true;
+		v.scrollleft = v.zk ? 150 : 0;
+	}
+	const solleft = (v : any, i : number) => { 
+		props.InvoicingList.forEach((item, k) => {
+			if (k != i&&item.zk==true) {
+				item.zk = false;
+				item.scrollleft = 0; 
+			}
+		})
+	}
+	const scrolltolower = () => {
+		emit('scrolltolower')
+	}
+	const scrollLeft = ref(0)
+	const scroll = (e)=>{
+		// scrollLeft.value = e.detail.scrollLeft
+		// console.log(e.detail.scrollLeft)
+	}
+</script>
+
+<style scoped lang="less">
+	.crdcroll {
+		width: 96vw;
+		height: 70.3vh;
+
+		.box {
+			width: 96vw;
+			display: grid;
+			grid-template-columns: 1fr 1fr;
+		}
+		.fler {
+			width: 47vw;
+			height: 15.6vw;
+		}
+	}
+
+	.carditem {
+		width: 47vw;
+		height: 14.5vw;
+		background: rgba(245, 246, 248, 1);
+		border-radius: 1.6vw;
+		position: relative;
+		margin-bottom: 1.1vw;
+		display: flex;
+		overflow: hidden;
+		justify-content: flex-start;
+		white-space: nowrap;
+
+		.zkadd {
+			width: 14vw;
+			height: 100%;
+			display: inline-flex;
+			justify-content: flex-end;
+			position: absolute;
+			top: 0;
+			right: -14vw;
+
+			>view {
+				width: 7vw;
+				height: 100%;
+				font-weight: 400;
+				font-size: 1.3vw;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				flex-wrap: wrap;
+
+				&:nth-child(2) {
+					background: #1083F8;
+					color: #fff;
+
+					view {
+						width: 3.8vw;
+						height: 3.8vw;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						flex-wrap: wrap;
+						flex-direction: column;
+					}
+
+				}
+
+				&:nth-child(1) {
+					background: #C2C4C9;
+					color: #555555;
+				}
+			}
+		}
+
+		.zkf {
+			width: 7vw;
+			right: -7vw;
+		}
+
+		.add {
+			width: 6vw;
+			height: 14.5vw;
+			display: inline-flex;
+			justify-content: center;
+			align-items: center;
+			position: relative;
+			top: -2vw;
+
+			>view {
+				width: 4.5vw;
+				height: 1.8vw;
+				background: #E3EEF7;
+				border-radius: 0.9vw;
+				border: 1px solid rgba(3, 133, 250, 0.34);
+				font-weight: 400;
+				font-size: 1.1vw;
+				color: #1083F8;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				position: absolute;
+				top: 0.8vw;
+				right: 0.8vw;
+			}
+
+			image {
+				width: 3vw;
+				height: 3vw;
+			}
+		}
+
+		.msitem {
+			width: 25vw;
+			height: 100%;
+			padding: 1vw;
+			display: inline-block;
+
+			>view {
+				margin-top: 0.5vw;
+
+				&:nth-child(4) {
+					width: 100%;
+					height: 3.4vw;
+					display: flex;
+					justify-content: space-between;
+
+					>view {
+						width: 33.3%;
+						height: 100%;
+						display: flex;
+						flex-direction: column;
+						position: relative;
+						align-items: center;
+
+						&:nth-child(1) {
+							width: 30%;
+							text-align: left;
+						}
+
+						&:nth-child(2) {
+							width: 40%;
+							text-align: center;
+						}
+
+						&:nth-child(3) {
+							width: 30%;
+							text-align: right;
+						}
+
+						&:nth-child(2)::after {
+							content: '';
+							position: absolute;
+							right: 0;
+							width: 100%;
+							height: 2.2vw;
+							border-left: 1px solid #C9C9C9;
+							border-right: 1px solid #C9C9C9;
+							top: 0.6vw;
+						}
+
+						text {
+							&:nth-child(1) {
+								font-weight: bold;
+								font-size: 1.7vw;
+								color: #555555;
+							}
+
+							&:nth-child(2) {
+								font-weight: 400;
+								font-size: 1.1vw;
+								color: #999999;
+							}
+						}
+					}
+				}
+
+				&:nth-child(2),
+				&:nth-child(3) {
+					display: flex;
+					justify-content: space-between;
+
+					text {
+						font-weight: 400;
+						font-size: 1.4vw;
+						color: #777777;
+						margin-top: 0.35vw;
+					}
+				}
+
+				&:nth-child(1) {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					height: 2vw;
+
+					>view {
+						width: 19vw;
+						height: 2vw;
+						font-weight: bold;
+						font-size: 1.6vw;
+						color: #222222;
+						text-overflow: ellipsis;
+						overflow: hidden;
+						white-space: nowrap;
+					}
+
+					text {
+						width: 6vw;
+						font-weight: 300;
+						font-size: 1.4vw;
+						color: #222222;
+					}
+				}
+			}
+		}
+
+		// .spleft{
+		// 	margin-left: -15vw !important;
+		// }
+		.speitem {
+			width: 15vw;
+			height: 100%;
+			display: inline-flex;
+			flex-direction: column;
+			position: relative;
+			top: -2vw;
+
+			.cardp {
+				width: 12.5vw;
+				height: 4vw;
+				display: flex;
+				flex-wrap: wrap;
+				margin: 0 auto;
+				align-items: center;
+
+				view {
+					width: 5.5vw;
+					height: 1.8vw;
+					border-radius: 0.9vw;
+					border: 1px solid #D2D2D2;
+					margin: 0.5vw 0 0 0.5vw;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					font-weight: 400;
+					font-size: 1vw;
+					color: #555555;
+				}
+			}
+
+			>image {
+				width: 9vw;
+				height: 8vw;
+				margin: 1vw auto 0;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/procurement/components/classification.vue b/pages/procurement/components/classification.vue
index b434546..3857dfe 100644
--- a/pages/procurement/components/classification.vue
+++ b/pages/procurement/components/classification.vue
@@ -84,7 +84,7 @@
 			 nuId:uni.getStorageSync('nuId'),
 			 categoryId:scroll.act1>-1?TreeData.value[scroll.act1].categoryId:'',
 			 typeId:scroll.act2>-1?TreeData.value[scroll.act1].children[scroll.act2].typeId:'',
-			 medicationId:scroll.act3>-1?TreeData.value[scroll.act1].children[scroll.act2].children[scroll.act3].medicationId:'',
+			 medicationId:scroll.act3>-1?TreeData.value[scroll.act1].children[scroll.act2].children[scroll.act3].key:'',
 		 }
 		 getTreeDataWlnum(obj).then(res=>{
 			 num.value = res.result.totalSize;
@@ -100,7 +100,7 @@
 		 let obj= {
 			 categoryId:scroll.act1>-1?TreeData.value[scroll.act1].categoryId:'',
 			 typeId:scroll.act2>-1?TreeData.value[scroll.act1].children[scroll.act2].typeId:'',
-			 medicationId:scroll.act3>-1?TreeData.value[scroll.act1].children[scroll.act2].children[scroll.act3].medicationId:'',
+			 medicationId:scroll.act3>-1?TreeData.value[scroll.act1].children[scroll.act2].children[scroll.act3].key:'',
 		 }
 		 emit('confirm',obj)
 	 }
diff --git a/pages/procurement/material.vue b/pages/procurement/material.vue
index fa13a13..2589d2e 100644
--- a/pages/procurement/material.vue
+++ b/pages/procurement/material.vue
@@ -29,7 +29,7 @@
 			<view class="kjlt more guodu" :style="qb?'width:11.2vw':''">
 				<view @click="qb=!qb" class="righ0">
 					{{!qb?'更多':'收起'}}
-					<image src="/static/index/procurement/zjt.png" mode="aspectFill"></image>
+					<image class="guodu" :style="qb?'transform: rotate(180deg);':''" src="/static/index/procurement/zjt.png" mode="aspectFill"></image>
 				</view>
 				<view class="guodu" :class="qb?'':'righ0'" @click="Invenshow = true">查看全部</view>
 				<view class="guodu" :class="qb?'':'righ0'">添加全部</view>
@@ -70,62 +70,7 @@
 
 		</view>
 		<view class="listcard">
-			<scroll-view scroll-y="true" class="crdcroll"  scroll-with-animation :scroll-top="scrolltop"  
-					@scrolltolower="scrolltolower(2)">
-					<view  class="fler">
-						<view class="carditem" v-for="(v,index) in InvoicingList" :key="index" >
-								<view class="speitem guodu" :class="v.zk?'spleft':''">
-									<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"></image>
-									<view class="cardp">
-										<view v-if="v.categoryId_dictText">{{v.categoryId_dictText}}</view>
-										<view v-if="v.typeId_dictText">{{v.typeId_dictText}}</view>
-										<view v-if="v.medicationName">{{v.medicationName}}</view>
-									</view>
-								</view>
-								<view class="msitem guodu" :style="v.zk?'margin-left:2.5vw':''">
-									<view>
-										<view>{{v.materialName}}</view><text>{{v.materialNo}}</text>
-									</view>
-									<view>
-										<text> 规格型号: {{v.specificationModel}}</text>
-									</view>
-									<view>
-										<text v-if="v.multiUnitType=='1'">采购单价: ￥{{v.oneUnitPrice}} </text>    
-										<text v-if="v.multiUnitType=='1'">采购单位: {{ v.oneUnit}}</text>
-										<text v-if="v.multiUnitType=='2'">采购单价: ￥{{v.twoUnitPrice}} </text>   
-										<text v-if="v.multiUnitType=='2'">采购单位: {{ v.twoUnit}}</text> 
-										<text v-if="v.multiUnitType=='3'">采购单价: ￥{{v.referenceUnitPrice}} </text>   
-										<text v-if="v.multiUnitType=='3'">采购单位: {{ v.materialUnits}}</text> 
-									</view>
-									<view>
-										<view>
-											<text>{{v.kcsl}}</text>
-											<text>库存数量</text>
-										</view>
-										<view>
-											<text >{{v.upperLimit}}</text>
-											<text>物料上限 ↑</text>
-										</view>
-										<view>
-											<text >{{v.lowerLimit}}</text>
-											<text>↓ 物料下限</text>
-										</view>
-									</view>
-								</view>
-								<view class="add" @click="clkzk(v,index)">
-									<view v-if="v.isAdd==1">已添加</view>
-									<image class="guodu" :src="!v.zk?'/static/index/procurement/+.png':'/static/index/procurement/-.png'" mode="aspectFill"></image>
-								</view>
-								<view class="zkadd guodu" :class="v.zk?'':'zkf'">
-									<view>出入库</view>
-									<view @click="addcar(v,i)">加购物车</view>
-								</view>
-						</view>
-					</view>
-					<view style="height:3vw;width: 100%;display: flex;align-items: center;justify-content: center;">
-						<u-loadmore :status="status" :loadText="{nomore:'暂无更多数据'}" v-if="InvoicingList.length>6"/>
-					</view>
-			</scroll-view>
+			<carditem :InvoicingList="InvoicingList" @addcar="addcard" @addcartory="addcartory" @scrolltolower="scrolltolower" :status="status"></carditem>
 		</view>
 		<view class="fiedright">
 			<view>
@@ -136,14 +81,18 @@
 				<image src="/static/index/procurement/cg.png" mode="aspectFill"></image>
 			</view>
 		</view>
-		<view class="mengban" v-if="addflag" @click="qk"></view>
+		<!-- num -->
+		<view class="mengban" style="z-index: 119;" v-if="addflag" @click="qk"></view>
 		<calculator :show="addflag" @jjnum="jjnum" :caigouobj="caigouobj" 
 		:translateNumber="caigouobj?.Limitnum" :doOnce="caigouobj?.Limitnum
 		" @colse="qk" @right="right"></calculator>
+		<!-- 筛选 -->
 		<view class="mengban" v-if="ification" @click="qk"></view>
 		<classification @confirm="confirm" :show="ification"></classification>
+		<!-- more -->
 		<view class="mengban" v-if="Invenshow" @click="Invenshow = false"></view>
-		<Inventory @addcartory="addcartory" :show="Invenshow" :InvoicingList="Material" :status="statustory" @tolower="scrolltolower(1)"></Inventory>
+		<Inventory @addcartory="addcartory" :show="Invenshow" :InvoicingList="Material" 
+		 :status="statustory" @tolower="scrolltolower(1)"></Inventory>
 	</view>
 </template>
 
@@ -154,6 +103,7 @@
 	import calculator from './components/calculator.vue'
 	import classification from './components/classification.vue'
 	import Inventory from './components/Inventory.vue'
+	import carditem from './components/carditem.vue'
 	const qb = ref(false)
 	const addflag = ref(false)
 	const ification = ref(false)
@@ -201,6 +151,7 @@
 			console.log(res.result)
 			res.result.records.forEach(item=>{
 				item.zk = false;
+				item.scrollleft = 0;
 			})
 			Material.value.push(...res.result.records);
 			statustory.value = (res.result.total == Material.value.length ? 'nomore' : 'loadmore')
@@ -264,23 +215,13 @@
 		queryInvoicingList(form).then(res => {
 			res.result.records.forEach(item=>{
 				item.zk = false;
+				item.scrollleft = 0;
 			})
 			InvoicingList.value.push(...res.result.records);
 			status.value = (res.result.total == InvoicingList.value.length ? 'nomore' : 'loadmore')
 			setout2.value = (res.result.total == InvoicingList.value.length ? false : true)
 		})
 	}
-	const clkzk =(v:any,i:number)=>{
-		caigouobj.value = v;
-		caigouobj.value.Limitnum =  Number(caigouobj.value?.upperLimit)-Number(caigouobj.value.kcsl);
-		InvoicingList.value.forEach((item,k)=>{
-			if(k==i){
-				item.zk = !item.zk;
-			}else{
-				item.zk = false;
-			}
-		})
-	}
 	const addcartory =(e:any)=>{
 		console.log(e)
 		 caigouobj.value = e;
@@ -308,6 +249,10 @@
 		}
 		connfig(nm)
 	}
+	const addcard=(n:any,nm:any)=>{
+		caigouobj.value = n;
+		connfig(nm)
+	}
 	const timers = ref(true)
 	const connfig = (nm:any) =>{
 		if(timers.value==false){return}
@@ -337,8 +282,10 @@
 				if(res.success){
 					addflag.value = false;
 					shoppcar();
-					if(caigouobj.value.index){
+					if(caigouobj.value.yj){
 						Material.value[caigouobj.value.index].isAdd = 1
+					}else{
+						InvoicingList.value[caigouobj.value.index].isAdd = 1
 					}
 				}
 			},700)
@@ -394,207 +341,12 @@
 		width: 100%;
 		height: 70.3vh;
 		margin-top: 1vw;
-
-		.carditem {
-			width: 47vw;
-			height: 14.5vw;
-			background: rgba(255, 255, 255, 0.5);
-			border-radius: 1.6vw;
-			position: relative;
-			margin-bottom: 1.1vw;
-			display: flex;
-			overflow: hidden;
-			justify-content: flex-start;
-			.zkf{
-				right:-10vw !important;
-			}
-			.zkadd{
-				width: 10vw;
-				height: 100%;
-				display: flex;
-				justify-content: flex-end;
-				position: absolute;
-				top: 0;
-				right: 0;
-				view{
-					width: 5vw;
-					height: 100%;
-					font-weight: 400;
-					font-size: 1.3vw;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					flex-wrap: wrap;
-					&:nth-child(2){
-						background: #1083F8;
-						color: #fff;
-						padding: 1.1vw;
-					}
-					&:nth-child(1){
-						background: #C2C4C9;
-						color: #555555;
-					}
-				}
-			}
-			.add{
-				width: 6vw;
-				height: 100%;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				>view{
-					width: 4.5vw;
-					height: 1.8vw;
-					background: #E3EEF7;
-					border-radius: 0.9vw;
-					border: 1px solid rgba(3, 133, 250, 0.34);
-					font-weight: 400;
-					font-size: 1.1vw;
-					color: #1083F8;
-					text-align: center;
-					line-height: 1.75vw;
-					position: absolute;
-					top: 0.8vw;
-					right: 0.8vw;
-				}
-				image{
-					width: 3.2vw;
-					height: 3.2vw;
-				}
-			}
-			.msitem{
-				width: 25vw;
-				height: 100%;
-				padding: 1vw;
-				>view{
-					margin-top: 0.5vw;
-					&:nth-child(4){
-						width: 100%;
-						height: 3.4vw;
-						display: flex;
-						justify-content: space-between;
-						>view{
-							width: 33.3%;
-							height: 100%;
-							display: flex;
-							flex-direction: column;
-							position: relative;
-							align-items: center;
-							&:nth-child(1){
-								width: 30%;
-								text-align: left;
-							}
-							&:nth-child(2){
-								width: 40%;
-								text-align: center;
-							}
-							&:nth-child(3){
-								width: 30%;
-								text-align: right;
-							}
-							&:nth-child(2)::after{
-								content: '';
-								position: absolute;
-								right: 0;
-								width: 100%;
-								height: 2.2vw;
-								border-left: 1px solid  #C9C9C9;
-								border-right: 1px solid  #C9C9C9;
-								top: 0.6vw;
-							}
-							text{
-								&:nth-child(1){
-									font-weight: bold;
-									font-size: 1.7vw;
-									color: #555555;
-								}
-								&:nth-child(2){
-									font-weight: 400;
-									font-size: 1.1vw;
-									color: #999999;
-								}
-							}
-						}
-					}
-					&:nth-child(2),&:nth-child(3){
-						display: flex;
-						justify-content: space-between;
-						text{
-							font-weight: 400;
-							font-size: 1.4vw;
-							color: #777777;
-							margin-top: 0.35vw;
-						}
-					}
-					&:nth-child(1){
-						display: flex;
-						justify-content: space-between;
-						align-items: center;
-						height: 2vw;
-						>view{
-							width: 19vw;
-							height: 2vw;
-							font-weight: bold;
-							font-size: 1.6vw;
-							color: #222222;
-							text-overflow:ellipsis;
-							overflow: hidden;
-							white-space: nowrap;
-						}
-						text{
-							width: 6vw;
-							font-weight: 300;
-							font-size: 1.4vw;
-							color: #222222;
-						}
-					}
-				}
-			}
-			.spleft{
-				margin-left: -15vw !important;
-			}
-			.speitem{
-				width: 15vw;
-				height: 100%;
-				display: flex;
-				flex-direction: column;
-				.cardp{
-					width: 12.5vw;
-					height: 4vw;
-					display: flex;
-					flex-wrap: wrap;
-					margin: 0 auto;
-					align-items: center;
-					view{
-						width: 5.5vw;
-						height: 1.8vw;
-						border-radius: 0.9vw;
-						border: 1px solid #D2D2D2;
-						margin: 0.5vw 0 0 0.5vw;
-						display: flex;
-						justify-content: center;
-						align-items: center;
-						font-weight: 400;
-						font-size: 1vw;
-						color: #555555;
-					}
-				}
-				>image{
-					width: 9vw;
-					height: 8vw;
-					margin: 1vw auto 0;
-				}
-			}
-		}
-
+		
 		.crdcroll {
 			width: 100%;
 			height: 100%;
-			
-			.fler {
-				display: grid;
-				grid-template-columns: 1fr 1fr;
-			}
+			display: grid;
+			grid-template-columns: 1fr 1fr;
 		}
 	}