 zhangsiyu
|
4b09bef25e
|
Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev
|
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 |
kilo
|
cb9a594b3a
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/option/distribution/distributionStockArticle.js
|
2 years ago |
 caoyizhong
|
c441ff2c35
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
caoyizhong
|
ffa566e81c
|
修改在库页面
|
2 years ago |
|
kilo
|
385885f652
|
预约添加库存品信息
|
2 years ago |
0.0
|
3190c7ab7a
|
1.切换页面
|
2 years ago |
|
caoyizhong
|
c275c79f01
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
caoyizhong
|
d9e70f7198
|
修改页面
|
2 years ago |
|
0.0
|
3b8de83a22
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
0.0
|
258c1be197
|
1.车辆司机关联
|
2 years ago |
|
caoyizhong
|
c358676783
|
修改转库存品
|
2 years ago |
|
caoyizhong
|
80cd366916
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
caoyizhong
|
57240c68a8
|
添加包件详情页面
|
2 years ago |
|
zhangsiyu
|
34e98c34e6
|
Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev
|
2 years ago |
|
zhangsiyu
|
6b5ab74fcb
|
Squashed commit of the following:
commit 5fdc85adae
Merge: 019f62e 90be2b3
Author: pref_mail@163.com <123456>
Date: Sun Jun 25 13:58:38 2023 +0800
Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev
commit 019f62ea84
Author: pref_mail@163.com <123456>
Date: Sun Jun 25 13:57:03 2023 +0800
修改地图插件问题
commit 90be2b3038
Merge: eb05df9 3c44f6d
Author: caoyizhong <1270296080@qq.com>
Date: Sun Jun 25 13:37:24 2023 +0800
Merge remote-tracking branch 'origin/dev' into dev
commit eb05df91e1
Author: caoyizhong <1270296080@qq.com>
Date: Sun Jun 25 13:37:18 2023 +0800
修改客户信息
# Conflicts:
# src/views/distribution/delivery/distributionDelivery.vue
# Conflicts:
# src/views/distribution/delivery/distributionDelivery.vue
|
2 years ago |
|
zhangsiyu
|
3efbe7ea51
|
Squashed commit of the following:
commit 5fdc85adae
Merge: 019f62e 90be2b3
Author: pref_mail@163.com <123456>
Date: Sun Jun 25 13:58:38 2023 +0800
Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev
commit 019f62ea84
Author: pref_mail@163.com <123456>
Date: Sun Jun 25 13:57:03 2023 +0800
修改地图插件问题
commit 90be2b3038
Merge: eb05df9 3c44f6d
Author: caoyizhong <1270296080@qq.com>
Date: Sun Jun 25 13:37:24 2023 +0800
Merge remote-tracking branch 'origin/dev' into dev
commit eb05df91e1
Author: caoyizhong <1270296080@qq.com>
Date: Sun Jun 25 13:37:18 2023 +0800
修改客户信息
# Conflicts:
# src/views/distribution/delivery/distributionDelivery.vue
|
2 years ago |
|
zhangsiyu
|
62c8668fc8
|
更新
|
2 years ago |
pref_mail@163.com
|
5fdc85adae
|
Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev
|
2 years ago |
|
pref_mail@163.com
|
019f62ea84
|
修改地图插件问题
|
2 years ago |
|
caoyizhong
|
90be2b3038
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
caoyizhong
|
eb05df91e1
|
修改客户信息
|
2 years ago |
|
zhangsiyu
|
1860b87661
|
Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev
|
2 years ago |
|
pref_mail@163.com
|
cbfe34e887
|
Merge branch 'test' into pre-production
|
2 years ago |
|
pref_mail@163.com
|
db442a4fed
|
修改首页代码
|
2 years ago |
|
pref_mail@163.com
|
78814433a3
|
Merge branch 'test' into pre-production
|
2 years ago |
|
pref_mail@163.com
|
42c191237a
|
Merge branch 'dev' into test
|
2 years ago |
|
pref_mail@163.com
|
3c44f6d1a1
|
修改打包地址
|
2 years ago |
|
kilo
|
94b653ec43
|
预约转配送提交页面
|
2 years ago |
|
kilo
|
bf247b3e1f
|
预约转配送页面
|
2 years ago |
|
caoyizhong
|
44d47b70c8
|
修改客户
|
2 years ago |
|
zhangsiyu
|
9c57261f2c
|
Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev
|
2 years ago |
|
zhangsiyu
|
4669540d77
|
Squashed commit of the following:
commit dc43cb86f6
Merge: efa5a97 e2769fd
Author: caoyizhong <1270296080@qq.com>
Date: Mon Jun 19 18:10:14 2023 +0800
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/router/views/index.js
commit efa5a9716d
Author: caoyizhong <1270296080@qq.com>
Date: Mon Jun 19 18:09:23 2023 +0800
修改客户信息
commit e2769fdcac
Author: 0.0 <1092404103.qq.com>
Date: Mon Jun 19 18:02:43 2023 +0800
1.配送车次数量
commit 83d07b76e5
Author: kilo <wan.ren@foxmail.com>
Date: Mon Jun 19 15:47:24 2023 +0800
批量转配送任务
commit 8e08140603
Author: caoyizhong <1270296080@qq.com>
Date: Mon Jun 19 09:20:30 2023 +0800
修改库存管理
commit bb113255a5
Author: 0.0 <1092404103.qq.com>
Date: Fri Jun 16 18:04:10 2023 +0800
1.生成预约列表.2.隐藏资产操作
# Conflicts:
# src/option/distribution/distributionDeliveryList.js
# src/views/distribution/stockup/distributionStockup.vue
|
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
|
dc43cb86f6
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/router/views/index.js
|
2 years ago |
|
caoyizhong
|
efa5a9716d
|
修改客户信息
|
2 years ago |
|
0.0
|
e2769fdcac
|
1.配送车次数量
|
2 years ago |
|
kilo
|
83d07b76e5
|
批量转配送任务
|
2 years ago |
|
zhangsiyu
|
beabd22e09
|
更新
|
2 years ago |
|
caoyizhong
|
8e08140603
|
修改库存管理
|
2 years ago |
|
0.0
|
bb113255a5
|
1.生成预约列表.2.隐藏资产操作
|
2 years ago |
|
zhangsiyu
|
4b8edb39b3
|
Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev
# Conflicts:
# src/views/distribution/signfor/distributionSignfor.vue
# vite.config.js
|
2 years ago |
|
zhangsiyu
|
47f972e0f6
|
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/views/distribution/signfor/distributionSignfor.vue
# vite.config.js
|
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
|
0318cd7105
|
Merge branch 'test' into pre-production
|
2 years ago |
|
pref_mail@163.com
|
1d5104d381
|
Merge branch 'dev' into test
|
2 years ago |
|
kilo
|
859932a264
|
配送api调整
|
2 years ago |
