From 6b1c27e71b86ef3dd909160aeb894f644b2a8cd6 Mon Sep 17 00:00:00 2001
From: Teng <461587751@qq.com>
Date: Tue, 16 Dec 2025 10:29:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NursingNew/component/pleasetake/common/takeing.vue |  2 +-
 .../component/pleasetake/common/takerecord.vue         |  3 ++-
 .../component/pleasetake/component/returnorder.vue     |  1 +
 .../component/pleasetake/component/takehomep.vue       |  1 +
 pages/procurement/common/takeing.vue                   |  2 +-
 pages/procurement/inventory.vue                        |  6 +++++-
 pages/procurement/retstock.vue                         | 10 ++++++----
 7 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/pages/NursingNew/component/pleasetake/common/takeing.vue b/pages/NursingNew/component/pleasetake/common/takeing.vue
index ca26f6c..de1332e 100644
--- a/pages/NursingNew/component/pleasetake/common/takeing.vue
+++ b/pages/NursingNew/component/pleasetake/common/takeing.vue
@@ -28,7 +28,7 @@
 							<view>
 								<view>
 									规格型号
-									<text style="white-space: nowrap;width:20vw ;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{objtake?.specificationModel}}</text>
+									<text style="width:20vw ;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{objtake?.specificationModel}}</text>
 								</view>
 							</view>
 						</view>
diff --git a/pages/NursingNew/component/pleasetake/common/takerecord.vue b/pages/NursingNew/component/pleasetake/common/takerecord.vue
index 39c633b..3af3b06 100644
--- a/pages/NursingNew/component/pleasetake/common/takerecord.vue
+++ b/pages/NursingNew/component/pleasetake/common/takerecord.vue
@@ -88,7 +88,8 @@
 	const times = ref('')
 	const status = ref('loadmore')
 	onMounted(()=>{
-		times.value = uni.getStorageSync('NUall').elderInfo.checkinTime
+		// console.log("啥啊",uni.getStorageSync('NUall'))
+		times.value = uni.getStorageSync('NUall').elderInfo?.checkinTime
 	})
 	const wuobj = ref({})
 	const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
diff --git a/pages/NursingNew/component/pleasetake/component/returnorder.vue b/pages/NursingNew/component/pleasetake/component/returnorder.vue
index 950542e..7a2df02 100644
--- a/pages/NursingNew/component/pleasetake/component/returnorder.vue
+++ b/pages/NursingNew/component/pleasetake/component/returnorder.vue
@@ -322,6 +322,7 @@
 	const rightinfolist = ()=>{
 		queryQldWlInfo({ qldNo: plsbuy.value[lefttarget.value].qldNo }).then((element : any) => {
 			rightarray.value = [];
+			console.log("kankan",element.result)
 			rightarray.value.push(...element.result)
 			rightdonghua.value = true;
 		})
diff --git a/pages/NursingNew/component/pleasetake/component/takehomep.vue b/pages/NursingNew/component/pleasetake/component/takehomep.vue
index af4c977..2369640 100644
--- a/pages/NursingNew/component/pleasetake/component/takehomep.vue
+++ b/pages/NursingNew/component/pleasetake/component/takehomep.vue
@@ -176,6 +176,7 @@
 				item.zk = false;
 				item.scrollleft = 0;
 			})
+			console.log("?????",form,res.result.records)
 			listarr.value.push(...res.result.records)
 			status.value = (res.result.total == listarr.value.length ? 'nomore' : 'loadmore')
 		})
diff --git a/pages/procurement/common/takeing.vue b/pages/procurement/common/takeing.vue
index 8d1d031..0fe0732 100644
--- a/pages/procurement/common/takeing.vue
+++ b/pages/procurement/common/takeing.vue
@@ -26,7 +26,7 @@
 							<view>
 								<view>
 									规格型号
-									<text style="white-space: nowrap;">{{objtake.materialInfo?.specificationModel}}</text>
+									<text style="width:20vw ;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{objtake.materialInfo?.specificationModel}}</text>
 								</view>
 							</view>
 						</view>
