pages/order/orderDetlList.vue

@@ -89,25 +89,28 @@
                })
            },
            chose(item) {
                let that = this
                uni.navigateTo({
                    url: "../order/orderPakin2",
                    success: function(res) {
                        // 通过eventChannel向被打开页面传送数据   向另外一个页面传递值的
                        res.eventChannel.emit('orderItem', {
                            item: item
                        })
                    },
                    events: {
                        // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据  另外一个页面传过来的
                        acceptDataFromOpenedPage: function(data) {
                            // that.matnr = data.data
                            // that.input(that.matnr)
                        },
                    },
                // let that = this
                // uni.navigateTo({
                //     url: "../order/orderPakin2",
                //     success: function(res) {
                //         // 通过eventChannel向被打开页面传送数据   向另外一个页面传递值的
                //         res.eventChannel.emit('orderItem', {
                //             item: item
                //         })
                //     },
                //     events: {
                //         // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据  另外一个页面传过来的
                //         acceptDataFromOpenedPage: function(data) {
                //             // that.matnr = data.data
                //             // that.input(that.matnr)
                //         },
                //     },
                
                
                });
                // });
                uni.navigateBack({
					
                })
            }
        }
    }

 pages/order/orderList.vue

@@ -5,16 +5,16 @@
            <uni-search-bar v-model="condition" placeholder=" 扫码 / 输入" bgColor="#EEEEEE" @confirm="search" />
        </view>        
        <view>
            <view class="tag-list" v-for="(item,i) in matList" :key="i" @click="toPrint(item)">
            <view class="tag-list" v-for="(item,i) in matList" :key="i"  >
                <view class="tag">
                    <view style="display: flex;">
                        <view class="wms-tag" :style="baColor" >单据</view>
                        <view class="wms-tag" :style="baColor" @click="findBySelect(item.orderNo)">选择单据</view>
                    </view>
                </view>
                <view class="tag-item">单据号： {{item.orderNo}}</view>
                <view class="tag-item">单据类型： {{item.docType$}}</view>
                <view class="tag-item">单据状态： {{item.settle$}}</view>
                <view class="tag-item">仓库： {{item.itemName}}</view>
                <view class="tag-item" @click="findBySelect(item.orderNo)">单据号： {{item.orderNo}}</view>
                <view class="tag-item" @click="findBySelect(item.orderNo)">单据类型： {{item.docType$}}</view>
                <view class="tag-item" @click="findBySelect(item.orderNo)">单据状态： {{item.settle$}}</view>
                <view class="tag-item" @click="toPrint(item)"><a >详    情</a></view>
            </view>
        </view>
        <uni-load-more v-show="matList.length != 0" :status="status" :icon-size="16" :content-text="contentText" />
@@ -206,6 +206,14 @@
                
                
                });
            },
			
            findBySelect(matnr) {
                this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: matnr});
                uni.navigateBack({
					
                })
				
            }
        }
    }

 pages/order/orderList2.vue

New file
@@ -0,0 +1,246 @@
<template>
    <view>
        <!-- 搜索框 -->
        <view class="search-bar">
            <uni-search-bar v-model="condition" placeholder=" 扫码 / 输入" bgColor="#EEEEEE" @confirm="search" />
        </view>		
        <view>
            <view class="tag-list" v-for="(item,i) in matList" :key="i" @click="toPrint(item)">
                <view class="tag">
                    <view style="display: flex;">
                        <view class="wms-tag" :style="baColor" >单据</view>
                    </view>
                </view>
                <view class="tag-item">单据号： {{item.orderNo}}</view>
                <view class="tag-item">单据类型： {{item.docType$}}</view>
                <view class="tag-item">单据状态： {{item.settle$}}</view>
                <view class="tag-item">仓库： {{item.itemName}}</view>
            </view>
        </view>
        <uni-load-more v-show="matList.length != 0" :status="status" :icon-size="16" :content-text="contentText" />
    </view>
</template>

