From cc32dc8d26f71497ce7f7e43930ec03035e6fe90 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 20 十一月 2024 14:23:14 +0800
Subject: [PATCH] #
---
pages/order/orderComb.vue | 87 ++++++++++++++++++++-----------------------
1 files changed, 41 insertions(+), 46 deletions(-)
diff --git a/pages/order/orderComb.vue b/pages/order/orderComb.vue
index af177b6..0668df0 100644
--- a/pages/order/orderComb.vue
+++ b/pages/order/orderComb.vue
@@ -20,10 +20,10 @@
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
@input="barcodeInput()">
</view>
- <view class="item">
+ <!-- <view class="item">
<view class="code-decs">璁㈠崟鍙�:</view>
<uni-combox :candidates="orderNoList" placeholder="璇烽�夋嫨璁㈠崟" v-model="orderNo" @input="getOrderDet"></uni-combox>
- </view>
+ </view> -->
</view>
<view class="mat-list-title">
<view style="width: 200rpx;"></view>
@@ -32,49 +32,21 @@
</view>
<scroll-view>
<checkbox-group class="list" v-for="(item,i) in dataList" :key="i" @change="checkboxChange">
- <view class="aside">
- <!-- <checkbox :value="item.matnr" :checked="item.checked" @click="set(i)"/> -->
- </view>
<view class="list-left" style="margin: 0;">
<view class="list-left-item">
- <view class="desc">No锛�</view>
- <view class="left-item">{{i + 1}}</view>
+ <view class="desc">No锛歿{i + 1}}</view>
</view>
<view class="list-left-item">
- <view class="desc">璁㈠崟鍙凤細</view>
- <view class="left-item">
- <uni-tag :text="item.orderNo" type="primary"></uni-tag>
- </view>
+ <view class="desc">璁㈠崟鍙凤細{{item.orderNo}}</view>
</view>
<view class="list-left-item">
- <view class="desc">鏂欏彿锛�</view>
- <view class="left-item">
- <uni-tag :text="item.matnr" type="primary"></uni-tag>
- </view>
+ <view class="desc">鏂欏彿锛歿{item.matnr}}</view>
</view>
<view class="list-left-item">
- <view class="desc">鍚嶇О锛�</view>
- <view class="left-item">{{item.maktx}}</view>
+ <view class="desc">鎵瑰彿锛歿{item.batch}}</view>
</view>
- <view class="list-left-item">
- <view class="desc">瑙勬牸锛�</view>
- <view class="left-item">{{item.specs}}</view>
- </view>
- <view class="list-left-item">
- <view class="desc">鎵瑰彿锛�</view>
- <view class="left-item">
- <uni-tag :text="item.batch" type="warning"></uni-tag>
- </view>
- </view>
- <!-- <view class="list-left-item">
- <view class="desc">閲嶉噺锛�</view>
- <view class="left-item">
- <uni-tag :text="item.weight" type="warning"></uni-tag>
- </view>
- </view> -->
- <view class="list-left-item">
- <view class="desc">鍓╀綑鏁伴噺锛�</view>
- <view class="left-item">{{item.anfme}}</view>
+ <view class="list-left-item" >
+ <view class="desc">鏁伴噺锛歿{item.anfme}}</view>
</view>
</view>
<view class="list-right">
@@ -113,7 +85,7 @@
<view class="popup-item">
<view class="popup-item-left">鏁伴噺:</view>
<view class="popup-item-right" style="border: none;justify-content: center;">
- <uni-number-box :value="count" :step='1' :max="9999999" color="#747474"
+ <uni-number-box :value="count" :step='1' :max="maxCount" color="#747474"
@change="changeValue" />
</view>
</view>
@@ -191,6 +163,7 @@
removeNum: 0,
orderNoList: [],
orderNo: '',
+ maxCount: 0
}
},
onShow() {
@@ -212,14 +185,35 @@
this.dataList[e].checked = ck ? false:true
},
getChecked() {
- var checkedList = []
- for(var i = 0; i < this.dataList.length; i++) {
- var t = !this.dataList[i].checked
- if (this.dataList[i].checked) {
- checkedList.push(this.dataList[i])
+ let _this = this
+ uni.navigateTo({
+ url: './orderSelect',
+ success(res) {
+ res.eventChannel.emit('matList', {
+ matList: _this.dataList
+ })
+ },
+ events: {
+ pickList: function(data) {
+ for (let k of data.data) {
+ let add = true
+ if (_this.dataList.length == 0) {
+ _this.dataList.push(k)
+ continue
+ }
+ for (let m of _this.dataList) {
+ if (k.matnr == m.matnr && k.orderNo == k.orderNo) {
+ add = false
+ }
+ }
+ if (add) {
+ k['maxCount'] = k.anfme
+ _this.dataList.push(k)
+ }
+ }
+ }
}
- }
- this.dataList = checkedList
+ })
},
getOrderDet() {
let that = this
@@ -459,6 +453,7 @@
this.count = this.dataList[i].anfme
this.batch = this.dataList[i].batch
this.weight = this.dataList[i].weight
+ this.maxCount = this.dataList[i].maxCount
this.rowNum = i
this.eject()
},
@@ -542,7 +537,7 @@
.code {
width: 100%;
position: fixed;
- min-height: 200rpx;
+ min-height: 100rpx;
background-color: #FFF;
z-index: 10;
}
@@ -583,7 +578,7 @@
width: 100%;
background-color: white;
position: fixed;
- margin-top: 200rpx;
+ margin-top: 100rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
--
Gitblit v1.9.1