From 6bbe0377eada8f53c074151085ffd1228e75f9fc Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Wed, 15 Apr 2026 15:36:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |   7 +
 pages/NursingNew/component/index.vue          |   4 +-
 pages/NursingNew/component/nurse/newindex.vue |   5 +-
 pages/NursingNew/index.vue                    |  25 +-
 pages/login/newanimationpage.vue              |   8 +-
 pages/material/component/carditem.vue         | 559 ++++++++++++++++++
 pages/material/material.vue                   | 284 +++++++++
 7 files changed, 873 insertions(+), 19 deletions(-)
 create mode 100644 pages/material/component/carditem.vue
 create mode 100644 pages/material/material.vue

diff --git a/pages.json b/pages.json
index cba22e3..55c4c34 100644
--- a/pages.json
+++ b/pages.json
@@ -235,6 +235,13 @@
 			{
 				"navigationBarTitleText" : ""
 			}
+		},
+		{
+			"path" : "pages/material/material",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
 		}
 	],
 	"globalStyle": {
diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index c9aae0a..64b2187 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -433,7 +433,7 @@
 			fwzlarr.value.forEach(item=>{
 				item.obj = parseDirectiveName(item.directiveName)
 			})
-			console.log(fwzlarr.value)
+			// console.log(fwzlarr.value)
 		})
 	}
 	const parseDirectiveName=(directiveName)=> {
@@ -640,7 +640,7 @@
 		queryPadPageList().then((res => {
 			if(props.kf=='0'){
 				leftMenuArray.value = res.result.records;
-				console.log(leftMenuArray.value)
+				// console.log(leftMenuArray.value)
 				filteredMenu('izHldy').forEach((element : any, index : number) => {
 					if (element.nuId === uni.getStorageSync('NUall').nuId) {
 						menutarget.value = index;
diff --git a/pages/NursingNew/component/nurse/newindex.vue b/pages/NursingNew/component/nurse/newindex.vue
index bed81c5..09f5160 100644
--- a/pages/NursingNew/component/nurse/newindex.vue
+++ b/pages/NursingNew/component/nurse/newindex.vue
@@ -1067,7 +1067,7 @@
 			optTime: ts,
 			instructionTagId:typearray.value[whitchtype.value]?.instructionType
 		}
-		// console.log("啥情况data", data)
+		console.log("啥情况data", data)
 		editDirective(data).then((res) => {
 			// console.log("啥情况1111", res)
 			if (res.success) {
@@ -1352,7 +1352,8 @@
 		infoValue.startTime = timearr.value[indexsave.value[0]].children[indexsave.value[1]].startTime;
 		infoValue.endTime = timearr.value[indexsave.value[0]].children[indexsave.value[1]].endTime;
 		infoValue.instructionTagId = typearray.value[whitchtype.value]?.instructionType
-
+		console.log(infoValue)
+		console.log(timearr.value[indexsave.value[0]])
 		editDirective(infoValue).then((res : any) => {
 			if (res.success) {
 				geteverything()
diff --git a/pages/NursingNew/index.vue b/pages/NursingNew/index.vue
index 6ebf538..8dc9fcf 100644
--- a/pages/NursingNew/index.vue
+++ b/pages/NursingNew/index.vue
@@ -71,26 +71,26 @@
 		<!-- <logistics :isShow="menuIndexshowfourth" v-if="menuIndex==3" /> -->
 		<requestform :isShow="menuIndex=='jcgn_ql'" v-if="swipedex=='jcgn_ql'" />
 		<!-- 设备页 -->
-		<equipment :isShow="menuIndex=='jcgn_wisb'" v-if="swipedex=='jcgn_wisb'" />
+		<equipment :isShow="menuIndex=='jcgn_wlsb'" v-if="swipedex=='jcgn_wlsb'" />
 		<!-- 没有数据 -->
 		<view class="nomessageclass" :style="messageopit?{opacity: `1`}:{opacity: `0`}"
 			v-if="(menuIndex == 1 || menuIndex == 2) && (!uni.getStorageSync('elderId') ||!uni.getStorageSync('nuId'))">
 			<defaultr cont="暂无老人入住"></defaultr>
 		</view>
+		<wuliao  :isShow="menuIndex == 'jcgn_wl'" v-if="swipedex == 'jcgn_wl'"></wuliao>
 		
-		
-		<material :isShow="menuIndex == 'jcgn_cg'" v-if="menuIndex == 'jcgn_cg'&&!specialPagedex" ref="materials"
+		<material :isShow="menuIndex == 'jcgn_cg'" v-if="swipedex == 'jcgn_cg'&&!specialPagedex" ref="materials"
 			@changepages="changeNumber"></material>
 		<materialcar v-if="menuIndex == 'jcgn_cg'&&specialPagedex==1" @gotoitem="specialPagedex=2"></materialcar>
 		<purchaseorder v-if="menuIndex == 1&&specialPagedex==2"></purchaseorder>
 		
-		<picking :isShow="menuIndex == 'jcgn_jh'" v-if="menuIndex == 'jcgn_jh'"></picking>
-		<finish :isShow="menuIndex == 'jcgn_wj'" v-if="menuIndex == 'jcgn_wj'"></finish>
-		<outbound :isShow="menuIndex == 'jcgn_ql'" v-if="menuIndex == 'jcgn_ql'"></outbound>
-		<retstock :isShow="menuIndex == 'jcgn_qlrk'" v-if="menuIndex == 'jcgn_qlrk'"></retstock>
-		<inventory :isShow="menuIndex == 'jcgn_kcpd' " v-if="menuIndex == 'jcgn_kcpd'&& !specialPagedex" ref="inventorys"
+		<picking :isShow="menuIndex == 'jcgn_jh'" v-if="swipedex == 'jcgn_jh'"></picking>
+		<finish :isShow="menuIndex == 'jcgn_wj'" v-if="swipedex == 'jcgn_wj'"></finish>
+		<outbound :isShow="menuIndex == 'jcgn_ql'" v-if="swipedex == 'jcgn_ql'"></outbound>
+		<retstock :isShow="menuIndex == 'jcgn_qlrk'" v-if="swipedex == 'jcgn_qlrk'"></retstock>
+		<inventory :isShow="menuIndex == 'jcgn_kcpd' " v-if="swipedex == 'jcgn_kcpd'&& !specialPagedex" ref="inventorys"
 			@changepages="changepages"></inventory>
-		<addtory :isShow="menuIndex == 'jcgn_kcpd'" v-if="menuIndex == 'jcgn_kcpd'&&specialPagedex=='1'" :specialitem="specialitem">
+		<addtory :isShow="menuIndex == 'jcgn_kcpd'" v-if="swipedex == 'jcgn_kcpd'&&specialPagedex=='1'" :specialitem="specialitem">
 		</addtory>
 	</view>
 </template>
@@ -116,6 +116,7 @@
 
 
 	import material from "@/pages/procurement/material.vue";
+	import wuliao from "@/pages/material/material.vue";
 	import materialcar from "@/pages/procurement/materialcar.vue";
 	import purchaseorder from "@/pages/procurement/purchaseorder.vue";
 	import picking from "@/pages/Warehouse/picking.vue";
@@ -190,10 +191,11 @@
         { name: '库存盘点', url: '/static/shouye/ck/p0.png', urls: '/static/shouye/ck/p1.png', menuCode: 'jcgn_kcpd' },
         { name: '请领出库', url: '/static/shouye/ck/q0.png', urls: '/static/shouye/ck/q1.png', menuCode: 'jcgn_qlck' },
         { name: '退货入库', url: '/static/shouye/ck/t0.png', urls: '/static/shouye/ck/t1.png', menuCode: 'jcgn_qlrk' },
-        { name: '物联', url: '/static/shouye/sy/g0.png', urls: '/static/shouye/sy/g1.png', menuCode: 'jcgn_wisb' }
+        { name: '物联', url: '/static/shouye/sy/g0.png', urls: '/static/shouye/sy/g1.png', menuCode: 'jcgn_wlsb' }
 	])
 	const specialPage = ref('')
 	const navurl = (e, v) => {
+		if(swipedex.value == v.menuCode){return}
 		swipedex.value = '';
 		specialPage.value = ''
 		
@@ -205,7 +207,6 @@
 				menuIndex.value = v.menuCode;
 			}, 100)
 		}
-
 	}
 	const arrlist = ref([ 
 			{ name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png', menuCode: 'jcgn_sy' },
@@ -255,6 +256,7 @@
 
 	// 变更菜单
 	const changeMenu = (index) => {
+		console.log(index)
 		if (index === menuIndex.value) {
 			return
 		}
@@ -262,6 +264,7 @@
 		setTimeout(()=>{
 			swipedex.value = index;
 		},50)
+		console.log(swipedex.value,menuIndex.value)
 	};
 	const clientX = ref(0);
 	const clientY = ref(0);
diff --git a/pages/login/newanimationpage.vue b/pages/login/newanimationpage.vue
index 6431aa2..ccdd96c 100644
--- a/pages/login/newanimationpage.vue
+++ b/pages/login/newanimationpage.vue
@@ -173,8 +173,8 @@
 			}
 		})
 	});
-	const filteredMenu = (index : number) => {
-		return leftMenuArray.value.filter(item => Number(item.areaFlag) - 1 == index);
+	const filteredMenu = (code : any) => {
+		return leftMenuArray.value.filter(item =>  item[code]  == 'Y');
 	}
 	const ondoorarray =
 		genPaths(
@@ -288,7 +288,7 @@
 
 		housedex.value = index;
 		if (index == 0) {
-			let data = filteredMenu(0)[0]
+			let data = filteredMenu('izHldy')[0]
 			if (!data) {
 				uni.showToast({
 					title: '暂无单元数据', // 文案要短
@@ -324,7 +324,7 @@
 			})
 		}
 		if (index == 4) {
-			let data = filteredMenu(2)[0]
+			let data = filteredMenu('izKf')[0]
 			if (!data) {
 				uni.showToast({
 					title: '暂无库房数据', // 文案要短
diff --git a/pages/material/component/carditem.vue b/pages/material/component/carditem.vue
new file mode 100644
index 0000000..6e889c6
--- /dev/null
+++ b/pages/material/component/carditem.vue
@@ -0,0 +1,559 @@
+<template>
+	<view>
+		<scroll-view scroll-y="true" class="crdcroll" scroll-with-animation @scrolltolower="scrolltolower()" lower-threshold="300"
+			:enhanced="true" :bounce="true" enable-back-to-top>
+			<view class="box">
+				<view class="fler" v-for="(v,index) in InvoicingList" :key="index">
+					<view class="fler-view" @touchstart="ts($event)" @touchmove="canmove($event,index)">
+						<!-- @touchend="handleTouchEnd($event,v,index)"
+							@touchstart="touchstart($event,v,index)" scroll-with-animation scroll-x="true"
+							:scroll-left="v.scrollleft" @scroll="scroll" -->
+							
+						<view class="carditem guodu"
+							:style="openwhitchindex === index? { transform: 'translateX(-14vw)' }: { transform: 'translateX(0)' }">
+							<view class="cgdh">
+								采购单号：C10120251012001 <text class="s">↑</text><text class="j">↓</text>
+							</view>
+							<view class="cgsl">
+								<text>325</text>
+								<view>库存数量</view>
+							</view>
+							<view class="speitem guodu">
+								<view class="imghs">
+									<image style="border-radius: 1vw;"
+										:src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'"
+										mode="aspectFill">
+									</image>
+								</view>
+								<view class="cardp">
+									<view>复健用品</view>
+									<view>复健用品</view>
+								</view>
+								<!-- <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>纸尿裤-拉拉裤纸尿裤拉拉裤纸尿裤</view>
+								</view>
+								<view style="margin-top: 1vw;">
+									<text style="white-space: nowrap;"> 物料编码: ZHYP044</text>
+								</view>
+								<view>
+									<text style="white-space: nowrap;"> 规格型号: 800mm*680mm</text>
+								</view>
+								<view>
+									<text style="white-space: nowrap;"> 品牌型号：品牌型号名称</text>
+								</view>
+								<view>
+									<text style="white-space: nowrap;"> 生产厂家：吉林省捌零信创科技有限...</text>
+								</view>
+								<view>
+									<text style="white-space: nowrap;"> 供 应 商 ：长春市天林商贸有限公司...</text>
+								</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" >
+								<view class="zkadd-white" style="background: #F1F1F1;" @click.stop="crk(v,index)" @touchend.stop>盘点</view>
+								<view class="zkadd-white" @click.stop="crk(v,index)" @touchend.stop>出入库</view>
+								<view class="zkadd-blue" @click.stop="addcar(v,index)" v-if="v.isAdd!=1" @touchend.stop>
+									<view>
+										销售价格
+									</view>
+								</view>
+							</view>
+							
+						</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>
+	</view>
+</template>
+
+<script setup lang="ts">
+	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineComponent } from 'vue';
+	const props = defineProps({
+		InvoicingList: {
+			type: Array
+		},
+		status: {
+			type: String
+		},
+		show: {
+			type: Boolean,
+			default: false
+		},
+	})
+	const emit = defineEmits(['addcartory', 'scrolltolower', 'addcar', 'crk'])
+	const serverUrl = ref('')
+	onMounted(() => {
+		serverUrl.value = uni.getStorageSync('serverUrl') + '/sys/common/static/';
+		// setTimeout(()=>{
+		// 	console.log(serverUrl.value+props.InvoicingList[0].materialImg)
+		// },3000)
+	})
+	const caigouobj = ref({})
+	const addcar = (v : any, i : number) => {
+		// console.log("为啥点击不上啊",i)
+		if (Number(v.kcsl) >= Number(v.upperLimit)) {
+			uni.showToast({
+				title: '库存数量已满，不可添加购物车！',
+				icon: 'none'
+			})
+			return
+		}
+		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) {
+	// 		v.scrollleft = 1
+	// 		setTimeout(() => {
+	// 			v.scrollleft = 0
+	// 		}, 20)
+	// 		return
+	// 	}
+	// 	if (absx < 10 && absy < 10) {
+	// 		if (v.zk == false) {
+	// 			setTimeout(() => {
+	// 				v.scrollleft = 0
+	// 			}, 20)
+	// 		}
+	// 		console.log("2")
+	// 		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)
+	// }
+	const crk = (v, i) => {
+		emit('crk', v, i)
+	}
+	const startX = ref(0)
+	const openwhitchindex = ref(-1)
+	const ts = (e) => {
+		startX.value = e.touches[0].clientX;
+	}
+	const canmove = (e : any, index : number) => {
+		const moveX = e.touches[0].clientX
+		const diff = moveX - startX.value
+		// diff 为负值就是向左滑
+		if (diff < -40) {  // 👉 60px 阈值，随便改
+			openwhitchindex.value = index
+		}
+		if (diff > 40) {  // 👉 60px 阈值，随便改
+			openwhitchindex.value = -1
+		}
+	}
+</script>
+
+<style scoped lang="less">
+	.crdcroll {
+		width: 90vw;
+		height: calc(100vh - 4vw);
+
+		.box {
+			width: 90vw;
+			display: grid;
+			grid-template-columns: 1fr 1fr;
+		}
+
+		.fler {
+			width: 44vw;
+			height: 19.1vw;
+			position: relative;
+			// background-color: red;
+
+			.fler-view {
+				width: 44vw;
+				height: 18.2vw;
+				background: rgba(255, 255, 255, 1);
+				border-radius: 1.6vw;
+				position: relative;
+				margin-bottom: 1.1vw;
+				overflow: hidden;
+				white-space: nowrap;
+			}
+		}
+	}
+	.zkadd {
+		width: 14vw;
+		height: 18.8vw;
+		display:flex;
+		justify-content: flex-end;
+		// background-color: blue;
+		position: absolute;
+		top: -3vw;
+		right: -14vw;
+		z-index: 55;
+	
+		>view {
+			width: 4.66vw;
+			height: 100%;
+			font-weight: 400;
+			font-size: 1.5vw;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			writing-mode: vertical-rl;
+			text-orientation: upright;
+			text-align: center;
+	
+		}
+	
+		.zkadd-blue {
+			background: #1083F8;
+			color: #fff;
+	
+			view {
+				width: 3.8vw;
+				height: 3.8vw;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				margin-top: -0.7vw;
+			}
+		}
+	
+		.zkadd-white {
+			background: #e3e5e7;
+			color: #555555;
+		}
+	}
+	.carditem {
+		position: absolute;
+		top: 2.5vw;
+		left: 0;
+		height: 100%;
+		display: flex;
+		transition: transform 500ms cubic-bezier(.2, .8, .2, 1);
+		will-change: transform;
+		.cgsl{
+			position: absolute;
+			width: 5vw;
+			height:4.5vw;
+			display: flex;
+			justify-content: center;
+			flex-direction: column;
+			align-items: center;
+			right: 2.6vw;
+			top: -1.5vw;
+			text{
+				font-weight: bold;
+				font-size: 2.3vw;
+				color: #222222;
+				font-style: normal;
+				text-transform: none;
+				margin: 0.6vw 0;
+			}
+			view{
+				font-size: 13px;
+				color: #777777;
+				font-style: normal;
+				text-transform: none;
+			}
+		}
+		.cgdh{
+			position: absolute;
+			width: 25vw;
+			height: 3vw;
+			display: flex;
+			align-items: center;
+			top: -2vw;
+			left: 2.3vw;
+			
+			text{
+				width: 1.5vw;
+				height: 1.5vw;
+				border-radius: 0.3vw;
+				font-weight: bold;
+				font-size: 1vw;
+				line-height: 1.5vw;
+				text-align: center;
+				display: block;
+				color: #fff;
+				margin-left: 1.2vw;
+			}
+			.s{
+				background: #FF5B5B;
+			}
+			.j{
+				background: #1083F8;
+			}
+		}
+
+		
+
+		.zkf {
+			width: 7vw;
+			right: -7vw;
+		}
+
+		.add {
+			width: 4.5vw;
+			height: 100%;
+			position: absolute;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			top: 50%;
+			transform: translateY(-50%);
+			// top: 0.8vw;
+			right: 16vw;
+			// background-color: red;
+
+			>view {
+				width: 5.5vw;
+				height: 2.2vw;
+				background: #fff;
+				border-radius: 0.9vw;
+				border: 1px solid #1083F8;
+				font-weight: 400;
+				font-size: 1.4vw;
+				color: #1083F8;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				position: absolute;
+				top: 2.3vw;
+				right: 0.8vw;
+			}
+
+			image {
+				width: 2.5vw;
+				height: 2.5vw;
+			}
+		}
+
+		.msitem {
+			min-width: 25vw;
+			height: 14vw;
+			margin-right: 4.2vw;
+			position: relative;
+
+			>view {
+
+				&:nth-child(2),
+				&:nth-child(3),
+				&:nth-child(4),
+				&:nth-child(6),
+				&:nth-child(5) {
+					margin-top: 0.25vw;
+					max-width: 25vw;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					overflow: hidden;
+
+					text {
+						font-weight: 400;
+						font-size: 1.3vw;
+						color: #777777;
+						margin-top: 0.25vw;
+					}
+				}
+
+				&:nth-child(1) {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					height: 2vw;
+					margin-top: 1vw;
+
+					>view {
+						width: 19vw;
+						height: 2vw;
+						font-weight: bold;
+						font-size: 1.8vw;
+						color: #222222;
+						text-overflow: ellipsis;
+						overflow: hidden;
+						white-space: nowrap;
+					}
+
+					text {
+						width: 6vw;
+						font-weight: 300;
+						font-size: 1.4vw;
+						color: #222222;
+					}
+				}
+			}
+
+			>.wlsy {
+				width: 100%;
+				height: 3.4vw;
+				display: flex;
+				justify-content: space-between;
+				margin-top: 0vw;
+
+				>view {
+					width: 33.3%;
+					height: 100%;
+					display: flex;
+					flex-direction: column;
+					position: relative;
+					margin-top: 1vw;
+
+					&:nth-child(1) {
+						width: 30%;
+						align-items: left;
+					}
+
+					&:nth-child(2) {
+						width: 40%;
+						align-items: center;
+					}
+
+					&:nth-child(3) {
+						width: 30%;
+						text-align: right;
+						align-items: 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.8vw;
+							color: #555555;
+						}
+
+						&:nth-child(2) {
+							font-weight: 400;
+							font-size: 1.2vw;
+							color: #999999;
+						}
+					}
+				}
+			}
+		}
+
+		// .spleft{
+		// 	margin-left: -15vw !important;
+		// }
+		.speitem {
+			min-width: 14.8vw;
+			height: 14vw;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+
+			.cardp {
+				width: 12.5vw;
+				height: 4vw;
+				display: flex;
+				flex-wrap: wrap;
+				margin: 0 auto;
+				align-items: center;
+
+				view {
+					min-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;
+					padding: 0 0.25vw;
+
+					&:nth-child(1),
+					&:nth-child(2) {
+						max-width: 6vw;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+						display: block;
+						line-height: 1.8vw;
+						text-align: center;
+					}
+
+					&:nth-child(3) {
+						max-width: 11.5vw;
+						padding: 0 0.8vw;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+						display: block;
+						line-height: 1.8vw;
+						text-align: center;
+					}
+				}
+			}
+
+			.imghs {
+				width: 10vw;
+				height: 10vw;
+				margin: 1vw auto 0.25vw;
+				padding: 0.2vw;
+				background: #fff;
+				border-radius: 1.1vw;
+				
+				>image {
+					width: 100%;
+					height: 100%;
+					border-radius: 1.1vw;
+				}
+			}
+
+		}
+	}
+</style>
+ 
\ No newline at end of file
diff --git a/pages/material/material.vue b/pages/material/material.vue
new file mode 100644
index 0000000..9370add
--- /dev/null
+++ b/pages/material/material.vue
@@ -0,0 +1,284 @@
+<template>
+	<view class="guodu" :style="!transition?'opacity: 0':'opacity: 1'" style="transition: opacity 1s ease;padding: 1.1vw;">
+		<view class="serchs guodu" :style="'width:90vw'">
+			<view class="ipt">
+				<input type="text" placeholder="物料名称/物料编码/物料简拼" v-model="form.wlParamInfo" @confirm="search" />
+				<image src="/static/index/procurement/x.png" mode="aspectFill" v-if="form.wlParamInfo"
+					@click="search(0)"></image>
+			</view>
+			<view @click="search" class="scr guodu">
+				<image src="/static/index/procurement/sh.png" mode="aspectFill" class="sh"></image>
+				<image src="/static/index/procurement/shr.png" mode="aspectFill" class="shr"></image>
+				检索
+			</view>
+			<!-- <view class="shx guodu" @click="ification=true">
+				<image src="/static/index/purchaseorder/select.png" mode="aspectFill" class="sh"></image>
+				<image src="/static/index/purchaseorder/selecttarget.png" mode="aspectFill" class="shr"></image>
+				筛选
+			</view> -->
+			<view class="shx guodu" @click="chongzhi"
+				v-if="form.categoryId!=''||form.wlParamInfo!=''||form.suppliers!=''">
+				<image src="/static/index/procurement/cz.png" mode="aspectFill"></image>
+				重置
+			</view>
+			<view class="back guodu" >
+				<!-- <image src="/static/index/procurement/bk.png" mode="aspectFill"></image> -->
+				出入库
+			</view>
+		</view>
+		<view class="listcard">
+			<view class="contain-right-nomessage center" v-if="InvoicingList.length == 0">
+				<view class="que">
+					<image src="/static/index/procurement/que.png" mode="aspectFill"></image>
+					<view>暂无物料</view>
+				</view>
+			</view>
+			<carditem :InvoicingList="InvoicingList" @addcartory="addcartory" @scrolltolower="scrolltolower" lower-threshold="300"
+				:status="status" @crk="crk"></carditem>
+		</view>
+	</view>
+</template>
+
+<script lang="ts" setup>
+	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineComponent, inject, watch } from 'vue';
+	import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
+	import carditem from './component/carditem.vue'
+	 const transition = ref(false)
+	 const props = defineProps({
+	 	isShow: {
+	 		type: Boolean
+	 	},
+	 });
+	 watch(
+	 	() => props.isShow,
+	 	(newVal, oldVal) => {
+	 		if (!oldVal && newVal) {
+	 			transition.value = false;
+	 			setTimeout(() => {
+	 				transition.value = true;
+	 			}, 50)
+	 		} else {
+	 			transition.value = false;
+	 		}
+			console.log(transition.value)
+	 	}
+	 )
+	 const form = reactive({
+	 	nuId: uni.getStorageSync('nuId'),
+	 	pageNo: 1,
+	 	pageSize: 30,
+	 	categoryId: '',
+	 	typeId: '',
+	 	medicationId: '',
+	 	wlParamInfo: '',
+	 	isWaring: 0,
+	 	suppliers: ''
+	 })
+	 const ification = ref(false)
+	 const InvoicingList = ref([{},{},{},{},{},{},]);
+	 const search = (x : number) => {
+	 	if (x === 0) { form.wlParamInfo = '' }
+	 	form.pageNo = 1;
+	 	InvoicingList.value = [];
+	 	// queryInvo();
+	 }
+	 const chongzhi = () => {
+	 	form.categoryId = '';
+	 	form.typeId = '';
+	 	form.medicationId = '';
+	 	form.suppliers = '';
+	 	form.pageNo = 1;
+	 	form.wlParamInfo = '',
+		InvoicingList.value = [];
+	 	// classication.value.typescroll(1, -1, {});
+	 	// classication.value.qingkong();
+	 	// classication.value.config();
+	 }
+</script>
+
+<style lang="less" scoped>
+.listcard {
+		width: 90vw;
+		height: calc(100vh - 4vw);
+		margin-top: 0.9vw;
+		// background-color: #fff;
+		position: relative;
+		.center {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+		
+		.contain-right-nomessage {
+			position: fixed;
+			top: 0;
+			right: 0;
+			width: 91.2%;
+			height: 100vh;
+			border-radius: 30rpx;
+			z-index: 100;
+			.que {
+				width: 20vw;
+				height: 20vw;
+				margin-right: 12vw;
+				// margin: auto;
+			
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			
+				view {
+					margin-top: -30rpx;
+					width: 100%;
+					text-align: center;
+					font-weight: 300;
+					font-size: 1.2vw;
+					color: #555555;
+				}
+			}
+		}
+
+		.crdcroll {
+			width: 100%;
+			height: 100%;
+			display: grid;
+			grid-template-columns: 1fr 1fr;
+		}
+	}
+
+.serchs {
+		width: 100%;
+		height: 3.3vw;
+		border-radius: 1.6vw;
+		display: flex;
+		align-items: center;
+		position: relative;
+
+		.ipt {
+			display: flex;
+			align-items: center;
+			width: 28vw;
+			border-radius: 1.65vw;
+			height: 3.3vw;
+			background: #FFFFFF;
+			border: 1px solid #D2D2D2;
+
+			image {
+				width: 2.2vw;
+				height: 2.2vw;
+				// margin: 0 0.5vw;
+				margin-right: 1.5vw;
+			}
+
+			input {
+				width: 25vw;
+				height: 3.3vw;
+				font-size: 1.4vw;
+				padding-left: 1.6vw;
+
+			}
+		}
+
+		.back {
+			width: 9vw;
+			height: 3.3vw;
+			border-radius: 1.6vw;
+			background: rgba(255, 255, 255, 1);
+			border-radius: 1.65vw;
+			font-weight: 400;
+			font-size: 1.4vw;
+			color: rgba(85, 85, 85, 1);
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			position: absolute;
+			right: 0.5vw;
+			top: 0.2vw;
+			border: 1px solid #D9DADC;
+
+			image {
+				width: 1.5vw;
+				height: 1.3vw;
+				margin: 0 0.5vw 0 0;
+			}
+
+		}
+
+		.back:active,
+		.shx:active,
+		.scr:active {
+			color: #1083F8;
+			background: linear-gradient(-45deg, rgba(223, 244, 252, 1), rgba(204, 228, 249, 0.43));
+			border: 1px solid #1083F8;
+		}
+
+		.scr {
+			border-radius: 1.65vw;
+			font-weight: 400;
+			font-size: 1.4vw;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			width: 8.5vw;
+			height: 3.3vw;
+			margin: 0 0 0 0.7vw;
+			background: rgba(255, 255, 255, 1);
+			border: 1px solid #D9DADC;
+			color: #555555;
+
+			image {
+				width: 1.6vw;
+				height: 1.6vw;
+				margin: 0 0.5vw 0 0;
+			}
+		}
+
+		.shr {
+			display: none;
+		}
+
+		.scr:active .sh {
+			display: none;
+		}
+
+		.shx:active .shr {
+			display: inline-block;
+		}
+
+		.shx:active .sh {
+			display: none;
+		}
+
+		.scr:active .shr {
+			display: inline-block;
+		}
+
+		.shx {
+			width: 8.5vw;
+			height: 3.3vw;
+			background: #FFFFFF;
+			border-radius: 1.65vw;
+			border: 1px solid #D9DADC;
+			font-weight: 400;
+			font-size: 1.4vw;
+			color: #222;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			margin: 0 0 0 0.7vw;
+			color: #555555;
+
+			image {
+				width: 1.6vw;
+				height: 1.6vw;
+				margin: 0 0.5vw 0 0;
+			}
+		}
+	}
+	.guodu {
+		transition: .4s;
+		-webkit-transform-style: preserve-3d;
+		-webkit-overflow-scrolling: touch;
+	}
+</style>