From 7dd2e7918b00a857ca8a3634e24b2f6dd7446d1b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 24 六月 2025 10:29:33 +0800
Subject: [PATCH] Merge branch 'xgmFlwms' of http://47.97.1.152:5880/r/wms_app into xgmFlwms
---
pages/basics/stockCheck.vue | 57 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/pages/basics/stockCheck.vue b/pages/basics/stockCheck.vue
index 944db2b..6e80efb 100644
--- a/pages/basics/stockCheck.vue
+++ b/pages/basics/stockCheck.vue
@@ -3,37 +3,45 @@
<view class="cu-form-group margin-top">
<view class="title">鎵樼洏鐮�</view>
<input v-model="billNo" placeholder="鎵爜 / 杈撳叆" name="input" @input="findCode()" focus>
- <button v-model="matBtn" class="cu-btn bg-yellow" @click="toggle('right')"><text>+琛ュ厖</text></button>
+ <!-- <button v-model="matBtn" class="cu-btn bg-yellow" @click="toggle('right')"><text>+琛ュ厖</text></button> -->
</view>
<view class="margin-top">
<uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
<uni-tr>
<uni-th align="center" width="80">鏁伴噺</uni-th>
+ <uni-th align="center" width="100">鍗曚綅</uni-th>
<uni-th align="center" width="100">浜у搧缂栫爜</uni-th>
<uni-th align="center" width="100">浜у搧鍚嶇О</uni-th>
<uni-th align="center" width="100">浜у搧鎵瑰彿</uni-th>
- <uni-th align="center" width="100">搴撲綅</uni-th>
- <uni-th align="center" width="150">纭鏁伴噺</uni-th>
+ <!-- <uni-th align="center" width="100">搴撲綅</uni-th> -->
+ <!-- <uni-th align="center" width="150">纭鏁伴噺</uni-th> -->
</uni-tr>
<uni-tr v-for="(item, index) in locDetlData" :key="index">
- <uni-td>{{item.count}}</uni-td>
- <uni-td>{{item.matNo}}</uni-td>
- <uni-td>{{item.matName}}</uni-td>
- <uni-td>{{item.itemBatch}}</uni-td>
- <uni-td>{{item.locNo}}</uni-td>
- <uni-td align="center">
+ <uni-td style="text-align: center;">{{item.anfme}}</uni-td>
+ <uni-td style="text-align: center;">{{item.model}}</uni-td>
+ <uni-td style="text-align: center;">{{item.matnr}}</uni-td>
+ <uni-td style="text-align: center;">{{item.maktx}}</uni-td>
+ <uni-td style="text-align: center;">{{item.batch}}</uni-td>
+ <!-- <uni-td>{{item.locNo}}</uni-td> -->
+ <!-- <uni-td align="center">
<button class ="cu-btn bg-orange margin-xs" @click="conf(index,item)">淇敼</button>
<button class ="cu-btn bg-red margin-xs" @click="remove(index,item)">鍒犻櫎</button>
- </uni-td>
+ </uni-td> -->
</uni-tr>
</uni-table>
</view>
- <view class="flex solid-bottom padding justify-around">
- <button class="cu-btn bg-yellow lg" @click="check">纭� 璁�</button>
- <button class="cu-btn bg-grey lg" @click="reset">閲� 缃�</button>
+ <view style="height: 200rpx;">
+ <!-- 绌虹櫧灞� -->
+ </view>
+ <view class="cu-bar foot input" style="height: 130rpx;">
+ <view class="flex solid-bottom padding justify-start" >
+ <button class="cu-btn bg-yellow main-btn margin-xs" style="width: 430rpx;" @click="reset">纭� 璁�</button>
+ <button class="cu-btn bg-grey main-btn margin-xs" @click="reset">閲� 缃�</button>
+ </view>
</view>
- <view>
+
+ <scroll-view>
<uni-popup ref="popup" background-color="#fff" style="width: 500rpx;">
<view class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }">
<view class="cu-form-group margin-top">
@@ -62,10 +70,12 @@
<view class="flex solid-bottom padding justify-center">
<button class="cu-btn bg-yellow pda-btn2" @click="confirm">鎻愬彇</button>
</view>
-
+ <view style="height: 200rpx;">
+ <!-- 绌虹櫧灞� -->
+ </view>
</view>
</uni-popup>
- </view>
+ </scroll-view>
<view>
<!-- 鎻愮ず淇℃伅寮圭獥 -->
<uni-popup ref="message" type="message">
@@ -107,6 +117,7 @@
count:0,
type: '',
baseIP:'',
+ basePORT:'',
checkList:[],
sourceList:[],
billNo:'',
@@ -118,7 +129,9 @@
mounted(){
// 鑾峰彇IP绔彛
const UIP = uni.getStorageSync('UIP');
- this.baseIP = UIP
+ this.baseIP = UIP;
+ const UPORT = uni.getStorageSync('UPORT');
+ this.basePORT = UPORT;
},
methods: {
// 鎻愮ず绐楀彛
@@ -137,15 +150,15 @@
// 璧嬪�煎墠娓呯┖琛ㄦ牸
that.locDetlData = []
uni.request({
- url: that.baseHttp + that.baseIP + that.baseUrl + "/mobile/check/queryMatFromBarCode?barCode=" + barCode,
+ url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + "/mobile/pakout/query/auth",
header: {
'content-type':'application/x-www-form-urlencoded',
'token':uni.getStorageSync('token')
},
data: {
- barCode: barCode
+ barcode: barCode
},
- method:'GET',
+ method:'POST',
success(res) {
if (res.data.code === 200) {
that.locDetlData = res.data.data
@@ -187,7 +200,7 @@
return;
}
uni.request({
- url: that.baseHttp + that.baseIP + that.baseUrl + "/matCode/auth",
+ url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + "/matCode/auth",
header: {
'content-type':'application/x-www-form-urlencoded',
'token':uni.getStorageSync('token')
@@ -320,7 +333,7 @@
}
// this.noTitlemodalTap()
uni.request({
- url: that.baseHttp + that.baseIP + that.baseUrl + "/mobile/stock/check",
+ url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + "/mobile/stock/check",
header: {
'token':uni.getStorageSync('token')
},
--
Gitblit v1.9.1