From de81495e20ae59a0d608e1e17b5ca087bfe10e59 Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Fri, 19 Dec 2025 16:08:58 +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
---
.../component/pleasetake/common/carditem.vue | 41 ++++++++++++-------
.../component/pleasetake/common/htditem.vue | 27 ++++++++----
.../component/pleasetake/common/medetails.vue | 39 ++++++++++++------
.../component/pleasetake/common/submits.vue | 34 ++++++++++-----
.../pleasetake/common/takerecord.vue | 36 +++++++++++-----
.../pleasetake/component/requestform.vue | 34 ++++++++++-----
.../pleasetake/component/returnorder.vue | 2 +-
pages/procurement/authorization.vue | 34 ++++++++++-----
pages/procurement/common/submits.vue | 40 +++++++++++-------
pages/procurement/common/thitem.vue | 28 +++++++++----
pages/procurement/components/carditem.vue | 26 ++++++++----
pages/procurement/components/carlist.vue | 23 +++++++----
pages/procurement/components/purorder.vue | 19 ++++++---
pages/procurement/outbound.vue | 38 +++++++++++------
pages/procurement/retstock.vue | 2 +-
unpackage/dist/dev/.nvue/pages/camera.js | 2 +-
unpackage/dist/dev/.nvue/pages/fullcamera.js | 2 +-
17 files changed, 292 insertions(+), 135 deletions(-)
diff --git a/pages/NursingNew/component/pleasetake/common/carditem.vue b/pages/NursingNew/component/pleasetake/common/carditem.vue
index 5539007..a5e554d 100644
--- a/pages/NursingNew/component/pleasetake/common/carditem.vue
+++ b/pages/NursingNew/component/pleasetake/common/carditem.vue
@@ -10,12 +10,15 @@
-
-
+
+
+
+
{{v.categoryId_dictText}}
{{v.typeId_dictText}}
+ {{v.medicationId_dictText}}
@@ -337,33 +340,43 @@
top:0;
left: 0;
.cardp {
- width:8vw;
- height: 4vw;
+ width:9vw;
display: flex;
- margin: 0 auto;
+ margin:0.3vw auto;
align-items: center;
justify-content: center;
- flex-direction: column;
+ flex-wrap: wrap;
+ // flex-direction: column;
view {
min-width: 5.5vw;
- height: 1.8vw;
+ height: 1.6vw;
border-radius: 0.9vw;
border: 1px solid #D2D2D2;
- margin: 0.5vw 0 0 0.5vw;
+ margin: 0.25vw 0 0 0;
display: flex;
justify-content: center;
align-items: center;
font-weight: 400;
- font-size: 1vw;
+ font-size: 0.8vw;
color: #555555;
padding: 0 0.25vw;
}
}
- >image {
- width: 8.5vw;
- height: 7.5vw;
- margin: 0vw auto 0.25vw;
+ .imgs {
+ width: 7.8vw;
+ height: 7vw;
+ background: #Fff;
+ border-radius: 1.1vw;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin: 0.8vw auto 0;
+ padding: 0.3vw;
+ >image {
+ width: 100%;
+ height: 100%;
+ }
}
}
diff --git a/pages/NursingNew/component/pleasetake/common/htditem.vue b/pages/NursingNew/component/pleasetake/common/htditem.vue
index 92eb781..8dba6b4 100644
--- a/pages/NursingNew/component/pleasetake/common/htditem.vue
+++ b/pages/NursingNew/component/pleasetake/common/htditem.vue
@@ -8,12 +8,16 @@
@touchstart="touchstart($event,v,index)" scroll-with-animation scroll-x="true"
:scroll-left="v.scrollleft" @scroll="scroll" >
-
-
+
+
+
+
+
{{v.materialInfo?.categoryName}}
{{v.materialInfo?.typeName}}
+ {{v.materialInfo?.medicationName}}
@@ -345,25 +349,32 @@
flex-direction: column;
view {
min-width: 5.5vw;
- height: 1.8vw;
+ height: 1.6vw;
border-radius: 0.9vw;
border: 1px solid #D2D2D2;
- margin: 0.5vw 0 0 0.5vw;
+ margin: 0.25vw 0 0 0.5vw;
display: flex;
justify-content: center;
align-items: center;
font-weight: 400;
- font-size: 1vw;
+ font-size: 0.8vw;
color: #555555;
padding: 0 0.25vw;
}
}
-
- >image {
+ .imge{
width: 8vw;
height: 7vw;
+ padding: 0.2vw;
margin: 0.3vw auto 0.25vw;
+ background: #fff;
+ border-radius: 1.1vw;
+ >image {
+ width: 100%;
+ height: 100%;
+ }
}
+
}
.itembox{
diff --git a/pages/NursingNew/component/pleasetake/common/medetails.vue b/pages/NursingNew/component/pleasetake/common/medetails.vue
index 4396ec7..b7d627f 100644
--- a/pages/NursingNew/component/pleasetake/common/medetails.vue
+++ b/pages/NursingNew/component/pleasetake/common/medetails.vue
@@ -5,10 +5,13 @@
物料详情
-
+
+
+
{{ objtake?.categoryId_dictText }}
{{ objtake?.typeId_dictText }}
+ {{objtake?.medicationId_dictText}}
@@ -143,17 +146,14 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive }
width: 14.2vw;
height: 100%;
border-right: 2px solid #E5E5E5;
-
- view {
+ &:nth-child(1) view {
width: 100%;
margin-top: 0.6vw;
display: flex;
- // justify-content: space-around;
- flex-direction: column;
align-items: center;
-
+ flex-wrap: wrap;
view {
- width: 6vw;
+ width: 6.5vw;
height: 2vw;
border-radius: 1vw;
border: 1px solid #D2D2D2;
@@ -163,15 +163,28 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive }
display: flex;
justify-content: center;
align-items: center;
+ margin: 0.25vw 0 0 0.3vw;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
}
}
-
- >image {
- width: 10.2vw;
- height: 10.2vw;
- margin: 0 auto;
- display: block;
+ .img{
+ padding: 0.3vw;
+ background: #f8f8f8;
+ width: 12.2vw;
+ height: 11.2vw;
+ padding: 0.2vw;
+ margin: 0.3vw auto;
+ border-radius: 1.6vw;
+ >image {
+ width: 100%;
+ height: 100%;
+ margin: 0.3vw auto;
+ display: block;
+ }
}
+
}
.youcont {
diff --git a/pages/NursingNew/component/pleasetake/common/submits.vue b/pages/NursingNew/component/pleasetake/common/submits.vue
index 2792a67..4c7d72f 100644
--- a/pages/NursingNew/component/pleasetake/common/submits.vue
+++ b/pages/NursingNew/component/pleasetake/common/submits.vue
@@ -17,12 +17,15 @@
-
-
+
+
+
+
{{v.materialInfo?.categoryName}}
{{v.materialInfo?.typeName}}
+ {{v.materialInfo.medicationId_dictText}}
@@ -84,6 +87,7 @@
const showbox = ref(false)
watch(()=>props.show,
()=>{
+ console.log(props.list)
if(props.show==true){
setTimeout(()=>{
showbox.value = true
@@ -228,8 +232,8 @@
top:0;
left: 0;
.cardp {
- width:8vw;
- height: 4vw;
+ width:10vw;
+ height: 5vw;
display: flex;
margin: 0 auto;
align-items: center;
@@ -237,24 +241,34 @@
flex-direction: column;
view {
min-width: 5.5vw;
- height: 1.8vw;
+ height: 1.6vw;
border-radius: 0.9vw;
border: 1px solid #D2D2D2;
- margin: 0.5vw 0 0 0.5vw;
+ margin: 0.25vw 0 0 0.5vw;
display: flex;
justify-content: center;
align-items: center;
font-weight: 400;
- font-size: 1vw;
+ font-size: 0.8vw;
color: #555555;
padding: 0 0.25vw;
}
}
- >image {
+ .imgs {
width: 7vw;
height: 7vw;
- margin: 0.5vw auto 0.25vw;
+ background: #Fff;
+ border-radius: 1.1vw;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin: 0.5vw auto 0;
+ padding: 0.2vw;
+ >image {
+ width: 100%;
+ height: 100%;
+ }
}
}
}
diff --git a/pages/NursingNew/component/pleasetake/common/takerecord.vue b/pages/NursingNew/component/pleasetake/common/takerecord.vue
index 3af3b06..0d77ca9 100644
--- a/pages/NursingNew/component/pleasetake/common/takerecord.vue
+++ b/pages/NursingNew/component/pleasetake/common/takerecord.vue
@@ -8,10 +8,14 @@
-
-
+
+
+
+
+
{{objtake?.categoryId_dictText}}
{{objtake?.typeId_dictText}}
+ {{objtake?.medicationId_dictText}}
@@ -250,36 +254,46 @@
width: 15.2vw;
height: 100%;
border-right: 2px solid #E5E5E5;
-
- view {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ .carditem {
width: 100%;
margin-top: 0.3vw;
display: flex;
- flex-direction: column;
align-items: center;
+ flex-wrap: wrap;
// justify-content: space-around;
view {
- width: 6vw;
+ min-width: 6vw;
height: 2vw;
border-radius: 1vw;
border: 1px solid #D2D2D2;
font-weight: 400;
- font-size: 1.1vw;
+ font-size: 0.9vw;
color: #555555;
display: flex;
justify-content: center;
align-items: center;
padding: 0 0.6vw;
+ margin: 0.5vw 0 0 0.25vw;
+ white-space: nowrap;
}
}
-
- >image {
+ .bgimg{
width: 8.5vw;
height: 8vw;
- margin: 0 auto;
- display: block;
+ background: #fff;
+ border-radius: 1.1vw;
+ >image {
+ width: 100%;
+ height: 100%;
+ margin: 0.3vw auto;
+ display: block;
+ }
}
+
}
.youcont {
diff --git a/pages/NursingNew/component/pleasetake/component/requestform.vue b/pages/NursingNew/component/pleasetake/component/requestform.vue
index 64524bf..b77d29a 100644
--- a/pages/NursingNew/component/pleasetake/component/requestform.vue
+++ b/pages/NursingNew/component/pleasetake/component/requestform.vue
@@ -163,15 +163,22 @@
-
-
+
+
+
+
+
{{ item.materialInfo.categoryName}}
{{ item.materialInfo.typeName}}
+
+
+ {{item.materialInfo.medicationName}}
+
@@ -939,26 +946,31 @@
flex-direction: column;
align-items: center;
- .left-image {
+ .imge {
width: 140rpx;
height: 140rpx;
- // margin: 15rpx 0;
margin-top: 10rpx;
margin-bottom: 15rpx;
- // margin-top: 5rpx;
+ padding: 0.2vw;
+ border-radius: 1.1vw;
+ background: #f8f8f8;
+ image{
+ width: 100%;
+ height: 100%;
+ }
}
.left-tages {
width: 130rpx;
- height: 43rpx;
- border-radius: 30rpx;
+ height: 38rpx;
+ border-radius: 19rpx;
display: flex;
justify-content: center;
align-items: center;
color: #555555;
border: 1rpx solid #D2D2D2;
- margin-top: 5rpx;
- font-size: 23rpx;
+ margin-top:0.2vw;
+ font-size: 19rpx;
}
}
diff --git a/pages/NursingNew/component/pleasetake/component/returnorder.vue b/pages/NursingNew/component/pleasetake/component/returnorder.vue
index 7a2df02..fef9459 100644
--- a/pages/NursingNew/component/pleasetake/component/returnorder.vue
+++ b/pages/NursingNew/component/pleasetake/component/returnorder.vue
@@ -13,7 +13,7 @@
- 提交请购单
+ 提交请领单
diff --git a/pages/procurement/authorization.vue b/pages/procurement/authorization.vue
index bcdd320..bc19de3 100644
--- a/pages/procurement/authorization.vue
+++ b/pages/procurement/authorization.vue
@@ -103,12 +103,16 @@
-
-
+
+
+
+
+
{{v.materialInfo?.categoryName}}
{{v.materialInfo?.typeName}}
+ {{v.materialInfo?.medicationName}}
@@ -511,30 +515,40 @@
width:8vw;
height: 4vw;
display: flex;
- margin: 0 auto;
+ margin: 0.3vw auto;
align-items: center;
justify-content: center;
flex-direction: column;
view {
min-width: 5.5vw;
- height: 1.8vw;
+ height: 1.6vw;
border-radius: 0.9vw;
border: 1px solid #D2D2D2;
- margin: 0.5vw 0 0 0.5vw;
+ margin: 0.3vw 0 0 0vw;
display: flex;
justify-content: center;
align-items: center;
font-weight: 400;
- font-size: 1vw;
+ font-size: 0.8vw;
color: #555555;
padding: 0 0.25vw;
}
}
- >image {
+ .bgimg{
width: 7.5vw;
- height: 7.5vw;
- margin: 0vw auto 0.25vw;
+ 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%;
+ }
}
}
diff --git a/pages/procurement/common/submits.vue b/pages/procurement/common/submits.vue
index 79a9dda..6c35e58 100644
--- a/pages/procurement/common/submits.vue
+++ b/pages/procurement/common/submits.vue
@@ -17,13 +17,18 @@
-
-
+
+
+
+
+
{{v.materialInfo?.categoryName}}
{{v.materialInfo?.typeName}}
+ {{v.materialInfo?.typeName}}
+ {{v.materialInfo?.medicationName}}
@@ -249,34 +254,41 @@
.cardp {
width: 8vw;
- height: 4vw;
+ height: 5.5vw;
display: flex;
- margin: 0 auto;
+ margin: 0.3vw auto 0;
align-items: center;
justify-content: center;
flex-direction: column;
-
+ overflow: hidden;
view {
min-width: 5.5vw;
- height: 1.8vw;
+ height: 1.6vw;
border-radius: 0.9vw;
border: 1px solid #D2D2D2;
- margin: 0.5vw 0 0 0.5vw;
+ margin: 0 0 0.5vw 0.5vw ;
display: flex;
justify-content: center;
align-items: center;
font-weight: 400;
- font-size: 1vw;
+ font-size: 0.8vw;
color: #555555;
padding: 0 0.25vw;
}
}
-
- >image {
- width: 8.5vw;
- height: 7.5vw;
+ .imge{
+ width: 7vw;
+ height:6.5vw;
margin: 0.7vw auto 0.25vw;
+ border-radius: 1.1vw;
+ background: #fff;
+ padding: 0.2vw;
+ >image {
+ width: 100%;
+ height: 100%;
+ }
}
+
}
}
}
diff --git a/pages/procurement/common/thitem.vue b/pages/procurement/common/thitem.vue
index 01daa01..7516aab 100644
--- a/pages/procurement/common/thitem.vue
+++ b/pages/procurement/common/thitem.vue
@@ -11,13 +11,17 @@
-
-
+
+
+
+
+
{{v.materialInfo?.categoryName}}
{{v.materialInfo?.typeName}}
+ {{v.materialInfo?.medicationName}}
@@ -404,12 +408,22 @@
padding: 0 0.25vw;
}
}
-
- >image {
+ .bgimg{
width: 7.5vw;
height: 7.5vw;
- margin: 0vw auto 0.25vw;
+ 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%;
+ }
}
+
}
diff --git a/pages/procurement/components/carditem.vue b/pages/procurement/components/carditem.vue
index 6f526bc..fd5f02f 100644
--- a/pages/procurement/components/carditem.vue
+++ b/pages/procurement/components/carditem.vue
@@ -7,9 +7,12 @@
@touchstart="touchstart($event,v,index)" scroll-with-animation scroll-x="true"
:scroll-left="v.scrollleft" @scroll="scroll" >
-
-
+
+
+
+
+
{{v.categoryId_dictText}}
{{v.typeId_dictText}}
@@ -418,12 +421,19 @@
}
}
}
-
- >image {
- width: 8.5vw;
- height: 7.5vw;
- margin: 1.25vw auto 0.25vw;
+ .imghs{
+ width: 9vw;
+ height: 8vw;
+ margin: 0.8vw auto 0.25vw;
+ padding: 0.2vw;
+ background: #fff;
+ border-radius: 1.1vw;
+ >image {
+ width: 100%;
+ height: 100%;
+ }
}
+
}
}
\ 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
};