From 4a1560759e9530863158bb8689a716cf3ac5fb96 Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Thu, 18 Dec 2025 17:17:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../NursingNew/component/doctorask/api/api.js | 29 ++
.../component/doctorask/doctorask.vue | 385 +++++++++++++++++-
pages/Warehouse/Warehouse.vue | 22 +-
pages/watch/index.vue | 8 +-
static/index/warehouse/newtwo/Warehouse1.png | Bin 0 -> 162167 bytes
static/index/warehouse/newtwo/Warehouse2.png | Bin 0 -> 162279 bytes
static/index/warehouse/newtwo/Warehouse3.png | Bin 0 -> 164802 bytes
static/index/warehouse/newtwo/Warehouse4.png | Bin 0 -> 165425 bytes
static/index/warehouse/newtwo/Warehouse5.png | Bin 0 -> 166671 bytes
static/index/warehouse/newtwo/Warehouse6.png | Bin 0 -> 167778 bytes
static/index/warehouse/newtwo/Warehouse7.png | Bin 0 -> 168356 bytes
static/index/warehouse/newtwo/Warehouse8.png | Bin 0 -> 167521 bytes
static/index/warehouse/newtwo/backpage.jpg | Bin 0 -> 126539 bytes
static/index/warehouse/newtwo/count.png | Bin 0 -> 28263 bytes
static/index/warehouse/newtwo/end0.png | Bin 0 -> 49178 bytes
static/index/warehouse/newtwo/end1.png | Bin 0 -> 44733 bytes
static/index/warehouse/newtwo/end2.png | Bin 0 -> 42287 bytes
static/index/warehouse/newtwo/end3.png | Bin 0 -> 41433 bytes
static/index/warehouse/newtwo/end4.png | Bin 0 -> 41046 bytes
static/index/warehouse/newtwo/end5.png | Bin 0 -> 40380 bytes
static/index/warehouse/newtwo/end6.png | Bin 0 -> 41484 bytes
static/index/warehouse/newtwo/lead.png | Bin 0 -> 6189 bytes
static/index/warehouse/newtwo/logo1.png | Bin 0 -> 27943 bytes
static/index/warehouse/newtwo/logo2.png | Bin 0 -> 27414 bytes
static/index/warehouse/newtwo/logo3.png | Bin 0 -> 28028 bytes
static/index/warehouse/newtwo/matrix0.png | Bin 0 -> 25089 bytes
static/index/warehouse/newtwo/matrix1.png | Bin 0 -> 25191 bytes
static/index/warehouse/newtwo/matrix2.png | Bin 0 -> 25236 bytes
static/index/warehouse/newtwo/matrix3.png | Bin 0 -> 25273 bytes
static/index/warehouse/newtwo/matrix4.png | Bin 0 -> 25335 bytes
static/index/warehouse/newtwo/matrix5.png | Bin 0 -> 25418 bytes
static/index/warehouse/newtwo/monitor0.png | Bin 0 -> 39745 bytes
static/index/warehouse/newtwo/monitor1.png | Bin 0 -> 39833 bytes
static/index/warehouse/newtwo/monitor2.png | Bin 0 -> 39826 bytes
static/index/warehouse/newtwo/monitor3.png | Bin 0 -> 39907 bytes
static/index/warehouse/newtwo/monitor4.png | Bin 0 -> 39737 bytes
static/index/warehouse/newtwo/monitor5.png | Bin 0 -> 39742 bytes
static/index/warehouse/newtwo/monitor6.png | Bin 0 -> 39576 bytes
static/index/warehouse/newtwo/monitor7.png | Bin 0 -> 39290 bytes
static/index/warehouse/newtwo/purchase0.png | Bin 0 -> 35690 bytes
static/index/warehouse/newtwo/purchase1.png | Bin 0 -> 35927 bytes
static/index/warehouse/newtwo/purchase2.png | Bin 0 -> 35993 bytes
static/index/warehouse/newtwo/purchase3.png | Bin 0 -> 35918 bytes
static/index/warehouse/newtwo/purchase4.png | Bin 0 -> 35812 bytes
static/index/warehouse/newtwo/purchase5.png | Bin 0 -> 35686 bytes
static/index/warehouse/newtwo/purchase6.png | Bin 0 -> 35632 bytes
static/index/warehouse/newtwo/purchase7.png | Bin 0 -> 35153 bytes
static/index/warehouse/newtwo/return.png | Bin 0 -> 5917 bytes
static/index/warehouse/newtwo/train1.png | Bin 0 -> 5750 bytes
static/index/warehouse/newtwo/train10.png | Bin 0 -> 6920 bytes
static/index/warehouse/newtwo/train2.png | Bin 0 -> 4825 bytes
static/index/warehouse/newtwo/train3.png | Bin 0 -> 7113 bytes
static/index/warehouse/newtwo/train4.png | Bin 0 -> 5650 bytes
static/index/warehouse/newtwo/train5.png | Bin 0 -> 8481 bytes
static/index/warehouse/newtwo/train6.png | Bin 0 -> 7110 bytes
static/index/warehouse/newtwo/train7.png | Bin 0 -> 4738 bytes
static/index/warehouse/newtwo/train8.png | Bin 0 -> 5563 bytes
static/index/warehouse/newtwo/train9.png | Bin 0 -> 5752 bytes
static/index/warehouse/newtwo/unit1-0.png | Bin 0 -> 27161 bytes
static/index/warehouse/newtwo/unit1-1.png | Bin 0 -> 28241 bytes
static/index/warehouse/newtwo/unit1-2.png | Bin 0 -> 29739 bytes
static/index/warehouse/newtwo/unit1-3.png | Bin 0 -> 30564 bytes
static/index/warehouse/newtwo/unit1-4.png | Bin 0 -> 27910 bytes
63 files changed, 408 insertions(+), 36 deletions(-)
create mode 100644 static/index/warehouse/newtwo/Warehouse1.png
create mode 100644 static/index/warehouse/newtwo/Warehouse2.png
create mode 100644 static/index/warehouse/newtwo/Warehouse3.png
create mode 100644 static/index/warehouse/newtwo/Warehouse4.png
create mode 100644 static/index/warehouse/newtwo/Warehouse5.png
create mode 100644 static/index/warehouse/newtwo/Warehouse6.png
create mode 100644 static/index/warehouse/newtwo/Warehouse7.png
create mode 100644 static/index/warehouse/newtwo/Warehouse8.png
create mode 100644 static/index/warehouse/newtwo/backpage.jpg
create mode 100644 static/index/warehouse/newtwo/count.png
create mode 100644 static/index/warehouse/newtwo/end0.png
create mode 100644 static/index/warehouse/newtwo/end1.png
create mode 100644 static/index/warehouse/newtwo/end2.png
create mode 100644 static/index/warehouse/newtwo/end3.png
create mode 100644 static/index/warehouse/newtwo/end4.png
create mode 100644 static/index/warehouse/newtwo/end5.png
create mode 100644 static/index/warehouse/newtwo/end6.png
create mode 100644 static/index/warehouse/newtwo/lead.png
create mode 100644 static/index/warehouse/newtwo/logo1.png
create mode 100644 static/index/warehouse/newtwo/logo2.png
create mode 100644 static/index/warehouse/newtwo/logo3.png
create mode 100644 static/index/warehouse/newtwo/matrix0.png
create mode 100644 static/index/warehouse/newtwo/matrix1.png
create mode 100644 static/index/warehouse/newtwo/matrix2.png
create mode 100644 static/index/warehouse/newtwo/matrix3.png
create mode 100644 static/index/warehouse/newtwo/matrix4.png
create mode 100644 static/index/warehouse/newtwo/matrix5.png
create mode 100644 static/index/warehouse/newtwo/monitor0.png
create mode 100644 static/index/warehouse/newtwo/monitor1.png
create mode 100644 static/index/warehouse/newtwo/monitor2.png
create mode 100644 static/index/warehouse/newtwo/monitor3.png
create mode 100644 static/index/warehouse/newtwo/monitor4.png
create mode 100644 static/index/warehouse/newtwo/monitor5.png
create mode 100644 static/index/warehouse/newtwo/monitor6.png
create mode 100644 static/index/warehouse/newtwo/monitor7.png
create mode 100644 static/index/warehouse/newtwo/purchase0.png
create mode 100644 static/index/warehouse/newtwo/purchase1.png
create mode 100644 static/index/warehouse/newtwo/purchase2.png
create mode 100644 static/index/warehouse/newtwo/purchase3.png
create mode 100644 static/index/warehouse/newtwo/purchase4.png
create mode 100644 static/index/warehouse/newtwo/purchase5.png
create mode 100644 static/index/warehouse/newtwo/purchase6.png
create mode 100644 static/index/warehouse/newtwo/purchase7.png
create mode 100644 static/index/warehouse/newtwo/return.png
create mode 100644 static/index/warehouse/newtwo/train1.png
create mode 100644 static/index/warehouse/newtwo/train10.png
create mode 100644 static/index/warehouse/newtwo/train2.png
create mode 100644 static/index/warehouse/newtwo/train3.png
create mode 100644 static/index/warehouse/newtwo/train4.png
create mode 100644 static/index/warehouse/newtwo/train5.png
create mode 100644 static/index/warehouse/newtwo/train6.png
create mode 100644 static/index/warehouse/newtwo/train7.png
create mode 100644 static/index/warehouse/newtwo/train8.png
create mode 100644 static/index/warehouse/newtwo/train9.png
create mode 100644 static/index/warehouse/newtwo/unit1-0.png
create mode 100644 static/index/warehouse/newtwo/unit1-1.png
create mode 100644 static/index/warehouse/newtwo/unit1-2.png
create mode 100644 static/index/warehouse/newtwo/unit1-3.png
create mode 100644 static/index/warehouse/newtwo/unit1-4.png
diff --git a/pages/NursingNew/component/doctorask/api/api.js b/pages/NursingNew/component/doctorask/api/api.js
index 0a06e4c..ecf6f1f 100644
--- a/pages/NursingNew/component/doctorask/api/api.js
+++ b/pages/NursingNew/component/doctorask/api/api.js
@@ -15,3 +15,32 @@ export const queryCareInfoList = (params) => {
data: params,
})
}
+
+export const startOrder = (params) => {
+ return request({
+ url: `${uni.getStorageSync('serverUrl')}/api/pad/care/startOrder`,
+ method: 'post',
+ data: params,
+ })
+}
+export const endOrder = (params) => {
+ return request({
+ url: `${uni.getStorageSync('serverUrl')}/api/pad/care/endOrder`,
+ method: 'post',
+ data: params,
+ })
+}
+export const editSubMp4 = (params) => {
+ return request({
+ url: `${uni.getStorageSync('serverUrl')}/api/pad/care/editSubMp4`,
+ method: 'post',
+ data: params,
+ })
+}
+export const editSubPicPath = (params) => {
+ return request({
+ url: `${uni.getStorageSync('serverUrl')}/api/pad/care/editSubPicPath`,
+ method: 'post',
+ data: params,
+ })
+}
diff --git a/pages/NursingNew/component/doctorask/doctorask.vue b/pages/NursingNew/component/doctorask/doctorask.vue
index 0320664..fd0334b 100644
--- a/pages/NursingNew/component/doctorask/doctorask.vue
+++ b/pages/NursingNew/component/doctorask/doctorask.vue
@@ -66,32 +66,141 @@
结束时间:
{{v.endTime.slice(0,16)}}
+
- 开始服务
- 结束服务
- 录像
- 拍照
+ 开始服务
+ 结束服务
+ 录像
+ 拍照
+
+
+
+
+
+
+
+
+
+ {{ topbuttontarget==1?`照片`:`录像` }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击上传{{topbuttontarget==1?'图片':'录像'}}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/procurement/components/carlist.vue b/pages/procurement/components/carlist.vue
index 0531bb2..e701684 100644
--- a/pages/procurement/components/carlist.vue
+++ b/pages/procurement/components/carlist.vue
@@ -12,9 +12,12 @@
@touchstart="touchstart($event,v,index)" scroll-with-animation scroll-x="true"
:scroll-left="v.scrollleft" @scroll="scroll" :class="v.flag?'actve':''">
-
-
+
+
+
+
+
{{v.categoryId_dictText}}
{{v.typeId_dictText}}
@@ -447,11 +450,17 @@
}
}
- >image {
- width: 9vw;
- height: 8vw;
- margin: 0 auto 0;
+ .imghs{
+ width: 10vw;
+ height: 9vw;
+ margin: -0.8vw auto 0.25vw;
+ padding: 0.2vw;
+ background: #fff;
border-radius: 1.1vw;
+ >image {
+ width: 100%;
+ height: 100%;
+ }
}
}
}
diff --git a/pages/procurement/components/purorder.vue b/pages/procurement/components/purorder.vue
index f910202..4aaba10 100644
--- a/pages/procurement/components/purorder.vue
+++ b/pages/procurement/components/purorder.vue
@@ -110,9 +110,11 @@
-
-
+
+
+
+
{{v.categoryName}}
{{v.typeName}}
@@ -484,10 +486,17 @@
}
}
- >image {
+ .imghs{
width: 10vw;
height: 9vw;
- margin: 0.5vw auto 0;
+ margin: 0.8vw auto 0.25vw;
+ padding: 0.2vw;
+ background: #fff;
+ border-radius: 1.1vw;
+ >image {
+ width: 100%;
+ height: 100%;
+ }
}
}
}
diff --git a/pages/procurement/outbound.vue b/pages/procurement/outbound.vue
index 309f65d..37db79f 100644
--- a/pages/procurement/outbound.vue
+++ b/pages/procurement/outbound.vue
@@ -181,15 +181,20 @@
-
-
+
+
+
+
{{ item.materialInfo.categoryName}}
{{ item.materialInfo.typeName}}
+
+ {{ item.materialInfo.medicationName}}
+
@@ -1099,18 +1104,25 @@
flex-direction: column;
align-items: center;
- .left-image {
- width: 150rpx;
- height: 150rpx;
- // margin: 15rpx 0;
- margin-top: 10rpx;
- margin-bottom: 15rpx;
- // margin-top: 5rpx;
+ .bgimg{
+ width: 7.5vw;
+ height: 7vw;
+ margin: 0.3vw auto 0.25vw;
+ border-radius: 1.1vw;
+ background: #fff;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ padding: 0.2vw;
+ >image {
+ width: 100%;
+ height: 100%;
+ }
}
.left-tages {
width: 130rpx;
- height: 43rpx;
+ height: 36rpx;
border-radius: 30rpx;
display: flex;
justify-content: center;
@@ -1118,7 +1130,7 @@
color: #555555;
border: 1rpx solid #D2D2D2;
margin-top: 5rpx;
- font-size: 23rpx;
+ font-size: 20rpx;
}
}
diff --git a/pages/procurement/retstock.vue b/pages/procurement/retstock.vue
index 34a5138..c8e5a40 100644
--- a/pages/procurement/retstock.vue
+++ b/pages/procurement/retstock.vue
@@ -264,7 +264,7 @@
console.log(v)
wuliao();
thdNuMaterialList({ nuId: v.nuId, id: v.id }).then(res => {
- console.log(res)
+ console.log({ nuId: v.nuId, id: v.id })
cardarr.value = res.result
})
if (v.izRead == 'N') {
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 dd59bdc..c959abe 100644
--- a/unpackage/dist/dev/.nvue/pages/fullcamera.js
+++ b/unpackage/dist/dev/.nvue/pages/fullcamera.js
@@ -577,7 +577,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
};