Merge branch 'jsxswms-app' of http://47.97.1.152:5880/r/wms_app into jsxswm...

skyouc

14 小时以前 ad1e4e950a4e961a41344e5847d47f91dabd0c29

Merge branch 'jsxswms-app' of http://47.97.1.152:5880/r/wms_app into jsxswms-app

 pages.json

@@ -39,13 +39,13 @@
        {
            "path": "pages/AGV/CollectionPakin",
            "style": {
                "navigationBarTitleText": "集货区组托"
                "navigationBarTitleText": "SO/EO区组托"
            }
        },
        {
            "path": "pages/AGV/CollectionInCall",
            "style": {
                "navigationBarTitleText": "集货区入库"
                "navigationBarTitleText": "SO/EO区入库"
            }
        },
        {
@@ -75,7 +75,7 @@
        {
            "path": "pages/AGV/CallEmptyCar",
            "style": {
                "navigationBarTitleText": "入库区呼叫空车"
                "navigationBarTitleText": "SO/EO区呼叫空车"
            }
        },
        {

 pages/AGV/CallEmptyCar.vue

@@ -2,7 +2,11 @@
    <view>
        <view class="code">
            <view class="item">
                <view class="code-decs">入库区:</view>
                <view class="code-decs">起始区:</view>
                <uni-combox :candidates="staList" placeholder="请选择站点" v-model="orgSite"></uni-combox>
            </view>
            <view class="item">
                <view class="code-decs">终点站:</view>
                <input type="text" placeholder=" 扫码 / 输入" v-model="tarSite" :focus="barcodeFocus">
            </view>

@@ -70,7 +74,7 @@
                locNo: "",
                orgSite: '',
                tarSite: '',
                staList: ["e"],
                staList: ["SO", "EO"],
            }
        },
        onLoad() {
@@ -88,7 +92,7 @@
            this.token = uni.getStorageSync('token');
        },
        mounted() {
            this.tarSite = uni.getStorageSync('tarSite')
            // this.tarSite = uni.getStorageSync('tarSite')
        },
        methods: {
            messageToggle(type) {
@@ -284,11 +288,16 @@
                this.$refs.combConfirm.close()
            },
            comb() {
                uni.setStorageSync('tarSite', this.tarSite);
                // uni.setStorageSync('tarSite', this.tarSite);
                uni.vibrateShort();
                let that = this;
                if (that.orgSite === '') {
                    this.messageText = "起始区为空"
                    this.messageToggle('error')
                    return;
                }
                if (that.tarSite === '') {
                    this.messageText = "入库区为空"
                    this.messageText = "终点站为空"
                    this.messageToggle('error')
                    return;
                }
@@ -343,7 +352,7 @@
            resst() {
                this.orgSite = ''
                this.dataList = []

                this.tarSite = ''

            },
        }

 pages/AGV/CollectionInCall.vue

@@ -9,6 +9,10 @@
                <view class="code-decs">托盘码:</view>
                <input type="text" placeholder=" 扫码 / 输入" v-model="barcode">
            </view>
            <view class="item">
                <view class="code-decs">目标区:</view>
                <uni-combox :candidates="staList" placeholder="请选择站点" v-model="tarSite"></uni-combox>
            </view>
        </view>
        <view class="mat-list-title">
        </view>
@@ -79,13 +83,13 @@
                locNo: "",
                orgSite: '',
                tarSite: '',
                staList: [],
                staList: ["EO", "SO"],
            }
        },
        onLoad() {
            let that = this
            const eventChannel = this.getOpenerEventChannel();
            that.getSites()
            // that.getSites()
        },
        onShow() {
            this.baseUrl = uni.getStorageSync('baseUrl');
@@ -260,11 +264,21 @@
                this.$refs.combConfirm.close()
            },
            comb() {
                uni.setStorageSync('tarSite', this.tarSite);
                // uni.setStorageSync('tarSite', this.tarSite);
                uni.vibrateShort();
                let that = this;
                if (that.orgSite === '') {
                    this.messageText = "产线站为空"
                    this.messageText = "起始站为空"
                    this.messageToggle('error')
                    return;
                }
                if (that.barcode === '') {
                    this.messageText = "托盘码为空"
                    this.messageToggle('error')
                    return;
                }
                if (that.tarSite === '') {
                    this.messageText = "目标区为空"
                    this.messageToggle('error')
                    return;
                }
@@ -272,7 +286,8 @@
                    url: that.baseUrl + '/mobile/collection/agv/call',
                    data: JSON.stringify({
                        orgSite: that.orgSite,
                        barcode: that.barcode
                        barcode: that.barcode,
                        tarSite: that.tarSite
                    }),
                    method: 'POST',
                    header: {
@@ -319,7 +334,8 @@
            resst() {
                this.orgSite = ''
                this.dataList = []

                this.tarSite = ''
                this.barcode = ''

            },
        }