java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

Squashed commit of the following: 

commit 9976795934
Author: zhangsiyu <q3183592900@qq.com>
Date:   Tue Aug 15 14:37:39 2023 +0800

    Squashed commit of the following:

    commit af78cbe841
    Author: 0.0 <1092404103.qq.com>
    Date:   Fri Aug 11 17:59:51 2023 +0800

        1.货架

    commit 563be24098
    Author: 0.0 <1092404103.qq.com>
    Date:   Fri Aug 11 10:28:28 2023 +0800

        1.托盘功能

    commit 957798645d
    Author: 0.0 <1092404103.qq.com>
    Date:   Thu Aug 10 21:54:02 2023 +0800

        1.托盘详情

commit ce6eda80f0
Merge: 7881d7d 20719d8
Author: zhangsiyu <q3183592900@qq.com>
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 7881d7d326
Author: zhangsiyu <q3183592900@qq.com>
Date:   Tue Aug 15 14:30:29 2023 +0800

    库位可视化

commit 20719d883c
Author: pref_mail@163.com <123456>
Date:   Tue Aug 15 10:27:44 2023 +0800

    增加梦天的配送车次和在在库包件

commit e2c09e0fa7
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 b7cc43a0fe
Author: kilo <wan.ren@foxmail.com>
Date:   Mon Aug 14 20:35:43 2023 +0800

    商配编辑编辑页面调整

commit a68fc74bd9
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 d518f251c0
Author: caoyizhong <1270296080@qq.com>
Date:   Mon Aug 14 15:38:17 2023 +0800

    修改自提操作编辑提货单

commit 511868d27c
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 82b5993dce
Author: big-y <804609860@qq.com>
Date:   Mon Aug 14 13:35:22 2023 +0800

    提货单提交bug修复

commit d26f11f339
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 9faf783694
Author: pref_mail@163.com <123456>
Date:   Mon Aug 14 12:49:44 2023 +0800

    1.修改名称 将叉车司机修改为备货人员

commit 8a6d42ac12
Merge: 2c6759a 4925f66
Author: zhangsiyu <q3183592900@qq.com>
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 2c6759a0e3
Author: zhangsiyu <q3183592900@qq.com>
Date:   Mon Aug 14 09:59:58 2023 +0800

    Squashed commit of the following:

    commit bb7cdb8d1e
    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 cbb2a855b0
    Author: caoyizhong <1270296080@qq.com>
    Date:   Thu Aug 10 22:14:50 2023 +0800

        修改订单详细字段

    commit 7b99fabb02
    Author: caoyizhong <1270296080@qq.com>
    Date:   Thu Aug 10 21:36:15 2023 +0800

        修改订单查询条件

    commit 3d9a02978d
    Author: caoyizhong <1270296080@qq.com>
    Date:   Thu Aug 10 20:41:59 2023 +0800

        修改客户信息编辑编码校验

    commit d8aa2f2c1d
    Author: caoyizhong <1270296080@qq.com>
    Date:   Thu Aug 10 19:39:39 2023 +0800

        修改客户服务仓添加

    commit fab70c4b27
    Author: big-y <804609860@qq.com>
    Date:   Thu Aug 10 19:11:23 2023 +0800

        标签渲染

    commit ae4f831595
    Author: big-y <804609860@qq.com>
    Date:   Thu Aug 10 18:49:31 2023 +0800

        标签渲染

    commit 9cca1d753a
    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 9aa102af6d
    Author: caoyizhong <1270296080@qq.com>
    Date:   Thu Aug 10 17:29:35 2023 +0800

        修改班组添加操作

    commit 5cbd767207
    Author: big-y <804609860@qq.com>
    Date:   Thu Aug 10 16:19:29 2023 +0800

        标签渲染

    commit b2e7078fbe
    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 553e8d3c4e
    Author: pref_mail@163.com <123456>
    Date:   Thu Aug 10 14:32:55 2023 +0800

        没有修改二维码包间生成

    commit 37356e4d77
    Author: 0.0 <1092404103.qq.com>
    Date:   Thu Aug 10 09:08:11 2023 +0800

        1.隐藏按钮

    commit 1272b45ea7
    Author: kilo <wan.ren@foxmail.com>
    Date:   Wed Aug 9 21:56:21 2023 +0800

        订单新增调整

    commit e3c6e255ff
    Author: 0.0 <1092404103.qq.com>
    Date:   Wed Aug 9 21:40:34 2023 +0800

        1.物料导出导入,托盘报损

    commit b598c70542
    Author: caoyizhong <1270296080@qq.com>
    Date:   Wed Aug 9 21:02:55 2023 +0800

        修改批量补充物料

    commit 47ab085072
    Author: caoyizhong <1270296080@qq.com>
    Date:   Wed Aug 9 15:56:56 2023 +0800

        添加订单字段

    commit 921ea4ffd0
    Author: caoyizhong <1270296080@qq.com>
    Date:   Wed Aug 9 14:02:16 2023 +0800

        添加三方物料

    commit d78b8a9da4
    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 1b1efea6a5
    Author: caoyizhong <1270296080@qq.com>
    Date:   Wed Aug 9 11:30:31 2023 +0800

        修改文字提醒

commit 4925f666f2
Author: caoyizhong <1270296080@qq.com>
Date:   Fri Aug 11 18:00:23 2023 +0800

    修改自提操作添加订单查询

commit b0b590868f
Author: caoyizhong <1270296080@qq.com>
Date:   Fri Aug 11 14:50:23 2023 +0800

    修改自提操作添加订单

commit 2b6447ea94
Author: caoyizhong <1270296080@qq.com>
Date:   Fri Aug 11 13:31:34 2023 +0800

    修改自提操作

commit bb7cdb8d1e
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 cbb2a855b0
Author: caoyizhong <1270296080@qq.com>
Date:   Thu Aug 10 22:14:50 2023 +0800

    修改订单详细字段

commit 7b99fabb02
Author: caoyizhong <1270296080@qq.com>
Date:   Thu Aug 10 21:36:15 2023 +0800

    修改订单查询条件

commit 3d9a02978d
Author: caoyizhong <1270296080@qq.com>
Date:   Thu Aug 10 20:41:59 2023 +0800

    修改客户信息编辑编码校验

commit d8aa2f2c1d
Author: caoyizhong <1270296080@qq.com>
Date:   Thu Aug 10 19:39:39 2023 +0800

    修改客户服务仓添加

commit fab70c4b27
Author: big-y <804609860@qq.com>
Date:   Thu Aug 10 19:11:23 2023 +0800

    标签渲染

commit ae4f831595
Author: big-y <804609860@qq.com>
Date:   Thu Aug 10 18:49:31 2023 +0800

    标签渲染

commit 9cca1d753a
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 9aa102af6d
Author: caoyizhong <1270296080@qq.com>
Date:   Thu Aug 10 17:29:35 2023 +0800

    修改班组添加操作

commit 5cbd767207
Author: big-y <804609860@qq.com>
Date:   Thu Aug 10 16:19:29 2023 +0800

    标签渲染

commit b2e7078fbe
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 553e8d3c4e
Author: pref_mail@163.com <123456>
Date:   Thu Aug 10 14:32:55 2023 +0800

    没有修改二维码包间生成
dev-warehouse
zhangsiyu 2 years ago
parent
739a017fdf
commit
900757108b
1 changed files with 19 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      src/router/views/index.js

19
src/router/views/index.js
Unescape View File

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

Write Preview
Loading…
Cancel
Save