parent: 90973a0d | 补丁 | 提交 | show whitespace
zhou zhou
5 天以前 899503dfe12a826f11f7ce77283ef5c27d5c98c6 
Merge remote-tracking branch 'origin/phyz' into phyz

# Conflicts:
#	pages/emptyTray/outBound.vue
3个文件已修改
4 ■■■■■ 已修改文件
pages/AGV/StartInTask.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/emptyTray/outBound.vue 补丁 | 查看 | 原始文档 | blame | 历史
pages/listing/matnrPalletising.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 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




 pages/listing/matnrPalletising.vue


@@ -530,7 +530,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,