yangjun
/
hldy_app_mini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
wangweidong 2026-01-16 14:33:01 +08:00
parent 200a296ba3 642ebc6482
commit eee6afc03e
6 changed files with 1880 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
pages/NursingNew/component/invoicing/index.vue
View File

@ -587,7 +587,7 @@
watch(
() => props.isshow,
(newVal, oldVal) => {
console.log(1111)
// console.log(1111)
// 只有当新旧值不相同时才执行
if (newVal !== oldVal) {
bottomisShaking.value = false
@ -1608,15 +1608,15 @@
})
}
const routerPush = () => {
uni.setStorage({
key: 'myArray',
data: timearr.value,
success: function () {
uni.navigateTo({
url: `/pages/timeMatrix/indexnew`
})
},
});
// uni.setStorage({
// key: 'myArray',
// data: timearr.value,
// success: function () {
// uni.navigateTo({
// url: `/pages/timeMatrix/indexnew`
// })
// },
// });
}
// 暂存器
const saveRulerTime = ref({
@ -1664,7 +1664,7 @@
const emotionTagList = ref([]);
const bodyTagList = ref([]);
const geteverything = () => {
if (uni.getStorageSync('nuId') && uni.getStorageSync('elderId')) {
// console.log("有没有",uni.getStorageSync('nuId'),uni.getStorageSync('elderId'))
getNclist(uni.getStorageSync('nuId'),uni.getStorageSync('elderId')).then((res : any) => {
console.log("啥啊",res)
timearr.value = Array.from({ length: 24 }, (_, hour) => ({
@ -1694,12 +1694,47 @@
}
})
})
}
// if (uni.getStorageSync('nuId') && uni.getStorageSync('elderId')) {
// getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('elderId')).then((res : any) => {
// console.log("啥啊",res)
// timearr.value = Array.from({ length: 24 }, (_, hour) => ({
// positioning: hour.toString(),
// children: minuteArr.map(time => ({
// tagName: time, // 表示分钟，如 '00', '05' 等
// directiveName: '' // 默认的 directiveName
// }))
// }))
// res.result.serviceList.forEach((res : any) => {
// timearr.value[res.positioning].children[res.positioningLong] = res;
// })
// bottomItems.value = res.result.instantList
// cansumit.value = true;
// emotionTagList.value = res.result.emotionTagList;
// emotionTagListLook.value = []
// bodyTagListLook.value = []
// res.result.emotionTagList.forEach((res : any) => {
// if (res.izSelected == 'Y') {
// emotionTagListLook.value.push(res.netPic)
// }
// })
// bodyTagList.value = res.result.bodyTagList
// res.result.bodyTagList.forEach((res : any) => {
// if (res.izSelected == 'Y') {
// bodyTagListLook.value.push(res.netPic)
// }
// })
// })
// }
}
const savePackagelist = ref([]);
onMounted(() => {
// if(uni.getStorageSync('elderId')===null){
// uni.setStorageSync('elderId', "");
// }
savePackagelist.value = uni.getStorageSync('Packagelist') || []
let res = uni.getStorageSync('saveTree2')
console.log("啥啊啊啊啊",savePackagelist.value,res)
let goodArray = []
myArray.forEach((element : any) => {
element.children.forEach((element1 : any) => {

8
pages/NursingNew/component/nurse/bigindex.css
View File

@ -138,7 +138,7 @@
width: 100%;
height: 1350rpx;
display: flex;
margin-top: 62rpx;
margin-top: 30rpx;
.doctorsay-container-container {
width: 100%;
@ -469,8 +469,8 @@
.right-order {
position: fixed;
right: 20rpx;
top: 62rpx;
height: 1220rpx;
top: 30rpx;
height: 1278rpx;
width: 454rpx;
background-color: #fff;
border-radius: 30rpx;
@ -604,7 +604,7 @@
.history-items {
width: 100%;
margin-top: 15rpx;
height: 385rpx;
height: 440rpx;
.history-item {
/* margin-left: 1%; */

2
pages/NursingNew/component/nurse/bigindex.vue
View File

@ -29,7 +29,7 @@
</view>
</view>
</view>
<view style="display: flex;height: 1165rpx;position: relative;">
<view style="display: flex;height: 1225rpx;position: relative;">
<view class="xian-bian"></view>
<scroll-view style="height: 100%;width:6960rpx;background-color: #fff;"

1817
pages/NursingNew/component/nurse/newindex.vue Normal file
View File

File diff suppressed because it is too large Load Diff

8
pages/NursingNew/index.vue
View File

@ -3,10 +3,13 @@
<!-- 左侧菜单 -->
<leftcontent :list="arrlist" @navurl="navurl" :userInfo="userInfo"></leftcontent>
<!-- 主页 -->
<!-- <index :isShow="menuIndex==0" v-if="swipedex==0&&!specialPage" @swip="swip" @gospecial="gospecial" /> -->
<index :isShow="menuIndex==0" v-if="swipedex==0&&!specialPage" @swip="swip" @gospecial="gospecial" />
<!-- 新主页 -->
<bignurse :isshow="menuIndex==0" v-if="swipedex==0&&specialPage==1&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" />
<!-- 户嘱页 -->
<nurse :isshow="menuIndex==1" v-if="swipedex==1&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" />
<newnurse :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')" />
@ -30,13 +33,14 @@
import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue';
import { queryPadPageList ,getPermissionList } from '@/pages/watch/api/lunpan.js'
import index from "./component/index.vue"
import newnurse from "./component/nurse/newindex.vue"
import equipment from "./component/equipment.vue"
import logistics from "./component/logistics/index.vue"
import invoicing from "./component/invoicing/index.vue"
import requestform from "./component/pleasetake/takehome.vue"
import doctorask from "./component/doctorask/doctorask.vue"
import nurse from "./component/nurse/index.vue"
// import nurse from "./component/nurse/index.vue"
import bignurse from "./component/nurse/bigindex.vue"
import { onBackPress,onShow } from '@dcloudio/uni-app';
import { getNcPackagelist } from './component/nurse/api.js'

6
pages/login/login.vue
View File

@ -173,7 +173,7 @@
return form.password && isLength11(form.username)
})
const showPopup = ref(true)
const showPopup = ref(false)
function closebottom() {
openbottom.value = false;
isTarget.value = true;
@ -182,6 +182,8 @@
function closePopup() {
showPopup.value = false;
}
onMounted(()=>{
uni.setStorageSync("appWgtVersion", uni.getSystemInfoSync().appWgtVersion)
if (uni.getStorageSync('appWgtVersion') != uni.getSystemInfoSync().appWgtVersion) {
showPopup.value = true;
@ -196,7 +198,7 @@
}
}
init();
}
})
function closeapp() {
plus.runtime.quit()
}