#
zjj
3 天以前 e042325822ddd556f36f58f8e4df81f6515a4111
#
2个文件已添加
2个文件已修改
722 ■■■■■ 已修改文件
pages.json 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/home.vue 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/out/orderGift2.vue 127 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/out/orderGiftDetls2.vue 557 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages.json
@@ -250,6 +250,23 @@
                "enablePullDownRefresh": false
            }
            
        },{
            "path" : "pages/out/orderGift2",
            "style" :
            {
                "navigationBarTitleText": "核对单据列表",
                "enablePullDownRefresh": false
            }
        }
        ,{
            "path" : "pages/out/orderGiftDetls2",
            "style" :
            {
                "navigationBarTitleText": "扫描条码",
                "enablePullDownRefresh": false
            }
        }
    ],
    "globalStyle": {
pages/home/home.vue
@@ -52,13 +52,13 @@
                        cuIcon: 'pullup',
                        url: '/order/orderPakin2'
                    },
                    {
                        title: '手动入库',
                        name: 'handIn',
                        color: 'olive',
                        cuIcon: 'pullup',
                        url: '/out/handIn'
                    },
                    // {
                    //     title: '手动入库',
                    //     name: 'handIn',
                    //     color: 'olive',
                    //     cuIcon: 'pullup',
                    //     url: '/out/handIn'
                    // },
                    {
                        title: '核对单据',
                        name: 'orderGift',
@@ -66,6 +66,13 @@
                        cuIcon: 'pullup',
                        url: '/out/orderGift'
                    },
                    {
                        title: '核对',
                        name: 'orderGift2',
                        color: 'orange',
                        cuIcon: 'pullup',
                        url: '/out/orderGift2'
                    },
                    // {
                    //     title: '组托入库',
                    //     name: 'pakin',
pages/out/orderGift2.vue
New file
@@ -0,0 +1,127 @@
<template>
    <view>
        <view class="code">
            <uni-search-bar :focus="searchValueFocus" v-model="searchValue"
                maxlength="500" ancel="cancel" @confirm="searchValueInput2()" @clear="clear" placeholder="输入 / 扫描 订单号">
            </uni-search-bar>
            <view class="list" v-for="(item,index) in dataList">
                <view class="list-left">
                    <view >
                        <text style="">单据编号:</text>
                        <text style="font-size: 18px;font-weight: 600;color: #333;">{{item.orderNo}}</text>
                    </view>
                    <view>类型:{{item.docType$}}</view>
                    <view>创建时间:{{item.createTime$}}</view>
                </view>
                <view class="list-right" @click="toDetls(index)">
                    <uni-icons type="right" size="25"  color="#55aaff"></uni-icons>
                </view>
            </view>
        </view>
        <view style="height: 20px;"></view>
    </view>
</template>
<script>
    export default {
        data() {
            return {
                baseUrl: '',
                token: '',
                searchValue: '',
                searchValueFocus: false,
                dataList: [],
                data: {
                    curr: 1,
                    limit: 10,
                    order_no: '',
                }
            }
        },
        onShow() {
            this.baseUrl = uni.getStorageSync('baseUrl');
            this.token = uni.getStorageSync('token');
            this.getOrder()
        },
        // 下拉刷新
        onReachBottom() {
            this.status = 'more';
            this.getOrder(this.searchValue,10);
        },
        methods: {
            getOrder(threeCode,limit) {
                let _this = this
                _this.data.order_no = threeCode
                _this.data.limit = limit
                uni.request({
                    url: `${_this.baseUrl}/orderGift/head/page/auth`,
                    header: {'token': uni.getStorageSync('token')},
                    data: _this.data,
                    method:'GET',
                    success(res) {
                        res = res.data
                        console.log(res);
                        if (res.code === 200) {
                            let list = res.data.records
                            _this.dataList =  _this.dataList.concat(list);
                            _this.data.curr = _this.data.curr + 1
                        }
                    }
                })
            },
            searchValueInput2() {
                this.dataList = []
                this.data.curr = 1
                if (this.searchValue.length == 0) {
                    this.getOrder(this.searchValue,10)
                } else {
                    this.getOrder(this.searchValue,10)
                }
            },
            clear() {
                this.dataList = []
                this.data.curr = 1
                setTimeout(()=> {
                    this.getOrder(this.searchValue,10)
                },300)
            },
            toDetls(index) {
                let _this = this
                uni.navigateTo({
                    url: './orderGiftDetls2',
                    success(res) {
                        res.eventChannel.emit('item', {
                            item: _this.dataList[index]
                        })
                    },
                })
            }
        }
    }
