同步

pages/NursingNew/component/nurse/index.css

@@ -992,7 +992,7 @@
 	justify-content: center;
 	align-items: center;
 	/* 添加毛玻璃效果 */
-	z-index: 98;
+	z-index: 999;
 
 	.popup-overlay-content {
 		position: absolute;

pages/NursingNew/component/nurse/index.vue

@@ -419,7 +419,7 @@
 		</view>
 		<!-- 点击的弹出层 -->
 		<view v-show="isopen" class="popup-overlay" @click="isopen=false;flyNumber.index0=999;touchindex1=-1">
-			<view class="popup-overlay-content" style="height: 390rpx;" :class="getjiao"
+			<view class="popup-overlay-content" style="height: 390rpx;" popup-overlay:class="getjiao"
 				v-if="timearr[showDetail[0]]?.children[showDetail[1]]?.izPackage==='N'"
 				:style="{ top: (2*openY - 350) + 'rpx',left: (2*openX - 780) + 'rpx',opacity: isopacity ? 1 : 0 }"
 				@click.stop>
@@ -1548,7 +1548,7 @@
 									openX.value = Math.floor(res.left) - 18
 									jiao.value[0] = false
 								}
-								if (res.top > 500) {
+								if (res.top > 300) {
 									// 表格太靠上侧，修改到下面
 									openY.value = Math.floor(res.top) + 100;
 									jiao.value[1] = true
@@ -1561,7 +1561,7 @@
 								
 								showDetail.value[0] = index0;
 								showDetail.value[1] = index1;
-								console.log("shaa",timearr.value[showDetail.value[0]]?.children[showDetail.value[1]]?.izPackage)
+								// console.log("shaa",timearr.value[showDetail.value[0]]?.children[showDetail.value[1]]?.izPackage)
 								isopacity.value = false;
 								//加动画
 								setTimeout(() => {

pages/NursingNew/component/pleasetake/common/addwl.vue

@@ -3,12 +3,18 @@
 		<view class="kcyj">
 			<view class="kjlt">
 				请领物料
-				<view class="mhao" v-if="Material.length>0">{{Material.length}}</view>
+				<view class="mhao" v-if="Material.length>0">
+					<view class="mhao-font">
+						{{Material.length}}
+					</view>
+
+				</view>
 			</view>
-			<scroll-view scroll-x="true" class="kcscrol guodu"  @scroll="onScroll"
+			<scroll-view scroll-x="true" class="kcscrol guodu" @scroll="onScroll" scroll-with-animation
-				scroll-with-animation :scroll-left="scrollleft"  :style="qb?'width:calc(100% - 21.8vw)':'width:calc(100% - 10vw)' ">
+				:scroll-left="scrollleft" :style="qb?'width:calc(100% - 21.8vw)':'width:calc(100% - 10vw)' ">
-				<view class="yjbox" v-for="(v,i) in Material" :key="i" >
+				<view class="yjbox" v-for="(v,i) in Material" :key="i">
-					<image :src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
+					<image
+						:src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
 						mode="aspectFill"></image>
 					<view>{{v.materialInfo?.materialName}}</view>
 					<text class="ytj" v-if="v.qlNum>=0">{{v.qlNum}}</text>
@@ -16,9 +22,15 @@
 						<view>-</view>
 					</view>
 				</view>
-				<defaultr cont="暂无数据" v-if="Material.length==0&&timeout" style="position: absolute;width: 10vw;height: 10vw;"></defaultr>
+				<view class="que" v-if="Material.length==0&&timeout">
+					<image src="/static/index/procurement/que.png" mode="aspectFill"></image>
+					<view>暂无数据</view>
+				</view>
+				<!-- <defaultr cont="暂无数据" v-if="Material.length==0&&timeout"
+					style="position: absolute;width: 10vw;height: 10vw;"></defaultr> -->
 			</scroll-view>
-			<view class="kjlt more guodu" :style="qb?'width:15vw':'' "  @touchstart="ts" @touchmove="canmove" v-if="Material.length>0">
+			<view class="kjlt more guodu" :style="qb?'width:15vw':'' " @touchstart="ts" @touchmove="canmove"
+				v-if="Material.length>0">
 				<view @click="zksq" class="righ0">
 					{{!qb?'更多':'收起'}}
 					<image class="guodu" :style="qb?'transform: rotate(180deg);':''"
@@ -40,46 +52,46 @@
 </template>
 
 <script setup lang="ts">
-	import { ref, onMounted, onBeforeUnmount, computed, nextTick,  watch, reactive } from 'vue';
+	import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive } from 'vue';
 	import defaultr from './default.vue'
 	import tanchuang from '../common/tanchuang.vue';
 	const props = defineProps({
-		Material:{
+		Material: {
-			type:Array,
+			type: Array,
 			required: true,
 		}
 	});
-	const emit = defineEmits([ 'delall' ,'del','submit'])
+	const emit = defineEmits(['delall', 'del', 'submit'])
 	const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
 	const qb = ref(false)
 	const moredex = ref(0)
-	watch(()=>props.Material,
+	watch(() => props.Material,
-	()=>{
+		() => {
-		if(props.Material.length==0){
+			if (props.Material.length == 0) {
-			qb.value = false;
+				qb.value = false;
-			moredex.value=0;
+				moredex.value = 0;
-		}
+			}
-	})
+		})
-	const delall = ()=>{
+	const delall = () => {
 		emit('delall');
-		setTimeout(()=>{
+		setTimeout(() => {
 			moredex.value = 0;
 			qb.value = false;
-		},100)
+		}, 100)
 	}
-	const del =(v)=>{
+	const del = (v) => {
-		emit('del',v)
+		emit('del', v)
 	}
-	const zksq = () =>{
+	const zksq = () => {
-		if(props.Material.length==0){
+		if (props.Material.length == 0) {
 			uni.showToast({
-				icon:'none',
+				icon: 'none',
-				title:'请添加请领物料！'
+				title: '请添加请领物料！'
 			})
 			return
 		}
-		qb.value=!qb.value;
+		qb.value = !qb.value;
-		moredex.value=0;
+		moredex.value = 0;
 		moveleft();
 	}
 	const startX = ref(0)
@@ -93,7 +105,7 @@
 	}
 	const scrollleft = ref(0)
 	const canmove = (e : any) => {
-		if(props.Material.length==0){ return }
+		if (props.Material.length == 0) { return }
 		const moveX = e.touches[0].clientX
 		const diff = moveX - startX.value
 		// diff 为负值就是向左滑
@@ -129,10 +141,10 @@
 		}
 	}
 	const timeout = ref(false)
-	onMounted(()=>{
+	onMounted(() => {
-		setTimeout(()=>{
+		setTimeout(() => {
 			timeout.value = true
-		},500)
+		}, 500)
 	})
 </script>
 
@@ -157,22 +169,28 @@
 			font-size: 1.4vw;
 			position: relative;
 			z-index: 10;
-			.mhao{
+
-				width: 1.6vw;
+			.mhao {
-				min-height: 0vw;
-				border-radius: 0.8vw;
-				border: 1px solid #FF4E4E;
-				font-weight: 400;
-				font-size: 1.1vw;
-				color: #FF4E4E;
-				padding: 0.4vw 0vw;
 				position: absolute;
-				top: -0.8vw;
+				top: -0.2vw;
-				right: -0.4vw;
+				/* 根据视觉需要微调 */
-				transform: rotate(-90deg);
+				right: -0.2vw;
+				box-sizing: border-box;
+				width: 1.8vw;
+				height: 1.8vw;
+				border-radius: 50%;
+				border: 1px solid #FF4E4E;
+				color: #FF4E4E;
 				display: flex;
-				justify-content: center;
 				align-items: center;
+				justify-content: center;
+				background: transparent;
+				writing-mode: horizontal-tb;
+				overflow: hidden;
+				.mhao-font{
+					font-size: 25rpx;
+					letter-spacing: -0.05em; /* 负值 = 字符之间更近 */
+				}
 			}
 		}
 
@@ -221,7 +239,7 @@
 					right: 7.7vw;
 					z-index: 2;
 				}
-				
+
 				&:nth-child(4) {
 					right: 11.6vw;
 					z-index: 2;
@@ -234,8 +252,9 @@
 			}
 
 		}
+
 		.kcscrol {
-			width:calc(100% - 10vw);
+			width: calc(100% - 10vw);
 			height: 10vw;
 			white-space: nowrap;
 			margin-left: 0.6vw;
@@ -250,14 +269,16 @@
 				border-radius: 1.1vw;
 				margin-right: 0.8vw;
 				position: relative;
-				.zhanwei{
+
+				.zhanwei {
 					width: 100%;
 					height: 100%;
 					position: absolute;
 					top: 0;
 					left: 0;
 					z-index: 200;
-					view{
+
+					view {
 						position: absolute;
 						width: 2.2vw;
 						height: 2.2vw;
@@ -276,6 +297,7 @@
 						color: rgba(255, 78, 78, 1);
 					}
 				}
+
 				.ytj {
 					min-width: 1.5vw;
 					height: 1.8vw;
@@ -288,7 +310,7 @@
 					text-align: center;
 					line-height: 1.75vw;
 					position: absolute;
-					padding:  0 0.8vw;
+					padding: 0 0.8vw;
 					top: 0.8vw;
 					right: 0.8vw;
 				}
@@ -316,9 +338,40 @@
 			}
 		}
 	}
+
 	.guodu {
 		transition: .4s;
 		-webkit-transform-style: preserve-3d;
 		-webkit-overflow-scrolling: touch;
 	}
+	.que{
+		width: 16vw;
+		height: 16vw;
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 82.2vw;
+		height: 10vw;
+		background: rgba(245, 246, 248, 1);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 20rpx;
+		
+		image{
+			width: 12vw;
+			height: 12vw;
+		}
+		view{
+			width: 12vw;
+			text-align: center;
+			position: absolute;
+			bottom: 0.5vw;
+			left: 50%;
+			transform: translateX(-50%);
+			font-weight: 300;
+			font-size: 1.4vw;
+			color: #555555;
+		}
+	}
 </style>

pages/NursingNew/component/pleasetake/common/carditem.vue

@@ -220,6 +220,7 @@
 			position: absolute;
 			bottom: 0.8vw;
 			right: 0vw;
+			
 		}
 	}
 	.msitem {
@@ -370,7 +371,7 @@
 	
 	.itembox{
 		width: 100%;
-		height: 64vh;
+		height: 66vh;
 		padding:1vw 2vw 0 0;
 		
 		.box{

pages/NursingNew/component/pleasetake/common/cgdclass.vue

@@ -335,7 +335,7 @@
 				min-width: 8vw;
 				height: 3.8vw;
 				background: #EDEDEF;
-				border-radius: 1.6vw;
+				border-radius: 3vw;
 				padding: 0 2vw;
 				margin-left: 1vw;
 				border: 1px solid #EDEDEF;

pages/NursingNew/component/pleasetake/common/htditem.vue

@@ -307,7 +307,7 @@
 					font-size: 1.6vw;
 					color: #222222;
 					height: 3vw;
-					padding-top: 1.3vw;
+					padding-top: 1.2vw;
 					text-overflow: ellipsis;
 					overflow: hidden;
 					white-space: nowrap;

pages/NursingNew/component/pleasetake/common/medetails.vue

@@ -7,8 +7,8 @@
 				<view class="leftbox">
 					<image :src="objtake?.materialImg?serverUrl+objtake?.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"/>
 					<view>
-						<text>耗材用品</text>
+						<view>{{ objtake?.categoryId_dictText }}</view>
-						<text>复健用品</text>
+						<view>{{ objtake?.typeId_dictText }}</view>
 					</view>
 				</view>
 				<view class="youcont">
@@ -70,15 +70,15 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick,  watch, reactive }
 	const showbox = ref(false)
 	watch(()=>props.show,
 		()=>{
-			console.log(props.objtake)
+			// console.log(`11111111111`,props.objtake)
 			if(props.show==true){
 				let obj = {
 					nuId:uni.getStorageSync('nuId'),
-					elderId:uni.getStorageSync('NUall').id,
+					elderId:uni.getStorageSync('NUall').elderId,
 					wlId:props.objtake.wlId
 				}
 				queryMaterialInfo(obj).then(res=>{
-					console.log(res)
+					console.log(`wuobj`,res)
 					wuobj.value = res.result
 				})
 				setTimeout(()=>{
@@ -113,6 +113,7 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick,  watch, reactive }
 		}
 		.quxiao{
 			background: #EDEDEF;
+			color: #888888;
 		}
 		.plsbuy-bottom-blue {
 			background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
@@ -142,14 +143,16 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick,  watch, reactive }
 				width: 14.2vw;
 				height: 100%;
 				border-right: 2px solid #E5E5E5;
-
+				
 				view {
 					width: 100%;
 					margin-top: 0.6vw;
 					display: flex;
-					justify-content: space-around;
+					// justify-content: space-around;
-
+					flex-direction: column;
-					text {
+					align-items: center;
+					
+					view {
 						width: 6vw;
 						height: 2vw;
 						border-radius: 1vw;

pages/NursingNew/component/pleasetake/common/submits.vue

@@ -211,7 +211,7 @@
 									font-size: 1.6vw;
 									color: #222222;
 									height: 3vw;
-									padding-top: 1.3vw;
+									padding-top: 1.2vw;
 									text-overflow: ellipsis;
 									overflow: hidden;
 									white-space: nowrap;
@@ -266,6 +266,7 @@
 			font-weight: 400;
 			font-size: 1.4vw;
 			color: #555555;
+			margin-left: 1.1vw;
 		}
 		.itemcan{
 			width: 100%;
@@ -273,6 +274,8 @@
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
+			padding-left: 1vw;
+			padding-right: 1vw;
 			text{
 				font-weight: 400;
 				font-size: 1.4vw;
@@ -280,7 +283,7 @@
 			}
 		}
 		.tit {
-			width: 100%;
+			width: 96.5%;
 			height: 3.5vw;
 			line-height: 6vw;
 			font-weight: 400;
@@ -290,6 +293,8 @@
 			justify-content: space-between;
 			align-items: center;
 			border-bottom: 1px solid #E5E5E5;
+			margin: 0 1vw;
+			
 		}
 	}
 	.mengban{
@@ -338,6 +343,7 @@
 		}
 		.quxiao{
 			background: #EDEDEF;
+			color: #888888;
 		}
 		.plsbuy-bottom-blue {
 			background: linear-gradient(0deg, #CAE0F9, #E9F4FF);

pages/NursingNew/component/pleasetake/common/takeing.vue

@@ -227,6 +227,7 @@
 				   	}
 				   	.quxiao{
 				   		background: #EDEDEF;
+						color: #888888;
 				   	}
 				   	.plsbuy-bottom-blue {
 				   		background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
@@ -317,6 +318,7 @@
 					font-size: 1.4vw;
 					font-weight: 500;
 					text-align: center;
+					margin-left: 1.5vw;
 				}
 				
 			   .cont{

pages/NursingNew/component/pleasetake/common/takerecord.vue

@@ -10,8 +10,8 @@
 				<view class="leftbox">
 					<image :src="objtake?.materialImg?serverUrl+objtake?.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"/>
 					<view>
-						<text>耗材用品</text>
+						<view v-if="objtake?.categoryId_dictText">{{objtake?.categoryId_dictText}}</view>
-						<text>复健用品</text>
+						<view v-if="objtake?.typeId_dictText">{{objtake?.typeId_dictText}}</view>
 					</view>
 				</view>
 				<view class="youcont">
@@ -101,10 +101,11 @@
 			if(props.show==true){
 				let obj = {
 					nuId:uni.getStorageSync('nuId'),
-					elderId:uni.getStorageSync('NUall').id,
+					elderId:uni.getStorageSync('NUall').elderId,
 					wlId:props.objtake.wlId, 
 				}
 				queryMaterialInfo(obj).then(res=>{
+					console.log("入参",obj,`返回`,res)
 					wuobj.value = res.result
 				})
 				qglog()
@@ -175,7 +176,8 @@
 				.dian{
 					 width: 0.5vw;
 					 height: 0.5vw;
-					 margin: 01.6vw;
+					 margin: 1.6vw;
+					 margin-right: 1vw;
 					 background: #888888;
 					 border-radius: 50%;
 					 position: relative;
@@ -192,24 +194,25 @@
 					background: white;
 				}
 				.riqi{
-					min-width: 7.2vw;
+					width: 12vw;
 					height: 2vw;
 					background: #F9F9FA;
 					border-radius: 1vw;
-					border: 1px solid #D2D2D2;
+					border: 1rpx solid #D2D2D2;
 					display: flex;
 					justify-content: center;
 					align-items: center;
 					font-weight: 400;
 					font-size: 1vw;
 					color: #888888;
-					padding: 0 0.6vw;
+					padding: 0 0.4vw;
 				}
 				.qlr{
+					width: 11vw;
 					font-weight: 400;
-					font-size: 1.3vw;
+					font-size: 1.2vw;
 					color: #999999;
-					margin-left: 1.8vw;
+					margin-left: 1vw;
 					text{
 						color: #333;
 					}
@@ -249,12 +252,14 @@
 			
 					view {
 						width: 100%;
-						margin-top: 0.6vw;
+						margin-top: 0.3vw;
 						display: flex;
-						justify-content: space-around;
+						flex-direction: column;
-			
+						align-items: center;
-						text {
+						// justify-content: space-around;
-							min-width: 4.8vw;
+						
+						view {
+							width: 6vw;
 							height: 2vw;
 							border-radius: 1vw;
 							border: 1px solid #D2D2D2;
@@ -290,7 +295,7 @@
 							height: 3.6vw;
 							display: flex;
 							justify-content: flex-start;
-							margin-top: 1.8vw;
+							margin-top: 1.6vw;
 			
 							>view {
 								width: 50%;
@@ -311,15 +316,15 @@
 			
 						&:nth-child(1) {
 							width: 100%;
-							height: 1.8vw;
+							height: 2vw;
 							font-weight: bold;
-							font-size: 1.6vw;
+							font-size: 1.5vw;
 							color: #222222;
 							white-space: nowrap;
 							text-overflow: ellipsis;
 							overflow: hidden;
-							line-height: 1.8vw;
 						}
+						
 					}
 				}
 			
@@ -365,6 +370,7 @@
 		}
 		.quxiao{
 			background: #EDEDEF;
+			color: #888888;
 		}
 		.plsbuy-bottom-blue {
 			background: linear-gradient(0deg, #CAE0F9, #E9F4FF);

pages/NursingNew/component/pleasetake/component/requestform.vue

@@ -232,7 +232,7 @@
 	watch(
 		() => props.isShow,
 		(newVal, oldVal) => {
-			console.log("??????",newVal, oldVal)
+			// console.log("??????",newVal, oldVal)
 			// 当旧值为false，新值为true时延迟0.2秒调用方法
 			if (!oldVal && newVal) {
 				transition.value = false;
@@ -333,7 +333,7 @@
 	const firstgetqueryCgdList = () => {
 		queryQld(plzinfo).then((res : any) => {
 			transition.value = true;
-			// console.log("kankan",plzinfo,res)
+			// console.log("kankan",res)
 			if (((res.message === "缺少参数") || (!res.result?.total)) && cannomessage.value) {
 				nomessageshow.value = true;
 				return
@@ -356,6 +356,8 @@
 					rightarray.value.push(...element.result)
 					rightdonghua.value = true;
 				})
+			}else{
+				rightarray.value = []
 			}
 
 			if (res.result.records.length < plzinfo.pageSize) {

pages/NursingNew/component/pleasetake/component/returnorder.vue

@@ -10,7 +10,7 @@
 					作废
 				</view>
 			</view>
-			<view class="right-button" style="width: 11vw;" @click="tijiaoshow=true">
+			<view class="right-button" style="width: 11vw;" @click="tijiaoshow=true" v-if="rightarray.length">
 				<image src="/static/index/warehouse/procurement/picking/caigou.png" />
 				<view>
 					提交请购单
@@ -183,7 +183,8 @@
 			// 当旧值为false，新值为true时延迟0.2秒调用方法
 			if (!oldVal && newVal) {
 				transition.value = false;
-				// console.log("????",transition.value)
+				plzinfo.pageNo = 1;
+				plzinfo.canpull = true;
 				setTimeout(() => {
 					transition.value = true;
 					lefttarget.value = 0;
@@ -286,7 +287,7 @@
 			plsbuy.value = [];
 			// console.log(res)
 			plsbuy.value.push(...res.result.records)
-			// console.log("入参", plzinfo)
+			console.log("入参", plzinfo)
 			console.log("查看数组", res.result.records)
 			alltotal.value = res.result.total
 
@@ -426,6 +427,7 @@
 				setTimeout(()=>{
 					plsbuy.value[lefttarget.value] = res.result.result
 					tijiaoshow.value = false;
+					
 					rightinfolist();
 				},800)
 			}else{

pages/NursingNew/component/pleasetake/component/takehomep.vue

@@ -1,9 +1,9 @@
 <template>
-	<view  v-if="isShow">
+	<view v-if="isShow">
 		<view class="buttons-father">
 			<view class="boxtwo">
 				<view class="ipt">
-					<input type="text" placeholder="物料名称/物料简拼"  v-model="form.wlParamInfo" @confirm="search"/>
+					<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>
@@ -16,8 +16,7 @@
 						筛选
 					</view>
 				</view>
-				<view class="shx" @click="chongzhi"
+				<view class="shx" @click="chongzhi" v-if="form.categoryId!=''||form.wlParamInfo!='' ">
-				v-if="form.categoryId!=''||form.wlParamInfo!='' " >
 					<image src="/static/index/requestform/chongzhi.png" mode="aspectFill"></image>
 					<view class="shx-font">
 						重置
@@ -30,12 +29,14 @@
 					<view class="shx-font" @click="changePage(1)">
 						请领单
 					</view>
+					<view class="qlthbtn-red" v-if="isQingling"></view>
 				</view>
 				<view class="qlthbtn">
 					<image src="/static/index/requestform/ql1.png" mode="aspectFill"></image>
 					<view class="shx-font" @click="changePage(2)">
 						回退单
 					</view>
+					<view class="qlthbtn-red" v-if="isRead"></view>
 				</view>
 				<view class="qlthbtn" @click="thshow = true">
 					<image src="/static/index/requestform/ql2.png" mode="aspectFill"></image>
@@ -46,21 +47,22 @@
 			</view>
 		</view>
 		<addwl :Material="addMaterial" @delall="delall" @del="adddel" @submit="submit"></addwl>
-		<carditem :InvoicingList="listarr" @scrolltolower="scrolltolower" :status="status"  @comfig="comfig"></carditem>
+		<carditem :InvoicingList="listarr" @scrolltolower="scrolltolower" :status="status" @comfig="comfig"></carditem>
 		<takeing :show="takeshow" :objtake="objtake" @fill="takeshow = false" @right="right"></takeing>
-		<cgdclass @confirm="confirm" :show="ification"  :typenum="0" ref="classication" @fill="ification = false"></cgdclass>
+		<cgdclass @confirm="confirm" :show="ification" :typenum="0" ref="classication" @fill="ification = false">
-		<medetails :show="detaishow"  @fill="detaishow = false" @confirm="confirm"  :objtake="objtake"></medetails>
+		</cgdclass>
+		<medetails :show="detaishow" @fill="detaishow = false" @confirm="confirm" :objtake="objtake"></medetails>
 		<tanchuang @back="tanshow = false" :show="tanshow" font="确定将该物料从本次请领清单中移除吗？" @right="del"></tanchuang>
 		<takerecord :objtake="objtake" :show="recordshow" @fill="recordshow = false"></takerecord>
 		<submits :show="subshow" :list="addMaterial" @fill="subshow = false" @config="tijiao"></submits>
 		<tanchuang @back="thshow = false" :show="thshow" font="是否发起退货流程？" @right="thclk"></tanchuang>
-		<errorshow :show="openerror" :font="errmsg" @close="openerror=false"  />
+		<errorshow :show="openerror" :font="errmsg" @close="openerror=false" />
 	</view>
 </template>
 
 <script setup lang="ts">
-	import { ref, onMounted, onBeforeUnmount, computed, nextTick,  watch, reactive } from 'vue';
+	import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive } from 'vue';
-	import { queryInvoicingList,wlzd,queryGwcInfo,addGwc ,deleteGwcWl,removeAllGwc,submitQld,requireTH} from '../api/api.js'
+	import { queryInvoicingList, wlzd, queryGwcInfo, addGwc, deleteGwcWl, removeAllGwc, submitQld, requireTH, queryQld } from '../api/api.js'
 	import addwl from '../common/addwl.vue';
 	import carditem from '../common/carditem.vue';
 	import takeing from '../common/takeing.vue';
@@ -70,28 +72,33 @@
 	import takerecord from '../common/takerecord.vue';
 	import submits from '../common/submits.vue'
 	const form = reactive({
-		pageNo:1,
+		pageNo: 1,
-		pageSize:10,
+		pageSize: 10,
-		nuId:uni.getStorageSync('nuId'),
+		nuId: uni.getStorageSync('nuId'),
-		elderId:uni.getStorageSync('NUall').elderId,
+		elderId: uni.getStorageSync('NUall').elderId,
-		wlParamInfo:'',
+		wlParamInfo: '',
-		categoryId:'',
+		categoryId: '',
-		typeId:'',
+		typeId: '',
-		medicationId:''
+		medicationId: ''
 	})
 	const props = defineProps({
 		isShow: {
-			type: Boolean 
+			type: Boolean
 		},
 	});
 	const transition = ref(false);
 	watch(
 		() => props.isShow,
 		(newVal, oldVal) => {
-			form.pageNo = 1;
 			listarr.value = [];
-			config()
+			form.categoryId = '';
-			wuliao() 
+			form.typeId = '';
+			form.medicationId = '';
+			form.pageNo = 1;
+			form.wlParamInfo = '',
+				config()
+			wuliao()
+			getreddian()
 			if (!oldVal && newVal) {
 				transition.value = false;
 				setTimeout(() => {
@@ -100,7 +107,7 @@
 			} else {
 				transition.value = false;
 			}
-	
+
 		}
 	)
 	const takeshow = ref(false)
@@ -114,21 +121,56 @@
 	const errmsg = ref('')
 	const classication = ref<InstanceType<typeof ChildComponent>>()
 	const addMaterial = ref([])
-	const wuliao = () =>{
+
-		let obj = {
+	const isRead = ref(false)
-			nuId:form.nuId,
+	const isQingling = ref(false)
-			elderId:form.elderId
+	const getreddian = () => {
+		let plzinfo0 = {
+			pageNo: 1,
+			pageSize: 1,
+			searchContent: "",
+			status: "3",
+			elderId: uni.getStorageSync('NUall').elderId,
+			nuId: uni.getStorageSync('nuId')
 		}
-		queryGwcInfo(obj).then(res=>{
+		queryQld(plzinfo0).then((res : any) => {
-			console.log(res)
+			if (res.result.records[0].izYgRead == `N`) {
+				isRead.value = true;
+			} else {
+				isRead.value = false;
+			}
+		})
+		let plzinfo1 = {
+			pageNo: 1,
+			pageSize: 1,
+			searchContent: "",
+			status: "4",
+			elderId: uni.getStorageSync('NUall').elderId,
+			nuId: uni.getStorageSync('nuId')
+		}
+		queryQld(plzinfo1).then((res : any) => {
+			if (res.result.records[0].izYgRead == `N`) {
+				isQingling.value = true;
+			} else {
+				isQingling.value = false;
+			}
+		})
+	}
+	const wuliao = () => {
+		let obj = {
+			nuId: form.nuId,
+			elderId: form.elderId
+		}
+		queryGwcInfo(obj).then(res => {
+			// console.log(res)
 			addMaterial.value = res.result
 		})
 	}
 	const listarr = ref([])
 	const status = ref('loadmore')
-	const config = ()=>{
+	const config = () => {
-		queryInvoicingList(form).then(res=>{
+		queryInvoicingList(form).then(res => {
-			res.result.records.forEach(item=>{
+			res.result.records.forEach(item => {
 				item.zk = false;
 				item.scrollleft = 0;
 			})
@@ -136,18 +178,19 @@
 			status.value = (res.result.total == listarr.value.length ? 'nomore' : 'loadmore')
 		})
 	}
-	const thclk =() =>{
+	const thclk = () => {
-		requireTH({nuId:form.nuId,elderId:form.elderId}).then(res=>{
+		requireTH({ nuId: form.nuId, elderId: form.elderId }).then(res => {
-			if(res.success){
+			if (res.success) {
 				thshow.value = false;
 				uni.showToast({
-					icon:'none',
+					icon: 'none',
-					title:res.message
+					title: res.message
 				})
-			}else{
+			} else {
 				thshow.value = false;
 				errmsg.value = res.message;
 				openerror.value = true;
+				console.log("?????")
 			}
 		})
 	}
@@ -157,188 +200,190 @@
 		listarr.value = [];
 		config();
 	}
-	const scrolltolower = ( ) => {
+	const scrolltolower = () => {
-		if (status.value=='loading'||status.value=='nomore') { return }
+		if (status.value == 'loading' || status.value == 'nomore') { return }
-			status.value = 'loading';
+		status.value = 'loading';
-			form.pageNo++;
+		form.pageNo++;
-			config()
+		config()
-		}
+	}
-	const submit = ()=>{
+	const submit = () => {
 		wuliao();
 		subshow.value = true;
 	}
-	const adddel = (v)=>{
+	const adddel = (v) => {
-		listarr.value.forEach(item=>{
+		listarr.value.forEach(item => {
-			if(item.wlId == v.wlId){
+			if (item.wlId == v.wlId) {
 				objtake.value = item
 			}
 		})
-		if(!objtake.value.wlId){
+		if (!objtake.value.wlId) {
 			objtake.value = v;
 		}
 		tanshow.value = true;
 		console.log(objtake.value)
 	}
-	const del = ()=>{
+	const del = () => {
 		let obj = {
-			nuId:form.nuId,
+			nuId: form.nuId,
-			elderId:form.elderId,
+			elderId: form.elderId,
-			wlId:objtake.value.wlId
+			wlId: objtake.value.wlId
 		}
 		console.log(obj)
-		deleteGwcWl(obj).then(res=>{
+		deleteGwcWl(obj).then(res => {
-			if(res.success){
+			if (res.success) {
 				wuliao();
 				tanshow.value = false;
 				objtake.value.isAdd = null;
 				objtake.value.qlNum = null;
-			}else{
+			} else {
 				errmsg.value = res.message;
 				openerror.value = true;
 			}
 		})
 	}
-	const delall = () =>{
+	const delall = () => {
-		console.log({nuId:form.nuId, elderId:form.elderId})
+		console.log({ nuId: form.nuId, elderId: form.elderId })
-		removeAllGwc({nuId:form.nuId, elderId:form.elderId}).then(res=>{
+		removeAllGwc({ nuId: form.nuId, elderId: form.elderId }).then(res => {
-			 if(res.success){
+			if (res.success) {
-			 	wuliao();
+				wuliao();
-				listarr.value.forEach(item=>{
+				listarr.value.forEach(item => {
 					item.isAdd = null;
 					item.qlNum = null;
 					item.gwcId = null;
 				})
-			 }else{
+			} else {
-				 errmsg.value = res.message;
-				 openerror.value = true;
-			 }
-		})
-	}
-	const objtake = ref({})
-	const comfig=(v,i,t)=>{
-		// console.log(v,i,t)
-		switch (t){
-			case 0:
-				objtake.value = v;
-				if(v.isAdd==1){
-					tanshow.value = true;
-				}else{
-					takeshow.value = true;
-				}
-			
-				break;
-			
-			case 1:
-			objtake.value = v;
-			recordshow.value = true;
-			
-				break;
-				
-			case 2:
-			objtake.value = v;
-			detaishow.value = true;
-				break;
-			case 3:
-			let obj = {
-				nuId:form.nuId,
-				elderId:form.elderId,
-				wlId:v.wlId,
-				izZd:v.zhiDingId?false:true
-			}
-			wlzd(obj).then(res=>{
-				console.log(obj,res)
-				if(res.success){
-					// objtake.value = v;
-					// objtake.value.zk = false;
-					// objtake.value.scrollleft = 0;
-					// objtake.value = v.zhiDingId?false:true;
-					// listarr.value.splice(i,1);
-					// listarr.value.unshift(v)
-					listarr.value = [];
-					form.pageNo = 1;
-					
-					config()
-				}else{
-					errmsg.value = res.message;
-					openerror.value = true;
-				}
-			})
-			
-				break;
-				
-			default:
-				break;
-		}
-	}
-	const right = (e,v) =>{
-		console.log(v)
-		let obj = {
-			kfId:v.nuId,
-			wlId:v.wlId,
-			qlNum:e,
-			nuId:form.nuId,
-			elderId:form.elderId
-		}
-		addGwc(obj).then(res=>{
-			if(res.success){
-				takeshow.value = false;
-				v.isAdd = 1;
-				v.qlNum = e;
-				wuliao();
-			}else{
 				errmsg.value = res.message;
 				openerror.value = true;
 			}
 		})
 	}
-	const tijiao = ()=>{
+	const objtake = ref({})
-		let obj = {
+	const comfig = (v, i, t) => {
-			nuId:form.nuId,
+		console.log(`看看数据`, v, i, t)
-			elderId:form.elderId
+		switch (t) {
-		}
+			case 0:
-		submitQld(obj).then(res=>{
+				objtake.value = v;
-			if(res.success&&res.result.status=='success'){
+				if (v.isAdd == 1) {
-				uni.showToast({
+					tanshow.value = true;
-					icon:'success',
+				} else {
-					title:'提交成功'
+					takeshow.value = true;
+				}
+
+				break;
+
+			case 1:
+				objtake.value = v;
+				recordshow.value = true;
+
+				break;
+
+			case 2:
+				objtake.value = v;
+				detaishow.value = true;
+				break;
+			case 3:
+				let obj = {
+					nuId: form.nuId,
+					elderId: form.elderId,
+					wlId: v.wlId,
+					izZd: v.zhiDingId ? false : true
+				}
+				wlzd(obj).then(res => {
+					console.log(obj, res)
+					if (res.success) {
+						// objtake.value = v;
+						// objtake.value.zk = false;
+						// objtake.value.scrollleft = 0;
+						// objtake.value = v.zhiDingId?false:true;
+						// listarr.value.splice(i,1);
+						// listarr.value.unshift(v)
+						listarr.value = [];
+						form.pageNo = 1;
+
+						config()
+					} else {
+						errmsg.value = res.message;
+						openerror.value = true;
+					}
 				})
-				setTimeout(()=>{
+
-					subshow.value = false;
+				break;
-					wuliao();
+
-				},800)
+			default:
-			}else{
+				break;
-				errmsg.value = res.result.message;
+		}
+	}
+	const right = (e, v) => {
+		console.log(v)
+		let obj = {
+			kfId: v.nuId,
+			wlId: v.wlId,
+			qlNum: e,
+			nuId: form.nuId,
+			elderId: form.elderId
+		}
+		addGwc(obj).then(res => {
+			if (res.success) {
+				takeshow.value = false;
+				v.isAdd = 1;
+				v.qlNum = e;
+				wuliao();
+			} else {
+				errmsg.value = res.message;
 				openerror.value = true;
 			}
 		})
 	}
-	const confirm = (e)=>{
+	const tijiao = () => {
+		let obj = {
+			nuId: form.nuId,
+			elderId: form.elderId
+		}
+		submitQld(obj).then(res => {
+			if (res.success && res.result.status == 'success') {
+				uni.showToast({
+					icon: 'success',
+					title: '提交成功'
+				})
+				setTimeout(() => {
+					subshow.value = false;
+					wuliao();
+					changePage(1)
+				}, 800)
+			} else {
+				// console.log("!!!!!",res)
+				errmsg.value = res.result.message?res.result.message:res.message
+				openerror.value = true;
+			}
+		})
+	}
+	const confirm = (e) => {
 		form.categoryId = e.categoryId;
 		form.typeId = e.typeId;
 		form.medicationId = e.medicationId;
-		form.pageNo=1;
+		form.pageNo = 1;
 		listarr.value = [];
 		config();
 		ification.value = false;
 		console.log(e)
 	}
-	const chongzhi=()=>{
+	const chongzhi = () => {
 		form.categoryId = '';
 		form.typeId = '';
 		form.medicationId = '';
-		form.pageNo=1;
+		form.pageNo = 1;
-		form.wlParamInfo= '',
+		form.wlParamInfo = '',
-		listarr.value = [];
+			listarr.value = [];
-		classication.value.typescroll(1,-1,{});
+		classication.value.typescroll(1, -1, {});
 		classication.value.qingkong();
 		classication.value.config();
 	}
 	const emit = defineEmits(['changePageNumber']) // 也可以用类型签名（见下面）
-	const changePage = (index:number) => {
+	const changePage = (index : number) => {
-		emit('changePageNumber', index) 
+		emit('changePageNumber', index)
 	}
 </script>
 
 <style lang="less" scoped>
 	@import "../css/take.less";
-</style>
+</style>

pages/NursingNew/component/pleasetake/css/take.less

@@ -38,7 +38,7 @@
 	
 	.buttons-father {
 		width: 100%;
-		height: 90rpx;
+		height: 70rpx;
 		display: flex;
 		justify-content: space-between;
 		.flexend{
@@ -80,7 +80,7 @@
 			border-radius: 1.65vw;
 			border: 1rpx solid #D9DADC;
 			font-weight: 400;
-			font-size: 1.2vw;
+			font-size: 1.4vw;
 			color: #222;
 			display: flex;
 			justify-content: center;
@@ -88,10 +88,21 @@
 			box-shadow: 0.5rpx 3rpx 3rpx #dadee1;
 			margin: 0 0 0 0.5vw;
 			color: #555555;
+			position: relative;
+			.qlthbtn-red{
+				position: absolute;
+				right: -0vw;
+				top: -0vw;
+				width: 1vw;
+				height: 1vw;
+				background-color: rgba(255, 78, 78, 1);
+				border-radius: 50%;
+			}
+			
 			image {
-				width: 1.8vw;
+				width: 1.5vw;
-				height: 1.8vw;
+				height: 1.5vw;
-				margin: 0 0.2vw 0 0;
+				margin: 0.1vw 0.3vw 0 0;
 			}
 		}
 	
@@ -135,6 +146,7 @@
 	
 			.shx-font {
 				margin-top: 3rpx;
+				// font-size: 1.4vw;
 				// margin-left: -5rpx;
 			}
 		}

pages/Warehouse/api/lunpan.js

@@ -1,6 +1,6 @@
 // 引入 request 文件
 import request from '@/request/index.js'
- 
+
 // 查询仓库对应物料
 export const queryInvoicingList = (params) => {
 	return request({
@@ -8,21 +8,22 @@ export const queryInvoicingList = (params) => {
 		method: 'get',
 		data: params,
 	})
-} 
+}
 
 // 获取物料分类树（请购列表使用）
 export const getMaterialTreeData = (params) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getMaterialTreeData?nuId=`+params.nuId,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getMaterialTreeData?nuId=` + params.nuId,
 		method: 'get',
 		data: params,
 	})
-} 
+}
 
 // （业务）获取物料分类树（购物车使用）
 export const getGwcMaterialTreeData = (params) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getGwcMaterialTreeData?nuId=`+params.nuId,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getGwcMaterialTreeData?nuId=` + params
+			.nuId,
 		method: 'get',
 		data: params
 	})
@@ -30,7 +31,8 @@ export const getGwcMaterialTreeData = (params) => {
 // （业务）获取物料分类树（采购单使用）
 export const getCgdMaterialTreeData = (params) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getCgdMaterialTreeData?nuId=`+params.nuId,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getCgdMaterialTreeData?nuId=` + params
+			.nuId,
 		method: 'get',
 		data: params,
 	})
@@ -42,7 +44,7 @@ export const queryNuInfoByNuId = (params) => {
 		method: 'get',
 		data: params,
 	})
-} 
+}
 // 修改库房启用停用
 
 export const updateKfstatus = (params) => {
@@ -51,7 +53,7 @@ export const updateKfstatus = (params) => {
 		method: 'post',
 		data: params,
 	})
-} 
+}
 //获得采购单信息
 export const queryCgdList = (params) => {
 	return request({
@@ -59,7 +61,7 @@ export const queryCgdList = (params) => {
 		method: 'get',
 		data: params,
 	})
-} 
+}
 
 // 查询采购项目
 export const queryCgdInfoList = (params) => {
@@ -68,7 +70,7 @@ export const queryCgdInfoList = (params) => {
 		method: 'get',
 		data: params,
 	})
-} 
+}
 // 查询采购项目的详情
 export const queryWlInfoByWlId = (params) => {
 	return request({
@@ -76,21 +78,21 @@ export const queryWlInfoByWlId = (params) => {
 		method: 'get',
 		data: params,
 	})
-} 
+}
 export const addShoppingCartList = (params) => {
 	return request({
 		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/addShoppingCartList`,
 		method: 'post',
 		data: params,
 	})
-} 
+}
 export const queryShoppingCartList = (params) => {
 	return request({
 		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/queryShoppingCartList`,
 		method: 'get',
 		data: params,
 	})
-} 
+}
 export const generatedPurchaseOrder = (params) => {
 	return request({
 		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/generatedPurchaseOrder`,
@@ -107,14 +109,14 @@ export const generatedPurchaseViewOrder = (params) => {
 }
 export const deleteQgInfoById = (params) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/deleteQgInfoById?id=`+params,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/deleteQgInfoById?id=` + params,
-		method: 'DELETE' 
+		method: 'DELETE'
 	})
 }
 export const emptiedQgInfo = (params) => {
 	return request({
 		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/emptiedQgInfo`,
-		method: 'DELETE' 
+		method: 'DELETE'
 	})
 }
 
@@ -125,7 +127,7 @@ export const upload = (params) => {
 		method: 'post',
 		data: params,
 	})
-} 
+}
 // 作废
 export const voidedCgdMain = (params) => {
 	return request({
@@ -133,7 +135,7 @@ export const voidedCgdMain = (params) => {
 		method: 'post',
 		data: params,
 	})
-} 
+}
 
 //修改库房物料是否启用
 export const updateWarehouserEnabled = (params) => {
@@ -142,14 +144,14 @@ export const updateWarehouserEnabled = (params) => {
 		method: 'post',
 		data: params,
 	})
-} 
+}
 //获得采购人
 export const getCgrLis = () => {
 	return request({
 		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getCgrList`,
 		method: 'get'
 	})
-} 
+}
 
 //获得采购人
 export const getGysList = () => {
@@ -157,7 +159,7 @@ export const getGysList = () => {
 		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getGysList`,
 		method: 'get'
 	})
-} 
+}
 
 //改价
 export const editPrice = (params) => {
@@ -166,7 +168,7 @@ export const editPrice = (params) => {
 		method: 'post',
 		data: params,
 	})
-} 
+}
 
 //(业务)拣货、销账操作
 export const pickingInfo = (params) => {
@@ -175,7 +177,7 @@ export const pickingInfo = (params) => {
 		method: 'post',
 		data: params
 	})
-} 
+}
 
 //（业务）查询随行单照片集合
 export const querySxdList = (params) => {
@@ -184,7 +186,7 @@ export const querySxdList = (params) => {
 		method: 'get',
 		data: params
 	})
-} 
+}
 //（业务）查询随行单照片集合
 export const addSxd = (params) => {
 	return request({
@@ -200,7 +202,7 @@ export const queryJhzpList = (params) => {
 		method: 'get',
 		data: params
 	})
-} 
+}
 // （业务）采购单拣货记录
 export const queryPickingRecordList = (params) => {
 	return request({
@@ -208,11 +210,11 @@ export const queryPickingRecordList = (params) => {
 		method: 'get',
 		data: params
 	})
-} 
+}
 export const editIzNew = (params) => {
- 	return request({
+	return request({
- 		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/editIzNew`,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/editIzNew`,
- 		method: 'post',
+		method: 'post',
- 		data: params,
+		data: params,
- 	})
+	})
- }
+}

pages/Warehouse/picking.vue

@@ -1051,7 +1051,7 @@
 	import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
 	import calendar from '@/component/public/calendar.vue'
 	import nomessageimge from '@/pages/procurement/components/nomessage.vue';
-	import tanchuang from '@/pages/procurement/components/tanchuang.vue';
+	
 
 	const open = ref(0);
 	const typechange = ref(0);
@@ -1353,7 +1353,7 @@
 	const nomessageshow = ref(false);
 	const firstgetqueryCgdList = () => {
 		queryCgdList(plzinfo).then((res : any) => {
-
+			console.log("数据呢",res)
 			plsbuy.value.push(...res.result.records)
 			alltotal.value = res.result.total
 			if (!res.result.total) {
@@ -1406,7 +1406,7 @@
 		// console.log("!!!!",form)
 		queryCgdInfoList(form).then(res => {
 			InvoicingList.value = []
-			// console.log("数据呢", res.result.records)
+			console.log("数据呢", form)
 			InvoicingList.value.push(...res.result.records);
 			if (form.pageNo) {
 				clickmiddle(0);
@@ -1454,7 +1454,7 @@
 	const mobanform = {
 		nuId: '',
 		pageNo: 1,
-		pageSize: 9,
+		pageSize: -1,
 		categoryId: '',
 		typeId: '',
 		medicationId: '',
@@ -1512,6 +1512,7 @@
 		// if (!plzinfo.cgdParamInfo) return
 		plzinfo.pageNo = 1;
 		plsbuy.value = [];
+		plzinfo.canpull = true
 		queryCgdList(plzinfo).then((res : any) => {
 			plsbuy.value.push(...res.result.records)
 			alltotal.value = res.result.total

pages/procurement/api/lunpan.js

@@ -355,3 +355,27 @@ export const outbound = (params) => {
 		data: params,
 	})
 }
+// 盘点单所有的接口
+// 获得列表
+export const queryPddList = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/pdd/queryPddList`,
+		method: 'get',
+		data: params,
+	})
+}
+//获得采购人
+export const queryPddStartByList = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/pdd/queryPddStartByList`,
+		method: 'get',
+		data: params,
+	})
+} 
+export const addPddMain = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/pdd/addPddMain`,
+		method: 'post',
+		data: params,
+	})
+}

pages/procurement/outbound.vue

@@ -183,7 +183,7 @@
 						<view class="right-one" v-for="(item,index) in rightarray" :key="index">
 							<view class="right-one-left">
 								<image class="left-image"
-									:src="item.materialInfo.materialImg?serverUrl+item.materialInfo.materialImg:'/static/index/procurement/k.png'"
+									:src="item.materialInfo?.materialImg?serverUrl+item.materialInfo?.materialImg:'/static/index/procurement/k.png'"
 									mode="aspectFill"></image>
 								<view class="left-tages" style="margin-top: -15rpx;">
 									{{ item.materialInfo.categoryName}}
@@ -371,7 +371,6 @@
 			plsbuy.value = []
 			plsbuy.value.push(...res.result.records)
 			alltotal.value = res.result.total
-
 			if (res.result.records.length) {
 				rightdonghua.value = false;
 
@@ -380,6 +379,8 @@
 					rightarray.value.push(...element.result)
 					rightdonghua.value = true;
 				})
+			}else{
+				rightarray.value = []
 			}
 
 			if (res.result.records.length < plzinfo.pageSize) {

pages/procurement/purchaseorder.vue

@@ -537,7 +537,7 @@
 	const mobanform = {
 		nuId: uni.getStorageSync('nuId'),
 		pageNo: 1,
-		pageSize: 9,
+		pageSize: -1,
 		categoryId: '',
 		typeId: '',
 		medicationId: '',