diff --git a/application/org_mgnt/serializers.py b/application/org_mgnt/serializers.py index 2c51f49..997ad3f 100644 --- a/application/org_mgnt/serializers.py +++ b/application/org_mgnt/serializers.py @@ -15,9 +15,24 @@ class SecondaryDepartmentSerializer(serializers.ModelSerializer): class EntityChangeRecordSerializer(serializers.ModelSerializer): + change_date = serializers.DateField(format='%Y-%m-%d') + modified_obj = serializers.SerializerMethodField() + modified_field_verbose = serializers.SerializerMethodField() + class Meta: model = EntityChangeRecord - fields = '__all__' + fields = ('modified_obj', 'modified_field_verbose', 'content_before_change', 'content_after_change', 'change_date', 'change_executed_by') + + def get_modified_obj(self, obj): + company_entity = obj.company_entity + return f"{company_entity.company_name}" + + def get_modified_field_verbose(self, obj): + # 获取模型类 + model_class = obj.company_entity._meta.model + # 获取字段的 verbose_name + field = model_class._meta.get_field(obj.change_type) + return field.verbose_name class CompanyBankAccountSerializer(serializers.ModelSerializer): diff --git a/application/org_mgnt/templates/ce_list_inherit.html b/application/org_mgnt/templates/ce_list_inherit.html index 8030d40..669917a 100644 --- a/application/org_mgnt/templates/ce_list_inherit.html +++ b/application/org_mgnt/templates/ce_list_inherit.html @@ -58,7 +58,7 @@ data-bs-target="#addEditModal">编辑 + 变更主体 变更日期 变更类型 变更前内容 变更后内容 - 变更原因 变更执行人 @@ -215,7 +215,7 @@ -