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

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

@@ -44,3 +44,28 @@ export const editSubPicPath = (params) => {
 		data: params,
 	})
 }
+// （业务）转单/协助时查询员工信息
+export const queryEmpList = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/employee/queryEmpList`,
+		method: 'get',
+		data: params,
+	})
+}
+// （业务）服务指令转单
+
+export const transferOrder = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/serviceorder/transferOrder`,
+		method: 'post',
+		data: params,
+	})
+}
+// （业务）服务指令协助执行
+export const assistOrder = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/serviceorder/assistOrder`,
+		method: 'post',
+		data: params,
+	})
+}

pages/NursingNew/component/index.vue

@@ -166,6 +166,74 @@
 				</view>
 
 			</view>
+			<view class="mengban" v-if="zdxzdex>0" @click="zdxzdex=0"></view>
+			<view class="photowall" v-show="zdxzdex>0" :style="zdxzdex?{opacity:1}:{opacity:0}">
+				<view class="photowall-title">
+					<view class="photowall-name">
+						{{ zdxzdex==1?`转单执行`:`协助执行` }}
+					</view>
+				</view>
+				<scroll-view scroll-y="true" class="photowall-other" scroll-with-animation enable-flex v-if="zdxzdex>0">
+					<view class="photowall-other" >
+						<view class="bottom-title" v-for="(v,i) in zdxzarr" :key='i' @click="zdwu(v,i)" 
+						 style="border: 1px solid #f8f8f8;width: 16vw;margin: 0 0.8vw;;height: 17vw;border-radius: 1.1vw;background: #f8f8f8;display: flex;flex-direction: column;align-items: center;"
+						 :style="v.flag?'border: 1px solid #0385FA;background: #fff !important;':''">
+							 <image style="width: 9vw;height: 9vw;border-radius: 50%;margin: 1vw auto;"
+							 		:src="v.headPath?serverUrl+v.headPath:'/static/shouye/xd.png'" />
+							 	<view class="name-weight">
+							 		{{v.name }}
+							 	</view>
+							 	<view class="message-view" v-if="uni.getStorageSync('NUall').elderInfo?.name">
+							 		{{v.sex}}
+							 		<view class="message-shu"></view>
+							 		<view style="font-weight: 600;">
+							 			{{ v.height}}cm
+							 		</view>
+							 		
+							 		<view class="message-shu"></view>
+							 		{{ v.weight}}Kg
+							 	</view>
+							 	 
+							 </view>
+						
+						</view>
+					
+				</scroll-view>	
+				<view style="position: absolute;right: 2vw;bottom: 0.8vw;height: 4vw;"  >
+					<view  
+					v-if="flag"
+					style="width: 8.2vw;
+					height: 3.3vw;
+					background: #EDEDEF;
+					border-radius: 1.6vw;
+					font-weight: 400;
+					font-size: 1.6vw;
+					color: #888888;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					border: 1px solid #EDEDEF; 
+					background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
+					border: 1px solid rgba(3,133,250,0.34);
+					color: #0385FA;" @click="zhixingsub" >确定</view>
+					<view
+					v-if="!flag"
+					style="width: 8.2vw;
+					height: 3.3vw;
+					background: #EDEDEF;
+					border-radius: 1.6vw;
+					font-weight: 400;
+					font-size: 1.6vw;
+					color: #888888;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					border: 1px solid #EDEDEF; 
+					border: 1px solid rgba(3,133,250,0.34);
+					color: #999;" >确定</view>
+				</view>
+				<tanchuang :show="zxzd>0" :font="zdcont" @back="zxzd = 0" @right="tijiaozx()"> </tanchuang>
+			</view>	
 		</view>
 		<view class="left-menu"  v-show="indexmessage?.startTime">
 			<view  style="margin: 30rpx 0;" @click="errmsgclk(0,1)">
@@ -189,24 +257,29 @@
 				</view>
 			</view>
 		</view>
-		<view class="right-menu" v-show="indexmessage?.startTime">
+		<view class="right-menu" v-show="indexmessage?.startTime"  v-if="indexmessage?.optType==1">
 			<view class="zhezhao-top" @click="scrollTop -= 115"></view>
 			<view class="zhezhao-bottom" @click="scrollTop += 115"></view>
 			<image class="top-img" :src="`/static/index/newindex/rightmenu/top.png`"
 				@click="scrollTop>0? scrollTop -= 115:scrollTop=0" />
 			<scroll-view scroll-y="true" class="right-scroll" :scroll-top="scrollTop" @scroll="onScroll">
-				<view style="height: 20rpx;">
+				<view style="height: 20rpx;"> </view>
 				
-				</view>
+				<view style="margin: 20rpx 0;width: 110rpx;margin-left: 20rpx;" @click="zhixing(1)">
-				<view v-for="(item,index) in rightMenu" style="margin: 20rpx 0;width: 110rpx;margin-left: 20rpx;">
+					<view class="white-circle" :style="indexmessage?.izStart=='Y'?'background-color:RGBA(228, 229, 231, 1)' : ''">
-					<view class="white-circle">
+						<image class="right-menu-img" :src="'/static/index/newindex/rightmenu/1.png'" />
-						<image class="right-menu-img" :src="item.url" />
 						<view class="right-menu-name">
-							{{ item.name }}
+							转单执行
+						</view>
+					</view>
+				</view>
+				<view style="margin: 20rpx 0;width: 110rpx;margin-left: 20rpx;" @click="zhixing(2)">
+					<view class="white-circle">
+						<image class="right-menu-img" :src="'/static/index/newindex/rightmenu/2.png'" />
+						<view class="right-menu-name">
+							协助执行
 						</view>
 					</view>
-
-
 				</view>
 				<view style="height: 30rpx;">
 
@@ -254,8 +327,10 @@
 			<scroll-view class="top-list" scroll-y>
 				<view class="list-view" :style="menutarget===index?{borderColor:`#8DD6FF`,backgroundColor:`#F7F7F9`}:{}"
 					v-for="(item,index) in filteredMenu(0)" :key="index" @click="clickmenu(index)">
