From b6c44345b43433a9e28aab4fc33dedfb5ab16efe Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 08 五月 2025 12:30:51 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/pda-master into devlop
---
pages/rece/other.vue | 62 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/pages/rece/other.vue b/pages/rece/other.vue
index 8fe6ce0..8ed67e7 100644
--- a/pages/rece/other.vue
+++ b/pages/rece/other.vue
@@ -8,9 +8,10 @@
<!-- <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,9 +39,16 @@
<view class="cu-item">
<view class="content">
<text class="text-black">ASN:</text>
+ <text class="text-grey ">{{item.asnCode}}</text>
</view>
<view class="action">
- <text class="text-grey ">{{item.asnCode}}</text>
+
+ </view>
+ </view>
+ <view class="cu-item">
+ <view class="content">
+ <text class="text-black">鐗╂枡鍚嶇О:</text>
+ <text class="text-grey ">{{item.maktx}}</text>
</view>
</view>
@@ -52,17 +61,17 @@
</view>
</view> -->
- <view class="cu-item">
+ <!-- <view class="cu-item">
<view class="content">
<text class="text-black">鏈�澶у簱瀛�: <text class="text-grey ">{{item.maxQty}}</text></text>
</view>
<view class="content">
<text class="text-black">瀹炴椂搴撳瓨: <text class="text-grey ">{{item.stockQty}}</text></text>
</view>
- </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>
@@ -102,7 +111,7 @@
<view class="content" v-if="!isconfirm">
<view class="cu-form-group padding-lr-0">
<view class="title text-blue">渚涘簲鍟嗘壒娆�:</view>
- <input placeholder="璇疯緭鍏ヤ緵搴斿晢鎵规" v-model="item.splrBatch"></input>
+ {{item.splrBatch}}
</view>
</view>
<view class="content" v-else>
@@ -150,8 +159,10 @@
<view class="cu-form-group margin-bottom">
<view class="title">鏀惰揣鍖�</view>
- <uni-data-select v-model="whAreaId" :localdata="range" placement="top"
- @change="selChange"></uni-data-select>
+ <view style="width: 80%;">
+ <uni-data-select style="min-width: 90%; max-width: 90%;" v-model="whAreaId" :localdata="range" placement="top"
+ @change="selChange"></uni-data-select>
+ </view>
</view>
<view class="cu-bar btn-group foot" v-show="!isconfirm">
@@ -187,18 +198,20 @@
range: [],
repeatClick: false,
isconfirm: false,
- max: 99999999
+ max: 99999999,
}
},
computed: {
- ...mapState('user', ['dynamicFields']),
+ ...mapState('user', ['dynamicFields']),
+
allCount() {
return this.list.reduce((acc, row) => +row.receiptQty + acc, 0)
}
},
mounted() {
- this.getRece()
+ this.getRece()
+ console.log(dynamicFields)
this.whAreaId = uni.getStorageSync('whAreaId')
},
methods: {
@@ -208,7 +221,8 @@
data,
msg
} = await request('/orders/other', {
- asnCode: this.asncode
+ asnCode: this.asncode,
+ matnrCode: this.barcode
})
if (code === 200) {
this.list = [...data]
@@ -224,12 +238,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);
@@ -256,7 +274,7 @@
console.log(val)
uni.setStorageSync('whAreaId', val)
},
- async complete(id) {
+ async complete(id) {
this.repeatClick = true
const {
code,
@@ -273,7 +291,7 @@
title: msg,
icon: "none",
})
- }
+ }
this.repeatClick = false
},
async confirm(isCom) {
--
Gitblit v1.9.1