diff --git a/pages/procurement/inventory.vue b/pages/procurement/inventory.vue
index f4f96c1..24516ef 100644
--- a/pages/procurement/inventory.vue
+++ b/pages/procurement/inventory.vue
@@ -271,8 +271,12 @@
 		
 		})
 	}
+	onShow(()=>{
+		chongzhi()
+		console.log("刷新了")
+	})
 	onMounted(() => {
-		firstgetqueryCgdList();
+		// firstgetqueryCgdList();
 		getSelectList();
 	})
 	type datetype = {
diff --git a/pages/procurement/retstock.vue b/pages/procurement/retstock.vue
index 1a6b142..34a5138 100644
--- a/pages/procurement/retstock.vue
+++ b/pages/procurement/retstock.vue
@@ -125,6 +125,7 @@
 		<view v-show="opendata" class="mengban" :style="opendata ?{background:`transparent`}:{}"
 			@click="opendata=false;">
 		</view>
+		<errorshow :show="openmessage" :font="errormessage" @close="openmessage=false"  />
 	</view>
 </template>
 
@@ -176,8 +177,11 @@
 			subshow.value = true;
 		})
 	}
+	const errormessage = ref("");
+	const openmessage = ref(false)
 	const tijiao = () => {
 		submitThd({ id: tharrlist.value[cardindex.value].id }).then(res => {
+			console.log("入库退货单",res)
 			if (res.success) {
 				subshow.value = false;
 				th(tharrlist.value[cardindex.value], cardindex.value)
@@ -185,10 +189,8 @@
 					cardcon(tharrlist.value[cardindex.value], cardindex.value);
 				}, 200)
 			} else {
-				uni.showToast({
-					icon: 'none',
-					title: res.message
-				})
+				errormessage.value = res.message;
+				openmessage.value = true
 			}
 		})
 	}

From 2428c26dd8ce064b67aee259890f029c072a68a5 Mon Sep 17 00:00:00 2001
From: Teng <461587751@qq.com>
Date: Tue, 16 Dec 2025 11:05:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/procurement/common/thitem.vue      | 238 +++++++++++++++--------
 pages/procurement/components/carlist.vue |   8 +-
 2 files changed, 163 insertions(+), 83 deletions(-)

diff --git a/pages/procurement/common/thitem.vue b/pages/procurement/common/thitem.vue
index bb1fcb1..482837b 100644
--- a/pages/procurement/common/thitem.vue
+++ b/pages/procurement/common/thitem.vue
@@ -1,16 +1,18 @@
 <template>
 	<view>
-		<scroll-view scroll-y="true" class="itembox" scroll-with-animation @scrolltolower="scrolltolower()" enable-back-to-top>
+		<scroll-view scroll-y="true" class="itembox" 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" >
+						:scroll-left="v.scrollleft" @scroll="scroll">
 						<view class="zding" v-if="v.zhiDingId">
 							<image src="/static/index/procurement/zd.png" mode="aspectFill"></image>
 						</view>
-						<view class="speitem guodu" >
-							<image :src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
+						<view class="speitem guodu">
+							<image
+								:src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
 								mode="aspectFill">
 							</image>
 							<view class="cardp">
@@ -18,12 +20,12 @@
 								<view v-if="v.materialInfo?.typeName">{{v.materialInfo?.typeName}}</view>
 							</view>
 						</view>
-						<view class="msitem guodu" >
+						<view class="msitem guodu">
 							<view>
 								<view>{{v.materialInfo?.materialName}}</view>
 							</view>
 							<view>
-								<text  style="white-space: nowrap;"> 规格型号: </text>
+								<text style="white-space: nowrap;"> 规格型号: </text>
 								<view>{{v.materialInfo?.specificationModel}}</view>
 							</view>
 							<view>
@@ -37,11 +39,16 @@
 								</view>
 							</view>
 						</view>
-						<view class="add" >
+						<view class="add">
 							<view v-if="v.isAdd==1">已添加</view>