</script>
<style>
    .list {
        margin: 20rpx;
        font-size: 14px;
        background-color: #fff;
        border-radius: 20rpx;
        border: 1px solid #eeeeee;
        display: flex;
        position: relative;
    }
    .list-left {
        flex: 1;
        padding: 20rpx;
        position: relative;
    }
    .list-right {
        width: 70rpx;
        border-left: 1px solid #eeeeee;
        display: flex;
        align-items: center;
        justify-content: center;
    }
</style>
pages/out/orderGiftDetls2.vue
New file
@@ -0,0 +1,557 @@
<template>
    <view>
        <view class="code">
            <view class="item">
                <view class="code-decs">订单号:</view>
                <span>{{orderNo}}</span>
            </view>
            <view class="item">
                <view class="code-decs">条码:</view>
                <textarea style="background-color: #f0f0f0;max-height: 100rpx;padding: 4px;margin: 4px;"
                    type="textarea" placeholder=" 扫码 / 输入" maxlength="1000" v-model="barcode" :focus="barcodeFocus"
                    @input="analysis()" />
            </view>
        </view>
        <scroll-view>
            <view class="list" v-for="(item,i) in dataList" :key="i">
                <view class="list-left">
                    <view class="list-left-item">
                        <view class="desc">箱号:</view>
                        <view class="left-item">{{item.boxNo}}</view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">净重:</view>
                        <view class="left-item">{{item.netWeight}}</view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">状态:</view>
                        <view class="left-item">
                            <uni-tag :text="item.msg" :type="deadTimeType"></uni-tag>
                        </view>
                    </view>
                </view>
            </view>
        </scroll-view>
        <!-- 底部操作按钮 -->
        <!-- 弹窗 -->
        <!-- 修改数量 -->
        <view>
            <uni-popup ref="revise" type="dialog">
                <view class="popup">
                    <!-- 标题 -->
                    <view class="title">修改</view>
                    <view class="popup-item">
                        <view class="popup-item-left">编码:</view>
                        <view class="popup-item-right">
                            <input type="text" v-model="matnr" disabled="true"
                                style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
                        </view>
                    </view>
                    <!-- <view class="popup-item">
                        <view class="popup-item-left">批号:</view>
                        <view class="popup-item-right"><input type="text" v-model="batch"></view>
                    </view> -->
                    <!-- <view class="popup-item">
                        <view class="popup-item-left">重量:</view>
                        <view class="popup-item-right"><input type="text" v-model="weight"></view>
                    </view> -->
                    <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='0.01' :max="9999999" color="#747474" @change="changeValue" />
                        </view>
                    </view>
                    <view class="btn">
                        <view class="btn-left" @click="reviseClose">取消</view>
                        <view class="btn-right" @click="reviseConfirm()">修改</view>
                    </view>
                </view>
            </uni-popup>
        </view>
        <!-- 移除确认 -->
        <view>
            <!-- 提示窗示例 -->
            <uni-popup ref="alertDialog" type="dialog">
                <uni-popup-dialog :type="msgType" confirmText="移除" :title="title" :content="content"
                    @confirm="removeConfirm()" @close="removeClose"></uni-popup-dialog>
            </uni-popup>
        </view>
        <view>
            <!-- 提示信息弹窗 -->
            <uni-popup ref="message" type="message">
                <uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
            </uni-popup>
        </view>
        <!-- 确认确认 -->
        <view>
            <uni-popup ref="combConfirm" type="dialog">
                <uni-popup-dialog :type="msgType" cancelText="取消" confirmText="确认" :title="title" :content="content"
                    @confirm="comb" @close="combClose"></uni-popup-dialog>
            </uni-popup>
        </view>
        <!-- 确认重置 -->
        <view>
            <uni-popup ref="resetConfirm" type="dialog">
                <uni-popup-dialog :type="msgType" cancelText="取消" confirmText="确认" :title="title" :content="content"
                    @confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
            </uni-popup>
        </view>
    </view>