<script>
    export default {
        data() {
            return {
                tagList: [],
                matList: [],
                condition: '',
                reload: false,
                curr:1,
                tag: '分类',
                baColor: "background-color: #0081ff;",
                desc: '商品编号:',
                baseUrl: '',
                token: '',
                status: 'more',
                contentText: {
                    contentdown: '上拉加载更多',
                    contentrefresh: '加载中',
                    contentnomore: '没有更多'
                },
                // 当前tagId
                tagIdNow: 1,
				
            }
        },
        onReachBottom() {
            this.status = 'more';
            this.showMat(this.tagIdNow);
        },
        onLoad() {
            // 没啥用了
            let that = this
            // const eventChannel = this.$scope.eventChannel; // 兼容APP-NVUE
            const eventChannel = this.getOpenerEventChannel();
			
            // 监听acceptDataFromOpenerPage事件，获取上一页面通过eventChannel传送到当前页面的数据
            eventChannel.on('commonUrl', function(data) {
                that.commonUrl = data.commonUrl
            })
        },
        onShow() {
            this.baseUrl = uni.getStorageSync('baseUrl');
            this.token = uni.getStorageSync('token');
            this.showMat(1)
        },
        methods: {
            search() {
                let that = this
                uni.request({
                    url: that.baseUrl + '/order/search/pda/auth',
                    data: {
                        condition: that.condition
                    },
                    method:"GET",
                    header: {
                        'token':uni.getStorageSync('token'),
                    },
                    success(result) {
                        console.log(result);
                        var res = result.data
                        if (res.code === 200 ) {
                            that.matList = res.data
                            // that.save()
                        } else if (res.code == 403) {
                            uni.showToast({title: res.msg, icon: "none", position: 'top'})
                            setTimeout(() => {
                                uni.reLaunch({
                                    url: '../login/login'
                                });
                            }, 1000);
                        } else {
                            uni.showToast({title: res.msg, icon: "none",position: 'top'})
                        }
                    }
                });
            },
            showTag(parentId) {
                let that = this
                uni.request({
                    url: that.baseUrl + '/tag/list/pda/auth',
                    header: {
                        'token':uni.getStorageSync('token'),
                    },
                    data: {
                        limit: 100000,
                        parentId: parentId
                    },
                    header: {
                        'token':uni.getStorageSync('token'),
                    },
                    success(result) {
                        that.tagList = null
                        that.matList = []
                        var res = result.data
                        if (res.code === 200) {
                            if (res.data != null && res.data.length > 0) {
                                that.tagList = res.data
                            } else {
                                that.showMat(parentId)
                            }
                            that.baColor = "background-color: #0081ff;"
                        } else if (res.code === 403 ) {
                            uni.showToast({title: res.msg, icon: "none", position: 'top'})
                            setTimeout(() => {
                                uni.reLaunch({
                                    url: '../login/login'
                                });
                            }, 1000);
                        } else {
                            uni.showToast({title: res.msg, icon: "none",position: 'top'})
                        }
                    }
                });
            },
            showMat(tagId) {
                let that = this				
                // wms端 补接口
                // @RequestMapping(value = "/mat/list/pda/page/auth")
                // @ManagerAuth
                // public R pdaPageList(@RequestParam(required = true)Long tagId,
                //                      @RequestParam(defaultValue = "1")Integer curr,
                //                      @RequestParam(defaultValue = "10")Integer limit){
                //     EntityWrapper<Mat> wrapper = new EntityWrapper<>();
                //     wrapper.eq("tag_id", tagId);
                //     wrapper.orderBy("create_time", false);
                //     return R.ok().add(matService.selectPage(new Page<>(curr, limit), wrapper));
                // }
                uni.request({
                    url: that.baseUrl + '/order/list/pda/page/auth',
                    data: {
                        curr:that.curr,
                        limit: 100,
                        tagId: tagId
                    },
                    method:"GET",
                    header: {
                        'token':uni.getStorageSync('token'),
                    },
                    success(result) {
                        that.tagList = null
                        var res = result.data
                        if (res.code === 200) {
                            if (res.data.records != null && res.data.records.length > 0) {
                                let list = res.data.records
                                that.matList = that.reload ? list : that.matList.concat(list);
                                that.curr = that.curr + 1
                            }
                            if (res.data.records.length == 0) {
                                that.status = 'noMore'
                            }
                            that.baColor = "background-color: #1cbbb4;"
                        } else if (res.code === 403 ) {
                            uni.showToast({title: res.msg, icon: "none", position: 'top'})
                            setTimeout(() => {
                                uni.reLaunch({
                                    url: '../login/login'
                                });
                            }, 1000);
                        } else {
                            uni.showToast({title: res.msg, icon: "none",position: 'top'})
                        }
						
                    }
                });
            },
            toPrint(item) {
                let that = this
                uni.navigateTo({
                    url: "../order/orderDetlList",
                    success: function(res) {
                        // 通过eventChannel向被打开页面传送数据   向另外一个页面传递值的
                        res.eventChannel.emit('data', {
                            data: item
                        })
                    },
                    events: {
                        // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据  另外一个页面传过来的
                        acceptDataFromOpenedPage: function(data) {
                            that.matnr = data.data
                            that.findMat(that.matnr)
                        },
                    },
				
				
                });
            }
        }
    }
