From 2d2ac91d76af6ef4d755555c7623ee4e016a3066 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期日, 29 九月 2024 15:50:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pda/pages/index/queueup.vue | 88 +++++++++++++++++++++++++++++---------------
1 files changed, 58 insertions(+), 30 deletions(-)
diff --git a/pda/pages/index/queueup.vue b/pda/pages/index/queueup.vue
index dcbedc5..25c6711 100644
--- a/pda/pages/index/queueup.vue
+++ b/pda/pages/index/queueup.vue
@@ -100,18 +100,20 @@
</view>
</view>
<view class="separate"></view>
- <view class="contract_list" v-for="item in wmsInfo.wmsJobContractVOList">
- <view class="title">鍚堝悓鍙凤細{{ item.contractCode }}</view>
- <view class="address">鏀惰揣鍦帮細{{ item.address }}</view>
- <view class="list">
- <view class="item" v-for="line in item.platformWmsDetailList">
- <view class="line">
- <view class="label">鐗╂枡锛�</view>
- <view class="value">{{ line.materialName }}</view>
- </view>
- <view class="line">
- <view class="label">鏁伴噺锛�</view>
- <view class="value">{{ line.ioQty }}涓囨敮</view>
+ <view class="contract_wrap">
+ <view class="contract_list" v-for="item in wmsInfo.wmsJobContractVOList">
+ <view class="title">鍚堝悓鍙凤細{{ item.contractCode }}</view>
+ <view class="address">鏀惰揣鍦帮細{{ item.address }}</view>
+ <view class="list">
+ <view class="item" v-for="line in item.platformWmsDetailList">
+ <view class="line">
+ <view class="label">鐗╂枡锛�</view>
+ <view class="value">{{ line.materialName }}</view>
+ </view>
+ <view class="line">
+ <view class="label">鏁伴噺锛�</view>
+ <view class="value">{{ line.ioQty }}涓囨敮</view>
+ </view>
</view>
</view>
</view>
@@ -133,6 +135,7 @@
export default {
data() {
return {
+ windowTop: 24,
showDetail: false,
showPlatformgroup: false,
capacity: 10,
@@ -199,10 +202,11 @@
}
</script>
<style lang="scss">
+ page{
+ background: #f7f7f7;
+ }
.main_app {
padding: 30rpx 0 0rpx;
- min-height: 100vh;
- background: #f7f7f7;
.main_content {
background-color: #fff;
padding: 30rpx 30rpx 0;
@@ -251,15 +255,21 @@
align-items: center;
margin-bottom: 30rpx;
.code {
- display: flex;
font-weight: 600;
height: 60rpx;
- line-height: 60rpx;
+ height: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
font-size: 32rpx;
color: #111111;
border-radius: 8rpx;
border: 1rpx solid #dfdede;
text {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 100%;
&:nth-of-type(1) {
background: #e9f5f6;
padding: 0 12rpx;
@@ -294,8 +304,9 @@
.btn {
width: 136rpx;
height: 64rpx;
- line-height: 64rpx;
- text-align: center;
+ display: flex;
+ justify-content: center;
+ align-items: center;
background: #ffffff;
border-radius: 40rpx;
border: 1rpx solid #999999;
@@ -310,9 +321,11 @@
}
}
}
-.detail_modal {
- padding: 36rpx 30rpx;
-
+.detail_modal {
+ height: 100vh;
+ padding: 36rpx 30rpx;
+ border-radius: 12rpx;
+ box-shadow: 0 0 6rpx rgba(0, 0, 0, 0.5);
.modal_title {
font-weight: 600;
font-size: 32rpx;
@@ -321,25 +334,40 @@
text-align: center;
margin-bottom: 36rpx;
}
-
- .contract_list {
+ .contract_wrap{
+ height: calc( 100% - 400rpx );
+ overflow-y: auto;
+ }
+ .contract_list {
+ border-top: 1rpx solid #E5E5E5;
+ margin-bottom: 30rpx;
+ padding-top: 30rpx;
+ &:nth-last-child(1){
+ margin-bottom: 0;
+ }
.list {
background: #f7f7f7;
border-radius: 8rpx;
padding: 20rpx;
-
+ .item{
+ border-bottom: 1rpx solid #e5e5e5;
+ padding-bottom: 20rpx;
+ margin-bottom: 20rpx;
+ &:nth-last-child(1){
+ border: none;
+ padding-bottom: 0;
+ margin-bottom: 0;
+ }
+ }
.line {
display: flex;
margin-bottom: 20rpx;
-
- &:nth-of-type(3n) {
- border-top: 1rpx solid #e5e5e5;
- padding-top: 20rpx;
+ &:nth-last-child(1){
+ margin-bottom: 0rpx;
}
-
.label {
color: #666666;
- width: 86rpx;
+ width: 92rpx;
}
.value {
--
Gitblit v1.9.3