From fb7738138c94aa4dde6fccfdec4755c4608dd655 Mon Sep 17 00:00:00 2001 From: Teng <461587751@qq.com> Date: Tue, 10 Mar 2026 17:13:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/doctorask/doctorask.vue | 2 +- pages/NursingNew/component/index.vue | 8 +- .../component/leftcontent/serveswipe.vue | 2 +- .../component/pleasetake/common/addwl.vue | 11 +- .../component/pleasetake/common/carditem.vue | 33 +-- .../component/pleasetake/common/htditem.vue | 14 +- .../pleasetake/component/requestform.vue | 6 +- .../pleasetake/component/returnorder.vue | 6 +- pages/Warehouse/finish.vue | 2 +- pages/Warehouse/index/component/index.vue | 7 +- pages/Warehouse/picking.vue | 2 +- pages/login/ceshi.nvue | 199 ++++++++++++++++ pages/login/newanimationpage.vue | 2 +- pages/procurement/common/thitem.vue | 4 +- pages/procurement/common/toryitem.vue | 64 +++--- pages/procurement/common/torytor.vue | 76 ++++++- pages/procurement/components/Inventory.vue | 4 +- pages/procurement/components/calculator.vue | 107 +++++---- pages/procurement/components/carditem.vue | 4 +- pages/procurement/components/carlist.vue | 212 +++++++++--------- pages/procurement/components/default.vue | 2 +- pages/procurement/components/details.vue | 4 +- pages/procurement/components/purorder.vue | 15 +- pages/procurement/inventory.vue | 10 +- pages/procurement/material.vue | 21 +- pages/procurement/materialcar.vue | 6 +- pages/procurement/outbound.vue | 9 +- pages/procurement/retstock.vue | 4 +- static/shouye/sy/l0.png | Bin 3045 -> 2334 bytes static/shouye/sy/l1.png | Bin 3174 -> 2517 bytes 30 files changed, 561 insertions(+), 275 deletions(-) create mode 100644 pages/login/ceshi.nvue diff --git a/pages/NursingNew/component/doctorask/doctorask.vue b/pages/NursingNew/component/doctorask/doctorask.vue index fdbd25e..7510c18 100644 --- a/pages/NursingNew/component/doctorask/doctorask.vue +++ b/pages/NursingNew/component/doctorask/doctorask.vue @@ -789,7 +789,7 @@ justify-content: center; align-items: center; min-width: 89.7vw; - height: 96vh; + height: 97vh; margin-top: 1vw; flex-direction: column; background-color: #fff; diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue index cd8a96d..4bbd8f7 100644 --- a/pages/NursingNew/component/index.vue +++ b/pages/NursingNew/component/index.vue @@ -821,9 +821,10 @@ display: flex; align-items: center; margin-left: 2vw; - font-size: 32rpx; + font-size: 34rpx; font-weight: 600; border-bottom: 1px solid #F2F2F2; + padding-top: 1vw; } .top-list { @@ -1291,6 +1292,7 @@ border: 1px solid #F8F8F8; text-align: center; overflow: hidden; + border: 2px solid transparent; image { width: 2.6vw; @@ -1362,7 +1364,7 @@ .tittop { height: 2vw; font-weight: 400; - font-size: 35rpx; + font-size: 34rpx; color: #333333; display: flex; align-items: center; @@ -1458,7 +1460,7 @@ .tittop { height: 2vw; font-weight: 400; - font-size: 35rpx; + font-size: 34rpx; color: #333333; display: flex; align-items: center; diff --git a/pages/NursingNew/component/leftcontent/serveswipe.vue b/pages/NursingNew/component/leftcontent/serveswipe.vue index d1ed572..bb55164 100644 --- a/pages/NursingNew/component/leftcontent/serveswipe.vue +++ b/pages/NursingNew/component/leftcontent/serveswipe.vue @@ -3,7 +3,7 @@ - 暂无服务指令 diff --git a/pages/NursingNew/component/pleasetake/common/addwl.vue b/pages/NursingNew/component/pleasetake/common/addwl.vue index fb29d20..91f3c11 100644 --- a/pages/NursingNew/component/pleasetake/common/addwl.vue +++ b/pages/NursingNew/component/pleasetake/common/addwl.vue @@ -11,7 +11,7 @@ - + @@ -495,17 +495,18 @@ justify-content: center; align-items: center; flex-direction: column; + padding-top: 0.5vw; .more-whitebutton { width: 74%; height: 50rpx; border-radius: 10rpx; - color: #ababab; + color: #a7a7a7; display: flex; justify-content: center; align-items: center; font-size: 26rpx; - border: 2rpx solid #BFBFBF; + border: 2rpx solid #a7a7a7; margin-bottom: 12rpx; } @@ -567,10 +568,10 @@ display: inline-block; width: 296rpx; height: 10.7vw; - background: #F9F9F9; + background: #fff; border-radius: 1.3vw; margin-right: 18rpx; - + border: 1rpx solid #C3C3C3; position: relative; .sl { diff --git a/pages/NursingNew/component/pleasetake/common/carditem.vue b/pages/NursingNew/component/pleasetake/common/carditem.vue index 4cae836..4fa0299 100644 --- a/pages/NursingNew/component/pleasetake/common/carditem.vue +++ b/pages/NursingNew/component/pleasetake/common/carditem.vue @@ -256,9 +256,9 @@ >view { width: 5vw; height: 2.3vw; - background: #E3EEF7; + background: #fff; border-radius: 1vw; - border: 1px solid rgba(3, 133, 250, 0.34); + border: 1px solid #1083F8; font-weight: 400; font-size: 1.25vw; color: #1083F8; @@ -281,30 +281,33 @@ } .msitem { - width: 11.5vw; + width: 24vw; height: 100%; position: absolute; top: 0; left: 15vw; + // background-color: blue; .msitem-item { - width: 25vw; - // background-color: red; + width: 24vw; margin-top: 10rpx; font-size: 33rpx; - white-space: nowrap; - /* 不换行 */ - overflow: hidden; - /* 超出隐藏 */ - text-overflow: ellipsis; - /* 显示 ... */ + display: flex; .msitem-item-left { + width: 190rpx; color: #777777; } .msitem-item-right { - margin-left: 10rpx; + display: inline-block; + /* 或 block，看你布局 */ + width: 400rpx; + /* 注意：要有固定宽度，max-width 有时不够稳 */ + // box-sizing: border-box; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } } @@ -385,7 +388,7 @@ width: 12vw; height: 12vw; // background: #fff; - + border-radius: 1.1vw; display: flex; justify-content: center; @@ -393,11 +396,11 @@ margin: 1.2vw auto 0; // padding: 0.3vw; // background-color: red; - + >image { width: 100%; height: 100%; - + } } } diff --git a/pages/NursingNew/component/pleasetake/common/htditem.vue b/pages/NursingNew/component/pleasetake/common/htditem.vue index 05b842f..197af1b 100644 --- a/pages/NursingNew/component/pleasetake/common/htditem.vue +++ b/pages/NursingNew/component/pleasetake/common/htditem.vue @@ -478,16 +478,16 @@ } .imge { - width: 8vw; - height: 8vw; + width: 7vw; + height: 7vw; // margin: 0.3vw auto 0.25vw; - margin-top: 0.8vw; - margin-bottom: 0.25vw; + margin-top: 2vw; + margin-bottom: 0.8vw; margin-left: 1.2vw; - background: #fff; - padding: 0.2vw; + background: red; + // padding: 0.2vw; // padding: 0.5vw; - // margin: 0.3vw auto 0.25vw; + // margin: 0.7vw auto 0.3vw; border-radius: 1.1vw; diff --git a/pages/NursingNew/component/pleasetake/component/requestform.vue b/pages/NursingNew/component/pleasetake/component/requestform.vue index 8c2a188..7e9467b 100644 --- a/pages/NursingNew/component/pleasetake/component/requestform.vue +++ b/pages/NursingNew/component/pleasetake/component/requestform.vue @@ -1266,9 +1266,9 @@ .bignomessage{ position: fixed; top: 8.5vh; - left: 9.4vw; - width: 89vw; - height: 89vh; + left: 9.2vw; + width: 89.5vw; + height: 89.6vh; z-index: 100; background-color: #fff; display: flex; diff --git a/pages/NursingNew/component/pleasetake/component/returnorder.vue b/pages/NursingNew/component/pleasetake/component/returnorder.vue index 32682f9..d8089bb 100644 --- a/pages/NursingNew/component/pleasetake/component/returnorder.vue +++ b/pages/NursingNew/component/pleasetake/component/returnorder.vue @@ -947,9 +947,9 @@ .bignomessage{ position: fixed; top: 8.5vh; - left: 9.4vw; - width: 89vw; - height: 89vh; + left: 9.2vw; + width: 89.5vw; + height: 89.5vh; z-index: 100; background-color: #fff; display: flex; diff --git a/pages/Warehouse/finish.vue b/pages/Warehouse/finish.vue index 0146663..5eea9c2 100644 --- a/pages/Warehouse/finish.vue +++ b/pages/Warehouse/finish.vue @@ -5,7 +5,7 @@ @click="moreindex=-1; topbuttontarget=-1;openjianhuo=false;opengaijia=false;opendata=false;opencgr=false;opengys=false;albumlist=[]"> - diff --git a/pages/Warehouse/index/component/index.vue b/pages/Warehouse/index/component/index.vue index ba98612..07c4d7d 100644 --- a/pages/Warehouse/index/component/index.vue +++ b/pages/Warehouse/index/component/index.vue @@ -578,9 +578,10 @@ display: flex; align-items: center; margin-left: 2vw; - font-size: 32rpx; + font-size: 34rpx; font-weight: 600; border-bottom: 1px solid #F2F2F2; + padding-top: 1vw; } .top-list { @@ -1297,7 +1298,7 @@ border-radius: 1.6vw; margin: 1.5vw 1.5vw 0 0vw; display: inline-block; - border: 1px solid #F8F8F8; + border: 1px solid transparent; text-align: center; overflow: hidden; @@ -1371,7 +1372,7 @@ .tittop { height: 2vw; font-weight: 400; - font-size: 35rpx; + font-size: 34rpx; color: #333333; display: flex; align-items: center; diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue index 77c86a1..2694448 100644 --- a/pages/Warehouse/picking.vue +++ b/pages/Warehouse/picking.vue @@ -4,7 +4,7 @@ :style="opencgr||opengys||opendata ?{background:`transparent`}:{}" @click="moreindex=-1; topbuttontarget=-1;openjianhuo=false;opengaijia=false;opendata=false;opencgr=false;opengys=false;albumlist=[]"> - diff --git a/pages/login/ceshi.nvue b/pages/login/ceshi.nvue new file mode 100644 index 0000000..69878bd --- /dev/null +++ b/pages/login/ceshi.nvue @@ -0,0 +1,199 @@ + + + + + \ No newline at end of file diff --git a/pages/login/newanimationpage.vue b/pages/login/newanimationpage.vue index c2b091d..af3fc2f 100644 --- a/pages/login/newanimationpage.vue +++ b/pages/login/newanimationpage.vue @@ -158,7 +158,7 @@ onShow(() => { setTimeout(() => { playall.value = true; - }, 1500) + }, 2000) zyupgrade.value?.check_update(); queryPadPageList().then((res => { diff --git a/pages/procurement/common/thitem.vue b/pages/procurement/common/thitem.vue index ba0584e..d3a22dd 100644 --- a/pages/procurement/common/thitem.vue +++ b/pages/procurement/common/thitem.vue @@ -236,9 +236,9 @@ >view { width: 4.5vw; height: 1.8vw; - background: #E3EEF7; + background: #fff; border-radius: 0.9vw; - border: 1px solid rgba(3, 133, 250, 0.34); + border: 1px solid #1083F8; font-weight: 400; font-size: 1.1vw; color: #1083F8; diff --git a/pages/procurement/common/toryitem.vue b/pages/procurement/common/toryitem.vue index bd312e2..6100201 100644 --- a/pages/procurement/common/toryitem.vue +++ b/pages/procurement/common/toryitem.vue @@ -71,7 +71,7 @@ - @@ -178,6 +178,11 @@ const valindex = ref(-1); const havezk = ref(false) + // 点击锁 + const secondlock = ref(false) + // 检测上一次点击 + const savelastvalue = ref(false) + const zhankai = (v, i) => { let s = Math.ceil((i + 1) / 3); @@ -186,11 +191,13 @@ } valindex.value = i; scrolltop.value = top.value; - // scrolltop.value = Math.ceil(i / 2) * 195; - // console.log("啥啊",i) v.zk = !v.zk; + savelastvalue.value = v.zk + if(savelastvalue.value && v.zk){ + secondlock.value = true; + } havezk.value = v.zk - // console.log("头疼啊",havezk.value) + if (v.zk) { if (props.pddType == '1') { uni.setStorageSync('valitem', v); } setTimeout(() => { @@ -344,7 +351,7 @@ return y <= (h * 1 / 2); } const isbottom = ref(false); - // const clicklock = ref(false) + const clicklock = ref(false) /** 事件处理示例 */ function onTap(e) { const top = isTopHalfApp(e); @@ -354,23 +361,24 @@ } if (havezk.value) { // console.log("top", top, clicklock.value) - // if (!clicklock.value) { - // if (!top) { - // isbottom.value = true - // // console.log("开启了") - // } else { - // isbottom.value = false - // } - // clicklock.value = true - // } - if (!top) { - isbottom.value = true - // console.log("开启了") - } else { - isbottom.value = false - } + if (!clicklock.value || secondlock.value ) { + if (!top) { + isbottom.value = true + // console.log("开启了") + } else { + isbottom.value = false + } + clicklock.value = true; + secondlock.value = false; + } + // if (!top) { + // isbottom.value = true + // // console.log("开启了") + // } else { + // isbottom.value = false + // } } else { - // clicklock.value = false + clicklock.value = false } // uni.showToast({ title: top ? '上半部分' : '下半部分', icon: 'none' }); @@ -591,13 +599,13 @@ text { font-weight: 400; - font-size: 0.7vw; + font-size: 1vw; color: #78B1EB; } image { - width: 2.3vw; - height: 2.3vw; + width: 2.8vw; + height: 2.8vw; } } @@ -613,8 +621,6 @@ width: 100%; padding-left: 2.4vw; } - - } .gray-bgc { @@ -622,7 +628,7 @@ width: 28vw; height: 12vw; border-radius: 2vw; - box-shadow: 0rpx 0rpx 5rpx 0rpx rgba(116, 141, 164, 0.22); + box-shadow: 0rpx 0rpx 5rpx 0rpx rgba(116, 141, 164, 0.6); position: absolute; bottom: 3.6vw; left: 1vw; @@ -668,7 +674,7 @@ border-radius: 1.3vw; border: 1px solid rgba(3, 133, 250, 0.34); right: 3.2vw; - top: 0vw; + top: 1vw; position: absolute; font-weight: 400; font-size: 1.4vw; @@ -890,7 +896,7 @@ justify-content: center; align-items: center; font-weight: 400; - font-size: 1.2vw; + font-size: 1vw; color: #555555; padding: 0 0.6vw; diff --git a/pages/procurement/common/torytor.vue b/pages/procurement/common/torytor.vue index 0782ab7..aa0bf2e 100644 --- a/pages/procurement/common/torytor.vue +++ b/pages/procurement/common/torytor.vue @@ -3,16 +3,16 @@ 数量 - + {{item}} - + - - + + @@ -20,16 +20,16 @@ - + - 同步 - + {{item}} @@ -62,7 +62,10 @@ }, pddType: { type: String - } + }, + // pz:{ + // // type: Boolean + // }, }); watch(() => props.show, () => { @@ -175,7 +178,7 @@ height: 16vw; justify-content: space-between; // background-color: red; - margin-top: -2vw; + margin-top: -1.5vw; .rigsbt { width: 19vw; @@ -196,7 +199,6 @@ display: flex; justify-content: center; align-items: center; - // background: url('/static/index/procurement/bt.png') no-repeat; background-color: #F3F5F9; border-radius: 30rpx; background-size: 100% 100%; @@ -219,6 +221,20 @@ width: 5vw; height: 4vw; } + .calculator-kuai-bad{ + display: flex; + justify-content: center; + align-items: center; + background-color: #F3F5F9; + color: #999; + border-radius: 30rpx; + background-size: 100% 100%; + font-size: 1.5vw; + font-weight: 500; + width: 5vw; + height: 4vw; + opacity: 0.6; + } } } @@ -245,9 +261,12 @@ height: 3.4vw; background: #F3F5F9; border-radius: 1vw; + // color: #999; + color: black; border: 1px solid #CBCFD0; justify-content: space-around; box-shadow: 0rpx 0.1vw 0.3vw 0rpx rgba(140, 143, 153, 0.17) inset; + opacity: 0.6; view { display: flex; @@ -259,10 +278,49 @@ height: 3.4vw; } } + .stringShow-kuai-bad { + display: flex; + align-items: center; + width: 9vw; + height: 3.4vw; + background: #F3F5F9; + border-radius: 1vw; + color: #999; + border: 1px solid #CBCFD0; + justify-content: space-around; + box-shadow: 0rpx 0.1vw 0.3vw 0rpx rgba(140, 143, 153, 0.17) inset; + opacity: 0.6; + + view { + display: flex; + justify-content: center; + align-items: center; + font-size: 1.7vw; + font-weight: 500; + width: 2.2vw; + height: 3.4vw; + } + } + .jiajian { display: flex; justify-content: space-between; + + .jj-bad{ + width: 4.2vw; + height: 4.2vw; + margin: 0 1vw; + display: flex; + justify-content: center; + align-items: center; + color: #999; + background: url('/static/index/procurement/bt.png') no-repeat; + background-size: 100% 100%; + border-radius: 25rpx; + font-size: 36rpx; + opacity: 0.6; + } .jj { width: 4.2vw; diff --git a/pages/procurement/components/Inventory.vue b/pages/procurement/components/Inventory.vue index a4e0be3..8f49df1 100644 --- a/pages/procurement/components/Inventory.vue +++ b/pages/procurement/components/Inventory.vue @@ -246,9 +246,9 @@ >view { width: 4.5vw; height: 1.8vw; - background: #E3EEF7; + background: #fff; border-radius: 0.9vw; - border: 1px solid rgba(3, 133, 250, 0.34); + border: 1px solid #1083F8; font-weight: 400; font-size: 1.1vw; color: #1083F8; diff --git a/pages/procurement/components/calculator.vue b/pages/procurement/components/calculator.vue index 0e231f0..b05c269 100644 --- a/pages/procurement/components/calculator.vue +++ b/pages/procurement/components/calculator.vue @@ -15,8 +15,7 @@ :style="`height: ${(gysarr && gysarr.length*8) || 0}vh`"> - {{v.name}} - + {{ v.name }} @@ -39,12 +38,13 @@ - + 采购数量 超过库存上限！ + - + - @@ -52,8 +52,8 @@ {{item}} - + + @@ -337,7 +337,7 @@ } else { console.log('无效状态（通常不会到这）'); } - + } const Interval = (e : number) => { @@ -398,8 +398,8 @@ height: 3.3vw; justify-content: space-between; align-items: center; - margin: 0.8vw 0; - + margin: 1.2vw 0; + margin-left: 1.1vw; background: #F3F5F9; border-radius: 1.1vw; padding: 0 1vw; @@ -526,8 +526,7 @@ >.tanchu { width: 26vw; - max-height: 35vh; - background: #FFFFFF; + // max-height: 35vh; box-shadow: 0rpx 0rpx 0.5vw 0rpx rgba(174, 175, 176, 0.35); border-radius: 1.1vw; padding: 0 1vw; @@ -535,6 +534,7 @@ left: 4vw; top: 6.5vw; z-index: 211; + background-color: #fff; .gysscrol { width: 100%; @@ -550,20 +550,14 @@ view { display: flex; - justify-content: space-between; align-items: center; - // justify-content: center; font-weight: 400; font-size: 1.5vw; color: #666666; - height: 8vh; - // margin-bottom: 1.2vw; - // padding-right: 1.5vw; + // height: 8vh; position: relative; - - &:nth-child(1) { - // margin-top: 1.2vw; - } + // padding: 0 30rpx; + margin: 20rpx 0; image { position: absolute; @@ -580,7 +574,7 @@ } .gssel { - width: 26vw; + width: 27vw; display: flex; height: 3.3vw; justify-content: space-between; @@ -611,28 +605,21 @@ overflow: hidden; text-overflow: ellipsis; font-weight: 400; - font-size: 1.6vw; + font-size: 1.5vw; color: #555555; line-height: 3.3vw; } } - .tlt { - font-weight: bold; - font-size: 1.5vw; - color: #333333; - padding-left: 3vw; - font-weight: 400; - margin-bottom: 30rpx; - } + } .plsbuy-contain { display: flex; align-items: center; flex-direction: column; - width: 34vw; - height: 95vh; + width: 33vw; + height: 91vh; background: rgba(250, 251, 252, 1); overflow: hidden; box-shadow: 0rpx 0rpx 1.6vw 0rpx rgba(136, 141, 153, 0.28); @@ -646,8 +633,8 @@ .plsbuy-bottom { - width: 75%; - margin-top: 3vw; + width: 90%; + margin-top: 0.5vw; height: 7vw; display: flex; justify-content: flex-end; @@ -667,26 +654,29 @@ } .quxiao { - min-width: 8vw; - height: 3.8vw; - background: #EDEDEF; - border-radius: 1.9vw; - padding: 0 2vw; - margin-left: 1vw; - border: 1px solid #EDEDEF; - font-size: 1.8vw; - font-weight: 400; + width: 160rpx; + height: 75rpx; + background-color: #ebeced; color: #888888; - white-space: nowrap; display: flex; justify-content: center; align-items: center; + font-size: 30rpx; + border-radius: 40rpx; } .plsbuy-bottom-blue { - background: linear-gradient(0deg, #CAE0F9, #E9F4FF); - border: 1px solid rgba(3, 133, 250, 0.34); + width: 160rpx; + height: 75rpx; color: #0385FA; + display: flex; + justify-content: center; + align-items: center; + font-size: 30rpx; + border-radius: 40rpx; + border: 1rpx solid #0385FA; + background: linear-gradient(to bottom, #E9F4FF, #CAE0F9); + margin: 0 40rpx; } } @@ -730,6 +720,7 @@ display: flex; align-items: center; justify-content: center; + margin-left: 0.8vw; .jj { width: 5vw; @@ -765,7 +756,8 @@ border-radius: 1vw; border: 1px solid #CBCFD0; justify-content: space-around; - box-shadow: 0rpx 0.1vw 0.3vw 0rpx rgba(140, 143, 153, 0.17) inset; + padding: 0 1vw; + // box-shadow: 0rpx 0.1vw 0.3vw 0rpx rgba(140, 143, 153, 0.17) inset; view { display: flex; @@ -800,4 +792,21 @@ -webkit-transform-style: preserve-3d; -webkit-overflow-scrolling: touch; } + + .tab-view { + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; + word-break: break-word; + } + + .tlt { + font-weight: bold; + font-size: 34rpx; + color: #333333; + padding-left: 3vw; + font-weight: 400; + margin-bottom: 30rpx; + } \ No newline at end of file diff --git a/pages/procurement/components/carditem.vue b/pages/procurement/components/carditem.vue index abb5530..e8ec737 100644 --- a/pages/procurement/components/carditem.vue +++ b/pages/procurement/components/carditem.vue @@ -269,9 +269,9 @@ >view { width: 5.5vw; height: 2.2vw; - background: #E3EEF7; + background: #fff; border-radius: 0.9vw; - border: 1px solid rgba(3, 133, 250, 0.34); + border: 1px solid #1083F8; font-weight: 400; font-size: 1.4vw; color: #1083F8; diff --git a/pages/procurement/components/carlist.vue b/pages/procurement/components/carlist.vue index fca020a..eed067c 100644 --- a/pages/procurement/components/carlist.vue +++ b/pages/procurement/components/carlist.vue @@ -48,23 +48,23 @@ 采购单位: {{v.wlUnits}} - - 供应商: {{v.suppliersName}} + + - {{v.kcsl?v.kcsl:'0'}} + {{v.kcsl?v.kcsl:'0'}} 库存数量 - + {{v.wlUpperLimit}} 物料上限 ↑ - + @@ -72,6 +72,10 @@ ↓ 物料下限 + + 供应商: {{v.suppliersName}} + + view { - // width: 33%; - // height: 100%; - // display: flex; - // flex-direction: column; - // position: relative; - // align-items: center; - - // border-right: 2rpx solid #c3c3c3; - // // background-color: blue; - // // border: 2rpx solid black; - - // // &:nth-child(1) { - // // text-align: center; - // // } - // &:nth-child(1) &:nth-child(2), - // &:nth-child(3), - // { - // border-right: 0; - // text-align: center; - // } + } + } + + &:nth-child(2), + &:nth-child(3), + &:nth-child(4), + &:nth-child(5), + &:nth-child(6), + + { + display: flex; + justify-content: space-between; + margin-bottom: 0.5vw; + + + text { + font-weight: 400; + font-size: 1.4vw; + color: #777777; + white-space: nowrap; + /* 不换行 */ + overflow: hidden; + /* 隐藏溢出部分 */ + text-overflow: ellipsis; + /* 显示省略号 */ + } + + + } + + &:nth-child(6) { + width: 25vw; + height: 1.6vw; + display: block !important; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + } + + &:nth-child(1) { + display: flex; + justify-content: space-between; + align-items: center; + height: 1.8vw; + margin-bottom: 1.2vw; + margin-top: 1.5vw; + + // margin-top: -0.4vw; + >view { + width: 19vw; + height: 2vw; + font-weight: 800; + font-size: 1.8vw; + color: #222222; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + } + + text { + width: 6vw; + font-weight: 400; + font-size: 1.4vw; + color: #222222; } } - - &:nth-child(2), - &:nth-child(3), - &:nth-child(4), - &:nth-child(5), - &:nth-child(6), - { - display: flex; - justify-content: space-between; - margin-bottom: 0.5vw; - - - text { - font-weight: 400; - font-size: 1.4vw; - color: #777777; - white-space: nowrap; - /* 不换行 */ - overflow: hidden; - /* 隐藏溢出部分 */ - text-overflow: ellipsis; - /* 显示省略号 */ - } - } - - &:nth-child(6) { - width: 25vw; - height: 1.6vw; - display: block !important; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; - } - - &:nth-child(1) { - display: flex; - justify-content: space-between; - align-items: center; - height: 1.8vw; - margin-bottom: 1.2vw; - margin-top: 1.5vw; - - // margin-top: -0.4vw; - >view { - width: 19vw; - height: 2vw; - font-weight: bold; - font-size: 1.8vw; - color: #222222; - text-overflow: ellipsis; - overflow: hidden; - white-space: nowrap; - } - - text { - width: 6vw; - font-weight: 400; - font-size: 1.4vw; - color: #222222; - } } } + + .gongyingshang { + margin-top: -10rpx; + width: 500rpx; /* 你原来的宽度 */ + font-size: 1.4vw; /* 建议不要用 vw 混用 */ + line-height: 1.2; /* 行高（数字形式也可以），用于计算 */ + color: #a9a9a9; + font-weight: 400; + + /* 多行省略核心 */ + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; + text-overflow: ellipsis; /* 单行兼容项 */ + + /* 兼容与保底 */ + word-break: break-word; + white-space: normal; /* 确保允许换行 */ + min-width: 0; /* 如果父容器是 flex 必需 */ + max-height: calc(1.4 * 2 * 1em); /* 额外保底（可选） */ } - // .spleft{ - // margin-left: -15vw !important; - // } .speitem { width: 17vw; height: 100%; display: inline-flex; flex-direction: column; - justify-content: center; + // justify-content: center; position: relative; - top: -4vw; + top: -8.2vw; // background-color: red; .cardp { @@ -519,7 +522,7 @@ padding-left: 1vw; height: 4vw; display: flex; - margin-top: 3vw; + // margin-top: 3vw; // flex-direction: column; // align-items: center; flex-wrap: wrap; @@ -556,6 +559,7 @@ align-items: center; } + &:nth-child(3) { max-width: 12vw; // color: red; diff --git a/pages/procurement/components/default.vue b/pages/procurement/components/default.vue index 562b0c2..51bb6c4 100644 --- a/pages/procurement/components/default.vue +++ b/pages/procurement/components/default.vue @@ -39,7 +39,7 @@ bottom: 0.5vw; left: 0; font-weight: 300; - font-size: 1.4vw; + font-size: 1.3vw; color: #555555; } } diff --git a/pages/procurement/components/details.vue b/pages/procurement/components/details.vue index 8f57c24..4fc2217 100644 --- a/pages/procurement/components/details.vue +++ b/pages/procurement/components/details.vue @@ -247,9 +247,9 @@ >view { width: 4.5vw; height: 1.8vw; - background: #E3EEF7; + background: #fff; border-radius: 0.9vw; - border: 1px solid rgba(3, 133, 250, 0.34); + border: 1px solid #1083F8; font-weight: 400; font-size: 1.1vw; color: #1083F8; diff --git a/pages/procurement/components/purorder.vue b/pages/procurement/components/purorder.vue index 3be3c03..b6462c0 100644 --- a/pages/procurement/components/purorder.vue +++ b/pages/procurement/components/purorder.vue @@ -248,19 +248,21 @@