From aa03f2f0eef43395905579713edd5073a3293b81 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 16 Mar 2021 08:28:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=B8=BB=E5=8A=A8=E6=8A=A5?=
 =?UTF-8?q?=E9=80=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/views/supervision/taskdo.vue       |  2 +
 .../migrations/0008_auto_20210316_0827.py     | 40 +++++++++++++++++++
 server/apps/supervision/models.py             |  2 +-
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 server/apps/supervision/migrations/0008_auto_20210316_0827.py

diff --git a/client/src/views/supervision/taskdo.vue b/client/src/views/supervision/taskdo.vue
index 2fadf86..14fe763 100644
--- a/client/src/views/supervision/taskdo.vue
+++ b/client/src/views/supervision/taskdo.vue
@@ -233,6 +233,7 @@ export default {
       });
     },
     chose1(item){
+        this.now = item
         this.listLoading = true
         getRecordList({pageoff:true, content:item.id}).then(res=>{
             this.listLoading = false
@@ -240,6 +241,7 @@ export default {
         })
     },
     chose2(item){
+        this.now = item
         this.listLoading = true
         getRecordList({pageoff:true, belong_dept:item.id}).then(res=>{
             this.listLoading = false
diff --git a/server/apps/supervision/migrations/0008_auto_20210316_0827.py b/server/apps/supervision/migrations/0008_auto_20210316_0827.py
new file mode 100644
index 0000000..27cc541
--- /dev/null
+++ b/server/apps/supervision/migrations/0008_auto_20210316_0827.py
@@ -0,0 +1,40 @@
+# Generated by Django 3.0.5 on 2021-03-16 00:27
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('supervision', '0007_auto_20210315_1412'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='task',
+            name='is_self',
+        ),
+        migrations.AddField(
+            model_name='record',
+            name='is_self',
+            field=models.BooleanField(default=False, verbose_name='是否主动报送'),
+        ),
+        migrations.AlterField(
+            model_name='record',
+            name='content',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='record_content', to='supervision.Content', verbose_name='材料内容'),
+        ),
+        migrations.AlterField(
+            model_name='record',
+            name='task',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='record_task', to='supervision.Task', verbose_name='关联任务'),
+        ),
+        migrations.AlterField(
+            model_name='record',
+            name='up_user',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='record_up_user', to=settings.AUTH_USER_MODEL, verbose_name='上报人'),
+        ),
+    ]
diff --git a/server/apps/supervision/models.py b/server/apps/supervision/models.py
index 6df1e23..b831fcd 100644
--- a/server/apps/supervision/models.py
+++ b/server/apps/supervision/models.py
@@ -27,7 +27,6 @@ class Task(CommonBModel):
         ('已完成', '已完成'),
     )
     name = models.CharField('名称', max_length=100)
-    is_self = models.BooleanField('是否主动报送', default=False)
     end_date = models.DateField('截止时间', null=True, blank=True)
     note = models.TextField('任务备注', null=True, blank=True)
     complete_rate = models.IntegerField('完成度', default=0)
@@ -51,6 +50,7 @@ class Record(CommonBModel):
     )
     content = models.ForeignKey(Content, verbose_name='材料内容', on_delete=models.DO_NOTHING, related_name='record_content')
     task = models.ForeignKey(Task, verbose_name='关联任务', null=True, blank=True, on_delete=models.SET_NULL, related_name='record_task')
+    is_self = models.BooleanField('是否主动报送', default=False)
     up_date = models.DateField('上报时间', null=True, blank=True)
     up_user = models.ForeignKey(User, verbose_name='上报人', null=True, blank=True,on_delete=models.SET_NULL, related_name='record_up_user')
     end_date = models.DateField('截止时间', null=True, blank=True)