Merge remote-tracking branch 'origin/nbncPda' into nbncPda

野心家

2025-01-06 a374e91194afc8d3c2be316c0e4fdbf55e5cd429

Merge remote-tracking branch 'origin/nbncPda' into nbncPda

 pages/order/orderPickConfirm2.vue

@@ -206,10 +206,28 @@
                        })
                    },
                    events: {
                        sMat: function(data) {
                            _this.dataList.push(data.data)
                            console.log(data);
                        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)
                                }
                            }
                        }
                        // sMat: function(data) {
                        //     _this.dataList.push(data.data)
                        //     console.log(data);
                        // }
                    }
                })
            },

 pages/order/pickOrderList.vue

@@ -26,8 +26,9 @@
                
            </view>
            <view class="code-title">
                <view></view>
                <view style="width: 100%;text-align: center;margin: 16rpx 0;">{{searchValue}} 总数量：- {{total}} -</view>
                <view style="flex: 1;"></view>
                <view style="flex: 1;width: 100%;text-align: center;margin: 16rpx 0;">{{searchValue}} 总数量：- {{total}} -</view>
                <view style="flex: 1;display: flex;align-items: center;"><button size="mini" type="primary" @click="allSelect()">{{seltitle}}</button></view>
            </view>
        </view>
        
@@ -36,12 +37,20 @@
                <view>No：{{index + 1}}</view>
                <view>订单号：{{orderDetl.orderNo}}</view>
                <view>料号：{{orderDetl.matnr}}</view>
                <view>料名：{{orderDetl.maktx}}</view>
                <view>批号：{{orderDetl.batch}}</view>
                <view>可用数量：{{orderDetl.count}}</view>
            </view>
            <view class="order__list__right" @click="addItem(orderDetl)">
                <uni-icons type="folder-add" size="25"  color="#fff"></uni-icons>
            <view class="order__list__right">
                <!-- <view class="order__list__right" @click="addItem(orderDetl)"> -->
                <label @click="checkboxChange(orderDetl)">
                    <checkbox :value="orderDetl.matnr" :checked="orderDetl.checked" style="transform:scale(0.7)" /><text></text>
                </label>
            </view>
        </view>
        <!-- 底部操作按钮 -->
        <view class="buttom">
            <button size="mini" type="primary" @click="addItems()">提取</button>
        </view>
        <view style="height: 100rpx;width: 100%;text-align: center;line-height: 100rpx;">- 已经到底了 -</view>
    </view>
@@ -59,7 +68,8 @@
                searchType: '物料',
                searchValue: '',
                dataList: [],
                selectedList: []
                selectedList: [],
                seltitle: '全选'
            }
        },
        onShow() {
@@ -81,6 +91,40 @@
        },
        methods: {
            back() { uni.navigateBack({}) },
            checkboxChange(e) {
                let items = this.dataList,
                values = e.matnr;
                if (e.checked) {
                    this.$set(e,'checked',false)
                } else {
                    this.$set(e,'checked',true)
                }
                var count = 0
                for (let k of items) {
                    if (k.checked) {
                        count++
                    }
                }
                if (count == items.length && count > 0) {
                    this.seltitle = '取消全选'
                } else {
                    this.seltitle = '全选'
                }
            },
            allSelect() {
                if (this.seltitle == '全选') {
                    for (let k of this.dataList) {
                        k.checked = true
                    }
                    this.seltitle = '取消全选'
                } else {
                    for (let k of this.dataList) {
                        k.checked = false
                    }
                    this.seltitle = '全选'
                }
				
            },
            set(e) {
                var ck = this.dataList[e].checked
                this.dataList[e].checked = ck ? false : true
@@ -121,12 +165,24 @@
                })
                
            },
            addItem(mat) {
                this.getOpenerEventChannel().emit('sMat', {data: mat});
            addItems() {
                let pickList = []
                for (let k of this.dataList) {
                    if (k.checked) {
                        pickList.push(k)
                    }
                }
                this.getOpenerEventChannel().emit('pickList', {data: pickList});
                uni.navigateBack({
                    
                })
            }
            },
            // addItem(mat) {
            //     this.getOpenerEventChannel().emit('sMat', {data: mat});
            //     uni.navigateBack({
					
            //     })
            // }
        }
    }
</script>