Merge remote-tracking branch 'origin/phyz' into phyz

zhou zhou

18 小时以前 899503dfe12a826f11f7ce77283ef5c27d5c98c6

Merge remote-tracking branch 'origin/phyz' into phyz

# Conflicts:
#	pages/emptyTray/outBound.vue

 pages/AGV/StartInTask.vue

@@ -229,7 +229,7 @@
                    code,
                    data,
                    msg
                } = await request('/areas/receipt', {}, 'get')
                } = await request('/areas/user/all', {}, 'get')
                if (code === 200) {
                    this.range = data.map(item => ({
                        value: item.id,

 pages/emptyTray/outBound.vue

@@ -173,7 +173,7 @@
                }finally{
                    this.isconfirm = false
                }
				

            }

            // const {

 pages/listing/matnrPalletising.vue

@@ -476,7 +476,7 @@
            },
        // 提交组托请求
    async submitConfirm(agvStation) {
        this.repeatClick = true				
        this.repeatClick = true
        try {
            const newArr = this.list.map(item => {
                
@@ -526,18 +526,18 @@
        }
    },
        async getRece() {
        const {
            code,
            data,
            msg
        } = await request('/areas/receipt', {}, 'get')
        if (code === 200) {
            this.range = data.map(item => ({
                value: item.id,
                text: item.warehouseId$ + "-- " + item.name
            }));
        }
    },
            const {
                code,
                data,
                msg
            } = await request('/areas/user/all', {}, 'get')
            if (code === 200) {
                this.range = data.map(item => ({
                    value: item.id,
                    text: item.warehouseId$ + "-- " + item.name
                }));
            }
        },
        }
    }
</script>