Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini

pages/NursingNew/component/doctorask/api/api.js

@@ -15,3 +15,32 @@ export const queryCareInfoList = (params) => {
 		data: params,
 	})
 }
+
+export const startOrder = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/startOrder`,
+		method: 'post',
+		data: params,
+	})
+}
+export const endOrder = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/endOrder`,
+		method: 'post',
+		data: params,
+	})
+}
+export const editSubMp4 = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/editSubMp4`,
+		method: 'post',
+		data: params,
+	})
+}
+export const editSubPicPath = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/editSubPicPath`,
+		method: 'post',
+		data: params,
+	})
+}

pages/NursingNew/component/doctorask/doctorask.vue

@@ -66,32 +66,141 @@
 										<text  style="white-space: nowrap;"> 结束时间: </text>
 										<view>{{v.endTime.slice(0,16)}}</view>
 									</view>
+									
 								</view>
 								<view class="fubtn" >
-									<view class="ld">开始服务</view> 
-									<view class="ld">结束服务</view>
-									<view class="bd">录像</view>
-									<view class="bd">拍照</view>
+									<view class="ld" @click="start(v)" v-if="v.izStart=='N'">开始服务</view> 
+									<view class="ld"  v-if="v.izStart=='Y'&& v.izFinish=='N'" @click="end(v)">结束服务</view>
+									<view class="bd"  v-if="(v.izStart=='Y'&& v.izFinish=='N')||v.manuallyMp4Path!=null" @click="ysptp(v,i,2)">录像</view>
+									<view class="bd" v-if="(v.izStart=='Y'&& v.izFinish=='N')|| v.manuallyPicPath!=null"  @click="ysptp(v,i,1)" >拍照</view>
 								</view>
 							</view>
+							
 						</view>
 					</view>
 				</scroll-view>
 			</view>
 		</view>
+		
+		
+		
+		<!-- 照片墙 -->
+		<view class="mengban" v-if="topbuttontarget>0" @click="topbuttontarget=0"></view>
+		<view class="photowall" v-show="topbuttontarget>0" :style="donghuaopo?{opacity:1}:{opacity:0}">
+			<view class="photowall-title">
+				<view class="photowall-name">
+					{{ topbuttontarget==1?`照片`:`录像` }}
+				</view>
+			</view>
+			<scroll-view scroll-y="true" class="photowall-other" scroll-with-animation enable-flex v-if="topbuttontarget>0">
+				<view class="photowall-other" >
+				<view class="photowall-other-one" v-for="(item,index) in ilanarr" :key="index"
+					@click="previewImage(item,index,ilanarr)">
+					<view  v-if="topbuttontarget==1"  style="width: 100%;height: 70%;border-radius: 30rpx;position: relative;">
+						<image style="width: 100%;height: 100%;border-radius: 30rpx;"
+							:src="item?serverUrl + item:'/static/ceshiyaoshan.png'" mode="aspectFill"
+							:lazy-load="true"/>
+						<view @click.stop="open=1;del(item,index)"
+						style="width: 1.6vw;
+						height: 1.6vw;
+						z-index: 20;
+						position: absolute;
+						right: -1vw;
+						top: -0.7vw;
+						background: red;
+						display: flex;
+						justify-content: center;
+						border-radius: 50%;
+						align-items: center;"
+						 v-if="topbuttontarget>0&&(listobj.izStart=='Y'&& listobj.izFinish=='N')">
+							<image src="/static/index/warehouse/procurement/x.png" mode="aspectFill" 
+							style="width: 1.4vw;
+						height: 1.4vw;"></image>
+						</view>
+					</view>
+					<view  v-if="topbuttontarget==2" style="width: 100%;height: 70%;border-radius: 30rpx ;position: relative;" @click="clik(serverUrl + item)">
+						<video style="width: 100%;height: 100%;border-radius: 30rpx;"  :id="'myVideo'+index" 
+						:src="servervideoUrl+item"
+						  mode="aspectFill"  ></video>
+						<view @click.stop="ilanarr.splice(index,1)"
+						 v-if="topbuttontarget>0&&(listobj.izStart=='Y'&& listobj.izFinish=='N')"
+						style="width: 1.6vw;
+						height: 1.6vw;
+						z-index: 20;
+						position: absolute;
+						right: -1vw;
+						top: -0.7vw;
+						background: red;
+						display: flex;
+						justify-content: center;
+						border-radius: 50%;
+						align-items: center;">
+							<image src="/static/index/warehouse/procurement/x.png" mode="aspectFill" 
+							style="width: 1.4vw;
+						height: 1.4vw;"></image>
+						</view>
+					</view>
+					<!-- <view style="margin-top: 20rpx;">
+						<text style="color: #888888;">
+							上传时间:
+						</text>
+						<text style="margin-left: 15rpx;">
+							{{item.createTime.replace(/-/g, '.')}}
+						</text>
+					</view>
+					<view style="margin-top: 10rpx;">
+						<text style="color: #888888;letter-spacing: 8.9rpx;">
+							上传人:
+						</text>
+						<text>
+							{{item.createBy}}
+						</text>
+					</view> -->
+				</view>
+				<view class="photowall-other-one" v-if="topbuttontarget>0&&(listobj.izStart=='Y'&& listobj.izFinish=='N')">
+					<view style="width: 100%;height: 71%;display: flex;flex-direction: column;
+						justify-content: center;align-items: center;position: absolute;top:0vw;left: 0;
+						background-color:#fafdff ;border: 1rpx solid #78B1EB;border-radius: 30rpx;" @click="uplod(1)">
+						<image style="width: 70rpx;height: 70rpx;margin-bottom: 5rpx;"
+							src="/static/index/warehouse/procurement/picking/addphoto.png" />
+						<view style="color: #78B1EB;">
+							点击上传{{topbuttontarget==1?'图片':'录像'}}
+						</view>
+					</view>
+				</view>
+				<!-- <view class="noarray" v-if="!ilanarr.length">
+					<image class="noarray-img" src="/static/index/warehouse/procurement/picking/noarray.png"
+						mode="aspectFill" />
+					<view class="noarray-font">
+						暂无照片
+					</view>
+				</view> -->
+			</view>
+			</scroll-view>
+			<view style="position: absolute;right: 2vw;bottom: 0.8vw;height: 4vw;" v-if="topbuttontarget>0&&(listobj.izStart=='Y'&& listobj.izFinish=='N')">
+				<button type="primary" style="width: 9vw; position: absolute;right: 0vw;bottom: 0.vw;" @click="submit" >确定</button>
+			</view>
+		</view>
+		<tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del1()"> </tanchuang>
 	</view>
 </template>
 <script setup lang="ts">
 	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineComponent } from 'vue';
 	import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
