From b75ab103d8763245432c773d32c1f38239ec162f Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 04 二月 2023 13:24:09 +0800
Subject: [PATCH] Merge branch 'bfwms' of http://47.97.1.152:5880/r/wms_app into bfwms
---
pages/basics/pakin.vue | 6 ++++--
pages/basics/piking.vue | 14 ++++++++------
pages/basics/stockCheckv2.vue | 8 +++++---
pages/basics/matQuery.vue | 4 ++++
pages/index/index2.vue | 6 ++++++
manifest.json | 2 +-
pages/basics/stockCheck.vue | 8 +++++---
7 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/manifest.json b/manifest.json
index 07db100..c463b8a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
"name" : "涓壃WMS",
"appid" : "__UNI__DA5854D",
"description" : "",
- "versionName" : "20230129A",
+ "versionName" : "20230202A",
"versionCode" : 104,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
diff --git a/pages/basics/matQuery.vue b/pages/basics/matQuery.vue
index 38aad6c..88a91f9 100644
--- a/pages/basics/matQuery.vue
+++ b/pages/basics/matQuery.vue
@@ -23,6 +23,10 @@
<view class="text-title"><input type="text" v-model="matData.memo"></view>
</view>
<view class="text-box">
+ <view class="text-title"><text>瀹㈡埛淇℃伅</text></view>
+ <view class="text-title"><input type="text" v-model="matData.cstmr"></view>
+ </view>
+ <view class="text-box">
<view class="text-title"><text>鏁伴噺</text></view>
<view class="text-title">
<view>
diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index 9093c46..c3547fe 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -156,7 +156,7 @@
searchBox: 'hide',
pick:'hide',
matnr:'',
- matList:[{}],
+ matList:[],
result: '',
enableQty:'',
count:'',
@@ -444,6 +444,7 @@
this.count = this.matList[index].anfme
this.batch = this.matList[index].batch
this.memo = this.matList[index].memo
+ this.cstmr = this.matList[index].cstmr
this.rowNum = index
this.eject()
},
@@ -459,6 +460,7 @@
this.matList[this.rowNum].anfme = this.count
this.matList[this.rowNum].batch = this.batch
this.matList[this.rowNum].memo = this.memo
+ this.matList[this.rowNum].cstmr = this.cstmr
this.$refs.revise.close()
this.$forceUpdate() // 寮哄埗鍒锋柊
},
@@ -639,7 +641,7 @@
margin-top: 20rpx;
}
.data-list:last-child {
- margin-bottom: 120rpx;
+ margin-bottom: 180rpx;
}
/* .data-list-left {
display: inline-block;
diff --git a/pages/basics/piking.vue b/pages/basics/piking.vue
index 2d585fb..7e52d73 100644
--- a/pages/basics/piking.vue
+++ b/pages/basics/piking.vue
@@ -43,8 +43,10 @@
<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>
- <text style="width: 400rpx;">鏁伴噺锛歿{item.anfme}}</text>
+ <text style="width: 400rpx;">澶囨敞锛歿{item.memo}}</text>
+ <text style="width: 400rpx;margin-left: 100rpx">鏁伴噺锛歿{item.anfme}}</text>
</view>
</view>
<view class="data-list-right">
@@ -456,7 +458,7 @@
}
.data-list {
border-bottom: 1px solid #d8d8d8;
- height: 230rpx;
+ height: 240rpx;
margin: 15rpx;
border-radius: 20rpx;
}
@@ -464,13 +466,13 @@
margin-top: 20rpx;
}
.data-list:last-child {
- margin-bottom: 160rpx;
+ margin-bottom: 180rpx;
}
.data-list-left {
display: inline-block;
float: left;
margin-left: 6%;
- height: 180rpx;
+ height: 240rpx;
color: #676767;
}
.matnr {
@@ -480,8 +482,8 @@
display: inline-block;
float: right;
width: 200rpx;
- height: 230rpx;
- line-height: 230rpx;
+ height: 240rpx;
+ line-height: 240rpx;
}
.data-list-right label {
display: inline-block;
diff --git a/pages/basics/stockCheck.vue b/pages/basics/stockCheck.vue
index 390b5b2..3266940 100644
--- a/pages/basics/stockCheck.vue
+++ b/pages/basics/stockCheck.vue
@@ -59,8 +59,10 @@
<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>
- <text style="width: 400rpx;">鏁伴噺锛歿{item.anfme}}</text>
+ <text style="width: 400rpx;">澶囨敞锛歿{item.memo}}</text>
+ <text style="width: 400rpx;margin-left: 100rpx">鏁伴噺锛歿{item.anfme}}</text>
</view>
</view>
<view class="data-list-right">
@@ -426,7 +428,7 @@
}
.data-list {
border-bottom: 1px solid #d8d8d8;
- height: 230rpx;
+ height: 240rpx;
margin: 15rpx;
border-radius: 20rpx;
}
@@ -434,7 +436,7 @@
margin-top: 20rpx;
}
.data-list:last-child {
- margin-bottom: 160rpx;
+ margin-bottom: 180rpx;
}
.data-list-left {
display: inline-block;
diff --git a/pages/basics/stockCheckv2.vue b/pages/basics/stockCheckv2.vue
index bc4de88..9c61095 100644
--- a/pages/basics/stockCheckv2.vue
+++ b/pages/basics/stockCheckv2.vue
@@ -59,8 +59,10 @@
<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>
- <text style="width: 400rpx;">鏁伴噺锛歿{item.anfme}}</text>
+ <text style="width: 400rpx;">澶囨敞锛歿{item.memo}}</text>
+ <text style="width: 400rpx;margin-left: 100rpx">鏁伴噺锛歿{item.anfme}}</text>
</view>
</view>
<view class="data-list-right">
@@ -426,7 +428,7 @@
}
.data-list {
border-bottom: 1px solid #d8d8d8;
- height: 230rpx;
+ height: 250rpx;
margin: 15rpx;
border-radius: 20rpx;
}
@@ -434,7 +436,7 @@
margin-top: 20rpx;
}
.data-list:last-child {
- margin-bottom: 160rpx;
+ margin-bottom: 180rpx;
}
.data-list-left {
display: inline-block;
diff --git a/pages/index/index2.vue b/pages/index/index2.vue
index 7147b25..78401de 100644
--- a/pages/index/index2.vue
+++ b/pages/index/index2.vue
@@ -80,6 +80,12 @@
cuIcon: 'safe'
},
{
+ title: '琛ヨ揣',
+ name: 'stockCheckv2',
+ color: 'blue',
+ cuIcon: 'safe'
+ },
+ {
title: '鎷ｆ枡鍑哄簱',
name: 'piking',
color: 'blue',
--
Gitblit v1.9.1