From 089e3a6acb64a47d7fb6a2900cd8c9a29c2b27d9 Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Thu, 25 Dec 2025 08:43:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../component/pleasetake/common/cgdclass.vue | 2 +-
.../component/pleasetake/common/medetails.vue | 8 +++---
.../pleasetake/common/takerecord.vue | 26 ++++++++++++-------
pages/login/components/homelist.vue | 7 +++++
pages/login/index.vue | 2 --
pages/procurement/components/Inventory.vue | 3 ++-
pages/procurement/components/calculator.vue | 8 ------
7 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/pages/NursingNew/component/pleasetake/common/cgdclass.vue b/pages/NursingNew/component/pleasetake/common/cgdclass.vue
index 5d65b64..ec5ff6f 100644
--- a/pages/NursingNew/component/pleasetake/common/cgdclass.vue
+++ b/pages/NursingNew/component/pleasetake/common/cgdclass.vue
@@ -382,7 +382,7 @@
.scroll-Y {
width: 10vw;
- height: calc(75vh - 22vw);
+ height: calc(75vh - 16vw);
view {
min-width: 8.5vw;
diff --git a/pages/NursingNew/component/pleasetake/common/medetails.vue b/pages/NursingNew/component/pleasetake/common/medetails.vue
index b7d627f..9ac936a 100644
--- a/pages/NursingNew/component/pleasetake/common/medetails.vue
+++ b/pages/NursingNew/component/pleasetake/common/medetails.vue
@@ -8,7 +8,7 @@
-
+
{{ objtake?.categoryId_dictText }}
{{ objtake?.typeId_dictText }}
{{objtake?.medicationId_dictText}}
@@ -146,7 +146,7 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive }
width: 14.2vw;
height: 100%;
border-right: 2px solid #E5E5E5;
- &:nth-child(1) view {
+ .cardfa {
width: 100%;
margin-top: 0.6vw;
display: flex;
@@ -172,8 +172,8 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive }
.img{
padding: 0.3vw;
background: #f8f8f8;
- width: 12.2vw;
- height: 11.2vw;
+ width: 10.2vw;
+ height: 9.2vw;
padding: 0.2vw;
margin: 0.3vw auto;
border-radius: 1.6vw;
diff --git a/pages/NursingNew/component/pleasetake/common/takerecord.vue b/pages/NursingNew/component/pleasetake/common/takerecord.vue
index 0d77ca9..f7769a1 100644
--- a/pages/NursingNew/component/pleasetake/common/takerecord.vue
+++ b/pages/NursingNew/component/pleasetake/common/takerecord.vue
@@ -246,17 +246,18 @@
background: #F9F9FA;
border-radius: 1.6vw;
margin: 1.5vw auto 0;
- padding: 1.4vw 1vw;
- display: flex;
- justify-content: flex-start;
+ position: relative;
.leftbox {
- width: 15.2vw;
- height: 100%;
+ width: 13vw;
+ height: 12;
border-right: 2px solid #E5E5E5;
display: flex;
flex-direction: column;
align-items: center;
+ position: absolute;
+ left: 0;
+ top: 1.3vw;
.carditem {
width: 100%;
margin-top: 0.3vw;
@@ -266,7 +267,7 @@
// justify-content: space-around;
view {
- min-width: 6vw;
+ width: 6vw;
height: 2vw;
border-radius: 1vw;
border: 1px solid #D2D2D2;
@@ -279,18 +280,19 @@
padding: 0 0.6vw;
margin: 0.5vw 0 0 0.25vw;
white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
}
}
.bgimg{
- width: 8.5vw;
- height: 8vw;
+ width: 10.5vw;
+ height: 9.5vw;
background: #fff;
border-radius: 1.1vw;
+ padding: 0.35vw;
>image {
width: 100%;
height: 100%;
- margin: 0.3vw auto;
- display: block;
}
}
@@ -302,6 +304,10 @@
display: flex;
flex-direction: column;
justify-content: space-between;
+ position: absolute;
+ right: 0;
+ top: 0;
+ padding: 1.3vw;
>view {
padding: 0 1.8vw;
&:nth-child(2),
diff --git a/pages/login/components/homelist.vue b/pages/login/components/homelist.vue
index 72b458b..8f238de 100644
--- a/pages/login/components/homelist.vue
+++ b/pages/login/components/homelist.vue
@@ -21,6 +21,7 @@
+
{{ v.fzr }}
@@ -97,6 +98,7 @@
white-space: nowrap;
}
}
+
.kx{
width: 3.6vw;
height: 1.8vw;
@@ -112,6 +114,11 @@
right: 1.5vw;
top: 1.5vw;
}
+ .pd{
+ width: 4.6vw;
+ color: #FFFFFF;
+ background: #50B8F7;
+ }
.hldyimg{
width: 6.5vw;
height: 6.5vw;
diff --git a/pages/login/index.vue b/pages/login/index.vue
index a848856..1381290 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -126,7 +126,6 @@
onShow(() => {
zyupgrade.value?.check_update();
queryPadPageList().then((res => {
- console.log(res)
leftMenuArray.value = res.result.records;
}))
@@ -142,7 +141,6 @@
}
}
const jumptopage = (index:number) => {
-
uni.setStorageSync('nuId', cardarray.value[index].nuId);
uni.setStorageSync('nuName', cardarray.value[index].nuName);
uni.setStorageSync('elderId', cardarray.value[index].elderInfo ? cardarray.value[index].elderInfo?.id : null);
diff --git a/pages/procurement/components/Inventory.vue b/pages/procurement/components/Inventory.vue
index 1fa29e3..d2c45e5 100644
--- a/pages/procurement/components/Inventory.vue
+++ b/pages/procurement/components/Inventory.vue
@@ -20,7 +20,7 @@
{{v.materialName}}{{v.materialNo}}
-
+
规格型号: {{v.specificationModel}}
@@ -316,6 +316,7 @@
font-size: 1.4vw;
color: #777777;
margin-top: 0.35vw;
+ white-space: nowrap;
}
}
&:nth-child(1){
diff --git a/pages/procurement/components/calculator.vue b/pages/procurement/components/calculator.vue
index 7290f8f..1aabc29 100644
--- a/pages/procurement/components/calculator.vue
+++ b/pages/procurement/components/calculator.vue
@@ -127,7 +127,6 @@
// if(!old.num){return}
// if(old.num==1){
// let num = Number(props.caigouobj.upperLimit)-Number(props.caigouobj.kcsl);
-
// let m = Math.floor(relNumber.value/news.num);
// huansuan(m)
// }
@@ -338,19 +337,12 @@
const colse = ()=>{
emit('colse')
}
- // 这个方法是查看数字有多少位
function digitCountByString(n) {
- // 先处理负数
const s = Math.abs(n).toString();
- // 若不想统计小数点，可去掉小数点后再取长度：
- // return s.replace('.', '').length;
return s.length;
}
- // 这个方法是将Number转为String
function toFixed4ByPadStart(n) {
- // 1. 取绝对值并向下取整，防止小数和负号影响
const intPart = Math.floor(Math.abs(n));
- // 2. 转字符串并 padStart 到长度 4，不足时前面补 '0'
return String(intPart).padStart(4, '0');
}