修改了大量的样式

manifest.json

@@ -2,8 +2,8 @@
     "name" : "护理单元",
     "appid" : "__UNI__FB2D473",
     "description" : "护理单元",
-    "versionName" : "1.0.033",
+    "versionName" : "1.0.034",
-    "versionCode" : 10033,
+    "versionCode" : 10034,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/NursingNew/component/index.vue

@@ -28,8 +28,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="title-card" 
+			<view class="title-card" @click="uni.navigateTo({
-			@click="uni.navigateTo({
 				url:'/pages/NursingNew/component/doctorask/medical/medical'
 			})">
 				<view class="card-top">
@@ -59,8 +58,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="title-card"  
+			<view class="title-card" @click="uni.navigateTo({
-			@click="uni.navigateTo({
 				url:'/pages/NursingNew/component/doctorask/medical/medical'
 			})">
 				<view class="card-top">
@@ -114,18 +112,25 @@
 						即时服务指令
 					</view>
 					<view class="spiw">
-						<view v-for="(v,i) in ['护理','医疗','后勤']" :key="i" :class="i==fwzlindex?'act':''" @click="shtab(i)">{{v}}</view> 
+						<view v-for="(v,i) in ['护理','医疗','后勤']" :key="i" :class="i==fwzlindex?'act':''"
+							@click="shtab(i)">{{v}}</view>
 					</view>
 					<scroll-view class="scrol" scroll-y="true">
-						<view v-for="(v,i) in fwzlarr" :key='i' :class="i==fwzldex?'act':''" class="cdk" @click="zldex(i)">
+						<view v-for="(v,i) in fwzlarr" :key='i' :class="i==fwzldex?'act':''" class="cdk"
-							<image :src="serverUrl+(fwzldex!=i?v.previewFile:v.previewFileSmall)" mode="aspectFill"></image>
+							@click="zldex(i)">
-							<text style="white-space: nowrap;width: 100%;text-overflow: ellipsis;overflow: hidden;">{{v.directiveName?.substring(0,4)}}</text>
+							<image :src="serverUrl+(fwzldex!=i?v.previewFile:v.previewFileSmall)" mode="aspectFill">
+							</image>
+							<text
+								style="white-space: nowrap;width: 100%;text-overflow: ellipsis;overflow: hidden;">{{v.directiveName?.substring(0,4)}}</text>
 							<view>{{v.directiveName?.substring(4,12)}}</view>
 
 						</view>
-						<view style="width: 13vw;height: 13vw;margin: 7vw 0 0 23.5vw;display: block;background: none;" v-if="fwzlarr?.length==0||!fwzlarr">
+						<view style="width: 13vw;height: 13vw;margin: 7vw 0 0 23.5vw;display: block;background: none;"
-							<image src="/static/index/card/zw.png" mode="aspectFill" style="width:13vw;height: 13vw"></image>
+							v-if="fwzlarr?.length==0||!fwzlarr">
-							<view style="width: 100%;text-align: center; font-weight: 400; font-size: 1.2vw;color: #555555;margin-top: -3vw;text-align: center;white-space: nowrap;">
+							<image src="/static/index/card/zw.png" mode="aspectFill" style="width:13vw;height: 13vw">
+							</image>
+							<view
+								style="width: 100%;text-align: center; font-weight: 400; font-size: 1.2vw;color: #555555;margin-top: -3vw;text-align: center;white-space: nowrap;">
 								暂无服务指令
 							</view>
 						</view>
@@ -199,7 +204,7 @@
 				</view>
 			</scroll-view>
 		</view>
-		<view class="mengban" v-if="zzbqshow" @click="zzbqshow = false;tagtarget=-1"></view>
+		<view class="mengban" style="background-color: transparent;" v-if="zzbqshow" @click="zzbqshow = false;tagtarget=-1"></view>
 		<view class="right-bottom">
 			<view class="bottom-title">
 				<image class="bottom-carmera" src="/static/index/newindex/leftmenu/carmera.png" @click="gotolook" />
@@ -229,7 +234,7 @@
 								<view style="margin-left: 1vw;"></view>
 								情绪标签
 							</view>
-							<view class="tg">
+							<view class="tg" style="margin-left: 0.3vw;">
 								<view v-for="(v,i) in bodyTagList" :key='i' @click="clicktag(v,i+2)">
 									<image :src="uni.getStorageSync('imagebase') + v.pic" mode="aspectFill"></image>
 									<text>{{v.tagName}}</text>
@@ -401,7 +406,7 @@
 			fwzlarr.value = zlarr.value?.hqList
 		}
 		fwzldex.value = -1