-					<image class="list-img"
+					<view  class="list-img">
-						:src="`/static/index/newindex/leftmenu/NU${item.elderInfo?.name?`blue`:`white`}.png`" />
+						<image :src="`/static/index/newindex/leftmenu/NU${item.elderInfo?.name?`blue`:`white`}.png`" />
+						<view v-if="item.readList!=null&&item.readList.length>0"></view>
+					</view>
 					<view class="">
 						<view class="first-line">
 							<view style="font-size: 1.2vw;">
@@ -501,6 +576,9 @@
 			</view>
 		</view>
 		<tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del1()"> </tanchuang>
+		
+			
+				
 	</view>
 </template>
 
@@ -509,7 +587,7 @@
 	import { queryPadPageList } from '@/pages/watch/api/lunpan.js'
 	import { queryWorkOrderList,queryCountByType,queryAll } from './api.js'
 	// import {startOrder,endOrder} from './doctorask/api/api.js'
-	import {queryOrderList,queryOrderInfoList,startOrder,endOrder,editSubPicPath,editSubMp4} from '../component/doctorask/api/api.js'
+	import {queryOrderList,queryOrderInfoList,startOrder,endOrder,editSubPicPath,editSubMp4,queryEmpList,transferOrder,assistOrder} from '../component/doctorask/api/api.js'
 	import { getNclist } from "./nurse/api.js";
 	const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
 	const servervideoUrl = ref(uni.getStorageSync('serverUrl') + '/sys/commonVideo/staticVideo/')
@@ -520,13 +598,114 @@
 		nuId:uni.getStorageSync('nuId')
 		
 	})
