Commit Graph
54 Commits
Author SHA1 Message Date
lewis_yan b508242456 feat(celery): add check_quote_deadline_expired periodic task 2026-04-02 10:45:11 +08:00
lewis_yan 03edefa636 feat(email): register TEMPLATE_QUOTE_DEADLINE_EXPIRED template 2026-04-02 10:44:24 +08:00
lewis_yan 98563d279e Merge branch 'develop' of http://192.168.80.90:8086/pisteams/pis into develop 2026-04-02 10:32:15 +08:00
lewis_yan 45eccc45ec test: update Django+DRF testing infrastructure
- pytest.ini: use application.test_settings for MSSQL compatibility
- conftest.py: move to backend root; use UserFactory with Sequence
- application/test_settings.py: NoCreateTestDatabase patch for MSSQL
- test_serializers.py: use chinese error keys (django_restql behavior)
- test_views.py: use API response code assertions (SuccessResponse format)
2026-04-02 10:26:12 +08:00
allen_xiong ceaa3bdc1f Merge branch 'develop' into 'develop'
Develop

See merge request pisteams/pis!36
2026-04-02 02:07:05 +00:00
lewis_yan eb1e8c3f5d test: add CurrencyViewSet tests for basicinfo 2026-04-02 09:58:36 +08:00
lewis_yan 8d46b5c4fa test: add CurrencySerializer tests for basicinfo 2026-04-02 09:58:19 +08:00
lewis_yan 5df83edb1e test: add CurrencyFactory and UnitFactory for basicinfo app 2026-04-02 09:58:03 +08:00
lewis_yan dfc0c742c2 test: add basicinfo tests directory 2026-04-02 09:57:10 +08:00
lewis_yan 4582dd5ef4 Merge branch 'develop' of http://192.168.80.90:8086/pisteams/pis into develop 2026-04-02 09:22:18 +08:00
lewis_yan 27b98bc73f feat(dashboard): complete buyer/supplier dashboard redesign
Backend:
- Fix JWT auth header format (use "JWT " prefix)
- Fix DashboardView to return data for superadmin users
- Return empty structure when no business data exists
- Use serializers for response validation

Frontend:
- Redesign BuyerDashboard with new UI matching design spec
- Redesign SupplierDashboard with consistent styling
- Add role switcher for users with both buyer/supplier roles
- Fix FontAwesome icon class names (fa vs fas)
- Update tagsView title when switching roles via mitt event
- Add i18n translations for dashboard

Auth fixes:
- Fix token storage to use sessionStorage instead of Cookies
- Add route initialization guard to prevent duplicate routing
- Fix login flow for token handling

Files:
- Add BuyerDashboard, SupplierDashboard, KpiCard, TrendChart components
- Add dashboard API and Pinia store
- Add mitt event type for tagsView name update
2026-04-02 09:20:12 +08:00
nebula_chen 851580afad 修改履历表写入文本 2026-04-01 19:40:43 +08:00
nebula_chen 92c4f5d524 调整部分前端效果;增加报价单逾期写入履历表 2026-04-01 19:35:54 +08:00
lewis_yan 7240d4f0c9 refactor(dashboard): rewrite views.py using DRF CBV pattern
- Move serializers into views.py for self-contained CBV
- Use DashboardViewSet with list() method for GET
- Add proper docstrings
- Use serializer for response validation
2026-04-01 19:27:21 +08:00
lewis_yan 574d9557cf fix(dashboard): use DashboardView instead of placeholder in urls.py
The urls.py was still using a placeholder view function. Updated to import
and use the proper DashboardView.as_view() from views.py.
2026-04-01 19:21:39 +08:00
lewis_yan 0bd82e517b feat(dashboard): implement dashboard view with role-based data filtering 2026-04-01 19:07:47 +08:00
lewis_yan 54976e0335 feat(dashboard): add dashboard serializers 2026-04-01 19:07:00 +08:00
lewis_yan c3fb11c481 feat(dashboard): create dashboard app skeleton with URL routing 2026-04-01 19:06:17 +08:00
allen_xiong 6d4e431a39 Merge branch 'develop' into 'develop'
新增邮件类型;调整部分前端效果

See merge request pisteams/pis!34
2026-04-01 09:36:20 +00:00
nebula_chen 0a1d5e29fb 新增邮件类型;调整部分前端效果
询价单详情页仅查看模式显示“询价单操作日志”;修改受邀供应商均报价提醒采购人员邮件文案;新增超过报价截止时间提醒采购人员邮件模板及调用
2026-04-01 17:18:59 +08:00
allen_xiong 670bb9c12f Merge branch 'develop' into 'develop'
新增 - 所有供应商均提交报价邮件通知采购商;供应商用户信息表及相应序列化器

See merge request pisteams/pis!33
2026-04-01 06:49:42 +00:00
nebula_chen c3ecfbfd56 实现询价操作日志查询接口;实现前端页面“询价操作日志查询” 2026-04-01 14:47:31 +08:00
nebula_chen 0424a3e3f4 补充询价操作履历表更新逻辑;修复前端bug--报价单仅拉起10条数据;杂采报价相应表结构名更新前缀pis_misc_ 2026-04-01 11:02:35 +08:00
nebula_chen 90103f6126 新增 - 所有供应商均提交报价邮件通知采购商;供应商用户信息表及相应序列化器 2026-04-01 09:43:44 +08:00
allen_xiong bf531c13fa Merge branch 'develop' into 'develop'
报价单详情窗口、询价单详情窗口、比价窗口转为对应路由页面;