</script>

<style>
    @import url('../../static/css/wms.css/wms.css');
    .tag-list {
        width: 94%;
        min-height: 160rpx;
        margin: 10px auto;
        background-color: #FFF;
        border-radius: 5px;
        box-shadow: 0 5upx 20upx rgba(0, 0, 0, 0.2);
    }
    .tag {
        display: flex;
        flex-direction: column;
        min-height: 80rpx;
        border-bottom: 1px solid #e2e2e2;
    }
    .wms-tag {
        min-width: 60rpx;
        margin-left: 50rpx;
        margin-top: 30rpx;
        color: #FFF;
        font-size: 14px;
        padding: 4rpx 12rpx;
    }
    .tag-item {
        width: 100%;
        min-height: 60rpx;
        line-height: 2;
        padding-left: 50rpx;
        color: #606266;
        font-size: 14px;
    }
</style>

 pages/pakin/pakin.vue

@@ -2,6 +2,16 @@
    <view>
        <view class="code">
            <view class="item">
                <view class="code-decs">单据编号:</view>
                <input type="text" placeholder=" 扫码 / 输入" v-model="orderNo" 
                    @input="barcodeInput()">
                    <view class="item-right">
                        <button></button>
                        <text style="text-align: right;color: #409EFF;" @click="selectOrder()">提取+</text>
                        <uni-icons type="right" color="#c1c1c1"></uni-icons>
                    </view>
            </view>
            <view class="item">
                <view class="code-decs">托盘码:</view>
                <input type="text" placeholder=" 扫码 / 输入" v-model="barcode" :focus="barcodeFocus"
                    @input="barcodeInput()">
@@ -11,8 +21,8 @@
                <input type="text" placeholder=" 扫码 / 输入" v-model="matnr" :focus="matFocus" @input="findMat()">
                <view class="item-right">
                    <button></button>
                    <text style="text-align: right;color: #409EFF;" @click="selectMat()">提取+</text>
                    <uni-icons type="right" color="#c1c1c1"></uni-icons>
                    <!-- <text style="text-align: right;color: #409EFF;" @click="selectMat()">提取+</text> -->
                    <!-- <uni-icons type="right" color="#c1c1c1"></uni-icons> -->
                </view>
            </view>
            <!-- <view class="item">
@@ -67,9 +77,13 @@
                        <view class="desc">数量：</view>
                        <view class="left-item">{{item.anfme}}</view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">条码：</view>
                        <view class="left-item">{{item.threeCode}}</view>
                    </view>
                </view>
                <view class="list-right">
                    <uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
                    <!-- <uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons> -->
                    <uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
                </view>
            </view>
@@ -155,6 +169,8 @@
                dataList: [],
                count: 0,
                rowNum: '',
                orderNo: '',
                matnr: '',
                matnr: '',
                batch: '',
                weight: '',
@@ -163,7 +179,8 @@
                messageText: '',
                title: '',
                content: '',
                barcodeFocus: true,
                orderNoFocus: true,
                barcodeFocus: false,
                matFocus: false,
                matData: '',
                removeNum: 0,