+	const zdxzdex = ref(0)
+	const zdxzarr = ref(0)
+	const zhixing = (e)=>{
+		if(indexmessage.value?.izStart=='Y' && e ==1){
+			uni.showToast({
+				title:'服务中不能转单！',
+				icon:'none'
+			})
+			return
+		}
+		queryEmpList({id:uni.getStorageSync('userInfo').id}).then(res=>{
+			zdxzarr.value = res.result;
+			console.log(res)
+			zdxzarr.value.forEach(item=>{
+				item.flag = false
+			})
+			zdxzdex.value = e;
+		})
+	}
+	const flag = ref(false)
+	const zdwu = (e,k)=>{
+		if(zdxzdex.value==1){
+			 e.flag = !e.flag;
+			 zdxzarr.value.forEach((item,i)=>{
+				 if(i!=k){
+					 item.flag = false
+				 }
+			 })
+			 flag.value = e.flag
+		}
+		if(zdxzdex.value==2){
+			 e.flag = !e.flag;
+			 let arr = [];
+			 zdxzarr.value.forEach((item,i)=>{
+				 if(item.flag){
+					 arr.push(1)
+				 }
+			 })
+			 if(arr.length==0){
+				 flag.value = false;
+			 }else{
+				 flag.value = true;
+			 }
+		}
+	}
+	const zhixingsub = ()=>{
+		zxzd.value = zdxzdex.value
+		if(zdxzdex.value==1){
+			  zdcont.value = "确认转单执行？"
+		}
+		if(zdxzdex.value==2){
+			  zdcont.value = "确认协助执行？"
+		}
+	}
+	const zxzd = ref(0);
+	const zdcont = ref('');
+	const tijiaozx = ()=>{
+		if(zxzd.value == 1){
+			let s = {}
+			zdxzarr.value.forEach((item,i)=>{
+				 if(item.flag){
+					 s = item;
+				 }
+			})
+			let obj = {
+				mainId:indexmessage.value.mainId,
+				employeeId:s.id,
+				employeeName:s.name
+			}
+			let nuId = uni.getStorageSync('nuId');
+			transferOrder(obj).then(res=>{
+				if(res.success){
+					firstgetqueryCgdList(nuId);
+					flag.value = false;
+					zxzd.value = 0;
+					zdxzdex.value = 0;
+				}
+			})
+		}
+		if(zxzd.value == 2){
+			let userinfo = uni.getStorageSync('userInfo')
+			let id = userinfo.id+',';
+			let name = userinfo.realname+',';
+			zdxzarr.value.forEach((item,i)=>{
+				 if(item.flag){
+					 id+=item.id+','
+					 name+=item.name+','
+				 }
+			})
+			let obj = {
+				mainId:indexmessage.value.mainId,
+				employeeId:id,
+				employeeName:name
+			}
+			assistOrder(obj).then(res=>{
+				if(res.success){
+					clickLeftMenu(0,{id:indexmessage.value.mainId})
+					flag.value = false;
+					zxzd.value = 0;
+					zdxzdex.value = 0;
+				}
+			})
+		}
+	}
 	const plsbuy = ref([])
 	const firstgetqueryCgdList = (nuId) => {
 		form.nuId = nuId;
-		console.log(form)
 		queryOrderList(form).then(res => {
-			console.log(res)
-			// plsbuy.value.push(...res.result.records);
 			if(res.result.records.length>0){
 				clickLeftMenu(0,res.result.records[0])
 			}else{
@@ -775,7 +954,6 @@
 			elderId:elderId
 		}
 		queryAll(data).then(res=>{
-			console.log(res)
 			zlarr.value = res.result;
 			shtab(fwzlindex.value)
 		})
@@ -960,15 +1138,15 @@
 	})
 	 
 	const filteredMenu = (index : number) => {
+		console.log(leftMenuArray.value.filter(item => Number(item.areaFlag) - 1 == index))
 		return leftMenuArray.value.filter(item => Number(item.areaFlag) - 1 == index);
 	}
 	const getmenu = () => {
 		queryPadPageList().then((res => {
-			console.log("看看数据",res.result.records)
 			leftMenuArray.value = res.result.records;
 			filteredMenu(0).forEach((element : any, index : number) => {
 				if (element.nuId === uni.getStorageSync('NUall').nuId) {
-					menutarget.value = index
+					menutarget.value = index;
 					clickmenu(menutarget.value)
 				}
 			})
@@ -1204,6 +1382,20 @@
 						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 {
@@ -1233,6 +1425,8 @@
 			}
 		}
 
+		
+	}
 	.right-bottom {
 		margin-top: 2vh;
 		width: 100%;
@@ -1267,8 +1461,6 @@
 			border-radius: 50%;
 		}
 	}
-	}
-
 	.index-content-other {
 		width: 65vw;
 		height: 100%;

pages/NursingNew/component/leftcontent/leftcontent.vue

@@ -68,7 +68,6 @@
 		}else{
 			codesc.value = -1;
 		}
-		console.log(codesc.value)
 	})
 	const scroll = (e)=>{
 		// console.log(e.detail.scrollTop)

pages/NursingNew/index.vue

@@ -63,7 +63,6 @@
 			uni.setStorageSync("Packagelist", res.result)
 		})
 		getPermissionList({employessId:uni.getStorageSync('userInfo').employessId}).then(res=>{
-			console.log(res)
 			listarr.value = res.result ;
 		})
 	})

pages/Warehouse/index/component/index.vue

@@ -119,6 +119,74 @@
 				</view>
 		
 			</view>
+			<view class="mengban" v-if="zdxzdex>0" @click="zdxzdex=0"></view>
+			<view class="photowall" v-show="zdxzdex>0" :style="zdxzdex?{opacity:1}:{opacity:0}">
+				<view class="photowall-title">
+					<view class="photowall-name">
+						{{ zdxzdex==1?`转单执行`:`协助执行` }}
+					</view>
+				</view>
+				<scroll-view scroll-y="true" class="photowall-other" scroll-with-animation enable-flex v-if="zdxzdex>0">
+					<view class="photowall-other" >
+						<view class="bottom-title" v-for="(v,i) in zdxzarr" :key='i' @click="zdwu(v,i)" 
+						 style="border: 1px solid #f8f8f8;width: 16vw;margin: 0 0.8vw;;height: 17vw;border-radius: 1.1vw;background: #f8f8f8;display: flex;flex-direction: column;align-items: center;"
+						 :style="v.flag?'border: 1px solid #0385FA;background: #fff !important;':''">
+							 <image style="width: 9vw;height: 9vw;border-radius: 50%;margin: 1vw auto;"
+							 		:src="v.headPath?serverUrl+v.headPath:'/static/shouye/xd.png'" />
+							 	<view class="name-weight">
+							 		{{v.name }}
+							 	</view>
+							 	<view class="message-view" v-if="uni.getStorageSync('NUall').elderInfo?.name">
+							 		{{v.sex}}
+							 		<view class="message-shu"></view>
+							 		<view style="font-weight: 600;">
+							 			{{ v.height}}cm
+							 		</view>
+							 		
+							 		<view class="message-shu"></view>
+							 		{{ v.weight}}Kg
+							 	</view>
+							 	 
+							 </view>
+						
+						</view>
+					
+				</scroll-view>	
+				<view style="position: absolute;right: 2vw;bottom: 0.8vw;height: 4vw;"  >
+					<view  
+					v-if="flag"
+					style="width: 8.2vw;
+					height: 3.3vw;
+					background: #EDEDEF;
+					border-radius: 1.6vw;
+					font-weight: 400;
+					font-size: 1.6vw;
+					color: #888888;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					border: 1px solid #EDEDEF; 
+					background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
+					border: 1px solid rgba(3,133,250,0.34);
+					color: #0385FA;" @click="zhixingsub" >确定</view>
+					<view
+					v-if="!flag"
+					style="width: 8.2vw;
+					height: 3.3vw;
+					background: #EDEDEF;
+					border-radius: 1.6vw;
+					font-weight: 400;
+					font-size: 1.6vw;
+					color: #888888;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					border: 1px solid #EDEDEF; 
+					border: 1px solid rgba(3,133,250,0.34);
+					color: #999;" >确定</view>
+				</view>
+				<tanchuang :show="zxzd>0" :font="zdcont" @back="zxzd = 0" @right="tijiaozx()"> </tanchuang>
+			</view>	
 		</view>
 		<view class="left-menu"  v-show="indexmessage?.startTime">
 			<view  style="margin: 30rpx 0;" @click="errmsgclk(0,1)">
@@ -142,24 +210,33 @@
 				</view>
 			</view>
 		</view>
-		<view class="right-menu">
+		<view class="right-menu" v-show="indexmessage?.startTime"  v-if="indexmessage?.optType==1">
 			<view class="zhezhao-top" @click="scrollTop -= 115"></view>
 			<view class="zhezhao-bottom" @click="scrollTop += 115"></view>
 			<image class="top-img" :src="`/static/index/newindex/rightmenu/top.png`"
 				@click="scrollTop>0? scrollTop -= 115:scrollTop=0" />
 			<scroll-view scroll-y="true" class="right-scroll" :scroll-top="scrollTop" @scroll="onScroll">
