From 48514d94be6b9176cd63ab7bd8c3861d1c48b3b7 Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Fri, 9 Jan 2026 16:25:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/NursingNew/component/index.vue | 88 ++++++++++++-------
.../component/leftcontent/leftcontent.vue | 22 +++--
.../pleasetake/common/takerecord.vue | 2 +-
.../pleasetake/component/takehomep.vue | 3 +-
.../component/pleasetake/takehome.vue | 2 -
pages/NursingNew/index.vue | 6 +-
pages/Warehouse/index/index.vue | 18 +++-
pages/procurement/components/tanchuang.vue | 2 +-
pages/procurement/inventory.vue | 13 +--
pages/procurement/material.vue | 60 ++++++++-----
unpackage/dist/dev/.nvue/pages/camera.js | 2 +-
unpackage/dist/dev/.nvue/pages/fullcamera.js | 2 +-
12 files changed, 136 insertions(+), 84 deletions(-)
diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index ef907ec..b9c4f88 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -119,7 +119,7 @@
-
+
- 待执行
+ {{indexmessage?.izStart=='N'?'待执行':'执行中'}}
+
@@ -152,14 +153,14 @@
{{ indexmessage?.directiveName }}
-
+
开始服务
-
+
结束服务
@@ -349,32 +350,35 @@
-
+
-
+
- 库存盘点
+ {{ indexmessage?.directiveName }}
-
- 10:00 - 10:10
+
+ {{ indexmessage?.startTime.slice(11, 16) }}
+ -
+ {{ indexmessage?.endTime.slice(11, 16) }}
单人执行
- 王金福
+ {{indexmessage.employeeName}}
-
+
-
+
开始服务
-
+
结束服务
@@ -418,7 +422,7 @@
height: 1.4vw;">
-
+
@@ -478,12 +482,25 @@
-
+ 确定
+
-
-
@@ -494,7 +511,8 @@
// import {startOrder,endOrder} from './doctorask/api/api.js'
import {queryOrderList,queryOrderInfoList,startOrder,endOrder,editSubPicPath,editSubMp4} from '../component/doctorask/api/api.js'
import { getNclist } from "./nurse/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,
@@ -512,17 +530,16 @@
if(res.result.records.length>0){
clickLeftMenu(0,res.result.records[0])
}else{
- indexmessage.value = [];
+ indexmessage.value = {};
}
})
}
const clickLeftMenu = (index : any, item : object) => {
queryOrderInfoList({ mainId: item.id }).then(res => {
- console.log(res)
if(res.result.length>0){
indexmessage.value = res.result[0]
}else{
- indexmessage.value = [];
+ indexmessage.value = {};
}
})
}
@@ -531,7 +548,6 @@
const topbuttontarget = ref(0);
const ilanarr = ref([]);
const listobj = ref({});
-
const ysptp = (v,i,r) =>{
// v.manuallyPicPath
if(r == 1&&v.manuallyPicPath){
@@ -625,7 +641,7 @@
if(res.success){
topbuttontarget.value = 0;
donghuaopo.value = false;
- clickLeftMenu(lefttarget.value,plsbuy.value[lefttarget.value])
+ clickLeftMenu(0,{id:indexmessage.value.mainId})
}
})
}else{
@@ -633,7 +649,7 @@
if(res.success){
topbuttontarget.value = 0;
donghuaopo.value = false;
- clickLeftMenu(lefttarget.value,plsbuy.value[lefttarget.value])
+ clickLeftMenu(0,{id:indexmessage.value.mainId})
}
})
}
@@ -815,16 +831,20 @@
})
}
const end = (v)=>{
- console.log(v)
- if(v.izStart=='Y'&& v.izFinish=='N'){
- endOrder({id:v.id}).then(res=>{
- console.log(res)
+ if(indexmessage.value.izStart=='Y'&& indexmessage.value.izFinish=='N'){
+ open.value=3;
+ }
+ }
+ const ends = ()=>{
+
+ endOrder({id:indexmessage.value.id}).then(res=>{
if(res.success){
+ open.value=0;
firstgetqueryCgdList(uni.getStorageSync('nuId'))
}else{
}
- })}
+ })
}
// 通用的生成函数
@@ -1751,12 +1771,12 @@
display: flex;
align-items: center;
transition: all 0.5s ease;
-
+ padding:0 0 0 1.5vw;
.fixed-card-left {
display: flex;
flex-direction: column;
align-items: center;
-
+ margin-right:1.2vw;
.card-left-img {
width: 12vw;
height: 8vw;
@@ -1785,7 +1805,8 @@
display: flex;
margin-top: 1vw;
font-size: 1.5vw;
-
+ width: 18.5vw;
+ justify-content: space-around;
.button-left {
width: 8.5vw;
height: 3.3vw;
@@ -1808,7 +1829,6 @@
border-radius: 1.2vw;
border: 1rpx solid #5AAEFF;
color: #249BFA;
- margin-left: 1vw;
background: linear-gradient(to bottom, #fff, #D1EAFF);
}
}
diff --git a/pages/NursingNew/component/leftcontent/leftcontent.vue b/pages/NursingNew/component/leftcontent/leftcontent.vue
index 846308a..725b0a6 100644
--- a/pages/NursingNew/component/leftcontent/leftcontent.vue
+++ b/pages/NursingNew/component/leftcontent/leftcontent.vue
@@ -1,7 +1,7 @@
-
+
@@ -47,10 +47,13 @@
},
style:{
type:String
+ },
+ userInfo:{
+ type:Object
}
});
const serverUrl = ref(uni.getStorageSync('serverUrl'))
- const userInfo = uni.getStorageSync('userInfo');
+ // const userInfo = uni.getStorageSync('userInfo');
const emit = defineEmits(['navurl'])
const dexleft = ref(0);
const scrolltop = ref(0)
@@ -142,10 +145,19 @@
margin-top: 0.6vw;
color: #666666;
}
+ .tp image{
+ width: 100%;
+ height: 100%;
+ border-radius: 50%;
+ }
}
.logomain{
width: 6vw;
height: 6vw;
+ image{
+ width: 100%;
+ height: 100%;
+ }
}
.topcpnt{
width: 6vw;
@@ -240,11 +252,7 @@
}
}
}
- .tp image{
- width: 100%;
- height: 100%;
- border-radius: 50%;
- }
+
.guodu {
transition: .4s;
-webkit-transform-style: preserve-3d;
diff --git a/pages/NursingNew/component/pleasetake/common/takerecord.vue b/pages/NursingNew/component/pleasetake/common/takerecord.vue
index 229d812..845089f 100644
--- a/pages/NursingNew/component/pleasetake/common/takerecord.vue
+++ b/pages/NursingNew/component/pleasetake/common/takerecord.vue
@@ -250,7 +250,7 @@
.leftbox {
width: 13vw;
- height: 12;
+ height: 12vw;
border-right: 2px solid #E5E5E5;
display: flex;
flex-direction: column;
diff --git a/pages/NursingNew/component/pleasetake/component/takehomep.vue b/pages/NursingNew/component/pleasetake/component/takehomep.vue
index 1ab8407..cf37eb4 100644
--- a/pages/NursingNew/component/pleasetake/component/takehomep.vue
+++ b/pages/NursingNew/component/pleasetake/component/takehomep.vue
@@ -49,8 +49,7 @@
-
-
+
diff --git a/pages/NursingNew/component/pleasetake/takehome.vue b/pages/NursingNew/component/pleasetake/takehome.vue
index 6a9d91d..21046b5 100644
--- a/pages/NursingNew/component/pleasetake/takehome.vue
+++ b/pages/NursingNew/component/pleasetake/takehome.vue
@@ -8,8 +8,6 @@
{{ uni.getStorageSync('nuName')}}
-
- {{uni.getStorageSync('realname')}}
返回
diff --git a/pages/NursingNew/index.vue b/pages/NursingNew/index.vue
index 45c0b91..a85cba2 100644
--- a/pages/NursingNew/index.vue
+++ b/pages/NursingNew/index.vue
@@ -1,7 +1,7 @@
-
+
@@ -270,6 +270,10 @@
messageopit.value = true;
}, 200)
}
+ const userInfo = ref({})
+ onShow(()=>{
+ userInfo.value = uni.getStorageSync('userInfo');
+ })