 caoyizhong
|
21e76becb7
|
修改订单变量名
|
2 years ago |
 zhangsiyu
|
05b100038d
|
修改地图样式，修改其他等若干问题
|
2 years ago |
|
zhangsiyu
|
cbbe6ba803
|
修改表格自适应，修复搜索条件显示隐藏失效
|
2 years ago |
|
zhangsiyu
|
3fd911ca74
|
更新内容
|
2 years ago |
|
caoyizhong
|
9eb0daadd9
|
修改订单预约限制操作
|
2 years ago |
|
zhangsiyu
|
0afad7e38a
|
Squashed commit of the following:
commit 905bffef83
Merge: f40f2ec 08b1e3c
Author: big-y <804609860@qq.com>
Date: Wed Aug 30 15:12:10 2023 +0800
Merge remote-tracking branch 'origin/dev' into dev
commit f40f2ec43b
Author: big-y <804609860@qq.com>
Date: Wed Aug 30 15:11:51 2023 +0800
产品包配置回显问题已调整完成
commit 08b1e3c369
Merge: bdcb96d 1db8162
Author: caoyizhong <1270296080@qq.com>
Date: Wed Aug 30 14:35:59 2023 +0800
Merge remote-tracking branch 'origin/dev' into dev
commit bdcb96d90c
Author: caoyizhong <1270296080@qq.com>
Date: Wed Aug 30 14:35:52 2023 +0800
添加全部订单记录
commit 1db8162b7e
Author: 0.0 <1092404103.qq.com>
Date: Wed Aug 30 11:04:35 2023 +0800
1.仓库权限
commit e20a7de5db
Author: pref_mail@163.com <123456>
Date: Tue Aug 29 22:30:16 2023 +0800
修复预约
commit ec972fcd59
Author: kilo <wan.ren@foxmail.com>
Date: Tue Aug 29 21:41:01 2023 +0800
页面调整
commit 357d9cebd7
Author: caoyizhong <1270296080@qq.com>
Date: Tue Aug 29 17:31:04 2023 +0800
添加订单可空格查询
commit 7d75a1cf64
Author: pref_mail@163.com <123456>
Date: Tue Aug 29 17:14:26 2023 +0800
修改运单显示字段
commit 21771e8699
Author: 0.0 <1092404103.qq.com>
Date: Tue Aug 29 17:08:25 2023 +0800
1.禁用
commit d52dccc927
Merge: 42ee206 ea10e1c
Author: caoyizhong <1270296080@qq.com>
Date: Tue Aug 29 11:15:07 2023 +0800
Merge remote-tracking branch 'origin/dev' into dev
commit 42ee2067e0
Author: caoyizhong <1270296080@qq.com>
Date: Tue Aug 29 11:14:32 2023 +0800
修改班组人员添加
# Conflicts:
# src/views/basicdata/team/basicdataTeamStaff.vue
|
2 years ago |
|
caoyizhong
|
357d9cebd7
|
添加订单可空格查询
|
2 years ago |
|
caoyizhong
|
fee6f3c7ae
|
修改订单时间搜索
|
2 years ago |
|
caoyizhong
|
920654c74c
|
添加订单字段回显
|
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 |
|
caoyizhong
|
b0b590868f
|
修改自提操作添加订单
|
2 years ago |
|
caoyizhong
|
7b99fabb02
|
修改订单查询条件
|
2 years ago |
|
caoyizhong
|
3d9a02978d
|
修改客户信息编辑编码校验
|
2 years ago |
pref_mail@163.com
|
553e8d3c4e
|
没有修改二维码包间生成
|
2 years ago |
|
caoyizhong
|
8234ed2c36
|
修改备货条件查询
|
2 years ago |
|
caoyizhong
|
5f039ba250
|
修改转库存品提醒
|
2 years ago |
|
caoyizhong
|
d37688b559
|
修改订单值回显
|
2 years ago |
|
caoyizhong
|
635e458b63
|
修改字典状态查询不正确
|
2 years ago |
|
caoyizhong
|
c8f009a288
|
修改部分问题
|
2 years ago |
|
caoyizhong
|
228bd2a8dd
|
添加查询条件
|
2 years ago |
|
pref_mail@163.com
|
77641e9358
|
修改订单状态 --tag
|
2 years ago |
|
caoyizhong
|
39d800e253
|
修改自提编辑
|
2 years ago |
|
caoyizhong
|
4783c4e10c
|
修改创建人
|
2 years ago |
|
caoyizhong
|
3bf2547043
|
修改回显
|
2 years ago |
|
caoyizhong
|
aaa16be310
|
修改提货编辑
|
2 years ago |
|
caoyizhong
|
3a6324b231
|
修改自提
|
2 years ago |
|
caoyizhong
|
36664b2271
|
修改在库订单
|
2 years ago |
|
caoyizhong
|
e3fb510156
|
修改订单显示
|
2 years ago |
|
caoyizhong
|
4995e787d4
|
添加入库单
|
2 years ago |
|
zhangsiyu
|
51be36e542
|
Squashed commit of the following:
commit 78016097ae
Author: 0.0 <1092404103.qq.com>
Date: Thu Jul 6 15:51:37 2023 +0800
1.修改表单
commit 2fc3c8a2df
Author: caoyizhong <1270296080@qq.com>
Date: Thu Jul 6 15:50:55 2023 +0800
修改页面
|
2 years ago |
|
caoyizhong
|
2fc3c8a2df
|
修改页面
|
2 years ago |
|
zhangsiyu
|
08fc7b0c6e
|
Squashed commit of the following:
commit bbf4359530
Author: kilo <wan.ren@foxmail.com>
Date: Tue Jul 4 18:57:38 2023 +0800
预约转配送
commit df37afb76b
Merge: fc1b299 848411f
Author: caoyizhong <1270296080@qq.com>
Date: Tue Jul 4 18:14:22 2023 +0800
Merge remote-tracking branch 'origin/dev' into dev
commit fc1b29958d
Author: caoyizhong <1270296080@qq.com>
Date: Tue Jul 4 18:13:37 2023 +0800
修改库存品拆包
|
2 years ago |
|
caoyizhong
|
fc1b29958d
|
修改库存品拆包
|
2 years ago |
|
zhangsiyu
|
5713620815
|
更新适配table
|
2 years ago |
|
caoyizhong
|
e5bdd67d84
|
修改自提
|
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
|
af0d15535a
|
Squashed commit of the following:
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
添加包件详情页面
|
2 years ago |
|
caoyizhong
|
d9e70f7198
|
修改页面
|
2 years ago |
|
caoyizhong
|
c358676783
|
修改转库存品
|
2 years ago |
|
caoyizhong
|
57240c68a8
|
添加包件详情页面
|
2 years ago |
|
zhangsiyu
|
f52441e374
|
1
|
2 years ago |
|
zhangsiyu
|
e152ebdd0f
|
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 |
|
caoyizhong
|
efa5a9716d
|
修改客户信息
|
2 years ago |
|
caoyizhong
|
8e08140603
|
修改库存管理
|
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 |
|
caoyizhong
|
3d2b759b4e
|
修改备货
|
2 years ago |
|
zhangsiyu
|
e0670775da
|
1
|
2 years ago |
|
caoyizhong
|
ca423ac6e6
|
添加库存品页面
|
2 years ago |
