 qb
|
1f47338162
|
新增弹窗全屏
|
1 year ago |
 zhangsiyu
|
cbbe6ba803
|
修改表格自适应，修复搜索条件显示隐藏失效
|
2 years ago |
|
zhangsiyu
|
3fd911ca74
|
更新内容
|
2 years ago |
|
zhangsiyu
|
739a017fdf
|
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
没有修改二维码包间生成
|
2 years ago |
|
zhangsiyu
|
2c6759a0e3
|
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
修改文字提醒
|
2 years ago |
pref_mail@163.com
|
553e8d3c4e
|
没有修改二维码包间生成
|
2 years ago |
|
pref_mail@163.com
|
77641e9358
|
修改订单状态 --tag
|
2 years ago |
|
zhangsiyu
|
88215de1c8
|
Squashed commit of the following:
commit c441ff2c35
Merge: ffa566e 3190c7a
Author: caoyizhong <1270296080@qq.com>
Date: Tue Jun 27 19:22:51 2023 +0800
Merge remote-tracking branch 'origin/dev' into dev
commit ffa566e81c
Author: caoyizhong <1270296080@qq.com>
Date: Tue Jun 27 19:22:45 2023 +0800
修改在库页面
commit 3190c7ab7a
Author: 0.0 <1092404103.qq.com>
Date: Tue Jun 27 18:09:13 2023 +0800
1.切换页面
commit c275c79f01
Merge: d9e70f7 3b8de83
Author: caoyizhong <1270296080@qq.com>
Date: Mon Jun 26 18:11:29 2023 +0800
Merge remote-tracking branch 'origin/dev' into dev
commit d9e70f7198
Author: caoyizhong <1270296080@qq.com>
Date: Mon Jun 26 18:11:24 2023 +0800
修改页面
commit 3b8de83a22
Merge: 258c1be c358676
Author: 0.0 <1092404103.qq.com>
Date: Mon Jun 26 16:35:37 2023 +0800
Merge remote-tracking branch 'origin/dev' into dev
commit 258c1be197
Author: 0.0 <1092404103.qq.com>
Date: Mon Jun 26 16:35:23 2023 +0800
1.车辆司机关联
commit c358676783
Author: caoyizhong <1270296080@qq.com>
Date: Mon Jun 26 15:55:32 2023 +0800
修改转库存品
commit 80cd366916
Merge: 57240c6 34e98c3
Author: caoyizhong <1270296080@qq.com>
Date: Sun Jun 25 18:32:11 2023 +0800
Merge remote-tracking branch 'origin/dev' into dev
commit 57240c68a8
Author: caoyizhong <1270296080@qq.com>
Date: Sun Jun 25 18:32:04 2023 +0800
添加包件详情页面
# Conflicts:
# src/option/distribution/distributionStockArticleFrom.js
# src/views/distribution/inventory/delivery/distributionStockArticle.vue
# src/views/distribution/inventory/distributionStockArticleFrom.vue
|
2 years ago |
|
zhangsiyu
|
c6953bda86
|
Squashed commit of the following:
commit 859932a264
Author: kilo <wan.ren@foxmail.com>
Date: Fri Jun 16 11:18:14 2023 +0800
配送api调整
commit 8f84925824
Author: kilo <wan.ren@foxmail.com>
Date: Fri Jun 16 11:15:28 2023 +0800
配送api调整
commit bb3434c07a
Author: caoyizhong <1270296080@qq.com>
Date: Fri Jun 16 10:56:59 2023 +0800
添加班组
commit e59ea0d301
Merge: ffbd2d0 ccb3fd8
Author: caoyizhong <1270296080@qq.com>
Date: Fri Jun 16 09:16:03 2023 +0800
Merge remote-tracking branch 'origin/dev' into dev
commit ffbd2d028f
Author: caoyizhong <1270296080@qq.com>
Date: Fri Jun 16 09:15:54 2023 +0800
修改备货查询
commit ccb3fd8ad5
Author: 0.0 <1092404103.qq.com>
Date: Thu Jun 15 20:27:23 2023 +0800
1.调整搜索时间
commit 9ef429246e
Author: kilo <wan.ren@foxmail.com>
Date: Thu Jun 15 19:38:33 2023 +0800
仓库所属部门调整
commit 3d2b759b4e
Author: caoyizhong <1270296080@qq.com>
Date: Thu Jun 15 16:23:00 2023 +0800
修改备货
commit c58aa3a26b
Author: kilo <wan.ren@foxmail.com>
Date: Thu Jun 15 15:01:55 2023 +0800
备货、预约页面
commit 0aa1c28db6
Merge: ca423ac 72e0847
Author: caoyizhong <1270296080@qq.com>
Date: Thu Jun 15 10:30:15 2023 +0800
Merge remote-tracking branch 'origin/dev' into dev
commit ca423ac6e6
Author: caoyizhong <1270296080@qq.com>
Date: Thu Jun 15 10:30:09 2023 +0800
添加库存品页面
# Conflicts:
# src/option/distribution/distributionStockList.js
# src/views/distribution/inventory/distributionStockArticle.vue
# src/views/distribution/inventory/distributionStockList.vue
# src/views/distribution/signfor/distributionSignfor.vue
# vite.config.js
|
2 years ago |
|
zhangsiyu
|
f5a6eb3505
|
Squashed commit of the following:
commit 0aa1c28db6
Merge: ca423ac 72e0847
Author: caoyizhong <1270296080@qq.com>
Date: Thu Jun 15 10:30:15 2023 +0800
Merge remote-tracking branch 'origin/dev' into dev
commit ca423ac6e6
Author: caoyizhong <1270296080@qq.com>
Date: Thu Jun 15 10:30:09 2023 +0800
添加库存品页面
|
2 years ago |
|
pref_mail@163.com
|
5aa6bcb9f2
|
合并分支
|
2 years ago |
 caoyizhong
|
3d2b759b4e
|
修改备货
|
2 years ago |
|
zhangsiyu
|
e0670775da
|
1
|
2 years ago |
|
caoyizhong
|
ca423ac6e6
|
添加库存品页面
|
2 years ago |
|
caoyizhong
|
a1c09d3c82
|
添加提货
|
2 years ago |
|
caoyizhong
|
761c038da3
|
添加配送在库订单
|
2 years ago |
0.0
|
e354b10f75
|
1.生成配送签收模块
|
2 years ago |
|
caoyizhong
|
c069bbfab3
|
添加基础价格
|
2 years ago |
|
pref_mail@163.com
|
e039e8c4df
|
1.增加工厂数据-SNM线路管理
|
2 years ago |
