diff --git a/pages/NursingNew/component/pleasetake/common/htditem.vue b/pages/NursingNew/component/pleasetake/common/htditem.vue
index 8dba6b4..21d1bbb 100644
--- a/pages/NursingNew/component/pleasetake/common/htditem.vue
+++ b/pages/NursingNew/component/pleasetake/common/htditem.vue
@@ -368,10 +368,10 @@
padding: 0.2vw;
margin: 0.3vw auto 0.25vw;
background: #fff;
- border-radius: 1.1vw;
>image {
width: 100%;
height: 100%;
+ border-radius: 1.1vw;
}
}
diff --git a/pages/NursingNew/component/pleasetake/component/returnorder.vue b/pages/NursingNew/component/pleasetake/component/returnorder.vue
index d6984fd..3c1847e 100644
--- a/pages/NursingNew/component/pleasetake/component/returnorder.vue
+++ b/pages/NursingNew/component/pleasetake/component/returnorder.vue
@@ -431,15 +431,17 @@
}
submitQld(obj).then(res=>{
+ console.log(res)
if(res.success){
uni.showToast({
icon:'success',
title:'提交成功'
})
setTimeout(()=>{
- plsbuy.value[lefttarget.value] = res.result.result
+ queryQld({searchContent:plsbuy.value[lefttarget.value].qldNo}).then((res : any) => {
+ plsbuy.value[lefttarget.value] = res.result.records[0];
+ })
tijiaoshow.value = false;
-
rightinfolist();
},800)
}else{
diff --git a/pages/procurement/outbound.vue b/pages/procurement/outbound.vue
index b933885..6d22857 100644
--- a/pages/procurement/outbound.vue
+++ b/pages/procurement/outbound.vue
@@ -595,18 +595,20 @@
}
outbound(data).then((res : any) => {
- selectarray.value = [];
- manyselect.value = false
- chukushow.value = false
- plzinfo.pageNo = 1;
- lefttarget.value = 0
- plzinfo.canpull = true;
- leftscrolltop.value = 1
- setTimeout(() => {
- leftscrolltop.value = 0
- }, 50)
- lefttarget.value = 0
- firstgetqueryCgdList();
+ if (res.success) {
+ selectarray.value = [];
+ manyselect.value = false
+ chukushow.value = false
+ plzinfo.pageNo = 1;
+ lefttarget.value = 0
+ plzinfo.canpull = true;
+ leftscrolltop.value = 1
+ setTimeout(() => {
+ leftscrolltop.value = 0
+ }, 50)
+ lefttarget.value = 0
+ firstgetqueryCgdList();
+ }
console.log("!!!!!!", res)
setTimeout(() => {
if (res.success) {
@@ -617,7 +619,7 @@
})
} else {
chukuerror.value = true;
- chukuvalue.value = res.result.message;
+ chukuvalue.value = res.message;
}
// uni.showToast({
// title: res.success ? res.result.message : res.message,
@@ -1096,7 +1098,7 @@
.right-one {
- width: 630rpx;
+ width: 570rpx;
height: 270rpx;
margin-left: 20rpx;
margin-top: 15rpx;
@@ -1134,13 +1136,15 @@
width: 130rpx;
height: 36rpx;
border-radius: 30rpx;
- display: flex;
- justify-content: center;
- align-items: center;
color: #555555;
border: 1rpx solid #D2D2D2;
margin-top: 5rpx;
font-size: 20rpx;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ text-align: center;
+ line-height: 34rpx;
}
}
diff --git a/pages/procurement/retstock.vue b/pages/procurement/retstock.vue
index c7ef890..1caea32 100644
--- a/pages/procurement/retstock.vue
+++ b/pages/procurement/retstock.vue
@@ -90,6 +90,8 @@
+
@@ -127,7 +129,7 @@
-
+
@@ -175,6 +177,7 @@
import tanchuang from './components/tanchuang.vue'
import submits from './common/submits.vue'
import calendar from '@/component/public/calendar.vue'
+ import defaultr from './components/default.vue'
const openleft = ref(true)
const props = defineProps({
isShow: { type: Boolean }
@@ -321,10 +324,10 @@
const tharrlist = ref([])
const thlist = () => {
thdList(form).then(res => {
- console.log("red", res.result.records)
tharrlist.value.push(...res.result.records);
+ console.log("red", res.result.records)
status.value = res.result.total == tharrlist.value.length ? 'nomore' : 'loadmore';
- if (form.pageNo == 1) {
+ if (form.pageNo == 1 && tharrlist.value.length>0) {
cardcon(tharrlist.value[cardindex.value], cardindex.value);
// 取消红点
cardindex.value = cardindex.value;
@@ -335,7 +338,9 @@
console.log(res)
cardarr.value = res.result
})
-
+ }
+ if(tharrlist.value.length==0){
+ cardarr.value = [];
}
})
}