+
 							<!-- <image v-if="v.isAdd!=1" :src="'/static/index/procurement/+.png'" mode="aspectFill"></image>
 							<image v-if="v.isAdd==1" :src="'/static/index/procurement/-.png'" mode="aspectFill"></image> -->
 						</view>
+						<view class="nextadd" @click.stop="clkzk(v,index)">
+							<image class="guodu" :style="v.zk?'transform: rotate(180deg);':''"
+								:src="'/static/index/procurement/l.png'" mode="aspectFill"></image>
+						</view>
 						<view class="zkadd guodu" v-if="status<2">
 							<view @click.stop="comfig(v,index,1)" @touchend.stop>
 								添加物料
@@ -49,62 +56,82 @@
 						</view>
 					</scroll-view>
 				</view>
-				<defaultr cont="暂无数据" v-if="InvoicingList.length==0 " style="position: absolute;width: 10vw;height: 10vw;"></defaultr>
+				<defaultr cont="暂无数据" v-if="InvoicingList.length==0 "
+					style="position: absolute;width: 10vw;height: 10vw;"></defaultr>
 			</view>
 		</scroll-view>
-		<taking :show="tuihuoshow" :objtake="tuihuoobj"  @fill="tuihuoshow = false" @right="right"></taking>
-		<errorshow :show="openerror" :font="errmsg" @close="openerror=false"  />
+		<taking :show="tuihuoshow" :objtake="tuihuoobj" @fill="tuihuoshow = false" @right="right"></taking>
+		<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 taking from './takeing.vue'
 	import defaultr from '../components/default.vue'
-	
+
 	const props = defineProps({
 		InvoicingList: {
 			type: Array,
-			required: true 
+			required: true
 		},
 		status: {
 			type: String
-		} 
+		}
 	})
 	const openerror = ref(false)
 	const errmsg = ref('')
 	const carnum = ref(0)
 	const caigouobj = ref({})
 	const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
-	const emit = defineEmits([ 'scrolltolower' ,'comfig'])
-	
+	const emit = defineEmits(['scrolltolower', 'comfig'])
+
 	const pageX = ref(0);
 	const pageY = ref(0);
 	const ones = ref(true)
