#
whycq
2024-04-16 6a5799976fe6f85ef93000db76875a036f208406
#
3个文件已修改
86 ■■■■ 已修改文件
pages/home/orderManage.vue 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/phyz/orderOut/orderCheck.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/phyz/stationManage/stationDetl.vue 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/orderManage.vue
@@ -27,28 +27,28 @@
                elements2: [
                    {
                        title: '采购入库单',
                        name: 'outOrder',
                        name: 'outPakin',
                        color: 'blue',
                        // cuIcon: 'pullup',
                        url: `/phyz/order/pakinOrderSelect`
                    },
                    // {
                    //     title: '出库单',
                    //     name: 'outOrder',
                    //     color: 'blue',
                    //     // cuIcon: 'pullup',
                    //     url: `/phyz/order/outOrder`
                    // },
                    // {
                    //     title: '入库单测试用',
                    //     name: 'pakin',
                    //     color: 'blue',
                    //     // cuIcon: 'pullup',
                    //     url: `/phyz/order/purchaseOrder`
                    // },
                    {
                        title: '出库单',
                        title: '订单出库',
                        name: 'outOrder',
                        color: 'blue',
                        // cuIcon: 'pullup',
                        url: `/phyz/order/outOrder`
                    },
                    {
                        title: '入库单测试用',
                        name: 'pakin',
                        color: 'blue',
                        // cuIcon: 'pullup',
                        url: `/phyz/order/purchaseOrder`
                    },
                    {
                        title: '出库单测试用',
                        name: 'pakin',
                        color: 'blue',
                        // cuIcon: 'pullup',
                        url: `/phyz/orderOut/orderOutSelect`
pages/phyz/orderOut/orderCheck.vue
@@ -63,7 +63,7 @@
                count: 0
            }
        },
        onLoad() {
        onShow() {
            let _this = this
            this.baseUrl = uni.getStorageSync('baseUrl');
            this.token = uni.getStorageSync('token');
pages/phyz/stationManage/stationDetl.vue
@@ -95,6 +95,24 @@
        
        <!-- 弹窗 -->
        <view>
            <uni-popup ref="doContainerMoveOut2" 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="barcode"></view>
                    </view>
                    <view class="btn">
                        <view class="btn-left" @click="containerMoveOutClose">取消</view>
                        <view class="btn-right" @click="containerMoveOut()">入库</view>
                    </view>
                </view>
            </uni-popup>
        </view>
        <!-- 弹窗 -->
        <view>
            <uni-popup ref="doPickIn" type="dialog">
                <view class="popup">
                    <!-- 标题 -->
@@ -141,6 +159,7 @@
        <view class="buttom">
            <button size="mini" type="primary" @click="emptyPakin()" v-if="btnType == 'emptyPakin'">空板入库</button>
            <button size="mini" type="primary" @click="emptyOut()" v-if="btnType == 'emptyPakin'">呼叫空板</button>
            <button size="mini" type="primary" @click="doContainerMoveOut2()" v-if="btnType == 'out'">容器离场</button>
            <button size="mini" type="primary" @click="doContainerMoveOut()" v-if="btnType == 'out'">确认出库</button>
            <button size="mini" type="primary" @click="doPickIn()" v-if="btnType == 'pick'">已拣料回库</button>
            <button size="mini" type="primary" @click="startPakin()" v-if="btnType == 'start'">启动入库</button>
@@ -500,6 +519,39 @@
                    }
                })
            },
            // 全板出库 容器离场
            doContainerMoveOut2() {
                this.$refs.doContainerMoveOut2.open()
            },
            containerMoveOutClose() {
                this.$refs.doContainerMoveOut2.close()
            },
            containerMoveOut() {
                let _this = this
                let devNo = {devNo:[this.station.devNo],barcode: _this.barcode}
                uni.request({
                    url: `${_this.baseUrl}/agv/basDevp/visualized/container/moveOut2`,
                    data: JSON.stringify(devNo),
                    method: 'POST',
                    success(res) {
                        res = res.data
                        if (res.code === 200) {
                            _this.$refs.doContainerMoveOut.close()
                            setTimeout(()=> {
                                _this.barcode = ''
                                _this.reloadStation()
                            },1000)
                            uni.showToast({ title: '离场完成', icon: "success", position: 'top' })
                        } else if (res.code == 403) {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                            setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' })
                        }
                    }
                })
            },
            // 拣料出库 确认后回库
            doPickIn() {
                this.$refs.doPickIn.open()