彭森
|
c7b68e0ea8
|
commit 模型调整为上个版本
|
2024-06-16 20:08:28 +08:00 |
|
彭森
|
4ea98bedaf
|
commit 修改模型外键相关问题，重置了数据库
|
2024-06-16 14:07:40 +08:00 |
 王思川
|
639aa38f7f
|
Merge remote-tracking branch 'origin/master' into wsc
# Conflicts:
# application/org_mgnt/views.py
|
2024-06-14 16:51:55 +08:00 |
|
彭森
|
ae37487b83
|
commit 1. excel上传问题
|
2024-06-14 16:47:56 +08:00 |
|
王思川
|
d05d65703f
|
base.html views 权限配置
|
2024-06-14 16:47:43 +08:00 |
|
彭森
|
85a0676f92
|
commit 1. 权限管理 2. 各个table的点击modal（未完成，今天完成）
|
2024-06-12 16:40:51 +08:00 |
|
彭森
|
7f12221240
|
commit 基础数据表 excel模板
|
2024-06-09 16:45:08 +08:00 |
|
彭森
|
066d7480ac
|
commit 基础数据表view修改
|
2024-06-07 14:20:58 +08:00 |
|
彭森
|
46c3f14922
|
commit 基础数据表view修改
|
2024-06-07 03:47:15 +08:00 |
|
王思川
|
f66943b84c
|
commit
|
2024-06-06 23:46:12 +08:00 |
|
王思川
|
e4a2b7f655
|
commit
|
2024-06-06 22:44:07 +08:00 |
|
彭森
|
7ffdb445c4
|
commit view_list 格式规范
|
2024-06-06 20:56:06 +08:00 |
|
彭森
|
349e17a4ca
|
commit 新增视图数据页面
|
2024-06-06 15:08:38 +08:00 |
|
王思川
|
04045a165a
|
commit
|
2024-06-05 10:11:00 +08:00 |
|
王思川
|
32ba648d94
|
Merge remote-tracking branch 'origin/ps-'
# Conflicts:
# application/perf_mgnt/templates/perf_mgnt/gbo_list.html
|
2024-06-04 18:47:00 +08:00 |
|
王思川
|
4a76fa3680
|
commit
|
2024-06-04 18:45:11 +08:00 |
|
彭森
|
8689ea6258
|
commit 1. 优化代码生成脚本
|
2024-06-04 16:50:30 +08:00 |
|
王思川
|
c3a52ccc92
|
Merge remote-tracking branch 'origin/ps'
# Conflicts:
# application/perf_mgnt/templates/perf_mgnt/gbo_list.html
# application/perf_mgnt/views.py
|
2024-06-03 11:43:33 +08:00 |
|
彭森
|
5e6a235ab1
|
commit 1. 编辑/新增模态框修复bug
|
2024-06-03 11:13:20 +08:00 |
|
彭森
|
0f2b13c459
|
commit 1. 编辑/新增模态框修复bug
|
2024-06-03 00:13:17 +08:00 |
|
王思川
|
3623b32439
|
commit
|
2024-06-02 21:47:43 +08:00 |
|
王思川
|
af00a025c2
|
commit
|
2024-06-02 21:30:17 +08:00 |
|
王思川
|
808c6e7a7e
|
commit
|
2024-06-02 14:47:17 +08:00 |
|
彭森
|
691993373d
|
commit 1. 编辑/新增模态框 2. input新增date和month
|
2024-06-02 14:07:08 +08:00 |
|
彭森
|
be08a5c38a
|
commit 1. 编辑/新增模态框 2. input新增date和month
|
2024-06-02 13:38:07 +08:00 |
|
王思川
|
937e999856
|
Merge branch 'ps'
# Conflicts:
# XH_Digital_Management/urls.py
# application/hrm_mgnt/templates/hrm_mgnt/annual_leave_record.html
# application/hrm_mgnt/templates/hrm_mgnt/employee_attendance_records.html
# application/hrm_mgnt/templates/hrm_mgnt/employee_information.html
# application/hrm_mgnt/templates/hrm_mgnt/positions_table.html
# application/hrm_mgnt/templates/hrm_mgnt/ranks_table.html
# application/opa_mgnt/templates/opa_mgnt/account_operation_management.html
# application/opa_mgnt/templates/opa_mgnt/social_media_account_registration.html
# application/opa_mgnt/templates/opa_mgnt/website_maintenance_record.html
# application/opa_mgnt/templates/opa_mgnt/website_registration.html
# application/org_mgnt/templates/org_mgnt/entity_information_registration.html
# application/org_mgnt/templates/org_mgnt/secondary_departments.html
# application/org_mgnt/views.py
# application/perf_mgnt/views.py
# application/rsc_mgnt/templates/rsc_mgnt/business_vehicle_usage_registry.html
# application/rsc_mgnt/templates/rsc_mgnt/company_mobile_phone_usage_registry.html
# application/rsc_mgnt/templates/rsc_mgnt/consumable_goods_category_management.html
# application/rsc_mgnt/templates/rsc_mgnt/consumable_goods_inventory.html
# application/rsc_mgnt/templates/rsc_mgnt/membership_accounts_registry.html
# application/rsc_mgnt/templates/rsc_mgnt/stored_value_card_registration.html
|
2024-06-01 11:21:37 +08:00 |
|
王思川
|
8616ef6fb8
|
commit
|
2024-06-01 06:30:19 +08:00 |
|
王思川
|
45a95d8a99
|
commit
|
2024-06-01 05:05:29 +08:00 |
|
王思川
|
98ab816473
|
commit
|
2024-06-01 01:16:14 +08:00 |
|
王思川
|
59ac191993
|
commit
|
2024-06-01 00:57:14 +08:00 |
|
彭森
|
2e97a907e1
|
commit 1. 基础数据表 list页面
|
2024-05-31 20:17:40 +08:00 |
|
王思川
|
1696aa44fd
|
修改记录 模态框
|
2024-05-30 20:49:13 +08:00 |
|
王思川
|
cbe474d764
|
commit
|
2024-05-30 18:22:18 +08:00 |
|
王思川
|
42b3e3cff5
|
commit
|
2024-05-30 17:33:51 +08:00 |
|
王思川
|
6bab6d6191
|
commit
|
2024-05-30 17:06:23 +08:00 |
|
王思川
|
013c4878fa
|
Merge branch 'ps' into wsc
# Conflicts:
# XH_Digital_Management/settings.py
|
2024-05-30 14:16:02 +08:00 |
|
王思川
|
49559e7125
|
commit
|
2024-05-30 14:13:48 +08:00 |
|
王思川
|
eaf857470b
|
commit
|
2024-05-30 13:40:50 +08:00 |
|
彭森
|
bb82983880
|
commit 1. 基础数据表后端
|
2024-05-30 13:39:36 +08:00 |
|
王思川
|
da677c4668
|
Merge remote-tracking branch 'origin/ps' into wsc
# Conflicts:
# XH_Digital_Management/settings.py
# static/js/menu-setting.js
# static/js/pages/ac-notification.js
# static/js/pages/data-ajax-custom.js
# static/js/pages/data-scroller-custom.js
# static/js/pages/data-server-custom.js
# static/js/pages/data-source-custom.js
# static/js/pages/form-advance-custom.js
# static/js/pages/new-signup/zxcvbn.js
# static/js/pages/offline-custom.js
# static/js/pcoded.js
|
2024-05-29 15:55:14 +08:00 |
|
彭森
|
bdd63c01fb
|
commit 1. 修改静态资源位置
|
2024-05-29 15:40:26 +08:00 |
|
王思川
|
e15c1eeff5
|
commit
|
2024-05-29 15:34:10 +08:00 |
|
彭森
|
09c5029132
|
commit 1. 基础数据表后端接口
|
2024-05-29 09:27:39 +08:00 |
|
彭森
|
4237a63df0
|
commit 创建基础数据表相关model,并搭建django前端
|
2024-05-27 23:39:32 +08:00 |
|
彭森
|
7f6568525b
|
commit 创建基础数据表相关model
|
2024-05-15 18:41:23 +08:00 |
|
王思川
|
1cccd40084
|
commit
|
2024-05-15 13:59:41 +08:00 |