Commit Graph

104 Commits

Author SHA1 Message Date
18338781771 5120f4bf4f Merge branch 'feature/inv' into develop 2026-02-25 10:41:39 +08:00
18338781771 1251f78c6b 扫码领取数量限制 2026-02-25 10:40:39 +08:00
18338781771 c2e2a20e35 Merge branch 'feature/inv' into develop 2026-02-24 16:54:46 +08:00
18338781771 8d83309daf 物品列表 2026-02-24 16:54:39 +08:00
18338781771 d59c390674 Merge branch 'feature/inv' into develop 2026-02-24 16:16:00 +08:00
18338781771 144fa72075 编辑数量时记录 2026-02-24 16:15:49 +08:00
18338781771 d02555df0a Merge branch 'feature/inv' into develop 2026-02-24 13:30:33 +08:00
18338781771 a9aabfa454 二维码 2026-02-24 13:30:27 +08:00
18338781771 0067a7508f Merge branch 'feature/inv' into develop 2026-02-24 11:28:21 +08:00
18338781771 cd692594e4 物品扫码领用与库存 2026-02-24 11:28:12 +08:00
18338781771 01f49f35b2 Merge branch 'feature/inv' into develop 2026-02-10 15:02:22 +08:00
18338781771 20857453d2 查询当前人是否已审核 2026-02-10 15:02:16 +08:00
18338781771 90a431015b Merge branch 'feature/inv' into develop 2026-02-10 10:20:18 +08:00
18338781771 6469e05176 当前人审核状态 2026-02-10 10:20:09 +08:00
18338781771 698f532ced Merge branch 'feature/inv' into develop 2026-02-10 10:09:45 +08:00
18338781771 3da11b4b37 日期处理 2026-02-10 10:09:39 +08:00
18338781771 af90824edd Merge branch 'feature/inv' into develop 2026-02-10 10:03:34 +08:00
18338781771 f6c8271729 日期处理 2026-02-10 10:03:28 +08:00
18338781771 ad5c053a5e Merge branch 'feature/inv' into develop 2026-02-10 09:51:18 +08:00
18338781771 40bc3a894d 审批过的审批状态处理 2026-02-10 09:51:11 +08:00
18338781771 c72b128872 Merge branch 'feature/inv' into develop 2026-02-09 14:08:19 +08:00
18338781771 fde98ea5b9 审核详情 2026-02-09 14:08:08 +08:00
18338781771 5f605f5a63 Merge branch 'feature/inv' into develop 2026-02-09 11:37:58 +08:00
18338781771 4894b25722 时间处理 2026-02-09 11:37:24 +08:00
18338781771 44dc6c06ee Merge branch 'feature/inv' into develop 2026-02-05 11:06:14 +08:00
18338781771 757689573b 审批id 2026-02-05 11:06:05 +08:00
18338781771 c896bef9a6 Merge branch 'feature/inv' into develop
# Conflicts:
#	app/controller/IndexController.php
#	composer.lock
#	config/route.php
2026-02-05 09:51:21 +08:00
18338781771 a16429ff3a 物品归还 2026-02-04 09:28:54 +08:00
18338781771 ab3bffe7cb 借用 2026-02-02 13:17:11 +08:00
18338781771 a8d1309349 1 2026-01-30 10:46:54 +08:00
18338781771 c38a53f053 物品下拉 2026-01-05 10:42:08 +08:00
18338781771 07a40bf688 物品相关信息 2026-01-05 10:18:27 +08:00
mzl92 399eaa2b5c 物品领用 2025-12-05 09:22:53 +00:00
18338781771 b4b4f6cd5f 仪表盘路由 2025-12-05 10:28:36 +08:00
18338781771 5c3f8679ce 仪表盘路由规则 2025-12-04 17:54:40 +08:00
18338781771 db7c8a650b 询单转发 2025-12-01 17:51:16 +08:00
18338781771 bf74d9b917 询单转发 2025-12-01 17:48:44 +08:00
18338781771 05e39d2d65 询单转发 2025-11-29 17:50:08 +08:00
18338781771 af8577064d 记录寻盘 2025-11-29 16:13:53 +08:00
18338781771 22ba33125a 询单 2025-11-29 15:55:48 +08:00
18338781771 6997947717 询单 2025-11-29 15:51:34 +08:00
18338781771 1e37560301 询单转发 2025-11-29 15:46:11 +08:00
18338781771 8a94de610d 询盘转发 2025-11-29 15:36:53 +08:00
mzl92 80fbf6c35a Merge branch 'develop'
# Conflicts:
#	config/route.php
2025-11-11 16:46:22 +08:00
mzl92 aabd0f4634 Merge branch 'develop'
# Conflicts:
#	app/admin/controller/dashboard/FinStatisticsController.php
#	app/common/controller/FinPaymentApplyController.php
#	app/common/controller/FinReceiptController.php
#	app/common/logic/FinReceiptLogic.php
#	app/common/model/FinPaymentApply.php
#	app/common/model/FinReceipt.php
#	app/common/service/FinPaymentApplyService.php
#	app/common/service/FinReceiptService.php
#	app/common/service/StockOrdersService.php
#	config/route.php
2025-11-04 10:36:52 +08:00
mzl92 359755fdf1 Merge branch 'release' 2025-11-03 18:16:51 +08:00
mzl92 1058bd9cbd Merge branch 'develop' 2025-10-21 19:55:36 +08:00
mzl92 009312ffa3 调整ä功能 2025-10-11 08:41:11 +00:00
mzl92 11b5a694ac 调整审批流&&增加人员分组 2025-10-10 11:09:37 +00:00
mzl92 81c7267b39 ts 2025-09-24 18:15:16 +08:00