#
whycq
2023-09-19 af30e5448508e586af40216890fa3cf1cddad9b0
#
3个文件已修改
45 ■■■■■ 已修改文件
pages/mat/matQuery.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/mat/matSelected.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/tzsk/AGV/AGVPakin.vue 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/mat/matQuery.vue
@@ -153,6 +153,7 @@
                if (tagId == null || tagId == '' || tagId == undefined) {
                    return;
                }
                uni.showLoading({})
                uni.request({
                    url: that.baseUrl + '/mat/list/pda/page/auth',
                    data: {
@@ -168,6 +169,7 @@
                        that.tagList = null
                        var res = result.data
                        if (res.code === 200) {
                            uni.hideLoading()
                            if (res.data.records != null && res.data.records.length > 0) {
                                let list = res.data.records
                                that.matList = that.reload ? list : that.matList.concat(list);
@@ -178,6 +180,7 @@
                            }
                            that.baColor = "background-color: #1cbbb4;"
                        } else if (res.code === 403 ) {
                            uni.hideLoading()
                            uni.showToast({title: res.msg, icon: "none", position: 'top'})
                            setTimeout(() => {
                                uni.reLaunch({
@@ -185,6 +188,7 @@
                                });
                            }, 1000);
                        } else {
                            uni.hideLoading()
                            uni.showToast({title: res.msg, icon: "none",position: 'top'})
                        }
                        
pages/mat/matSelected.vue
@@ -61,6 +61,7 @@
            
            // 监听acceptDataFromOpenerPage事件,获取上一页面通过eventChannel传送到当前页面的数据
            eventChannel.on('mat', function(data) {
                console.log(data);
                that.mat = data.data
                that.mat.anfme = 0
            })
pages/tzsk/AGV/AGVPakin.vue
@@ -7,7 +7,7 @@
                    @input="findOrder()">
            </view>
            <view class="item">
                <view class="code-decs">托盘码:</view>
                <view class="code-decs">料箱码:</view>
                <input type="text" placeholder=" 扫码 / 输入" v-model="barcode" :focus="barcodeFocus"
                    @input="barcodeInput()">
            </view>
@@ -163,6 +163,7 @@
                orderNoFocus: false,
                matData: '',
                removeNum: 0,
                tempOrderInfo: {csocode: '',isoseq: ''}
            }
        },
        onLoad() {
@@ -184,9 +185,19 @@
                    },
                    success(res) {
                        res = res.data
                        if (res.code === 200 && res.data[0]) {
                            for (var i = 0; i < res.data[0].combMats.length; i++) {
                                that.checkMat(res.data[0].combMats[i])
                        if (res.code === 200) {
                            if(res.data) {
                                for (var i = 0; i < res.data[0].combMats.length; i++) {
                                    that.checkMat(res.data[0].combMats[i])
                                }
                                that.tempOrderInfo.csocode = res.data[0].combMats.csocode ? res.data[0].combMats.csocode : ''
                                that.tempOrderInfo.isoseq = res.data[0].combMats.isoseq ? res.data[0].combMats.isoseq : ''
                            } else {
                                uni.showToast({
                                    title: that.orderNo + '请检查订单号是否正确',
                                    icon: "none",
                                    position: 'top'
                                })
                            }
                        } else if (res.code == 403) {
                            uni.showToast({
@@ -266,12 +277,8 @@
                }
                uni.request({
                    url: that.baseUrl + '/mat/auth',
                    data: {
                        matnr: that.matnr
                    },
                    header: {
                        'token': uni.getStorageSync('token')
                    },
                    data: { matnr: that.matnr },
                    header: { 'token': uni.getStorageSync('token') },
                    success(result) {
                        result = result.data
                        if (result.code === 200 && result.data) {
@@ -279,11 +286,12 @@
                            that.matnr = ''
                            that.matData['batch'] = ''
                            uni.navigateTo({
                                url: "../mat/matSelected",
                                url: "../../mat/matSelected",
                                // 通过eventChannel向被打开页面传送数据
                                success: function(res) {
                                    res.eventChannel.emit('mat', {
                                        data: result.data
                                        data: result.data,
                                        tempOrderInfo: that.tempOrderInfo
                                    })
                                },
                                // 为指定事件添加一个监听器,获取被打开页面传送到当前页面的数据
@@ -320,7 +328,7 @@
            selectMat() {
                let that = this
                uni.navigateTo({
                    url: "../mat/matQuery",
                    url: "../../mat/matQuery",
                    success: function(res) {
                        // 通过eventChannel向被打开页面传送数据   向另外一个页面传递值的
                        res.eventChannel.emit('commonUrl', {
@@ -513,7 +521,7 @@
    @import url('../../../static/css/wms.css/wms.css');
    .list:first-child {
        margin-top: 460rpx;
        margin-top: 340rpx;
    }
    .code {
        width: 100%;
@@ -526,7 +534,7 @@
    .item {
        display: flex;
        align-items: center;
        height: 100rpx;
        height: 70rpx;
        margin-left: 20rpx;
        border-bottom: 1px solid #DCDFE6;
    }
@@ -558,7 +566,7 @@
        width: 100%;
        background-color: white;
        position: fixed;
        margin-top: 300rpx;
        margin-top: 210rpx;
        z-index: 9;
        /* border-top: 1px solid #DCDFE6; */
        text-align: center;