diff --git a/component/public/calendar.vue b/component/public/calendar.vue
index a1a99fb..2590a87 100644
--- a/component/public/calendar.vue
+++ b/component/public/calendar.vue
@@ -252,6 +252,7 @@
box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
// max-width: 720rpx;
margin: 0 auto;
+ overflow: hidden;
}
.header {
diff --git a/component/public/errorshow.vue b/component/public/errorshow.vue
index aee2989..2c96044 100644
--- a/component/public/errorshow.vue
+++ b/component/public/errorshow.vue
@@ -61,6 +61,7 @@
line-height: 1.7vw;
flex-wrap: wrap;
margin-bottom: 4vw;
+ text-align: center;
}
.qd {
diff --git a/pages/NursingNew/component/pleasetake/common/carditem.vue b/pages/NursingNew/component/pleasetake/common/carditem.vue
index 4a802b7..5539007 100644
--- a/pages/NursingNew/component/pleasetake/common/carditem.vue
+++ b/pages/NursingNew/component/pleasetake/common/carditem.vue
@@ -230,7 +230,7 @@
top:0;
left: 10vw;
>view {
- margin-top: 0.25vw;
+ margin-top: 0vw;
&:nth-child(3) {
width: 100%;
@@ -308,7 +308,7 @@
font-weight: bold;
font-size: 1.6vw;
color: #222222;
- padding-top: 1.3vw;
+ padding-top: 1vw;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
@@ -363,7 +363,7 @@
>image {
width: 8.5vw;
height: 7.5vw;
- margin: 0.7vw auto 0.25vw;
+ margin: 0vw auto 0.25vw;
}
}
@@ -384,7 +384,7 @@
height: 13vw;
margin-bottom: 0.9vw;
.carditem{
- width: 27.5vw;
+ width: 28.3vw;
height: 13vw;
background: rgba(245, 246, 248, 1);
border-radius: 1.1vw;
diff --git a/pages/NursingNew/component/pleasetake/common/htditem.vue b/pages/NursingNew/component/pleasetake/common/htditem.vue
index 4c75341..92eb781 100644
--- a/pages/NursingNew/component/pleasetake/common/htditem.vue
+++ b/pages/NursingNew/component/pleasetake/common/htditem.vue
@@ -228,7 +228,7 @@
top:0;
left: 10vw;
>view {
- margin-top: 0.25vw;
+ margin-top: 0vw;
&:nth-child(3) {
width: 100%;
@@ -307,7 +307,7 @@
font-size: 1.6vw;
color: #222222;
height: 3vw;
- padding-top: 1.2vw;
+ padding-top: 1vw;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
@@ -362,7 +362,7 @@
>image {
width: 8vw;
height: 7vw;
- margin: 1vw auto 0.25vw;
+ margin: 0.3vw auto 0.25vw;
}
}
diff --git a/pages/NursingNew/component/pleasetake/common/submits.vue b/pages/NursingNew/component/pleasetake/common/submits.vue
index 190d2a5..2792a67 100644
--- a/pages/NursingNew/component/pleasetake/common/submits.vue
+++ b/pages/NursingNew/component/pleasetake/common/submits.vue
@@ -132,7 +132,7 @@
top:0;
left: 10vw;
>view {
- margin-top: 0.25vw;
+ margin-top: 0vw;
&:nth-child(3) {
width: 100%;
@@ -211,7 +211,7 @@
font-size: 1.6vw;
color: #222222;
height: 3vw;
- padding-top: 1.2vw;
+ padding-top: 1vw;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
@@ -252,9 +252,9 @@
}
>image {
- width: 8.5vw;
- height: 7.5vw;
- margin: 0.7vw auto 0.25vw;
+ width: 7vw;
+ height: 7vw;
+ margin: 0.5vw auto 0.25vw;
}
}
}
diff --git a/pages/NursingNew/component/pleasetake/component/requestform.vue b/pages/NursingNew/component/pleasetake/component/requestform.vue
index 5dd5509..64524bf 100644
--- a/pages/NursingNew/component/pleasetake/component/requestform.vue
+++ b/pages/NursingNew/component/pleasetake/component/requestform.vue
@@ -440,8 +440,15 @@
const badshow = ref(false)
const zuofei = () => {
+ let data = {
+ qldNo: plsbuy.value[lefttarget.value].qldNo,
+ nuId: uni.getStorageSync('nuId'),
+ elderId: uni.getStorageSync('NUall').elderId,
+ nuName: uni.getStorageSync('nuName'),
+ elderName: uni.getStorageSync(`NUall`).elderInfo.name
- cancellation({ qldNo: plsbuy.value[lefttarget.value].qldNo }).then((res : any) => {
+ }
+ cancellation(data).then((res : any) => {
console.log('作废', res)
badshow.value = false
if (res.success) {
@@ -933,8 +940,8 @@
align-items: center;
.left-image {
- width: 150rpx;
- height: 150rpx;
+ width: 140rpx;
+ height: 140rpx;
// margin: 15rpx 0;
margin-top: 10rpx;
margin-bottom: 15rpx;
diff --git a/pages/NursingNew/component/pleasetake/component/returnorder.vue b/pages/NursingNew/component/pleasetake/component/returnorder.vue
index b040927..950542e 100644
--- a/pages/NursingNew/component/pleasetake/component/returnorder.vue
+++ b/pages/NursingNew/component/pleasetake/component/returnorder.vue
@@ -288,8 +288,8 @@
plsbuy.value = [];
// console.log(res)
plsbuy.value.push(...res.result.records)
- console.log("入参", plzinfo)
- console.log("查看数组", res.result.records)
+ // console.log("入参", plzinfo)
+ // console.log("查看数组", res.result.records)
alltotal.value = res.result.total
// console.log("请购单数据呢???", res)
@@ -313,7 +313,7 @@
if(res.success){
rightinfolist();
}else{
- errmsg.value = res.message;
+ errmsg.value = res.result?.message ? res.result?.message : res.message
openerror.value = true;
}
})
@@ -377,7 +377,7 @@
if(res.success){
rightinfolist();
}else{
- errmsg.value = res.message;
+ errmsg.value = res.result?.message ? res.result?.message : res.message
openerror.value = true;
}
})
@@ -385,8 +385,15 @@
const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
const badshow = ref(false)
const zuofei = () => {
-
- cancellation({ qldNo: plsbuy.value[lefttarget.value].qldNo }).then((res : any) => {
+ let data = {
+ qldNo: plsbuy.value[lefttarget.value].qldNo,
+ nuId: uni.getStorageSync('nuId'),
+ elderId: uni.getStorageSync('NUall').elderId,
+ nuName: uni.getStorageSync('nuName'),
+ elderName: uni.getStorageSync(`NUall`).elderInfo.name
+
+ }
+ cancellation(data).then((res : any) => {
badshow.value = false
if (res.success) {
plsbuy.value[lefttarget.value] = res.result.result
@@ -413,6 +420,7 @@
}
const tijiaoshow = ref(false);
const tijiao = ()=>{
+
let obj = {
nuId:plzinfo.nuId,
elderId:plzinfo.elderId,
@@ -435,7 +443,7 @@
rightinfolist();
},800)
}else{
- errmsg.value = res.result.message;
+ errmsg.value = res.result?.message ? res.result?.message : res.message
openerror.value = true;
}
})
diff --git a/pages/NursingNew/component/pleasetake/component/takehomep.vue b/pages/NursingNew/component/pleasetake/component/takehomep.vue
index c44cdd3..af4c977 100644
--- a/pages/NursingNew/component/pleasetake/component/takehomep.vue
+++ b/pages/NursingNew/component/pleasetake/component/takehomep.vue
@@ -134,7 +134,7 @@
nuId: uni.getStorageSync('nuId')
}
queryQld(plzinfo0).then((res : any) => {
- if ( res.result.records.length) {
+ if (res.result.records.length) {
isRead.value = true;
} else {
isRead.value = false;
@@ -149,7 +149,7 @@
nuId: uni.getStorageSync('nuId')
}
queryQld(plzinfo1).then((res : any) => {
- // console.log("22",res.result)
+ // console.log("22",res.result)
if (res.result.records.length) {
isQingling.value = true;
} else {
@@ -181,7 +181,13 @@
})
}
const thclk = () => {
- requireTH({ nuId: form.nuId, elderId: form.elderId }).then(res => {
+
+ let data = {
+ nuId: uni.getStorageSync('nuId'),
+ elderId: uni.getStorageSync('NUall').elderId,
+ nuName: uni.getStorageSync('nuName'),
+ }
+ requireTH(data).then(res => {
if (res.success) {
thshow.value = false;
uni.showToast({
@@ -190,7 +196,7 @@
})
} else {
thshow.value = false;
- errmsg.value = res.message;
+ errmsg.value = res.result?.message ? res.result?.message : res.message
openerror.value = true;
console.log("?????")
}
@@ -238,7 +244,7 @@
objtake.value.isAdd = null;
objtake.value.qlNum = null;
} else {
- errmsg.value = res.message;
+ errmsg.value = res.result?.message ? res.result?.message : res.message
openerror.value = true;
}
})
@@ -254,7 +260,7 @@
item.gwcId = null;
})
} else {
- errmsg.value = res.message;
+ errmsg.value = res.result?.message ? res.result?.message : res.message
openerror.value = true;
}
})
@@ -304,7 +310,7 @@
config()
} else {
- errmsg.value = res.message;
+ errmsg.value = res.result?.message ? res.result?.message : res.message
openerror.value = true;
}
})
@@ -331,7 +337,7 @@
v.qlNum = e;
wuliao();
} else {
- errmsg.value = res.message;
+ errmsg.value = res.result?.message ? res.result?.message : res.message
openerror.value = true;
}
})
@@ -344,7 +350,7 @@
elderName: uni.getStorageSync(`NUall`).elderInfo.name
}
submitQld(obj).then(res => {
- console.log("?????",obj,res)
+ console.log("?????111", obj, res)
if (res.success && res.result.status == 'success') {
uni.showToast({
icon: 'success',
@@ -357,7 +363,7 @@
}, 800)
} else {
// console.log("!!!!!",res)
- errmsg.value = res.result.message ? res.result.message : res.message
+ errmsg.value = res.result?.message ? res.result?.message : res.message
openerror.value = true;
}
})
diff --git a/pages/procurement/authorization.vue b/pages/procurement/authorization.vue
index a701439..bcdd320 100644
--- a/pages/procurement/authorization.vue
+++ b/pages/procurement/authorization.vue
@@ -44,7 +44,7 @@
- {{ v.fqTime.replace(/-/g, '.') }}
+ {{ v.fqTime.replace(/-/g, '.')?.slice(0,10) }}
@@ -61,7 +61,7 @@
- {{ v.logList[1].opeTime?.slice(0,10) }}
+ {{ v.logList[1].opeTime?.replace(/-/g, '.').slice(0,10) }}
@@ -400,7 +400,7 @@
top:0;
left: 10vw;
>view {
- margin-top: 0.25vw;
+ margin-top: 0vw;
&:nth-child(3) {
width: 100%;
@@ -479,7 +479,7 @@
font-size: 1.6vw;
color: #222222;
height: 3vw;
- padding-top: 1.3vw;
+ padding-top: 1vw;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
@@ -532,9 +532,9 @@
}
>image {
- width: 8.5vw;
+ width: 7.5vw;
height: 7.5vw;
- margin: 1.7vw auto 0.25vw;
+ margin: 0vw auto 0.25vw;
}
}
@@ -547,16 +547,16 @@
background: #fff;
.box{
width: 100%;
- display: grid;
- grid-template-columns: 1fr 1fr;
+ display: flex;
+ flex-wrap: wrap;
}
.fler{
- width: 30.4vw;
+ width: 31.4vw;
height: 13vw;
margin-bottom: 0.9vw;
margin-left: 0.5vw;
.carditem{
- width: 30.4vw;
+ width: 31vw;
height: 13vw;
background: rgba(245, 246, 248, 1);
border-radius: 1.1vw;
diff --git a/pages/procurement/common/submits.vue b/pages/procurement/common/submits.vue
index 7e85705..79a9dda 100644
--- a/pages/procurement/common/submits.vue
+++ b/pages/procurement/common/submits.vue
@@ -1,23 +1,24 @@
-
+
退货详情
- 请领区域:{{ uni.getStorageSync('nuName')}}
- 请领人:{{uni.getStorageSync('realname')}}
- 请领日期:{{times}}
+ 退货区域:{{ uni.getStorageSync('nuName')}}
+ 退货人:{{uni.getStorageSync('realname')}}
+ 退货日期:{{times}}
- 请领物料
+ 退货物料
-
-
+
@@ -25,22 +26,22 @@
{{v.materialInfo?.typeName}}
-
+
{{v.materialInfo?.materialName}}
- 规格型号:
+ 规格型号:
{{v.materialInfo?.specificationModel}}
{{v.thNum?v.thNum:'--'}}
- 请领数量
+ 退货数量
{{v.materialInfo?.materialUnits}}
- 请领单位
+ 退货单位
@@ -48,7 +49,7 @@
-
+
取消
@@ -60,69 +61,73 @@
+
\ No newline at end of file
diff --git a/pages/procurement/common/takeing.vue b/pages/procurement/common/takeing.vue
index d245339..8d1d031 100644
--- a/pages/procurement/common/takeing.vue
+++ b/pages/procurement/common/takeing.vue
@@ -32,14 +32,15 @@
- 数量 超过退货上限！
+ 数量
-
+
-
+
{{item}}
@@ -239,6 +240,7 @@
}
.quxiao{
background: #EDEDEF;
+ color: #999999;
}
.plsbuy-bottom-blue {
background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
@@ -329,6 +331,7 @@
font-size: 1.4vw;
font-weight: 500;
text-align: center;
+ margin-left: 1.5vw;
}
.cont{
diff --git a/pages/procurement/common/thitem.vue b/pages/procurement/common/thitem.vue
index 4866835..bb1fcb1 100644
--- a/pages/procurement/common/thitem.vue
+++ b/pages/procurement/common/thitem.vue
@@ -61,6 +61,7 @@
import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive } from 'vue';
import taking from './takeing.vue'
import defaultr from '../components/default.vue'
+
const props = defineProps({
InvoicingList: {
type: Array,
@@ -225,13 +226,13 @@
}
}
.msitem {
- width: 11.5vw;
+ width: 11vw;
height: 100%;
position: absolute;
top:0;
left: 10vw;
>view {
- margin-top: 0.25vw;
+ margin-top: 0vw;
&:nth-child(3) {
width: 100%;
@@ -309,8 +310,8 @@
font-weight: bold;
font-size: 1.6vw;
color: #222222;
- height: 3vw;
- padding-top: 1.3vw;
+ height: 3.1vw;
+ padding-top: 1vw;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
@@ -340,7 +341,7 @@
left: 0;
.cardp {
width:8vw;
- height: 4vw;
+ height: 4.2vw;
display: flex;
margin: 0 auto;
align-items: center;
@@ -363,9 +364,9 @@
}
>image {
- width: 8.5vw;
+ width: 7.5vw;
height: 7.5vw;
- margin: 1.7vw auto 0.25vw;
+ margin: 0vw auto 0.25vw;
}
}
@@ -373,21 +374,24 @@
.itembox{
width: 100%;
- height: calc(100vh - 23vw);
+ height: calc(100vh - 22vw);
padding:1vw 0.5vw 1vw;
+
background: #fff;
.box{
width: 100%;
- display: grid;
- grid-template-columns: 1fr 1fr;
+ display: flex;
+ flex-wrap: wrap;
+ // display: grid;
+ // grid-template-columns: 1fr 1fr;
}
.fler{
- width: 30.4vw;
+ width: 31.5vw;
height: 13vw;
margin-bottom: 0.9vw;
margin-left: 0.5vw;
.carditem{
- width: 30.4vw;
+ width: 31vw;
height: 13vw;
background: rgba(245, 246, 248, 1);
border-radius: 1.1vw;
diff --git a/pages/procurement/common/thwl.vue b/pages/procurement/common/thwl.vue
index 4e41443..17f890f 100644
--- a/pages/procurement/common/thwl.vue
+++ b/pages/procurement/common/thwl.vue
@@ -3,12 +3,20 @@
退货物料
- {{Material.length}}
+
+
+
+ {{Material.length}}
+
+
+
-
-
-
+
+
{{v.materialInfo?.materialName}}
{{v.thNum}}
@@ -16,9 +24,11 @@
-
-
+
-
+
{{!qb?'更多':'收起'}}
清空列表
-
+
提交退货单
@@ -40,49 +51,49 @@
@@ -147,10 +158,12 @@
margin-top: 1vw;
position: relative;
padding-left: 1vw;
- .fff{
+
+ .fff {
background: #fff;
border-radius: 1.1vw;
}
+
.kjlt {
width: 3.2vw;
height: 10vw;
@@ -165,22 +178,30 @@
position: relative;
z-index: 10;
background: #FFFFFF;
- .mhao{
- width: 1.6vw;
- min-height: 0vw;
- border-radius: 0.8vw;
- border: 1px solid #FF4E4E;
- font-weight: 400;
- font-size: 1.1vw;
- color: #FF4E4E;
- padding: 0.4vw 0vw;
+
+ .mhao {
position: absolute;
- top: -0.8vw;
- right: -0.4vw;
- transform: rotate(-90deg);
+ top: -0.2vw;
+ /* 根据视觉需要微调 */
+ right: -0.2vw;
+ box-sizing: border-box;
+ width: 1.8vw;
+ height: 1.8vw;
+ border-radius: 50%;
+ border: 1px solid #FF4E4E;
+ color: #FF4E4E;
display: flex;
- justify-content: center;
align-items: center;
+ justify-content: center;
+ background: transparent;
+ writing-mode: horizontal-tb;
+ overflow: hidden;
+
+ .mhao-font {
+ font-size: 25rpx;
+ letter-spacing: -0.05em;
+ /* 负值 = 字符之间更近 */
+ }
}
}
@@ -229,7 +250,7 @@
right: 7.7vw;
z-index: 2;
}
-
+
&:nth-child(4) {
right: 11.6vw;
z-index: 2;
@@ -242,14 +263,15 @@
}
}
+
.kcscrol {
- width:calc(100% - 10vw);
+ width: calc(100% - 10vw);
height: 10vw;
white-space: nowrap;
margin-left: 0.6vw;
position: relative;
z-index: 9;
-
+
.yjbox {
display: inline-block;
@@ -259,14 +281,16 @@
border-radius: 1.1vw;
margin-right: 0.8vw;
position: relative;
- .zhanwei{
+
+ .zhanwei {
width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0;
z-index: 200;
- view{
+
+ view {
position: absolute;
width: 2.2vw;
height: 2.2vw;
@@ -285,6 +309,7 @@
color: rgba(255, 78, 78, 1);
}
}
+
.ytj {
min-width: 1.5vw;
height: 1.8vw;
@@ -297,7 +322,7 @@
text-align: center;
line-height: 1.75vw;
position: absolute;
- padding: 0 0.8vw;
+ padding: 0 0.8vw;
top: 0.8vw;
right: 0.8vw;
}
@@ -325,6 +350,7 @@
}
}
}
+
.guodu {
transition: .4s;
-webkit-transform-style: preserve-3d;
diff --git a/pages/procurement/material.vue b/pages/procurement/material.vue
index 1a6e07c..d2c4d17 100644
--- a/pages/procurement/material.vue
+++ b/pages/procurement/material.vue
@@ -91,11 +91,16 @@
:status="status" @crk="crk">
-
+
- {{carnum>99?'99+':carnum}}
+
+
+
+ {{carnum}}
+
+
-
+
@@ -395,7 +400,7 @@
title:res.message
})
}else{
- errmsg.value = res.message;
+ errmsg.value = res.result?.message ? res.result?.message : res.message
openerror.value = true;
adfangdou.value = true;
}
@@ -475,8 +480,8 @@
display: flex;
flex-direction: column;
justify-content: space-between;
-
- view {
+
+ .fiedrightview{
width: 5vw;
height: 5vw;
background: rgba(255, 255, 255, 0.86);
@@ -486,7 +491,7 @@
justify-content: center;
align-items: center;
position: relative;
-
+
text {
min-width: 1.8vw;
height: 1.8vw;
@@ -503,12 +508,13 @@
top: -0.8vw;
right: -0.8vw;
}
-
+
image {
width: 3.3vw;
height: 3.3vw;
}
}
+
}
.listcard {
@@ -699,7 +705,7 @@
display: flex;
justify-content: center;
letter-spacing: 3px;
- font-size: 1.4vw;
+ font-size: 1.5vw;
position: relative;
z-index: 100;
}
@@ -971,6 +977,28 @@
z-index: 100;
background: RGBA(239, 240, 244, 0.55);
}
+ .mhao {
+ position: absolute;
+ top: -0.2vw;
+ /* 根据视觉需要微调 */
+ right: -0.2vw;
+ box-sizing: border-box;
+ width: 1.8vw;
+ height: 1.8vw;
+ border-radius: 50%;
+ border: 1px solid #FF4E4E;
+ color: #FF4E4E;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background: transparent;
+ writing-mode: horizontal-tb;
+ overflow: hidden;
+ .mhao-font{
+ font-size: 25rpx;
+ letter-spacing: -0.05em; /* 负值 = 字符之间更近 */
+ }
+ }