From 8ebbb1cb3b258ba1469e507af6768a2550d6b434 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 24 六月 2025 17:01:56 +0800
Subject: [PATCH] #

---
 pages/outbound/wavePickItem.vue |   29 ++++++++++++--
 pages/outbound/fastPicking.vue  |   52 +++++++------------------
 2 files changed, 39 insertions(+), 42 deletions(-)

diff --git a/pages/outbound/fastPicking.vue b/pages/outbound/fastPicking.vue
index c84be1c..667ab7b 100644
--- a/pages/outbound/fastPicking.vue
+++ b/pages/outbound/fastPicking.vue
@@ -2,9 +2,10 @@
 	<view class="has-foot">
 		<form>
 			<view class="cu-form-group" v-show="!isconfirm">
-				<view class="title">瀹瑰櫒/搴撲綅鐮�</view>
-				<input placeholder="璇锋壂鎻忓鍣�/搴撲綅鐮�" v-model="barcode" @input="search()" focus></input>
+				<view class="title">瀹瑰櫒鐮�</view>
+				<input placeholder="璇锋壂鎻忓鍣ㄧ爜" v-model="barcode"  focus></input>
 				<text class='cuIcon-close text-gray margin-right-xs' v-show="barcode!==''" @click="clearCode"></text>
+				<text class='cuIcon-search text-blue' @click="search"></text>
 			</view>
 
 		</form>
@@ -17,7 +18,7 @@
 
 		<view class="cu-list det menu sm-border  padding">
 			<block  v-for="(item, index) in list" :key="index">
-				<view :style="clickItem === index ?itemStyle : {}" class="cu-list det menu  "  @click="clickTaskItem(index)">
+				<view :style="clickItem === index ?itemStyle : {}" class="cu-list det menu  " >
 					
 				
 				<view class="cu-bar bg-white solid-bottom margin-top-sm">
@@ -32,15 +33,10 @@
 					<view class="content">
 						<text class="text-gray">缂栫爜:<text class="text-black ">{{item.matnrCode}}</text></text>
 					</view>					
-				</view>
+				</view>				
 				<view class="cu-item">
 					<view class="content">
-						<text class="text-gray">璁㈠崟:<text class="text-black ">{{item.trackCode}}</text></text>
-					</view>					
-				</view>
-				<view class="cu-item">
-					<view class="content">
-						<text class="text-gray">鍑哄簱鍗�:<text class="text-black ">{{item.trackCode}}</text></text>
+						<text class="text-gray">鍑哄簱鍗�:<text class="text-black ">{{item.sourceCode}}</text></text>
 					</view>					
 				</view>
 				<view class="cu-item">
@@ -52,21 +48,12 @@
 					<view class="content">
 						<text class="text-gray">搴撳瓨鍗曚綅:<text class="text-black ">{{item.unit}}</text></text>
 					</view>	
-					<view class="content">
-						<text class="text-gray">璐ㄦ缁撹:<text class="text-black ">{{item.matnrCode}}</text></text>
-					</view>
+					
 				</view>				
-				<view class="cu-item">
-					<view class="content">
-						<text class="text-gray">鏍囩:<text class="text-black ">{{item.matnrCode}}</text></text>
-					</view>
-						
-				</view>
+				
 				
 				<view class="cu-item">
-					<view class="content">
-						<text class="text-gray">瀛樺偍鏁伴噺:<text class="text-black ">{{item.matnrCode}}</text></text>
-					</view>
+					
 					<view class="content">
 						<text class="text-gray">璁″垝鍒嗘嫞鏁伴噺:<text class="text-black ">{{item.anfme}}</text></text>
 					</view>						
@@ -74,7 +61,7 @@
 				<view class="cu-item">						
 					<view class="content2">
 						<text class="text-gray">鏈鍒嗘嫞鏁伴噺:</text>
-						<input type="number" v-model="item.workQty"></input>
+						<input type="number" v-model="item.anfme" disabled=""></input>
 					</view>
 						
 				</view>	
@@ -83,25 +70,16 @@
 		</view>
 
 
-		<view class="text-blue text-right padding-lr" v-show="isconfirm">
-			鏈鏀惰揣鎬绘暟閲�:{{allCount}}
-		</view>
+		
 
-		<view class="cu-form-group " v-show="isconfirm">
-			<view class="title">鏀惰揣鍖�</view>
-			<uni-data-select v-model="whAreaId" :localdata="range" placement="top"
-				@change="selChange"></uni-data-select>
-		</view>
+		
 
-		<view class="cu-bar btn-group foot" v-show="!isconfirm">
+		<view class="cu-bar btn-group foot" >
 			<button class="cu-btn text-blue line-blue shadow" @click="clear">娓呯┖</button>
-			<button class="cu-btn bg-blue shadow-blur" @click="next">涓嬩竴姝�</button>
+			<button class="cu-btn bg-blue shadow-blur" @click="next">鎻愪氦</button>
 		</view>
 
-		<view class="cu-bar btn-group foot" v-show="isconfirm">
-			<button class="cu-btn text-blue line-blue shadow" @click="prev">涓婁竴姝�</button>
-			<button class="cu-btn bg-blue shadow-blur" @click="confirm">鎻愪氦鏀惰揣</button>
-		</view>
+		
 
 	</view>
 </template>
diff --git a/pages/outbound/wavePickItem.vue b/pages/outbound/wavePickItem.vue
index 16c4057..e62dcbf 100644
--- a/pages/outbound/wavePickItem.vue
+++ b/pages/outbound/wavePickItem.vue
@@ -17,7 +17,7 @@
 				
 
 		<view class="cu-list det menu sm-border  padding">
-			<block  v-for="(item, index) in list" :key="index">
+			<block  v-for="(item, index) in list">
 				<view  class="cu-list det menu  ">
 					
 				
@@ -70,7 +70,7 @@
 							<text class="text-gray">宸叉嫞鏁伴噺:<text class="text-black ">{{item2.qty}}</text></text>
 						</view>
 					</view>
-					<view class="cu-item">
+					<view class="cu-item" v-show="item2.anfme !== item2.qty">
 						<view class="content">
 							<view class="cu-form-group padding-lr-0">
 								<view class="title text-blue"><text
@@ -119,7 +119,7 @@
 				wave:'',
 				list: [],				
 				isconfirm: false,
-				barcode:'80003642',
+				barcode:'',
 				max: 99999999,
 				repeatClick:false
 				
@@ -142,7 +142,7 @@
 				that.wave = data.data
 				
 			})
-			this.search()
+			
 		},
 		methods: {
 			clear() {
@@ -193,18 +193,37 @@
 			
 			},
 			async complete() {
+				
 				let that = this
+				if(that.barcode === '' || that.barcode === null){
+					uni.showToast({
+						title: "瀹瑰櫒鍙蜂负绌�",
+						icon: "error",
+					})
+					return ;
+				}
+				if(that.list === [] || that.list.length === 0){
+					uni.showToast({
+						title: "鎷h揣鏄庣粏涓虹┖",
+						icon: "error",
+					})
+					return ;
+				}
 				this.repeatClick = true
 				const {
 					code,
 					data,
 					msg
-				} = await request('/saveWavePick',that.list)
+				} = await request('/saveWavePick',{
+					container:that.barcode,
+					containerWaveDtos:that.list
+				})
 				if (code === 200) {
 					uni.showToast({
 						title: msg,
 						icon: "none",
 					})
+					that.clear()
 				} else {
 					uni.showToast({
 						title: msg,

--
Gitblit v1.9.1