 王思川
|
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 |
|
王思川
|
2fad627296
|
Merge remote-tracking branch 'origin/ps' into ps1
|
2024-06-14 02:28:54 +08:00 |
|
彭森
|
335e2670d1
|
commit 1. 各个模块细节部分
|
2024-06-13 00:12:17 +08:00 |
|
彭森
|
85a0676f92
|
commit 1. 权限管理 2. 各个table的点击modal（未完成，今天完成）
|
2024-06-12 16:40:51 +08:00 |
|
彭森
|
e6d921479e
|
commit 基础数据表 excel模板
|
2024-06-09 17:14:10 +08:00 |
|
彭森
|
066d7480ac
|
commit 基础数据表view修改
|
2024-06-07 14:20:58 +08:00 |
|
彭森
|
46c3f14922
|
commit 基础数据表view修改
|
2024-06-07 03:47:15 +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 |
|
彭森
|
8689ea6258
|
commit 1. 优化代码生成脚本
|
2024-06-04 16:50:30 +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 |
|
王思川
|
59ac191993
|
commit
|
2024-06-01 00:57:14 +08:00 |
|
彭森
|
2e97a907e1
|
commit 1. 基础数据表 list页面
|
2024-05-31 20:17:40 +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 |
|
王思川
|
eaf857470b
|
commit
|
2024-05-30 13:40:50 +08:00 |
|
彭森
|
bb82983880
|
commit 1. 基础数据表后端
|
2024-05-30 13:39:36 +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 |