From cbf0dbba8e22af7c9e69fcf374b8b1e7f105cabc Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Wed, 7 Jan 2026 11:23:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/NursingNew/component/api.js             |  4 +-
 .../NursingNew/component/doctorask/api/api.js | 16 ++---
 .../component/doctorask/doctorask.vue         |  7 +-
 pages/NursingNew/component/index.vue          | 11 +--
 .../component/leftcontent/leftcontent.vue     |  4 +-
 pages/NursingNew/index.vue                    | 43 +++++++-----
 pages/Warehouse/index/component/index.vue     |  1 +
 pages/Warehouse/index/index.vue               | 68 ++++++++++++++++---
 unpackage/dist/dev/.nvue/pages/camera.js      |  2 +-
 unpackage/dist/dev/.nvue/pages/fullcamera.js  |  2 +-
 10 files changed, 108 insertions(+), 50 deletions(-)

diff --git a/pages/NursingNew/component/api.js b/pages/NursingNew/component/api.js
index b53ad20..5df1a04 100644
--- a/pages/NursingNew/component/api.js
+++ b/pages/NursingNew/component/api.js
@@ -9,9 +9,9 @@ export const electricityMeterlist = () => {
 	})
 }
 // 获得护理单元主页大图
-export const queryWorkCareList = (data) => {
+export const queryWorkOrderList = (data) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/queryWorkCareList?workType=${data.workType}&employeeId=${data.employeeId}&nuId=${data.nuId}`,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/serviceorder/queryWorkOrderList?workType=${data.workType}&employeeId=${data.employeeId}&nuId=${data.nuId}`,
 		method: 'get'
 	})
 }
diff --git a/pages/NursingNew/component/doctorask/api/api.js b/pages/NursingNew/component/doctorask/api/api.js
index ecf6f1f..6460976 100644
--- a/pages/NursingNew/component/doctorask/api/api.js
+++ b/pages/NursingNew/component/doctorask/api/api.js
@@ -1,16 +1,16 @@
 // 引入 request 文件
 import request from '@/request/index.js'
  
-export const queryCareList = (params) => {
+export const queryOrderList = (params) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/queryCareList`,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/serviceorder/queryOrderList`,
 		method: 'get',
 		data: params,
 	})
 }
-export const queryCareInfoList = (params) => {
+export const queryOrderInfoList = (params) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/queryCareInfoList`,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/serviceorder/queryOrderInfoList`,
 		method: 'get',
 		data: params,
 	})
@@ -18,28 +18,28 @@ export const queryCareInfoList = (params) => {
 
 export const startOrder = (params) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/startOrder`,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/serviceorder/startOrder`,
 		method: 'post',
 		data: params,
 	})
 }
 export const endOrder = (params) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/endOrder`,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/serviceorder/endOrder`,
 		method: 'post',
 		data: params,
 	})
 }
 export const editSubMp4 = (params) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/editSubMp4`,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/serviceorder/editSubMp4`,
 		method: 'post',
 		data: params,
 	})
 }
 export const editSubPicPath = (params) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/editSubPicPath`,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/serviceorder/editSubPicPath`,
 		method: 'post',
 		data: params,
 	})
diff --git a/pages/NursingNew/component/doctorask/doctorask.vue b/pages/NursingNew/component/doctorask/doctorask.vue
index 223323d..c40f822 100644
--- a/pages/NursingNew/component/doctorask/doctorask.vue
+++ b/pages/NursingNew/component/doctorask/doctorask.vue
@@ -191,10 +191,9 @@
 <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,startOrder,endOrder,editSubPicPath,editSubMp4} from './api/api.js'
