From 01fa4d418174e5862db206663fa4a9de95298463 Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Wed, 2 Mar 2022 16:04:29 +0800
Subject: [PATCH] erjidanweibaosong
---
client/src/api/record.js | 10 +++++++++-
client/src/views/supervision/mytaskrecord.vue | 16 ++++++++++++++++
client/src/views/supervision/record.vue | 10 +++++++---
client/src/views/supervision/recorddo.vue | 18 ++++++++++++++++--
client/src/views/supervision/taskdo.vue | 6 ++++++
.../migrations/0029_record_dept_yes.py | 18 ++++++++++++++++++
.../migrations/0030_auto_20220302_1103.py | 18 ++++++++++++++++++
server/apps/supervision/models.py | 1 +
server/apps/supervision/views.py | 18 ++++++++++++++++--
9 files changed, 107 insertions(+), 8 deletions(-)
create mode 100644 server/apps/supervision/migrations/0029_record_dept_yes.py
create mode 100644 server/apps/supervision/migrations/0030_auto_20220302_1103.py
diff --git a/client/src/api/record.js b/client/src/api/record.js
index 080a6eb..abf1667 100644
--- a/client/src/api/record.js
+++ b/client/src/api/record.js
@@ -76,4 +76,12 @@ export function createRecord(data) {
method: 'post',
data
})
-}
\ No newline at end of file
+}
+
+export function deptconfirm(id) {
+ return request({
+ url: `/supervision/record/${id}/deptconfirm/`,
+ method: 'put',
+ })
+}
+
diff --git a/client/src/views/supervision/mytaskrecord.vue b/client/src/views/supervision/mytaskrecord.vue
index 3869bb5..240cb35 100644
--- a/client/src/views/supervision/mytaskrecord.vue
+++ b/client/src/views/supervision/mytaskrecord.vue
@@ -38,6 +38,12 @@
{{ scope.row.noteb }}
+
+
+
+ 已确认
+ 未确认
+
@@ -86,6 +92,16 @@
size="small"
@click="handleRecord({ action: 'up', record: scope.row })"
>报送
+ 二级单位确认
+
+ 已确认
+ 未确认
+
+
{{
@@ -457,9 +463,7 @@ export default {
this.centerDialogVisible = false;
this.listQuery = {
page: 1,
- page_size: 20,
- state: "待报送",
- is_self: true,
+ page_size: 20
};
this.getList();
});
diff --git a/client/src/views/supervision/recorddo.vue b/client/src/views/supervision/recorddo.vue
index 4670469..437472b 100644
--- a/client/src/views/supervision/recorddo.vue
+++ b/client/src/views/supervision/recorddo.vue
@@ -99,6 +99,12 @@
@click="confirm()"
v-else-if="this.data.action == 'delete'"
>删除
+ 确认
确认
@@ -136,6 +142,7 @@ import {
rejectRecord,
confirmRecord,
deleteRecord,
+ deptconfirm
} from "@/api/record";
export default {
name: "recorddo",
@@ -218,12 +225,19 @@ export default {
this.$message.success("成功");
this.$emit("handleDo",true);
});
- } else if (this.data.action == "reject") {
+ } else if (this.data.action == "deptconfirm") {
+ deptconfirm(this.record.id).then((res) => {
+ this.$message.success("二级单位确认成功");
+ this.$emit("handleDo",true);
+ });
+
+ }
+ else if (this.data.action == "reject") {
rejectRecord(this.record.id, this.record).then((res) => {
this.$message.success("成功");
this.$emit("handleDo",true);
});
- } else if (this.data.action == "confirm") {
+ }else if (this.data.action == "confirm") {
confirmRecord(this.record.id).then((res) => {
this.$message.success("成功");
this.$emit("handleDo",true);
diff --git a/client/src/views/supervision/taskdo.vue b/client/src/views/supervision/taskdo.vue
index 226fba4..d2f7293 100644
--- a/client/src/views/supervision/taskdo.vue
+++ b/client/src/views/supervision/taskdo.vue
@@ -247,6 +247,12 @@
}}
+
+
+ 已确认
+ 未确认
+
+
{{ scope.row.note }}
diff --git a/server/apps/supervision/migrations/0029_record_dept_yes.py b/server/apps/supervision/migrations/0029_record_dept_yes.py
new file mode 100644
index 0000000..223138a
--- /dev/null
+++ b/server/apps/supervision/migrations/0029_record_dept_yes.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.5 on 2022-03-02 02:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('supervision', '0028_remove_taskdept_files'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='record',
+ name='dept_yes',
+ field=models.BooleanField(default=False, verbose_name='二级单位是否确认'),
+ ),
+ ]
diff --git a/server/apps/supervision/migrations/0030_auto_20220302_1103.py b/server/apps/supervision/migrations/0030_auto_20220302_1103.py
new file mode 100644
index 0000000..b483d41
--- /dev/null
+++ b/server/apps/supervision/migrations/0030_auto_20220302_1103.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.5 on 2022-03-02 03:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('supervision', '0029_record_dept_yes'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='record',
+ name='dept_yes',
+ field=models.BooleanField(default=True, verbose_name='二级单位是否确认'),
+ ),
+ ]
diff --git a/server/apps/supervision/models.py b/server/apps/supervision/models.py
index 56ce6f7..cc9f007 100644
--- a/server/apps/supervision/models.py
+++ b/server/apps/supervision/models.py
@@ -82,6 +82,7 @@ class Record(CommonBModel):
opinion = models.TextField('修改意见', null=True, blank=True)
noteb = models.TextField('报送说明', null=True, blank=True)
files = models.ManyToManyField(File, verbose_name="关联文件")
+ dept_yes = models.BooleanField('二级单位是否确认', default=True)
class Meta:
verbose_name = '报送记录'
verbose_name_plural = verbose_name
diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py
index 8e206a8..f5710ff 100644
--- a/server/apps/supervision/views.py
+++ b/server/apps/supervision/views.py
@@ -84,6 +84,7 @@ class TaskViewSet(CreateUpdateCustomMixin, ModelViewSet):
data['end_date'] = obj.end_date
data['create_by'] = request.user
data['state'] = '待发布'
+ data['dept_yes'] = False
record_list.append(Record(**data))
TaskDept.objects.bulk_create(taskdept_list)
Record.objects.bulk_create(record_list)
@@ -117,6 +118,7 @@ class TaskViewSet(CreateUpdateCustomMixin, ModelViewSet):
r.end_date = obj.end_date
r.create_by = request.user
r.state = '待报送'
+ r.dept_yes = False
r.save()
obj.save()
return Response(status=status.HTTP_200_OK)
@@ -280,7 +282,7 @@ class RecordViewSet(PageOrNot, CreateUpdateCustomMixin, ModelViewSet):
rlist = []
for i in contents:
content = Content.objects.get(pk=i)
- data = {'content':content, 'belong_dept':request.user.dept, 'is_self':True, 'content_name':content.name, 'content_desc':content.desc}
+ data = {'content':content, 'belong_dept':request.user.dept, 'is_self':True,'dept_yes':False, 'content_name':content.name, 'content_desc':content.desc}
rlist.append(Record(**data))
Record.objects.bulk_create(rlist)
return Response(status=status.HTTP_200_OK)
@@ -326,6 +328,8 @@ class RecordViewSet(PageOrNot, CreateUpdateCustomMixin, ModelViewSet):
obj.files.add(*request.data['files'])
obj.noteb = request.data['noteb']
obj.state = '已报送'
+ if obj.belong_dept.type.name=='2级公司':
+ obj.dept_yes = True
obj.up_user = request.user
obj.up_date = timezone.now()
obj.save()
@@ -351,7 +355,17 @@ class RecordViewSet(PageOrNot, CreateUpdateCustomMixin, ModelViewSet):
else:
return Response('请填写修改意见', status=status.HTTP_400_BAD_REQUEST)
return Response('记录状态错误', status=status.HTTP_400_BAD_REQUEST)
-
+ @action(methods=['put'], detail=True, perms_map = {'put':'record_detconfirm'})
+ def deptconfirm(self, request, *args, **kwargs):
+ """
+ 二级单位确认
+ """
+ obj = self.get_object()
+ if obj.state in ['已报送']:
+ obj.dept_yes = True
+ obj.save()
+ return Response(status=status.HTTP_200_OK)
+ return Response('记录状态错误', status=status.HTTP_400_BAD_REQUEST)
@action(methods=['put'], detail=True, perms_map = {'put':'record_confirm'})
def confirm(self, request, *args, **kwargs):
"""