From a232dcf6d4a59c7c47e06b6619eb7566163f95b4 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 05 十一月 2025 19:26:46 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/pda-master into devlop
---
pages/outbound/wavePickItem.vue | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/pages/outbound/wavePickItem.vue b/pages/outbound/wavePickItem.vue
index 16c4057..452fa27 100644
--- a/pages/outbound/wavePickItem.vue
+++ b/pages/outbound/wavePickItem.vue
@@ -1,10 +1,10 @@
<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>
@@ -17,10 +17,9 @@
<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 +48,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>
@@ -70,7 +69,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
@@ -83,7 +82,7 @@
</view>
<view class="cu-item">
<view class="content">
- <text class="text-gray">鏈鎷ｈ揣鏁伴噺:<text class="text-black ">{{item.asnOrderItems.reduce((total, item) => total + (Number(item.demandQty) ||0 ) , 0)}}</text></text>
+ <text class="text-gray">鏈鎷ｈ揣鏁伴噺:<text class="text-black ">{{item.wkOrderItems.reduce((total, item) => total + (Number(item.demandQty) ||0 ) , 0)}}</text></text>
</view>
</view>
@@ -119,7 +118,7 @@
wave:'',
list: [],
isconfirm: false,
- barcode:'80003642',
+ barcode:'',
max: 99999999,
repeatClick:false
@@ -142,7 +141,7 @@
that.wave = data.data
})
- this.search()
+
},
methods: {
clear() {
@@ -193,18 +192,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: "鎷ｈ揣鏄庣粏涓虹┖",
+ 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