+	import {queryOrderList,queryOrderInfoList,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,
@@ -219,7 +218,7 @@
 		firstgetqueryCgdList();
 	}
 	const firstgetqueryCgdList = () => {
-		queryCareList(form).then(res => {
+		queryOrderList(form).then(res => {
 			console.log(res)
 			plsbuy.value.push(...res.result.records);
 			status.value = res.result.total == plsbuy.value.length ? 'nomore' : 'loadmore';
@@ -243,7 +242,7 @@
 		let num = Math.ceil((index + 1))
 		leftscrolltop.value = (num - 2) * 186;
 		lefttarget.value = index;
-		queryCareInfoList({ mainId: item.id }).then(res => {
+		queryOrderInfoList({ mainId: item.id }).then(res => {
 			console.log(res)
 			cardarr.value = res.result
 		})
diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index 17ab767..c031f1b 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -473,9 +473,9 @@
 <script setup lang="ts">
 	import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch ,reactive} from 'vue';
 	import { queryPadPageList } from '@/pages/watch/api/lunpan.js'
-	import { queryWorkCareList } from './api.js'
+	import { queryWorkOrderList } from './api.js'
 	// import {startOrder,endOrder} from './doctorask/api/api.js'
-	import {queryCareList,queryCareInfoList,startOrder,endOrder,editSubPicPath,editSubMp4} from '../component/doctorask/api/api.js'
+	import {queryOrderList,queryOrderInfoList,startOrder,endOrder,editSubPicPath,editSubMp4} from '../component/doctorask/api/api.js'
 	import { getNclist } from "./nurse/api.js";
 	
 	const form = reactive({
@@ -486,7 +486,7 @@
 	})
 	const plsbuy = ref([])
 	const firstgetqueryCgdList = () => {
-		queryCareList(form).then(res => {
+		queryOrderList(form).then(res => {
 			plsbuy.value.push(...res.result.records);
 			if(form.pageNo==1){
 				clickLeftMenu(0,plsbuy.value[0])
@@ -494,7 +494,7 @@
 		})
 	}
 	const clickLeftMenu = (index : any, item : object) => {
-		queryCareInfoList({ mainId: item.id }).then(res => {
+		queryOrderInfoList({ mainId: item.id }).then(res => {
 			indexmessage.value = res.result[0]
 		})
 	}
@@ -897,7 +897,8 @@
 			employeeId: uni.getStorageSync('userInfo').employessId,
 			workType: 5
 		}
-		queryWorkCareList(data).then((res : any) => {
+		console.log("看看图",data)
+		queryWorkOrderList(data).then((res : any) => {
 			console.log("看看图",res)
 			indexmessage.value = res.result.records[0]; 
 			console.log("看看图",'https://www.focusnu.com/media/upFiles/'+indexmessage.value.previewFile)
diff --git a/pages/NursingNew/component/leftcontent/leftcontent.vue b/pages/NursingNew/component/leftcontent/leftcontent.vue
index d502dc9..db4bab5 100644
--- a/pages/NursingNew/component/leftcontent/leftcontent.vue
+++ b/pages/NursingNew/component/leftcontent/leftcontent.vue
@@ -4,7 +4,7 @@
 			<view class="logomain tp">
 				<image src="/static/shouye/logo2.png" mode="aspectFill"></image>
 			</view>
-			<view class="cont">
+			<scroll-view class="cont" :scroll-y="true">
 				<view class="items" v-for="(v,i) in list" :key='i' :class="{'act':i==dexleft}" @click="dexleft = i;emit('navurl',i,v)">
 					<view class="tm guodu">
 						<image :src="i==dexleft?v.urls:v.url" mode="aspectFill" class="guodu"></image>
@@ -12,7 +12,7 @@
 					</view>
 					<!-- <view class="heng guodu" :style="i!=dexleft&&i!=list.length-1?'opacity: 1':'opacity: 0'"></view> -->
 				</view>
-			</view>
+			</scroll-view>
 			<view class="logo">
 				<view class="tp">
 					<image src="/static/shouye/xd.png" mode="aspectFill"></image>
diff --git a/pages/NursingNew/index.vue b/pages/NursingNew/index.vue
index 0c91a3b..496e103 100644
--- a/pages/NursingNew/index.vue
+++ b/pages/NursingNew/index.vue
@@ -8,13 +8,12 @@
 		<nurse :isshow="menuIndex==1" v-if="swipedex==1&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" />
 		<!-- 医嘱 -->
 		<doctorask v-if="swipedex==2&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" />
-		<!-- 设备页 -->
 		<logistics :isshow="menuIndex==3" v-if="swipedex==3&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" />
-		<equipment :isShow="menuIndex==5" v-if="swipedex==5" />
 		<!-- 医嘱页 -->
 		<!-- <logistics :isShow="menuIndexshowfourth" v-if="menuIndex==3" /> -->
 		<requestform :isShow="menuIndex==4" v-if="swipedex==4" />
-		
+		<!-- 设备页 -->
+		<equipment :isShow="menuIndex==5" v-if="swipedex==5" />
 		<!-- 没有数据 -->
 		<view class="nomessageclass" :style="messageopit?{opacity: `1`}:{opacity: `0`}"
 			v-if="(menuIndex == 1 || menuIndex == 2) && (!uni.getStorageSync('elderId') ||!uni.getStorageSync('nuId'))">
@@ -50,7 +49,8 @@
 			uni.setStorageSync("Packagelist", res.result)
 		})
 		getPermissionList({employessId:uni.getStorageSync('userInfo').employessId}).then(res=>{
-			listarr.value = res.result;
+			console.log(res)
+			listarr.value = res.result ;
 		})
 	})
 
@@ -64,10 +64,10 @@
 		})
 	}
 	const tabbrarr = ref([
-		{ name: '护理矩阵', url: '/static/shouye/sy/n0.png', urls: '/static/shouye/sy/n1.png' ,type:'hldy_hljz'},
-		{ name: '医疗矩阵', url: '/static/shouye/sy/y0.png', urls: '/static/shouye/sy/y1.png' ,type:'hldy_yljz'},
-		{ name: '后勤矩阵', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png' ,type:'hldy_xzjz'},
-		{ name: '请领', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png' ,type:'hldy_ql'},
+		{ name: '护理矩阵', url: '/static/shouye/sy/n0.png', urls: '/static/shouye/sy/n1.png' ,type:'kzgn_hljz'},
+		{ name: '医疗矩阵', url: '/static/shouye/sy/y0.png', urls: '/static/shouye/sy/y1.png' ,type:'kzgn_yljz'},
+		{ name: '后勤矩阵', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png' ,type:'kzgn_hqjz'},
+		{ name: '库房矩阵', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png' ,type:'kzgn_kfjz'},
 	])
 	const navurl = (e,v) => {
 		swipedex.value = -1;
@@ -79,28 +79,32 @@
 			},100)
 			console.log('护理单元')
 				break;
-			case 'hldy_hljz':
+			case 'kzgn_hljz':
 			swipedex.value = 1;
 			setTimeout(()=>{
 				menuIndex.value =1;
 			},100)
 			console.log('护理矩阵')
 				break;
-			case 'hldy_yljz':
+			case 'kzgn_yljz':
 			swipedex.value = 2;
 			setTimeout(()=>{
 				menuIndex.value = 2;
 			},100)
 			console.log('医疗矩阵')
 				break;
-			case 'hldy_xzjz':
+			case 'kzgn_hqjz':
 			swipedex.value = 3;
 			setTimeout(()=>{
 				menuIndex.value = 3;
 			},100)
-			console.log('行政矩阵')
+			console.log('后勤矩阵')
 				break;
-			case 'kf':
+			case 'kzgn_kfjz':
+			swipedex.value = 3;
+			setTimeout(()=>{
+				menuIndex.value = 3;
+			},100)
 			console.log('库房')
 				break;
 			case 'kf_cg':
@@ -147,15 +151,22 @@
 		{ name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png' ,type:'hldy'}
 	])
 	const swip = ()=>{
+		let nuId = uni.getStorageSync('nuId');
+		let arrs = [];
+		listarr.value.forEach(item=>{
+			if(item.nuId == nuId){
+				arrs = item.dataList
+			}
+		})
 		let nuName = uni.getStorageSync('nuName')
+		
 		queryPadPageList({'pageNo':-1,'nuName':nuName}).then((res => {
-			console.log(res.result.records)
 			let arr = res.result.records[0].permissionList;
 			arrlist.value = [{ name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png' ,type:'hldy'}];
 			let tbr = [];
 			if(arr){
 				arr.forEach((v,i)=>{
-					let obj = listarr.value.find(item=>
+					let obj = arrs.find(item=>
 						item.menuCode == v.menuCode
 					);
 					if(obj){
@@ -168,12 +179,12 @@
 					);
 					if(obj){
 						arrlist.value.push(obj);
-						console.log(arrlist.value)
 					}
 				}) 
 			}
 			
 			let back =[
+				{ name: '请领', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png' ,type:'hldy_ql'},
 				{ name: '智慧物联', url: '/static/shouye/sy/g0.png', urls: '/static/shouye/sy/g1.png' ,type:'wl'},
 				{ name: '返回', url: '/static/shouye/sy/f0.png', urls: '/static/shouye/sy/f1.png' ,type:'back'}
 			]
diff --git a/pages/Warehouse/index/component/index.vue b/pages/Warehouse/index/component/index.vue
index 802b357..197010b 100644
--- a/pages/Warehouse/index/component/index.vue
+++ b/pages/Warehouse/index/component/index.vue
@@ -271,6 +271,7 @@
 		uni.setStorageSync('nuId', data.nuId);
 		uni.setStorageSync('nuName', data.nuName);
 		uni.setStorageSync('elderId', data.elderInfo ? data.elderInfo?.id : null);
+		console.log(uni.getStorageSync('elderId'),uni.getStorageSync('nuId'),data.elderInfo)
 		uni.setStorageSync('NUall', data);
 		emit('swip')
 	}
diff --git a/pages/Warehouse/index/index.vue b/pages/Warehouse/index/index.vue
index 5a97699..327a5ce 100644
--- a/pages/Warehouse/index/index.vue
+++ b/pages/Warehouse/index/index.vue
@@ -12,6 +12,9 @@
 				<outbound  :isShow="menuop == 4" v-if="swipdex == 4"></outbound>
 				<retstock  :isShow="menuop == 5" v-if="swipdex == 5"></retstock>
 				<inventory :isShow="menuop == 6" v-if="swipdex == 6"></inventory>
+				<nurse     :isshow="menuop == 7" v-if="swipdex==7&&uni.getStorageSync('nuId')" />
+				<doctorask :isshow="menuop == 8" v-if="swipdex==8&&uni.getStorageSync('nuId')" />
+				<logistics :isshow="menuop == 9" v-if="swipdex==9&&uni.getStorageSync('nuId')" />
 			</view>
 		</view>
 	</view>
@@ -31,14 +34,16 @@
 	import outbound from "@/pages/procurement/outbound.vue";
 	import inventory from "@/pages/procurement/inventory.vue";
 	import retstock from "@/pages/procurement/retstock.vue";
+	
+	import logistics from "@/pages/NursingNew/component/nurse/logistics.vue"
+	import doctorask from "@/pages/NursingNew/component/doctorask/doctorask.vue"
+	import nurse from "@/pages/NursingNew/component/nurse/index.vue"
 
 	const tabbrarr = ref([
-		{ name: '采购', url: '/static/shouye/ck/c0.png', urls: '/static/shouye/ck/c1.png'  ,type:'kf_cg'},
-		{ name: '拣货', url: '/static/shouye/ck/j0.png', urls: '/static/shouye/ck/j1.png'  ,type:'kf_jh'},
-		{ name: '完结', url: '/static/shouye/ck/w0.png', urls: '/static/shouye/ck/w1.png'  ,type:'kf_wj'},
-		{ name: '请领出库', url: '/static/shouye/ck/q0.png', urls: '/static/shouye/ck/q1.png'  ,type:'kf_ql'},
-		{ name: '退货入库', url: '/static/shouye/ck/t0.png', urls: '/static/shouye/ck/t1.png'  ,type:'kf_th'},
-		{ name: '库存盘点', url: '/static/shouye/ck/p0.png', urls: '/static/shouye/ck/p1.png'  ,type:'kf_pd'},
+		{ name: '护理矩阵', url: '/static/shouye/sy/n0.png', urls: '/static/shouye/sy/n1.png' ,type:'kzgn_hljz'},
+		{ name: '医疗矩阵', url: '/static/shouye/sy/y0.png', urls: '/static/shouye/sy/y1.png' ,type:'kzgn_yljz'},
+		{ name: '后勤矩阵', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png' ,type:'kzgn_hqjz'},
+		{ name: '库房矩阵', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png' ,type:'kzgn_kfjz'},
 	])
 	const menuop = ref(0)
 	const swipdex = ref(0)
@@ -98,6 +103,34 @@
 					menuop.value = 6
 				},100)
 					break;
+				case 'kzgn_hljz':
+				swipdex.value = 7;
+				setTimeout(()=>{
+					menuop.value =7;
+				},100)
+				console.log('护理矩阵')
+					break;
+				case 'kzgn_yljz':
+				swipdex.value = 8;
+				setTimeout(()=>{
+					menuop.value = 8;
+				},100)
+				console.log('医疗矩阵')
+					break;
+				case 'kzgn_hqjz':
+				swipdex.value = 9;
+				setTimeout(()=>{
+					menuop.value = 9;
+				},100)
+				console.log('后勤矩阵')
+					break;
+				case 'kzgn_kfjz':
+				swipdex.value = 7;
+				setTimeout(()=>{
+					menuop.value =7;
+				},100)
+				console.log('库房')
+					break;
 				case 'back':
 				uni.navigateBack()
 					break;
@@ -107,18 +140,31 @@
 			}
 		},10)
 	}
-	const arrlist = ref([
-		{ name: '首页', url: '/static/shouye/ck/h0.png', urls: '/static/shouye/ck/h1.png' ,type:'sy'}
-	])
+	const arrlist = ref([ ])
 	const listarr = ref([])
 	const swip = ()=>{
+		let nuId = uni.getStorageSync('nuId');
 		getPermissionList({employessId:uni.getStorageSync('userInfo').employessId}).then(res=>{
-			listarr.value = res.result;
+			console.log(res)
+			console.log(nuId)
+			res.result.forEach(item=>{
+				if(item.nuId == nuId){
+					listarr.value  = item.dataList
+				}
+			})
 		})
 		let nuName = uni.getStorageSync('nuName')
 		queryPadPageList({'pageNo':-1,'nuName':nuName}).then((res => {
 			let arr = res.result.records[0].permissionList;
-			arrlist.value = [{ name: '首页', url: '/static/shouye/ck/h0.png', urls: '/static/shouye/ck/h1.png' ,type:'sy'}];
+			arrlist.value = [
+				{ name: '首页', url: '/static/shouye/ck/h0.png', urls: '/static/shouye/ck/h1.png' ,type:'sy'},
+				{ name: '采购', url: '/static/shouye/ck/c0.png', urls: '/static/shouye/ck/c1.png'  ,type:'kf_cg'},
+				{ name: '拣货', url: '/static/shouye/ck/j0.png', urls: '/static/shouye/ck/j1.png'  ,type:'kf_jh'},
+				{ name: '完结', url: '/static/shouye/ck/w0.png', urls: '/static/shouye/ck/w1.png'  ,type:'kf_wj'},
+				{ name: '请领出库', url: '/static/shouye/ck/q0.png', urls: '/static/shouye/ck/q1.png'  ,type:'kf_ql'},
+				{ name: '退货入库', url: '/static/shouye/ck/t0.png', urls: '/static/shouye/ck/t1.png'  ,type:'kf_th'},
+				{ name: '库存盘点', url: '/static/shouye/ck/p0.png', urls: '/static/shouye/ck/p1.png'  ,type:'kf_pd'},
+			];
 			let tbr = [];
 			if(arr){
 				arr.forEach((v,i)=>{
diff --git a/unpackage/dist/dev/.nvue/pages/camera.js b/unpackage/dist/dev/.nvue/pages/camera.js
index 12310ff..04100f2 100644
--- a/unpackage/dist/dev/.nvue/pages/camera.js
+++ b/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
 };
diff --git a/unpackage/dist/dev/.nvue/pages/fullcamera.js b/unpackage/dist/dev/.nvue/pages/fullcamera.js
index a0a8c0f..f69ae1a 100644
--- a/unpackage/dist/dev/.nvue/pages/fullcamera.js
+++ b/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
 };