合并代码

This commit is contained in:
Teng 2026-02-06 17:24:51 +08:00
parent d736479c6e
commit bda0132983
157 changed files with 1067 additions and 582 deletions

View File

@ -2,8 +2,8 @@
"name" : "护理单元", "name" : "护理单元",
"appid" : "__UNI__FB2D473", "appid" : "__UNI__FB2D473",
"description" : "护理单元", "description" : "护理单元",
"versionName" : "1.0.031", "versionName" : "1.0.033",
"versionCode" : 10031, "versionCode" : 10033,
"transformPx" : false, "transformPx" : false,
/* 5+App */ /* 5+App */
"app-plus" : { "app-plus" : {

View File

@ -1499,6 +1499,7 @@
height: 100%; height: 100%;
transition: opacity 1s ease; transition: opacity 1s ease;
position: relative; position: relative;
margin-left: 3vw;
.index-father { .index-father {
width: 100%; width: 100%;

View File

@ -898,7 +898,8 @@
height: 100%; height: 100%;
transition: opacity 0.4s ease; transition: opacity 0.4s ease;
position: relative; position: relative;
margin-left: -1.5vw; // margin-left: -1.5vw;
margin-left: 1.5vw;
} }
.right-container-title-nav { .right-container-title-nav {

View File

@ -126,7 +126,7 @@
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
padding: 2.3vw 0 1vw 0; padding: 2.3vw 0 1vw 0;
margin-right: 3vw; // margin-right: 3vw;
.logo{ .logo{
width: 3.8vw; width: 3.8vw;
display: flex; display: flex;

View File

@ -104,7 +104,7 @@
height: 100vh; height: 100vh;
transition: opacity 1s ease; transition: opacity 1s ease;
position: relative; position: relative;
margin-left: -50rpx; margin-left: 10rpx;
.joystick { .joystick {
position: absolute; position: absolute;

View File

@ -127,7 +127,8 @@
height: 100vh; height: 100vh;
transition: opacity 1s ease; transition: opacity 1s ease;
position: relative; position: relative;
margin-left: -50rpx; /* margin-left: -50rpx; */
margin-left: 0.5vw;
.joystick { .joystick {
position: absolute; position: absolute;

View File

@ -1,6 +1,52 @@
<template> <template>
<view> <view>
<view class="kcyj"> <view class="warhouse-warning" @click="backmoreopen=false">
<view class="warning-title">
<view class="title-left">
<view class="blue-shu"></view>
<view class="blue-font">
请领物料
</view>
</view>
<view class="more-view">
<image src="/static/backmore.png" mode="aspectFill" class="more" v-if="Material.length"
@click.stop="backmoreopen=!backmoreopen"></image>
<image src="/static/nobackmore.png" mode="aspectFill" v-else class="more" ></image>
<view class="more-view-button" @click.stop v-show="backmoreopen">
<view class="more-whitebutton" @click="moredex = moredex==1?0:1;backmoreopen=false ">
批量移除
</view>
<view class="more-whitebutton" @click="moredex=2;backmoreopen=false ">
清空列表
</view>
<view class="more-whitebutton" @click="moredex=3;emit('submit');backmoreopen=false">
提交请领单
</view>
<view class="triangle">
<view class="triangle-small"></view>
</view>
</view>
</view>
</view>
<view class="warning-other">
<scroll-view scroll-x="true" class="kcscrol guodu" scroll-with-animation>
<view class="yjbox" v-for="(v,i) in Material" :key="i">
<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill"></image>
<view>{{v.materialInfo?.materialName}}</view>
<view class="zhanwei" v-if="moredex==1" @click.stop="del(v)">
<view>-</view>
</view>
</view>
<defaultr cont="暂无数据" v-if="Material.length==0&&timeout"
style="position: absolute;width: 10vw;height: 10vw;left: 0%;"></defaultr>
</scroll-view>
</view>
</view>
<!-- <view class="kcyj">
<view class="kjlt"> <view class="kjlt">
请领物料 请领物料
<view class="mhao" v-if="Material.length>0"> <view class="mhao" v-if="Material.length>0">
@ -26,8 +72,6 @@
<image src="/static/index/procurement/que.png" mode="aspectFill"></image> <image src="/static/index/procurement/que.png" mode="aspectFill"></image>
<view>暂无数据</view> <view>暂无数据</view>
</view> </view>
<!-- <defaultr cont="暂无数据" v-if="Material.length==0&&timeout"
style="position: absolute;width: 10vw;height: 10vw;"></defaultr> -->
</scroll-view> </scroll-view>
<view class="kjlt more guodu" :style="qb?'width:15vw':'' " @touchstart="ts" @touchmove="canmove" <view class="kjlt more guodu" :style="qb?'width:15vw':'' " @touchstart="ts" @touchmove="canmove"
> >
@ -55,7 +99,7 @@
提交请领单 提交请领单
</view> </view>
</view> </view>
</view> </view> -->
<tanchuang @back="moredex = 0" :show="moredex==2" font="确定将本次请领清单中的所有物料都移除吗?" @right="delall"></tanchuang> <tanchuang @back="moredex = 0" :show="moredex==2" font="确定将本次请领清单中的所有物料都移除吗?" @right="delall"></tanchuang>
</view> </view>
</template> </template>
@ -74,14 +118,17 @@
const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/') const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
const qb = ref(true) const qb = ref(true)
const moredex = ref(0) const moredex = ref(0)
const backmoreopen = ref(false)
watch(() => props.Material, watch(() => props.Material,
() => { () => {
if (props.Material.length == 0) { if (props.Material.length == 0) {
qb.value = false; qb.value = false;
moredex.value = 0; moredex.value = 0;
} }
if(props.Material.length == 1) { if (props.Material.length == 1) {
if(!qb.value){ if (!qb.value) {
qb.value = true; qb.value = true;
} }
} }
@ -163,194 +210,422 @@
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.kcyj { // .kcyj {
width: 100%; // width: 100%;
height: 10vw; // height: 10vw;
display: flex; // display: flex;
margin-top: 1vw; // margin-top: 1vw;
position: relative; // position: relative;
.kjlt { // .kjlt {
width: 3.2vw; // width: 3.2vw;
height: 10vw; // height: 10vw;
background: rgba(255, 255, 255, 0.5); // background: rgba(255, 255, 255, 0.5);
border-radius: 1.1vw; // border-radius: 1.1vw;
writing-mode: vertical-rl; // writing-mode: vertical-rl;
align-items: center; // align-items: center;
// display: flex;
// justify-content: center;
// letter-spacing: 3px;
// font-size: 1.5vw;
// position: relative;
// z-index: 10;
// .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; /* = */
// }
// }
// }
// .more {
// margin-left: 0.6vw;
// position: relative;
// background: RGBA(239, 240, 244, 0);
// .righ0 {
// right: 0 !important;
// }
// view {
// writing-mode: vertical-rl;
// align-items: center;
// display: flex;
// justify-content: center;
// letter-spacing: 3px;
// width: 3.2vw;
// height: 10vw;
// position: absolute;
// top: 0;
// border-radius: 1.1vw;
// font-size: 1.4vw;
// color: #888888;
// background: #fff;
// &:nth-child(1) {
// letter-spacing: 6px;
// padding-top: 2vw;
// z-index: 5;
// image {
// width: 1.6vw;
// height: 1.6vw;
// margin-top: 10px;
// }
// }
// &:nth-child(2) {
// right: 3.9vw;
// z-index: 3;
// }
// &:nth-child(3) {
// right: 7.7vw;
// z-index: 2;
// }
// &:nth-child(4) {
// right: 11.6vw;
// z-index: 2;
// }
// }
// .avt {
// background: rgba(85, 166, 249, 1);
// color: #FFFFFF;
// }
// }
// .kcscrol {
// width: calc(100% - 10vw);
// height: 10vw;
// white-space: nowrap;
// margin-left: 0.6vw;
// position: relative;
// z-index: 9;
// .yjbox {
// display: inline-block;
// width: 12vw;
// height: 10vw;
// background: rgba(255, 255, 255, 0.5);
// border-radius: 1.1vw;
// margin-right: 0.8vw;
// position: relative;
// .zhanwei {
// width: 100%;
// height: 100%;
// position: absolute;
// top: 0;
// left: 0;
// z-index: 200;
// view {
// position: absolute;
// width: 2.2vw;
// height: 2.2vw;
// display: flex;
// top: 0;
// left: 0;
// right: 0;
// bottom: 0;
// margin: auto;
// border-radius: 50%;
// border: 2px solid rgba(255, 78, 78, 1);
// display: flex;
// justify-content: center;
// align-items: center;
// font-size: 3vw;
// color: rgba(255, 78, 78, 1);
// }
// }
// .ytj {
// min-width: 1.5vw;
// height: 1.8vw;
// background: #E3EEF7;
// border-radius: 0.9vw;
// border: 1px solid rgba(3, 133, 250, 0.34);
// font-weight: 400;
// font-size: 1.1vw;
// color: #1083F8;
// text-align: center;
// line-height: 1.75vw;
// position: absolute;
// padding: 0 0.8vw;
// top: 0.8vw;
// right: 0.8vw;
// }
// image {
// width: 7vw;
// height: 7vw;
// margin: 0.5vw auto 0.5vw;
// display: block;
// border-radius: 1vw;
// }
// >view {
// width: 100%;
// height: 1.4vw;
// font-weight: 400;
// font-size: 1.3vw;
// color: #212327;
// white-space: nowrap;
// text-overflow: ellipsis;
// overflow: hidden;
// padding: 0 1vw;
// text-align: center;
// }
// }
// }
// }
// .guodu {
// transition: .4s;
// -webkit-transform-style: preserve-3d;
// -webkit-overflow-scrolling: touch;
// }
// .que{
// width: 16vw;
// height: 16vw;
// position: fixed;
// top: 0;
// left: 0;
// width: 77.5vw;
// height: 10vw;
// background: rgba(245, 246, 248, 1);
// display: flex;
// justify-content: center;
// align-items: center;
// border-radius: 20rpx;
// image{
// width: 12vw;
// height: 12vw;
// }
// view{
// width: 12vw;
// text-align: center;
// position: absolute;
// bottom: 0.5vw;
// left: 50%;
// transform: translateX(-50%);
// font-weight: 300;
// font-size: 1.4vw;
// color: #555555;
// }
// }
.warhouse-warning {
margin-top: 12rpx;
margin-left: 5rpx;
width: 98%;
height: 330rpx;
background-color: #fff;
border-radius: 35rpx;
.warning-title {
width: 100%;
height: 80rpx;
display: flex; display: flex;
justify-content: center; justify-content: space-between;
letter-spacing: 3px; align-items: center;
font-size: 1.5vw;
position: relative;
z-index: 10;
.mhao { .title-left {
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; display: flex;
align-items: center; align-items: center;
justify-content: center;
background: transparent;
writing-mode: horizontal-tb;
overflow: hidden;
.mhao-font{
font-size: 25rpx;
letter-spacing: -0.05em; /* 负值 = 字符之间更近 */
}
}
}
.more { .blue-shu {
margin-left: 0.6vw; background-color: #0089FE;
position: relative; width: 8.5rpx;
background: RGBA(239, 240, 244, 0); height: 25rpx;
border-radius: 8rpx;
margin-left: 32rpx;
.righ0 { margin-right: 16rpx;
right: 0 !important;
}
view {
writing-mode: vertical-rl;
align-items: center;
display: flex;
justify-content: center;
letter-spacing: 3px;
width: 3.2vw;
height: 10vw;
position: absolute;
top: 0;
border-radius: 1.1vw;
font-size: 1.4vw;
color: #888888;
background: #fff;
&:nth-child(1) {
letter-spacing: 6px;
padding-top: 2vw;
z-index: 5;
image {
width: 1.6vw;
height: 1.6vw;
margin-top: 10px;
}
} }
&:nth-child(2) { .blue-font {
right: 3.9vw; font-size: 30.2rpx;
z-index: 3;
}
&:nth-child(3) {
right: 7.7vw;
z-index: 2;
}
&:nth-child(4) {
right: 11.6vw;
z-index: 2;
} }
} }
.avt { .more-view {
background: rgba(85, 166, 249, 1); width: 35rpx;
color: #FFFFFF; height: 35rpx;
} margin-right: 60rpx;
}
.kcscrol {
width: calc(100% - 10vw);
height: 10vw;
white-space: nowrap;
margin-left: 0.6vw;
position: relative;
z-index: 9;
.yjbox {
display: inline-block;
width: 12vw;
height: 10vw;
background: rgba(255, 255, 255, 0.5);
border-radius: 1.1vw;
margin-right: 0.8vw;
position: relative; position: relative;
.zhanwei { .more {
width: 100%; width: 100%;
height: 100%; height: 100%;
position: absolute; }
top: 0;
left: 0;
z-index: 200;
view { .more-view-button {
position: absolute; position: absolute;
width: 2.2vw; top: 40rpx;
height: 2.2vw; left: -125rpx;
display: flex; width: 200rpx;
top: 0; height: 240rpx;
left: 0; background-color: #fff;
right: 0; border-radius: 30rpx;
bottom: 0; z-index: 100;
margin: auto; border: 2rpx #E5E5E5 solid;
border-radius: 50%; display: flex;
border: 2px solid rgba(255, 78, 78, 1); justify-content: center;
align-items: center;
flex-direction: column;
.more-whitebutton {
width: 74%;
height: 50rpx;
border-radius: 10rpx;
color: #ababab;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
font-size: 3vw; font-size: 26rpx;
color: rgba(255, 78, 78, 1); border: 2rpx solid #BFBFBF;
margin-bottom: 12rpx;
}
.more-whitebutton:active {
width: 74%;
height: 50rpx;
border-radius: 10rpx;
color: #fff;
background-color: #57A8FA;
display: flex;
justify-content: center;
align-items: center;
font-size: 24rpx;
border: 2rpx solid #57A8FA;
}
.triangle {
position: absolute;
top: -8.34rpx;
right: 43rpx;
width: 0;
height: 0;
border-left: 14.44rpx solid transparent;
border-right: 14.44rpx solid transparent;
border-bottom: 8.34rpx solid #E5E5E5;
.triangle-small {
position: absolute;
top: 1.2rpx;
right: 50%;
transform: translateX(50%);
width: 0;
height: 0;
border-left: 14.44rpx solid transparent;
border-right: 14.44rpx solid transparent;
border-bottom: 8.34rpx solid #fff;
}
} }
} }
}
}
.ytj { .warning-other {
min-width: 1.5vw; width: 100%;
height: 1.8vw; height: 250rpx;
background: #E3EEF7; // background-color: red;
border-radius: 0.9vw; }
border: 1px solid rgba(3, 133, 250, 0.34); }
font-weight: 400;
font-size: 1.1vw;
color: #1083F8;
text-align: center;
line-height: 1.75vw;
position: absolute;
padding: 0 0.8vw;
top: 0.8vw;
right: 0.8vw;
}
image { .kcscrol {
width: 7vw; width: 87.5vw;
height: 7vw; height: 10.9vw;
margin: 0.5vw auto 0.5vw; white-space: nowrap;
display: block; margin-left: 18rpx;
border-radius: 1vw; position: relative;
} z-index: 99;
>view { .yjbox {
width: 100%; display: inline-block;
height: 1.4vw; width: 296rpx;
font-weight: 400; height: 10.7vw;
font-size: 1.3vw; background: #F9F9F9;
color: #212327; border-radius: 1.3vw;
white-space: nowrap; margin-right: 18rpx;
text-overflow: ellipsis;
overflow: hidden; position: relative;
padding: 0 1vw;
text-align: center; .sl {
} min-width: 1.2vw;
height: 1.8vw;
background: #E3EEF7;
border-radius: 0.9vw;
border: 1px solid rgba(3, 133, 250, 0.34);
font-weight: 400;
font-size: 1.1vw;
color: #1083F8;
text-align: center;
line-height: 1.75vw;
position: absolute;
padding: 0 1.6vw;
top: 0.8vw;
left: 0.8vw;
}
.ytj {
width: 4.5vw;
height: 1.8vw;
background: #E3EEF7;
border-radius: 0.9vw;
border: 1px solid rgba(3, 133, 250, 0.34);
font-weight: 400;
font-size: 1.1vw;
color: #1083F8;
text-align: center;
line-height: 1.75vw;
position: absolute;
top: 0.8vw;
right: 0.8vw;
}
image {
width: 7vw;
height: 7vw;
margin: 0.5vw auto 0.5vw;
display: block;
border-radius: 0.7vw;
}
>view {
width: 100%;
// height: 1.4vw;
// line-height: 1.4vw;
font-weight: 400;
font-size: 1.3vw;
color: #212327;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
padding: 0 1vw;
text-align: center;
} }
} }
} }
@ -360,34 +635,32 @@
-webkit-transform-style: preserve-3d; -webkit-transform-style: preserve-3d;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
} }
.que{
width: 16vw; .zhanwei {
height: 16vw; width: 100%;
position: fixed; height: 100%;
position: absolute;
top: 0; top: 0;
left: 0; left: 0;
width: 77.5vw; z-index: 200;
height: 10vw;
background: rgba(245, 246, 248, 1); view {
display: flex;
justify-content: center;
align-items: center;
border-radius: 20rpx;
image{
width: 12vw;
height: 12vw;
}
view{
width: 12vw;
text-align: center;
position: absolute; position: absolute;
bottom: 0.5vw; width: 2.2vw;
left: 50%; height: 2.2vw;
transform: translateX(-50%); display: flex;
font-weight: 300; top: 0;
font-size: 1.4vw; left: 0;
color: #555555; right: 0;
bottom: 0;
margin: auto;
border-radius: 50%;
border: 2px solid rgba(255, 78, 78, 1);
display: flex;
justify-content: center;
align-items: center;
font-size: 3vw;
color: rgba(255, 78, 78, 1);
} }
} }
</style> </style>

View File

@ -1,15 +1,16 @@
<template> <template>
<view> <view>
<scroll-view scroll-y="true" class="itembox" scroll-with-animation @scrolltolower="scrolltolower()" enable-back-to-top> <scroll-view scroll-y="true" class="itembox" scroll-with-animation @scrolltolower="scrolltolower()"
enable-back-to-top>
<view class="box"> <view class="box">
<view class="fler" v-for="(v,index) in InvoicingList" :key="index"> <view class="fler" v-for="(v,index) in InvoicingList" :key="index">
<scroll-view class="carditem guodu" @touchend="handleTouchEnd($event,v,index)" <scroll-view class="carditem guodu" @touchend="handleTouchEnd($event,v,index)"
@touchstart="touchstart($event,v,index)" scroll-with-animation scroll-x="true" @touchstart="touchstart($event,v,index)" scroll-with-animation scroll-x="true"
:scroll-left="v.scrollleft" @scroll="scroll" > :scroll-left="v.scrollleft" @scroll="scroll">
<view class="zding" v-if="v.zhiDingId"> <view class="zding" v-if="v.zhiDingId">
<image src="/static/index/procurement/zd.png" mode="aspectFill"></image> <image src="/static/index/procurement/zd.png" mode="aspectFill"></image>
</view> </view>
<view class="speitem guodu" > <view class="speitem guodu">
<view class="imgs"> <view class="imgs">
<image :src="v?.materialImg?serverUrl+v?.materialImg:'/static/index/procurement/k.png'" <image :src="v?.materialImg?serverUrl+v?.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill"> mode="aspectFill">
@ -21,11 +22,44 @@
<view v-if="v.medicationId_dictText">{{v.medicationId_dictText}}</view> <view v-if="v.medicationId_dictText">{{v.medicationId_dictText}}</view>
</view> </view>
</view> </view>
<view class="msitem guodu" > <view class="msitem guodu">
<view> <view>
<view>{{v?.materialName}}</view> <view>{{v?.materialName}}</view>
</view> </view>
<view>
<view class="msitem-item">
<text class="msitem-item-left">
物料编码:
</text>
<text class="msitem-item-right">
{{ v?.materialNo }}
</text>
</view>
<view class="msitem-item">
<text class="msitem-item-left">
规格型号:
</text>
<text class="msitem-item-right">
{{ v?.specificationModel }}
</text>
</view>
<view class="msitem-item">
<text class="msitem-item-left">
请领数量:
</text>
<text class="msitem-item-right" :style="v.qlNum?{fontWeight:`600`}:{}">
{{v.qlNum?v.qlNum:'--'}}
</text>
</view>
<view class="msitem-item">
<text class="msitem-item-left">
请领单位:
</text>
<text class="msitem-item-right">
{{ v?.twoUnit }}
</text>
</view>
<!-- <view>
<text style="white-space: nowrap;"> 规格型号: </text> <text style="white-space: nowrap;"> 规格型号: </text>
<view>{{v?.specificationModel}}</view> <view>{{v?.specificationModel}}</view>
</view> </view>
@ -38,7 +72,7 @@
<text>{{v.materialUnits}}</text> <text>{{v.materialUnits}}</text>
<text>请领单位</text> <text>请领单位</text>
</view> </view>
</view> </view> -->
</view> </view>
<view class="add" @click.stop="comfig(v,index,0)"> <view class="add" @click.stop="comfig(v,index,0)">
<view v-if="v.isAdd==1">已添加</view> <view v-if="v.isAdd==1">已添加</view>
@ -67,34 +101,34 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive } from 'vue'; import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive } from 'vue';
const props = defineProps({ const props = defineProps({
InvoicingList: { InvoicingList: {
type: Array, type: Array,
required: true required: true
}, },
status: { status: {
type: String type: String
} }
}) })
const caigouobj = ref({}) const caigouobj = ref({})
const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/') const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
const emit = defineEmits([ 'scrolltolower' ,'comfig']) const emit = defineEmits(['scrolltolower', 'comfig'])
const pageX = ref(0); const pageX = ref(0);
const pageY = ref(0); const pageY = ref(0);
const ones = ref(true) const ones = ref(true)
const touchstart = (event : any, v : any,i:number) => { const touchstart = (event : any, v : any, i : number) => {
caigouobj.value = v; caigouobj.value = v;
pageX.value = event.changedTouches[0].pageX; pageX.value = event.changedTouches[0].pageX;
pageY.value = event.changedTouches[0].pageY; pageY.value = event.changedTouches[0].pageY;
if(ones.value){ if (ones.value) {
ones.value = false; ones.value = false;
solleft(v, i) solleft(v, i)
} }
} }
const comfig=(v,i,t)=>{ const comfig = (v, i, t) => {
emit('comfig',v,i,t) emit('comfig', v, i, t)
} }
const handleTouchEnd = (event : any, v : any, i : number) => { const handleTouchEnd = (event : any, v : any, i : number) => {
let y = event.changedTouches[0].pageY; let y = event.changedTouches[0].pageY;
@ -102,29 +136,29 @@
let absx = Math.abs(x - pageX.value) let absx = Math.abs(x - pageX.value)
let absy = Math.abs(y - pageY.value); let absy = Math.abs(y - pageY.value);
ones.value = true; ones.value = true;
if (absy > 30 && absx+10<absy) { if (absy > 30 && absx + 10 < absy) {
caigouobj.value.scrollleft = 0.01 caigouobj.value.scrollleft = 0.01
setTimeout(()=>{ setTimeout(() => {
caigouobj.value.scrollleft = 0 caigouobj.value.scrollleft = 0
},20) }, 20)
return return
} }
if (absx < 10 && absy < 10) { if (absx < 10 && absy < 10) {
if(caigouobj.value.zk==false){ if (caigouobj.value.zk == false) {
setTimeout(()=>{ setTimeout(() => {
caigouobj.value.scrollleft = 0 caigouobj.value.scrollleft = 0
},20) }, 20)
} }
return return
} }
if(scrollLeft.value <=40){ if (scrollLeft.value <= 40) {
caigouobj.value.scrollleft = scrollLeft.value; caigouobj.value.scrollleft = scrollLeft.value;
caigouobj.value.zk = false; caigouobj.value.zk = false;
nextTick(()=>{ nextTick(() => {
caigouobj.value.scrollleft = 0; caigouobj.value.scrollleft = 0;
scrollLeft.value = 0; scrollLeft.value = 0;
}) })
}else{ } else {
scrollLeft.value = 150 scrollLeft.value = 150
caigouobj.value.scrollleft = scrollLeft.value; caigouobj.value.scrollleft = scrollLeft.value;
caigouobj.value.zk = true; caigouobj.value.zk = true;
@ -132,224 +166,192 @@
caigouobj.value.zk = x > pageX.value ? false : true; caigouobj.value.zk = x > pageX.value ? false : true;
caigouobj.value.scrollleft = caigouobj.value.zk ? 150 : 0; caigouobj.value.scrollleft = caigouobj.value.zk ? 150 : 0;
} }
const solleft = (v : any, i : number) => { const solleft = (v : any, i : number) => {
// console.log(v) // console.log(v)
props.InvoicingList.forEach((item, k) => { props.InvoicingList.forEach((item, k) => {
if (k != i&&item.zk==true) { if (k != i && item.zk == true) {
item.zk = false; item.zk = false;
item.scrollleft = 0; item.scrollleft = 0;
} }
}) })
} }
const scrolltolower = () => { const scrolltolower = () => {
emit('scrolltolower') emit('scrolltolower')
} }
const scrollLeft = ref(0) const scrollLeft = ref(0)
const scroll = (e)=>{ const scroll = (e) => {
scrollLeft.value = e.detail.scrollLeft scrollLeft.value = e.detail.scrollLeft
// console.log(e.detail.scrollLeft) // console.log(e.detail.scrollLeft)
} }
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.zkadd { .zkadd {
width: 9vw; width: 12vw;
height: 100%; height: 100%;
display: inline-flex; display: inline-flex;
justify-content: flex-end; justify-content: flex-end;
position: absolute; position: absolute;
top: 0; top: 0;
right: -9vw; right: -12vw;
view:active{
background:rgba(85, 166, 249, 1) !important; view:active {
background: rgba(85, 166, 249, 1) !important;
color: #FFFFFF !important; color: #FFFFFF !important;
} }
>view { >view {
width: 3vw; width: 4vw;
height: 100%; height: 100%;
font-weight: 400; font-weight: 400;
font-size: 1.3vw; font-size: 1.4vw;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
writing-mode: vertical-rl; writing-mode: vertical-rl;
text-orientation: upright; text-orientation: upright;
letter-spacing:2px; letter-spacing: 2px;
&:nth-child(3) { &:nth-child(3) {
background: rgba(194, 196, 201, .6); background: rgba(224, 225, 228, .6);
color: #555555; color: #555555;
} }
&:nth-child(2) { &:nth-child(2) {
background: rgba(194, 196, 201, .4); background: rgba(224, 225, 228, .4);
color: #666666; color: #666666;
} }
&:nth-child(1) { &:nth-child(1) {
background: rgba(194, 196, 201, .2); background: rgba(224, 225, 228, .2);
color: #666666; color: #666666;
} }
} }
} }
.add { .add {
width:5vw; width: 5vw;
height: 13vw; height: 13vw;
display: inline-flex; display: inline-flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
position: absolute; position: absolute;
top:0; top: 0;
right:0.8vw; right: 1.5vw;
>view { >view {
width: 4.5vw; width: 5vw;
height: 1.8vw; height: 2.3vw;
background: #E3EEF7; background: #E3EEF7;
border-radius: 0.9vw; border-radius: 1vw;
border: 1px solid rgba(3, 133, 250, 0.34); border: 1px solid rgba(3, 133, 250, 0.34);
font-weight: 400; font-weight: 400;
font-size: 1.1vw; font-size: 1.25vw;
color: #1083F8; color: #1083F8;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
position: absolute; position: absolute;
top: 0.8vw; top: 1.7vw;
right: 0vw; right: 0vw;
} }
image { image {
width: 3vw; width: 2.5vw;
height: 3vw; height: 2.5vw;
position: absolute; position: absolute;
bottom: 0.8vw; bottom: 0.8vw;
right: 0vw; right: 0vw;
} }
} }
.msitem { .msitem {
width: 11.5vw; width: 11.5vw;
height: 100%; height: 100%;
position: absolute; position: absolute;
top:0; top: 0;
left: 10vw; left: 15vw;
.msitem-item {
width: 25vw;
// background-color: red;
margin-top: 10rpx;
font-size: 34rpx;
white-space: nowrap;
/* 不换行 */
overflow: hidden;
/* 超出隐藏 */
text-overflow: ellipsis;
/* 显示 ... */
.msitem-item-left {
color: #777777;
}
.msitem-item-right {
margin-left: 10rpx;
}
}
>view { >view {
margin-top: 0vw; margin-top: 0vw;
&:nth-child(3) {
width: 100%;
height: 3.4vw;
display: flex;
justify-content: space-between;
>view {
width: 50%;
height: 100%;
display: flex;
flex-direction: column;
position: relative;
margin-top:1vw;
white-space: nowrap;
&:nth-child(1){
padding-right: 1.7vw;
align-items: flex-start;
}
&:nth-child(2){
padding-left: 1.7vw;
align-items: flex-start;
}
&:nth-child(1)::after {
content: '';
position: absolute;
right: 0;
width: 100%;
height: 2.2vw;
border-right: 1px solid #C9C9C9;
top: 0.6vw;
}
text {
&:nth-child(1) {
font-weight: bold;
font-size: 1.7vw;
color: #555555;
}
&:nth-child(2) {
font-weight: 400;
font-size: 1.1vw;
color: #999999;
white-space: nowrap;
}
}
}
}
&:nth-child(2) {
display: flex;
justify-content: space-between;
flex-direction: column;
margin-top: 0.1vw;
view{
font-size: 1.4vw;
color: #888888;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
}
text {
font-weight: 400;
font-size: 1.1vw;
color: #777777;
margin-top: 0.25vw;
}
}
&:nth-child(1) { &:nth-child(1) {
view{ view {
display: inline-block; display: inline-block;
width: 10vw; width: 10vw;
font-weight: bold; font-weight: bold;
font-size: 1.6vw; font-size: 1.8vw;
color: #222222; color: #222222;
padding-top: 1vw; padding-top: 1.9vw;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
margin-bottom: 30rpx;
} }
} }
} }
} }
.zding{
width: 4.6vw; .zding {
height: 4.6vw; width: 6vw;
height: 6vw;
position: absolute; position: absolute;
left: 0; left: 0vw;
top: 0; top: 0vw;
z-index: 11; z-index: 11;
image{
image {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
} }
.speitem { .speitem {
width: 10vw; width: 15vw;
height: 100%; height: 100%;
display: inline-flex; display: inline-flex;
flex-direction: column; flex-direction: column;
position: absolute; position: absolute;
top:0; top: 0;
left: 0; left: 0;
.cardp { .cardp {
width:9vw; width: 9vw;
display: flex; display: flex;
margin:0.3vw auto; margin: 0.3vw auto;
margin-top: 0;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
flex-wrap: wrap; flex-wrap: wrap;
// flex-direction: column; // flex-direction: column;
view { view {
min-width: 5.5vw; min-width: 6vw;
height: 1.6vw; height: 2vw;
border-radius: 0.9vw; border-radius: 0.9vw;
border: 1px solid #D2D2D2; border: 1px solid #D2D2D2;
margin: 0.25vw 0 0 0; margin: 0.25vw 0 0 0;
@ -357,53 +359,62 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
font-weight: 400; font-weight: 400;
font-size: 0.8vw; font-size: 1vw;
color: #555555; color: #555555;
padding: 0 0.25vw; padding: 0 0.25vw;
} }
} }
.imgs { .imgs {
width: 7.8vw; width: 11vw;
height: 7vw; height: 11vw;
background: #Fff; // background: #fff;
border-radius: 1.1vw; border-radius: 1.1vw;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin: 0.8vw auto 0; margin: 0.8vw auto 0;
padding: 0.3vw; padding: 0.3vw;
>image { >image {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
} }
} }
.itembox{ .itembox {
width: 100%; // width: 100%;
height: 66vh; // height: 66vh;
padding:1vw 2vw 0 0; padding: 1vw 2vw 0 0;
width: 90vw;
.box{ height: 64.5vh;
width: 100%;
.box {
width: 90vw;
display: grid; display: grid;
grid-template-columns: 1fr 1fr 1fr; grid-template-columns: 1fr 1fr;
} }
.fler{
width: 27.5vw; .fler {
height: 13vw; width: 44vw;
margin-bottom: 0.9vw; height: 20.5vw;
.carditem{
width: 28.3vw; // margin-bottom: 0.9vw;
height: 13vw; .carditem {
background: rgba(255, 255, 255, 0.6); width: 44vw;
border-radius: 1.1vw; height: 19.5vw;
background: rgba(255, 255, 255, 1);
border-radius: 1.6vw;
position: relative; position: relative;
margin-bottom: 1.1vw;
display: flex;
overflow: hidden; overflow: hidden;
justify-content: flex-start;
white-space: nowrap;
} }
} }
} }
</style> </style>

View File

@ -467,7 +467,7 @@
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
position: fixed; position: fixed;
z-index: 20; z-index: 200;
top: 0; top: 0;
left: 0; left: 0;
background: RGBA(239, 240, 244, 0.55); background: RGBA(239, 240, 244, 0.55);

View File

@ -1,17 +1,21 @@
<template> <template>
<view class="buttons-father" :style="transition?{opacity: `1`}:{opacity: `0`}" v-show="isShow"> <view class="buttons-father" :style="transition?{opacity: `1`}:{opacity: `0`}" v-show="isShow">
<view class="ipt"> <view class="title-input">
<input type="text" v-model="plzinfo.searchContent" placeholder="请领单号" @confirm="clickconfirm" /> <input type="text" v-model="plzinfo.searchContent" placeholder="请领单号" @confirm="clickconfirm" />
<image src="/static/index/procurement/x.png" mode="aspectFill" v-if="plzinfo.searchContent"
@click="plzinfo.searchContent=``"></image>
</view> </view>
<view class="scr" @click="clickconfirm"> <view class="title-ball" @click="clickconfirm();handleClick()">
检索 <image class="title-ball-img" :src="imgSrc" mode="aspectFill"></image>
</view> </view>
<view class="shx" @click="chongzhi"> <view class="title-ball" @click="chongzhi();handleClick1()">
<image src="/static/index/requestform/chongzhi.png" mode="aspectFill"></image> <image class="title-ball-img" :src="imgSrc1" mode="aspectFill"></image>
<view class="shx-font">
重置
</view>
</view> </view>
<view class="center-font">
<image src="/static/index/purchaseorder/company.png" mode="aspectFill" class="center-font-imge"></image>
{{ uni.getStorageSync('nuName')}}
</view>
<view class="right-button" @click="badshow=true" v-show="plsbuy[lefttarget]?.status==`1`"> <view class="right-button" @click="badshow=true" v-show="plsbuy[lefttarget]?.status==`1`">
<image src="/static/index/warehouse/procurement/picking/bebad.png" /> <image src="/static/index/warehouse/procurement/picking/bebad.png" />
<view> <view>
@ -31,24 +35,25 @@
<tanchuang :show="shouhuoshow" font="这个请领单确定要收货吗" @back="shouhuoshow=false;" @right="shouhuo"> </tanchuang> <tanchuang :show="shouhuoshow" font="这个请领单确定要收货吗" @back="shouhuoshow=false;" @right="shouhuo"> </tanchuang>
<view class="other-contain" :style="transition?{opacity: `1`}:{opacity: `0`}" v-show="isShow && !nomessageshow"> <view class="other-contain" :style="transition?{opacity: `1`}:{opacity: `0`}" v-show="isShow && !nomessageshow">
<view class="other-contain-left"> <view class="other-contain-left">
<view class="left-selecttype"> <view class="left-selecttype">
<view :class="selectType===index?`selecttype-target`: `selecttype`" v-for="(item,index) in tagsarray" <view :class="selectType===index?`selecttype-target`: `selecttype`" v-for="(item,index) in tagsarray"
@click="changetype(index)"> @click="changetype(index)">
{{ item }} {{ item }}
</view> </view>
<view class="heng-blue" :style="{ left: `${selectType === 0 ? 11.5 : 12 + selectType * 18.5}%` }"> <view class="heng-blue" :style="{ left: `${ 11.6 + selectType * 18.5}%` }">
</view> </view>
</view> </view>
<scroll-view scroll-y="true" scroll-with-animation class="left-menu-scroll" :scroll-top="leftscrolltop" <scroll-view scroll-y="true" scroll-with-animation class="left-menu-scroll" :scroll-top="leftscrolltop"
@scrolltolower="plsbuytolower" :lower-threshold="200"> @scrolltolower="plsbuytolower" :lower-threshold="200">
<view style="height: 1%;"></view> <!-- <view style="height: 1%;"></view> -->
<view class="pls-card" v-for="(v,i) in plsbuy" :key='i' @click="clickLeftMenu(i,v)" :style="{ <view class="pls-card" v-for="(v,i) in plsbuy" :key='i' @click="clickLeftMenu(i,v)" :style="{
borderColor: i === lefttarget ? '' : 'transparent', borderColor: i === lefttarget ? '' : 'transparent',
background: i === lefttarget ? '#fff' : 'rgba(255,255,255,0.6)' // background: i === lefttarget ? '#fff' : 'rgba(255,255,255,0.6)'
}"> }">
<view <view
style="background: #ff5757;position: absolute;width: 1.3vw;height: 1.3vw;border-radius: 50%;right: -0.5vw;top: -0.2vw;" style="background: #ff5757;position: absolute;width: 1.3vw;height: 1.3vw;border-radius: 50%;right: 0vw;top: 0vw;"
v-if="v.izYgRead=='N'"> v-if="v.izYgRead=='N'">
</view> </view>
<view class="pls-card-title"> <view class="pls-card-title">
@ -161,24 +166,24 @@
<view class="other-contain-right"> <view class="other-contain-right">
<scroll-view scroll-y="true" scroll-with-animation class="right-contain"> <scroll-view scroll-y="true" scroll-with-animation class="right-contain">
<view class="right-ones"> <view class="right-ones">
<view class="right-one" v-for="(item,index) in rightarray" :key="index"> <view class="right-one" v-for="(item,index) in rightarray" :key="index" :style="index===rightarray.length-1?{marginBottom:`15rpx`}:{}">
<view class="right-one-left"> <view class="right-one-left">
<view class="imge"> <view class="imge">
<image class="left-image" <image class="left-image"
:src="item.materialInfo.materialImg?serverUrl+item.materialInfo.materialImg:'/static/index/procurement/k.png'" :src="item.materialInfo.materialImg?serverUrl+item.materialInfo.materialImg:'/static/index/procurement/k.png'"
mode="aspectFill"></image> mode="aspectFill"></image>
</view> </view>
<view class="left-tages" > <view class="left-tages">
{{ item.materialInfo.categoryName}} {{ item.materialInfo.categoryName}}
</view> </view>
<view class="left-tages"> <view class="left-tages">
{{ item.materialInfo.typeName}} {{ item.materialInfo.typeName}}
</view> </view>
<view class="left-tages" v-if="item.materialInfo.medicationName"> <view class="left-tages" v-if="item.materialInfo.medicationName">
{{item.materialInfo.medicationName}} {{item.materialInfo.medicationName}}
</view> </view>
</view> </view>
<view class="right-one-right"> <view class="right-one-right">
<view class="right-title"> <view class="right-title">
@ -266,7 +271,7 @@
if ((selectType.value == index) && index) { if ((selectType.value == index) && index) {
return return
} }
leftscrolltop.value = 1 leftscrolltop.value = 0.01
setTimeout(() => { setTimeout(() => {
leftscrolltop.value = 0 leftscrolltop.value = 0
}, 50) }, 50)
@ -301,7 +306,7 @@
plzinfo.canpull = true; plzinfo.canpull = true;
lefttarget.value = 0 lefttarget.value = 0
firstgetqueryCgdList() firstgetqueryCgdList()
leftscrolltop.value = 1 leftscrolltop.value = 0.01
setTimeout(() => { setTimeout(() => {
leftscrolltop.value = 0 leftscrolltop.value = 0
}, 10) }, 10)
@ -394,7 +399,7 @@
} }
const clickLeftMenu = (index : any, item : any) => { const clickLeftMenu = (index : any, item : any) => {
let num = Math.ceil((index + 1)) let num = Math.ceil((index + 1))
leftscrolltop.value = (num - 2) * 180; leftscrolltop.value = (num - 2) * 188;
lefttarget.value = index; lefttarget.value = index;
rightdonghua.value = false; rightdonghua.value = false;
@ -452,7 +457,7 @@
} else { } else {
plzinfo.pageNo = 1; plzinfo.pageNo = 1;
plzinfo.canpull = true; plzinfo.canpull = true;
leftscrolltop.value = 1 leftscrolltop.value = 0.01
setTimeout(() => { setTimeout(() => {
leftscrolltop.value = 0 leftscrolltop.value = 0
}, 50) }, 50)
@ -489,7 +494,7 @@
plsbuy.value[lefttarget.value] = res.result.result plsbuy.value[lefttarget.value] = res.result.result
} else { } else {
plzinfo.pageNo = 1; plzinfo.pageNo = 1;
leftscrolltop.value = 1 leftscrolltop.value = 0.01
setTimeout(() => { setTimeout(() => {
leftscrolltop.value = 0 leftscrolltop.value = 0
}, 50) }, 50)
@ -513,6 +518,45 @@
}) })
} }
const basePath = '/static/index/procurement/' //
const imgNormal = basePath + 'sh.png'
const imgActive = basePath + 'shr.png'
const imgSrc = ref(imgNormal)
const busy = ref(false) //
function handleClick() {
if (busy.value) return
busy.value = true
// active
imgSrc.value = imgActive
// 0.5
setTimeout(() => {
imgSrc.value = imgNormal
busy.value = false
}, 300)
}
const basePath1 = '/static/index/procurement/' //
const imgNormal1 = basePath + 'cz.png'
const imgActive1 = basePath + 'czr.png'
const imgSrc1 = ref(imgNormal1)
const busy1 = ref(false) //
function handleClick1() {
if (busy1.value) return
busy1.value = true
// active
imgSrc1.value = imgActive1
// 0.5
setTimeout(() => {
imgSrc1.value = imgNormal1
busy1.value = false
}, 300)
}
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
@ -532,11 +576,72 @@
} }
.buttons-father { .buttons-father {
height: 3.3vw;
width: 100%; width: 100%;
height: 90rpx;
transition: opacity 1s ease; transition: opacity 1s ease;
display: flex; display: flex;
position: relative; position: relative;
margin-top: 1.1vw;
// background-color: blue;
.center-font {
position: absolute;
left: 31%;
top: 50%;
transform: translateY(-50%);
color: #555555;
font-size: 29rpx;
font-weight: 800;
display: flex;
align-items: center;
.center-font-imge {
width: 48rpx;
height: 48rpx;
margin-right: 10rpx;
}
}
.title-input {
display: flex;
align-items: center;
width: 19.3vw;
border-radius: 1.65vw;
height: 3.3vw;
background: #FFFFFF;
border: 1px solid #D2D2D2;
image {
width: 2.2vw;
height: 2.2vw;
margin: 0 0.5vw;
}
input {
// width: 15vw;
height: 3.3vw;
font-size: 1.4vw;
padding-left: 1.6vw;
}
}
.title-ball {
width: 5.3vh;
height: 5.3vh;
border-radius: 50%;
margin-left: 10rpx;
background-color: #fff;
border: 2rpx solid #D9DADC;
display: flex;
justify-content: center;
align-items: center;
.title-ball-img {
width: 55%;
height: 55%;
}
}
.ipt { .ipt {
display: flex; display: flex;
@ -640,14 +745,15 @@
height: 85vh; height: 85vh;
display: flex; display: flex;
transition: opacity 1s ease; transition: opacity 1s ease;
margin-top: 5rpx;
.other-contain-left { .other-contain-left {
width: 35%; width: 30%;
height: 100%; height: 100%;
.left-menu-scroll { .left-menu-scroll {
margin-top: 3%; margin-top: 2.5%;
height: 90%; height: 97%;
width: 100%; width: 100%;
// position: relative; // position: relative;
// overflow: auto; // overflow: auto;
@ -655,11 +761,11 @@
// background-color: red; // background-color: red;
.pls-card { .pls-card {
width: 98%; width: 98%;
height: 25.3vh; height: 356rpx;
border: #0f9fff 3rpx solid; border: #0f9fff 4rpx solid;
background-color: #fff; background-color: #fff;
border-radius: 40rpx; border-radius: 40rpx;
margin-bottom: 1.5vh; margin-bottom: 16rpx;
// margin: 1vh 0; // margin: 1vh 0;
padding: 0 30rpx; padding: 0 30rpx;
position: relative; position: relative;
@ -711,7 +817,7 @@
.pls-card-middle { .pls-card-middle {
width: 100%; width: 100%;
height: 11vh; height: 11vh;
margin-top: 1.5vh; margin-top: 1.7vh;
display: flex; display: flex;
position: relative; position: relative;
@ -791,7 +897,7 @@
justify-content: space-between; justify-content: space-between;
position: relative; position: relative;
padding-left: 15rpx; padding-left: 15rpx;
margin-top: 10rpx; margin-top: 18rpx;
.end-left { .end-left {
height: 100%; height: 100%;
@ -850,8 +956,9 @@
} }
.left-selecttype { .left-selecttype {
margin-top: 8rpx;
width: 98%; width: 98%;
height: 80rpx; height: 85rpx;
border-radius: 40rpx; border-radius: 40rpx;
background-color: #FFFFFF; background-color: #FFFFFF;
display: flex; display: flex;
@ -865,8 +972,8 @@
bottom: 0; bottom: 0;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
width: 25rpx; width: 29rpx;
height: 8rpx; height: 7rpx;
border-radius: 10rpx; border-radius: 10rpx;
background-color: #1083F8; background-color: #1083F8;
transition: 0.3s all ease; transition: 0.3s all ease;
@ -880,7 +987,7 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
color: #999999; color: #999999;
font-size: 31rpx; font-size: 29rpx;
position: relative; position: relative;
} }
@ -892,7 +999,7 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
color: #222222; color: #222222;
font-size: 31rpx; font-size: 29rpx;
font-weight: 600; font-weight: 600;
position: relative; position: relative;
} }
@ -900,9 +1007,11 @@
} }
.other-contain-right { .other-contain-right {
width: 64%; width: 68%;
margin-left: 1%; margin-left: 0.5%;
height: 100.5%; height: 106%;
background-color: #fff;
border-radius: 30rpx;
.right-contain { .right-contain {
width: 100%; width: 100%;
@ -916,14 +1025,15 @@
display: flex; display: flex;
width: 100%; width: 100%;
flex-wrap: wrap; flex-wrap: wrap;
padding-left: 5rpx;
padding-top: 5rpx;
.right-one { .right-one {
width: 570rpx; width: 620rpx;
height: 261rpx; height: 280rpx;
margin-right: 20rpx; margin-left: 20rpx;
margin-bottom: 15rpx; margin-top: 15rpx;
background-color: #fff; background-color: #F9F9F9;
border-radius: 30rpx; border-radius: 30rpx;
display: flex; display: flex;
@ -935,14 +1045,15 @@
align-items: center; align-items: center;
.imge { .imge {
width: 140rpx; width: 160rpx;
height: 140rpx; height: 160rpx;
margin-top: 10rpx; margin-top: 20rpx;
margin-bottom: 0.2vw; // margin-bottom: 0.2vw;
padding: 0.2vw; padding: 0.2vw;
border-radius: 1.1vw; border-radius: 1.1vw;
background: #f8f8f8; background: #f8f8f8;
image{
image {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
@ -954,8 +1065,8 @@
border-radius: 19rpx; border-radius: 19rpx;
color: #555555; color: #555555;
border: 1rpx solid #D2D2D2; border: 1rpx solid #D2D2D2;
margin-bottom:0.2vw; margin-bottom: 0.3vw;
font-size: 19rpx; font-size: 22rpx;
text-align: center; text-align: center;
line-height: 40rpx; line-height: 40rpx;
white-space: nowrap; white-space: nowrap;
@ -969,7 +1080,7 @@
.right-title { .right-title {
font-size: 34rpx; font-size: 34rpx;
font-weight: 600; font-weight: 800;
margin-top: 25rpx; margin-top: 25rpx;
color: #222222; color: #222222;
width: 300rpx; width: 300rpx;
@ -994,7 +1105,7 @@
.right-down { .right-down {
display: flex; display: flex;
margin-top: 15rpx; margin-top: 30rpx;
.right-first-num { .right-first-num {
font-size: 35rpx; font-size: 35rpx;

View File

@ -7,22 +7,32 @@
<image src="/static/index/procurement/x.png" mode="aspectFill" v-if="form.wlParamInfo" <image src="/static/index/procurement/x.png" mode="aspectFill" v-if="form.wlParamInfo"
@click="search(0)"></image> @click="search(0)"></image>
</view> </view>
<view class="scr" @click="search"> <view class="shx guodu" @click="search">
检索 <image src="/static/index/procurement/sh.png" mode="aspectFill" class="sh"></image>
<image src="/static/index/procurement/shr.png" mode="aspectFill" class="shr"></image>
<view class="shx-font">
检索
</view>
</view> </view>
<view class="shx" @click="ification = true"> <view class="shx guodu" @click="ification = true">
<image src="/static/index/requestform/shaixuan.png" mode="aspectFill"></image> <image src="/static/index/purchaseorder/select.png" mode="aspectFill" class="sh"></image>
<image src="/static/index/purchaseorder/selecttarget.png" mode="aspectFill" class="shr"></image>
<view class="shx-font"> <view class="shx-font">
筛选 筛选
</view> </view>
</view> </view>
<view class="shx" @click="chongzhi" v-if="form.categoryId!=''||form.wlParamInfo!='' "> <view class="shx guodu" @click="chongzhi" v-if="form.categoryId!=''||form.wlParamInfo!='' ">
<image src="/static/index/requestform/chongzhi.png" mode="aspectFill"></image> <image src="/static/index/requestform/chongzhi.png" mode="aspectFill"></image>
<view class="shx-font"> <view class="shx-font">
重置 重置
</view> </view>
</view> </view>
</view> </view>
<view class="center-font">
<image src="/static/index/purchaseorder/company.png" mode="aspectFill" class="center-font-imge"></image>
{{ uni.getStorageSync('nuName')}}
</view>
<view class="boxtwo flexend"> <view class="boxtwo flexend">
<view class="qlthbtn"> <view class="qlthbtn">
<image src="/static/index/requestform/ql0.png" mode="aspectFill"></image> <image src="/static/index/requestform/ql0.png" mode="aspectFill"></image>
@ -46,6 +56,7 @@
</view> </view>
</view> </view>
</view> </view>
<addwl :Material="addMaterial" @delall="delall" @del="adddel" @submit="submit"></addwl> <addwl :Material="addMaterial" @delall="delall" @del="adddel" @submit="submit"></addwl>
<carditem :InvoicingList="listarr" @scrolltolower="scrolltolower" :status="status" @comfig="comfig"></carditem> <carditem :InvoicingList="listarr" @scrolltolower="scrolltolower" :status="status" @comfig="comfig"></carditem>
<takeing :show="takeshow" :objtake="objtake" @fill="takeshow = false" @right="right"></takeing> <takeing :show="takeshow" :objtake="objtake" @fill="takeshow = false" @right="right"></takeing>

View File

@ -1,5 +1,5 @@
.right-container-title-nav { .right-container-title-nav {
margin-top: 40rpx; // margin-top: 40rpx;
display: flex; display: flex;
align-items: center; align-items: center;
height: 60rpx; height: 60rpx;
@ -38,54 +38,56 @@
.buttons-father { .buttons-father {
width: 100%; width: 100%;
height: 70rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.flexend{ height: 3.3vw;
justify-content: flex-end !important; margin-top: 1.1vw;
padding-right: 1.8vw; position: relative;
} margin-bottom: 0.7vw;
.boxtwo{ // background-color: blue;
width: 50%;
height: 100%; .center-font{
display: flex; position: absolute;
justify-content: flex-start; left: 50%;
} top: 50%;
.ipt { transform: translateY(-50%);
color: #555555;
font-size: 29rpx;
font-weight: 800;
display: flex; display: flex;
align-items: center; align-items: center;
width: 16vw; .center-font-imge{
background: #E2E4E9; width: 48rpx;
border-radius: 1.65vw; height: 48rpx;
height: 3.3vw; margin-right: 10rpx;
image {
width: 2.2vw;
height: 2.2vw;
margin: 0 0.5vw;
}
input {
width: 18vw;
height: 3.5vw;
font-size: 1.4vw;
padding-left: 1.6vw;
} }
} }
.flexend{
justify-content: flex-end !important;
padding-right: 1.4vw;
}
.boxtwo{
display: flex;
justify-content: flex-start;
// background-color: red;
}
.qlthbtn{ .qlthbtn{
width: 9.3vw; width: 8.5vw;
height: 3.3vw; height: 3.3vw;
background: rgba(255, 255, 255, 0.6); background: rgba(255, 255, 255, 0.6);
border-radius: 1.65vw; border-radius: 1.65vw;
border: 1rpx solid #D9DADC; border: 2rpx solid #D9DADC;
font-weight: 400; font-weight: 400;
font-size: 1.4vw; font-size: 1.4vw;
color: #222; color: #222;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
box-shadow: 0.5rpx 3rpx 3rpx #dadee1; // box-shadow: 0.5rpx 3rpx 3rpx #dadee1;
margin: 0 0 0 0.5vw; margin: 0 0 0 0.5vw;
color: #555555; color: #555555;
position: relative; position: relative;
@ -123,31 +125,73 @@
} }
.shx { .shx {
width: 6.5vw;
height: 3.3vw;
background: rgba(255, 255, 255, 0.6);
border-radius: 1.65vw; border-radius: 1.65vw;
border: 1rpx solid #D9DADC;
font-weight: 400; font-weight: 400;
font-size: 1.4vw; font-size: 1.4vw;
color: #222;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
box-shadow: 0.5rpx 3rpx 3rpx #dadee1; width: 7vw;
margin: 0 0 0 0.5vw; height: 3.3vw;
margin: 0 0 0 0.7vw;
background: rgba(255, 255, 255, 1);
border: 1px solid #D9DADC;
color: #555555; color: #555555;
image { image {
width: 1.8vw; width: 1.6vw;
height: 1.8vw; height: 1.6vw;
margin: 0 0.2vw 0 0; margin: 0 0.5vw 0 0;
} }
.shx-font { .shx-font {
margin-top: 3rpx; font-size: 1.4vw;
// font-size: 1.4vw; // font-size: 1.4vw;
// margin-left: -5rpx; // margin-left: -5rpx;
} }
} }
}
.ipt {
display: flex;
align-items: center;
width: 17.5vw;
border-radius: 1.65vw;
height: 3.3vw;
background: #FFFFFF;
border: 1px solid #D2D2D2;
image {
width: 2.2vw;
height: 2.2vw;
margin: 0 0.5vw;
}
input {
// width: 15vw;
height: 3.3vw;
font-size: 1.4vw;
padding-left: 1.6vw;
}
}
.shr {
display: none;
}
.scr:active .sh {
display: none;
}
.shx:active .shr {
display: inline-block;
}
.shx:active .sh {
display: none;
}
.shx:active {
color: #1083F8;
background: linear-gradient(-45deg, rgba(223, 244, 252, 1), rgba(204, 228, 249, 0.43));
border: 1px solid #1083F8;
} }

View File

@ -1,6 +1,6 @@
<template> <template>
<view class="index-content-other" :style="transition?{opacity: `1`}:{opacity: `0`}"> <view class="index-content-other" :style="transition?{opacity: `1`}:{opacity: `0`}">
<view class="right-container-title-nav"> <!-- <view class="right-container-title-nav">
<text style="margin-left: 30rpx;"> <text style="margin-left: 30rpx;">
NUID{{ uni.getStorageSync('nuId')}} NUID{{ uni.getStorageSync('nuId')}}
</text> </text>
@ -11,7 +11,7 @@
<image class="right-icons-img-back" src="/static/index/requestform/back.png" v-if="hometype>0" @click="hometype=0" /> <image class="right-icons-img-back" src="/static/index/requestform/back.png" v-if="hometype>0" @click="hometype=0" />
<view v-if="hometype>0" @click="hometype=0">返回</view> <view v-if="hometype>0" @click="hometype=0">返回</view>
</view> </view>
</view> </view> -->
<takehomep :isShow="hometype==0" @changePageNumber="changehometype" ></takehomep> <takehomep :isShow="hometype==0" @changePageNumber="changehometype" ></takehomep>
<requestformView :isShow="hometype==1" /> <requestformView :isShow="hometype==1" />
<returnorder :isShow="hometype==2" /> <returnorder :isShow="hometype==2" />
@ -21,12 +21,23 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive } from 'vue'; import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive } from 'vue';
import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app" import { onShow, onLoad, onHide, onPageScroll,onBackPress } from "@dcloudio/uni-app"
import { queryCgdList } from '@/pages/Warehouse/api/lunpan.js' import { queryCgdList } from '@/pages/Warehouse/api/lunpan.js'
import requestformView from './component/requestform.vue' import requestformView from './component/requestform.vue'
import takehomep from './component/takehomep.vue' import takehomep from './component/takehomep.vue'
import returnorder from './component/returnorder.vue' import returnorder from './component/returnorder.vue'
onBackPress(() => {
if(hometype.value){
hometype.value = 0
return true;
}else{
return false
}
})
const hometype = ref(-1) const hometype = ref(-1)
const transition = ref(false); const transition = ref(false);
const props = defineProps({ const props = defineProps({
@ -64,10 +75,11 @@
<style scoped lang="scss"> <style scoped lang="scss">
@import "./css/take.less"; @import "./css/take.less";
.index-content-other { .index-content-other {
width: calc(100% - 260rpx); width: calc(100% - 202rpx);
// background-color: red;
height: 100%; height: 100%;
transition: opacity 1s ease; transition: opacity 1s ease;
// background-color: red;
position: relative; position: relative;
margin-left: 1.2vw;
} }
</style> </style>

View File

@ -55,7 +55,8 @@
v-if="swipedex==0&&specialPage==1&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" /> v-if="swipedex==0&&specialPage==1&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" />
<!-- 户嘱页 --> <!-- 户嘱页 -->
<newnurse :isshow="menuIndex==1" v-if="swipedex==1" :canmove="startmoveit" :sendxy="targetrule" :isblue='isblue' <newnurse :isshow="menuIndex==1" v-if="swipedex==1" :canmove="startmoveit" :sendxy="targetrule" :isblue='isblue'
:howtomove="howtomove" :targetrule="targetrule" @handsend="handsend" @rulepush="rulepush" @cleanall="cleanall" /> :howtomove="howtomove" :targetrule="targetrule" @handsend="handsend" @rulepush="rulepush"
@cleanall="cleanall" />
<!-- 医嘱 --> <!-- 医嘱 -->
<doctorask v-if="swipedex==2&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" /> <doctorask v-if="swipedex==2&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" />
<logistics :isshow="menuIndex==3" <logistics :isshow="menuIndex==3"
@ -123,6 +124,7 @@
const gospecial = (index : number) => { const gospecial = (index : number) => {
specialPage.value = index specialPage.value = index
} }
// //
function genPaths(base, prefix, count, ext = 'png', startIndex = 0, pad = false) { function genPaths(base, prefix, count, ext = 'png', startIndex = 0, pad = false) {
return Array.from({ length: count }, (_, i) => { return Array.from({ length: count }, (_, i) => {
@ -208,8 +210,9 @@
//console.log('') //console.log('')
break; break;
case 'back': case 'back':
// uni.navigateBack()
uni.navigateBack()
uni.navigateBack() uni.navigateBack()
//console.log('')
break; break;
default: default:
@ -234,7 +237,7 @@
queryPadPageList({ 'pageNo': -1, 'nuName': nuName }).then((res => { queryPadPageList({ 'pageNo': -1, 'nuName': nuName }).then((res => {
let arr = res.result.records[0].permissionList; let arr = res.result.records[0].permissionList;
arrlist.value = [{ name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png', type: 'hldy' }]; arrlist.value = [{ name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png', type: 'hldy' }];
let tbr = []; let tbr = [];
// console.log("xxxx",arr) // console.log("xxxx",arr)
@ -257,7 +260,7 @@
} }
}) })
} }
let back = [ let back = [
{ name: '请领', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png', type: 'hldy_ql' }, { name: '请领', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png', type: 'hldy_ql' },
{ name: '物联', url: '/static/shouye/sy/g0.png', urls: '/static/shouye/sy/g1.png', type: 'wl' }, { name: '物联', url: '/static/shouye/sy/g0.png', urls: '/static/shouye/sy/g1.png', type: 'wl' },

View File

@ -494,7 +494,7 @@
borderColor: i === lefttarget ? '#0f9fff' : '', borderColor: i === lefttarget ? '#0f9fff' : '',
}"> }">
<text style="display: block;background: #ff5757; <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: 0vw;top: 0vw;" v-if="v.izNew=='Y'">
</text> </text>
<view class="pls-card-title"> <view class="pls-card-title">
<view class="title-left"> <view class="title-left">
@ -1994,7 +1994,6 @@
<style lang="less" scoped> <style lang="less" scoped>
.contain { .contain {
background-color: rgb(239, 240, 244);
width: 92.7vw; width: 92.7vw;
height: calc(100vh - 3vw); height: calc(100vh - 3vw);
padding: 0 2vw 0 1vw; padding: 0 2vw 0 1vw;

View File

@ -535,7 +535,7 @@
borderColor: i === lefttarget ? '#0f9fff' : '', borderColor: i === lefttarget ? '#0f9fff' : '',
}"> }">
<text style="display: block;background: #ff5757; <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: 0vw;top: 0vw;" v-if="v.izNew=='Y'">
</text> </text>
<view class="pls-card-title"> <view class="pls-card-title">
<view class="title-left"> <view class="title-left">
@ -781,7 +781,7 @@
</view> </view>
<view style="display: flex;margin-top: 25rpx;font-size: 30rpx;"> <view style="display: flex;margin-top: 25rpx;font-size: 30rpx;">
<view :class="showvalue.jianhuobtn==false?`jianhuobutton-gray-bad`: `jianhuobutton-gray`" @click="dogaijia" <view :class="showvalue.jianhuobtn==false?`jianhuobutton-gray-bad`: `jianhuobutton-gray`" @click="opengaijiaclick"
style="margin-right: 20rpx;"> style="margin-right: 20rpx;">
改价 改价
</view> </view>

View File

@ -154,7 +154,7 @@
onShow(() => { onShow(() => {
setTimeout(() => { setTimeout(() => {
playall.value = true; playall.value = true;
}, 400) }, 1000)
zyupgrade.value?.check_update(); zyupgrade.value?.check_update();
// console.log("zzzzzzzzzzzzzzzzzzzzzzzzzzzz") // console.log("zzzzzzzzzzzzzzzzzzzzzzzzzzzz")

View File

@ -43,7 +43,7 @@
<view class="more-whitebutton" @click="moredex=1;Invenshow=true;backmoreopen=false"> <view class="more-whitebutton" @click="moredex=1;Invenshow=true;backmoreopen=false">
查看全部 查看全部
</view> </view>
<view class="more-bluebutton" @click="moredex=2;backmoreopen=false"> <view class="more-whitebutton" @click="moredex=2;backmoreopen=false">
添加全部 添加全部
</view> </view>
@ -401,8 +401,8 @@
} }
const addcartory = (e : any) => { const addcartory = (e : any) => {
// eindexindex0 // eindexindex0
console.log("我要测试",e)
if(e.suppliers_dictText || e.suppliers){ if(!e.suppliers_dictText || !e.suppliers){
openerror.value = true; openerror.value = true;
errmsg.value = `此物料暂无供应商,请联系管理员` errmsg.value = `此物料暂无供应商,请联系管理员`
return return
@ -1159,7 +1159,7 @@
margin-bottom: 15rpx; margin-bottom: 15rpx;
} }
.more-bluebutton { .more-whitebutton:active {
width: 74%; width: 74%;
height: 50rpx; height: 50rpx;
border-radius: 10rpx; border-radius: 10rpx;

View File

@ -9,7 +9,7 @@
<view class="title-ball" @click="chongzhi();handleClick1()"> <view class="title-ball" @click="chongzhi();handleClick1()">
<image class="title-ball-img" :src="imgSrc1" mode="aspectFill"></image> <image class="title-ball-img" :src="imgSrc1" mode="aspectFill"></image>
</view> </view>
<view class="right-buttons"> <view class="right-buttons">
<view :class="manyselect?`right-button-blue`:`right-button-white`" @click="startselect()" <view :class="manyselect?`right-button-blue`:`right-button-white`" @click="startselect()"
v-show="plsbuy[lefttarget]?.status==`1`"> v-show="plsbuy[lefttarget]?.status==`1`">
@ -27,7 +27,7 @@
</view> </view>
<view class="mengban" style="background: #fff;width:100vw;right:0;left: 0vw;top:-5vw;height: 110vh;" <view class="mengban" style="background: #fff;width:100vw;right:0;left: 0vw;top:-5vw;height: 110vh;"
v-if="nomessageshow"> v-if="nomessageshow">
<defaultr cont="暂无数据" style="z-index: 999;margin: auto;top: 0;left:35vw;bottom: 0;right: 0;"></defaultr> <defaultr cont="暂无数据" style="z-index: 999;margin: auto;"></defaultr>
</view> </view>
</view> </view>
<tanchuang :show="badshow" font="确定要回退这个请领单吗" @back="badshow=false;" @right="huitui"> </tanchuang> <tanchuang :show="badshow" font="确定要回退这个请领单吗" @back="badshow=false;" @right="huitui"> </tanchuang>

View File

@ -1,5 +1,5 @@
<template> <template>
<view class="all-bgc guodu" :style="!transition?'opacity: 0':'opacity: 1'" style="transition: opacity 1s ease;"> <view class="all-bgc guodu" :style="!transition?'opacity: 0':'opacity: 1'" style="transition: opacity 1s ease;">
<view class="serchs"> <view class="serchs">
<view class="leftbtn"> <view class="leftbtn">
<view class="ipt" @click="opendata=true"> <view class="ipt" @click="opendata=true">
@ -108,6 +108,10 @@
</view> </view>
</view> </view>
</view> </view>
<view class="mengban" style="background: #fff;width:100vw;right:0;left: 0vw;top:-5vw;height: 110vh;"
v-if="nomessageshow">
<defaultr cont="暂无数据" style="z-index: 999;margin: auto;"></defaultr>
</view>
<tanchuang @back="tanshow = false" :show="tanshow" font="确定将该物料从本次退货清单中移除吗?" @right="del"></tanchuang> <tanchuang @back="tanshow = false" :show="tanshow" font="确定将该物料从本次退货清单中移除吗?" @right="del"></tanchuang>
<submits :show="subshow" :list="addMaterial" @fill="subshow = false" :thdt="tharrlist[cardindex]" <submits :show="subshow" :list="addMaterial" @fill="subshow = false" :thdt="tharrlist[cardindex]"
@config="tijiao"></submits> @config="tijiao"></submits>
@ -127,11 +131,13 @@
<view v-show="opendata" class="mengban" :style="opendata ?{background:`transparent`}:{}" <view v-show="opendata" class="mengban" :style="opendata ?{background:`transparent`}:{}"
@click="opendata=false;"> @click="opendata=false;">
</view> </view>
<errorshow :show="openmessage" :font="errormessage" @close="openmessage=false" /> <errorshow :show="openmessage" :font="errormessage" @close="openmessage=false" />
<view class="fixed-card" :style="openleft?{}:{right:`-34vw`}" v-if="tharrlist[cardindex]?.orderIzFinish=='N'&&qcobj"> <view class="fixed-card" :style="openleft?{}:{right:`-34vw`}"
v-if="tharrlist[cardindex]?.orderIzFinish=='N'&&qcobj">
<view class="fixed-card-left"> <view class="fixed-card-left">
<image class="card-left-img" :src="serverUrl+(qcobj?.netPreviewFileSmall?qcobj?.netPreviewFileSmall:qcobj?.netPreviewFile)" /> <image class="card-left-img"
:src="serverUrl+(qcobj?.netPreviewFileSmall?qcobj?.netPreviewFileSmall:qcobj?.netPreviewFile)" />
<view class=""> <view class="">
{{qcobj.directiveName}} {{qcobj.directiveName}}
</view> </view>
@ -151,11 +157,12 @@
业务单号{{qcobj.orderNo}} 业务单号{{qcobj.orderNo}}
</view> </view>
<view class="icon-button"> <view class="icon-button">
<view class="" :class="qcobj.izStart=='N'?'button-right':'button-left'" @click="start()"> <view class="" :class="qcobj.izStart=='N'?'button-right':'button-left'" @click="start()">
开始服务 开始服务
</view> </view>
<view :class="(qcobj.izFinish=='N'&&qcobj.izStart=='Y')?'button-right':'button-left'" @click="end()"> <view :class="(qcobj.izFinish=='N'&&qcobj.izStart=='Y')?'button-right':'button-left'"
结束服务 @click="end()">
结束服务
</view> </view>
</view> </view>
</view> </view>
@ -169,9 +176,9 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineComponent,watch } from 'vue'; import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineComponent, watch } from 'vue';
import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app" import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
import { thdList, transRead, thdNuMaterialList, addThc, thcList, removeWl, removeAll, submitThd, startServe, finishServe,queryOrderList,startDirectiveServe,finishDirectiveServe } from './api/lunpan.js' import { thdList, transRead, thdNuMaterialList, addThc, thcList, removeWl, removeAll, submitThd, startServe, finishServe, queryOrderList, startDirectiveServe, finishDirectiveServe } from './api/lunpan.js'
import thwl from './common/thwl.vue' import thwl from './common/thwl.vue'
import thitem from './common/thitem.vue' import thitem from './common/thitem.vue'
@ -198,31 +205,6 @@
} }
} }
) )
const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
const opendata = ref(false);
const form = reactive({
pageNo: 1,
pageSize: 10,
searchContent: '',
fqStartTime: "",
fqEndTime: "",
showstart:"",
showend:""
})
const tanshow = ref(false)
const subshow = ref(false)
const carnum = ref(0)
onMounted(() => {
thlist()
transition.value = false;
setTimeout(() => {
transition.value = true;
}, 50)
})
onShow(() => {
ritbot();
})
const ritbot = () => { const ritbot = () => {
let forms = { let forms = {
pageNo: 1, pageNo: 1,
@ -234,6 +216,35 @@
carnum.value = res.result.total; carnum.value = res.result.total;
}) })
} }
const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
const opendata = ref(false);
const form = reactive({
pageNo: 1,
pageSize: 10,
searchContent: '',
fqStartTime: "",
fqEndTime: "",
showstart: "",
showend: ""
})
const tanshow = ref(false)
const subshow = ref(false)
const carnum = ref(0)
const firstlook = ref(false);
const nomessageshow = ref(false)
onMounted(() => {
thlist()
transition.value = false;
setTimeout(() => {
transition.value = true;
}, 50)
})
onShow(() => {
ritbot();
})
const submit = () => { const submit = () => {
cardcon(tharrlist.value[cardindex.value], cardindex.value); cardcon(tharrlist.value[cardindex.value], cardindex.value);
nextTick(() => { nextTick(() => {
@ -244,7 +255,7 @@
const openmessage = ref(false) const openmessage = ref(false)
const tijiao = () => { const tijiao = () => {
submitThd({ id: tharrlist.value[cardindex.value].id }).then(res => { submitThd({ id: tharrlist.value[cardindex.value].id }).then(res => {
console.log("入库退货单",res) console.log("入库退货单", res)
if (res.success) { if (res.success) {
subshow.value = false; subshow.value = false;
th(tharrlist.value[cardindex.value], cardindex.value) th(tharrlist.value[cardindex.value], cardindex.value)
@ -300,12 +311,18 @@
thlist(); thlist();
} }
const tharrlist = ref([]) const tharrlist = ref([])
const thlist = () => { const thlist = () => {
thdList(form).then(res => { thdList(form).then(res => {
tharrlist.value.push(...res.result.records); tharrlist.value.push(...res.result.records);
if(!firstlook.value&&!res.result.records.length){
nomessageshow.value = true;
}
firstlook.value = true
console.log("red", res.result.records) console.log("red", res.result.records)
status.value = res.result.total == tharrlist.value.length ? 'nomore' : 'loadmore'; status.value = res.result.total == tharrlist.value.length ? 'nomore' : 'loadmore';
if (form.pageNo == 1 && tharrlist.value.length>0) { if (form.pageNo == 1 && tharrlist.value.length > 0) {
cardcon(tharrlist.value[cardindex.value], cardindex.value); cardcon(tharrlist.value[cardindex.value], cardindex.value);
// //
cardindex.value = cardindex.value; cardindex.value = cardindex.value;
@ -317,7 +334,7 @@
cardarr.value = res.result cardarr.value = res.result
}) })
} }
if(tharrlist.value.length==0){ if (tharrlist.value.length == 0) {
cardarr.value = []; cardarr.value = [];
} }
}) })
@ -340,15 +357,15 @@
} }
} }
const qcobj = ref({}) const qcobj = ref({})
const qCareList = (v)=>{ const qCareList = (v) => {
console.log({id:v.orderId}) console.log({ id: v.orderId })
queryOrderList({id:v.orderId}).then(res=>{ queryOrderList({ id: v.orderId }).then(res => {
qcobj.value = res.result; qcobj.value = res.result;
console.log(res) console.log(res)
if(qcobj.value.izStart == 'N'&&qcobj.value.izFinish == 'N'){ if (qcobj.value.izStart == 'N' && qcobj.value.izFinish == 'N') {
openleft.value = true openleft.value = true
} }
if(qcobj.value.izStart == 'Y'&&qcobj.value.izFinish == 'N'){ if (qcobj.value.izStart == 'Y' && qcobj.value.izFinish == 'N') {
openleft.value = false openleft.value = false
} }
}) })
@ -457,7 +474,7 @@
form.fqEndTime = res.end.replace(/-/g, '.') + ` 00:00:00`; form.fqEndTime = res.end.replace(/-/g, '.') + ` 00:00:00`;
form.pageNo = 1; form.pageNo = 1;
tharrlist.value = []; tharrlist.value = [];
console.log("0000",form) console.log("0000", form)
thlist() thlist()
} }
</script> </script>
@ -478,12 +495,13 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
transition: all 0.5s ease; transition: all 0.5s ease;
.open-img { .open-img {
width: 3vw; width: 3vw;
height: 3vw; height: 3vw;
} }
} }
.fixed-card { .fixed-card {
position: fixed; position: fixed;
right: 1vw; right: 1vw;
@ -498,28 +516,28 @@
align-items: center; align-items: center;
transition: all 0.5s ease; transition: all 0.5s ease;
z-index: 999; z-index: 999;
.fixed-card-left { .fixed-card-left {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
.card-left-img { .card-left-img {
width: 12vw; width: 12vw;
height: 8vw; height: 8vw;
} }
} }
.big-time { .big-time {
font-weight: 600; font-weight: 600;
font-size: 1.8vw; font-size: 1.8vw;
} }
.icon-people { .icon-people {
display: flex; display: flex;
margin: 0.3vw 0; margin: 0.3vw 0;
color: #555555; color: #555555;
.people-img { .people-img {
width: 1.5vw; width: 1.5vw;
height: 1.5vw; height: 1.5vw;
@ -527,12 +545,12 @@
margin-top: 0.1vw; margin-top: 0.1vw;
} }
} }
.icon-button { .icon-button {
display: flex; display: flex;
margin-top: 1vw; margin-top: 1vw;
font-size: 1.5vw; font-size: 1.5vw;
.button-left { .button-left {
width: 8.5vw; width: 8.5vw;
height: 3.3vw; height: 3.3vw;
@ -542,10 +560,10 @@
align-items: center; align-items: center;
border-radius: 1.2vw; border-radius: 1.2vw;
border: 1rpx solid #C7D2E4; border: 1rpx solid #C7D2E4;
margin:0 1vw; margin: 0 1vw;
color: #333333; color: #333333;
} }
.button-right { .button-right {
width: 8.5vw; width: 8.5vw;
height: 3.3vw; height: 3.3vw;
@ -556,13 +574,13 @@
border-radius: 1.2vw; border-radius: 1.2vw;
border: 1rpx solid #5AAEFF; border: 1rpx solid #5AAEFF;
color: #249BFA; color: #249BFA;
margin:0 1vw; margin: 0 1vw;
background: linear-gradient(to bottom, #fff, #D1EAFF); background: linear-gradient(to bottom, #fff, #D1EAFF);
} }
} }
} }
.thdfed { .thdfed {
width: 4.9vw; width: 4.9vw;
height: 4.9vw; height: 4.9vw;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 233 KiB

After

Width:  |  Height:  |  Size: 245 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
static/nobackmore.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -7,8 +7,8 @@
"id": "__UNI__FB2D473", "id": "__UNI__FB2D473",
"name": "护理单元", "name": "护理单元",
"version": { "version": {
"name": "1.0.031", "name": "1.0.033",
"code": 10031 "code": 10033
}, },
"description": "护理单元", "description": "护理单元",
"developer": { "developer": {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 167 KiB

After

Width:  |  Height:  |  Size: 245 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 964 B

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 996 B

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.0.031","code":10031},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"VideoPlayer":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"MonitorModule":{"__plugin_info__":{"name":"MonitorModule","description":"bugly升级","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#000000"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"} {"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.0.033","code":10033},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"VideoPlayer":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"MonitorModule":{"__plugin_info__":{"name":"MonitorModule","description":"bugly升级","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#000000"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Some files were not shown because too many files have changed in this diff Show More