Commit Graph

11 Commits

Author SHA1 Message Date
彭森 c1cbd6e7d1 commit
1. 修复继承html显示错误
2. 删除之前分别保存excel数据的接口
2024-06-19 14:04:14 +08:00
彭森 2c289c7cd6 commit
1. 继承items_list的html
2. 删除common-views中多余的excel方法
2024-06-19 02:19:18 +08:00
彭森 8a66997080 commit
1. 财务金额用千分号隔开
2. 删除了一些不必要的html
2024-06-18 10:31:15 +08:00
彭森 dc9bb836d5 commit
1.完成视图数据页面和base.html权限校验
2. 修复账号权限表与用户权限表权限设置后翻页未记录选择框状态
3. 项目回款记录table不显示开票记录字段
4. 公司主体信息登记表-银行账户新增账户状态
5. 人员基本信息表-添加数据根据生日自动算出年龄
6. 处理了一些页面不需要显示筛选和编辑和ID的问题
2024-06-18 09:58:03 +08:00
彭森 677f3079cf commit excel上传校验 2024-06-17 13:09:17 +08:00
彭森 349e17a4ca commit 新增视图数据页面 2024-06-06 15:08:38 +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
彭森 a649c85e24 commit 1. 基础数据表 list页面 2024-06-01 09:59:42 +08:00
王思川 59ac191993 commit 2024-06-01 00:57:14 +08:00
王思川 6bab6d6191 commit 2024-05-30 17:06:23 +08:00
彭森 09c5029132 commit 1. 基础数据表后端接口 2024-05-29 09:27:39 +08:00