#
zjj
2024-12-27 130a6f0e125a29223131cd8749203a7826d8cf86
#
6个文件已修改
289 ■■■■■ 已修改文件
pages/home/home.vue 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/mat/matList.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/order/orderDetlList.vue 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/order/orderList.vue 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/order/orderPakin2.vue 132 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/stock/stockCheck.vue 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/home.vue
@@ -58,6 +58,12 @@
                        color: 'orange',
                        cuIcon: 'order',
                        url: '/AGV/AGVUnbind'
                    },{
                        title: '盘点',
                        name: 'stockCheck',
                        color: 'red',
                        cuIcon: 'post',
                        url: '/stock/stockCheck'
                    },
                    // {
                    //     title: '组托上架',
@@ -95,12 +101,7 @@
                    //     url: '/stock/stockQuery'
                    // },
                    // {
                    //     title: '盘点',
                    //     name: 'stockCheck',
                    //     color: 'red',
                    //     cuIcon: 'post',
                    //     url: '/stock/stockCheck'
                    // },
                    // {
                    //     title: '商品打印',
                    //     name: 'matList',
pages/mat/matList.vue
@@ -75,6 +75,7 @@
        },
        methods: {
            search() {
                console.log("1")
            },
            showTag(parentId) {
                let that = this
pages/order/orderDetlList.vue
@@ -1,5 +1,9 @@
<template>
    <view>
        <!-- 搜索框 -->
        <view class="search-bar">
            <uni-search-bar v-model="condition" placeholder=" 扫码 / 输入" bgColor="#EEEEEE" @input="search" />
        </view>
        <view class="card" v-show="item.enableQty >0" v-for="item in menuList" @click="chose(item)">
            <view class="tag-item">单据号: {{item.orderNo}}</view>
            <view class="tag-item">物料码: {{item.matnr}}</view>
@@ -16,7 +20,8 @@
    export default {
        data() {
            return {
                data:'',
                data:'',
                condition:'',
                menuList: [],
                order:'',
                baseUrl: '',
@@ -33,9 +38,42 @@
        },
        onShow() {
            let that = this
            this.baseUrl = uni.getStorageSync('baseUrl');
            this.token = uni.getStorageSync('token');
            that.getOrderNoList(that.order)
        },
        methods: {
            search(){
                let that = this
                uni.request({
                    url: that.baseUrl + '/orderDetl/search/pda/auth',
                    data: {
                        condition: that.condition,
                        order: that.order.orderNo
                    },
                    // method:"GET",
                    header: {
                        'token':uni.getStorageSync('token'),
                    },
                    success(result) {
                        console.log(result);
                        var res = result.data
                        if (res.code === 200 ) {
                            that.menuList = 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'})
                        }
                    }
                });
            },
            getOrderNoList(order) {
                let that = this
                uni.request({
pages/order/orderList.vue
@@ -2,7 +2,7 @@
    <view>
        <!-- 搜索框 -->
        <view class="search-bar">
            <uni-search-bar placeholder=" 扫码 / 输入" bgColor="#EEEEEE" @confirm="search" />
            <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)">
@@ -27,6 +27,7 @@
            return {
                tagList: [],
                matList: [],
                condition: '',
                reload: false,
                curr:1,
                tag: '分类',
@@ -41,7 +42,8 @@
                    contentnomore: '没有更多'
                },
                // 当前tagId
                tagIdNow: 1
                tagIdNow: 1,
            }
        },
        onReachBottom() {
@@ -66,6 +68,34 @@
        },
        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
pages/order/orderPakin2.vue
@@ -13,15 +13,15 @@
                <input type="text" placeholder=" 扫码 / 输入" v-model="barcode" :focus="barcodeFocus"
                    @input="barcodeInput()">
            </view>
            <!-- <view class="item">
            <view class="item">
                <view class="code-decs">物料码:</view>
                <input type="text" placeholder=" 扫码 / 输入" v-model="matnr" :focus="matFocus" @input="findMat()">
                <view class="item-right">
                <!-- <view class="item-right">
                    <button></button>
                    <text style="text-align: right;color: #409EFF;" @click="selectMat()">提取+</text>
                    <uni-icons type="right" color="#c1c1c1"></uni-icons>
                </view>
            </view> -->
                </view> -->
            </view>
        </view>
        <view class="mat-list-title">
            商品列表
@@ -62,6 +62,10 @@
                    <view class="list-left-item">
                        <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.review}}</view>
                    </view>
                </view>
                <view class="list-right">
@@ -241,57 +245,66 @@
                let that = this
                let m = that.matnr.split(";")
                let matnr1 = m[0].slice(3)
                uni.request({
                    url: that.baseUrl + '/mat/auth',
                    data: {
                        matnr: matnr1
                    },
                    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'
                            })
                        }
                for(var i = 0;i<that.dataList.length;i++){
                    if(that.dataList[i].matnr === matnr1){
                        that.dataList[i].review = "已复核"
                    }
                });
                }
                setTimeout(() => {
                    this.matnr = '';
                }, 100);
                // uni.request({
                //     url: that.baseUrl + '/mat/auth',
                //     data: {
                //         matnr: matnr1
                //     },
                //     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() {
