feat:hrm-人员合同变更
This commit is contained in:
parent
416aa50a67
commit
7e052b7b71
|
|
@ -357,7 +357,7 @@ class EmpContract(CommonAModel):
|
||||||
employee = models.OneToOneField(Employee, verbose_name='人员信息', on_delete=models.SET_NULL, null=True, blank=True)
|
employee = models.OneToOneField(Employee, verbose_name='人员信息', on_delete=models.SET_NULL, null=True, blank=True)
|
||||||
ticket = models.OneToOneField('wf.ticket', verbose_name='关联工单',
|
ticket = models.OneToOneField('wf.ticket', verbose_name='关联工单',
|
||||||
on_delete=models.CASCADE, related_name='contract_ticket', null=True, blank=True)
|
on_delete=models.CASCADE, related_name='contract_ticket', null=True, blank=True)
|
||||||
counts = models.PositiveSmallIntegerField('合同变更次数', default=1)
|
counts = models.PositiveSmallIntegerField('合同变更次数', default=0)
|
||||||
plan_renewal = models.DateField('应续签', null=True, blank=True)
|
plan_renewal = models.DateField('应续签', null=True, blank=True)
|
||||||
normal_renewal = models.DateField('正常续签', null=True, blank=True)
|
normal_renewal = models.DateField('正常续签', null=True, blank=True)
|
||||||
change_date = models.IntegerField('续签/变更(年)', null=True, blank=True)
|
change_date = models.IntegerField('续签/变更(年)', null=True, blank=True)
|
||||||
|
|
|
||||||
|
|
@ -421,8 +421,8 @@ class EmpContractSerializer(CustomModelSerializer):
|
||||||
post_name = serializers.CharField(source="employee.post.name", read_only=True)
|
post_name = serializers.CharField(source="employee.post.name", read_only=True)
|
||||||
dept_name = serializers.CharField(source='employee.belong_dept.name', read_only=True)
|
dept_name = serializers.CharField(source='employee.belong_dept.name', read_only=True)
|
||||||
gender = serializers.CharField(source="employee.gender", read_only=True)
|
gender = serializers.CharField(source="employee.gender", read_only=True)
|
||||||
join_date = serializers.CharField(source="employee.join_date", read_only=True)
|
join_date = serializers.CharField(source="employee.start_date", read_only=True)
|
||||||
end_contract = serializers.CharField(source="employee.end_contract_date", read_only=True)
|
end_contract = serializers.CharField(source="employee.contract_end_date", read_only=True)
|
||||||
class Meta:
|
class Meta:
|
||||||
model = EmpContract
|
model = EmpContract
|
||||||
fields = '__all__'
|
fields = '__all__'
|
||||||
|
|
@ -20,7 +20,7 @@ router.register('empperson', EmpPersonInfoViewSet, basename='empperson')
|
||||||
router.register('leave', LeaveViewSet, basename='leave')
|
router.register('leave', LeaveViewSet, basename='leave')
|
||||||
router.register('transfer', TransferViewSet, basename='transfer')
|
router.register('transfer', TransferViewSet, basename='transfer')
|
||||||
router.register('probation', ProbationViewSet, basename='probation')
|
router.register('probation', ProbationViewSet, basename='probation')
|
||||||
router.register('contract', EmpContractViewSet, basename='emp_contract')
|
router.register('contract', EmpContractViewSet, basename='empcontract')
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path(API_BASE_URL, include(router.urls)),
|
path(API_BASE_URL, include(router.urls)),
|
||||||
]
|
]
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue