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

pages/NursingNew/component/api.js

@@ -144,4 +144,18 @@ export const humidDevicejgwarn = (data) => {
 		url: `${uni.getStorageSync('serverUrl')}/api/iot/humidDevice/jglist?column=createTime&order=desc&pageNo=${data.pageNo}&pageSize=${data.pageSize}&optType=read&sn=${data.sn}`,
 		method: 'get'
 	})
-}
+}
+// 护理医疗后勤数量
+export const queryCountByType = (data) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/services/directivePlan/queryCountByType?nuId=${data.nuId}&elderId=${data.elderId}`,
+		method: 'get'
+	})
+}
+// 即时指令内容
+export const queryAll = (data) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/services/directivePlanInstant/queryAll?nuId=${data.nuId}&elderId=${data.elderId}`,
+		method: 'get'
+	})
+} 

pages/NursingNew/component/leftcontent/leftcontent.vue

@@ -85,10 +85,14 @@
 	const scoltop =(e)=>{
 		if(e==0){
 			scrolltop.value = topsc.value;
-			scrolltop.value = 0;
+			nextTick(()=>{
+				scrolltop.value = 0;
+			})
 		}else{
 			scrolltop.value = topsc.value;
-			scrolltop.value = 999;
+			nextTick(()=>{
+				scrolltop.value = 999;
+			})
 		}
 	}
 	const codesc = ref(0)

pages/Warehouse/index/component/index.vue

@@ -4,7 +4,7 @@
 			<view class="title-card">
 				<view class="card-top">
 					<view class="card-top-left">
-						15
+						{{hldyobj.cklFinishedTotal}}
 					</view>
 					<view class="card-top-right">
 						<image class="right-img" src="/static/index/card/arrow.png" />
@@ -13,7 +13,7 @@
 						<view class="line">
 						</view>
 						<view class="line-gray">
-							70
+							{{hldyobj.cklTotal}}
 						</view>
 					</view>
 
@@ -29,7 +29,7 @@
 			<view class="title-card-right"  @click="jszlshow = true">
 				<view class="card-top">
 					<view class="card-top-left">
-						65
+						 
 					</view>
 					<view class="card-top-right">
 						<image class="right-img" src="/static/index/card/arrow.png" />
@@ -54,11 +54,11 @@
 						<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 1" :key='i' :class="i==2?'act':''" class="cdk">
+						<view v-for="(v,i) in zlarr" :key='i' :class="i==fwzldex?'act':''" class="cdk" @click="zldex(i)">
-							<image src="/static/qr.png" mode="aspectFill"></image>
+							<image :src="fwzldex!=i?v.netImmediateFile:v.netPreviewFileSmall" mode="aspectFill"></image>
-							<text>{{v}}</text>
+							<text>{{v.directiveName}}</text>
 						</view>
-						<view style="width: 13vw;height: 13vw;margin: 7vw 0 0 23.5vw;display: block;background: none;">
+						<view style="width: 13vw;height: 13vw;margin: 7vw 0 0 23.5vw;display: block;background: none;" v-if="zlarr.length==0">
 							<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;">
 								暂无服务指令
@@ -277,6 +277,7 @@
 <script setup lang="ts">
 	import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch } from 'vue';
 	import { queryPadPageList } from '@/pages/watch/api/lunpan.js'
+	import { queryWorkOrderList,queryCountByType,queryAll } from '@/pages/NursingNew/component/api.js'
 	const jszlshow = ref(false)
 	const props = defineProps({
 		isShow: {
@@ -299,6 +300,41 @@
 		console.log(uni.getStorageSync('elderId'),uni.getStorageSync('nuId'),data.elderInfo)
 		uni.setStorageSync('NUall', data);
 		emit('swip')
+		hlylhq(data.nuId )
+		zlfunc(data.nuId )
+	}
+	const hldyobj = ref({})
+	const hlylhq = (nuId)=>{
+		let data = {
+			nuId:nuId 
+		}
+		queryCountByType(data).then(res=>{
+			console.log(res)
+			hldyobj.value = res.result
+		})
+	}
+	const fwzlindex = ref(0);
+	const fwzldex = ref(-1);
+	const zlarr = ref({});
+	const zlfunc = (nuId)=>{
+		let data = {
+			nuId:nuId,
+			elderId:elderId
+		}
+		queryAll(data).then(res=>{
+			console.log(res)
+			zlarr.value = res.result.invoicing;
+		})
+	}
+	const zldex = (e) =>{
+		if(e>-1&&e==fwzldex.value){
+			fwzldex.value = -1
+		}else{
+			fwzldex.value = e
+		}
+	}
+	const subitshowing = () =>{
+		jszlshow.value = false
 	}
 	const tagarray = ["市医保", "半失能", "正常计费"]
 

pages/watch/settings/api.js

@@ -25,9 +25,9 @@ export const updateBaseInfo = (params) => {
 	})
 }
 // 改头像
-export const userEdit = (params) => {
+export const editAvatar = (params) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/sys/user/login/setting/userEdit`,
+		url: `${uni.getStorageSync('serverUrl')}/sys/user/login/setting/editAvatar`,
 		method: 'post',
 		data: params,
 	})

pages/watch/settings/settings.vue

@@ -120,7 +120,7 @@
 	import { getServiceTree0, getServiceTree1, getServiceTree2 } from '@/pages/NursingNew/component/nurse/api.js'
 	import { getLoginCode, loginApp } from '@/pages/login/api.js'
 
-	import {userEdit} from './api.js'
+	import {editAvatar} from './api.js'
 	const zyupgrade = ref(null);
 	const issay = ref(false)
 	const openany = ref(false);
@@ -190,7 +190,7 @@
 		userInfo.value = uni.getStorageSync('userInfo');
 	}
 	const avaxg = () =>{
-		userEdit({avatar:userInfo.value.avatar,id:userInfo.value.id}).then(res=>{
+		editAvatar({avatar:userInfo.value.avatar,id:userInfo.value.id}).then(res=>{
 			console.log(res)
 			if(res.success){
 				uni.setStorageSync('userInfo', userInfo.value);