From 6db6c1c25770ffecb483c5adf31a3a95a7c0d7b4 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 07 五月 2025 16:14:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
pages/rece/other.vue | 75 ++++++++++++++++++++-----------------
1 files changed, 40 insertions(+), 35 deletions(-)
diff --git a/pages/rece/other.vue b/pages/rece/other.vue
index 487b710..e342e0f 100644
--- a/pages/rece/other.vue
+++ b/pages/rece/other.vue
@@ -3,14 +3,15 @@
<form>
<view class="cu-form-group margin-top" v-show="!isconfirm">
<view class="title">ASN鍗曞彿</view>
- <input placeholder="璇锋壂鎻廇SN鍗曞彿" v-model="asncode" focus></input>
+ <input placeholder="璇锋壂鎻廇SN鍗曞彿" v-model="asncode" @input="search" focus></input>
<text class='cuIcon-close text-gray margin-right-xs' v-show="asncode!==''" @click="clearCode"></text>
- <text class='cuIcon-search text-blue' @click="search"></text>
+ <!-- <text class='cuIcon-search text-blue' @click="search"></text> -->
</view>
<view class="cu-form-group" v-show="!isconfirm">
- <view class="title">鐗╂枡鏍囩</view>
- <input placeholder="璇锋壂鎻忕墿鏂欐爣绛�" v-model="barcode"></input>
- <text class='cuIcon-search text-blue' @click="scrollTo"></text>
+ <view class="title">鐗╂枡缂栫爜</view>
+ <input placeholder="璇锋壂鎻忕墿鏂欑紪鐮�" v-model="barcode"></input>
+ <text class='cuIcon-close text-gray margin-right-xs' v-show="barcode!==''" @click="clearBarcode"></text>
+ <text class='cuIcon-search text-blue' @click="search"></text>
</view>
</form>
@@ -26,7 +27,8 @@
{{index+1}}
</view>
<view class="text-blue">
- {{`${item.maktx}`}}
+ 缂栫爜:
+ {{`${item.matnr}`}}
</view>
</view>
<view class="action" v-if="!isconfirm">
@@ -37,10 +39,17 @@
<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 class="action">
+
+ </view>
+ </view>
+ <view class="cu-item">
+ <view class="content">
+ <text class="text-black">鐗╂枡鍚嶇О:</text>
+ <text class="text-grey ">{{item.maktx}}</text>
+ </view>
</view>
<!-- <view class="cu-item">
@@ -60,18 +69,14 @@
<text class="text-black">瀹炴椂搴撳瓨: <text class="text-grey ">{{item.stockQty}}</text></text>
</view>
</view>
-
-
-
<view class="cu-item">
<view class="content">
- <text class="text-black">骞冲彴琛屽彿: <text class="text-grey ">{{item.platformId}}</text></text>
+ <text class="text-black">琛屽彿: <text class="text-grey ">{{item.platItemId}}</text></text>
</view>
<view class="content">
<text class="text-black">璐ㄦ缁撴灉: <text class="text-grey ">{{item.inspect}}</text></text>
</view>
</view>
-
<view class="cu-item">
<view class="content">
<text class="text-black">閲囪喘鍗曚綅:<text class="text-grey ">{{item.purUnit}}</text></text>
@@ -80,7 +85,6 @@
<text class="text-black">搴撳瓨鍗曚綅: <text class="text-grey ">{{item.stockUnit}}</text></text>
</view>
</view>
-
<view class="cu-item">
<view class="content">
<text class="black">璁″垝鏀惰揣鏁伴噺:<text class="text-grey ">{{item.anfme}}</text></text>
@@ -90,21 +94,19 @@
<text class="black">宸叉敹璐ф暟閲�:<text class="text-grey ">{{item.qty}}</text></text>
</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"><text
class="text-red text-xl vertical-middle">*</text>鏀惰揣鏁伴噺:</view>
- <input type="number" placeholder="璇疯緭鍏ユ暟閲�" v-model="item.receiptQty"></input>
+ <uni-number-box style="width: 70%;" :max="max" v-model="item.receiptQty"
+ :step='1'></uni-number-box>
</view>
</view>
<view class="content" v-else>
<text class="text-black">鏀惰揣鏁伴噺:<text class="text-grey ">{{item.receiptQty}}</text></text>
</view>
</view>
-
<view class="cu-item">
<view class="content" v-if="!isconfirm">
<view class="cu-form-group padding-lr-0">
@@ -133,7 +135,6 @@
<text class="text-black">鐢熶骇鏃ユ湡:<text class="text-grey ">{{item.prodTime}}</text></text>
</view>
</view>
-
<view class="cu-item grid col-1" v-if="!isconfirm">
<view v-for="el in dynamicFields" :key="el.id">
<view class="cu-form-group padding-lr-0">
@@ -142,16 +143,12 @@
</view>
</view>
</view>
-
<view class="cu-item grid col-2" v-if="isconfirm">
<view class="item" v-for="el in dynamicFields" :key="el.id">
<text class="text-black">{{el.fieldsAlise}}:
<text class="text-grey ">{{item[el.fields]}}</text></text>
</view>
-
</view>
-
-
</view>
</block>
</view>
@@ -166,7 +163,6 @@
@change="selChange"></uni-data-select>
</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" @click="next">涓嬩竴姝�</button>
@@ -174,8 +170,7 @@
<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(true)">鏀惰揣骞跺畬鎴�</button>
- <button class="cu-btn bg-blue shadow-blur" @click="confirm(false)">鏀惰揣</button>
+ <button class="cu-btn bg-blue shadow-blur" :disabled="repeatClick" @click="confirm(false)">鏀惰揣</button>
</view>
</view>
@@ -199,7 +194,9 @@
whAreaId: '',
list: [],
range: [],
- isconfirm: false
+ repeatClick: false,
+ isconfirm: false,
+ max: 99999999,
}
},
computed: {
@@ -220,7 +217,8 @@
data,
msg
} = await request('/orders/other', {
- asnCode: this.asncode
+ asnCode: this.asncode,
+ matnrCode: this.barcode
})
if (code === 200) {
this.list = [...data]
@@ -236,12 +234,16 @@
clearCode() {
this.asncode = ''
},
+ clearBarcode() {
+ this.barcode = ''
+ },
scrollTo() {
- const ref = this.$refs[`${this.barcode}ref`][0];
- uni.pageScrollTo({
- scrollTop: ref.$el.offsetTop,
- duration: 300
- })
+
+ // const ref = this.$refs[`${this.barcode}ref`][0];
+ // uni.pageScrollTo({
+ // scrollTop: ref.$el.offsetTop,
+ // duration: 300
+ // })
},
remove(index) {
this.list.splice(index, 1);
@@ -264,9 +266,12 @@
this.isconfirm = false
},
selChange(val) {
+ console.log('-------->')
+ console.log(val)
uni.setStorageSync('whAreaId', val)
},
async complete(id) {
+ this.repeatClick = true
const {
code,
data,
@@ -283,6 +288,7 @@
icon: "none",
})
}
+ this.repeatClick = false
},
async confirm(isCom) {
if (this.whAreaId === '') {
@@ -322,7 +328,6 @@
icon: "none",
})
}
-
}
},
async getRece() {
@@ -334,7 +339,7 @@
if (code === 200) {
this.range = data.map(item => ({
value: item.id,
- text: item.name
+ text: item.warehouseId$ + "-- " + item.name
}));
}
},
--
Gitblit v1.9.1