From 0cf2696771cb85270babf9e2870a0a00662043e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com> Date: Tue, 28 Jun 2022 17:10:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5rpm=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rpm/migrations/0004_auto_20220628_1709.py | 25 +++++++++++++++++++ apps/rpm/models.py | 4 +-- 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 apps/rpm/migrations/0004_auto_20220628_1709.py diff --git a/apps/rpm/migrations/0004_auto_20220628_1709.py b/apps/rpm/migrations/0004_auto_20220628_1709.py new file mode 100644 index 00000000..cd0529a7 --- /dev/null +++ b/apps/rpm/migrations/0004_auto_20220628_1709.py @@ -0,0 +1,25 @@ +# Generated by Django 3.2.12 on 2022-06-28 09:09 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('rpm', '0003_rparty_admin'), + ] + + operations = [ + migrations.AlterField( + model_name='rpjmember', + name='rcertificates', + field=models.ManyToManyField(blank=True, through='rpm.Rpjcertificate', to='rpm.Rcertificate'), + ), + migrations.AlterField( + model_name='rpjmember', + name='remployee', + field=models.ForeignKey(default=1541354338578993152, on_delete=django.db.models.deletion.CASCADE, to='rpm.remployee', verbose_name='关联人员'), + preserve_default=False, + ), + ] diff --git a/apps/rpm/models.py b/apps/rpm/models.py index b35eb548..b41c5f96 100644 --- a/apps/rpm/models.py +++ b/apps/rpm/models.py @@ -117,10 +117,10 @@ class Rpjmember(BaseModel): """ rpj = models.ForeignKey(Rpj, verbose_name='关联项目', on_delete=models.CASCADE) remployee = models.ForeignKey(Remployee, verbose_name='关联人员', - on_delete=models.CASCADE, null=True, blank=True) + on_delete=models.CASCADE) duty = models.CharField('职责', max_length=20, null=True, blank=True) is_manager = models.BooleanField('是否项目负责人', default=False) - rcertificates = models.ManyToManyField(Rcertificate, through='rpm.rpjcertificate') + rcertificates = models.ManyToManyField(Rcertificate, through='rpm.rpjcertificate', blank=True) class Rpjcertificate(BaseModel):