-				<view style="height: 20rpx;">
+				<view style="height: 20rpx;"> </view>
+				
+				<view style="margin: 20rpx 0;width: 110rpx;margin-left: 20rpx;" @click="zhixing(1)">
+					<view class="white-circle" :style="indexmessage?.izStart=='Y'?'background-color:RGBA(228, 229, 231, 1)' : ''">
+						<image class="right-menu-img" :src="'/static/index/newindex/rightmenu/1.png'" />
+						<view class="right-menu-name">
+							转单执行
+						</view>
+					</view>
+				</view>
+				<view style="margin: 20rpx 0;width: 110rpx;margin-left: 20rpx;" @click="zhixing(2)">
+					<view class="white-circle">
+						<image class="right-menu-img" :src="'/static/index/newindex/rightmenu/2.png'" />
+						<view class="right-menu-name">
+							协助执行
+						</view>
+					</view>
+				</view>
+				<view style="height: 30rpx;">
 		
 				</view>
-				<view v-for="(item,index) in rightMenu" style="margin: 20rpx 0;width: 110rpx;margin-left: 20rpx;">
-					<view class="white-circle">
-						<image class="right-menu-img" :src="item.url" />
-						<view class="right-menu-name">
-							{{ item.name }}
-						</view>
-					</view>
-				</view>
-				<view style="height: 30rpx;"></view>
 			</scroll-view>
 			<image class="top-img" :src="`/static/index/newindex/rightmenu/bottom.png`"
 				@click="scrollTop > (55* rightMenu.length) ? scrollTop = (55* rightMenu.length) : scrollTop += 115 " />
@@ -210,8 +287,8 @@
 							<view style="font-size: 1.2vw;">
 								{{ item.nuName }}
 							</view>
-							<view class="first-line-second">
+							<view class="first-line-second" :style="item.flag?'background:#47ADF5;color:#fff':''">
-								{{ item.elderInfo?.name?`盘点`:`正常` }}
+								{{ item.flag?`盘点`:`正常` }}
 							</view>
 						</view>
 						<view class="second-line">
@@ -413,7 +490,7 @@
 	import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch,reactive } from 'vue';
 	import { queryPadPageList } from '@/pages/watch/api/lunpan.js'
 	import { queryWorkOrderList,queryCountByType,queryAll } from '@/pages/NursingNew/component/api.js'
-	import {queryOrderList,queryOrderInfoList,startOrder,endOrder,editSubPicPath,editSubMp4} from '@/pages/NursingNew/component/doctorask/api/api.js'
+	import {queryOrderList,queryOrderInfoList,startOrder,endOrder,editSubPicPath,editSubMp4,queryEmpList,transferOrder,assistOrder} from '@/pages/NursingNew/component/doctorask/api/api.js'
 	const jszlshow = ref(false)
 	const props = defineProps({
 		isShow: {
@@ -422,6 +499,112 @@
 		},
 
 	});
+	
+	const zdxzdex = ref(0)
+	const zdxzarr = ref(0)
+	const zhixing = (e)=>{
+		if(indexmessage.value?.izStart=='Y' && e ==1){
+			uni.showToast({
+				title:'服务中不能转单！',
+				icon:'none'
+			})
+			return
+		}
+		queryEmpList({id:uni.getStorageSync('userInfo').id}).then(res=>{
+			zdxzarr.value = res.result;
+			console.log(res)
+			zdxzarr.value.forEach(item=>{
+				item.flag = false
+			})
+			zdxzdex.value = e;
+		})
+	}
+	const flag = ref(false)
+	const zdwu = (e,k)=>{
+		if(zdxzdex.value==1){
+			 e.flag = !e.flag;
+			 zdxzarr.value.forEach((item,i)=>{
+				 if(i!=k){
+					 item.flag = false
+				 }
+			 })
+			 flag.value = e.flag
+		}
+		if(zdxzdex.value==2){
+			 e.flag = !e.flag;
+			 let arr = [];
+			 zdxzarr.value.forEach((item,i)=>{
+				 if(item.flag){
+					 arr.push(1)
+				 }
+			 })
+			 if(arr.length==0){
+				 flag.value = false;
+			 }else{
+				 flag.value = true;
+			 }
+		}
+	}
+	const zhixingsub = ()=>{
+		zxzd.value = zdxzdex.value
+		if(zdxzdex.value==1){
+			  zdcont.value = "确认转单执行？"
+		}
+		if(zdxzdex.value==2){
+			  zdcont.value = "确认协助执行？"
+		}
+	}
+	const zxzd = ref(0);
+	const zdcont = ref('');
+	const tijiaozx = ()=>{
+		if(zxzd.value == 1){
+			let s = {}
+			zdxzarr.value.forEach((item,i)=>{
+				 if(item.flag){
+					 s = item;
+				 }
+			})
+			let obj = {
+				mainId:indexmessage.value.mainId,
+				employeeId:s.id,
+				employeeName:s.name
+			}
+			let nuId = uni.getStorageSync('nuId');
+			transferOrder(obj).then(res=>{
+				if(res.success){
+					firstgetqueryCgdList(nuId);
+					flag.value = false;
+					zxzd.value = 0;
+					zdxzdex.value = 0;
+				}
+			})
+		}
+		if(zxzd.value == 2){
+			let userinfo = uni.getStorageSync('userInfo')
+			let id = userinfo.id+',';
+			let name = userinfo.realname+',';
+			zdxzarr.value.forEach((item,i)=>{
+				 if(item.flag){
+					 id+=item.id+','
+					 name+=item.name+','
+				 }
+			})
+			let obj = {
+				mainId:indexmessage.value.mainId,
+				employeeId:id,
+				employeeName:name
+			}
+			assistOrder(obj).then(res=>{
+				if(res.success){
+					clickLeftMenu(0,{id:indexmessage.value.mainId})
+					flag.value = false;
+					zxzd.value = 0;
+					zdxzdex.value = 0;
+				}
+			})
+		}
+	}
+	
 	const indexmessage = ref({});
 	const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
 	const servervideoUrl = ref(uni.getStorageSync('serverUrl') + '/sys/commonVideo/staticVideo/')
