From aab4ddd36c63d4bd239d2d7fe9c4780b2fcc76da Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 08 六月 2023 15:16:41 +0800
Subject: [PATCH] Merge branch 'bfwms' of http://47.97.1.152:5880/r/wms_app into bfwms
---
pages/basics/pakin.vue | 5 +-
pages/basics/piking.vue | 19 +++------
pages/basics/stockCheckv2.vue | 31 ++++++---------
manifest.json | 2
pages/basics/stockCheck.vue | 27 ++++++-------
5 files changed, 35 insertions(+), 49 deletions(-)
diff --git a/manifest.json b/manifest.json
index ec24ad2..3c0d6a7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
"name" : "涓壃WMS",
"appid" : "__UNI__DA5854D",
"description" : "",
- "versionName" : "2023020501",
+ "versionName" : "2023050501",
"versionCode" : 104,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index 68f5a8d..731017c 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -639,6 +639,7 @@
min-height: 320rpx;
margin: 15rpx;
border-radius: 20rpx;
+ display: flex;
}
.data-list:first-child {
margin-top: 20rpx;
@@ -655,12 +656,12 @@
line-height: 180rpx;
} */
.data-list-left {
- display: inline-block;
- float: left;
margin-left: 6%;
min-height: 320rpx;
color: #676767;
width: 500rpx;
+ color: #676767;
+ max-width: 450rpx;
}
.matnr {
padding-top: 10rpx;
diff --git a/pages/basics/piking.vue b/pages/basics/piking.vue
index 7e52d73..218fc8c 100644
--- a/pages/basics/piking.vue
+++ b/pages/basics/piking.vue
@@ -457,10 +457,10 @@
background-color: #ebebeb;
}
.data-list {
- border-bottom: 1px solid #d8d8d8;
- height: 240rpx;
+ min-height: 250rpx;
margin: 15rpx;
border-radius: 20rpx;
+ display: flex;
}
.data-list:first-child {
margin-top: 20rpx;
@@ -469,26 +469,19 @@
margin-bottom: 180rpx;
}
.data-list-left {
- display: inline-block;
- float: left;
margin-left: 6%;
- height: 240rpx;
color: #676767;
+ max-width: 450rpx;
}
.matnr {
padding-top: 10rpx;
}
.data-list-right {
- display: inline-block;
- float: right;
width: 200rpx;
- height: 240rpx;
- line-height: 240rpx;
+ display: flex;
+ justify-content: space-around;
+ align-items: center;
}
.data-list-right label {
- display: inline-block;
- float: left;
- width: 100rpx;
- height: 180rpx;
}
</style>
\ No newline at end of file
diff --git a/pages/basics/stockCheck.vue b/pages/basics/stockCheck.vue
index 3266940..956ff6c 100644
--- a/pages/basics/stockCheck.vue
+++ b/pages/basics/stockCheck.vue
@@ -427,10 +427,10 @@
background-color: #ebebeb;
}
.data-list {
- border-bottom: 1px solid #d8d8d8;
- height: 240rpx;
+ min-height: 250rpx;
margin: 15rpx;
border-radius: 20rpx;
+ display: flex;
}
.data-list:first-child {
margin-top: 20rpx;
@@ -438,27 +438,26 @@
.data-list:last-child {
margin-bottom: 180rpx;
}
- .data-list-left {
+ /* .data-list-left {
display: inline-block;
float: left;
- margin-left: 6%;
+ text-align: center;
+ width: 100rpx;
height: 180rpx;
+ line-height: 180rpx;
+ } */
+ .data-list-left {
+ margin-left: 6%;
color: #676767;
+ max-width: 450rpx;
}
.matnr {
padding-top: 10rpx;
}
.data-list-right {
- display: inline-block;
- float: right;
width: 200rpx;
- height: 230rpx;
- line-height: 230rpx;
- }
- .data-list-right label {
- display: inline-block;
- float: left;
- width: 100rpx;
- height: 180rpx;
+ display: flex;
+ justify-content: space-around;
+ align-items: center;
}
</style>
\ No newline at end of file
diff --git a/pages/basics/stockCheckv2.vue b/pages/basics/stockCheckv2.vue
index 9c61095..4cbdeb0 100644
--- a/pages/basics/stockCheckv2.vue
+++ b/pages/basics/stockCheckv2.vue
@@ -53,13 +53,13 @@
<view style="text-align: center;">鏆傛棤鏇村鏁版嵁</view>
</view>
<checkbox-group>
- <view v-for="(item,index) in matList" :key="index" class="data-list bg-false" :class="'bg-'+item.checked" >
+ <view v-for="(item,index) in matList" :key="index" class="data-list bg-false" :class="'bg-'+item.checked">
<view class="data-list-left">
- <view class="matnr"><text style="width: 400rpx;">缂栫爜锛歿{item.matnr}}</text></view>
- <view><text style="width: 400rpx;">瑙勬牸锛歿{item.specs}}</text></view>
- <view><text style="width: 400rpx;">鍝佸悕锛歿{item.maktx}}</text></view>
- <view><text style="width: 400rpx;">鎵瑰彿锛歿{item.batch}}</text></view>
- <view><text style="width: 400rpx;">瀹㈡埛淇℃伅锛歿{item.cstmr}}</text></view>
+ <view class="matnr">缂栫爜锛�<text style="min-height: 10rpx;">{{item.matnr}}</text></view>
+ <view><text>瑙勬牸锛歿{item.specs}}</text></view>
+ <view><text>鍝佸悕锛歿{item.maktx}}</text></view>
+ <view><text>鎵瑰彿锛歿{item.batch}}</text></view>
+ <view><text>瀹㈡埛淇℃伅锛歿{item.cstmr}}</text></view>
<view>
<text style="width: 400rpx;">澶囨敞锛歿{item.memo}}</text>
<text style="width: 400rpx;margin-left: 100rpx">鏁伴噺锛歿{item.anfme}}</text>
@@ -427,10 +427,10 @@
background-color: #ebebeb;
}
.data-list {
- border-bottom: 1px solid #d8d8d8;
- height: 250rpx;
+ min-height: 250rpx;
margin: 15rpx;
border-radius: 20rpx;
+ display: flex;
}
.data-list:first-child {
margin-top: 20rpx;
@@ -439,26 +439,19 @@
margin-bottom: 180rpx;
}
.data-list-left {
- display: inline-block;
- float: left;
margin-left: 6%;
- height: 180rpx;
color: #676767;
+ max-width: 450rpx;
}
.matnr {
padding-top: 10rpx;
}
.data-list-right {
- display: inline-block;
- float: right;
width: 200rpx;
- height: 230rpx;
- line-height: 230rpx;
+ display: flex;
+ justify-content: space-around;
+ align-items: center;
}
.data-list-right label {
- display: inline-block;
- float: left;
- width: 100rpx;
- height: 180rpx;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.1