From 900757108bf7684278ac3a2ce9baf440e3dab0b9 Mon Sep 17 00:00:00 2001 From: zhangsiyu Date: Tue, 15 Aug 2023 14:40:56 +0800 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 99767959345c7f49b5bb09d838c1fbe6201e95e9 Author: zhangsiyu Date: Tue Aug 15 14:37:39 2023 +0800 Squashed commit of the following: commit af78cbe8410158165f447cbfb1d5daf749a6fabd Author: 0.0 <1092404103.qq.com> Date: Fri Aug 11 17:59:51 2023 +0800 1.货架 commit 563be24098c81d3a96d8296efaca25768a372937 Author: 0.0 <1092404103.qq.com> Date: Fri Aug 11 10:28:28 2023 +0800 1.托盘功能 commit 957798645db303a23b58fe4a1ea9a910fdc86686 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 21:54:02 2023 +0800 1.托盘详情 commit ce6eda80f0d11a63810de6cef36552a4abf0a67e Merge: 7881d7d 20719d8 Author: zhangsiyu Date: Tue Aug 15 14:30:57 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev # Conflicts: # vite.config.js commit 7881d7d32695982ce29fd30d3f42f6cbd24bec5e Author: zhangsiyu Date: Tue Aug 15 14:30:29 2023 +0800 库位可视化 commit 20719d883c23944f6f8f805ccd7552bf4cdf31f0 Author: pref_mail@163.com <123456> Date: Tue Aug 15 10:27:44 2023 +0800 增加梦天的配送车次和在在库包件 commit e2c09e0fa7037a78d212ade0cd4415f87bfcdc79 Merge: 511868d b7cc43a Author: pref_mail@163.com <123456> Date: Tue Aug 15 10:27:12 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit b7cc43a0fef6778c0a06cd3f5530f1dfa3fafaae Author: kilo Date: Mon Aug 14 20:35:43 2023 +0800 商配编辑编辑页面调整 commit a68fc74bd9158a69489426079969f889acae9edc Merge: d518f25 82b5993 Author: caoyizhong <1270296080@qq.com> Date: Mon Aug 14 15:38:23 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit d518f251c09b14d1391b070d3b7b727936428b4a Author: caoyizhong <1270296080@qq.com> Date: Mon Aug 14 15:38:17 2023 +0800 修改自提操作编辑提货单 commit 511868d27cb87edba48f4ee50e061cc2f8474db0 Merge: d26f11f 82b5993 Author: pref_mail@163.com <123456> Date: Mon Aug 14 14:34:39 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 82b5993dcec4d56e0908ad5d85ca4819592ab8d7 Author: big-y <804609860@qq.com> Date: Mon Aug 14 13:35:22 2023 +0800 提货单提交bug修复 commit d26f11f3396f3840f29d49287cbe162ee06f04f3 Merge: 9faf783 8a6d42a Author: pref_mail@163.com <123456> Date: Mon Aug 14 12:49:46 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 9faf783694e1a10bfd18eb5633f4f51180a64ed7 Author: pref_mail@163.com <123456> Date: Mon Aug 14 12:49:44 2023 +0800 1.修改名称 将叉车司机修改为备货人员 commit 8a6d42ac12565efbdc9f510150011edc3f9d1f7f Merge: 2c6759a 4925f66 Author: zhangsiyu Date: Mon Aug 14 10:07:22 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue # vite.config.js commit 2c6759a0e3f10f66d8148db9c21d6eee1c46a8b2 Author: zhangsiyu Date: Mon Aug 14 09:59:58 2023 +0800 Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒 commit 4925f666f2e9d31abf228047d62893813cf82329 Author: caoyizhong <1270296080@qq.com> Date: Fri Aug 11 18:00:23 2023 +0800 修改自提操作添加订单查询 commit b0b590868f5fa6f71185b961c6207faa9e769cf5 Author: caoyizhong <1270296080@qq.com> Date: Fri Aug 11 14:50:23 2023 +0800 修改自提操作添加订单 commit 2b6447ea94e7605e453541a84c8178bd39386efb Author: caoyizhong <1270296080@qq.com> Date: Fri Aug 11 13:31:34 2023 +0800 修改自提操作 commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 --- src/router/views/index.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/router/views/index.js b/src/router/views/index.js index 0c6d0d0d..f5455ac9 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -819,6 +819,25 @@ export default [ }, ], }, + { + path: '/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView', + component: Layout, + redirect: '/warehouse/goodsShelf/basicdataGoodsShelfView', + children: [ + { + path: '/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView', + name: '货位可视化', + meta: { + i18n: 'dict', + }, + props: route => ({ + name: route.query.name, + id: route.query.id + }), + component: () => import('@/views/basicdata/warehouse/tray/basicdataGoodsShelfView.vue'), + }, + ], + }, // { // path: 'basicdata/goodsShelf/basicdataGoodsShelfView', // component: Layout,