See merge request pisteams/pis!32
2026-04-01 01:12:05 +00:00
nebula_chen fb308ca691 报价单详情窗口、询价单详情窗口、比价窗口转为对应路由页面; 2026-03-31 19:37:45 +08:00
allen_xiong 29a5d55852 Merge branch 'develop' into 'develop'
重写制程最低价计算与取值逻辑;调整部分前端逻辑

See merge request pisteams/pis!31
2026-03-30 09:43:21 +00:00
nebula_chen 2fd8788e5f 重写制程最低价计算与取值逻辑;调整部分前端逻辑 2026-03-30 17:40:53 +08:00
allen_xiong 91ee7467c5 Merge branch 'develop' into 'develop'
调整比议价程式相关前端效果;修改制程最低价记录后端逻辑

See merge request pisteams/pis!30
2026-03-30 05:44:20 +00:00
nebula_chen e41983eb5a 调整比议价程式相关前端效果;修改制程最低价记录后端逻辑 2026-03-30 12:34:00 +08:00
Developer01 8211811dd0 更新0007_alter_misclowpriceheader_item_no.py和0005_alter_quotationmaster_quote_deadline_and_more.py 2026-03-29 19:50:25 +08:00
allen_xiong 466aec8fe9 Merge branch 'develop' into 'develop'
新增 - 报价截止时间校验逻辑;报价单流转到”已过期“状态逻辑;完善询价单流转到”报价结束“状态逻辑

See merge request pisteams/pis!27
2026-03-29 06:39:04 +00:00
nebula_chen 0f0d40588d 修复测试发现的问题;调整部分ui效果 2026-03-27 19:15:44 +08:00
nebula_chen e7ad616152 新增 - 报价截止时间校验逻辑;报价单流转到”已过期“状态逻辑;完善询价单流转到”报价结束“状态逻辑 2026-03-27 19:12:14 +08:00
Developer01 5075ff91c2 询报价增加采购方式、招标开始时间、招标结束时间 2026-03-27 16:09:16 +08:00
allen_xiong 379ebfa60f Merge branch 'develop' into 'develop'
新增 杂采比议价、询价履历记录 实现;调整部分ui效果

See merge request pisteams/pis!25
2026-03-27 07:30:34 +00:00
nebula_chen 6f2000041f 新增 杂采比议价、询价履历记录 实现;调整部分ui效果 2026-03-27 14:32:50 +08:00
Developer01 b87d549f41 询价模板版本增加初始默认值 2026-03-26 15:56:19 +08:00
allen_xiong 68f1a757b2 Merge branch 'develop' into 'develop'
新增 - 询/报价列表增加首列“交易厂区”列;修改 - 报价窗口“询价状态”改为"交易厂区";修复“报价中”状态无法报价bug。

See merge request pisteams/pis!23
2026-03-26 07:19:53 +00:00
nebula_chen 7af8dbde95 新增 - 询/报价列表增加首列“交易厂区”列;
修改 - 报价窗口“询价状态”改为"交易厂区";修复“报价中”状态无法报价bug。
2026-03-26 15:14:19 +08:00
Developer01 23fd346151 询报价增加重量栏位和询价单增加模板版本字段 2026-03-26 11:48:37 +08:00
allen_xiong b44438681b Merge branch 'develop' into 'develop'
修改部分前端效果并根据业务逻辑调整后端实现

See merge request pisteams/pis!20
2026-03-26 00:47:59 +00:00
nebula_chen 11ee089689 修改部分前端效果并根据业务逻辑调整后端实现 2026-03-25 17:52:52 +08:00
Developer01 81b313d790 增加邮件服务配置及功能 2026-03-25 17:41:41 +08:00
Developer01 93d53bd908 1.单据编号设置表迁移脚本更新 2026-03-25 14:40:07 +08:00
allen_xiong cbf78f9e2f Merge branch 'develop' into 'develop'
新增 - 邮件通知模型及其序列化器,邮件发文模板;询价单发布同步向对应供应商发送邮件。

See merge request pisteams/pis!15
2026-03-25 06:19:10 +00:00
nebula_chen 6572d1acda 新增 - 邮件通知模型及其序列化器,邮件发文模板;询价单发布同步向对应供应商发送邮件。 2026-03-25 11:34:27 +08:00
allen_xiong 23067831d6 Merge branch 'develop' into 'develop'
新增 - 取号规则表模型结构及相应序列化器;修改 - 报价单展开改为三个页签,且修复询价单附件回显异常的问题;当前询报价单号取号规则改为基于取号规则表字段进行组装;

See merge request pisteams/pis!14
2026-03-25 02:38:03 +00:00
nebula_chen 41a9ebc4da 新增 - 取号规则表模型结构及相应序列化器;
修改 - 报价单展开改为三个页签,且修复询价单附件回显异常的问题;当前询报价单号取号规则改为基于取号规则表字段进行组装;
2026-03-24 19:58:56 +08:00
allen_xiong bba8d60dd0 更新服务器迁移文件 2026-03-24 14:43:42 +08:00