-		console.log("数据呢啊",fwzlarr.value)
+		// console.log("数据呢啊", fwzlarr.value)
 		// console.log(zlarr.value,serverUrl.value)
 	}
 	const zldex = (e) => {
@@ -572,7 +577,7 @@
 	const getmenu = () => {
 		queryPadPageList().then((res => {
 			leftMenuArray.value = res.result.records;
-			console.log("数据呢",res.result.records)
+			// console.log("数据呢", res.result.records)
 			filteredMenu(0).forEach((element : any, index : number) => {
 				if (element.nuId === uni.getStorageSync('NUall').nuId) {
 					menutarget.value = index;
@@ -624,7 +629,7 @@
 			bodyTagList.value = [];
 			zzbqshow.value = true;
 			getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('elderId')).then((res : any) => {
-				console.log("东西呢",res)
+				// console.log("东西呢", res)
 				res.result.emotionTagList.forEach(item => {
 					if (item.izSelected == 'Y') {
 						emotionTagList.value.push(item)
@@ -688,16 +693,16 @@
 	function getleft(index) {
 		switch (index) {
 			case 0:
-				return 2.2;
+				return 2.4;
 
 			case 1:
-				return 6;
+				return 6.7;
 
 			case 2:
-				return 9.8;
+				return 11.5;
 
 			case 3:
-				return 13.4;
+				return 15.5;
 
 		}
 	}
@@ -713,8 +718,8 @@
 		tagtarget.value = index;
 		detail.value = getStatusDesc(item.tagName)
 		leftnumber.value = getleft(index);
-		bodyTagList.value = [];
+		// bodyTagList.value = [];
-		emotionTagList.value = []; 
+		// emotionTagList.value = [];
 	}
 </script>
 
@@ -733,8 +738,9 @@
 			height: 100%;
 		}
 	}
+
 	.zzbqsmall {
-			width: 18vw;
+		width: 20vw;
 		// height: 6vw;
 		background: #FFFFFF;
 		box-shadow: 0rpx 0rpx 0.5vw 0rpx rgba(136, 148, 167, 0.19);
@@ -749,12 +755,14 @@
 		color: black;
 		font-size: 1vw;
 	}
+
 	.index-content-right {
-		width: 22vw;
+		width: 23vw;
 		height: 100%;
 		transition: opacity 1s ease;
 		position: relative;
 		left: -0.5vw;
+
 		.right-time {
 			margin-top: 1.2vw;
 			width: 100%;
@@ -766,15 +774,18 @@
 			justify-content: center;
 			padding-left: 30rpx;
 			padding: 0 2.2vw;
+
 			.time-top {
 				display: flex;
 				align-items: center;
 				font-size: 1.1vw;
+
 				.time-big {
 					font-size: 3.5vw;
 					font-weight: 600;
 					margin-right: 10rpx;
 				}
+
 				.time-week {
 					font-weight: 600;
 				}
@@ -803,6 +814,7 @@
 				width: 100%;
 				height: 26vh;
 				margin-top: 1vw;
+
 				.list-view {
 					width: 86%;
 					margin-left: 7%;
@@ -819,6 +831,7 @@
 						margin-left: 0.5vw;
 						margin-right: 0.5vw;
 						position: relative;
+
 						view {
 							width: 0.8vw;
 							height: 0.8vw;
@@ -828,6 +841,7 @@
 							top: 0.3vw;
 							right: 0.5vw;
 						}
+
 						image {
 							width: 4vw;
 							height: 4vw;
@@ -863,6 +877,7 @@
 
 
 	}
+
 	.right-bottom {
 		margin-top: 2vh;
 		width: 100%;
@@ -896,13 +911,15 @@
 			border-radius: 50%;
 		}
 	}
+
 	.index-content-other {
 		width: 67vw;
 		height: 100%;
 		transition: opacity 0.4s ease;
 		position: relative;
-		// margin-left: -1.5vw;
+		margin-left: 1vw;
-		margin-left: 1.5vw;
+		// background-color: red;
+
 	}
 
 	.right-container-title-nav {
@@ -958,6 +975,7 @@
 		padding: 1.6vw;
 		position: relative;
 		margin-right: 1vw;
+
 		.mesu {
 			width: 100%;
 			height: 2.5vw;
@@ -967,6 +985,7 @@
 			padding: 0 1.5vw;
 			display: flex;
 			justify-content: space-between;
+
 			>view {
 				display: flex;
 				flex-direction: column;
@@ -974,9 +993,12 @@
 				justify-content: space-around;
 				width: 33%;
 				height: 100%;
-				&:nth-child(1),&:nth-child(2){
+
+				&:nth-child(1),
+				&:nth-child(2) {
 					border-right: 1px solid #DCDCDC;
 				}
+
 				>text {
 					&:nth-child(1) {
 						font-weight: bold;
@@ -984,6 +1006,7 @@
 						color: #333333;
 						margin-top: -1vw;
 					}
+
 					&:nth-child(2) {
 						font-weight: 400;
 						font-size: 1vw;
@@ -1112,6 +1135,7 @@
 		height: 4vh;
 		display: flex;
 		justify-content: center;
+
 		.bottom-tags {
 			background-color: #E7F1FF;
 			color: #0084FA;
@@ -1150,6 +1174,7 @@
 		color: #888888;
 		font-size: 25rpx;
 	}
+
 	.mengban {
 		width: 100vw;
 		height: 100vh;
@@ -1159,16 +1184,19 @@
 		z-index: 100;
 		background: RGBA(239, 240, 244, 0.55);
 	}
+
 	.guodu {
 		transition: .4s;
 		-webkit-transform-style: preserve-3d;
 		-webkit-overflow-scrolling: touch;
 	}
+
 	.jsh0 {
 		height: 0vw !important;
 		padding: 0 2vw !important;
 		top: 9.4vw !important;
 	}
+
 	.jszl {
 		width: 64.5vw;
 		height: 44vw;
@@ -1181,6 +1209,7 @@
 		z-index: 200;
 		padding: 2vw;
 		overflow: hidden;
+
 		.submit {
 			width: 100%;
 			height: 3.2vw;
@@ -1188,10 +1217,12 @@
 			padding-right: 2vw;
 			display: flex;
 			justify-content: flex-end;
+
 			view {
 				display: flex;
 				justify-content: center;
 				align-items: center;
+
 				&:nth-child(1) {
 					width: 7.1vw;
 					height: 3.2vw;
@@ -1202,6 +1233,7 @@
 					font-size: 1.4vw;
 					color: #555555;
 				}
+
 				&:nth-child(2) {
 					width: 7.1vw;
 					height: 3.2vw;
@@ -1215,6 +1247,7 @@
 				}
 			}
 		}
+
 		.scrol {
 			width: 110%;
 			height: 29.5vw;
@@ -1231,11 +1264,13 @@
 				border: 1px solid #F8F8F8;
 				text-align: center;
 				overflow: hidden;
+
 				image {
 					width: 2vw;
 					height: 2vw;
 					margin: 1vw auto 0vw;
 				}
+
 				text {
 					display: block;
 					text-align: center;
@@ -1244,6 +1279,7 @@
 					color: #333333;
 					width: 100%;
 				}
+
 				view {
 					text-align: center;
 					font-weight: 400;
@@ -1252,20 +1288,24 @@
 					width: 100%;
 				}
 			}
+
 			.act {
 				background: #F2F8FF;
 				border: 1px solid rgba(1, 125, 233, 0.43);
+
 				text {
 					color: #017DE9;
 				}
 			}
 		}
+
 		.spiw {
 			width: 14vw;
 			height: 2vw;
 			display: flex;
 			justify-content: space-around;
 			margin-top: 2.5vw;
+
 			view {
 				font-weight: 400;
 				font-size: 1.3vw;
@@ -1273,10 +1313,12 @@
 				position: relative;
 				line-height: 1.5vw;
 			}
+
 			.act {
 				color: #222222 !important;
 				font-weight: 500;
 			}
+
 			.act::after {
 				width: 50%;
 				height: 0.2vw;
@@ -1288,6 +1330,7 @@
 				left: 25%;
 			}
 		}
+
 		.tittop {
 			height: 2vw;
 			font-weight: 400;
@@ -1295,6 +1338,7 @@
 			color: #333333;
 			display: flex;
 			align-items: center;
+
 			view {
 				width: 0.4vw;
 				height: 1.2vw;
@@ -1304,6 +1348,7 @@
 			}
 		}
 	}
+
 	.bianj {
 		position: absolute;
 		width: 2.2vw;
@@ -1311,11 +1356,13 @@
 		top: 9.68vw;
 		right: 2.5vw;
 		z-index: 220;
+
 		image {
 			width: 100%;
 			height: 100%;
 		}
 	}
+
 	.jb {
 		position: absolute;
 		width: 2.2vw;
@@ -1323,18 +1370,21 @@
 		top: 2.7vw;
 		right: 1.5vw;
 		z-index: 201;
+
 		image {
 			width: 100%;
 			height: 100%;
 		}
 	}
+
 	.zzh0 {
 		height: 0vw !important;
 		padding: 0 1.6vw !important;
 		// top: 2.7vw !important;
 	}
+
 	.zzbq {
-		width: 18vw;
+		width: 20vw;
 		height: 10vw;
 		background: #FFFFFF;
 		box-shadow: 0rpx 0rpx 0.5vw 0rpx rgba(136, 148, 167, 0.19);
@@ -1345,23 +1395,31 @@
 		z-index: 200;
 		display: flex;
 		padding: 1.6vw 1.6vw 0;
+
 		.carfd {
-			width: 7.4vw;
+			width: 9vw;
 			height: 100%;
+
 			.tg {
 				width: 100%;
 				display: flex;
 				justify-content: space-around;
 				margin-top: 1vw;
+
 				view {
-					width: 1.8vw;
+					width: 3vw;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+
 					image {
-						width: 1.8vw;
+						width: 2.2vw;
-						height: 1.8vw;
+						height: 2.2vw;
 					}
+
 					text {
 						font-weight: 400;
-						font-size: 0.8vw;
+						font-size: 1vw;
 						color: #666666;
 						margin-top: 0.2vw;
 					}
@@ -1375,6 +1433,7 @@
 				color: #333333;
 				display: flex;
 				align-items: center;
+
 				view {
 					width: 0.4vw;
 					height: 1.2vw;

pages/NursingNew/component/leftcontent/serveswipe.vue

@@ -3,11 +3,11 @@
 		<view class="swipeservwe">
 			<view class="swper" v-if="plsbuy.length==0">
 				<view class="photo-father">
-					<image class="big-img" style="width: 550rpx;top:30%;" :src="`/static/index/newindex/wendu/2.png`"
+					<image class="big-img" style="width: 420rpx;top:30%;" :src="`/static/index/newindex/wendu/2.png`"
 						mode="aspectFill" />
 					<view class="juzhong" style=" filter:grayscale(60%)">
-						<donghua :width="`1300rpx`" :height="`900rpx`" :links="blueArray" :playing="true" :loop="true"
+						<donghua :width="`1300rpx`" :height="`900rpx`" :links="blueArray" :playing="photoplay"
-							:interval="120" />
+							:loop="true" :interval="120" />
 					</view>
 				</view>
 			</view>
@@ -70,7 +70,7 @@
 						<view class="big-img"
 							v-if="indexmessage.izPackage=='Y'&&indexmessage?.izStart=='N'&&!indexmessage.flag"
 							@click="indexmessage.flag = true">
-							<image :src="`/static/zlb.png`" :style=" 'width: 450rpx' " mode="aspectFill" />
+							<image :src="`/static/zlb.png`" :style=" 'width: 420rpx' " mode="aspectFill" />
 						</view>
 						<view class="cardbox"
 							v-if="indexmessage.izPackage=='Y'&&indexmessage?.izStart=='Y'||indexmessage.flag">
@@ -93,13 +93,11 @@
 							</scroll-view>
 						</view>
 						<view class="big-img" v-if="indexmessage.izPackage=='N' ">
-							<image :style="!indexmessage?.previewFile?'width: 450rpx':' '"
+							<image :style="!indexmessage?.previewFile?'width: 420rpx':' '"
 								:src="indexmessage?.previewFile? serverUrl + indexmessage?.previewFile: `/static/index/newindex/wendu/2.png`"
 								mode="heightFix" />
 						</view>
 
-
-
 						<view style="display: flex;align-items: center; ">
 							<view class="server-name">
 								{{ indexmessage?.directiveName }}
@@ -290,7 +288,7 @@
 		</view>
 		<tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del1()"> </tanchuang>
 		<errorshow :show="openerror" :font="errmsg" @close="openerror=false" style="left: 44%;" />
-		<tanchuang :show="open==3" :font="font" @back="open = 0" @right="del1()" fontsize="font-size:2.2vw"
+		<tanchuang :show="open==3" :font="font" @back="open = 0" @right="del1()" 
 			:close="false"> </tanchuang>
 
 		<severcard ref="severcards"></severcard>
@@ -312,12 +310,12 @@
 	const serverUrl = ref(uni.getStorageSync('imagebase'))
 	const servervideoUrl = ref(uni.getStorageSync('serverUrl') + '/sys/commonVideo/staticVideo/')
 	const serverpicUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
-	const current = ref(0)
+	const current = ref(-1)
 	const current2 = ref(0)
 	const autoplay = ref(false)
 	const severcards = ref<InstanceType<typeof ChildComponent>>()
 	const init = (e) => {
-		console.log("啥啊",e)
+		// console.log("啥啊",e)
 		firstgetqueryCgdList(e);
 		setTimeout(() => {
 			severcards.value.firstgetqueryCgdList()
@@ -383,7 +381,8 @@
 	onMounted(() => {
 		setTimeout(() => {
 			photoplay.value = true;
-		}, 200)
+			current.value = 0;
+		}, 1500)
 	})
 	const zdxzdex = ref(0)
 	const zdxzarr = ref(0)
@@ -540,7 +539,7 @@
 		form.nuId = nuId;
 		// console.log("wtf")
 		queryOrderList(form).then(res => {
-			console.log(`这啥啊啊啊啊啊`,form, res)
+			// console.log(`这啥啊啊啊啊啊`,form, res)
 			if (res.result.records.length > 0) {
 				res.result.records.forEach((item, l) => {
 					item.flag = false;
@@ -964,7 +963,7 @@
 
 	.swipeservwe {
 		width: 65.35vw;
-		height: 46.5vw;
+		height: 47.2vw;
 		position: relative;
 		background-color: #fff;
 		border-radius: 1.6vw;
@@ -1217,9 +1216,10 @@
 	}
 
 	.big-img {
-		height: 500rpx;
+		height: 420rpx;
 		z-index: 100;
-		margin-top: -100rpx;
+		margin-top: -50rpx;
+		// background-color: red;
 
 		image {
 			width: 100%;

pages/NursingNew/component/logistics/api.js

@@ -12,8 +12,9 @@ export const getServiceTree = () => {
 }
 // 查询表格
 export const getNclist = (nuId, elderId) => {
+	// console.log("数据是啥",`${uni.getStorageSync('serverUrl')}/api/pad/logistics/directive/getNclist?nuId=${nuId}&elderId=${``}`)
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/logistics/directive/getNclist?nuId=${nuId}&elderId=${elderId}`,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/logistics/directive/getNclist?nuId=${nuId}&elderId=${``}`,
 		method: 'get',
 	})
 }
@@ -72,7 +73,7 @@ export const deleteDirective = (params) => {
 // 编排护理流程-删除即时服务指令
 export const deleteInstant = (params) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}//api/pad/logistics/directive/deleteInstant`,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/logistics/directive/deleteInstant`,
 		method: 'post',
 		data: params,
 	})

pages/NursingNew/component/logistics/index.vue

@@ -2,7 +2,6 @@
 <template>
 	<view class="right-container" :style="isshow?{opacity: `1`}:{opacity: `0`}"
 		@click="bottomisShaking=false;shakyTable = false">
-		<severcard ></severcard>
 		<view class="right-container-title-nav">
 			<text style="margin-left: 30rpx;">
 				NUID：{{ uni.getStorageSync('nuId')}}
@@ -11,7 +10,7 @@
 				{{ uni.getStorageSync('nuName')}}
 			</text>
 			<view class="right-icons">
-				<!-- <view style="display: flex;align-items: center;margin-right: 25rpx;padding: 0 15rpx;"
+				<view style="display: flex;align-items: center;margin-right: 25rpx;padding: 0 15rpx;"
 					:class="!topindex&&!bodystatus&&!facestatus?'firsttarget':''">
 					<view class="mark">
 						<view style="margin-right: 15rpx;">
@@ -69,7 +68,7 @@
 							</view>
 						</view>
 					</view>
-				</view> -->
+				</view>
 				<!-- <view style="display: flex;align-items: center;margin-right: 15rpx;padding: 0 15rpx;"
 					:class="topindex===1&&!bodystatus&&!facestatus?'firsttarget':''">
 					<view class="mark">
@@ -110,14 +109,15 @@
 					<image class="white-img" :src="`/static/index/newruler/yulan.png`" />
 					预览
 				</view>
-				<!-- <view class="white-button"  @click="shareToWeixin">
+				<view class="white-button" @click="shareToWeixin">
 					<image class="white-img" :src="`/static/index/newruler/fenxiang.png`" />
 					分享
 				</view>
 				<view class="white-button" @click="changLeft(5)">
-					<image class="white-img" style="width: 45rpx;height: 45rpx;" :src="`/static/index/newruler/watch.png`" />
+					<image class="white-img" style="width: 45rpx;height: 45rpx;"
+						:src="`/static/index/newruler/watch.png`" />
 					监控
-				</view> -->
+				</view>
 			</view>
 		</view>
 		<view class="doctorsay-container-view">
@@ -139,8 +139,8 @@
 					</view>
 
 					<view class="super-card-container">
-						<scroll-view style="height: 1330rpx;width: 100%;border: 2rpx solid balck;" scroll-with-animation
+						<scroll-view style="height: 100%" scroll-with-animation :scroll-left="cardLeft" scroll-x
-							:scroll-left="cardLeft" scroll-x @scroll="handleTop" :show-scrollbar="false">
+							@scroll="handleTop" :show-scrollbar="false">
 							<view style="display: flex;width:4824rpx;">
 								<view v-for="(item0,index0) in timearr" :key="index0">
 									<view class="super-card-time">
@@ -185,7 +185,6 @@
 															:style="{ animationDelay:`-${computeDelay(index0, index1).toFixed(2)}s` }">
 
 															<view class="title-time" v-if="item1.startTime"
-																
 																style="flex-direction: column;">
 																<image v-show="item1.startTime"
 																	style="width: 50rpx;height: 50rpx;margin: 0 auto;margin-top: 20rpx"
@@ -323,7 +322,7 @@
 											<view :class="downdonghua==index? `downList-box-target` : `downList-box`"
 												@click="secondContant(index)">
 
-												<donghua :width="`55rpx`" :height="`55rpx`" :links="item.url"
+												<donghua :width="`60rpx`" :height="`60rpx`" :links="item.url"
 													:playing="downdonghua==index" :interval="120" />
 												<view class="downList-box-text">
 													{{ item.title }}
@@ -338,7 +337,7 @@
 							<view class="middle-right-box">
 								<view v-for="(item,index) in bigArray" :key="index" @click="changLeft(index)">
 									<view class="doctorsay-container-card">
-										<donghua :width="`50rpx`" :height="`50rpx`" :links="item.url"
+										<donghua :width="`60rpx`" :height="`60rpx`" :links="item.url"
 											:playing="index === upmenuIndex" :interval="120" />
 										<view
 											:class="(index === upmenuIndex) ? `doctorsay-container-card-font-dark`:`doctorsay-container-card-font`">
@@ -570,6 +569,7 @@
 				</view>
 			</view>
 		</view>
+		<severcard></severcard>
 	</view>
 </template>
 
@@ -588,7 +588,6 @@
 	watch(
 		() => props.isshow,
 		(newVal, oldVal) => {
-			console.log(1111)
 			// 只有当新旧值不相同时才执行
 			if (newVal !== oldVal) {
 				bottomisShaking.value = false
@@ -783,7 +782,6 @@
 		if (timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].id) {
 			deleteDirective(timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1]).then((res : any) => {
 				doChangeNew()
-				
 			})
 		} else {
 			doChangeNew()
@@ -1239,7 +1237,6 @@
 	const reldata = ref([]);
 	const deleteRuler = (index0 : number, index1 : number) => {
 		deleteDirective(timearr.value[index0].children[index1]).then((res : any) => {
-			console.log("删除",res)
 			if (res.success) {
 				geteverything()
 			}
@@ -1609,15 +1606,9 @@
 		})
 	}
 	const routerPush = () => {
-		uni.setStorage({
-			key: 'myArray',
-			data: timearr.value,
-			success: function () {
 		uni.navigateTo({
 			url: `/pages/timeMatrix/indexnew`
 		})
-			},
-		});
 	}
 	// 暂存器
 	const saveRulerTime = ref({
@@ -1667,7 +1658,6 @@
 	const geteverything = () => {
 		if (uni.getStorageSync('nuId') && uni.getStorageSync('elderId')) {
 			getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('elderId')).then((res : any) => {
-				console.log("啥啊",res)
 				timearr.value = Array.from({ length: 24 }, (_, hour) => ({
 					positioning: hour.toString(),
 					children: minuteArr.map(time => ({
@@ -1699,8 +1689,8 @@
 	}
 	const savePackagelist = ref([]);
 	onMounted(() => {
-		savePackagelist.value = uni.getStorageSync('Packagelist') || []
+		savePackagelist.value = uni.getStorageSync('Packagelist2') || []
-		let res = uni.getStorageSync('saveTree1')
+		let res = uni.getStorageSync('saveTree2')
 		let goodArray = []
 		myArray.forEach((element : any) => {
 			element.children.forEach((element1 : any) => {

pages/NursingNew/component/nurse/api.js

@@ -38,13 +38,26 @@ export const addBatch = (params) => {
 	})
 }
 // 查询指令包
-export const getNcPackagelist = (nuId,elderId) => {
+export const getNcPackagelist = (instructionTagId) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/getNcPackagelist`,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/getNcPackagelist?instructionTagId=${instructionTagId}`,
 		method: 'get',
 	})
 }
-
+// 查询指令包
+// export const getNcPackagelist1 = (nuId,elderId) => {
+// 	return request({
+// 		url: `${uni.getStorageSync('serverUrl')}/api/pad/logistics/directive/getNcPackagelist`,
+// 		method: 'get',
+// 	})
+// }
+// // 查询指令包
+// export const getNcPackagelist2 = (nuId,elderId) => {
+// 	return request({
+// 		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/directive/getNcPackagelist`,
+// 		method: 'get',
+// 	})
+// }
 // 新增服务指令
 // export const addDirective = (params) => {
 // 	return request({

pages/NursingNew/component/nurse/bigindex.css

@@ -478,6 +478,7 @@
 			display: flex;
 			align-items: center;
 			position: relative;
+
 			.order-month-right {
 				position: absolute;
 				right: 0;
@@ -829,6 +830,7 @@
 .info {
 	display: flex;
 	font-size: 30rpx;
+
 	.info-img {
 		width: 35rpx;
 		height: 35rpx;
@@ -945,34 +947,34 @@
 	left: 120rpx;
 	top: 20rpx;
 	display: flex;
-	gap: 5rpx;
+	gap: 8rpx;
-
-
-	/* height: 28px; */
-	/* 点的高度 + 跳起空间 */
 }
 
-
 .dot {
 	width: 5rpx;
 	height: 5rpx;
 	background: #4690FF;
 	border-radius: 50%;
-	animation: jump 1.5s ease-in-out infinite;
+	display: inline-block;
-
+	transform-origin: center center;
+	animation: pulse 1.1s ease-in-out infinite;
+	will-change: transform, opacity;
+	/* 提升动画性能 */
 }
 
-
+/* 从左到右依次放大到 1.6 倍再回到 1 倍 */
-@keyframes jump {
+@keyframes pulse {
 
 	0%,
 	80%,
 	100% {
-		transform: translateY(0);
+		transform: scale(1);
+		opacity: 1;
 	}
 
 	40% {
-		transform: translateY(-8px);
+		transform: scale(1.6);
+		opacity: 1;
 	}
 }
 
@@ -1011,10 +1013,12 @@
 	font-size: 32rpx;
 	margin-top: -5rpx;
 }
+
 .spec-shu {
 	margin: 0 7rpx;
 	color: #BABABA;
 }
+
 .packtarget-serviceContent {
 	width: 100%;
 	height: 200rpx;

pages/NursingNew/component/nurse/bigindex.vue

@@ -725,7 +725,20 @@
 		if (firstListTarget.value != -1) {
 			firstListTarget.value = -1
 		} else {
+			moveById.value = item.id
+			backsearch(item.id)
+			timearr.value.forEach((element : any) => {
+				element.children.forEach((data : any) => {
+					if (item.id == data.id) {
+						rulerTouchClick(data.positioning, data.positioningLong)
+					}
+				})
+			})
+			setTimeout(() => {
 				firstListTarget.value = index;
+			}, 50)
+
+
 		}
 	}
 	const clicksecondarray = (item, index) => {
@@ -1077,7 +1090,7 @@
 
 
 	const searchtable = (item : any) => {
-		console.log("aaaaaaa", item)
+		// console.log("aaaaaaa", item)
 		firstListTarget.value = -1;
 		secondListTarget.value = -1;
 		moveById.value = item.id

pages/NursingNew/component/nurse/index.css

@@ -451,9 +451,9 @@
 		color: #666666;
 
 		.tags-img {
-			width: 52rpx;
+			width: 50rpx;
-			height: 52rpx;
+			height: 50rpx;
-			margin-bottom: 12rpx;
+			margin-bottom: 5rpx;
 		}
 	}
 }
@@ -694,8 +694,8 @@
 					}
 
 					.check-img {
-						width: 52rpx;
+						width: 50rpx;
-						height: 52rpx;
+						height: 50rpx;
 						margin: 0 22rpx;
 					}
 
@@ -803,7 +803,7 @@
 
 			.blue-icon {
 				position: absolute;
-				right: 40rpx;
+				right: 30rpx;
 				top: 20rpx;
 				width: 45rpx;
 				height: 45rpx;
@@ -1296,8 +1296,8 @@
 		}
 
 		.instant-icon {
-			width: 70rpx;
+			width: 60rpx;
-			height: 70rpx;
+			height: 60rpx;
 			/* 性能关键 */
 			will-change: transform;
 			transform-origin: 50% 52%;
@@ -1388,7 +1388,7 @@
 
 		.explain-icon {
 			position: absolute;
-			right: 40rpx;
+			right: 30rpx;
 			top: 25rpx;
 			width: 45rpx;
 			height: 45rpx;
@@ -1718,8 +1718,8 @@
 
 .three-items {
 	margin-top: 20rpx;
-	width: 90%;
+	width: 97%;
-	margin-left: 7%;
+	margin-left: 3%;
 	height: 510rpx;
 	display: flex;
 
@@ -1739,8 +1739,8 @@
 
 			/* 禁止元素拖动 */
 			.card-icon {
-				width: 52rpx;
+				width: 60rpx;
-				height: 52rpx;
+				height: 60rpx;
 
 			}
 

pages/NursingNew/component/nurse/newindex.vue

@@ -210,7 +210,7 @@
 										即时标签
 									</view>
 								</view>
-								<image class="explain-icon" @click.stop="jishiopen=!jishiopen"
+								<image class="explain-icon" style="right: 27rpx;" @click.stop="jishiopen=!jishiopen"
 									src="/static/index/procurement/explain.png" mode="aspectFill"></image>
 
 								<view class="explain-text" v-show="jishiopen">
@@ -363,7 +363,7 @@
 										:scroll-y="canmovechange">
 										<view class="tree-card" v-for="(item,index) in bigArray[upmenuIndex]?.children"
 											:key="index" @click="secondContant(index)">
-											<donghua :width="`52rpx`" :height="`52rpx`" :links="item.url"
+											<donghua :width="`60rpx`" :height="`60rpx`" :links="item.url"
 												:playing="index === downmenuIndex" :interval="120" />
 											<view class="card-text"
 												:style="index === downmenuIndex?{color:`#0084ff`}:{}">
@@ -372,12 +372,12 @@
 										</view>
 									</scroll-view>
 								</view>
-								<view class="tree-item" style="width: 28%;">
+								<view class="tree-item">
 									<scroll-view style="height: 100%;width:100%;" scroll-with-animation
 										:scroll-y="canmovechange">
 										<view class="tree-card" v-for="(item,index) in bigArray" :key="index"
 											@click="changLeft(index)">
-											<donghua :width="`52rpx`" :height="`52rpx`" :links="item.url"
+											<donghua :width="`60rpx`" :height="`60rpx`" :links="item.url"
 												:playing="index === upmenuIndex" :interval="120" />
 											<view class="card-text" :style="index === upmenuIndex?{color:`#0084ff`}:{}">
 												{{ item.title }}
@@ -483,7 +483,7 @@
 
 							</view>
 							<view class="target-items-father"
-								v-if="ruleritem.directiveName  && ruleritem.izPackage==`Y`">
+								v-if="ruleritem.directiveName  && ruleritem.izPackage==`Y`&& ruleritem?.directivesList">
 								<view class="packtargetmessage">
 									<image class="packtargetmessage-icon" :src=" `/static/index/packtarget.png`"
 										mode="aspectFill" />
@@ -533,8 +533,8 @@
 
 								<view class="packtarget-end">
 									<image class="end-icon" :src="
-										    ruleritem?.directivesList?.[packtargetindex]?.immediateFile
+										    ruleritem?.directivesList[packtargetindex]?.immediateFile
-										      ? serverUrl + ruleritem.directivesList[packtargetindex].immediateFile
+										      ? serverUrl + ruleritem.directivesList[packtargetindex]?.immediateFile
 										      : noimageshow
 										  " mode="aspectFill">
 									</image>
@@ -1669,7 +1669,7 @@
 
 		if (uni.getStorageSync('nuId') && uni.getStorageSync('elderId')) {
 			getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('elderId')).then((res : any) => {
-				
+				// console.log("通了吗",res)
 				timearr.value = Array.from({ length: 24 }, (_, hour) => ({
 					positioning: hour.toString(),
 					children: minuteArr.map(time => ({

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

@@ -12,7 +12,7 @@
 						</view>
 						<view class="speitem guodu">
 							<view class="imgs">
-								<image :src="v?.materialImg?serverUrl+v?.materialImg:'/static/index/procurement/k.png'"
+								<image style="border-radius: 1vw;" :src="v?.materialImg?serverUrl+v?.materialImg:'/static/index/procurement/k.png'"
 									mode="aspectFill">
 								</image>
 							</view>
@@ -20,6 +20,7 @@
 								<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 style="border-color: #fff;" v-if="v.medicationId_dictText"></view>
 							</view>
 						</view>
 						<view class="msitem guodu">
@@ -261,8 +262,8 @@
 			width: 2.5vw;
 			height: 2.5vw;
 			position: absolute;
-			bottom: 0.8vw;
+			bottom: 2vw;
-			right: 0vw;
+			right: 1vw;
 
 		}
 	}
@@ -278,7 +279,7 @@
 			width: 25vw;
 			// background-color: red;
 			margin-top: 10rpx;
-			font-size: 34rpx;
+			font-size: 33rpx;
 			white-space: nowrap;
 			/* 不换行 */
 			overflow: hidden;
@@ -340,13 +341,16 @@
 		left: 0;
 
 		.cardp {
-			width: 9vw;
+			position: absolute;
+			left: 0;
+			top: 11vw;
+			width: 15vw;
 			display: flex;
 			margin: 0.3vw auto;
-			margin-top: 0;
 			align-items: center;
 			justify-content: center;
 			flex-wrap: wrap;
+			// background-color: red;
 
 			// flex-direction: column;
 			view {
@@ -354,7 +358,7 @@
 				height: 2vw;
 				border-radius: 0.9vw;
 				border: 1px solid #D2D2D2;
-				margin: 0.25vw 0 0 0;
+				margin: 0.7vw 0.3vw 0 0.3vw;
 				display: flex;
 				justify-content: center;
 				align-items: center;

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

@@ -106,11 +106,11 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick,  watch, reactive }
 			display: flex;
 			justify-content: center;
 			align-items: center;
-			width: 9.1vw;
+			width: 8vw;
-			height: 3.8vw;
+			height: 3vw;
 			color: rgba(92, 121, 146, 1);
 			border-radius:1.9vw;
-			font-size: 1.8vw;
+			font-size: 1.5vw;
 			border: 1px solid #EDEDEF;
 			margin-left: 1vw;
 		}
@@ -158,7 +158,7 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick,  watch, reactive }
 						border-radius: 1vw;
 						border: 1px solid #D2D2D2;
 						font-weight: 400;
-						font-size: 0.9vw;
+						font-size: 1vw;
 						color: #555555;
 						padding: 0 0.4vw;
 						margin: 0.5vw 0 0 0.25vw;
@@ -212,14 +212,14 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick,  watch, reactive }
 						>view {
 							width: 33.3%;
 							font-weight: 400;
-							font-size: 1.1vw;
+							font-size: 1.2vw;
 							color: #888888;
 							display: flex;
 							flex-direction: column;
 							justify-content: space-between;
 							text {
 								font-weight: 400;
-								font-size: 1.4vw;
+								font-size: 1.5vw;
 								color: #222222;
 							}
 						}

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

@@ -17,18 +17,28 @@
 							<view>{{objtake?.materialName}}</view>
 							<view>
 								<view>
-									物料编码
+									物料编码：
-									<text>{{objtake?.materialNo}}</text>
+									<view class="right-text">
+										{{objtake?.materialNo}}
 									</view>
-								<view>
-									请购单位
-									<text>{{objtake?.materialUnits}}</text>
 								</view>
 							</view>
 							<view>
 								<view>
-									规格型号
+									请购单位：
-									<text style="width:20vw ;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{objtake?.specificationModel}}</text>
+									<view class="right-text">
+										{{objtake?.materialUnits}}
+									</view>
+
+								</view>
+							</view>
+							<view>
+								<view>
+									规格型号：
+									<view class="right-text">
+										{{objtake?.specificationModel}}
+									</view>
+									<!-- <text style="width:20vw ;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{objtake?.specificationModel}}</text> -->
 								</view>
 							</view>
 						</view>
@@ -56,7 +66,7 @@
 				<view class="you">
 					<view class="calculator-father">
 						<view v-for="(item,index) in calculatorArray" :key="index">
-							<view class="calculator-kuai" style="font-size: 33rpx;" v-if="item==`AC`"
+							<view class="calculator-kuai" style="font-size: 30rpx;" v-if="item==`AC`"
 								@click="clickKuai(item,index)">
 								清零
 							</view>
@@ -217,15 +227,16 @@
 				justify-content: flex-end;
 				font-size: 35rpx;
 				
+
 				view {
 					display: flex;
 					justify-content: center;
 					align-items: center;
-					width: 9.1vw;
+					width: 7.7vw;
-					height: 3.8vw;
+					height: 3.2vw;
 					color: rgba(92, 121, 146, 1);
 					border-radius: 1.9vw;
-					font-size: 1.8vw;
+					font-size: 1.5vw;
 					border: 1px solid #EDEDEF;
 					margin-left: 1vw;
 				}
@@ -239,6 +250,7 @@
 					background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
 					border: 1px solid rgba(3, 133, 250, 0.34);
 					color: #0385FA;
+					margin-right: 1.2vw;
 				}
 			}
 
@@ -279,12 +291,12 @@
 			margin-top: 0.5vw;
 			display: flex;
 			align-items: center;
-			justify-content: flex-end;
 
 			.jj {
 				width: 5vw;
 				height: 5vw;
-				margin: 0 1vw;
+				margin: 0 1.5vw;
+
 				display: flex;
 				justify-content: center;
 				align-items: center;
@@ -355,50 +367,56 @@
 					padding-top: 1.8vw;
 
 					.youcont {
-						width: 17vw;
+						width: 18vw;
 						height: 100%;
 
 						>view {
 
 							&:nth-child(2),
-							&:nth-child(3) {
+							&:nth-child(3),
+							&:nth-child(4) {
 								width: 100%;
-								height: 3.6vw;
+								height: 2vw;
 								display: flex;
 								justify-content: space-between;
-								margin-top: 1.8vw;
+								margin-top: 0.6vw;
 
 								>view {
 									font-weight: 400;
-									font-size: 1.1vw;
+									font-size: 1.4vw;
 									color: #888888;
 									display: flex;
-									flex-direction: column;
-									justify-content: space-between;
 
-									text {
+									.right-text {
 										font-weight: 300;
 										font-size: 1.4vw;
 										color: #222222;
+										width: 220rpx;
+										overflow: hidden;
+										white-space: nowrap;
+										text-overflow: ellipsis;
 									}
+
 								}
 							}
 
 							&:nth-child(1) {
 								width: 17vw;
-								height: 1.8vw;
+								height: 3vw;
 								font-weight: bold;
 								font-size: 1.6vw;
 								color: #222222;
-								white-space: nowrap;
+								// white-space: nowrap;
-								text-overflow: ellipsis;
+								// text-overflow: ellipsis;
-								overflow: hidden;
+								// overflow: hidden;
 								line-height: 1.8vw;
+
 							}
 						}
 					}
 
 					.zuoimg {
+						margin-top: 3vw;
 						width: 8vw;
 						height: 8vw;
 

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

@@ -45,7 +45,7 @@
 				</view>
 			</view>
 			<view class="lji">
-				<view>累计请领:  </view>
+				<view>累计请领： </view>
 				<text>  {{wuobj.wlNum?wuobj.wlNum:0}}{{objtake.materialUnits}}</text>
 			</view>
 			<scroll-view scroll-y="true" class="jilu" scroll-with-animation @scrolltolower="scrolltolower()">
@@ -325,7 +325,7 @@
 							>view {
 								width: 50%;
 								font-weight: 400;
-								font-size: 1.1vw;
+								font-size: 1.2vw;
 								color: #888888;
 								display: flex;
 								flex-direction: column;
@@ -333,7 +333,7 @@
 			
 								text {
 									font-weight: 400;
-									font-size: 1.4vw;
+									font-size: 1.5vw;
 									color: #222222;
 								}
 							}
@@ -369,7 +369,7 @@
 			padding-top: 1vw;
 			text{
 				font-weight: 400;
-				font-size: 1.1vw;
+				font-size: 1.3vw;
 				color: #999999;
 			}
 		}
@@ -385,11 +385,11 @@
 			display: flex;
 			justify-content: center;
 			align-items: center;
-			width: 9.1vw;
+			width: 8vw;
-			height: 3.8vw;
+			height: 3vw;
 			color: rgba(92, 121, 146, 1);
 			border-radius:1.9vw;
-			font-size: 1.8vw;
+			font-size: 1.5vw;
 			border: 1px solid #EDEDEF;
 			margin-left: 1vw;
 		}

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

@@ -1079,6 +1079,7 @@
 								image {
 									width: 100%;
 									height: 100%;
+									border-radius: 1vw;
 								}
 							}
 

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

@@ -1,5 +1,5 @@
 <template>
-	<view v-if="isShow">
+	<view v-if="isShow" class="allview">
 		<view class="buttons-father">
 			<view class="boxtwo">
 				<view class="ipt">

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

@@ -44,6 +44,7 @@
 		margin-top: 1.1vw;
 		position: relative;
 		margin-bottom: 0.7vw;
+		
 		// background-color: blue;
 		
 		.center-font{
@@ -195,3 +196,7 @@
 		background: linear-gradient(-45deg, rgba(223, 244, 252, 1), rgba(204, 228, 249, 0.43));
 		border: 1px solid #1083F8;
 	}
+	.allview{
+		margin-left: -0.2vw;
+		width: 100.5%;
+	}

pages/NursingNew/component/warehousematrix/api.js

@@ -0,0 +1,96 @@
+// 引入 request 文件
+import request from '@/request/index.js'
+
+// 以下 api 为博主项目示例，实际与项目相匹配
+
+// 查询服务类型
+export const getServiceTree = () => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/directive/getServiceTree`,
+		method: 'get',
+	})
+}
+// 查询表格
+export const getNclist = (nuId,elderId) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/directive/getNclist?nuId=${nuId}&elderId=${``}`,
+		method: 'get',
+	})
+}
+// 保存表格
+export const addBatch = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/directive/addBatch`,
+		method: 'post',
+		data: params,
+	})
+}
+// 查询指令包
+export const getNcPackagelist = (nuId,elderId) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/directive/getNcPackagelist`,
+		method: 'get',
+	})
+}
+
+// 新增服务指令
+export const addDirective = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/directive/addDirective`,
+		method: 'post',
+		data: params,
+	})
+}
+
+// 新增即时指令
+export const addInstant = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/directive/addInstant`,
+		method: 'post',
+		data: params,
+	})
+}
+
+// 新增情绪/体型标签
+export const addElderTag = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/directive/addElderTag`,
+		method: 'post',
+		data: params,
+	})
+}
+
+// 编排护理流程-删除服务指令
+export const deleteDirective = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/directive/deleteDirective`,
+		method: 'post',
+		data: params,
+	})
+}
+
+// 编排护理流程-删除即时服务指令
+export const deleteInstant = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/directive/deleteInstant`,
+		method: 'post',
+		data: params,
+	})
+}
+
+// 编排护理流程-删除情绪/体型标签
+export const deleteElderTag = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/directive/deleteElderTag`,
+		method: 'post',
+		data: params,
+	})
+}
+// 编排护理流程-修改服务指令
+export const editDirective = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/directive/editDirective`,
+		method: 'post',
+		data: params,
+	})
+}

pages/NursingNew/index.vue

@@ -59,8 +59,11 @@
 			@cleanall="cleanall" />
 		<!-- 医嘱 -->
 		<doctorask v-if="swipedex==2&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" />
-		<logistics :isshow="menuIndex==3"
+		<logistics :isshow="menuIndex==3" v-if="swipedex==3" :canmove="startmoveit" :sendxy="targetrule"
-			v-if="swipedex==3&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" />
+			:isblue='isblue' :howtomove="howtomove" :targetrule="targetrule" @handsend="handsend" @rulepush="rulepush"
+			@cleanall="cleanall" />
+		<!-- 	<logistics :isshow="menuIndex==3"
+			v-if="swipedex==3&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" /> -->
 
 		<invoicing :isshow="menuIndex==6"
 			v-if="swipedex==6&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" />
@@ -84,7 +87,7 @@
 	import index from "./component/index.vue"
 	import newnurse from "./component/nurse/newindex.vue"
 	import equipment from "./component/equipment.vue"
-	import logistics from "./component/logistics/index.vue"
+	import logistics from "./component/logistics/newindex.vue"
 	import invoicing from "./component/invoicing/index.vue"
 
 	import requestform from "./component/pleasetake/takehome.vue"
@@ -111,11 +114,16 @@
 		menuIndex.value = 0;
 		swipedex.value = 0;
 
-		getNcPackagelist().then((res : any) => {
+		getNcPackagelist(`1`).then((res : any) => {
 			//缓存指令包
 			// console.log("缓存指令包", res)
 			uni.setStorageSync("Packagelist", res.result)
 		})
+		getNcPackagelist(`2`).then((res : any) => {
+			//缓存指令包
+			// console.log("缓存指令包", res)
+			uni.setStorageSync("Packagelist2", res.result)
+		})
 		getPermissionList({ employeesId: uni.getStorageSync('userInfo').employeesId }).then(res => {
 			listarr.value = res.result;
 			// console.log("这个是啥", listarr.value)
@@ -237,7 +245,7 @@
 		queryPadPageList({ 'pageNo': -1, 'nuName': nuName }).then((res => {
 
 			let arr = res.result.records[0].permissionList;
-
+			// console.log("???????????????",res.result.records[0].permissionList)
 			arrlist.value = [{ name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png', type: 'hldy' }];
 			let tbr = [];
 			// console.log("xxxx",arr)
@@ -250,6 +258,7 @@
 						tbr.push(v);
 					}
 				})
+
 				// console.log("是不是没了啊", tbr)
 				tbr.forEach(item => {
 					let obj = tabbrarr.value.find(r =>
@@ -465,6 +474,16 @@
 	const targetrule = ref([-1, -1])
 	function inArea(x, y) {
 		if (!whoisit.value) {
+			if(menuIndex.value===3){
+				if (x >= 790 &&
+					x <= 1062 &&
+					y >= 37 &&
+					y <= 255) {
+					return 1
+				} else {
+					return 0
+				}
+			}else{
 				if (x >= 790 &&
 					x <= 1062 &&
 					y >= 147 &&
@@ -473,6 +492,8 @@
 				} else {
 					return 0
 				}
+			}
+			
 		} else {
 			// console.log("000",x)
 			if (x > 1000) {

pages/Warehouse/finish.vue

@@ -2535,6 +2535,7 @@
 							margin-top: 10rpx;
 							width: 150rpx;
 							height: 150rpx;
+							border-radius: 1vw;
 						}
 
 						.middle-right {
@@ -2629,6 +2630,7 @@
 				height: 250rpx;
 				margin-left: 50rpx;
 				margin-top: 2vw;
+				border-radius: 1vw;
 			}
 
 			.left-tags {
@@ -2721,8 +2723,8 @@
 		width: 35rpx;
 		height: 35rpx;
 		position: absolute;
-		right: 220rpx;
+		right: 190rpx;
-		top: 50%;
+		top: 47%;
 		transform: translateY(-50%);
 	}
 

pages/Warehouse/index/component/index.vue

@@ -3,20 +3,9 @@
 		<view class="right-container-title-nav">
 			<view class="title-card">
 				<view class="card-top">
-					<view class="card-top-left">
-						{{hldyobj?.cklFinishedTotal}}
-					</view>
 					<view class="card-top-right">
 						<image class="right-img" src="/static/index/card/arrow.png" />
 					</view>
-					<view class="card-spec">
-						<view class="line">
-						</view>
-						<view class="line-gray">
-							{{hldyobj?.cklTotal}}
-						</view>
-					</view>
-
 				</view>
 				<view class="card-bottom">
 					<image class="bottom-img" src="/static/index/card/warehouse.png" />
@@ -24,10 +13,38 @@
 						库房
 					</view>
 				</view>
+				<view class="mesu">
+					<view>
+						<text>{{hldyobj?.cklFinishedTotal}}</text>
+						<text>已执行</text>
+					</view>
+					<view>
+						<text>{{hldyobj?.cklTotal}}</text>
+						<text>待执行</text>
+					</view>
+					<view>
+						<text>1</text>
+						<text>异常</text>
+					</view>
+				</view>
+			</view>
+			<view class="title-card-right" @click="jszlshow = true">
+				<view class="card-top" style="justify-content: space-between;">
+					<view class="card-top-left">
+						11
+					</view>
+					<view class="card-top-right">
+						<image class="right-img" src="/static/index/card/arrow.png" />
 					</view>
 
-			<view class="title-card-right"  @click="jszlshow = true">
+				</view>
-				<view class="card-top">
+				<view class="card-bottom" style=" top: 8vw;">
+					<image class="bottom-img" src="/static/index/card/alarm.png" />
+					<view class="bottom-font">
+						即时指令
+					</view>
+				</view>
+				<!-- <view class="card-top">
 					<view class="card-top-left"> </view>
 					<view class="card-top-right">
 						<image class="right-img" src="/static/index/card/arrow.png" />
@@ -38,7 +55,7 @@
 					<view class="bottom-font">
 						即时
 					</view>
-				</view>
+				</view> -->
 				<view class="bianj" v-if="jszlshow">
 					<image src="/static/index/card/bj.png" mode="aspectFill"></image>
 				</view>
@@ -51,13 +68,17 @@
 						<view v-for="(v,i) in ['库房']" :key="i" :class="i==0?'act':''">{{v}}</view>
 					</view>
 					<scroll-view class="scrol" scroll-y="true">
-						<view v-for="(v,i) in zlarr" :key='i' :class="i==fwzldex?'act':''" class="cdk" @click="zldex(i)">
+						<view v-for="(v,i) in zlarr" :key='i' :class="i==fwzldex?'act':''" class="cdk"
+							@click="zldex(i)">
 							<image :src="fwzldex!=i?v.netImmediateFile:v.netPreviewFileSmall" mode="aspectFill"></image>
 							<text>{{v.directiveName}}</text>
 						</view>
-						<view style="width: 13vw;height: 13vw;margin: 7vw 0 0 23.5vw;display: block;background: none;" v-if="zlarr.length==0">
+						<view style="width: 13vw;height: 13vw;margin: 7vw 0 0 23.5vw;display: block;background: none;"
-							<image src="/static/index/card/zw.png" mode="aspectFill" style="width:13vw;height: 13vw"></image>
+							v-if="zlarr.length==0">
-							<view style="width: 100%;text-align: center; font-weight: 400; font-size: 1.2vw;color: #555555;margin-top: -3vw;text-align: center;white-space: nowrap;">
+							<image src="/static/index/card/zw.png" mode="aspectFill" style="width:13vw;height: 13vw">
+							</image>
+							<view
+								style="width: 100%;text-align: center; font-weight: 400; font-size: 1.2vw;color: #555555;margin-top: -3vw;text-align: center;white-space: nowrap;">
 								暂无服务指令
 							</view>
 						</view>
@@ -71,7 +92,7 @@
 			<errorshow :show="error" :font="msg" @close="error=false" style="left: 44%;" />
 			<view class="mengban" v-if="jszlshow" @click="jszlshow = false"></view>
 		</view>
-		<serveswipe ref="serves" style="margin-top: -2.5vw;"></serveswipe>
+		<serveswipe ref="serves"></serveswipe>
 	</view>
 	<view class="index-content-right" :style="transition?{opacity: `1`}:{opacity: `0`}">
 		<view class="right-time">
@@ -111,8 +132,7 @@
 					v-for="(item,index) in filteredMenu(2)" :key="index" @click="clickmenu(index)">
 					<!-- <image class="list-img"
 						:src="`/static/index/newindex/leftmenu/ware${item.elderInfo?.name?`blue`:`white`}.png`" /> -->
-						<image class="list-img"
+					<image class="list-img" :src="`/static/index/newindex/leftmenu/wareblue.png`" />
-							:src="`/static/index/newindex/leftmenu/wareblue.png`" />
 					<view class="">
 						<view class="first-line">
 							<view style="font-size: 1.2vw;">
@@ -242,7 +262,7 @@
 	const clickmenu = (index : number) => {
 		menutarget.value = index
 		let data = filteredMenu(2)[index];
-		console.log(data)
+		// console.log(data)
 		uni.setStorageSync('nuId', data.nuId);
 		uni.setStorageSync('nuName', data.nuName);
 		uni.setStorageSync('elderId', data?.elderInfo ? data.elderInfo?.id : null);
@@ -271,7 +291,7 @@
 			// elderId:elderId
 		}
 		queryAll(data).then(res => {
-			console.log(res)
+			// console.log(res)
 			zlarr.value = res.result.ckList;
 		})
 	}
@@ -431,6 +451,7 @@
 		z-index: 100;
 		background: RGBA(239, 240, 244, 0.55);
 	}
+
 	.photowall {
 		position: fixed;
 		top: 54%;
@@ -444,6 +465,7 @@
 		z-index: 9990;
 		box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.1);
 		padding: 0 90rpx;
+
 		.photowall-title {
 			margin-top: 50rpx;
 			display: flex;
@@ -472,6 +494,7 @@
 			display: flex;
 			margin-top: 20rpx;
 			flex-wrap: wrap;
+
 			.photowall-other-one {
 				width: 22vw;
 				height: 430rpx;
@@ -480,6 +503,7 @@
 				border-radius: 1.6vw;
 				display: flex;
 				position: relative;
+
 				video {
 					width: 100%;
 					height: 100%;
@@ -487,30 +511,38 @@
 			}
 		}
 	}
+
 	.index-content-right {
-		width: 19.5vw;
+		width: 23vw;
-		margin-left: 2vw;
 		height: 100%;
 		transition: opacity 1s ease;
-		margin-top: 25rpx;
+		position: relative;
+		left: -0.5vw;
+		margin-top: -0.9vw;
+
 		.right-time {
+			margin-top: 1.2vw;
 			width: 100%;
-			height: 15vh;
+			height: 12vw;
 			background-color: #fff;
 			border-radius: 1.6vw;
 			display: flex;
 			flex-direction: column;
 			justify-content: center;
 			padding-left: 30rpx;
+			padding: 0 2.2vw;
+
 			.time-top {
 				display: flex;
 				align-items: center;
 				font-size: 1.1vw;
+
 				.time-big {
 					font-size: 3.5vw;
 					font-weight: 600;
 					margin-right: 10rpx;
 				}
+
 				.time-week {
 					font-weight: 600;
 				}
@@ -518,11 +550,11 @@
 		}
 
 		.right-top {
+			margin-top: 1vw;
 			width: 100%;
-			height: 35vh;
+			height: 22vw;
 			background-color: #fff;
 			border-radius: 1.6vw;
-			margin-top: 25rpx;
 
 			.top-title {
 				width: 80%;
@@ -539,6 +571,7 @@
 				width: 100%;
 				height: 26vh;
 				margin-top: 1vw;
+
 				.list-view {
 					width: 86%;
 					margin-left: 7%;
@@ -554,6 +587,22 @@
 						height: 4vw;
 						margin-left: 0.5vw;
 						margin-right: 0.5vw;
+						position: relative;
+
+						view {
+							width: 0.8vw;
+							height: 0.8vw;
+							background: #EE2C35;
+							border-radius: 50%;
+							position: absolute;
+							top: 0.3vw;
+							right: 0.5vw;
+						}
+
+						image {
+							width: 4vw;
+							height: 4vw;
+						}
 					}
 
 					.first-line {
@@ -583,48 +632,17 @@
 			}
 		}
 
-		.right-bottom {
-			margin-top: 25rpx;
-			width: 100%;
-			height: 38vh;
-			background-color: #fff;
-			border-radius: 1.6vw;
-			padding-top: 1vh;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
 
-			.bottom-title {
-
-				width: 100%;
-				padding: 0 8%;
-				display: flex;
-				justify-content: space-between;
-
-				.bottom-carmera {
-					margin-top: 0.5vw;
-					width: 3vw;
-					height: 3vw;
-				}
-			}
-
-			.big-older {
-				margin-top: 0.5vw;
-				width: 9vw;
-				height: 9vw;
-
-				border: 1rpx solid #DCDCDC;
-				border-radius: 50%;
-			}
-		}
 	}
 
 	.index-content-other {
-		margin-left: 1.9vw;
+		width: 67vw;
-		width: 65vw;
 		height: 100%;
-		transition: opacity 1s ease;
+		transition: opacity 0.4s ease;
 		position: relative;
+		margin-left: 1vw;
+		// background-color: red;
+		margin-top: -0.9vw;
 
 		.abs-time {
 			position: absolute;
@@ -643,14 +661,11 @@
 	}
 
 	.right-container-title-nav {
+		margin-top: 1.2vw;
 		display: flex;
 		height: 20vh;
 		position: relative;
 		font-size: 28rpx;
-		margin-top: 25rpx;
-		width: 105%;
-		left: -1vw;
-		z-index: 999;
 	}
 
 	.date {
@@ -659,30 +674,18 @@
 		margin-top: 0.8vw;
 	}
 
-
-
-
-
-
-
-
-
-
-
-
 	.title-card-right {
-		position: absolute;
+		width: 12.6vw;
-		right: 0;
+		height: 12vw;
-		top: 0;
-		width: 10vw;
-		height: 9.4vw;
 		border-radius: 1.6vw;
-		background-color: #E4EBF4;
+		background-color: #FFFFFF;
+		// margin-right: 1.6vw;
+		margin-left: 34.5vw;
+		border: 2rpx solid #FFFFFF;
 		padding: 1.6vw;
-		margin-right: 1.5vw;
+		position: relative;
-		border: 2rpx solid #D2DFF0;
-		z-index: 99;
 	}
+
 	.pao-father {
 		position: absolute;
 		top: 20rpx;
@@ -841,23 +844,62 @@
 	}
 
 	.title-card {
-		width: 10vw;
+		width: 17.2vw;
-		height: 9vw;
+		height: 12vw;
-		border-radius: 2vw;
+		border-radius: 1.6vw;
 		background-color: #FFFFFF;
 		padding: 1.6vw;
 		position: relative;
 		margin-right: 1vw;
-		margin-left: 1vw;
+
+		.mesu {
+			width: 100%;
+			height: 2.5vw;
+			position: absolute;
+			bottom: 2vw;
+			left: 0;
+			padding: 0 1.5vw;
+			display: flex;
+			justify-content: space-between;
+
+			>view {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: space-around;
+				width: 33%;
+				height: 100%;
+
+				&:nth-child(1),
+				&:nth-child(2) {
+					border-right: 1px solid #DCDCDC;
 				}
+
+				>text {
+					&:nth-child(1) {
+						font-weight: bold;
+						font-size: 1.8vw;
+						color: #333333;
+						margin-top: -1vw;
+					}
+
+					&:nth-child(2) {
+						font-weight: 400;
+						font-size: 1vw;
+						color: #333333;
+					}
+				}
+			}
+		}
+	}
+
 	.card-bottom {
 		position: absolute;
 		left: 0;
-			bottom: 0;
+		top: 1.9vw;
 		width: 100%;
 		height: 3vw;
 		display: flex;
-			z-index: 999;
 
 		.bottom-img {
 			width: 1.8vw;
@@ -867,24 +909,26 @@
 
 		.bottom-font {
 			color: #555555;
-				font-size: 1.4vw;
+			font-size: 1.5vw;
 			margin-left: 0.5vw;
 		}
 	}
 
+
 	.card-top {
 		width: 100%;
 		display: flex;
-			justify-content: space-between;
+		justify-content: flex-end;
-			position: relative;
+
+
 		.card-top-left {
 			font-size: 1.8vw;
 			font-weight: 600;
 		}
 
 		.card-top-right {
-				width: 2vw;
+			width: 2.3vw;
-				height: 2vw;
+			height: 2.3vw;
 			border-radius: 50%;
 			background-color: #F1F2F3;
 			display: flex;
@@ -892,8 +936,8 @@
 			align-items: center;
 
 			.right-img {
-					width: 0.8vw;
+				width: 1vw;
-					height: 0.8vw;
+				height: 1vw;
 			}
 		}
 
@@ -923,6 +967,7 @@
 			}
 		}
 	}
+
 	.title-time {
 		position: absolute;
 		right: 0;
@@ -1025,6 +1070,7 @@
 			flex-direction: column;
 			align-items: center;
 			margin: 0 1.5vw;
+
 			.card-left-img {
 				width: 12vw;
 				height: 8vw;
@@ -1055,6 +1101,7 @@
 			font-size: 1.5vw;
 			width: 18.5vw;
 			justify-content: space-around;
+
 			.button-left {
 				width: 8.5vw;
 				height: 3.3vw;
@@ -1103,11 +1150,13 @@
 			height: 3vw;
 		}
 	}
+
 	.right-container-tem {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
 		width: 80%;
+		margin-top: 1vw;
 
 		.right-container-tem-text {
 			font-size: 30rpx;
@@ -1121,6 +1170,7 @@
 			transform: translateY(6rpx)
 		}
 	}
+
 	.big-img-nomessage {
 		width: 500rpx;
 		height: 500rpx;
@@ -1132,11 +1182,13 @@
 		-webkit-transform-style: preserve-3d;
 		-webkit-overflow-scrolling: touch;
 	}
+
 	.jsh0 {
 		height: 0vw !important;
 		padding: 0 2vw !important;
 		top: 9.4vw !important;
 	}
+
 	.jszl {
 		width: 64.5vw;
 		height: 44vw;
@@ -1149,6 +1201,7 @@
 		z-index: 200;
 		padding: 2vw;
 		overflow: hidden;
+
 		.submit {
 			width: 100%;
 			height: 3.2vw;
@@ -1156,10 +1209,12 @@
 			padding-right: 2vw;
 			display: flex;
 			justify-content: flex-end;
+
 			view {
 				display: flex;
 				justify-content: center;
 				align-items: center;
+
 				&:nth-child(1) {
 					width: 7.1vw;
 					height: 3.2vw;
@@ -1170,6 +1225,7 @@
 					font-size: 1.4vw;
 					color: #555555;
 				}
+
 				&:nth-child(2) {
 					width: 7.1vw;
 					height: 3.2vw;
@@ -1183,6 +1239,7 @@
 				}
 			}
 		}
+
 		.scrol {
 			width: 110%;
 			height: 30vw;
@@ -1198,11 +1255,13 @@
 				display: inline-block;
 				border: 1px solid #F8F8F8;
 				text-align: center;
+
 				image {
 					width: 2vw;
 					height: 2vw;
 					margin: 1.4vw auto 0vw;
 				}
+
 				text {
 					display: block;
 					text-align: center;
@@ -1212,20 +1271,24 @@
 					width: 100%;
 				}
 			}
+
 			.act {
 				background: #F2F8FF;
 				border: 1px solid rgba(1, 125, 233, 0.43);
+
 				text {
 					color: #017DE9;
 				}
 			}
 		}
+
 		.spiw {
 			width: 14vw;
 			height: 2vw;
 			display: flex;
 			margin-top: 2.5vw;
 			padding-left: 1.5vw;
+
 			view {
 				font-weight: 400;
 				font-size: 1.3vw;
@@ -1233,10 +1296,12 @@
 				position: relative;
 				line-height: 1.5vw;
 			}
+
 			.act {
 				color: #222222 !important;
 				font-weight: 500;
 			}
+
 			.act::after {
 				width: 50%;
 				height: 0.2vw;
@@ -1248,6 +1313,7 @@
 				left: 25%;
 			}
 		}
+
 		.tittop {
 			height: 2vw;
 			font-weight: 400;
@@ -1255,6 +1321,7 @@
 			color: #333333;
 			display: flex;
 			align-items: center;
+
 			view {
 				width: 0.4vw;
 				height: 1.2vw;
@@ -1264,6 +1331,7 @@
 			}
 		}
 	}
+
 	.bianj {
 		position: absolute;
 		width: 2.2vw;
@@ -1271,11 +1339,13 @@
 		top: 9.68vw;
 		right: 2.5vw;
 		z-index: 220;
+
 		image {
 			width: 100%;
 			height: 100%;
 		}
 	}
+
 	.mengban {
 		width: 100vw;
 		height: 100vh;
@@ -1285,4 +1355,38 @@
 		z-index: 10;
 		background: RGBA(239, 240, 244, 0.55);
 	}
+
+	.right-bottom {
+		margin-top: 2vh;
+		width: 100%;
+		height: 24vw;
+		background-color: #fff;
+		border-radius: 3vh;
+		padding-top: 1vh;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.bottom-title {
+
+			width: 100%;
+			padding: 0 8%;
+			display: flex;
+			justify-content: space-between;
+
+			.bottom-carmera {
+				margin-top: 0.5vw;
+				width: 3vw;
+				height: 3vw;
+			}
+		}
+
+		.big-older {
+			margin-top: 0.5vw;
+			width: 9vw;
+			height: 9vw;
+			border: 1rpx solid #DCDCDC;
+			border-radius: 50%;
+		}
+	}
 </style>

pages/Warehouse/index/index.vue

@@ -1,12 +1,57 @@
 <template>
 	<view>
-		<view class="flex">
+		<view class="flex" @touchmove.stop="getxy" @touchend.stop="cleanall">
+			<!-- 手指拖动 -->
+			<view class="box" :style="boxStyle" v-if="!whoisit">
+				<view class="title-time-blue">
+					<image class="blue-img" lazy-load src="/static/index/target.png" />
+				</view>
+
+				<image class="card-icon" :src="movelook.url" mode="aspectFill"></image>
+				<view class="card-text" style="margin-top: 0;" :style="movelook.title.length>6?{fontSize:`24rpx`}:{}">
+					{{ movelook.title }}
+				</view>
+
+			</view>
+			<view class="card-box" :style="boxStyle" v-if="whoisit">
+				<view class="title-time-blue-card">
+					<image class="blue-img" src="/static/index/bluetarget.png" />
+				</view>
+				<view class="card-bao" v-if="simpleobj.izPackage==`Y`">
+					包
+				</view>
+				<view class="title-time-border-hisOk">
+					<view class="title-time">
+						<view class="title-time-font-rel">
+							{{ splitString(simpleobj.directiveName)[0]}}
+						</view>
+						<view v-if="splitString(simpleobj.directiveName)[1]" class="title-time-font-tags">
+							({{ splitString(simpleobj.directiveName)[1]}})
+						</view>
+						<view class="card-time">
+
+							<view class="weight-time">
+								{{ simpleobj.startTime  }}
+								<text style="margin: 0 3rpx;">
+									-
+								</text>
+								{{ simpleobj.endTime }}
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="delete-view" :style="isblue==`3`?{backgroundColor: `rgba(255, 239, 239, 0.8)`}:{}"
+				v-if="!startmoveit&&whoisit">
+				<image class="delete-img" :src="`/static/index/trash${isblue==`3`?`target`:``}.png`" />
+			</view>
 			<view class="left">
 				<leftcontent :list="arrlist" @navurl="navurl" :userInfo="userInfo"></leftcontent>
 			</view>
 			<view class="boxrt">
 				<index :isShow="menuop == 0" v-if="swipdex == 0" @swip="swip" />
-				<material :isShow="menuop == 1" v-if="swipdex == 1&&!specialPage" ref="materials" @changepages="changeNumber"></material>
+				<material :isShow="menuop == 1" v-if="swipdex == 1&&!specialPage" ref="materials"
+					@changepages="changeNumber"></material>
 				<materialcar v-if="swipdex == 1&&specialPage==1"></materialcar>
 				<purchaseorder v-if="swipdex == 1&&specialPage==2"></purchaseorder>
 
@@ -18,10 +63,13 @@
 					@changepages="changepages"></inventory>
 				<addtory :isShow="menuop == 6" v-if="swipdex == 6&&specialPage=='1'" :specialitem="specialitem">
 				</addtory>
-				<nurse :isshow="menuop == 7" v-if="swipdex==7&&uni.getStorageSync('nuId')" />
+				<!-- <nurse :isshow="menuop == 7" v-if="swipdex==7&&uni.getStorageSync('nuId')" /> -->
 				<!-- <invoicing :isshow="menuop == 8" v-if="swipdex==8&&uni.getStorageSync('nuId')" /> -->
 				<logistics :isshow="menuop == 9" v-if="swipdex==9&&uni.getStorageSync('nuId')" />
-				<invoicing :isshow="menuop == 10" v-if="swipdex==10&&uni.getStorageSync('nuId')" />
+				<!-- <warehousematrix :isshow="menuop == 10" v-if="swipdex==10&&uni.getStorageSync('nuId')" /> -->
+				<warehousematrix :isshow="menuop==10" v-if="swipdex==10" :canmove="startmoveit" :sendxy="targetrule"
+					:isblue='isblue' :howtomove="howtomove" :targetrule="targetrule" @handsend="handsend"
+					@rulepush="rulepush" @cleanall="cleanall" />
 			</view>
 		</view>
 	</view>
@@ -35,6 +83,7 @@
 	import material from "@/pages/procurement/material.vue";
 	import materialcar from "@/pages/procurement/materialcar.vue";
 	import purchaseorder from "@/pages/procurement/purchaseorder.vue";
+	import { getNcPackagelist } from '@/pages/NursingNew/component/nurse/api.js'
 
 	import index from "./component/index.vue"
 
@@ -47,9 +96,9 @@
 	import retstock from "@/pages/procurement/retstock.vue";
 
 	// import logistics from "@/pages/NursingNew/component/logistics/index.vue"
-	import invoicing from "@/pages/NursingNew/component/invoicing/index.vue"
+	import warehousematrix from "@/pages/NursingNew/component/warehousematrix/newindex.vue"
 	import logistics from "@/pages/NursingNew/component/logistics/index.vue"
-	import nurse from "@/pages/NursingNew/component/nurse/index.vue"
+	// import nurse from "@/pages/NursingNew/component/nurse/index.vue"
 
 	const tabbrarr = ref([
 		{ name: '护理', url: '/static/shouye/sy/n0.png', urls: '/static/shouye/sy/n1.png', type: 'kzgn_hljz' },
@@ -68,7 +117,26 @@
 			return false; // 禁止返回手势返回
 		}
 	})
+	// 当前选中的菜单索引
+	const menuIndex = ref<number>(-1);
+	const swipedex = ref<number>(-1);
+	onMounted(() => {
+		menuIndex.value = 0;
+		swipedex.value = 0;
 		
+		getNcPackagelist(`3`).then((res : any) => {
+			//缓存指令包
+			// console.log("缓存指令包", res)
+			uni.setStorageSync("Packagelist1", res.result)
+		})
+		getPermissionList({ employeesId: uni.getStorageSync('userInfo').employeesId }).then(res => {
+			listarr.value = res.result;
+			// console.log("这个是啥", listarr.value)
+		})
+	})
+	const gospecial = (index : number) => {
+		specialPage.value = index
+	}
 	const specialPage = ref(0)
 	const specialitem = ref({})
 	const changepages = (item : any) => {
@@ -234,6 +302,277 @@
 			inventorys.value.firstgetqueryCgdList()
 		}
 	})
+	const clientX = ref(0);
+	const clientY = ref(0);
+	const savename = ref("")
+
+
+	onShow(() => {
+		userInfo.value = uni.getStorageSync('userInfo');
+	})
+	const box = ref(null);
+	const boxStyle = ref({
+		transform: 'translate3d(-500px, -500px, 0px)',
+	});
+
+	function handmove(wh : number[]) {
+		// 直接更新 transform（父组件可频繁调用）
+		const nx = Number(wh[0]) || 0;
+		const ny = Number(wh[1]) || 0;
+		// console.log("----", nx, ny)
+		if (whoisit.value) {
+			boxStyle.value = {
+				transform: `translate3d(${nx - 70}px, ${ny - 60}px, 0)`
+			};
+		} else {
+			boxStyle.value = {
+				transform: `translate3d(${nx - 100}px, ${ny - 70}px, 0)`
+			};
+
+		}
+
+	}
+	const movelook = ref({
+		url: "",
+		title: "",
+		type: 0
+	})
+	const startmoveit = ref(true)
+	const whoisit = ref(0);
+	const simpleobj = ref({
+		startTime: "",
+		endTime: "",
+		directiveName: "",
+		izPackage: '',
+	})
+
+	function handsend(look : any) {
+		isblue.value = 0;
+		// console.log("look",look)
+		if (look.levle) {
+			whoisit.value = 0;
+
+			movelook.value.url = uni.getStorageSync('imagebase') + look.immediateFileFocus;
+			if (!look.immediateFileFocus) {
+				movelook.value.url = `/static/logotarget.png`
+			}
+			console.log("咋没了", movelook.value.url)
+			movelook.value.title = look.title;
+			movelook.value.type = 0;
+			startmoveit.value = false
+		} else if (look.packageName) {
+			whoisit.value = 0;
+			movelook.value.url = `/static/index/packtarget.png`
+			movelook.value.title = look.packageName;
+			movelook.value.type = 1;
+			startmoveit.value = false
+		}
+
+		else {
+			whoisit.value = 1;
+			simpleobj.value.startTime = look.startTime;
+			simpleobj.value.endTime = look.endTime;
+			simpleobj.value.directiveName = look.directiveName;
+			simpleobj.value.izPackage = look.izPackage;
+			startmoveit.value = false
+		}
+	}
+
+	//节流函数
+	function throttle(fn, delay) {
+		let lastExecutionTime = 0;
+		return function (...args) {
+			const now = Date.now();
+			if (now - lastExecutionTime >= delay) {
+				lastExecutionTime = now;
+				fn.apply(this, args);
+			}
+		};
+	}
+	const canTrigger = ref(true);
+	//全局获得x轴和y轴
+	const animation = uni.createAnimation({
+		duration: 0,
+		timingFunction: 'linear',
+		delay: 0
+	});
+	const animationData = ref({});
+	let ticking = false;
+	let handle = null;
+	const sendxy = ref([0, 0])
+	const isblue = ref(0)
+	const getxyrel = (event) => {
+		event.preventDefault()
+		// console.log("////",)
+		if (!startmoveit.value) {
+			const touch = event.touches[0];
+			const a = touch.clientX.toFixed(2);
+			const b = touch.clientY.toFixed(2);
+
+			isblue.value = inArea(a, b)
+			// console.log(a, b)
+			handmove([a, b])
+			if (whoisit.value) {
+				detectorMove(a, b); // ← 替换原来的 handmove([a,b])
+			}
+		}
+	}
+	const rules = ref([])
+	const rulepush = (array : any) => {
+		targetrule.value = [-1, -1]
+		rules.value = array
+	}
+	const targetrule = ref([-1, -1])
+	function inArea(x, y) {
+		if (!whoisit.value) {
+			if (x >= 790 &&
+				x <= 1062 &&
+				y >= 37 &&
+				y <= 255) {
+				return 1
+			} else {
+				return 0
+			}
+		} else {
+			// console.log("000",x)
+			if (x > 1000) {
+				return 3
+			}
+
+			for (let i = rules.value.length - 1; i >= 0; i--) {
+				const it = rules.value[i]
+				if (x >= it.left && x <= it.right && y >= it.top && y <= it.bottom) {
+					const raw0 = it.dataset?.index0
+					const raw1 = it.dataset?.index1
+					const n0 = raw0 === undefined ? NaN : Number(raw0)
+					const n1 = raw1 === undefined ? NaN : Number(raw1)
+					if (!isNaN(n0) && !isNaN(n1)) {
+						if (n0 != targetrule.value[0] || n1 != targetrule.value[1]) {
+							targetrule.value = [n0, n1]
+						}
+						return 2
+					}
+				}
+			}
+			// 没找到匹配项，设为 [-1, -1] 并返回 0
+			if (targetrule.value[0] !== -1 || targetrule.value[1] !== -1) {
+				targetrule.value = [-1, -1]
+			}
+			return 2
+		}
+	}
+	const getxy = throttle(getxyrel, 40);
+	const cleanall = (event) => {
+		// setTimeout(()=>{
+		if (whoisit.value) {
+			detectorEnd(); // ← 替换原来的 handmove([a,b])
+		}
+		handmove([-200, -200])
+		startmoveit.value = true;
+		// },100)
+	}
+	// 切割bigArray
+	function splitString(str) {
+		// 使用正则表达式找到所有括号的内容
+		let result = [];
+		let remainingStr = str;
+		// 正则匹配最外层括号（支持全角和半角）
+		let regex = /([^（(]*)[（(]([^）)]+)[）)]/;
+		while (regex.test(remainingStr)) {
+			let match = remainingStr.match(regex);
+			if (match) {
+				// 添加括号前的部分（去掉空白）
+				if (match[1].trim()) {
+					result.push(match[1].trim());
+				}
+				// 添加括号内的内容
+				if (match[2].trim()) {
+					result.push(match[2].trim());
+				}
+				// 更新剩余的字符串
+				remainingStr = remainingStr.replace(match[0], '').trim();
+			}
+		}
+		// 如果最后还有剩余部分，也加入结果
+		if (remainingStr.trim()) {
+			result.push(remainingStr.trim());
+		}
+		return result;
+	}
+	// ---------- 配置 ----------
+	const HOLD_MS = 350; // 0.5s 窗口
+	const RESET_MS = 100; // 0.1s 占位
+
+	// 判断方向（返回 [-1/0/1, -1/0/1]：x方向, y方向）
+	function getDir(x, y) {
+		const dx = (x <= 150 ? -1 : (x >= 710 && x < 825 ? 1 : 0));
+		const dy = (y <= 80 ? -1 : (y >= 550 ? 1 : 0));
+		return [dx, dy];
+	}
+
+	const howtomove = ref([2, 2])
+
+	// ---------- 状态 ----------
+	let windowTimer = null;      // 500ms 的计时器 id
+	let windowStartDir = null;   // 初始方向数组 [dx,dy]
+	let windowValid = false;     // 在窗口期间是否一直保持初始方向
+	let inCooldown = false;      // 触发后 0.1s 的占位期间，忽略新窗口
+
+	// 触发回调（你可以改成发事件或改成 setState）
+	function onDetected(arr) {
+		howtomove.value = arr
+		// console.log('DETECT ->', arr); // 例如 [1,1] 或 [-1,-1] 或 [2,2]
+		// 在这里把 arr 发给你的业务：比如更新某个 ref / 调用方法等
+	}
+
+	// 窗口到期时处理
+	function finishWindow() {
+		windowTimer = null;
+		// 如果窗口期间一直有效 且 方向不是 [0,0]
+		if (windowValid && windowStartDir && (windowStartDir[0] !== 0 || windowStartDir[1] !== 0)) {
+			onDetected(windowStartDir.slice()); // 立即返回方向
+			inCooldown = true;
+			// 0.1s 后返回占位 [2,2]，并结束 cooldown
+			setTimeout(() => {
+				onDetected([2, 2]);
+				inCooldown = false;
+			}, RESET_MS);
+		}
+		// 清理窗口状态（等待下一次 move 启动新窗口）
+		windowStartDir = null;
+		windowValid = false;
+	}
+
+	// 在 touchmove/getxyrel 中调用：传入数字 x,y
+	function detectorMove(x, y) {
+		if (inCooldown) return; // 占位期间忽略输入
+
+		const dir = getDir(x, y); // [dx,dy]
+
+		if (!windowTimer) {
+			// 没有在计时：开启一个新窗口
+			windowStartDir = dir.slice ? dir.slice() : [dir[0], dir[1]];
+			windowValid = true;
+			windowTimer = setTimeout(finishWindow, HOLD_MS);
+			return;
+		}
+
+		// 已在窗口中：只要方向与初始方向不同就把窗口标为无效
+		if (dir[0] !== windowStartDir[0] || dir[1] !== windowStartDir[1]) {
+			windowValid = false;
+		}
+	}
+
+	// 在 touchend / touchcancel 时调用，清理所有状态
+	function detectorEnd() {
+		if (windowTimer) {
+			clearTimeout(windowTimer);
+			windowTimer = null;
+		}
+		windowStartDir = null;
+		windowValid = false;
+		inCooldown = false;
+	}
 </script>
 
 <style scoped lang="less">
@@ -261,4 +600,173 @@
 		// padding-left: 1vw;
 		padding-top: 0.8vw;
 	}
+
+	.box {
+		position: fixed;
+		left: 0;
+		top: 0;
+		width: 190rpx;
+		height: 140rpx;
+		border-radius: 20rpx;
+		background: #fff;
+		will-change: transform;
+		pointer-events: none;
+		z-index: 200;
+		border: 2rpx dashed #0089FE;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+
+		.card-icon {
+			width: 55rpx;
+			height: 55rpx;
+			/* margin-bottom: 10rpx; */
+		}
+
+		.card-text {
+			margin-top: -10rpx;
+			color: #0089FE;
+			font-size: 26rpx;
+		}
+
+		.title-time-blue {
+			/* 你的定位与尺寸保持不变 */
+			position: absolute;
+			top: 50%;
+			left: 50%;
+			transform: translate(-50%, -50%);
+			width: 107%;
+			height: 105%;
+			z-index: 10;
+
+			.blue-img {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+
+	.card-box {
+		position: fixed;
+		left: 0;
+		top: 0;
+		width: 259rpx;
+		height: 245rpx;
+		border-radius: 20rpx;
+		background: #fff;
+		will-change: transform;
+		pointer-events: none;
+		z-index: 200;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+
+		.title-time-blue-card {
+			position: absolute;
+			top: 50%;
+			left: 50%;
+			transform: translate(-50%, -50%);
+			width: 98%;
+			height: 98%;
+			z-index: 10;
+
+			.blue-img {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.card-bao {
+			position: absolute;
+			left: 35rpx;
+			top: 110rpx;
+			width: 32rpx;
+			height: 32rpx;
+			font-size: 24rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			background-color: #4690FF;
+			color: #fff;
+			border-radius: 5rpx;
+		}
+
+		.title-time-border-hisOk {
+			border: 2rpx solid #D4E4FE;
+			width: calc(100% - 15rpx);
+			height: calc(100% - 15rpx);
+			border-radius: 20rpx;
+			display: flex;
+			align-items: center;
+			background-color: #F6F9FF;
+			flex-direction: column;
+			font-size: 30rpx;
+			overflow: hidden;
+			border: 2rpx solid #46B2F6;
+
+			.title-time {
+				display: flex;
+				width: 100%;
+				position: relative;
+				height: 100%;
+				padding: 25rpx;
+				padding-top: 18rpx;
+				flex-direction: column;
+
+				.title-time-font-rel {
+					margin-top: 9rpx;
+					font-size: 33rpx;
+					font-weight: 800;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+					color: black;
+				}
+
+				.title-time-font-tags {
+					font-size: 24rpx;
+					font-weight: 600;
+					/* margin-bottom: 5rpx; */
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+					color: #999;
+				}
+
+				.card-time {
+					position: absolute;
+					bottom: 30rpx;
+					left: 30rpx;
+					font-size: 30rpx;
+
+					.weight-time {
+						display: flex;
+					}
+				}
+			}
+
+		}
+	}
+
+	.delete-view {
+		position: fixed;
+		right: -950rpx;
+		top: 3%;
+		width: 1100rpx;
+		height: 1100rpx;
+		border-radius: 50%;
+		background-color: rgba(238, 240, 248, 0.4);
+		z-index: 150;
+
+		.delete-img {
+			position: absolute;
+			top: 50%;
+			transform: translateY(-50%);
+			left: 50rpx;
+			width: 60rpx;
+			height: 65rpx;
+		}
+	}
 </style>

pages/Warehouse/picking.vue

@@ -2437,6 +2437,7 @@
 					margin-top: 10rpx;
 					width: 150rpx;
 					height: 150rpx;
+					border-radius: 1vw;
 				}
 
 				.middle-right {
@@ -2520,6 +2521,7 @@
 				height: 250rpx;
 				margin-left: 50rpx;
 				margin-top: 2vw;
+				border-radius: 1vw;
 				// margin-right: 50rpx;
 			}
 
@@ -2614,8 +2616,8 @@
 		width: 35rpx;
 		height: 35rpx;
 		position: absolute;
-		right: 220rpx;
+		right: 190rpx;
-		top: 50%;
+		top: 47%;
 		transform: translateY(-50%);
 	}
 

pages/login/newanimationpage.vue

@@ -145,7 +145,7 @@
 		if (len === 10) return '1.3vw'      // 恰好10字
 		if (len < 10) return '1.5vw'      // 少于10字
 		if (len <= 15) return '1.1vw'      // 11~15字
-		return '0.9vw'                      // 超过15字1
+		return '1vw'                      // 超过15字1
 	})
 	onHide(() => {
 		playall.value = false;
@@ -276,6 +276,7 @@
 			// console.log("????0", res)
 			getServiceTree1().then((res : any) => {
 				//缓存护嘱菜单
+				// console.log("tree在哪",res)
 				uni.setStorageSync("saveTree1", res)
 				// console.log("????1", res)
 			})
@@ -314,9 +315,9 @@
 			})
 		}
 		if (index == 1) {
-			uni.navigateTo({
+			// uni.navigateTo({
-				url: '/pages/recording/recorder'
+			// 	url: '/pages/recording/recorder'
-			})
+			// })
 		}
 
 		// if (index == 2) {
@@ -624,7 +625,8 @@
 
 	.unit-text {
 		position: fixed;
-		bottom: 28.5vw;
+		// bottom: 28.5vw;
+		top: 32.5vw;
 		left: 18vw;
 		z-index: 12;
 		display: inline-block;
@@ -635,6 +637,8 @@
 		/* 负值 = 缩小 */
 		font-size: 1.2vw;
 		color: #0089FE;
+		width: 13vw;
+		// background-color: blue;
 	}
 
 	.unit-image {

pages/procurement/common/toryitem.vue

@@ -338,6 +338,7 @@
 			display: inline-block;
 			margin: 0 0.9vw 0.5vw 0;
 			position: relative;
+			// padding-top: 3vw;
 			z-index: 20;
 			top: 0;
 
@@ -395,7 +396,7 @@
 					position: absolute;
 					display: flex;
 					bottom: 0.7vw;
-					left: 0;
+					left: 1vw;
 					.triangle-leftpz {
 						width: 2vw;
 						height: 1.5vw;
@@ -560,7 +561,7 @@
 						background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
 						border-radius: 1.3vw;
 						border: 1px solid rgba(3, 133, 250, 0.34);
-						right: 1.4vw;
+						right: 3vw;
 						top: 0;
 						position: absolute;
 						font-weight: 400;
@@ -679,8 +680,8 @@
 				height: 100%;
 				overflow: hidden;
 				position: absolute;
-				left: 15vw;
+				left: 18vw;
-				top: 0;
+				top: 0.5vw;
 
 				.wltwo {
 					width: 11vw;
@@ -762,8 +763,8 @@
 				display: flex;
 				flex-direction: column;
 				position: absolute;
-				left: 1vw;
+				left: 2vw;
-				top: 0;
+				top: 0.5vw;
 
 				.cardp {
 					width: 14vw;
@@ -813,6 +814,7 @@
 					>image {
 						width: 9vw;
 						height: 9vw;
+						margin-left: 1vw;
 						border-radius: 0.4vw;
 					}
 				}

pages/procurement/common/torytor.vue

@@ -156,7 +156,7 @@
 		.rigsbt{
 			width: 19vw;
 			height: 100%;
-			margin-right: 4vw;
+			margin-right: 8vw;
 			
 			.calculator-father {
 				width: 18vw;
@@ -192,7 +192,7 @@
 			justify-content: space-around;
 			align-items: center;
 			padding: 0 1.5vw;
-			margin-left: 4vw;
+			margin-left: 2.5vw;
 			.shu{
 				font-weight: 400;
 				font-size: 1.2vw;

pages/procurement/components/carditem.vue

@@ -8,7 +8,7 @@
 						:scroll-left="v.scrollleft" @scroll="scroll" >
 						<view class="speitem guodu" >
 							<view class="imghs">
-								<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'"
+								<image style="border-radius: 1vw;" :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'"
 									mode="aspectFill">
 								</image>
 							</view>
@@ -94,9 +94,9 @@
 	const serverUrl = ref('')
 	onMounted(() => {
 		serverUrl.value = uni.getStorageSync('serverUrl') + '/sys/common/static/';
-		setTimeout(()=>{
+		// setTimeout(()=>{
-			console.log(serverUrl.value+props.InvoicingList[0].materialImg)
+		// 	console.log(serverUrl.value+props.InvoicingList[0].materialImg)
-		},3000)
+		// },3000)
 	})
 	const caigouobj = ref({})
 	const addcar = (v : any,i:number) => {
@@ -236,7 +236,7 @@
 				}
 
 				&:nth-child(1) {
-					background: #dcdee1;
+					background: #e3e5e7;
 					color: #555555;
 				}
 			}
@@ -254,8 +254,10 @@
 			display: flex;
 			justify-content: center;
 			align-items: center;
-			top: 1.5vw;
+			top:50%;
-			right:1.2vw;
+			transform: translateY(-50%);
+			// top: 0.8vw;
+			right:0.8vw;
 			>view {
 				width: 4.5vw;
 				height: 1.8vw;
@@ -269,13 +271,13 @@
 				justify-content: center;
 				align-items: center;
 				position: absolute;
-				top: 0.8vw;
+				top: 2.3vw;
-				right:1.6vw;
+				right:0.8vw;
 			}
 
 			image {
-				width: 3vw;
+				width: 2.5vw;
-				height: 3vw;
+				height: 2.5vw;
 			}
 		}
 
@@ -299,7 +301,7 @@
 					overflow: hidden;
 					text {
 						font-weight: 400;
-						font-size: 1.4vw;
+						font-size: 1.3vw;
 						color: #777777;
 						margin-top: 0.25vw;
 					}
@@ -409,6 +411,7 @@
 				flex-wrap: wrap;
 				margin: 0 auto;
 				align-items: center;
+				margin-top: -1vw;
 
 				view {
 					min-width: 5.5vw;

pages/procurement/components/carlist.vue

@@ -15,7 +15,7 @@
 						:scroll-left="v.scrollleft" @scroll="scroll" :class="v.flag?'actve':''">
 						<view class="speitem guodu">
 							<view class="imghs">
-								<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'"
+								<image style="border-radius: 1vw;" :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'"
 									mode="aspectFill">
 								</image>
 							</view>

pages/procurement/components/inboundoutbound.vue

@@ -43,8 +43,8 @@
 						<text> </text>
 					</view>
 				</view>
-				<defaults cont="暂无内容" v-if="list.length == 0 && status == 'nomore'"></defaults>
+				<defaults style="margin-top: 20rpx;" cont="暂无内容" v-if="list.length == 0 && status == 'nomore'"></defaults>
-				<view style="height:2vw;width: 100%;display: flex;align-items: center;justify-content: center;">
+				<view style="height:2vw;width: 100%;display: flex;align-items: center;justify-content: center;margin-top: 20rpx;">
 					<u-loadmore :status="status" :loadText="{nomore:'暂无更多数据'}" v-if="list.length>3" />
 				</view>
 			</scroll-view>
@@ -318,9 +318,9 @@
 							
 						}
 						image {
-							width: 0.7vw;
+							width: 1vw;
-							height: 0.5vw;
+							height: 1vw;
-							margin-left: 0.4vw;
+							margin-left: 0.3vw;
 						}
 
 					}

pages/procurement/inventory.vue

@@ -3,6 +3,8 @@
 		<view class="buttons-father">
 			<view class="ipt">
 				<input type="text" v-model="plzinfo.pddInfo" placeholder="盘点单号/盘点人/盘点日期" @confirm="clickconfirm" />
+				<image v-show="plzinfo.pddInfo" src="@/static/x.png"
+					@click="chongzhi()" />
 			</view>
 			<view class="scr" @click="clickconfirm">
 				检索
@@ -552,7 +554,7 @@
 		if (!plzinfo.canpull) return
 		queryPddList(plzinfo).then((res : any) => {
 			plsbuy.value.push(...res.result.records)
-			console.log("????", plzinfo, res.result.records)
+			// console.log("????", plzinfo, res.result.records)
 			alltotal.value = res.result.total
 			if (res.result.records.length < plzinfo.pageSize) {
 				plzinfo.canpull = false;
@@ -610,22 +612,34 @@
 		position: relative;
 
 		.ipt {
-			display: flex;
+			// display: flex;
-			align-items: center;
+			// align-items: center;
+			// width: 20vw;
+			// background: #E2E4E9;
+			// border-radius: 1.65vw;
+			// height: 3.3vw;
+			// position: relative;
 			width: 20vw;
-			background: #E2E4E9;
-			border-radius: 1.65vw;
 			height: 3.3vw;
+			background-color: #fff;
+			font-size: 27.5rpx;
+			// padding-left: 26rpx;
+			border-radius: 40rpx;
+			// padding-top: 2rpx;
+			border: 2rpx solid #C9C9C9;
 
 			image {
-				width: 2.2vw;
+				width: 35rpx;
-				height: 2.2vw;
+				height: 35rpx;
-				margin: 0 0.5vw;
+				position: absolute;
+				left: 370rpx;
+				top: 30%;
+				transform: translateY(-30%);
 			}
 
 			input {
 				width: 18vw;
-				height: 3.5vw;
+				height: 3.3vw;
 				font-size: 1.4vw;
 				padding-left: 1.6vw;
 
@@ -815,7 +829,7 @@
 
 	.all-contain {
 		width: 100.5%;
-		height: 89vh;
+		height: 88.2vh;
 
 		.all-scroll {
 			width: 100%;
@@ -831,7 +845,7 @@
 					width: 32%;
 					margin-right: 1%;
 					margin-bottom: 1%;
-					height: 384rpx;
+					height: 380rpx;
 					background-color: #fff;
 					border-radius: 30rpx;
 					// padding: 0 1%;

pages/procurement/material.vue

@@ -206,7 +206,7 @@
 	});
 	const queryInvo = () => {
 		queryInvoicingList(form).then(res => {
-			console.log(res)
+			// console.log(res)
 			res.result.records.forEach(item => {
 				item.zk = false;
 				item.scrollleft = 0;

pages/procurement/materialcar.vue

@@ -4,7 +4,7 @@
 			<view class="leftbtn">
 				<view class="ipt">
 					<input type="text" placeholder="物料名称/物料编码/物料简拼" v-model="form.wlParamInfo" @confirm="search(0)" />
-					<image src="/static/index/procurement/x.png" mode="aspectFill" v-if="form.wlParamInfo"
+					<image class="title-input-img" src="/static/index/procurement/x.png" mode="aspectFill" v-if="form.wlParamInfo"
 						@click="search(0)"></image>
 				</view>
 				<view @click="search" class="scr">
@@ -359,12 +359,13 @@
 			border-radius: 1.65vw;
 			height: 3.3vw;
 			padding-left: 1.1vw;
+			position: relative;
 
-			image {
+			// image {
-				width: 1.8vw;
+			// 	width: 1.8vw;
-				height: 1.8vw;
+			// 	height: 1.8vw;
-				margin: 0 0.5vw;
+			// 	margin: 0 0.5vw;
-			}
+			// }
 
 			input {
 				width: 100%;
@@ -468,6 +469,14 @@
 		z-index: 90;
 		background: RGBA(239, 240, 244, 0.55);
 	}
+	.title-input-img {
+		width: 35rpx;
+		height: 35rpx;
+		position: absolute;
+		right: 20rpx;
+		top: 48%;
+		transform: translateY(-50%);
+	}
 </style>
 <style>
 	/* page {

pages/procurement/outbound.vue

@@ -3,12 +3,18 @@
 		<view class="buttons-father">
 			<input class="title-input" type="text" v-model="plzinfo.searchContent" placeholder="请领单号/请领人/请领日期"
 				@confirm="clickconfirm" />
+			<image v-show="plzinfo.searchContent" class="title-input-img" src="@/static/x.png"
+				@click="chongzhi();handleClick1()" />
 			<view class="title-ball" @click="clickconfirm();handleClick()">
 				<image class="title-ball-img" :src="imgSrc" mode="aspectFill"></image>
 			</view>
 			<view class="title-ball" @click="chongzhi();handleClick1()">
 				<image class="title-ball-img" :src="imgSrc1" mode="aspectFill"></image>
 			</view>
+			<view class="center-font">
+				<image src="/static/index/purchaseorder/company.png" mode="aspectFill" class="center-font-imge"></image>
+				{{ uni.getStorageSync('nuName')}}
+			</view>
 
 			<view class="right-buttons">
 				<view :class="manyselect?`right-button-blue`:`right-button-white`" @click="startselect()"
@@ -722,6 +728,24 @@
 		display: flex;
 		position: relative;
 
+		.center-font {
+			position: absolute;
+			left: 33.5%;
+			top: 47%;
+			transform: translateY(-50%);
+			color: #555555;
+			font-size: 29rpx;
+			font-weight: 800;
+			display: flex;
+			align-items: center;
+
+			.center-font-imge {
+				width: 48rpx;
+				height: 48rpx;
+				margin-right: 10rpx;
+			}
+		}
+
 		.title-input {
 			width: 405rpx;
 			height: 5.1vh;
@@ -1177,6 +1201,7 @@
 								>image {
 									width: 100%;
 									height: 100%;
+									border-radius: 1.1vw;
 								}
 							}
 
@@ -1386,6 +1411,7 @@
 		border-radius: 30rpx;
 
 	}
+
 	.que {
 		width: 10vw;
 		height: 10vw;
@@ -1405,9 +1431,19 @@
 			color: #555555;
 		}
 	}
+
 	.center {
 		display: flex;
 		justify-content: center;
 		align-items: center;
 	}
+
+	.title-input-img {
+		width: 35rpx;
+		height: 35rpx;
+		position: absolute;
+		left: 370rpx;
+		top: 47%;
+		transform: translateY(-50%);
+	}
 </style>

pages/procurement/purchaseorder.vue

@@ -19,7 +19,7 @@
 					@scrolltolower="plsbuytolower" :lower-threshold="400">
 					<view class="pls-card" v-for="(v,i) in plsbuy" :key='i' @click="clickLeftMenu(i,v)" :style="{
 							  borderColor: i === lefttarget ? '' : 'transparent',
-							  background: i === lefttarget ? '#fff' : 'rgba(255,255,255,0.6)'
+							 
 							}">
 
 						<view v-if="moreindex==i" class="more-father">
@@ -149,7 +149,7 @@
 				<scroll-view scroll-y="true" class="middle-Y" scroll-with-animation :scroll-top="Invoitop">
 					<view class="middle-Y-father">
 						<view class="middle-one" v-for="(v,i) in InvoicingList" :key='i'
-							:style="{border: middletarget === i? '4rpx solid #1083F8': '4rpx solid transparent',backgroundColor:middletarget === i?`#F9FCFF`:``}"
+							:style="{border: middletarget === i? '4rpx dashed #0f9fff': '4rpx solid transparent',backgroundColor:middletarget === i?`#F9FCFF`:``}"
 							@click="clickmiddle(i)">
 							<image class="middle-img"
 								:src="v.materialImg?serverUrl + v.materialImg : '/static/index/warehouse/procurement/k.png'"
@@ -1058,6 +1058,7 @@
 								width: 150rpx;
 								height: 150rpx;
 								margin: 0.3vw 0 0 0.15vw;
+								border-radius: 1vw;
 							}
 
 							.middle-right {
@@ -1228,8 +1229,8 @@
 		width: 35rpx;
 		height: 35rpx;
 		position: absolute;
-		right: 150rpx;
+		right: 190rpx;
-		top: 50%;
+		top: 48%;
 		transform: translateY(-50%);
 	}
 

pages/procurement/retstock.vue

@@ -313,9 +313,9 @@
 	const tharrlist = ref([])
 	
 	const thlist = () => {
-		console.log("退货返回啥了啊",)
+		// console.log("退货返回啥了啊",)
 		thdList(form).then(res => {
-			console.log("退货返回啥了啊",res.result.records)
+			// console.log("退货返回啥了啊",res.result.records)
 			tharrlist.value.push(...res.result.records);
 			if(!firstlook.value&&!res.result.records.length){
 				nomessageshow.value = true;

unpackage/dist/build/app-plus/manifest.json

@@ -7,8 +7,8 @@
   "id": "__UNI__FB2D473",
   "name": "护理单元",
   "version": {
-    "name": "1.0.033",
+    "name": "1.0.034",
-    "code": 10033
+    "code": 10034
   },
   "description": "护理单元",
   "developer": {

unpackage/resources/__UNI__FB2D473/www/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.0.033","code":10033},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"VideoPlayer":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"MonitorModule":{"__plugin_info__":{"name":"MonitorModule","description":"bugly升级","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#000000"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.0.034","code":10034},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"VideoPlayer":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"MonitorModule":{"__plugin_info__":{"name":"MonitorModule","description":"bugly升级","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#000000"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"}