</template>
<script>
    export default {
        data() {
            return {
                baseUrl: '',
                token: '',
                barcode: '',
                dataList: [],
                count: 0,
                rowNum: '',
                matnr: '',
                batch: '',
                weight: '',
                msgType1: 'success',
                msgType: 'success',
                messageText: '',
                title: '',
                content: '',
                barcodeFocus: true,
                matFocus: false,
                matData: '',
                removeNum: 0,
                targetBatch: '',
                deadTimeType: 'error',
                orderNo:''
            }
        },
        onLoad() {
            let _this = this
            const eventChannel = _this.getOpenerEventChannel();
            // 监听acceptDataFromOpenerPage事件,获取上一页面通过eventChannel传送到当前页面的数据
            eventChannel.on('item', function(data) {
                _this.orderNo = data.item.orderNo
            })
        },
        onShow() {
            this.baseUrl = uni.getStorageSync('baseUrl');
            this.token = uni.getStorageSync('token');
        },
        methods: {
            messageToggle(type) {
                this.msgType1 = type
                this.$refs.message.open()
            },
            analysis() {
                let _this = this
                var matObj= {
                    rollNo: '', // 卷号
                    boxNo: '', // 箱号
                    specs: '', // 规格
                    length: '', // 长度
                    netWeight: '', // 净重
                    grossWeight: '', // 毛重
                    splices: '', // 接头 个
                }
                // 创建一个 Map 对象
                const resultMap = new Map();
                // 使用换行符作为分隔符分割字符串
                const lines = this.barcode.split('\n');
                console.log(lines);
                lines.forEach(line => {
                    // 使用中文冒号作为分隔符
                    const match = line.split(':');
                    if (match.length === 2) {
                        const key = match[0].trim(); // 中文部分作为键
                        const value = match[1].trim(); // 后面的字符串作为值
                        resultMap.set(key, value); // 将键值对存入 Map
                    }
                });
                // 输出结果
                console.log(resultMap);
                // 如果需要将 Map 转换为普通对象
                const resultObject = Object.fromEntries(resultMap);
                console.log(resultObject.净重);
                console.log(lines);
                matObj.rollNo = resultObject.卷号
                matObj.boxNo = resultObject.箱号
                matObj.specs = resultObject.规格
                matObj.length = resultObject.长度
                matObj.netWeight = resultObject.净重
                matObj.grossWeight = resultObject.毛重
                matObj.splices = resultObject.接头
                matObj.orderNo = this.orderNo
                console.log(matObj);
                this.barcodeInput(matObj)
                // this.checkMatObj(matObj)
                this.barcodeFocus = false;
                this.matFocus = false;
                setTimeout(() => {
                    this.matnr = '';
                    this.matFocus = true;
                }, 100);
            },
            checkMatObj(mat) {
                var len = this.dataList.length
                var add = true
                for    (let k of this.dataList) {
                    if (mat.boxNo == k.boxNo) {
                        add = false
                    }
                }
                if (add) {
                    this.dataList.unshift(mat)
                }
            },
            // barcode input 事件
            barcodeInput(code) {
                let _this = this
                let newBarcode =  code
                uni.request({
                    url: _this.baseUrl + '/mobile/order/search/batch/new/auth',
                    header: {'token': uni.getStorageSync('token')},
                    data: newBarcode,
                    method:'POST',
                    success(res) {
                        res = res.data
                        if (res.code === 200) {
                            let items = {                                 boxNo: code.boxNo,                                 netWeight: code.netWeight,                                 msg : res.msg                             }
                            _this.dataList.push(items)
                            _this.barcodeFocuss();
                        } else if (res.code == 403) {
                            _this.messageText = res.msg
                            _this.messageToggle('error')
                            setTimeout(() => {
                                uni.reLaunch({
                                    url: '../login/login'
                                });
                            }, 1000);
                        } else {
                            let items = {
                                boxNo: code.boxNo,
                                netWeight: code.netWeight,
                                msg : res.msg
                            }
                            _this.dataList.push(items)
                            _this.barcodeFocuss();
                        }
                    }
                })
            },
            // 托盘码有误重置
            barcodeFocuss() {
                let that = this;
                that.barcodeFocus = false;
                setTimeout(() => {
                    that.barcode = '';
                    that.barcodeFocus = true;
                }, 100);
            },
            // 商品光标清空重置
            focuss() {
                this.focus = false;
                setTimeout(() => {
                    this.matnr = '';
                    this.matFocus = true;
                }, 100);
            },
            // 搜索物料
            findMat() {
                let that = this
                uni.request({
                    url: that.baseUrl + '/mat/auth',
                    data: {
                        matnr: that.matnr
                    },
                    header: {
                        'token': uni.getStorageSync('token')
                    },
                    success(result) {
                        result = result.data
                        if (result.code === 200 && result.data) {
                            that.matData = result.data
                            that.matnr = ''
                            that.matData['batch'] = ''
                            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,
                                icon: "none",
                                position: 'top'
                            })
                            setTimeout(() => {
                                uni.reLaunch({
                                    url: '../login/login'
                                });
                            }, 1000);
                        } else {
                            uni.showToast({
                                title: result.msg,
                                icon: "none",
                                position: 'top'
                            })
                        }
                    }
                });
            },
            selectMat() {
                let that = this
                uni.navigateTo({
                    url: "../mat/matQuery",
                    success: function(res) {
                        // 通过eventChannel向被打开页面传送数据   向另外一个页面传递值的
                        res.eventChannel.emit('commonUrl', {
                            commonUrl: ''
                        })
                    },
                    events: {
                        // 为指定事件添加一个监听器,获取被打开页面传送到当前页面的数据  另外一个页面传过来的
                        acceptDataFromOpenedPage: function(data) {
                            that.matnr = data.data
                            that.findMat(that.matnr)
                        },
                    },
                });
                that.matnr = ''
            },
            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
                            }
                        } else {
                            // 相同物料相同批号 数量累加
                            this.dataList[i].anfme += mat.anfme
                            this.$forceUpdate() // 强制刷新
                            add = false
                        }
                    }
                }
                if (add) {
                    this.dataList.unshift(mat)
                }
            },
            // 修改批号
            revise(item, i) {
                this.matnr = this.dataList[i].matnr
                this.count = this.dataList[i].anfme
                this.batch = this.dataList[i].batch
                this.weight = this.dataList[i].weight
                this.rowNum = i
                this.eject()
            },
            eject(type) {
                this.type = type
                this.$refs.revise.open(type)
            },
            // 列表移除按钮
            remove(item, i, type) {
                this.removeNum  = i
                this.msgType = type
                this.title = '警告'
                this.content = '是否移除当前商品!'
                this.$refs.alertDialog.open(i)
            },
            // 确认移除
            removeConfirm() {
                this.messageText = "移除成功"
                this.messageToggle('success')
                this.dataList.splice(this.removeNum, 1)
            },
            // 取消移除
            removeClose() {
                this.$refs.alertDialog.close()
            },
            reviseConfirm() {
                this.dataList[this.rowNum].anfme = this.count
                this.dataList[this.rowNum].batch = this.batch
                this.dataList[this.rowNum].weight = this.weight
                this.matnr = ''
                this.messageText = "修改成功"
                this.messageToggle('success')
                this.$refs.revise.close()
            },
            reviseClose() {
                this.$refs.revise.close()
            },
            changeValue(value) {
                this.count = value
            },
            combConfirm(type) {
                this.msgType = type
                this.title = '警告'
                this.content = '是否现在确认!'
                this.$refs.combConfirm.open()
            },
            combClose() {
                this.$refs.combConfirm.close()
            },
            comb() {
                let that = this;
                console.log(that.dataList[0]);
                var matObj= {
                    rollNo: that.dataList[0].model, // 卷号
                    boxNo: that.dataList[0].batch, // 箱号
                    specs: that.dataList[0].matnr, // 规格
                    length: that.dataList[0].price, // 长度
                    netWeight: that.dataList[0].weight, // 净重
                    grossWeight: that.dataList[0].volume, // 毛重
                    splices: that.dataList[0].specs, // 接头 个
                }
                uni.request({
                    url: that.baseUrl + '/mobile/order/search/batch/auth',
                    data: matObj,
                    method: 'POST',
                    header: {'token': uni.getStorageSync('token')},
                    success(result) {
                        let res = result.data
                        if (res.code === 200) {
                            that.dataList = []
                            that.barcode = ''
                            that.messageText = "确认成功"
                            that.messageToggle('success')
                        } else if (res.code == 403) {
                            that.messageText = res.msg
                            that.messageToggle('error')
                            setTimeout(() => {
                                uni.reLaunch({
                                    url: '../login/login'
                                });
                            }, 1000);
                        } else {
                            that.messageText = res.msg
                            that.messageToggle('error')
                        }
                    }
                });
            },
            reset(type) {
                this.msgType = type
                this.title = '警告'
                this.content = '是否重置!'
                this.$refs.resetConfirm.open()
            },
            // 确认重置
            resetConfirm() {
                this.dataList = []
                this.barcode = ''
                this.targetBatch = ''
                this.messageText = "重置完成"
                this.messageToggle('success')
            },
            // 取消重置
            resetClose() {
            },
            // 清空
            resst() {
                this.dataList = []
                this.barcode = ''
                this.targetBatch = ''
                this.barcodeFocuss()
            },
        }
    }
</script>
<style>
    @import url('../../static/css/wms.css/wms.css');
    .list:first-child {
        margin-top: 320rpx;
    }
    .code {
        width: 100%;
        position: fixed;
        min-height: 100rpx;
        background-color: #FFF;
        z-index: 10;
    }
    .item {
        display: flex;
        align-items: center;
        height: 130rpx;
        margin-left: 20rpx;
        border-bottom: 1px solid #DCDFE6;
    }
    .item input {
        height: 50rpx;
        line-height: 50rpx;
        /* font-family: PingFang SC; uniapp 默认字体不居中 */
        font-size: 36upx;
        font-family: PingFang SC;
        width: 55vw;
    }
    .code-decs {
        width: 20vw;
        font-size: 18px;
        color: #303133;
    }
    .item-right {
        margin-left: auto;
        margin-right: 20rpx;
    }
    .mat-list-title {
        height: 80rpx;
        line-height: 80rpx;
        width: 100%;
        background-color: white;
        position: fixed;
        margin-top: 130rpx;
        z-index: 9;
        /* border-top: 1px solid #DCDFE6; */
        text-align: center;
        box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
    }
</style>