Compare commits

...

2 Commits

Author SHA1 Message Date
Teng c4a809510a Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini 2025-11-26 15:36:46 +08:00
Teng a110dfed1a 合并 2025-11-26 15:36:38 +08:00
8 changed files with 352 additions and 327 deletions

View File

@ -104,7 +104,7 @@
{
"path": "pages/NursingNew/index",
"style": {
"navigationStyle": "custom",
"navigationStyle": "custom"
}
},

View File

@ -143,7 +143,8 @@
<view style="color: #888888;margin-top: 10rpx;white-space: nowrap;">
规格型号
</view>
<view style="margin-top: 5rpx;font-size: 34rpx;white-space: nowrap;display: flex;flex-wrap: nowrap;">
<view
style="margin-top: 5rpx;font-size: 34rpx;white-space: nowrap;display: flex;flex-wrap: nowrap;">
{{showvalue.wlSpecificationModel}}
</view>
</view>
@ -363,7 +364,16 @@
</text>
</view>
</view>
<view class="noarray" v-if="!jhdanarr.length">
<image class="noarray-img" src="/static/index/warehouse/procurement/picking/noarray.png"
mode="aspectFill" />
<view class="noarray-font">
暂无拣货照片
</view>
</view>
</scroll-view>
<scroll-view scroll-y="true" class="photowall-other" scroll-with-animation v-if="topbuttontarget==1">
<view class="photowall-other-one" v-for="(item,index) in suixingdanarr" :key="index"
@click="previewImage(item,index,suixingdanarr,1)">
@ -512,11 +522,12 @@
<view class="left-menu-father">
<scroll-view scroll-y="true" scroll-with-animation class="left-menu-scroll" :scroll-top="leftscrolltop"
@scrolltolower="plsbuytolower" :lower-threshold="400">
<view class="pls-card" v-for="(v,i) in plsbuy" :key='i' @click="clickLeftMenu(i,v)"
:style="{borderColor: i==lefttarget? ``:`#fff` }">
<view class="pls-card" v-for="(v,i) in plsbuy" :key='i' @click="clickLeftMenu(i,v)" :style="{
borderColor: i === lefttarget ? '' : 'transparent',
background: i === lefttarget ? '#fff' : 'rgba(255,255,255,0.6)'
}">
<text style="display: block;background: #ff5757;
position: absolute;width: 1.3vw;height: 1.3vw;border-radius: 50%;right: -0.1vw;top: -0.1vw;"
v-if="v.izNew=='Y'">
position: absolute;width: 1.3vw;height: 1.3vw;border-radius: 50%;right: -0.1vw;top: -0.1vw;" v-if="v.izNew=='Y'">
</text>
<view class="pls-card-title">
<view class="title-left">
@ -534,21 +545,17 @@
</view>
</view>
<view class="pls-card-middle">
<view class="middle-heng"></view>
<view class="pls-card-middle-one">
<view class="middle-title">
{{ v.qgDate }}
</view>
<view class="middle-heng-father">
<view class="middle-heng"
style="border-top-left-radius: 20rpx;border-bottom-left-radius: 20rpx;"></view>
<view class="middle-heng" style="border-radius: 20rpx;background-color: #1083F8;">
</view>
<view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view>
<image class="middle-ball-img" src="/static/index/requestform/isok.png" />
</view>
<view class="end-font">
<view class="" :style="{color: `#1083F8`}">
<view>
采购
</view>
<view style="font-size: 25rpx;">
@ -561,29 +568,16 @@
{{ v.jhTime?.slice(0,10) }}
</view>
<view class="middle-heng-father">
<view class="middle-heng"></view>
<view class="middle-heng" v-if="Number(v.status)>=1"
style="border-radius: 20rpx;background-color: #1083F8;width: 105%;margin-left: -5%;">
</view>
<view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view>
<view class="middle-ball"
:style="Number(v.status)>=1?{backgroundColor: `#1083F8`}:{} ">
</view>
<!-- <view class="middle-ball"
:style="Number(v.status)>=1?{backgroundColor: `#1083F8`}:{} ">
</view> -->
<view class="middle-ball" v-if="Number(v.status)<1"></view>
<image class="middle-ball-img" v-else src="/static/index/requestform/isok.png" />
</view>
<view class="end-font">
<!-- <view class=""
:style="Number(v.status)<3 && Number(v.status)>0?{color: `#1083F8`}:{} ">
拣货
</view> -->
<view class="" :style="Number(v.status)>=1?{color: `#1083F8`}:{}">
<view>
拣货
</view>
<view style="font-size: 25rpx;" v-if="Number(v.status)>=1 && v.jhBy">
<view style="font-size: 25rpx;" v-if=" v.jhBy">
{{ "[ " + v.jhBy + " ]" }}
</view>
</view>
@ -594,22 +588,18 @@
</view>
<view class="middle-heng-father">
<view class="middle-heng"
style="border-top-right-radius: 20rpx;border-bottom-right-radius: 20rpx;">
</view>
<view class="middle-heng" v-if="Number(v.status)>=2"
style="border-radius: 20rpx;background-color: #1083F8;width: 105%;margin-left: -5%;">
</view>
<view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view>
<!-- <view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view> -->
<view class="middle-ball"
:style="Number(v.status)>=2?{backgroundColor: `#1083F8`}:{} ">
</view>
:style="{backgroundColor: Number(v.status)==1? ``:`#E5E5E5`}"
v-if="Number(v.status)!=2"></view>
<image class="middle-ball-img" v-else src="/static/index/requestform/isok.png" />
</view>
<view class="end-font">
<view :style="Number(v.status)>=2?{color: `#1083F8`}:{}">
<view>
完结
</view>
<view style="font-size: 25rpx;" v-if="Number(v.status)>=2 && v.wjBy">
<view style="font-size: 25rpx;" v-if=" v.wjBy">
{{ "[ " + v.wjBy + " ]" }}
</view>
</view>
@ -1382,6 +1372,7 @@
const nomessageshow = ref(false);
const firstgetqueryCgdList = () => {
queryCgdList(plzinfo).then((res : any) => {
plsbuy.value.push(...res.result.records)
alltotal.value = res.result.total
if (!res.result.total) {
@ -2005,7 +1996,7 @@
const textStyle = computed(() => ({
color: segColors.value[0] || rgbToHex(from),
fontSize: '30rpx',
fontWeight: '500',
fontWeight: '600',
zIndex: 3
}));
@ -2180,9 +2171,9 @@
height: 5.5vh;
border-radius: 40rpx;
font-size: 28rpx;
background-color: #DFF4FC;
background-color: #fff;
border: 1rpx solid #0da6f8;
color: #1083F8;
color: #0da6f8;
display: flex;
justify-content: center;
align-items: center;
@ -2259,9 +2250,9 @@
height: 4vh;
border-radius: 40rpx;
font-size: 28rpx;
background-color: #DFF4FC;
background-color: #fff;
border: 1rpx solid #0da6f8;
color: #1083F8;
color: #0da6f8;
display: flex;
justify-content: center;
align-items: center;
@ -2327,8 +2318,23 @@
width: 100%;
height: 11vh;
margin-top: 1vh;
// background-color: blue;
display: flex;
position: relative;
.middle-heng {
position: absolute;
left: 4%;
top: 35%;
transform: translateY(-35%);
width: 92%;
height: 2px;
/* 虚线粗细 */
background-image: repeating-linear-gradient(to right,
#E5E5E5 0,
#E5E5E5 6px,
transparent 6px,
transparent 10px);
}
.pls-card-middle-one {
width: 33.3%;
@ -2350,21 +2356,19 @@
height: 4vh;
position: relative;
.middle-heng {
width: 100%;
height: 0.8vh;
.middle-ball-img {
width: 35rpx;
height: 35rpx;
position: absolute;
left: 0;
top: 50%;
transform: translateY(-50%);
background-color: #EEEEEE;
left: 50%;
transform: translate(-50%, -50%);
}
.middle-ball {
width: 30rpx;
height: 30rpx;
background-color: #EEEEEE;
width: 20rpx;
height: 20rpx;
background-color: #1083F8;
position: absolute;
top: 50%;
left: 50%;
@ -2754,8 +2758,8 @@
}
.title-input-img {
width: 50rpx;
height: 50rpx;
width: 35rpx;
height: 35rpx;
position: absolute;
right: 220rpx;
top: 50%;
@ -3423,4 +3427,24 @@
-webkit-transform-style: preserve-3d;
-webkit-overflow-scrolling: touch;
}
.noarray {
width: 90%;
height: 100%;
// background-color: red;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
.noarray-img {
margin-top: -200rpx;
width: 400rpx;
height: 400rpx;
}
.noarray-font{
margin-top: -70rpx;
color: #888888;
}
}
</style>

View File

@ -170,7 +170,7 @@
},
cgdId: {
type: String,
default: 0
default: ""
}
})
watch(

View File

@ -23,23 +23,16 @@
</view>
</view>
<view class="pls-card-middle">
<view class="middle-heng"></view>
<view class="pls-card-middle-one">
<view class="middle-title">
{{v.qgDate}}
</view>
<view class="middle-heng-father">
<view class="middle-heng"
style="border-top-left-radius: 20rpx;border-bottom-left-radius: 20rpx;"></view>
<view class="middle-heng" style="border-radius: 20rpx;background-color: #1083F8;">
</view>
<!-- <view class="middle-heng" v-if="Number(v.status)<3 "
style="border-radius: 20rpx;background-color: #1083F8;"></view> -->
<view class="middle-ball"
:style="Number(v.status)<3?{backgroundColor: `#1083F8`}:{} "></view>
<!-- <view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view> -->
<image class="middle-ball-img" src="/static/index/requestform/isok.png" />
</view>
<view class="end-font">
<view :style="Number(v.status)<3?{color: `#1083F8`}:{} ">
<view>
采购
</view>
<view style="font-size: 25rpx;">
@ -53,27 +46,14 @@
</view>
<view class="middle-heng-father">
<view class="middle-heng"></view>
<!-- <view class="middle-heng"
style="border-radius: 20rpx;background-color: #1083F8;width: 105%;margin-left: -5%;">
</view> -->
<view class="middle-heng" v-if="Number(v.status)==1 "
style="border-radius: 20rpx;background-color: #1083F8;width: 105%;margin-left: -5%;">
</view>
<view class="middle-ball"
:style="Number(v.status)==1 ?{backgroundColor: `#1083F8`}:{} ">
</view>
<!-- <view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view> -->
<view class="middle-ball"
:style="Number(v.status)==1 ?{backgroundColor: `#1083F8`}:{} ">
</view>
<view class="middle-ball" style="background-color: #1083F8;"></view>
</view>
<view class="end-font">
<!-- <view class=""
:style="Number(v.status)<3 && Number(v.status)>0?{color: `#1083F8`}:{} ">
拣货
</view> -->
<view class="" :style="Number(v.status)==1 ?{color: `#1083F8`}:{}">
<view>
拣货
</view>
<view style="font-size: 25rpx;" v-if="Number(v.status)==1 ">
@ -86,24 +66,15 @@
{{v.wjTime}}
</view>
<view class="middle-heng-father">
<view class="middle-heng"
style="border-top-right-radius: 20rpx;border-bottom-right-radius: 20rpx;">
</view>
<view class="middle-heng" v-if="Number(v.status)<3 && Number(v.status)>1 "
style="border-radius: 20rpx;background-color: #1083F8;width: 105%;margin-left: -5%;">
</view>
<view class="middle-ball"
:style="Number(v.status)<3 && Number(v.status)>1?{backgroundColor: `#1083F8`}:{} ">
</view>
<view class="middle-ball"></view>
</view>
<view class="end-font">
<view class=""
:style="Number(v.status)<3 && Number(v.status)>1?{color: `#1083F8`}:{} ">
<view>
完结
</view>
<view style="font-size: 25rpx;" v-if="Number(v.status)==2 ">
<!-- <view style="font-size: 25rpx;" v-if="Number(v.status)==2 ">
[ {{v.wjTime}} ]
</view>
</view> -->
</view>
</view>
</view>
@ -129,7 +100,8 @@
</scroll-view>
</view>
<view class="rigitem">
<scroll-view scroll-y="true" class="crdcroll" scroll-with-animation enable-back-to-top @scroll="scroll" :scroll-top="scrolltoplist">
<scroll-view scroll-y="true" class="crdcroll" scroll-with-animation enable-back-to-top @scroll="scroll"
:scroll-top="scrolltoplist">
<view style="height:2vw;"></view>
<view class="fler" v-for="(v,index) in generatedOrder[lefttarget]?.cgdInfoList" :key="index">
<view class="speitem guodu">
@ -152,7 +124,8 @@
<text style="white-space: nowrap;"> 规格型号: {{v.wlSpecificationModel}}</text>
</view>
<view>
<text>采购单价: {{v.arrivalPrice?Number(v.arrivalPrice).toFixed(2) : Number(v.procurementPrice).toFixed(2) }}</text>
<text>采购单价:
{{v.arrivalPrice?Number(v.arrivalPrice).toFixed(2) : Number(v.procurementPrice).toFixed(2) }}</text>
<text>采购单位: {{v.wlUnits}}</text>
</view>
<view></view>
@ -273,7 +246,6 @@
})
}
</script>
<style scoped lang="less">
@ -283,17 +255,20 @@
display: flex;
justify-content: flex-end;
align-items: center;
.gb {
width: 10vw;
background: #EDEDEF;
color: #888888;
}
.scsgd {
width: 12vw;
background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
border: 1px solid rgba(3, 133, 250, 0.34);
color: #0385FA;
}
view {
display: flex;
justify-content: center;
@ -305,6 +280,7 @@
height: 3.8vw;
}
}
.purbox {
width: 83vw;
height: 90vh;
@ -317,11 +293,13 @@
z-index: 133;
display: flex;
overflow: hidden;
.lfitem {
width: 33vw;
height: 100%;
background: #EFF0F4;
}
.rigitem {
width: 50vw;
height: 100%;
@ -332,9 +310,11 @@
width: 100%;
height: calc(90vh - 7vw);
}
.actve {
border: 2px solid #1083F8 !important;
}
.fler {
width: 47vw;
height: 15.5vw;
@ -370,6 +350,7 @@
justify-content: space-between;
position: relative;
left: 0;
>view {
width: 25%;
height: 100%;
@ -383,7 +364,9 @@
}
&:nth-child(2),&:nth-child(3),&:nth-child(4) {
&:nth-child(2),
&:nth-child(3),
&:nth-child(4) {
text-align: center;
}
@ -408,12 +391,14 @@
&:nth-child(4) {
display: flex;
justify-content: space-between;
text {
font-weight: 400;
font-size: 1.4vw;
color: #777777;
}
}
&:nth-child(1) {
width: 28vw;
display: flex;
@ -423,6 +408,7 @@
margin-top: 1vw;
white-space: nowrap;
flex: auto;
>view {
width: 13vw;
height: 2vw;
@ -441,6 +427,7 @@
color: #222222;
white-space: nowrap;
text-align: right;
.q {
color: #555555;
font-size: 1.6vw;
@ -462,6 +449,7 @@
display: flex;
flex-direction: column;
position: relative;
.cardp {
width: 12.5vw;
height: 4vw;
@ -469,6 +457,7 @@
flex-wrap: wrap;
margin: 0vw auto 0;
align-items: center;
view {
width: 5.5vw;
height: 1.8vw;
@ -499,6 +488,7 @@
.left-menu-scroll {
height: 100%;
width: 100%;
.pls-card {
width: 30vw;
height: 16.5vw;
@ -546,9 +536,25 @@
width: 100%;
height: 11vh;
margin-top: 1vw;
// background-color: blue;
position: relative;
display: flex;
.middle-heng {
position: absolute;
left: 4%;
top: 35%;
transform: translateY(-35%);
width: 92%;
height: 2px;
/* 虚线粗细 */
background-image: repeating-linear-gradient(to right,
#E5E5E5 0,
#E5E5E5 6px,
transparent 6px,
transparent 10px);
}
.pls-card-middle-one {
width: 33.3%;
height: 100%;
@ -568,15 +574,13 @@
height: 4vh;
position: relative;
.middle-heng {
width: 100%;
height: 0.8vh;
.middle-ball-img {
width: 35rpx;
height: 35rpx;
position: absolute;
left: 0;
top: 50%;
transform: translateY(-50%);
background-color: #EEEEEE;
left: 50%;
transform: translate(-50%, -50%);
}
.middle-ball {
@ -664,6 +668,7 @@
}
}
}
.guodu {
transition: .4s;
-webkit-transform-style: preserve-3d;

View File

@ -297,8 +297,8 @@
height: 3.3vw;
image {
width: 2.2vw;
height: 2.2vw;
width: 1.8vw;
height: 1.8vw;
margin:0 0.5vw;
}

View File

@ -14,8 +14,10 @@
<view class="left-menu-father">
<scroll-view scroll-y="true" scroll-with-animation class="left-menu-scroll" :scroll-top="leftscrolltop"
@scrolltolower="plsbuytolower" :lower-threshold="400">
<view class="pls-card" v-for="(v,i) in plsbuy" :key='i' @click="clickLeftMenu(i,v)"
:style="{borderColor: i==lefttarget? ``:`#fff` }">
<view class="pls-card" v-for="(v,i) in plsbuy" :key='i' @click="clickLeftMenu(i,v)" :style="{
borderColor: i === lefttarget ? '' : 'transparent',
background: i === lefttarget ? '#fff' : 'rgba(255,255,255,0.6)'
}">
<view v-if="moreindex==i" class="more-father">
<view class="more-one" @click="share">
@ -46,27 +48,18 @@
</view>
</view>
<view class="pls-card-middle">
<view class="middle-heng"></view>
<view class="pls-card-middle-one">
<view class="middle-title">
{{ v.qgDate }}
</view>
<view class="middle-heng-father">
<view class="middle-heng"
style="border-top-left-radius: 20rpx;border-bottom-left-radius: 20rpx;"></view>
<view class="middle-heng" style="border-radius: 20rpx;background-color: #1083F8;">
</view>
<!-- <view class="middle-heng" v-if="Number(v.status)<3 "
style="border-radius: 20rpx;background-color: #1083F8;"></view> -->
<!-- <view class="middle-ball"
:style="Number(v.status)<3?{backgroundColor: `#1083F8`}:{} "></view> -->
<view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view>
<image class="middle-ball-img" src="/static/index/requestform/isok.png" />
</view>
<view class="end-font">
<!-- <view class="" :style="Number(v.status)<3?{color: `#1083F8`}:{} ">
采购
</view> -->
<view class="" :style="{color: `#1083F8`}">
采购
<view>
采购{{ Number(v.status) }}
</view>
<view style="font-size: 25rpx;">
{{ "[ " + v.qgBy + " ]" }}
@ -78,24 +71,17 @@
{{ v.jhTime?.slice(0,10) }}
</view>
<view class="middle-heng-father">
<view class="middle-heng"></view>
<!-- <view class="middle-heng"
style="border-radius: 20rpx;background-color: #1083F8;width: 105%;margin-left: -5%;">
</view> -->
<view class="middle-heng" v-if="Number(v.status)>0"
style="border-radius: 20rpx;background-color: #1083F8;width: 105%;margin-left: -5%;">
</view>
<view class="middle-ball"
:style="Number(v.status)>0?{backgroundColor: `#1083F8`}:{} ">
</view>
<!-- <view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view> -->
<view class="middle-ball"
:style="Number(v.status)>0?{backgroundColor: `#1083F8`}:{} ">
</view>
<view class="middle-ball" style="background-color: #1083F8;"
:style=" v?.cgdType=='9' ?{backgroundColor:`#FF5757`}:{}"
v-if="Number(v.status)<1"></view>
<image class="middle-ball-img" v-else src="/static/index/requestform/isok.png" />
</view>
<view class="end-font">
<view class="" :style="Number(v.status)>0?{color: `#1083F8`}:{}">
拣货
<view :style=" v?.cgdType=='9' ?{color:`#FF5757`}:{}">
{{ v?.cgdType=='9' ?`已作废`:`拣货` }}
</view>
<view style="font-size: 25rpx;" v-if="Number(v.status)>0 && v.jhBy ">
{{ "[ " + v.jhBy + " ]" }}
@ -107,23 +93,15 @@
{{ v.wjTime?.slice(0,10) }}
</view>
<view class="middle-heng-father">
<view class="middle-heng"></view>
<!-- <view class="middle-heng"
style="border-radius: 20rpx;background-color: #1083F8;width: 105%;margin-left: -5%;">
</view> -->
<view class="middle-heng" v-if="Number(v.status)>1"
style="border-radius: 20rpx;background-color: #1083F8;width: 105%;margin-left: -5%;">
</view>
<view class="middle-ball"
:style="Number(v.status)>1?{backgroundColor: `#1083F8`}:{} ">
</view>
<!-- <view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view> -->
<view class="middle-ball"
:style="Number(v.status)>1?{backgroundColor: `#1083F8`}:{} ">
</view>
<view class="middle-ball" :style="Number(v.status)==1?{backgroundColor: `#1083F8`}:{} "
v-if="Number(v.status)<2"></view>
<image class="middle-ball-img" v-else src="/static/index/requestform/isok.png" />
</view>
<view class="end-font">
<view class="" :style="Number(v.status)>1?{color: `#1083F8`}:{}">
<view>
完结
</view>
<view style="font-size: 25rpx;" v-if="Number(v.status)>1 && v.wjBy ">
@ -196,7 +174,8 @@
<view class="right-title">
{{ v.wlName }}
</view>
<view class="right-middle" style="white-space: nowrap;text-overflow:ellipsis;overflow: hidden;">
<view class="right-middle"
style="white-space: nowrap;text-overflow:ellipsis;overflow: hidden;">
{{ v.wlSpecificationModel }}
</view>
<view style="color: #888888;">
@ -830,9 +809,25 @@
width: 100%;
height: 11vh;
margin-top: 1vh;
// background-color: blue;
position: relative;
display: flex;
.middle-heng {
position: absolute;
left: 4%;
top: 35%;
transform: translateY(-35%);
width: 92%;
height: 2px;
/* 虚线粗细 */
background-image: repeating-linear-gradient(to right,
#E5E5E5 0,
#E5E5E5 6px,
transparent 6px,
transparent 10px);
}
.pls-card-middle-one {
width: 33.3%;
height: 100%;
@ -852,20 +847,18 @@
height: 4vh;
position: relative;
.middle-heng {
width: 100%;
height: 1vh;
.middle-ball-img {
width: 35rpx;
height: 35rpx;
position: absolute;
left: 0;
top: 50%;
transform: translateY(-50%);
background-color: #EEEEEE;
left: 50%;
transform: translate(-50%, -50%);
}
.middle-ball {
width: 30rpx;
height: 30rpx;
width: 20rpx;
height: 20rpx;
background-color: #EEEEEE;
position: absolute;
top: 50%;
@ -927,6 +920,7 @@
justify-content: center;
background-color: #FDEBEC;
color: #FF5757;
border: 1rpx solid #FF5757;
position: absolute;
right: -5rpx;
bottom: 20rpx;
@ -940,6 +934,7 @@
align-items: center;
justify-content: center;
background-color: #ECF6FF;
border: 1rpx solid #0385FA;
color: #1083F8;
position: absolute;
right: -5rpx;
@ -1157,6 +1152,7 @@
position: relative;
white-space: nowrap;
flex-wrap: nowrap;
.gray-text {
color: #999999;
margin-bottom: 3rpx;
@ -1184,8 +1180,8 @@
}
.title-input-img {
width: 50rpx;
height: 50rpx;
width: 35rpx;
height: 35rpx;
position: absolute;
right: 150rpx;
top: 50%;

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB