#
whycq
2023-10-10 550de61d9a9f2c1701858277bcf132b8ae895f65
#
1个文件已添加
1 文件已重命名
3个文件已修改
600 ■■■■■ 已修改文件
pages/home/home.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/login/login.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/tzsk/AGV/AGVPick - 副本.vue 补丁 | 查看 | 原始文档 | blame | 历史
pages/tzsk/AGV/AGVPick.vue 591 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/tzsk/AGV/AGVStart.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/home.vue
@@ -54,7 +54,7 @@
                    },
                    {
                        title: 'AGV盘点/拣料',
                        name: 'pakin',
                        name: 'AGVPick',
                        color: 'cyan',
                        cuIcon: 'pullup',
                        url: '/tzsk/AGV/AGVPick'
pages/login/login.vue
@@ -188,6 +188,9 @@
                        "content-type": "application/json"
                    },
                    success(result) {
                        uni.reLaunch({
                            url: '../home/home'
                        });
                        if (result.statusCode === 404) {
                            uni.showToast({
                                title: '登录失败',
pages/tzsk/AGV/AGVPick - ¸±±¾.vue
pages/tzsk/AGV/AGVPick.vue
New file
@@ -0,0 +1,591 @@
<template>
    <view>
        <view class="code">
            <view class="item">
                <view class="code-decs">楼号:</view>
                <uni-combox :candidates="floorList" placeholder="请选择楼号" v-model="floor" @input="getFloor"></uni-combox>
            </view>
            <view class="item">
                <view class="code-decs">暂存位:</view>
                <input type="text" placeholder=" æ‰«ç  / è¾“å…¥" v-model="stationCode" :focus="stationCodeFocus"
                    @input="stationCodeInput()">
            </view>
        </view>
        <view class="mat-list-title">
            <view style="-webkit-flex: 1;flex: 1;"></view>
            <view style="-webkit-flex: 1;flex: 1;">站点列表</view>
            <view style="-webkit-flex: 1;flex: 1;"><button size="mini" @click="selectAll()">{{btnText}}</button></view>
        </view>
        <scroll-view>
            <view class="list" v-for="(item,i) in dataList" :key="i" :class="'bg-'+item.color">
                <view class="aside">
                    <checkbox :value="item.matnr" :checked="item.checked" @click="set(i)"/>
                </view>
                <view class="list-left" style="display: flex;justify-content: center;">
                    {{item.devNo}}
                </view>
                <view class="list-right">
                    <!-- <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>
        </scroll-view>
        <!-- åº•部操作按钮 -->
        <view class="buttom">
            <button size="mini" @click="reset('warn')">重置</button>
            <button size="mini" type="primary" @click="containerMove()">容器离场</button>
            <button size="mini" type="primary" @click="containerPick()">盘点 / æ‹£è´§</button>
        </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: '',
                stationCode: '',
                stationCodeFocus: true,
                dataList: [
                    {devNo:'12321321'},
                    {devNo:'12321321'},
                    {devNo:'12321321'},
                    ],
                count: 0,
                rowNum: '',
                matnr: '',
                batch: '',
                weight: '',
                msgType1: 'success',
                msgType: 'success',
                messageText: '',
                title: '',
                content: '',
                barcodeFocus: true,
                matFocus: false,
                matData: '',
                removeNum: 0,
                floorList: [1,3],
                floor: "",
                devNo: [],
                btnText: '全选',
            }
        },
        onLoad() {
        },
        onShow() {
            this.baseUrl = uni.getStorageSync('baseUrl');
            this.token = uni.getStorageSync('token');
        },
        methods: {
            stationCodeInput() {
                setTimeout(() => {
                    var len = this.stationCode.length
                    if (len != 15) {
                        this.stationCode = ''
                        this.stationCodeFocus = true
                        uni.showToast({
                            title: '暂存码有误请重试',
                            icon: "none",
                            position: 'top'
                        });
                        return;
                    }
                    this.pushDevNo()
                    this.stationCodeFocuss()
                }, 200)
            },
            pushDevNo() {
                var devNo = {"devNo":this.stationCode}
                if (this.dataList.length == 0) {
                    this.dataList.push(devNo)
                    return
                }
                var flag = false
                for(var i = 0; i < this.dataList.length; i++ ) {
                    if (this.dataList[i].devNo == devNo.devNo) {
                        this.messageText = "站点重复"
                        this.messageToggle('warn')
                        return
                    } else {
                        flag = true
                    }
                }
                if(flag) {
                    this.dataList.push(devNo)
                }
            },
            stationCodeFocuss() {
                let that = this;
                this.stationCode = ''
                that.stationCodeFocus = false;
                setTimeout(() => {
                    that.stationCodeFocus = true;
                }, 100);
            },
            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])
                    }
                }
                this.dataList = checkedList
            },
            set(i) {
                var ck = this.dataList[i].checked
                this.dataList[i].checked = ck ? false:true
            },
            selectAll() {
                if (this.btnText == '全选') {
                    for (let i in this.dataList) {
                        this.$set(this.dataList[i],'checked',true)
                        this.btnText = '取消'
                    }
                } else {
                    for (let i in this.dataList) {
                        var ck = this.dataList[i].checked
                        this.dataList[i].checked = ck ? false:true
                        this.btnText = '全选'
                    }
                }
            },
            getFloor() {
                let that = this
                if (this.floor == '') {
                    return
                }
                uni.request({
                    url: that.baseUrl + '/agvMobile/getBasDevp/auth',
                    data: {
                        floor: that.floor
                    },
                    header: {
                        'token': uni.getStorageSync('token')
                    },
                    method: 'POST',
                    success(res) {
                        res = res.data
                        for(var i = 0; i < res.data.length; i++) {
                            if (res.data[i].locSts === 'F') {
                                // res.data[i]["color"] = "red"
                                that.dataList.push(res.data[i])
                            }
                        }
                    }
                });
            },
            messageToggle(type) {
                this.msgType1 = type
                this.$refs.message.open()
            },
            // barcode input äº‹ä»¶
            barcodeInput() {
                // ä¸è®¾ç½®å®šæ—¶å™¨ ä¼šå‡ºçŽ°æ‰«å…¥çš„å­—ç¬¦ä¸²ä¸å…¨
                setTimeout(() => {
                    var len = this.barcode.length
                    if (len != 8) {
                        uni.showToast({
                            title: '托盘码有误请重试',
                            icon: "none",
                            position: 'top'
                        });
                        this.barcodeFocuss()
                        return;
                    }
                    this.focuss()
                }, 200)
            },
            // æ‰˜ç›˜ç æœ‰è¯¯é‡ç½®
            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 (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'
                            })
                        }
                    }
                });
            },
            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() {
                this.devNo = []
                uni.vibrateShort();
                let that = this;
                for (var i = 0; i < this.dataList.length; i++) {
                    if (this.dataList[i].checked) {
                        this.devNo.push(this.dataList[i].devNo)
                    }
                }
                uni.request({
                    url: that.baseUrl + '/agvMobile/pakin/auth',
                    data: JSON.stringify({
                        devNo: that.devNo
                    }),
                    method: 'POST',
                    header: {
                        'token': uni.getStorageSync('token')
                    },
                    success(result) {
                        var res = result.data
                        if (res.code === 200) {
                            that.resst();
                            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.stationCode = ''
                this.floor = ''
                this.messageText = "重置完成"
                this.messageToggle('success')
            },
            // å–消重置
            resetClose() {
            },
            // æ¸…空
            resst() {
                this.dataList = []
                this.barcode = ''
                this.stationCode = ''
                this.floor = ''
                this.barcodeFocuss()
            },
        }
    }
</script>
<style>
    @import url('../../../static/css/wms.css/wms.css');
    .bg-red {
        background-color: #e54d42;
        color: #ffffff;
    }
    .bg-white {
        background-color: #ffffff;
        color: #666666;
    }
    .list:first-child {
        margin-top: 360rpx;
    }
    .aside {
        width: 100rpx;
        /* background-color: #303133; */
        display: flex;
        align-items: center;
        justify-content: center;
    }
    .code {
        width: 100%;
        position: fixed;
        min-height: 100rpx;
        background-color: #FFF;
        z-index: 10;
    }
    .item {
        display: flex;
        align-items: center;
        height: 100rpx;
        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 {
        display: flex;
        align-items: center;
        height: 80rpx;
        width: 100%;
        background-color: white;
        position: fixed;
        margin-top: 200rpx;
        z-index: 9;
        /* border-top: 1px solid #DCDFE6; */
        text-align: center;
        box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
    }
</style>
pages/tzsk/AGV/AGVStart.vue
@@ -13,7 +13,9 @@
        </view>
        
        <view class="mat-list-title">
            <view style="-webkit-flex: 1;flex: 1;"></view>
            <view style="-webkit-flex: 1;flex: 1;">站点列表</view>
            <view style="-webkit-flex: 1;flex: 1;"><button size="mini">全选</button></view>
        </view>
        <scroll-view>
            <view class="list" v-for="(item,i) in dataList" :key="i" :class="'bg-'+item.color">
@@ -109,7 +111,7 @@
                barcode: '',
                stationCode: '',
                stationCodeFocus: true,
                dataList: [],
                dataList: [{}],
                count: 0,
                rowNum: '',
                matnr: '',