@@ -684,8 +867,7 @@
 		let data = filteredMenu(2)[index]
 		uni.setStorageSync('nuId', data.nuId);
 		uni.setStorageSync('nuName', data.nuName);
-		uni.setStorageSync('elderId', data.elderInfo ? data.elderInfo?.id : null);
+		uni.setStorageSync('elderId', data?.elderInfo ? data.elderInfo?.id : null);
-		console.log(uni.getStorageSync('elderId'),uni.getStorageSync('nuId'),data.elderInfo)
 		uni.setStorageSync('NUall', data);
 		firstgetqueryCgdList(data.nuId);
 		emit('swip');
@@ -880,6 +1062,16 @@
 					menutarget.value = index;
 					clickmenu(index)
 				}
+				if(element.readList==null){
+					element.flag = false
+				}
+				if(element.readList.length>0){
+					element.readList.forEach(k=>{
+						if(k.type=='pdd'){
+							element.flag = true
+						}
+					})
+				}
 			})
 		}))
 	}

pages/Warehouse/index/index.vue

@@ -58,7 +58,6 @@
 	// })
 	const navurl = (e : number,v:any) => {
 		// 最后一个直接返回
-		console.log(v)
 		menuop.value = -1;
 		swipdex.value = -1;
 		setTimeout(()=>{

pages/Warehouse/picking.vue

@@ -1698,7 +1698,6 @@
 			success: res => {
 				const data = JSON.parse(res.data)
 				addSxd({ sxdPic: data.message, cgdId: plsbuy.value[lefttarget.value].id }).then(resd => {
-					console.log(resd)
 					if (resd.success) {
 						sxdarr()
 					}
@@ -1726,7 +1725,6 @@
 							albumlist.value.push(res.tempFilePath)
 						} else if (type == 1) {
 							sxdupld(res.tempFilePath)
-							console.log(res.tempFilePath)
 						}
 
 					}
@@ -1862,8 +1860,6 @@
 			cgdId: showvalue.value.cgdId
 		}
 		pickingInfo(obj).then(res => {
-			console.log(`入参`, obj)
-			console.log(`返回`, res)
 			if (res.success) {
 				uni.showToast({
 					icon: res.success ? 'success' : 'none',
@@ -2481,7 +2477,8 @@
 		.contain-right {
 			z-index: 1;
 			height: 100vh;
-			width: 62vw;
+			width: 60vw;
+			margin-left: 2%;
 			overflow: hidden;
 
 			.contain-right-title {
@@ -2491,6 +2488,7 @@
 				justify-content: flex-end;
 				position: relative;
 				
+
 				.contain-right-button {
 					width: 7.3vw;
 					height: 3.3vw;
@@ -2613,7 +2611,7 @@
 		position: fixed;
 		height: 102vh;
 		background-color: #fff;
-		width: 62.3vw;
+		width: 61vw;
 		top:-5vh;
 		right:-1vw;
 	}
@@ -3086,7 +3084,7 @@
 	.left-top-tags {
 		position: absolute;
 		top: -25rpx;
-		left: 0rpx;
+		left: 20rpx;
 	}
 
 	.juzhong {
@@ -3151,7 +3149,7 @@
 		top: 0%;
 		left: 50%;
 		transform: translate(-50%, 0%);
-		width: 55%;
+		width: 50%;
 		height: 100%;
 		border-radius: 40rpx;
 		background-color: #fff;
@@ -3206,7 +3204,7 @@
 
 		.photowall-other {
 			width: 107%;
-			height: 67vh;
+			height: 64vh;
 			display: flex;
 			margin-top: 20rpx;
 

pages/procurement/addtory.vue

@@ -82,7 +82,6 @@
 			pageSize:10
 		}
 		queryPddInfoList(obj).then(res=>{
-			console.log(res.result.records)
 			res.result.records.forEach((item,i)=>{
 				item.picPatharr = [];
 				item.zk = false;

pages/procurement/inventory.vue

@@ -27,7 +27,7 @@
 						v-for="(item,index) in tagsarray" @click="changetype(index)">
 						{{ item }}
 					</view>
-					<view class="heng-blue" :style="{ left: `${selectType === 0 ? 18 : 18 + selectType * 30}%` }">
+					<view class="heng-blue" :style="{ left: `${selectType === 0 ? 14 :(selectType==3?12:13) + selectType * 24}%` }">
 					</view>
 				</view>
 
@@ -60,7 +60,7 @@
 									{{ item.pddNo }}
 								</view> 
 							</view>
-							<view class="scroll-title-right">
+							<view class="scroll-title-right" :style="item.pddType==3?'color: #FF5757;border: 2rpx solid #FF5757;background-color: #FFF1F1;':''">
 								{{ item.pddType_dictText }}
 
 							</view>
@@ -138,7 +138,7 @@
 				<view class="bottom-right" @click="openselect=false;firstgetqueryCgdList()">
 					确定
 					<text style="font-size: 25rpx;margin-top: 5rpx;" v-if="alltotal">
-						（{{ alltotal }}采购单）
+						（{{ alltotal }}盘点单）
 					</text>
 				</view>
 			</view>
@@ -158,6 +158,10 @@
 					@click="plzinfo.pddType=`2`;firstgetqueryCgdList();selectType=2">
 					已完成
 				</view>
+				<view :class="plzinfo.pddType==`3`?`more-statues-button-target`:`more-statues-button`"
+					@click="plzinfo.pddType=`3`;firstgetqueryCgdList();selectType=3">
+					作废
+				</view>
 			</view>
 
 
@@ -267,7 +271,7 @@
 	const openselect = ref(false);
 	const manyselect = ref(false);
 	const addshow = ref(false)
-	const tagsarray = ref(["全部", "盘点中", "已完成"])
+	const tagsarray = ref(["全部", "盘点中", "已完成",'作废'])
 	const cgrlist = ref([]);
 	const props = defineProps({
 		isShow: {
@@ -338,6 +342,10 @@
 			case 2:
 				plzinfo.pddType = `2`
 				break
+			case 3:
+				plzinfo.pddType = `3`
+				
+				break
 
 		}
 		firstgetqueryCgdList()
@@ -753,7 +761,7 @@
 	}
 
 	.left-selecttype {
-		width: 450rpx;
+		width: 550rpx;
 		height: 70rpx;
 		border-radius: 40rpx;
 		// background-color: #FFFFFF;

pages/watch/settings/settings.vue

@@ -190,7 +190,7 @@
 		userInfo.value = uni.getStorageSync('userInfo');
 	}
 	const avaxg = () =>{
-		editAvatar({avatar:userInfo.value.avatar,id:userInfo.value.id}).then(res=>{
+		editAvatar({avatar:userInfo.value.avatar,id:userInfo.value.id,employessId:userInfo.value.employessId}).then(res=>{
 			console.log(res)
 			if(res.success){
 				uni.setStorageSync('userInfo', userInfo.value);

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

@@ -578,7 +578,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
 };