From ed6433bc89d7be8169d6933882e6d5ac9e016a5d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 08 五月 2025 15:28:14 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/pda-master into devlop
---
pages/listing/itemSelect.vue | 10 +++
pages/listing/matnrPalletising.vue | 53 ++++++++++++++---
pages/listing/unPakin.vue | 63 ++++-----------------
pages/rece/other.vue | 11 +--
4 files changed, 68 insertions(+), 69 deletions(-)
diff --git a/pages/listing/itemSelect.vue b/pages/listing/itemSelect.vue
index c65d690..6a84b85 100644
--- a/pages/listing/itemSelect.vue
+++ b/pages/listing/itemSelect.vue
@@ -2,7 +2,7 @@
<view>
<!-- 鎼滅储妗� -->
<view class="search-bar">
- <uni-search-bar v-model="condition" placeholder=" 杈撳叆鎵规" bgColor="#EEEEEE" @confirm="search()"/>
+ <uni-search-bar v-model="condition" placeholder=" 杈撳叆鎵规/缂栫爜/鍗曞彿" bgColor="#EEEEEE" @confirm="search()"/>
</view>
@@ -44,6 +44,14 @@
</view>
<view class="cu-item">
<view class="content">
+ <text class="text-black">璐ㄦ鐘舵��:</text>
+ </view>
+ <view class="action">
+ <text class="text-grey ">{{item.isptResult$}}</text>
+ </view>
+ </view>
+ <view class="cu-item">
+ <view class="content">
<text class="text-black">搴撳瓨鍗曚綅: <text class="text-grey ">{{item.stockUnit}}</text></text>
</view>
<view class="content">
diff --git a/pages/listing/matnrPalletising.vue b/pages/listing/matnrPalletising.vue
index c67be93..5469911 100644
--- a/pages/listing/matnrPalletising.vue
+++ b/pages/listing/matnrPalletising.vue
@@ -60,14 +60,14 @@
<text class="text-grey ">{{item.splrBatch}}</text>
</view>
</view>
- <!-- <view class="cu-item">
+ <view class="cu-item">
<view class="content">
- <text class="text-black">搴撳瓨鎵规:</text>
+ <text class="text-black">璐ㄦ鐘舵��:</text>
</view>
<view class="action">
- <text class="text-grey ">{{item.batch}}</text>
+ <text class="text-grey ">{{item.isptResult$}}</text>
</view>
- </view> -->
+ </view>
<!-- <view class="cu-item">
<view class="content">
<text class="text-black">骞冲彴琛屽彿: <text class="text-grey ">{{item.platformId}}</text></text>
@@ -226,7 +226,7 @@
// }
// },
async getList() {
- if(this.barcode === '' || this.barcode === null){
+ if(this.container === '' || this.container === null){
uni.showToast({
title: "瀹瑰櫒鐮佷负绌�",
icon: "none",
@@ -251,16 +251,35 @@
})
}
},
- showBackData(data){
+ showBackData(data){
+ let status ;
data.map(item => {
this.list.push(item)
- })
+ })
+ let oldLength = this.list.length
this.list = this.list.filter((item, index, self) =>
self.findIndex(i => (
i.id === item.id // 鏍规嵁id鍘婚噸
- )) === index
+ )) === index && item.isptResult === self[0].isptResult
);
+ let newLength = this.list.length
+
+ if(oldLength > newLength){
+ this.showMsg("鏂版槑缁嗚杩囨护锛岃妫�鏌ョ姸鎬�")
+
+ }
+ },
+ showMsg(msg){
+ setTimeout(function() {
+ uni.showToast({
+ icon: "none",
+ position: 'top',
+ title: msg,
+ duration:2000,
+ })
+ }, 200);
+
},
scrollTo() {
const ref = this.$refs[`${this.barcode}ref`][0];
@@ -290,7 +309,23 @@
this.isconfirm = false
},
async confirm() {
- this.repeatClick = true
+ if(this.container === '' || this.container === null){
+ uni.showToast({
+ title: "瀹瑰櫒鐮佷负绌�",
+ icon: "none",
+ position: 'top'
+ })
+ return ;
+ }
+ if(this.list.length ===0 || this.list === null){
+ uni.showToast({
+ title: "鏈坊鍔犳槑缁�",
+ icon: "none",
+ position: 'top'
+ })
+ return ;
+ }
+ this.repeatClick = true
const newArr = this.list.map(item => {
return {
diff --git a/pages/listing/unPakin.vue b/pages/listing/unPakin.vue
index e215395..34e616a 100644
--- a/pages/listing/unPakin.vue
+++ b/pages/listing/unPakin.vue
@@ -34,53 +34,32 @@
<view class="cu-item">
<view class="content">
<text class="text-black">ASN:</text>
- </view>
- <view class="action">
<text class="text-grey ">{{item.asnCode}}</text>
- </view>
+ </view>
</view>
<view class="cu-item">
<view class="content">
<text class="text-black">鐗╂枡缂栫爜:</text>
- </view>
- <view class="action">
<text class="text-grey ">{{item.matnrCode}}</text>
</view>
</view>
<view class="cu-item">
<view class="content">
<text class="text-black">渚涘簲鍟嗘壒娆�:</text>
- </view>
- <view class="action">
<text class="text-grey ">{{item.splrBatch}}</text>
- </view>
+ </view>
+ </view>
+ <view class="cu-item">
<view class="content">
<text class="text-black">璐ㄦ鐘舵��:</text>
- </view>
- <view class="action">
<text class="text-grey ">{{item.isptResult$}}</text>
- </view>
+ </view>
</view>
<view class="cu-item">
<view class="content">
- <text class="text-black">搴撳瓨鎵规:</text>
- </view>
- <view class="action">
- <text class="text-grey ">{{item.batch}}</text>
- </view>
- <view class="content">
<text class="text-black">搴撳瓨鍗曚綅: <text class="text-grey ">{{item.stockUnit}}</text></text>
</view>
- </view>
- <!-- <view class="cu-item">
- <view class="content">
- <text class="text-black">骞冲彴琛屽彿: <text class="text-grey ">{{item.platformId}}</text></text>
- </view>
- <view class="content">
- <text class="text-black">璐ㄦ缁撴灉: <text class="text-grey ">{{item.inspect}}</text></text>
- </view>
- </view> -->
-
+ </view>
<view class="cu-item">
<view class="content">
@@ -100,7 +79,7 @@
<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>缁勭洏鏁伴噺:
+ class="text-red text-xl vertical-middle">*</text>瑙ｇ粦鏁伴噺:
</view>
<uni-number-box style="width: 70%;" :max="max" v-model="item.receiptQty"
:step='1'></uni-number-box>
@@ -164,30 +143,9 @@
matnrCode: this.matnrCode,
asnCode: this.asnCode
}, "post")
- if (code === 200) {
- // if(data !== [] || data !== null){
- // uni.navigateTo({
- // url: "../listing/itemSelect",
- // success: function(res) {
- // // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- // res.eventChannel.emit('data', {
- // item: data
- // })
- // },
- // events: {
- // // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
- // acceptDataFromOpenedPage: function(data) {
- // that.matnr = data.data
- // that.findMat(that.matnr)
- // },
- // },
-
-
- // });
-
- // }
+ if (code === 200) {
for (var i = 0; i < data.length; i++) {
- data[i].receiptQty = 1;
+ data[i].receiptQty = 0;
data[i].selected = false;
}
this.list = data
@@ -209,6 +167,9 @@
type: 'unbind'
})
if (code === 200) {
+ for (var i = 0; i < data.length; i++) {
+ data[i].receiptQty = 0;
+ }
this.list = data
} else {
uni.showToast({
diff --git a/pages/rece/other.vue b/pages/rece/other.vue
index fba48b7..36c9faf 100644
--- a/pages/rece/other.vue
+++ b/pages/rece/other.vue
@@ -108,14 +108,9 @@
</view>
</view>
<view class="cu-item">
- <view class="content" v-if="!isconfirm">
- <view class="cu-form-group padding-lr-0">
- <view class="title text-blue">渚涘簲鍟嗘壒娆�:</view>
- {{item.splrBatch}}
- </view>
- </view>
- <view class="content" v-else>
- <text class="text-black">渚涘簲鍟嗘壒娆�:<text class="text-grey ">{{item.splrBatch}}</text></text>
+
+ <view class="content" >
+ <text class="text-black">鎵规:<text class="text-grey ">{{item.splrBatch}}</text></text>
</view>
</view>
--
Gitblit v1.9.1