@@ -317,6 +330,7 @@
                that.matnr = ''
            },
            checkMat(mat) {
                mat.review = "未复核"
                var len = this.dataList.length
                var add = true ,sameItem = false
                for (var i = 0; i < len; i++) {
@@ -421,11 +435,17 @@
                    return;
                }
                for (var i = 0; i < that.dataList.length; i++) {
                    if (that.dataList[i].review !== "已复核" ) {
                        this.messageText = that.dataList[i].matnr + '未复核'
                        this.messageToggle('error')
                        return;
                    }
                    if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
                        this.messageText = that.dataList[i].matnr + '组托数量不能为0'
                        this.messageToggle('error')
                        return;
                    }
                    }
                }
                uni.request({
                    url: that.baseUrl + '/mobile/comb/auth',
@@ -540,7 +560,7 @@
        width: 100%;
        background-color: white;
        position: fixed;
        margin-top: 200rpx;
        margin-top: 300rpx;
        z-index: 9;
        /* border-top: 1px solid #DCDFE6; */
        text-align: center;
pages/stock/stockCheck.vue
@@ -5,19 +5,10 @@
                <view class="code-decs">托盘码:</view>
                <input type="text" placeholder=" 扫码 / 输入" v-model="barcode" :focus="barcodeFocus"
                    @input="search()">
            </view>
            <view class="item">
                <view class="code-decs">物料码:</view>
                <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>
                </view>
            </view>
            </view>
        </view>
        <view class="mat-list-title">
            商品列表
            物料列表
        </view>
        <scroll-view>
            <view class="list" v-for="(item,i) in dataList" :key="i">
@@ -43,12 +34,18 @@
                    <view class="list-left-item">
                        <view class="desc">批号:</view>
                        <view class="left-item">
                            <uni-tag :text="item.batch" type="warning"></uni-tag>
                            {{item.batch}}
                        </view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">数量:</view>
                        <view class="left-item">{{item.anfme}}</view>
                        <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.checkAnfme}}</view>
                    </view>
                </view>
                <view class="list-right">
@@ -78,8 +75,9 @@
                    </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-right"><input type="text" v-model="batch" 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" style="border: none;justify-content: center;">
@@ -162,8 +160,11 @@
            // 根据托盘码搜索
            search() {
                let that = this
                if(that.barcode === "" || that.barcode === null || that.barcode === ''){
                    return
                }
                uni.request({
                    url: that.baseUrl + '/mobile/checkDetl/auth2',
                    url: that.baseUrl + '/inventoryCheckOrder/StockCheck/select/barcode',
                    header: {
                        'token':uni.getStorageSync('token')
                    },
@@ -184,6 +185,7 @@
                                });
                            }, 1000);
                        } else {
                            that.dataList = []
                            uni.showToast({title: res.msg, icon: "none",position: 'top'})
                        }
                    }
@@ -323,7 +325,7 @@
            // 修改批号
            revise(item, i) {
                this.matnr = this.dataList[i].matnr
                this.count = this.dataList[i].anfme
                this.count = this.dataList[i].checkAnfme
                this.batch = this.dataList[i].batch
                this.rowNum = i
                this.eject()
@@ -350,7 +352,7 @@
                this.$refs.alertDialog.close()
            },
            reviseConfirm() {
                this.dataList[this.rowNum].anfme = this.count
                this.dataList[this.rowNum].checkAnfme = this.count
                this.dataList[this.rowNum].batch = this.batch
                this.messageText = "修改成功"
                this.messageToggle('success')
@@ -396,12 +398,20 @@
            },
            adjust() {
                let that = this
                for (var i = 0; i < that.dataList.length; i++) {
                    if (that.dataList[i].checkAnfme == 0 || that.dataList[i].checkAnfme == '' || that.dataList[i].checkAnfme == null) {
                        this.messageText = that.dataList[i].matnr + '盘点数量不能为0'
                        this.messageToggle('error')
                        return;
                    }
                }
                var combMats = []
                var combParam = {}
                combParam['barcode'] = that.barcode
                combParam['wrkDetls'] = that.dataList
                combParam['param'] = that.dataList
                uni.request({
                    url: that.baseUrl + '/mobile/adjustNew/auth',
                    url: that.baseUrl + '/mobile/pda/adjust/auth',
                    method: 'POST',
                    data: JSON.stringify(combParam),
                    header: {
@@ -436,7 +446,7 @@
    .code {
        width: 100%;
        position: fixed;
        min-height: 200rpx;
        min-height: 100rpx;
        background-color: #FFF;
        z-index: 10;
    }
@@ -476,10 +486,21 @@
        width: 100%;
        background-color: white;
        position: fixed;
        margin-top: 200rpx;
        margin-top: 100rpx;
        z-index: 9;
        /* border-top: 1px solid #DCDFE6; */
        text-align: center;
        box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
    }
    .list {
        display: flex;
        min-height: 80rpx;
        background-color: #FFF;
        margin: 20rpx 20rpx;
        border-radius: 20rpx;
        box-shadow: 0px 0px 30px 0px rgba(0,0,0,0.2);
    }
    .list:first-child {
        margin-top: 250rpx;
    }
</style>