erjidanweibaosong

client/src/api/record.js

@@ -76,4 +76,12 @@ export function createRecord(data) {
     method: 'post',
     data
   })
-}
+}
+
+export function deptconfirm(id) {
+  return request({
+    url: `/supervision/record/${id}/deptconfirm/`,
+    method: 'put',
+  })
+}
+

client/src/views/supervision/mytaskrecord.vue

@@ -38,6 +38,12 @@
       </el-table-column>
       <el-table-column label="报送说明">
         <template slot-scope="scope">{{ scope.row.noteb }}</template>
+      </el-table-column>
+        <el-table-column label="二级单位确认">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.dept_yes" effect="plain">已确认</el-tag>
+          <el-tag type="danger" effect="plain" v-else>未确认</el-tag>
+          </template>
       </el-table-column>
       <el-table-column label="记录状态">
         <template slot-scope="scope">
@@ -86,6 +92,16 @@
               size="small"
               @click="handleRecord({ action: 'up', record: scope.row })"
               >报送</el-link
+            >
+              <el-link
+              v-if="
+                scope.row.dept_yes == false  &&  scope.row.state == '已报送' &&
+                checkPermission(['record_detconfirm'])
+              "
+              type="primary"
+              size="small"
+              @click="handleRecord({ action: 'deptconfirm', record: scope.row })"
+              >二级单位确认</el-link
             >
             <el-link
               v-if="

client/src/views/supervision/record.vue

@@ -152,6 +152,12 @@
             scope.row.belong_dept_.name
           }}</template>
         </el-table-column>
+          <el-table-column label="二级单位确认">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.dept_yes" effect="plain">已确认</el-tag>
+          <el-tag type="danger" effect="plain" v-else>未确认</el-tag>
+          </template>
+      </el-table-column>
         <el-table-column label="记录状态">
           <template slot-scope="scope">
             <el-tag type="danger" v-if="scope.row.state == '待报送'">{{
@@ -457,9 +463,7 @@ export default {
           this.centerDialogVisible = false;
           this.listQuery = {
             page: 1,
-            page_size: 20,
+            page_size: 20
-            state: "待报送",
-            is_self: true,
           };
           this.getList();
         });

client/src/views/supervision/recorddo.vue

@@ -99,6 +99,12 @@
         @click="confirm()"
         v-else-if="this.data.action == 'delete'"
         >删除</el-button
+      >
+        <el-button
+        @click="confirm()"
+       type="primary"
+        v-if="this.data.action == 'deptconfirm'"
+        >确认</el-button
       >
       <el-button type="primary" @click="confirm()" v-else>确认</el-button>
     </div>
@@ -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);

client/src/views/supervision/taskdo.vue

@@ -247,6 +247,12 @@
             }}</el-tag>
           </template>
         </el-table-column>
+         <el-table-column label="二级单位确认">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.dept_yes" effect="plain">已确认</el-tag>
+          <el-tag type="danger" effect="plain" v-else>未确认</el-tag>
+          </template>
+      </el-table-column>
         <el-table-column label="报送要求/备注">
           <template slot-scope="scope">{{ scope.row.note }}</template>
         </el-table-column>

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='二级单位是否确认'),
+        ),
+    ]

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='二级单位是否确认'),
+        ),
+    ]

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

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):
         """