From 7afa627789e11881366fd5145d9248d1992dcd3b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 05 十一月 2025 13:23:34 +0800
Subject: [PATCH] 波次拣货修改

---
 pages/outbound/wavePickItem.vue |   78 +++++++++++++++++++++++++--------------
 1 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/pages/outbound/wavePickItem.vue b/pages/outbound/wavePickItem.vue
index 16c4057..7efd7fa 100644
--- a/pages/outbound/wavePickItem.vue
+++ b/pages/outbound/wavePickItem.vue
@@ -1,26 +1,21 @@
 <template>
 	<view class="has-foot">
 		<form>
-			<view class="cu-form-group" v-show="!isconfirm">
+			<!-- <view class="cu-form-group" v-show="!isconfirm">
 				<view class="title">娉㈡鍙�</view>
 				<text class="text-black ">{{wave.code}}</text>				
-			</view>
+			</view> -->
 			<view class="cu-form-group" v-show="!isconfirm">
 				<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>
-		
-				
-
 		<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  ">
 					
-				
 				<view class="cu-bar bg-white solid-bottom margin-top-sm">
 					<view class="action">
 						<view class="index">
@@ -49,7 +44,7 @@
 				</view>
 				
 				</view>
-				<view  class="cu-list det menu noMargin " v-for="(item2,index2) in item.asnOrderItems">
+				<view  class="cu-list det menu noMargin " v-for="(item2,index2) in item.wkOrderItems">
 					<view class="cu-item">
 						<view class="content">
 							<text class="text-gray">{{index2+1}}.</text>
@@ -57,7 +52,7 @@
 					</view>
 					<view class="cu-item">						
 						<view class="content">
-							<text class="text-gray">璁㈠崟鍙�:<text class="text-black ">{{item2.asnCode}}</text></text>
+							<text class="text-gray">璁㈠崟鍙�:<text class="text-black ">{{item2.orderCode}}</text></text>
 						</view>						
 					</view>
 					<view class="cu-item">
@@ -74,6 +69,21 @@
 						<view class="content">
 							<view class="cu-form-group padding-lr-0">
 								<view class="title text-blue"><text
+										class="text-red text-xl vertical-middle">*</text>绁ㄥ彿: </view>
+								<input type="input" v-model="item2.fieldsIndex" class="text-black">
+							</view>	
+						</view>
+					</view>
+<!-- 					<view class="cu-item grid  col-2" v-if="item2.extendFields">
+						<view class="item" v-for="el in dynamicFields" :key="el.id">
+							<text class="text-black">{{el.fieldsAlise}}:
+								<text class="text-grey ">{{item.extendFields[el.fields]}}</text></text>
+						</view>
+					</view> -->
+					<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
 										class="text-red text-xl vertical-middle">*</text>鎷�:</view>
 								<uni-number-box style="width: 70%;" :max="max" v-model="item2.demandQty"
 									:step='1' ></uni-number-box>
@@ -83,23 +93,15 @@
 				</view>
 				<view class="cu-item">
 					<view class="content">
-						<text class="text-gray">鏈鎷h揣鏁伴噺:<text class="text-black ">{{item.asnOrderItems.reduce((total, item) => total + (Number(item.demandQty) ||0 ) , 0)}}</text></text>
+						<text class="text-gray">鏈鎷h揣鏁伴噺:<text class="text-black ">{{item.wkOrderItems.reduce((total, item) => total + (Number(item.demandQty) ||0 ) , 0)}}</text></text>
 					</view>						
 				</view>
-				
 			</block>
 		</view>
-
-
-		
-
 		<view class="cu-bar btn-group foot" v-show="!isconfirm">
 			<button class="cu-btn text-blue line-blue shadow" @click="clear">娓呯┖</button>
 			<button class="cu-btn bg-blue shadow-blur" :disabled="repeatClick" @click="complete">鎷h揣瀹屾垚</button>
 		</view>
-
-		
-
 	</view>
 </template>
 
@@ -119,20 +121,22 @@
 				wave:'',
 				list: [],				
 				isconfirm: false,
-				barcode:'80003642',
+				barcode:'',
 				max: 99999999,
-				repeatClick:false
-				
+				repeatClick:false,				
 			}
 		},
-		computed: {			
+		computed: {
+			...mapState('user', ['dynamicFields']),
+			...mapState('user', {
+					dynFields: state => state.dynamicFields
+			}),
 			allCount() {
-				return this.list.reduce((acc, row) => +row.receiptQty + acc, 0)
+				return this.list.reduce((acc, row) => + row.receiptQty + acc, 0)
 			},
-			
 		},
 		mounted() {
-			
+			console.log(dynamicFields);
 		},
 		onLoad() {
 			let that = this
@@ -142,7 +146,7 @@
 				that.wave = data.data
 				
 			})
-			this.search()
+			
 		},
 		methods: {
 			clear() {
@@ -194,17 +198,35 @@
 			},
 			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