From 9d68a7006e7e004009f6c5255da16f48cac9d94f Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 12 Apr 2023 14:17:45 +0800 Subject: [PATCH] =?UTF-8?q?refector:=20=E4=BF=AE=E6=94=B9dpm=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/dpm/apps.py | 2 +- apps/dpm/models.py | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/dpm/apps.py b/apps/dpm/apps.py index 456386e9..29b2d132 100644 --- a/apps/dpm/apps.py +++ b/apps/dpm/apps.py @@ -3,5 +3,5 @@ from django.apps import AppConfig class DpmConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' - name = 'dpm' + name = 'apps.dpm' verbose_name = '双重预防' \ No newline at end of file diff --git a/apps/dpm/models.py b/apps/dpm/models.py index 6ae90017..c7feea62 100644 --- a/apps/dpm/models.py +++ b/apps/dpm/models.py @@ -39,7 +39,7 @@ class Risk(CommonBModel): name = models.TextField('项目/步骤') level = models.PositiveSmallIntegerField('风险等级', default=10, choices=RiskPoint.R_LEVEL) standard = models.TextField('检查标准', null=True, blank=True) - hazard = models.TextField('危害因素', null=True, blank=True) + hazard_factors = models.TextField('危害因素', null=True, blank=True) results = models.ManyToManyField('system.dictionary', verbose_name='可能后果', related_name='risk_results', null=True) sort = models.PositiveSmallIntegerField('排序', default=1) measure_tech = models.TextField('工程技术措施', null=True, blank=True) @@ -131,12 +131,12 @@ class Hazard(CommonBModel): dept_correct = models.ForeignKey('system.dept', on_delete=models.CASCADE, verbose_name='整改部门', related_name='hazard_dept_correct', null=True, blank=True) user_correct = models.ForeignKey('system.user', on_delete=models.SET_NULL, verbose_name='整改责任人', related_name='hazard_user_correct', null=True, blank=True) correct_time = models.DateTimeField('整改完成时间', null=True, blank=True) - user_access = models.ForeignKey('system.user', on_delete=models.CASCADE, verbose_name='评估人', related_name='hazard_user_access') - opinion_access = models.TextField('评估意见', null=True, blank=True) - user_check = models.ForeignKey('system.user', on_delete=models.CASCADE, verbose_name='复查人', related_name='hazard_user_check') - opinion_check = models.TextField('复查意见', null=True, blank=True) - user_audit = models.ForeignKey('system.user', on_delete=models.CASCADE, verbose_name='审核人', related_name='hazard_user_audit') - opinion_audit = models.TextField('审核意见', null=True, blank=True) + # user_access = models.ForeignKey('system.user', on_delete=models.CASCADE, verbose_name='评估人', related_name='hazard_user_access') + # opinion_access = models.TextField('评估意见', null=True, blank=True) + # user_check = models.ForeignKey('system.user', on_delete=models.CASCADE, verbose_name='复查人', related_name='hazard_user_check') + # opinion_check = models.TextField('复查意见', null=True, blank=True) + # user_audit = models.ForeignKey('system.user', on_delete=models.CASCADE, verbose_name='审核人', related_name='hazard_user_audit') + # opinion_audit = models.TextField('审核意见', null=True, blank=True) ticket = models.ForeignKey('wf.ticket', on_delete=models.SET_NULL, verbose_name='关联工单', related_name='hazard_ticket', null=True, blank=True)