diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index 0a81b89..17ab767 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -73,7 +73,7 @@
-
+
65
@@ -89,9 +89,37 @@
即时
+
+
+
+
+
+
+ 即时服务指令
+
+
+ {{v}}
+
+
+
+
+ {{v}}
+
+
+
+
+ 暂无服务指令
+
+
+
+
+ 取消
+ 确定
+
+
-
+
-
@@ -217,6 +245,7 @@
+
护理单元
@@ -242,13 +271,43 @@
+
-
+
长者标签
+
+
+
+
+
+
+
+ 体重标签
+
+
+
+
+ {{v.tagName}}
+
+
+
+
+
+
+ 情绪标签
+
+
+
+
+ {{v.tagName}}
+
+
+
+
-
+
@@ -417,6 +476,7 @@
import { queryWorkCareList } 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 { getNclist } from "./nurse/api.js";
const form = reactive({
pageNo: 1,
@@ -665,7 +725,8 @@
}
const start = (v) =>{
if(v.izStart!='N'){return}
- startOrder({id:v.directiveId}).then(res=>{
+ console.log(v)
+ startOrder({id:v.id}).then(res=>{
console.log(res)
if(res.success){
v.izStart = "Y";
@@ -869,6 +930,34 @@
},
});
}
+ const jszlshow = ref(false)
+
+
+ const emotionTagList = ref([]);
+ const bodyTagList = ref([]);
+ const zzbqshow = ref(false)
+ const geteverything = () => {
+ if (uni.getStorageSync('nuId') && uni.getStorageSync('elderId')) {
+ emotionTagList.value = [];
+ bodyTagList.value = [];
+ getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('elderId')).then((res : any) => {
+ res.result.emotionTagList.forEach(item=>{
+ if(item.izSelected == 'Y'){
+ emotionTagList.value.push(item)
+ }
+ })
+ res.result.bodyTagList.forEach(item=>{
+ if(item.izSelected == 'Y'){
+ bodyTagList.value.push(item)
+ }
+ })
+ zzbqshow.value = true;
+ // emotionTagList.value = res.result.emotionTagList;
+ // bodyTagList.value = res.result.bodyTagList;
+ console.log(res.result)
+ })
+ }
+ }
\ No newline at end of file
diff --git a/pages/NursingNew/index.vue b/pages/NursingNew/index.vue
index 9fc557a..0c91a3b 100644
--- a/pages/NursingNew/index.vue
+++ b/pages/NursingNew/index.vue
@@ -40,9 +40,7 @@
const listarr = ref([]);
onMounted(() => {
menuIndex.value = 0;
- swipedex.value = 0;
- nextTick(() => swipedex.value = 0)
-
+ swipedex.value = 0;
getServiceTree().then((res : any) => {
//缓存护嘱菜单
uni.setStorageSync("saveTree", res)
@@ -180,7 +178,7 @@
{ name: '返回', url: '/static/shouye/sy/f0.png', urls: '/static/shouye/sy/f1.png' ,type:'back'}
]
arrlist.value.push(...back);
- navurl(0,arrlist.value[0])
+ // navurl(0,arrlist.value[0])
}))
}
// 当前选中的菜单索引
diff --git a/pages/procurement/outbound.vue b/pages/procurement/outbound.vue
index 06fdb5e..b933885 100644
--- a/pages/procurement/outbound.vue
+++ b/pages/procurement/outbound.vue
@@ -42,7 +42,7 @@
-->
-
+