diff --git a/client/src/views/supervision/taskdo.vue b/client/src/views/supervision/taskdo.vue index 577b148..5fbe4d7 100644 --- a/client/src/views/supervision/taskdo.vue +++ b/client/src/views/supervision/taskdo.vue @@ -81,7 +81,6 @@ size="small" >发布任务 - 按材料批量修改备注 diff --git a/server/apps/system/migrations/0016_auto_20210331_1040.py b/server/apps/system/migrations/0016_auto_20210331_1040.py new file mode 100644 index 0000000..09f1d4b --- /dev/null +++ b/server/apps/system/migrations/0016_auto_20210331_1040.py @@ -0,0 +1,18 @@ +# Generated by Django 3.0.5 on 2021-03-31 02:40 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('system', '0015_auto_20210331_0906'), + ] + + operations = [ + migrations.AlterField( + model_name='organization', + name='sort', + field=models.CharField(blank=True, max_length=100, null=True, verbose_name='排序'), + ), + ] diff --git a/server/apps/system/models.py b/server/apps/system/models.py index f807064..f1bdb65 100644 --- a/server/apps/system/models.py +++ b/server/apps/system/models.py @@ -59,7 +59,7 @@ class Organization(SoftModel): type = models.ForeignKey('system.dict', verbose_name='组织类型', null=True, blank=True, on_delete=models.SET_NULL) pid = models.ForeignKey('self', null=True, blank=True, on_delete=models.SET_NULL, verbose_name='父') - sort = models.CharField('排序', default="", max_length=100) + sort = models.CharField('排序', null=True, blank=True, max_length=100) can_supervision = models.BooleanField('是否可监督', default=False) class Meta: verbose_name = '组织架构'