Commit Graph

101 Commits

Author SHA1 Message Date
彭森 349e17a4ca commit 新增视图数据页面 2024-06-06 15:08:38 +08:00
王思川 b79ffa934f 精简list页面的context配置 2024-06-06 14:18:42 +08:00
王思川 68d3efa9c0 commit 2024-06-06 01:36:27 +08:00
王思川 07267bc151 commit 2024-06-05 23:29:00 +08:00
王思川 20a3f98b32 commit 2024-06-05 17:31:10 +08:00
王思川 c648e0c22e commit 2024-06-05 16:31:01 +08:00
王思川 03ff48830e commit 2024-06-05 15:39:26 +08:00
王思川 44a1bacba5 commit 2024-06-05 15:26:27 +08:00
王思川 82c91e4b03 commit 2024-06-05 14:44:44 +08:00
王思川 72970f02c4 commit 2024-06-05 14:05:45 +08:00
王思川 a467410d12 Merge branch 'ps-' into wsc 2024-06-05 12:45:08 +08:00
王思川 2402345e96 commit 2024-06-05 12:40:44 +08:00
王思川 210e4fea1d commit 2024-06-05 11:40:48 +08:00
王思川 a526e7be80 commit 2024-06-05 11:34:45 +08:00
王思川 04045a165a commit 2024-06-05 10:11:00 +08:00
彭森 3b96631483 commit 1. 优化代码生成脚本 2024-06-05 10:09:46 +08:00
王思川 7a05944bb5 commit 2024-06-05 00:45:24 +08:00
王思川 4f50e05343 commit 2024-06-04 22:35:12 +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
彭森 4ea82f2614 commit 1. 优化代码生成脚本 2024-06-04 17:31:55 +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
王思川 1bcced634e commit 2024-06-02 16:30:33 +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
王思川 06b4bc00a0 commit 2024-06-01 11:09:36 +08:00
王思川 c1f59fd292 commit 2024-06-01 06:37:31 +08:00
王思川 8616ef6fb8 commit 2024-06-01 06:30:19 +08:00
王思川 45a95d8a99 commit 2024-06-01 05:05:29 +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
王思川 bb0e99303a commit 2024-05-30 17:12:34 +08:00
王思川 0d46c610be commit 2024-05-30 17:09:09 +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
王思川 46368ac42b commit 2024-05-29 17:26:54 +08:00
王思川 b32c0973e8 commit 2024-05-29 17:11:26 +08:00
王思川 e15c1eeff5 commit 2024-05-29 15:34:10 +08:00