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/fastPicking.vue | 103 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 64 insertions(+), 39 deletions(-)
diff --git a/pages/outbound/fastPicking.vue b/pages/outbound/fastPicking.vue
index c84be1c..44fa013 100644
--- a/pages/outbound/fastPicking.vue
+++ b/pages/outbound/fastPicking.vue
@@ -2,22 +2,23 @@
<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>
- <view class="cu-form-group" v-show="isClickItem">
+ <!-- <view class="cu-form-group" v-show="isClickItem">
<view class="title">QR鐮�</view>
<input placeholder="璇锋壂鎻廞R鐮�" v-model="QRbarcode" ></input>
- </view>
+ </view> -->
<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" :disabled="repeatClick" @click="complete">鎻愪氦纭</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>
@@ -131,6 +109,7 @@
backgroundColor: '#42b983',
borderColor: '#42b983'
},
+ repeatClick: false
}
},
computed: {
@@ -192,6 +171,52 @@
},
+ 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 ;
+ }
+ that.repeatClick = true
+ const {
+ code,
+ data,
+ msg
+ } = await request('/saveOutTaskSts/'+that.barcode,{}, 'get')
+ if (code === 200) {
+ uni.showToast({
+ title: msg,
+ icon: "success"
+ })
+ that.clear()
+
+ }else if(code == 401){
+ setTimeout(() => {
+ uni.removeStorageSync('token');
+ uni.reLaunch({
+ url: "/pages/login/login"
+ });
+ }, 1000);
+ }else {
+ uni.showToast({
+ title: msg,
+ icon: "none",
+ position: 'top'
+ })
+ }
+ that.repeatClick = false
+
+ },
clearCode() {
this.barcode = ''
},
--
Gitblit v1.9.1