-	const touchstart = (event : any, v : any,i:number) => {
+	const clkzk = (v : any, i : number) => {
+		if(v.zk==true){
+			v.zk = false;
+			v.scrollleft =0.01
+			setTimeout(()=>{
+				v.scrollleft = 0
+			},20)
+			
+		}else{
+			v.zk = true;
+			v.scrollleft =149.99
+			setTimeout(()=>{
+				v.scrollleft = 150;
+			},20)
+			
+		}
+		solleft(v,i)
+		 
+	}
+	const touchstart = (event : any, v : any, i : number) => {
 		caigouobj.value = v;
 		pageX.value = event.changedTouches[0].pageX;
 		pageY.value = event.changedTouches[0].pageY;
-		if(ones.value){
+		if (ones.value) {
 			ones.value = false;
 			solleft(v, i)
 		}
 	}
 	const tuihuoshow = ref(false)
 	const tuihuoobj = ref({})
-	const comfig=(v,i,t)=>{
-		if(props.status == '0'){
+	const comfig = (v, i, t) => {
+		if (props.status == '0') {
 			errmsg.value = '未开始服务不能添加退货物料！';
 			openerror.value = true;
 			return
 		}
 		tuihuoobj.value = v;
 		tuihuoshow.value = true;
-		
+
 		// emit('comfig',v,i,t)
 	}
-	const right = (e,v) =>{
-		emit('comfig',e,v);
+	const right = (e, v) => {
+		emit('comfig', e, v);
 		tuihuoshow.value = false;
 	}
 	const handleTouchEnd = (event : any, v : any, i : number) => {
@@ -113,29 +140,29 @@
 		let absx = Math.abs(x - pageX.value)
 		let absy = Math.abs(y - pageY.value);
 		ones.value = true;
-		if (absy > 30 && absx+10<absy) {
+		if (absy > 30 && absx + 10 < absy) {
 			caigouobj.value.scrollleft = 0.01
-			setTimeout(()=>{
+			setTimeout(() => {
 				caigouobj.value.scrollleft = 0
-			},20)
+			}, 20)
 			return
 		}
 		if (absx < 10 && absy < 10) {
-			 if(caigouobj.value.zk==false){
-				 setTimeout(()=>{
+			if (caigouobj.value.zk == false) {
+				setTimeout(() => {
 					caigouobj.value.scrollleft = 0
-				 },20)
-			 }
+				}, 20)
+			}
 			return
 		}
-		if(scrollLeft.value <=40){
+		if (scrollLeft.value <= 40) {
 			caigouobj.value.scrollleft = scrollLeft.value;
 			caigouobj.value.zk = false;
-			nextTick(()=>{
+			nextTick(() => {
 				caigouobj.value.scrollleft = 0;
 				scrollLeft.value = 0;
 			})
-		}else{
+		} else {
 			scrollLeft.value = 150
 			caigouobj.value.scrollleft = scrollLeft.value;
 			caigouobj.value.zk = true;
@@ -143,20 +170,20 @@
 		caigouobj.value.zk = x > pageX.value ? false : true;
 		caigouobj.value.scrollleft = caigouobj.value.zk ? 150 : 0;
 	}
-	const solleft = (v : any, i : number) => { 
+	const solleft = (v : any, i : number) => {
 		console.log(v)
 		props.InvoicingList.forEach((item, k) => {
-			if (k != i&&item.zk==true) {
+			if (k != i && item.zk == true) {
 				item.zk = false;
-				item.scrollleft = 0; 
+				item.scrollleft = 0;
 			}
 		})
 	}
 	const scrolltolower = () => {
-			emit('scrolltolower')
+		emit('scrolltolower')
 	}
 	const scrollLeft = ref(0)
-	const scroll = (e)=>{
+	const scroll = (e) => {
 		scrollLeft.value = e.detail.scrollLeft
 		// console.log(e.detail.scrollLeft)
 	}
@@ -171,10 +198,12 @@
 		position: absolute;
 		top: 0;
 		right: -9vw;
-		view:active{
-			background:rgba(85, 166, 249, 1) !important;
+
+		view:active {
+			background: rgba(85, 166, 249, 1) !important;
 			color: #FFFFFF !important;
 		}
+
 		>view {
 			width: 3.6vw;
 			height: 100%;
@@ -185,21 +214,22 @@
 			align-items: center;
 			writing-mode: vertical-rl;
 			text-orientation: upright;
-			letter-spacing:2px;
-			background:rgba(85, 166, 249, 1) !important;
+			letter-spacing: 2px;
+			background: rgba(85, 166, 249, 1) !important;
 			color: #FFFFFF !important;
 		}
 	}
-	
+
 	.add {
-		width:5vw;
+		width: 5vw;
 		height: 13vw;
 		display: inline-flex;
 		justify-content: space-between;
 		align-items: center;
 		position: absolute;
-		top:0;
-		right:0.8vw;
+		top: 0;
+		right: 0.8vw;
+
 		>view {
 			width: 4.5vw;
 			height: 1.8vw;
@@ -216,7 +246,7 @@
 			top: 0.8vw;
 			right: 0vw;
 		}
-	
+
 		image {
 			width: 3vw;
 			height: 3vw;
@@ -225,36 +255,42 @@
 			right: 0vw;
 		}
 	}
+
 	.msitem {
 		width: 11vw;
 		height: 100%;
 		position: absolute;
-		top:0;
+		top: 0;
 		left: 10vw;
+
 		>view {
 			margin-top: 0vw;
-	
+
 			&:nth-child(3) {
 				width: 100%;
 				height: 3.4vw;
 				display: flex;
 				justify-content: space-between;
+
 				>view {
 					width: 50%;
 					height: 100%;
 					display: flex;
 					flex-direction: column;
 					position: relative;
-					margin-top:1vw;
+					margin-top: 1vw;
 					white-space: nowrap;
-					&:nth-child(1){
+
+					&:nth-child(1) {
 						padding-right: 1.7vw;
 						align-items: flex-start;
 					}
-					&:nth-child(2){
+
+					&:nth-child(2) {
 						padding-left: 1.7vw;
 						align-items: flex-start;
 					}
+
 					&:nth-child(1)::after {
 						content: '';
 						position: absolute;
@@ -264,14 +300,14 @@
 						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;
@@ -281,20 +317,21 @@
 					}
 				}
 			}
-	
-			&:nth-child(2)  {
+
+			&:nth-child(2) {
 				display: flex;
 				justify-content: space-between;
 				flex-direction: column;
 				margin-top: 0.1vw;
-				view{
+
+				view {
 					font-size: 1.4vw;
 					color: #888888;
 					text-overflow: ellipsis;
 					overflow: hidden;
 					white-space: nowrap;
 				}
-	
+
 				text {
 					font-weight: 400;
 					font-size: 1.1vw;
@@ -302,9 +339,9 @@
 					margin-top: 0.25vw;
 				}
 			}
-	
+
 			&:nth-child(1) {
-				view{
+				view {
 					display: inline-block;
 					width: 10vw;
 					font-weight: bold;
@@ -319,34 +356,39 @@
 			}
 		}
 	}
-	.zding{
+
+	.zding {
 		width: 4.6vw;
 		height: 4.6vw;
 		position: absolute;
 		left: 0;
 		top: 0;
 		z-index: 11;
-		image{
+
+		image {
 			width: 100%;
 			height: 100%;
 		}
 	}
+
 	.speitem {
 		width: 10vw;
 		height: 100%;
 		display: inline-flex;
 		flex-direction: column;
 		position: absolute;
-		top:0;
+		top: 0;
 		left: 0;
+
 		.cardp {
-			width:8vw;
+			width: 8vw;
 			height: 4.2vw;
 			display: flex;
 			margin: 0 auto;
 			align-items: center;
 			justify-content: center;
 			flex-direction: column;
+
 			view {
 				min-width: 5.5vw;
 				height: 1.8vw;
@@ -362,35 +404,38 @@
 				padding: 0 0.25vw;
 			}
 		}
-	
+
 		>image {
 			width: 7.5vw;
 			height: 7.5vw;
 			margin: 0vw auto 0.25vw;
 		}
 	}
-	
-	
-	
-	.itembox{
+
+
+
+	.itembox {
 		width: 100%;
 		height: calc(100vh - 22vw);
-		padding:1vw 0.5vw 1vw;
-	
+		padding: 1vw 0.5vw 1vw;
+
 		background: #fff;
-		.box{
+
+		.box {
 			width: 100%;
 			display: flex;
 			flex-wrap: wrap;
 			// display: grid;
 			// grid-template-columns: 1fr 1fr;
 		}
-		.fler{
+
+		.fler {
 			width: 31.5vw;
 			height: 13vw;
 			margin-bottom: 0.9vw;
 			margin-left: 0.5vw;
-			.carditem{
+
+			.carditem {
 				width: 31vw;
 				height: 13vw;
 				background: rgba(245, 246, 248, 1);
@@ -399,5 +444,46 @@
 				overflow: hidden;
 			}
 		}
-	}       
-</style>
+	}
+
+	.nextadd {
+		position: absolute;
+		right: 0;
+		top: -2vw;
+		width: 6vw;
+		height: 17vw;
+		display: inline-flex;
+		justify-content: center;
+		align-items: center;
+
+
+		>view {
+			width: 4.5vw;
+			height: 1.9vw;
+			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: 0vw;
+			right: 0vw;
+		}
+
+		image {
+			width: 3vw;
+			height: 3vw;
+
+		}
+	}
+
+	.guodu {
+		transition: .4s;
+		-webkit-transform-style: preserve-3d;
+		-webkit-overflow-scrolling: touch;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/procurement/components/carlist.vue b/pages/procurement/components/carlist.vue
index 0a51975..0531bb2 100644
--- a/pages/procurement/components/carlist.vue
+++ b/pages/procurement/components/carlist.vue
@@ -108,13 +108,7 @@
 	}
 	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]}
+
 		if(v.zk==true){
 			v.zk = false;
 			v.scrollleft = 0