@@ -222,14 +239,16 @@
                    this.matFocus = true;
                }, 100);
            },
			
            // 搜索物料
            findMat() {
                let that = this				
                let m = that.matnr.split(";")	
                let matnr1 = m[0].slice(3)
                let batch1 = m[1].slice(3)
                let that = this		
                let matnr1 = that.matnr
                // let m = that.matnr.split(";")	
                // let matnr1 = m[0].slice(3)
                // let batch1 = m[1].slice(3)
                uni.request({
                    url: that.baseUrl + '/mat/auth',
                    url: that.baseUrl + '/mat/tiaoma/auth',
                    data: {
                        matnr: matnr1
                    },
@@ -241,24 +260,28 @@
                        if (result.code === 200 && result.data) {
                            that.matData = result.data
                            that.matnr = ''
                            that.matData['batch'] = ''
                            result.data['batch'] = batch1
                            uni.navigateTo({
                                url: "../mat/matSelected",
                                // 通过eventChannel向被打开页面传送数据
                                success: function(res) {
                                    res.eventChannel.emit('mat', {
                                        data: result.data,										
                                    })
                                },
                                // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
                                events: {
                                    matList: function(data) {
                                        that.checkMat(data.data)
                                        that.focuss()
                                    },
                                },
                            });
                            that.matData['batch'] = result.data.unit
                            that.matData['anfme'] = result.data.safeQty
                            that.matData['threeCode'] = result.data.memo
							
                            that.checkMat(that.matData)
                            that.focuss()
                            // uni.navigateTo({
                            //     url: "../mat/matSelected",
                            //     // 通过eventChannel向被打开页面传送数据
                            //     success: function(res) {
                            //         res.eventChannel.emit('mat', {
                            //             data: result.data,										
                            //         })
                            //     },
                            //     // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
                            //     events: {
                            //         matList: function(data) {
                            //             that.checkMat(data.data)
                            //             that.focuss()
                            //         },
                            //     },
                            // });
                        } else if (result.code == 403) {
                            uni.showToast({
                                title: result.msg,
@@ -304,33 +327,55 @@
                });
                that.matnr = ''
            },
            selectOrder() {
                let that = this
                uni.navigateTo({
                    url: "../order/orderList",
                    success: function(res) {
                        // 通过eventChannel向被打开页面传送数据   向另外一个页面传递值的
                        res.eventChannel.emit('commonUrl', {
                            commonUrl: ''
                        })
                    },
                    events: {
                        // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据  另外一个页面传过来的
                        acceptDataFromOpenedPage: function(data) {
                            that.orderNo = data.data
                            //that.findMat(that.matnr)
                        },
                    },
			
			
                });
                that.orderNo = ''
            },
            checkMat(mat) {
                var len = this.dataList.length
                var add = true ,sameItem = false
                for (var i = 0; i < len; i++) {
                    if (mat.matnr == this.dataList[i].matnr) {
                        for (var j = 0; j < len; j++) {
                            if (mat.batch == this.dataList[j].batch) {
                                sameItem = true
                            }
                        }
                        // 相同物料 不同批号  新加列表
                        if (mat.batch != this.dataList[i].batch) {
                            this.$forceUpdate() // 强制刷新
                            if (sameItem) {
                                add = false
                            } else {
                                add = true
                            }
                // for (var i = 0; i < len; i++) {
                //     if (mat.matnr == this.dataList[i].matnr) {
                //         for (var j = 0; j < len; j++) {
                //             if (mat.batch == this.dataList[j].batch) {
                //                 sameItem = true
                //             }
                //         }
                //         // 相同物料 不同批号  新加列表
                //         if (mat.batch != this.dataList[i].batch) {
                //             this.$forceUpdate() // 强制刷新
                //             if (sameItem) {
                //                 add = false
                //             } else {
                //                 add = true
                //             }
                            
                        } else {
                            // 相同物料相同批号 数量累加
                            this.dataList[i].anfme += mat.anfme
                            this.$forceUpdate() // 强制刷新
                            add = false
                        }
                    }
                }
                //         } else {
                //             // 相同物料相同批号 数量累加
                //             this.dataList[i].anfme += mat.anfme
                //             this.$forceUpdate() // 强制刷新
                //             add = false
                //         }
                //     }
                // }
                if (add) {
                    this.dataList.unshift(mat)
                }
@@ -393,6 +438,11 @@
            comb() {
                uni.vibrateShort();
                let that = this;
                if (that.orderNo === '') {
                    this.messageText = "请扫描订单编号"
                    this.messageToggle('error')
                    return;
                }
                if (that.barcode === '') {
                    this.messageText = "请扫描托盘条码"
                    this.messageToggle('error')
@@ -413,7 +463,8 @@
                uni.request({
                    url: that.baseUrl + '/mobile/comb/auth',
                    data: JSON.stringify({
                        barcode: that.barcode,						
                        barcode: that.barcode,
                        orderNo: that.orderNo,							
                        combMats: that.dataList
                    }),
                    method: 'POST',