From 6db4d8bb64677569c3e1d9343a28e90becbc05be Mon Sep 17 00:00:00 2001
From: Teng <461587751@qq.com>
Date: Tue, 3 Mar 2026 14:51:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=A4=A7=E9=87=8F?=
=?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
component/public/errorshow.vue | 6 +-
.../component/pleasetake/common/htditem.vue | 13 +-
.../pleasetake/component/requestform.vue | 16 +-
.../pleasetake/component/returnorder.vue | 6 +-
pages/Warehouse/finish.vue | 45 +-
pages/Warehouse/index/component/index.vue | 4 +-
pages/Warehouse/picking.vue | 81 +-
pages/login/newanimationpage.vue | 2 +-
pages/procurement/addtory.vue | 2 +-
pages/procurement/common/toryitem.vue | 69 +-
pages/procurement/common/torytor.vue | 8 +-
pages/procurement/components/Inventory.vue | 840 ++++++++++--------
pages/procurement/components/calculator.vue | 18 +-
pages/procurement/components/carditem.vue | 150 ++--
.../procurement/components/classification.vue | 26 +-
pages/procurement/inventory.vue | 2 -
pages/procurement/material.vue | 69 +-
pages/procurement/purchaseorder.vue | 96 +-
18 files changed, 885 insertions(+), 568 deletions(-)
diff --git a/component/public/errorshow.vue b/component/public/errorshow.vue
index d64dfa5..372f675 100644
--- a/component/public/errorshow.vue
+++ b/component/public/errorshow.vue
@@ -4,7 +4,7 @@
- {{ font }}
+ {{font}}
确定
@@ -61,7 +61,8 @@
}
.addallfont {
- width: 23vw;
+ // margin: 0 auto;
+ max-width: 23vw;
font-weight: 400;
font-size: 1.3vw;
color: #888888;
@@ -70,6 +71,7 @@
margin-bottom: 4vw;
text-align: center;
overflow-wrap: break-word;
+ // background-color: red;
}
.qd {
diff --git a/pages/NursingNew/component/pleasetake/common/htditem.vue b/pages/NursingNew/component/pleasetake/common/htditem.vue
index f126caf..05b842f 100644
--- a/pages/NursingNew/component/pleasetake/common/htditem.vue
+++ b/pages/NursingNew/component/pleasetake/common/htditem.vue
@@ -278,6 +278,7 @@
position: absolute;
top: 0;
right: 0.8vw;
+ // background-color: red;
>view {
width: 4.5vw;
@@ -300,9 +301,9 @@
width: 2.4vw;
height: 2.4vw;
position: absolute;
- top: 65%;
- transform: translateY(-50%);
- right: 0.6vw;
+ top: 100%;
+ // transform: translateY(-50%);
+ right: 0.4vw;
}
}
@@ -517,7 +518,7 @@
width: 615rpx;
height: 365rpx;
margin-left: 20rpx;
- margin-bottom: 15rpx;
+ margin-bottom: 23rpx;
.carditem {
@@ -587,7 +588,7 @@
width: 2rpx;
height: 50rpx;
background-color: #C9C9C9;
- margin: 0 40rpx;
+ margin: 0 30rpx;
margin-top: 10rpx;
}
}
@@ -603,7 +604,7 @@
background-color: #fff;
border-radius: 30rpx;
margin-left: 20rpx;
- margin-bottom: 15rpx;
+ margin-bottom: 23rpx;
padding: 0 30rpx;
position: relative;
// background-color: red;
diff --git a/pages/NursingNew/component/pleasetake/component/requestform.vue b/pages/NursingNew/component/pleasetake/component/requestform.vue
index e92f713..76f0eb8 100644
--- a/pages/NursingNew/component/pleasetake/component/requestform.vue
+++ b/pages/NursingNew/component/pleasetake/component/requestform.vue
@@ -1080,7 +1080,7 @@
.right-contain {
width: 100%;
- height: 97%;
+ height: 98%;
margin-top: 20rpx;
display: flex;
flex-wrap: wrap;
@@ -1096,23 +1096,23 @@
// padding-bottom: 80rpx;
.right-one-white{
- width: 592rpx;
+ width: 615rpx;
height: 365rpx;
border: 1rpx solid #c9c9c9;
background-color: #fff;
border-radius: 30rpx;
margin-left: 20rpx;
- margin-bottom: 15rpx;
+ margin-bottom: 23rpx;
padding: 0 30rpx;
position: relative;
// background-color: #fff;
}
.right-one {
- width: 592rpx;
+ width: 615rpx;
height: 365rpx;
margin-left: 20rpx;
- margin-bottom: 15rpx;
+ margin-bottom: 23rpx;
background-color: #fff;
border-radius: 30rpx;
display: flex;
@@ -1265,8 +1265,8 @@
.bignomessage{
position: fixed;
top: 8.5vh;
- left: 9.8vw;
- width: 88.2vw;
+ left: 9.4vw;
+ width: 89vw;
height: 89vh;
z-index: 100;
background-color: #fff;
@@ -1283,7 +1283,7 @@
view {
text-align: center;
- margin-top: 1vw;
+ margin-top: -2vw;
font-weight: 300;
font-size: 1.5vw;
color: #555555;
diff --git a/pages/NursingNew/component/pleasetake/component/returnorder.vue b/pages/NursingNew/component/pleasetake/component/returnorder.vue
index 425ec78..32682f9 100644
--- a/pages/NursingNew/component/pleasetake/component/returnorder.vue
+++ b/pages/NursingNew/component/pleasetake/component/returnorder.vue
@@ -947,8 +947,8 @@
.bignomessage{
position: fixed;
top: 8.5vh;
- left: 9.8vw;
- width: 88.2vw;
+ left: 9.4vw;
+ width: 89vw;
height: 89vh;
z-index: 100;
background-color: #fff;
@@ -965,7 +965,7 @@
view {
text-align: center;
- margin-top: 1vw;
+ margin-top: -2vw;
font-weight: 300;
font-size: 1.5vw;
color: #555555;
diff --git a/pages/Warehouse/finish.vue b/pages/Warehouse/finish.vue
index 8d9cefe..6c65d26 100644
--- a/pages/Warehouse/finish.vue
+++ b/pages/Warehouse/finish.vue
@@ -490,6 +490,12 @@
-
+
暂无数据
-
+
暂无数据
-
+
暂无数据
@@ -606,6 +612,12 @@
+
+
+
+ 暂无数据
+
+
@@ -1368,7 +1380,7 @@
})
}
const leftscrolltop = ref(0)
-
+ const shownomessage = ref(false)
const plsbuy = ref([])
const alltotal = ref(0);
const nomessageshow = ref(false);
@@ -1530,6 +1542,11 @@
plzinfo.pageNo = 1;
plsbuy.value = [];
queryCgdList(plzinfo).then((res : any) => {
+ if (res.result.records.length) {
+ shownomessage.value = false;
+ } else {
+ shownomessage.value = true;
+ }
plsbuy.value.push(...res.result.records)
alltotal.value = res.result.total
if (res.result.records.length) {
@@ -2462,6 +2479,7 @@
overflow: hidden;
background-color: #fff;
border-radius: 30rpx;
+ position: relative;
.contain-right-title {
width: 100%;
@@ -3549,4 +3567,23 @@
justify-content: center;
align-items: center;
}
+ .haventmessage {
+ width: 100%;
+ height: 100%;
+ background-color: #fff;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border-radius: 30rpx;
+ }
+ .contain-right-nomessage {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background-color: #fff;
+ border-radius: 30rpx;
+ z-index: 100;
+ }
\ No newline at end of file
diff --git a/pages/Warehouse/index/component/index.vue b/pages/Warehouse/index/component/index.vue
index 3ac0692..5f5f4d4 100644
--- a/pages/Warehouse/index/component/index.vue
+++ b/pages/Warehouse/index/component/index.vue
@@ -862,7 +862,7 @@
z-index: 4;
}
.title-card-two{
- width: 33vw;
+ width: 33.6vw;
height: 12vw;
border-radius: 1.6vw;
background-color: #FFFFFF;
@@ -1358,7 +1358,7 @@
.tittop {
height: 2vw;
font-weight: 400;
- font-size: 1.4vw;
+ font-size: 1.5vw;
color: #333333;
display: flex;
align-items: center;
diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue
index 7ed7608..df1ed1b 100644
--- a/pages/Warehouse/picking.vue
+++ b/pages/Warehouse/picking.vue
@@ -74,7 +74,7 @@
-
+
1
@@ -132,7 +132,7 @@
{{showvalue.wlName}}
-
+
物料信息
@@ -184,10 +184,10 @@
-
+
-
+
入库信息
@@ -217,10 +217,10 @@
-
+
-
+
拣货拍照
@@ -233,7 +233,7 @@
-
-
-
+
-
+
数量
@@ -650,6 +650,13 @@
+
+
+
+ 暂无数据
+
+
+
@@ -1554,6 +1561,9 @@
} else {
shownomessage.value = true;
}
+ // if (!res.result.total) {
+ // nomessageshow.value = true;
+ // }
plsbuy.value.push(...res.result.records)
alltotal.value = res.result.total
if (res.result.records.length) {
@@ -2157,7 +2167,7 @@
.statues-father {
margin-top: 0.5vh;
- margin-bottom: 1vh;
+ margin-bottom: 1.2vh;
width: 100%;
height: 5.9vh;
display: flex;
@@ -2395,12 +2405,13 @@
.contain-right {
z-index: 1;
- height: 96.7vh;
+ height: 96.8vh;
width: 100vw;
margin-left: 20rpx;
overflow: hidden;
background-color: #fff;
border-radius: 30rpx;
+ position: relative;
.contain-right-title {
width: 100%;
@@ -3070,18 +3081,18 @@
// }
.gray-button-jianpan:active {
- background: linear-gradient(to top, #00C9FF, #0076FF);
+ background: linear-gradient(to top, #019cef, #0084fa);
color: #fff;
font-size: 44rpx;
- font-weight: 700;
- border: 1rpx solid #00C9FF;
+ font-weight: 500;
+ // border: 1rpx solid #00C9FF;
}
.gray-button-jianpan {
font-size: 40rpx;
font-weight: 600;
- background-color: #f3f5f9;
- border-radius: 45rpx;
+ // background-color: #f3f5f9;
+ // border-radius: 45rpx;
// box-shadow: 2px 3px 6px rgba(0, 0, 0, 0.12);
color: #555555;
width: 135rpx;
@@ -3090,17 +3101,20 @@
display: flex;
justify-content: center;
align-items: center;
- margin-right: 60rpx;
- margin-bottom: 30rpx;
+ margin: 25rpx 25rpx 0 0;
+ width: 7vw;
+ height: 5.5vw;
+ background-color: #F3F5F9;
+ border-radius: 40rpx;
transition: .1s;
-webkit-transform-style: preserve-3d;
-webkit-overflow-scrolling: touch;
}
.gray-button-jianpan-jian:active {
- background: linear-gradient(to top, #00C9FF, #0076FF);
+ background: linear-gradient(to bottom, #019cef, #0084fa);
color: #fff;
- font-size: 44rpx;
+ font-size: 40rpx;
font-weight: 700;
border: 1rpx solid #00C9FF;
}
@@ -3109,7 +3123,7 @@
font-size: 40rpx;
font-weight: 600;
background-color: #f3f5f9;
- border-radius: 45rpx;
+ border-radius: 35rpx;
// box-shadow: 2px 3px 6px rgba(0, 0, 0, 0.12);
color: #555555;
width: 135rpx;
@@ -3146,7 +3160,7 @@
.jianhuo-jianpan {
position: absolute;
right: 30rpx;
- bottom: 130rpx;
+ bottom: 110rpx;
}
.text-anim {
@@ -3213,8 +3227,8 @@
}
.moban-photo {
- width: 40%;
- height: 150rpx;
+ width: 36%;
+ height: 138rpx;
margin-right: 4%;
margin-top: 3%;
background-color: #F9F9F9;
@@ -3230,8 +3244,8 @@
height: 2vw;
z-index: 20;
position: absolute;
- right: 0.1vw;
- top: 0.1vw;
+ right: 0.3vw;
+ top: 0.3vw;
border-radius: 10rpx 0.6vw 10rpx 10rpx;
background: rgba(255, 255, 255, 1);
display: flex;
@@ -3403,4 +3417,15 @@
justify-content: center;
align-items: center;
}
+
+ .contain-right-nomessage {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background-color: #fff;
+ border-radius: 30rpx;
+ z-index: 100;
+ }
\ No newline at end of file
diff --git a/pages/login/newanimationpage.vue b/pages/login/newanimationpage.vue
index b928294..8b2b755 100644
--- a/pages/login/newanimationpage.vue
+++ b/pages/login/newanimationpage.vue
@@ -154,7 +154,7 @@
onShow(() => {
setTimeout(() => {
playall.value = true;
- }, 1000)
+ }, 1200)
zyupgrade.value?.check_update();
// console.log("zzzzzzzzzzzzzzzzzzzzzzzzzzzz")
diff --git a/pages/procurement/addtory.vue b/pages/procurement/addtory.vue
index e9a2ff6..42c5fbe 100644
--- a/pages/procurement/addtory.vue
+++ b/pages/procurement/addtory.vue
@@ -29,7 +29,7 @@
-
+
取消盘点
提交盘点单
diff --git a/pages/procurement/common/toryitem.vue b/pages/procurement/common/toryitem.vue
index 14eadd4..11d5bb8 100644
--- a/pages/procurement/common/toryitem.vue
+++ b/pages/procurement/common/toryitem.vue
@@ -2,8 +2,13 @@
-
+
+
+
+
+ 暂无数据
+
@@ -108,12 +113,13 @@
@click="previewImage(v,p,o)">
-
+
-
+
点击拍照上传
@@ -121,8 +127,8 @@
style="position: absolute;width: 10vw;height: 10vw;">
-
-
+
+
{{pddType=='1'?'取消':'关闭'}}
确定
@@ -427,7 +433,8 @@
.submit {
width: 100%;
- // height: 3.2vw;
+ height: 1vw;
+ margin-top: 0.7vw;
// margin-top: 0.9vw;
padding-right: 2vw;
display: flex;
@@ -515,10 +522,12 @@
bottom: 0;
right: 0;
}
- .scrollbgc{
+
+ .scrollbgc {
width: 92%;
margin-left: 4%;
height: 22vw;
+
.zpj {
width: 30%;
display: flex;
@@ -527,7 +536,7 @@
// padding: 0 1.6vw;
height: 22vw;
// background-color: red;
-
+
.zpk {
width: 17.8vw;
height: 10vw;
@@ -540,7 +549,7 @@
background: #F9F9F9;
overflow: hidden;
margin-right: 1vw;
-
+
view {
width: 2vw;
height: 2vw;
@@ -554,13 +563,13 @@
justify-content: center;
align-items: center;
}
-
+
image {
width: 100%;
height: 100%;
}
}
-
+
.clkpz {
width: 17.8vw;
height: 10vw;
@@ -572,22 +581,22 @@
align-items: center;
margin-top: 1vw;
flex-direction: column;
-
+
text {
font-weight: 400;
font-size: 0.7vw;
color: #78B1EB;
}
-
+
image {
width: 2.3vw;
height: 2.3vw;
}
}
-
+
}
}
-
+
.pztit {
font-weight: 400;
@@ -924,4 +933,32 @@
z-index: 21;
background: RGBA(239, 240, 244, 0);
}
+
+ .all-nomessage {
+ width: 89vw;
+ height: 56vw;
+ position: fixed;
+ top: 5vw;
+ left: 9.5vw;
+ background-color: #fff;
+ border-radius: 40rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+
+ image {
+ width: 13.5vw;
+ height: 13.5vw;
+ }
+
+ view {
+ margin-top: -40rpx;
+ width: 100%;
+ text-align: center;
+ font-weight: 300;
+ font-size: 1.4vw;
+ color: #555555;
+ }
+ }
\ No newline at end of file
diff --git a/pages/procurement/common/torytor.vue b/pages/procurement/common/torytor.vue
index c71d628..0782ab7 100644
--- a/pages/procurement/common/torytor.vue
+++ b/pages/procurement/common/torytor.vue
@@ -196,7 +196,9 @@
display: flex;
justify-content: center;
align-items: center;
- background: url('/static/index/procurement/bt.png') no-repeat;
+ // background: url('/static/index/procurement/bt.png') no-repeat;
+ background-color: #F3F5F9;
+ border-radius: 30rpx;
background-size: 100% 100%;
font-size: 1.5vw;
font-weight: 500;
@@ -205,10 +207,10 @@
}
.calculator-kuai:active {
- background: linear-gradient(to bottom, #00C9FF, #0076FF);
+ background: linear-gradient(to bottom, #019cef, #0084fa);
color: #fff !important;
font-weight: 500;
- border-radius: 1.5vw;
+ // border-radius: 1.5vw;
display: flex;
justify-content: center;
align-items: center;
diff --git a/pages/procurement/components/Inventory.vue b/pages/procurement/components/Inventory.vue
index f40a2b2..3e74841 100644
--- a/pages/procurement/components/Inventory.vue
+++ b/pages/procurement/components/Inventory.vue
@@ -2,443 +2,495 @@
全部库存预警
-
-
-
-
-
-
-
-
-
- {{v.categoryId_dictText}}
- {{v.typeId_dictText}}
- {{v.medicationId_dictText}}
-
+
+
+
+
+
+
+
+
+
+ {{v.categoryId_dictText}}
+ {{v.typeId_dictText}}
+ {{v.medicationId_dictText}}
+
+
+
+
+ {{v.materialName}}{{v.materialNo}}
+
+
+ 规格型号: {{v.specificationModel}}
+
+
+ 采购单价:
+ ￥{{v.oneUnitPrice?Number(v.oneUnitPrice).toFixed(2):""}}
+ 采购单位: {{ v.oneUnit}}
+ 采购单价:
+ ￥{{v.twoUnitPrice?Number(v.twoUnitPrice).toFixed(2):""}}
+ 采购单位: {{ v.twoUnit}}
+ 采购单价:
+ ￥{{v.referenceUnitPrice?Number(v.referenceUnitPrice).toFixed(2):""}}
+ 采购单位: {{ v.materialUnits}}
+
+
+
+ {{v.kcsl}}
+ 库存数量
-
-
- {{v.materialName}}{{v.materialNo}}
-
-
- 规格型号: {{v.specificationModel}}
-
-
- 采购单价: ￥{{v.oneUnitPrice?Number(v.oneUnitPrice).toFixed(2):""}}
- 采购单位: {{ v.oneUnit}}
- 采购单价: ￥{{v.twoUnitPrice?Number(v.twoUnitPrice).toFixed(2):""}}
- 采购单位: {{ v.twoUnit}}
- 采购单价: ￥{{v.referenceUnitPrice?Number(v.referenceUnitPrice).toFixed(2):""}}
- 采购单位: {{ v.materialUnits}}
-
-
-
- {{v.kcsl}}
- 库存数量
-
-
- {{v.upperLimit}}
- 物料上限 ↑
-
-
- {{v.lowerLimit}}
- ↓ 物料下限
-
-
+
+ {{v.upperLimit}}
+ 物料上限 ↑
-
- 已添加
-
+
+ {{v.lowerLimit}}
+ ↓ 物料下限
-
- 出入库
-
-
- 加购物车
-
-
+
+
+
+ 已添加
+
+
+
+ 出入库
+
+
+ 加购物车
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/procurement/components/calculator.vue b/pages/procurement/components/calculator.vue
index 5d0670a..f963e38 100644
--- a/pages/procurement/components/calculator.vue
+++ b/pages/procurement/components/calculator.vue
@@ -1,7 +1,7 @@
- 供应商
+ 供应商1111111111111
{{gysarr[gysidnum]?.name}}
@@ -698,26 +698,28 @@
flex-wrap: wrap;
display: grid;
grid-template-columns: 1fr 1fr 1fr;
+ padding-left: 29rpx;
.calculator-kuai {
display: flex;
justify-content: center;
align-items: center;
- background: url('/static/index/procurement/bt.png') no-repeat;
background-size: 100% 100%;
font-size: 42rpx;
font-weight: 500;
- margin: 12rpx 40rpx 0 0rpx;
- width: 7.6vw;
- height: 6.1vw;
+ margin: 25rpx 25rpx 0 0;
+ width: 7vw;
+ height: 5.5vw;
+ background-color: #F3F5F9;
+ border-radius: 40rpx;
}
.calculator-kuai:active {
- background: linear-gradient(to bottom, #00C9FF, #0076FF);
+ background: linear-gradient(to bottom, #019cef, #0084fa);
color: #fff;
- font-size: 45rpx;
+ font-size: 42rpx;
font-weight: 500;
- border-radius: 2.6vw;
+ border-radius: 40rpx;
}
}
diff --git a/pages/procurement/components/carditem.vue b/pages/procurement/components/carditem.vue
index ea02e79..35cc992 100644
--- a/pages/procurement/components/carditem.vue
+++ b/pages/procurement/components/carditem.vue
@@ -1,43 +1,46 @@
-
+
-
+ :scroll-left="v.scrollleft" @scroll="scroll">
+
-
-
+
{{v.categoryId_dictText}}
{{v.typeId_dictText}}
{{v.medicationId_dictText}}
-
+
- {{v.materialName}}
+ {{v.materialName}}
- 物料编码: {{v.materialNo}}
+ 物料编码: {{v.materialNo}}
- 规格型号: {{v.specificationModel}}
+ 规格型号: {{v.specificationModel}}
采购单价: ￥{{Number(v.oneUnitPrice).toFixed(2) }}
采购单价: ￥{{Number(v.twoUnitPrice).toFixed(2) }}
- 采购单价: ￥{{ Number(v.referenceUnitPrice).toFixed(2)}}
+ 采购单价: ￥{{ Number(v.referenceUnitPrice).toFixed(2)}}
+
- 采购单位: {{ v.oneUnit}}
- 采购单位: {{ v.twoUnit}}
- 采购单位: {{ v.materialUnits}}
+ 采购单位: {{ v.oneUnit}}
+ 采购单位: {{ v.twoUnit}}
+ 采购单位: {{ v.materialUnits}}
@@ -48,7 +51,7 @@
{{v.upperLimit}}
物料上限 ↑
-
+
{{v.lowerLimit}}
↓ 物料下限
@@ -60,7 +63,7 @@
-
+
出入库
@@ -80,20 +83,20 @@
@@ -182,6 +185,7 @@
display: grid;
grid-template-columns: 1fr 1fr;
}
+
.fler {
width: 44vw;
height: 20.5vw;
@@ -222,12 +226,13 @@
writing-mode: vertical-rl;
text-orientation: upright;
text-align: center;
-
+
}
- .zkadd-blue{
+
+ .zkadd-blue {
background: #1083F8;
color: #fff;
-
+
view {
width: 3.8vw;
height: 3.8vw;
@@ -237,8 +242,8 @@
margin-top: -0.7vw;
}
}
-
- .zkadd-white{
+
+ .zkadd-white {
background: #e3e5e7;
color: #555555;
}
@@ -256,10 +261,11 @@
display: flex;
justify-content: center;
align-items: center;
- top:50%;
+ top: 50%;
transform: translateY(-50%);
// top: 0.8vw;
- right:0.8vw;
+ right: 0.8vw;
+
>view {
width: 5.5vw;
height: 2.2vw;
@@ -274,7 +280,7 @@
align-items: center;
position: absolute;
top: 2.3vw;
- right:0.8vw;
+ right: 0.8vw;
}
image {
@@ -288,19 +294,21 @@
height: 100%;
padding: 1vw;
position: absolute;
- left:15vw;
+ left: 15vw;
top: 0;
>view {
+
&:nth-child(2),
&:nth-child(3),
&:nth-child(4),
- &:nth-child(5){
+ &:nth-child(5) {
margin-top: 0.25vw;
max-width: 25vw;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
+
text {
font-weight: 400;
font-size: 1.3vw;
@@ -315,11 +323,12 @@
align-items: center;
height: 2vw;
margin-top: 1vw;
+
>view {
width: 19vw;
height: 2vw;
font-weight: bold;
- font-size:1.8vw;
+ font-size: 1.8vw;
color: #222222;
text-overflow: ellipsis;
overflow: hidden;
@@ -334,36 +343,38 @@
}
}
}
- >.wlsy{
+
+ >.wlsy {
width: 100%;
height: 3.4vw;
display: flex;
justify-content: space-between;
margin-top: 0vw;
+
>view {
width: 33.3%;
height: 100%;
display: flex;
flex-direction: column;
position: relative;
- margin-top:1vw;
-
+ margin-top: 1vw;
+
&:nth-child(1) {
width: 30%;
align-items: left;
}
-
+
&:nth-child(2) {
width: 40%;
align-items: center;
}
-
+
&:nth-child(3) {
width: 30%;
text-align: right;
align-items: right;
}
-
+
&:nth-child(2)::after {
content: '';
position: absolute;
@@ -374,14 +385,14 @@
border-right: 1px solid #C9C9C9;
top: 0.6vw;
}
-
+
text {
&:nth-child(1) {
font-weight: bold;
font-size: 1.8vw;
color: #555555;
}
-
+
&:nth-child(2) {
font-weight: 400;
font-size: 1.2vw;
@@ -399,7 +410,7 @@
width: 14.8vw;
height: 100%;
position: absolute;
- display:flex;
+ display: flex;
flex-direction: column;
top: 0;
left: 0;
@@ -428,7 +439,9 @@
font-size: 1vw;
color: #555555;
padding: 0 0.25vw;
- &:nth-child(1),&:nth-child(2){
+
+ &:nth-child(1),
+ &:nth-child(2) {
max-width: 6vw;
overflow: hidden;
text-overflow: ellipsis;
@@ -437,22 +450,35 @@
line-height: 1.8vw;
text-align: center;
}
+
+ &:nth-child(3) {
+ max-width: 11.5vw;
+ padding: 0 0.8vw;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ display: block;
+ line-height: 1.8vw;
+ text-align: center;
+ }
}
}
- .imghs{
+
+ .imghs {
width: 12vw;
height: 12vw;
margin: 0.8vw auto 0.25vw;
padding: 0.2vw;
background: #fff;
border-radius: 1.1vw;
+
>image {
width: 100%;
height: 100%;
border-radius: 1.1vw;
}
}
-
+
}
}
\ No newline at end of file
diff --git a/pages/procurement/components/classification.vue b/pages/procurement/components/classification.vue
index 24e8c14..f9910a3 100644
--- a/pages/procurement/components/classification.vue
+++ b/pages/procurement/components/classification.vue
@@ -307,7 +307,7 @@
}
.set {
- width: 23vw;
+ width: 27vw;
height: 3.8vw;
padding: 0 1.7vw;
display: flex;
@@ -346,7 +346,7 @@
}
.ifclass {
- width: 36vw;
+ width: 40vw;
height: 83vh;
position: fixed;
z-index: 120;
@@ -400,26 +400,28 @@
justify-content: space-around;
.scrl1 {
- width: 10vw;
+ width: 13vw;
}
.scrl2,
.scrl3 {
- width: 10vw;
+ width: 13vw;
display: flex;
justify-content: flex-end;
- view {
- width: 8vw;
- margin-left: 1vw;
- }
+ // view {
+ // width: 11vw;
+ // margin-left: 1vw;
+ // }
}
.scroll-Y {
- width: 10vw;
+ width: 13vw;
height: calc(85vh - 23vw);
+ // background-color: red;
view {
- min-width: 8.5vw;
- max-width: 10vw;
+ // min-width: 8.5vw;
+ // max-width: 11vw;
+ width: 11vw;
height: 3.8vw;
background: #F5F5F8;
border-radius: 1.9vw;
@@ -435,7 +437,7 @@
text {
white-space: nowrap;
- width: 6vw;
+ width: 7vw;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
diff --git a/pages/procurement/inventory.vue b/pages/procurement/inventory.vue
index e08ba3f..7776264 100644
--- a/pages/procurement/inventory.vue
+++ b/pages/procurement/inventory.vue
@@ -134,8 +134,6 @@
暂无数据
-
diff --git a/pages/procurement/material.vue b/pages/procurement/material.vue
index 834bb89..94dd7ad 100644
--- a/pages/procurement/material.vue
+++ b/pages/procurement/material.vue
@@ -36,8 +36,8 @@
-
+
@@ -101,6 +101,12 @@
-->
+
+
+
+ 暂无数据
+
+
@@ -204,9 +210,14 @@
type: Boolean
},
});
+ const shownomessage = ref(false)
const queryInvo = () => {
queryInvoicingList(form).then(res => {
- // console.log(res)
+ if (res.result.records.length) {
+ shownomessage.value = false;
+ } else {
+ shownomessage.value = true;
+ }
res.result.records.forEach(item => {
item.zk = false;
item.scrollleft = 0;
@@ -216,7 +227,7 @@
setout2.value = (res.result.total == InvoicingList.value.length ? false : true)
})
}
- onMounted(()=>{
+ onMounted(() => {
// gwcsx()
form.pageNo = 1;
warn.pageNo = 1;
@@ -228,9 +239,9 @@
nextTick(() => {
chongzhi()
})
- setTimeout(()=>{
+ setTimeout(() => {
timeout.value = true
- },500)
+ }, 500)
transition.value = false;
setTimeout(() => {
transition.value = true;
@@ -400,12 +411,12 @@
InvoicingList.value = [];
queryInvo();
}
-
+
const addcartory = (e : any) => {
// e把index覆盖了导致index永远是0
// console.log("我要测试",e)
- console.log("啥啊",e)
- if(!e.suppliers_dictText || !e.suppliers){
+ console.log("啥啊", e)
+ if (!e.suppliers_dictText || !e.suppliers) {
openerror.value = true;
errmsg.value = `此物料暂无供应商，请联系管理员`
return
@@ -538,7 +549,7 @@
})
}
const openmore = () => {
- if(Material.value.length){
+ if (Material.value.length) {
backmoreopen.value = !backmoreopen.value
}
}
@@ -599,6 +610,8 @@
width: 90vw;
height: 70.3vh;
margin-top: 0.9vw;
+ // background-color: #fff;
+ position: relative;
.crdcroll {
width: 100%;
@@ -1214,4 +1227,40 @@
// background-color: red;
}
}
+ .que {
+ width: 10vw;
+ height: 10vw;
+ // margin: auto;
+
+ image {
+ width: 100%;
+ height: 100%;
+ }
+
+ view {
+ margin-top: -30rpx;
+ width: 100%;
+ text-align: center;
+ font-weight: 300;
+ font-size: 1.2vw;
+ color: #555555;
+ }
+ }
+
+ .center {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
+
+ .contain-right-nomessage {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 99.2%;
+ height: 90%;
+ background-color: #fff;
+ border-radius: 30rpx;
+ z-index: 100;
+ }
\ No newline at end of file
diff --git a/pages/procurement/purchaseorder.vue b/pages/procurement/purchaseorder.vue
index 6b55faa..02d14b5 100644
--- a/pages/procurement/purchaseorder.vue
+++ b/pages/procurement/purchaseorder.vue
@@ -17,6 +17,13 @@
+
+
+
+ 暂无数据
+
+
@@ -168,19 +199,19 @@
-
+
暂无数据
-
+
暂无数据
-
+
暂无数据
@@ -586,7 +617,7 @@
clickmiddle(middletarget.value);
})
}
-
+ const shownomessage = ref(false)
const search = () => {
// if (!searchValue.value) return
form.pageNo = 1;
@@ -599,7 +630,12 @@
plzinfo.pageNo = 1;
plsbuy.value = [];
queryCgdList(plzinfo).then((res : any) => {
- console.log(res.result.records)
+ if (res.result.records.length) {
+ shownomessage.value = false;
+ } else {
+ shownomessage.value = true;
+ }
+ // console.log(res.result.records)
plsbuy.value.push(...res.result.records)
if (res.result.records.length) {
form.cgdId = plsbuy.value[0].id
@@ -1002,6 +1038,7 @@
margin-left: 1.2%;
overflow: hidden;
background-color: #fff;
+ position: relative;
// background-color: red;
.contain-right-title {
@@ -1613,7 +1650,7 @@
justify-content: center;
align-items: center;
}
- .que {
+ .quespec {
width: 7vw;
height: 7vw;
margin-top: -1vw;
@@ -1633,4 +1670,51 @@
color: #555555;
}
}
+ .haventmessage {
+ width: 100%;
+ height: 100%;
+ background-color: #fff;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border-radius: 30rpx;
+
+ }
+
+ .que {
+ width: 10vw;
+ height: 10vw;
+ // margin: auto;
+
+ image {
+ width: 100%;
+ height: 100%;
+ }
+
+ view {
+ margin-top: -30rpx;
+ width: 100%;
+ text-align: center;
+ font-weight: 300;
+ font-size: 1.2vw;
+ color: #555555;
+ }
+ }
+
+ .center {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
+
+ .contain-right-nomessage {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background-color: #fff;
+ border-radius: 30rpx;
+ z-index: 100;
+ }
\ No newline at end of file