Commit Graph

108 Commits

Author SHA1 Message Date
18338781771 65f0be0a5d Merge branch 'feature/merge' into develop 2025-12-04 17:54:46 +08:00
18338781771 5c3f8679ce 仪表盘路由规则 2025-12-04 17:54:40 +08:00
mzl92 32a7752f8b Merge branch 'develop' into feature/mzl_dev
# Conflicts:
#	.gitignore
#	composer.lock
2025-12-02 14:17:25 +08:00
18338781771 fe78500ef0 转发 2025-12-01 18:15:53 +08:00
18338781771 8a94de610d 询盘转发 2025-11-29 15:36:53 +08:00
mzl92 2c295cd631 tz 2025-11-26 15:51:05 +08:00
mzl92 80fbf6c35a Merge branch 'develop'
# Conflicts:
#	config/route.php
2025-11-11 16:46:22 +08:00
mzl92 6ab4505e17 对账 2025-11-07 15:28:59 +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 013fc83362 Merge branch 'develop' into feature/mzl_dev 2025-11-04 10:32:22 +08:00
mzl92 359755fdf1 Merge branch 'release' 2025-11-03 18:16:51 +08:00
mzl92 2f8f7dccf9 调整备货单功能 2025-11-03 18:07:56 +08:00
18338781771 a98769fb4c Merge branch 'feature/fin' into develop 2025-11-01 14:44:58 +08:00
18338781771 56ad551707 收汇凭证倒计时 2025-11-01 14:44:47 +08:00
18338781771 0c789b7a1a Merge branch 'feature/fin' into develop
# Conflicts:
#	app/common/service/FinReceiptService.php
2025-11-01 13:37:39 +08:00
18338781771 8674063e6e 付款记录作废 2025-11-01 13:36:18 +08:00
18338781771 1094bc406f Revert "作废"
This reverts commit 139d3509f4.
2025-11-01 13:22:45 +08:00
18338781771 262add20f8 Merge branch 'feature/fin' into develop
# Conflicts:
#	app/common/service/FinReceiptService.php
2025-11-01 09:47:56 +08:00
18338781771 139d3509f4 作废 2025-11-01 09:45:41 +08:00
18338781771 f7faf79809 待入账列表 2025-11-01 08:56:48 +08:00
18338781771 ea0d5b14bc Merge branch 'feature/fin' into develop 2025-10-30 17:21:20 +08:00
18338781771 a3819bcba7 入账资料附件格式处理 2025-10-30 17:21:10 +08:00
18338781771 c2d291bed4 Merge branch 'feature/fin' into develop 2025-10-29 18:38:42 +08:00
18338781771 346d67c084 超过24小时邮件通知提交入账资料 2025-10-29 18:05:23 +08:00
18338781771 2b2e821779 Merge branch 'feature/fin' into develop 2025-10-29 14:23:53 +08:00
18338781771 07c0b2a2f3 收付款 2025-10-29 14:14:40 +08:00
18338781771 2127473290 系统设置 2025-10-28 16:59:51 +08:00
18338781771 2f9f483661 Merge branch 'feature/fin' into develop
# Conflicts:
#	app/controller/IndexController.php
#	config/route.php
2025-10-27 10:23:52 +08:00
18338781771 9fdce3eaf3 Merge branch 'feature/audit' 2025-10-24 15:02:20 +08:00
18338781771 18786591b1 Merge branch 'feature/audit' into develop 2025-10-24 15:02:01 +08:00
18338781771 5e3d05e502 请求操作日志 2025-10-23 13:21:07 +08:00
mzl92 1058bd9cbd Merge branch 'develop' 2025-10-21 19:55:36 +08:00
mzl92 13ab4b7868 根据10.17沟通调整 2025-10-21 19:53:21 +08:00
18338781771 8c2d6e07ff 更新日志 2025-10-21 15:17:08 +08:00
mzl92 04d7d73c45 增加业务强制绑定提醒 2025-10-13 13:27:22 +08:00
mzl92 009312ffa3 调整ä功能 2025-10-11 08:41:11 +00:00
mzl92 11b5a694ac 调整审批流&&增加人员分组 2025-10-10 11:09:37 +00:00
18338781771 e0b11718a7 收款记录关联备货单 2025-09-24 17:55:16 +08:00
18338781771 82e4435a2c 收汇附件名称 2025-09-24 17:49:14 +08:00
mzl92 2a44802994 增加审批时间轴&&调整采购单 2025-09-24 17:38:04 +08:00
18338781771 435d3ce677 付款记录 2025-09-24 15:23:47 +08:00
mzl92 8f2c47d8cb 修改审批流程模块儿 2025-09-24 11:18:59 +08:00
mzl92 368bfe44ee 采购单审批流程 2025-09-23 17:26:01 +08:00
18338781771 4717bb01ca 付款与收款 2025-09-23 15:14:08 +08:00
18338781771 36d1d333b1 付款与收款 2025-09-23 15:13:56 +08:00
root bdefd69a13 采购单处理 2025-09-22 15:50:36 +08:00
mzl92 e12d5951e4 修改计å¤备货单金额计算&&采购单编写†2025-09-22 01:55:34 +00:00
mzl92 20e3ce3b27 修改审批 2025-09-19 07:43:48 +00:00
mzl92 b7b6edb06c Merge branch 'develop' 2025-09-18 15:05:57 +08:00
mzl92 cd29507c45 Merge branch 'develop' into feature/mzl_dev 2025-09-18 15:04:59 +08:00