-	import {queryCareList,queryCareInfoList} from './api/api.js'
+	import {queryCareList,queryCareInfoList,startOrder,endOrder,editSubPicPath,editSubMp4} from './api/api.js'
 	const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
+	const servervideoUrl = ref(uni.getStorageSync('serverUrl') + '/sys/commonVideo/staticVideo/')
+	
 	const form = reactive({
 		pageNo: 1,
 		pageSize: 10,
 		employeeId:uni.getStorageSync('userInfo').employessId, 
 		nuId:uni.getStorageSync('nuId')
 	})
+	const open = ref(0)
+	const clik = (e)=>{
+		console.log(e)
+	}
 	const plsbuy = ref([])
 	onMounted(() => {
 		form.pageNo=1;
@@ -107,7 +216,7 @@
 	}
 	const firstgetqueryCgdList = () => {
 		queryCareList(form).then(res => {
-			console.log(res)
+			console.log(res,serverUrl.value)
 			plsbuy.value.push(...res.result.records);
 			status.value = res.result.total == plsbuy.value.length ? 'nomore' : 'loadmore';
 			if(form.pageNo==1){
@@ -134,28 +243,262 @@
 			console.log(res)
 			cardarr.value = res.result
 		})
-		if (item.izRead == 'N') {
-				transReads(item, index)
-			}
 		}
 	const sctop = ref(0)
 	const scroll = (e)=>{
 		sctop.value = e.detail.scrollTop
 	}
-	const addMaterial = ref([])
-	const transReads = (v, i) => {
-		transRead({ id: v.id })
-		v.izRead = 'Y'
-	}
-	const tharrlist = ref([])
-	const thlist = () => {
-		thdList(form).then(res => {
-			tharrlist.value=res.result.records;
+	const start = (v) =>{
+		startOrder({id:v.id}).then(res=>{
+			console.log(res)
+			if(res.success){
+				v.izStart = "Y"
+				clickLeftMenu(lefttarget.value,plsbuy.value[lefttarget.value])
+			}else{
+				
+				
+			}
 		})
 	}
+	const end = (v)=>{
+		endOrder({id:v.id}).then(res=>{
+			if(res.success){
+				v.izStart = "N";
+				v.izFinish = "Y";
+				clickLeftMenu(lefttarget.value,plsbuy.value[lefttarget.value])
+			}else{
+				
+			}
+		})
+	}
+	const donghuaopo = ref(false);
+	const topbuttontarget = ref(0);
+	const ilanarr = ref([]);
+	const listobj = ref({})
+	const ysptp = (v,i,r) =>{
+		// v.manuallyPicPath
+		if(r == 1&&v.manuallyPicPath){
+			ilanarr.value = v.manuallyPicPath.split(",");
+			ilanarr.value = ilanarr.value.filter(item => item !== '');
+		}else if(r == 2&&v.manuallyMp4Path){
+			ilanarr.value = v.manuallyMp4Path.split(",");
+			ilanarr.value = ilanarr.value.filter(item => item !== '');
+		}else{
+			ilanarr.value = [];
+		}
+		
+		listobj.value = v;
+		topbuttontarget.value = r;
+		donghuaopo.value = true;
+	}
+	const uplod = (v) => {
+		if(topbuttontarget.value==1){
+			uni.chooseImage({
+				count: 1, //默认9
+				sizeType: ['compressed'], //可以指定是原图还是压缩图，默认二者都有
+				sourceType: ['camera'], //从相册选择
+				success: (e) => {
+					let ar = JSON.stringify(e.tempFilePaths)
+					uni.compressImage({
+						src: JSON.parse(ar)[0],
+						quality: 60,
+						success: res => {
+							sxdupld(res.tempFilePath)
+							// v.picPatharr.push(res.tempFilePath);
+							// console.log(v.picPatharr)
+						}
+					})
+				}
+			});
+		}else{
+			uni.chooseVideo({
+				sourceType: ['camera' ],
+				success: (e)=> {
+					uni.compressVideo({
+						src: e.tempFilePath,
+						quality: 60,
+						success: res => {
+							sxdupld(res.tempFilePath)
+							// v.picPatharr.push(res.tempFilePath);
+							// console.log(v.picPatharr)
+						}
+					})
+					// sxdupld(res.tempFilePath )
+				}
+			});
+		}
+		
+	}
+	const sxdupld = (e) => {
+		let now = new Date();
+		let year = now.getFullYear();
+		let month = now.getMonth() + 1;
+		uni.uploadFile({
+			url: uni.getStorageSync('serverUrl') + '/sys/common/upload',
+			filePath: e,
+			name: 'file',
+			fileType:topbuttontarget.value==2?'video':'image',
+			formData: {
+				biz: year + '/' + month + (topbuttontarget.value==1?'/fwxm/manuallyPicPath':'/fwxm/manuallyMp4Path')
+			},
+			header: {
+				'X-Access-Token': uni.getStorageSync('token')
+			},
+			success: res => {
+				const data = JSON.parse(res.data);
+				console.log(data)
+				ilanarr.value.push(data.message)
+			},
+			fail: () => {
+				uni.showToast({ title: '上传失败', icon: 'none' })
+			}
+		})
+	}
+	const submit = ()=>{
+		let sub = "";
+		ilanarr.value.forEach(item=>{
+			sub+=item+','
+		})
+		if(topbuttontarget.value == 1){
+			editSubPicPath({id:listobj.value.id,manuallyPicPath:sub}).then(res=>{
+				if(res.success){
+					topbuttontarget.value = 0;
+					donghuaopo.value = false;
+					clickLeftMenu(lefttarget.value,plsbuy.value[lefttarget.value])
+				}
+			})
+		}else{
+			editSubMp4({id:listobj.value.id,manuallyMp4Path:sub}).then(res=>{
+				if(res.success){
+					topbuttontarget.value = 0;
+					donghuaopo.value = false;
+					clickLeftMenu(lefttarget.value,plsbuy.value[lefttarget.value])
+				}
+			})
+		}
+	}
+	const previewImage = (v, i, arr) => {
+		if(topbuttontarget.value == 1){
+			let u = []
+			arr.forEach(e => {
+				u.push(serverUrl.value + e)
+				console.log(serverUrl.value + e)
+			})
+			uni.previewImage({
+				current: i,
+				urls: u,
+				showmenu: false,
+				longPressActions: {
+					itemList: [],
+				}
+			})
+		}
+	}
+	const videoContext = ref(null)
+	const play = (e,i)=>{
+		 videoContext.value = uni.createVideoContext('myVideo'+i);
+		 videoContext.value.play()
+	}
+	const pici = ref(0);
+	const del = (v,i) =>{
+		pici.value = i;
+	}
+	const del1=()=>{
+		ilanarr.value.splice(pici.value,1);
+		open.value = 0
+	}
 </script>
 
 <style scoped lang="less">
+	
+	.noarray {
+		width: 90%;
+		height: 100%;
+		// background-color: red;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+	
+		.noarray-img {
+			margin-top: -200rpx;
+			width: 350rpx;
+			height: 350rpx;
+		}
+	
+	}
+	
+	.noarray-font {
+		margin-top: -60rpx;
+		color: #888888;
+		font-size: 25rpx;
+	}
+	.mengban {
+		width: 100vw;
+		height: 100vh;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 100;
+		background: RGBA(239, 240, 244, 0.55);
+	}
+	.photowall {
+		position: fixed;
+		top: 54%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		width: 80vw;
+		height: 83%;
+		border-radius: 30rpx;
+		background-color: #fff;
+		transition: all 0.3s;
+		z-index: 999;
+		box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.1);
+		padding: 0 90rpx;
+		.photowall-title {
+			margin-top: 50rpx;
+			display: flex;
+			justify-content: space-between;
+			width: 100%;
+			margin-bottom: 50rpx;
+	
+			.photowall-name {
+				font-size: 38rpx;
+				// font-weight: 600;
+			}
+	
+			.photowall-left {
+				color: #888888;
+			}
+	
+			.photowall-right {
+				font-size: 30rpx;
+				font-weight: 600;
+			}
+		}
+	
+		.photowall-other {
+			width: 76vw;
+			height: 62vh;
+			display: flex;
+			margin-top: 20rpx;
+			flex-wrap: wrap;
+			.photowall-other-one {
+				width: 22vw;
+				height: 430rpx;
+				margin-right: 3vw;
+				margin-bottom: 0%;
+				border-radius: 30rpx;
+				display:flex;
+				position: relative;
+				video{
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+	}
+	
 	.left-menu-father {
 		width: 33vw;
 		height: 90vh;
@@ -409,13 +752,13 @@
 			flex-wrap: wrap;
 		}
 		.fler{
-			width: 44vw;
-			height: 13vw;
+			width: 46vw;
+			min-height: 13vw;
 			margin-bottom: 0.9vw;
 			margin-left: 0.5vw;
 			.carditem{
 				width: 46vw;
-				height: 16vw;
+				height: 15vw;
 				background: rgba(245, 246, 248, 1);
 				border-radius: 1.1vw;
 				position: relative;

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

@@ -10,12 +10,15 @@
 							<image src="/static/index/procurement/zd.png" mode="aspectFill"></image>
 						</view>
 						<view class="speitem guodu" >
-							<image :src="v?.materialImg?serverUrl+v?.materialImg:'/static/index/procurement/k.png'"
-								mode="aspectFill">
-							</image>
+							<view class="imgs">
+								<image :src="v?.materialImg?serverUrl+v?.materialImg:'/static/index/procurement/k.png'"
+									mode="aspectFill">
+								</image>
+							</view>
 							<view class="cardp">
 								<view v-if="v.categoryId_dictText">{{v.categoryId_dictText}}</view>
 								<view v-if="v.typeId_dictText">{{v.typeId_dictText}}</view>
+								<view v-if="v.medicationId_dictText">{{v.medicationId_dictText}}</view>
 							</view>
 						</view>
 						<view class="msitem guodu" >
@@ -337,33 +340,43 @@
 		top:0;
 		left: 0;
 		.cardp {
-			width:8vw;
-			height: 4vw;
+			width:9vw;
 			display: flex;
-			margin: 0 auto;
+			margin:0.3vw auto;
 			align-items: center;
 			justify-content: center;
-			flex-direction: column;
+			flex-wrap: wrap;
+			// flex-direction: column;
 			view {
 				min-width: 5.5vw;
-				height: 1.8vw;
+				height: 1.6vw;
 				border-radius: 0.9vw;
 				border: 1px solid #D2D2D2;
-				margin: 0.5vw 0 0 0.5vw;
+				margin: 0.25vw 0 0 0;
 				display: flex;
 				justify-content: center;
 				align-items: center;
 				font-weight: 400;
-				font-size: 1vw;
+				font-size: 0.8vw;
 				color: #555555;
 				padding: 0 0.25vw;
 			}
 		}
 	
-		>image {
-			width: 8.5vw;
-			height: 7.5vw;
-			margin: 0vw auto 0.25vw;
+		.imgs {
+			width: 7.8vw;
+			height: 7vw;
+			background: #Fff;
+			border-radius: 1.1vw;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			margin: 0.8vw auto 0;
+			padding: 0.3vw;
+			>image {
+				width: 100%;
+				height: 100%;
+			}
 		}
 	}
 	

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

@@ -8,12 +8,16 @@
 						@touchstart="touchstart($event,v,index)" scroll-with-animation scroll-x="true"
 						:scroll-left="v.scrollleft" @scroll="scroll" >
 						<view class="speitem guodu" >
-							<image :src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
-								mode="aspectFill">
-							</image>
+							<view class="imge">
+								<image :src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
+									mode="aspectFill">
+								</image>
+							</view>
+							
 							<view class="cardp">
 								<view v-if="v.materialInfo?.categoryName">{{v.materialInfo?.categoryName}}</view>
 								<view v-if="v.materialInfo?.typeName">{{v.materialInfo?.typeName}}</view>
+								<view v-if="v.materialInfo?.medicationName">{{v.materialInfo?.medicationName}}</view>
 							</view>
 						</view>
 						<view class="msitem guodu" >
@@ -345,25 +349,32 @@
 			flex-direction: column;
 			view {
 				min-width: 5.5vw;
-				height: 1.8vw;
+				height: 1.6vw;
 				border-radius: 0.9vw;
 				border: 1px solid #D2D2D2;
-				margin: 0.5vw 0 0 0.5vw;
+				margin: 0.25vw 0 0 0.5vw;
 				display: flex;
 				justify-content: center;
 				align-items: center;
 				font-weight: 400;
-				font-size: 1vw;
+				font-size: 0.8vw;
 				color: #555555;
 				padding: 0 0.25vw;
 			}
 		}
-	
-		>image {
+		.imge{
 			width: 8vw;
 			height: 7vw;
+			padding: 0.2vw;
 			margin: 0.3vw auto 0.25vw;
+			background: #fff;
+			border-radius: 1.1vw;
+			>image {
+				width: 100%;
+				height: 100%;
+			}
 		}
+		
 	}
 	
 	.itembox{

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

@@ -5,10 +5,13 @@
 			<view class="tit">物料详情</view>
 			<view class="cont">
 				<view class="leftbox">
-					<image :src="objtake?.materialImg?serverUrl+objtake?.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"/>
+					<view class="img">
+						<image :src="objtake?.materialImg?serverUrl+objtake?.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"/>
+					</view>
 					<view>
 						<view>{{ objtake?.categoryId_dictText }}</view>
 						<view>{{ objtake?.typeId_dictText }}</view>
+						<view v-if="objtake?.medicationId_dictText">{{objtake?.medicationId_dictText}}</view>
 					</view>
 				</view>
 				<view class="youcont">
@@ -143,17 +146,14 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick,  watch, reactive }
 				width: 14.2vw;
 				height: 100%;
 				border-right: 2px solid #E5E5E5;
-				
-				view {
+				 &:nth-child(1) view {
 					width: 100%;
 					margin-top: 0.6vw;
 					display: flex;
-					// justify-content: space-around;
-					flex-direction: column;
 					align-items: center;
-					
+					flex-wrap: wrap;
 					view {
-						width: 6vw;
+						width: 6.5vw;
 						height: 2vw;
 						border-radius: 1vw;
 						border: 1px solid #D2D2D2;
@@ -163,15 +163,28 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick,  watch, reactive }
 						display: flex;
 						justify-content: center;
 						align-items: center;
+						margin: 0.25vw 0 0 0.3vw;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+						overflow: hidden;
 					}
 				}
-
-				>image {
-					width: 10.2vw;
-					height: 10.2vw;
-					margin: 0 auto;
-					display: block;
+				.img{
+					padding: 0.3vw;
+					background: #f8f8f8;
+					width: 12.2vw;
+					height: 11.2vw;
+					padding: 0.2vw;
+					margin: 0.3vw auto;
+					border-radius: 1.6vw;
+					>image {
+						width: 100%;
+						height: 100%;
+						margin: 0.3vw auto;
+						display: block;
+					}
 				}
+				
 			}
 
 			.youcont {

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

@@ -17,12 +17,15 @@
 				<view class="list">
 					<view class="card" v-for="(v,i) in list" :key='i'>
 						<view class="speitem guodu" >
-							<image :src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
-								mode="aspectFill">
-							</image>
+							<view class="imgs">
+								<image :src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
+									mode="aspectFill">
+								</image>
+							</view>
 							<view class="cardp">
 								<view v-if="v.materialInfo?.categoryName">{{v.materialInfo?.categoryName}}</view>
 								<view v-if="v.materialInfo?.typeName">{{v.materialInfo?.typeName}}</view>
+								<view v-if="v.materialInfo.medicationId_dictText">{{v.materialInfo.medicationId_dictText}}</view>
 							</view>
 						</view>
 						<view class="msitem guodu" >
@@ -84,6 +87,7 @@
 	const showbox = ref(false)
 	watch(()=>props.show,
 		()=>{
+			console.log(props.list)
 			if(props.show==true){
 				setTimeout(()=>{
 					showbox.value = true
@@ -228,8 +232,8 @@
 						top:0;
 						left: 0;
 						.cardp {
-							width:8vw;
-							height: 4vw;
+							width:10vw;
+							height: 5vw;
 							display: flex;
 							margin: 0 auto;
 							align-items: center;
@@ -237,24 +241,34 @@
 							flex-direction: column;
 							view {
 								min-width: 5.5vw;
-								height: 1.8vw;
+								height: 1.6vw;
 								border-radius: 0.9vw;
 								border: 1px solid #D2D2D2;
-								margin: 0.5vw 0 0 0.5vw;
+								margin: 0.25vw 0 0 0.5vw;
 								display: flex;
 								justify-content: center;
 								align-items: center;
 								font-weight: 400;
-								font-size: 1vw;
+								font-size: 0.8vw;
 								color: #555555;
 								padding: 0 0.25vw;
 							}
 						}
 					
-						>image {
+						.imgs {
 							width: 7vw;
 							height: 7vw;
-							margin: 0.5vw auto 0.25vw;
+							background: #Fff;
+							border-radius: 1.1vw;
+							display: flex;
+							justify-content: center;
+							align-items: center;
+							margin: 0.5vw auto 0;
+							padding: 0.2vw;
+							>image {
+								width: 100%;
+								height: 100%;
+							}
 						}
 					}
 				}

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

@@ -8,10 +8,14 @@
 			</view>
 			<view class="cont">
 				<view class="leftbox">
-					<image :src="objtake?.materialImg?serverUrl+objtake?.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"/>
-					<view>
+					<view class="bgimg">
+						<image :src="objtake?.materialImg?serverUrl+objtake?.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"/>
+					</view>
+					
+					<view class="carditem">
 						<view v-if="objtake?.categoryId_dictText">{{objtake?.categoryId_dictText}}</view>
 						<view v-if="objtake?.typeId_dictText">{{objtake?.typeId_dictText}}</view>
+						<view v-if="objtake?.medicationId_dictText">{{objtake?.medicationId_dictText}}</view>
 					</view>
 				</view>
 				<view class="youcont">
@@ -250,36 +254,46 @@
 					width: 15.2vw;
 					height: 100%;
 					border-right: 2px solid #E5E5E5;
-			
-					view {
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					.carditem {
 						width: 100%;
 						margin-top: 0.3vw;
 						display: flex;
-						flex-direction: column;
 						align-items: center;
+						flex-wrap: wrap;
 						// justify-content: space-around;
 						
 						view {
-							width: 6vw;
+							min-width: 6vw;
 							height: 2vw;
 							border-radius: 1vw;
 							border: 1px solid #D2D2D2;
 							font-weight: 400;
-							font-size: 1.1vw;
+							font-size: 0.9vw;
 							color: #555555;
 							display: flex;
 							justify-content: center;
 							align-items: center;
 							padding: 0 0.6vw;
+							margin: 0.5vw 0 0 0.25vw;
+							white-space: nowrap;
 						}
 					}
-			
-					>image {
+					.bgimg{
 						width: 8.5vw;
 						height: 8vw;
-						margin: 0 auto;
-						display: block;
+						background: #fff;
+						border-radius: 1.1vw;
+						>image {
+							width: 100%;
+							height: 100%;
+							margin: 0.3vw auto;
+							display: block;
+						}
 					}
+					
 				}
 			
 				.youcont {

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

@@ -163,15 +163,22 @@
 				<view class="right-ones">
 					<view class="right-one" v-for="(item,index) in rightarray" :key="index">
 						<view class="right-one-left">
-							<image class="left-image"
-								:src="item.materialInfo.materialImg?serverUrl+item.materialInfo.materialImg:'/static/index/procurement/k.png'"
-								mode="aspectFill"></image>
-							<view class="left-tages" style="margin-top: -15rpx;">
+							<view class="imge">
+								<image class="left-image"
+									:src="item.materialInfo.materialImg?serverUrl+item.materialInfo.materialImg:'/static/index/procurement/k.png'"
+									mode="aspectFill"></image>
+							</view>
+							
+							<view class="left-tages" >
 								{{ item.materialInfo.categoryName}}
 							</view>
 							<view class="left-tages">
 								{{ item.materialInfo.typeName}}
+							</view> 
+							<view class="left-tages"  v-if="item.materialInfo.medicationName">
+								{{item.materialInfo.medicationName}}
 							</view>
+							 
 						</view>
 						<view class="right-one-right">
 							<view class="right-title">
@@ -939,26 +946,31 @@
 							flex-direction: column;
 							align-items: center;
 
-							.left-image {
+							.imge {
 								width: 140rpx;
 								height: 140rpx;
-								// margin: 15rpx 0;
 								margin-top: 10rpx;
 								margin-bottom: 15rpx;
-								// margin-top: 5rpx;
+								padding: 0.2vw;
+								border-radius: 1.1vw;
+								background: #f8f8f8;
+								image{
+									width: 100%;
+									height: 100%;
+								}
 							}
 
 							.left-tages {
 								width: 130rpx;
-								height: 43rpx;
-								border-radius: 30rpx;
+								height: 38rpx;
+								border-radius: 19rpx;
 								display: flex;
 								justify-content: center;
 								align-items: center;
 								color: #555555;
 								border: 1rpx solid #D2D2D2;
-								margin-top: 5rpx;
-								font-size: 23rpx;
+								margin-top:0.2vw;
+								font-size: 19rpx;
 							}
 						}
 

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

@@ -13,7 +13,7 @@
 			<view class="right-button" style="width: 11vw;" @click="tijiaoshow=true" v-if="rightarray.length">
 				<image src="/static/index/warehouse/procurement/picking/caigou.png" />
 				<view>
-					提交请购单
+					提交请领单
 				</view>
 			</view>
 		</view>

pages/Warehouse/Warehouse.vue

@@ -54,7 +54,7 @@
 			<donghua width="40vw" height="40vw" :interval="150" :links="jianhuoarray" :playing="playall" :loop="true" />
 		</view>
 		<view class="pandan tp" @click="housactive(5)">
-			<image src="/static/index/warehouse/newhome/count.png" mode="widthFix"></image>
+			<image src="/static/index/warehouse/newtwo/count.png" mode="widthFix"></image>
 		</view>
 		<view class="pandantag tp" @click="housactive(5)">
 			<view class="gray-bgc">
@@ -64,7 +64,7 @@
 			</view>
 		</view>
 		<view class="return tp" @click="housactive(8)">
-			<image src="/static/index/warehouse/newhome/return.png" mode="widthFix"></image>
+			<image src="/static/index/warehouse/newtwo/return.png" mode="widthFix"></image>
 		</view>
 		<view class="leadtag tp" @click="housactive(8)">
 			<view class="gray-bgc">
@@ -74,7 +74,7 @@
 			</view>
 		</view>
 		<view class="lead tp" @click="housactive(7)">
-			<image src="/static/index/warehouse/newhome/lead.png" mode="widthFix"></image>
+			<image src="/static/index/warehouse/newtwo/lead.png" mode="widthFix"></image>
 		</view>
 		<view class="returntag tp" @click="housactive(7)">
 			<view class="gray-bgc">
@@ -85,7 +85,7 @@
 		</view>
 
 		<view class="picking tp" @click="housactive(2)">
-			<image src="/static/index/warehouse/newhome/picking.png" mode="widthFix"></image>
+			<image src="/static/index/warehouse/newtwo/picking.png" mode="widthFix"></image>
 		</view>
 		<view class="pickingtag tp" @click="housactive(2)">
 			<view class="blue-bgc">
@@ -106,7 +106,7 @@
 
 	const cararray =
 		genPaths(
-			'/static/index/warehouse/newhome/',
+			'/static/index/warehouse/newtwo/',
 			'train',
 			10,    // 张数
 			'png',
@@ -116,7 +116,7 @@
 	const cartarget = ref(0)
 	const paiziarray =
 		genPaths(
-			'/static/index/warehouse/newhome/',
+			'/static/index/warehouse/newtwo/',
 			'logo',
 			3,    // 张数
 			'png',
@@ -125,7 +125,7 @@
 		)
 	const jiankongarray =
 		genPaths(
-			'/static/index/warehouse/newhome/',
+			'/static/index/warehouse/newtwo/',
 			'monitor',
 			8,    // 张数
 			'png',
@@ -134,7 +134,7 @@
 		)
 	const wanjiearray =
 		genPaths(
-			'/static/index/warehouse/newhome/',
+			'/static/index/warehouse/newtwo/',
 			'end',
 			6,    // 张数
 			'png',
@@ -142,7 +142,7 @@
 			false  // 不补零
 		)
 	const caigouarray = genPaths(
-		'/static/index/warehouse/newhome/',
+		'/static/index/warehouse/newtwo/',
 		'purchase',
 		8,    // 张数
 		'png',
@@ -150,7 +150,7 @@
 		false  // 不补零
 	)
 	const rukuarray = genPaths(
-		'/static/index/warehouse/newhome/',
+		'/static/index/warehouse/newtwo/',
 		'unit1-',
 		5,    // 张数
 		'png',
@@ -158,7 +158,7 @@
 		false  // 不补零
 	)
 	const jianhuoarray = genPaths(
-		'/static/index/warehouse/newhome/',
+		'/static/index/warehouse/newtwo/',
 		'Warehouse',
 		8,    // 张数
 		'png',

pages/procurement/authorization.vue

@@ -103,12 +103,16 @@
 									<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'"
-										mode="aspectFill">
-									</image>
+									<view class="bgimg">
+										<image :src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
+											mode="aspectFill">
+										</image> 
+									</view>
+									
 									<view class="cardp">
 										<view v-if="v.materialInfo?.categoryName">{{v.materialInfo?.categoryName}}</view>
 										<view v-if="v.materialInfo?.typeName">{{v.materialInfo?.typeName}}</view>
+										<view v-if="v.materialInfo?.medicationName">{{v.materialInfo?.medicationName}}</view>
 									</view>
 								</view>
 								<view class="msitem guodu" >
@@ -511,30 +515,40 @@
 			width:8vw;
 			height: 4vw;
 			display: flex;
-			margin: 0 auto;
+			margin: 0.3vw auto;
 			align-items: center;
 			justify-content: center;
 			flex-direction: column;
 			view {
 				min-width: 5.5vw;
-				height: 1.8vw;
+				height: 1.6vw;
 				border-radius: 0.9vw;
 				border: 1px solid #D2D2D2;
-				margin: 0.5vw 0 0 0.5vw;
+				margin: 0.3vw 0 0 0vw;
 				display: flex;
 				justify-content: center;
 				align-items: center;
 				font-weight: 400;
-				font-size: 1vw;
+				font-size: 0.8vw;
 				color: #555555;
 				padding: 0 0.25vw;
 			}
 		}
 	
-		>image {
+		.bgimg{
 			width: 7.5vw;
-			height: 7.5vw;
-			margin: 0vw auto 0.25vw;
+			height: 7vw;
+			margin: 0.3vw auto 0.25vw;
+			border-radius: 1.1vw;
+			background: #fff;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			padding: 0.2vw;
+			>image {
+				width: 100%;
+				height: 100%;
+			}
 		}
 	}
 	

pages/procurement/common/submits.vue

@@ -17,13 +17,18 @@
 				<view class="list">
 					<view class="card" v-for="(v,i) in list" :key='i'>
 						<view class="speitem guodu">
-							<image
-								:src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
-								mode="aspectFill">
-							</image>
+							<view class="imge">
+								<image
+									:src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
+									mode="aspectFill">
+								</image>
+							</view>
+							
 							<view class="cardp">
 								<view v-if="v.materialInfo?.categoryName">{{v.materialInfo?.categoryName}}</view>
 								<view v-if="v.materialInfo?.typeName">{{v.materialInfo?.typeName}}</view>
+								<view v-if="v.materialInfo?.typeName">{{v.materialInfo?.typeName}}</view>
+								<view v-if="v.materialInfo?.medicationName">{{v.materialInfo?.medicationName}}</view>
 							</view>
 						</view>
 						<view class="msitem guodu">
@@ -249,34 +254,41 @@
 
 						.cardp {
 							width: 8vw;
-							height: 4vw;
+							height: 5.5vw;
 							display: flex;
-							margin: 0 auto;
+							margin: 0.3vw auto 0;
 							align-items: center;
 							justify-content: center;
 							flex-direction: column;
-
+							overflow: hidden;
 							view {
 								min-width: 5.5vw;
-								height: 1.8vw;
+								height: 1.6vw;
 								border-radius: 0.9vw;
 								border: 1px solid #D2D2D2;
-								margin: 0.5vw 0 0 0.5vw;
+								margin: 0 0 0.5vw 0.5vw ;
 								display: flex;
 								justify-content: center;
 								align-items: center;
 								font-weight: 400;
-								font-size: 1vw;
+								font-size: 0.8vw;
 								color: #555555;
 								padding: 0 0.25vw;
 							}
 						}
-
-						>image {
-							width: 8.5vw;
-							height: 7.5vw;
+						.imge{
+							width: 7vw;
+							height:6.5vw;
 							margin: 0.7vw auto 0.25vw;
+							border-radius: 1.1vw;
+							background: #fff;
+							padding: 0.2vw;
+							>image {
+								width: 100%;
+								height: 100%;
+							}
 						}
+						
 					}
 				}
 			}

pages/procurement/common/thitem.vue

@@ -11,13 +11,17 @@
 							<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'"
-								mode="aspectFill">
-							</image>
+							<view class="bgimg">
+								<image
+									:src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
+									mode="aspectFill">
+								</image>
+							</view>
+							
 							<view class="cardp">
 								<view v-if="v.materialInfo?.categoryName">{{v.materialInfo?.categoryName}}</view>
 								<view v-if="v.materialInfo?.typeName">{{v.materialInfo?.typeName}}</view>
+								<view v-if="v.materialInfo?.medicationName">{{v.materialInfo?.medicationName}}</view>
 							</view>
 						</view>
 						<view class="msitem guodu">
@@ -404,12 +408,22 @@
 				padding: 0 0.25vw;
 			}
 		}
-
-		>image {
+		.bgimg{
 			width: 7.5vw;
 			height: 7.5vw;
-			margin: 0vw auto 0.25vw;
+			margin: 0.3vw auto 0.25vw;
+			border-radius: 1.1vw;
+			background: #fff;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			padding: 0.2vw;
+			>image {
+				width: 100%;
+				height: 100%;
+			}
 		}
+		
 	}
 
 

pages/procurement/components/carditem.vue

@@ -7,9 +7,12 @@
 						@touchstart="touchstart($event,v,index)" scroll-with-animation scroll-x="true"
 						:scroll-left="v.scrollleft" @scroll="scroll" >
 						<view class="speitem guodu" >
-							<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'"
-								mode="aspectFill">
-							</image>
+							<view class="imghs">
+								<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'"
+									mode="aspectFill">
+								</image>
+							</view>
+							
 							<view class="cardp">
 								<view v-if="v.categoryId_dictText">{{v.categoryId_dictText}}</view>
 								<view v-if="v.typeId_dictText">{{v.typeId_dictText}}</view>
@@ -418,12 +421,19 @@
 					}
 				}
 			}
-
-			>image {
-				width: 8.5vw;
-				height: 7.5vw;
-				margin: 1.25vw auto 0.25vw;
+			.imghs{
+				width: 9vw;
+				height: 8vw;
+				margin: 0.8vw auto 0.25vw;
+				padding: 0.2vw;
+				background: #fff;
+				border-radius: 1.1vw;
+				>image {
+					width: 100%;
+					height: 100%;
+				}
 			}
+			
 		}
 	}
 </style>

pages/procurement/components/carlist.vue

@@ -12,9 +12,12 @@
 						@touchstart="touchstart($event,v,index)" scroll-with-animation scroll-x="true"
 						:scroll-left="v.scrollleft" @scroll="scroll"  :class="v.flag?'actve':''">
 						<view class="speitem guodu" >
-							<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'"
-								mode="aspectFill">
-							</image>
+							<view class="imghs">
+								<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'"
+									mode="aspectFill">
+								</image>
+							</view>
+							
 							<view class="cardp">
 								<view v-if="v.categoryId_dictText">{{v.categoryId_dictText}}</view>
 								<view v-if="v.typeId_dictText">{{v.typeId_dictText}}</view>
@@ -447,11 +450,17 @@
 				}
 			}
 
-			>image {
-				width: 9vw;
-				height: 8vw;
-				margin: 0 auto 0;
+			.imghs{
+				width: 10vw;
+				height: 9vw;
+				margin: -0.8vw auto 0.25vw;
+				padding: 0.2vw;
+				background: #fff;
 				border-radius: 1.1vw;
+				>image {
+					width: 100%;
+					height: 100%;
+				}
 			}
 		}
 	}

pages/procurement/components/purorder.vue

@@ -110,9 +110,11 @@
 					<!-- <view style="height:2vw;"></view> -->
 					<view class="fler" v-for="(v,index) in generatedOrder[lefttarget]?.cgdInfoList" :key="index">
 						<view class="speitem guodu">
-							<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'"
-								mode="aspectFill">
-							</image>
+							<view class="imghs">
+								<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'"
+									mode="aspectFill">
+								</image>
+							</view>
 							<view class="cardp">
 								<view v-if="v.categoryName">{{v.categoryName}}</view>
 								<view v-if="v.typeName">{{v.typeName}}</view>
@@ -484,10 +486,17 @@
 						}
 					}
 
-					>image {
+					.imghs{
 						width: 10vw;
 						height: 9vw;
-						margin: 0.5vw auto 0;
+						margin: 0.8vw auto 0.25vw;
+						padding: 0.2vw;
+						background: #fff;
+						border-radius: 1.1vw;
+						>image {
+							width: 100%;
+							height: 100%;
+						}
 					}
 				}
 			}

pages/procurement/outbound.vue

@@ -181,15 +181,20 @@
 					<view class="right-ones">
 						<view class="right-one" v-for="(item,index) in rightarray" :key="index">
 							<view class="right-one-left">
-								<image class="left-image"
-									:src="item.materialInfo?.materialImg?serverUrl+item.materialInfo?.materialImg:'/static/index/procurement/k.png'"
-									mode="aspectFill"></image>
-								<view class="left-tages" style="margin-top: -15rpx;">
+								<view class="bgimg">
+									<image class="left-image"
+										:src="item.materialInfo?.materialImg?serverUrl+item.materialInfo?.materialImg:'/static/index/procurement/k.png'"
+										mode="aspectFill"></image>
+								</view>
+								<view class="left-tages" >
 									{{ item.materialInfo.categoryName}}
 								</view>
 								<view class="left-tages">
 									{{ item.materialInfo.typeName}}
 								</view>
+								<view class="left-tages" v-if="item.materialInfo.medicationName">
+									{{ item.materialInfo.medicationName}}
+								</view>
 							</view>
 							<view class="right-one-right">
 								<view class="right-title">
@@ -1099,18 +1104,25 @@
 							flex-direction: column;
 							align-items: center;
 
-							.left-image {
-								width: 150rpx;
-								height: 150rpx;
-								// margin: 15rpx 0;
-								margin-top: 10rpx;
-								margin-bottom: 15rpx;
-								// margin-top: 5rpx;
+							.bgimg{
+								width: 7.5vw;
+								height: 7vw;
+								margin: 0.3vw auto 0.25vw;
+								border-radius: 1.1vw;
+								background: #fff;
+								display: flex;
+								justify-content: center;
+								align-items: center;
+								padding: 0.2vw;
+								>image {
+									width: 100%;
+									height: 100%;
+								}
 							}
 
 							.left-tages {
 								width: 130rpx;
-								height: 43rpx;
+								height: 36rpx;
 								border-radius: 30rpx;
 								display: flex;
 								justify-content: center;
@@ -1118,7 +1130,7 @@
 								color: #555555;
 								border: 1rpx solid #D2D2D2;
 								margin-top: 5rpx;
-								font-size: 23rpx;
+								font-size: 20rpx;
 							}
 						}
 

pages/procurement/retstock.vue

@@ -264,7 +264,7 @@
 		console.log(v)
 		wuliao();
 		thdNuMaterialList({ nuId: v.nuId, id: v.id }).then(res => {
-			console.log(res)
+			console.log({ nuId: v.nuId, id: v.id })
 			cardarr.value = res.result
 		})
 		if (v.izRead == 'N') {

pages/watch/index.vue

@@ -714,12 +714,12 @@
 				url: '/pages/NursingNew/index'
 			})
 		} else if (typeNow.value === 2) {
-			// uni.navigateTo({
-			// 	url: '/pages/Warehouse/Warehouse'
-			// })
 			uni.navigateTo({
-				url: '/pages/Warehouse/warehome',
+				url: '/pages/Warehouse/Warehouse'
 			})
+			// uni.navigateTo({
+			// 	url: '/pages/Warehouse/warehome',
+			// })
 		}
 	}
 

unpackage/dist/dev/.nvue/pages/camera.js

@@ -574,7 +574,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     )
   ]);
 }
-const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]);
+const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/camera.nvue"]]);
 export {
   camera as default
 };

unpackage/dist/dev/.nvue/pages/fullcamera.js

@@ -577,7 +577,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     )
   ]);
 }
-const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/fullcamera.nvue"]]);
+const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/fullcamera.nvue"]]);
 export {
   fullcamera as default
 };