From 223182d61b5f79b85894c680223b7a2ea24bbc28 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 31 Mar 2021 10:40:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=8E=92=E5=BA=8F=E5=8F=AF?=
 =?UTF-8?q?=E7=95=99=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/views/supervision/taskdo.vue        |  1 -
 .../migrations/0016_auto_20210331_1040.py      | 18 ++++++++++++++++++
 server/apps/system/models.py                   |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 server/apps/system/migrations/0016_auto_20210331_1040.py

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"
             >发布任务</el-button
           >
-          <el-button type="primary" @click="handleUp1" size="small" v-if="checkPermission(['task_update'])">按材料批量修改备注</el-button>
         </div>
       </div>
     </el-card>
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 = '组织架构'