新增消息

common/config/application-api.js

@@ -6,9 +6,9 @@ const {
 export const getProtocolList = (data) => http.get('/dev-api/care/protocol/list', data);
 //获取用户协议详情
 export const getProtocolInfo = (data) => http.get(`/dev-api/care/protocol/${data.id??0}`, data);
-//护理人员列表
+//查询护理人员列表
 export const getNursesList = (data) => http.get(`/dev-api/care/nurses/list`,data);
-//护理人员列表
+//查询护理人员详情
 export const getNursesInfo = (data) => http.get(`/dev-api/care/nurses/${data.id??0}`,data);
 //编辑护理人员
 export const editNurses = (data) => http.get(`/dev-api/care/nurses/${data.id??0}`,data);
@@ -31,4 +31,8 @@ export const postCareAssign = (parmas, config = {}) => http.post('/dev-api/care/
 //护理审核
 export const postCareCheck = (parmas, config = {}) => http.post('/dev-api/care/applications/check', parmas, config)
 //完成护理申请
-export const postCareComplete = (parmas, config = {}) => http.post('/dev-api/care/applications/complete', parmas, config)
+export const postCareComplete = (parmas, config = {}) => http.post('/dev-api/care/applications/complete', parmas, config)
+//查询全部公司 
+export const getCompanyList = (data) =>http.get('/dev-api/care/companies/listAll', data)
+//查询公司的护理人员
+export const getCompanyNursesList = (data) => http.get('/dev-api/care/nurses/listCompanyNurses', data)

pages/subpack/pages/application/choose.vue

@@ -54,6 +54,10 @@
 	import {
 		onLoad
 	} from "@dcloudio/uni-app"
+	import {
+		getCompanyList,
+		getCompanyNursesList
+	} from '@/common/config/application-api.js'
 
 	const {
 		proxy
@@ -145,6 +149,28 @@
 			uni.hideLoading();
 		}, 500)
 	}
+	
+	function getUserList(pageNo, pageSize){
+		getCompanyNursesList({
+			params: {
+				pageNum: pageNo,
+				pageSize
+			}
+		}).then(res=>{
+			
+		})
+	}
+	
+	function getFirmList(pageNo, pageSize) {
+		getCompanyList({
+			parmas: {
+				pageNum: pageNo,
+				pageSize
+			}
+		}).then(res=>{
+			
+		})
+	}
 
 	const paging = ref(null)
 

pages/subpack/pages/application/componenets/page1.vue

@@ -118,6 +118,8 @@
 	//是否显示退回按钮
 	function isShowBack(){
 		let user = store.state.vuex_user;
+		console.log('area=>', user.roles);
+		console.log('props.item.status=>',  props.item.status);
 		return user.roles.includes('area') && props.item.status == 'wait_check';
 	}
 	

pages/subpack/pages/application/list.vue

@@ -2,7 +2,7 @@
 	<view>
 		<z-paging ref="paging" v-model="dataList" @query="queryList" empty-view-text="~ 暂无数据 ~">
 			<template #top>
-				<u-navbar class="u-navbar-box" :title="computePageTitle" placeholder bgColor="transparent" autoBack />
+				<u-navbar class="u-navbar-box" :title="handleTitle" placeholder bgColor="transparent" autoBack />
 				<view class="bg-white">
 					<u-tabs :list="tabList" :current="tabIndex" lineWidth="80rpx" :itemStyle="itemStyle"
 						:activeStyle="activeStyle" :inactiveStyle="inactiveStyle" @click="handleTabs" />
@@ -21,6 +21,7 @@
 	import {
 		ref,
 		reactive,
+		computed,
 		getCurrentInstance,
 		onMounted,
 		computed
@@ -182,7 +183,14 @@
 		tabIndex.value = index;
 		proxy.$refs.paging.reload();
 	}
-
+	
+	const handleTitle = computed(() => {
+		if(roles.includes('area')) return '护理审核';
+		if(roles.includes('village')) return '护理申请';
+		if(roles.includes('company')) return '护理指派';
+		else return '护理打卡';
+	})
+	
 
 	const dataList = ref([])
 	const paging = ref(null)
@@ -225,21 +233,6 @@
 	onUnload(() => {
 		uni.$off('renderApplyList')
 	})
-
-	const computePageTitle = computed(() => {
-		if (proxy.vuex_user.roles.includes('village')) {
-			return '我的申请'
-		}
-		if (proxy.vuex_user.roles.includes('area')) {
-			return '申请审核'
-		}
-		if (proxy.vuex_user.roles.includes('company')) {
-			return '护理指派'
-		}
-		if (proxy.vuex_user.roles.includes('nurse')) {
-			return '我的护理'
-		}
-	})
 </script>
 <style>
 	page {