From f0ec4691bc4f70f66870c85156a0ce2529369e7f Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 30 Apr 2021 13:24:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8A=A5=E9=80=81=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/api/task.js                  |  7 +++++++
 client/src/views/supervision/taskdo.vue | 27 ++++++++++++++++++++++++-
 server/apps/supervision/urls.py         |  5 +++--
 server/apps/supervision/views.py        | 23 +++++++++++++++++++++
 4 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/client/src/api/task.js b/client/src/api/task.js
index 4948c2d..c28950a 100644
--- a/client/src/api/task.js
+++ b/client/src/api/task.js
@@ -96,4 +96,11 @@ export function getmytasklist(query) {
     method: 'get',
     params: query
   })
+}
+
+export function confirmTaskdept(id) {
+  return request({
+    url: `/supervision/taskdept/${id}/confirm/`,
+    method: 'put'
+  })
 }
\ No newline at end of file
diff --git a/client/src/views/supervision/taskdo.vue b/client/src/views/supervision/taskdo.vue
index b36146c..83a8725 100644
--- a/client/src/views/supervision/taskdo.vue
+++ b/client/src/views/supervision/taskdo.vue
@@ -124,6 +124,25 @@
             {{ scope.row.confirm_rate }}%
           </template>
         </el-table-column>
+        <el-table-column
+          align="center"
+          label="操作"
+          width="240px"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <el-link
+              v-if="
+                scope.row.confirm_rate != 100  &&
+                checkPermission(['record_confirm'])
+              "
+              type="warning"
+              size="small"
+              @click="handleConfirmDept(scope)"
+              >确认</el-link
+            >
+          </template>
+        </el-table-column>
       </el-table>
     </el-card>
     <el-card style="margin-top: 2px">
@@ -309,7 +328,7 @@
 }
 </style>
 <script>
-import { gettask, inittask, gettaskdeptall, starttask, appendtask } from "@/api/task";
+import { gettask, inittask, gettaskdeptall, starttask, appendtask, confirmTaskdept } from "@/api/task";
 import { getRecordList, updateRecords } from "@/api/record";
 import Pagination from "@/components/Pagination";
 import taskinit from "@/views/supervision/taskinit";
@@ -442,6 +461,12 @@ export default {
       }
       this.selectRecords = selects;
     },
+    handleConfirmDept(scope){
+      confirmTaskdept(scope.row.id).then(res=>{
+        this.getRecordList()
+        this.gettaskdeptall()
+      })
+    },
     handleUp2(){
       if (this.selectRecords.length) {
         this.$prompt('请输入备注内容', '提示').then(({ value }) => {
diff --git a/server/apps/supervision/urls.py b/server/apps/supervision/urls.py
index 907b470..cbb8155 100644
--- a/server/apps/supervision/urls.py
+++ b/server/apps/supervision/urls.py
@@ -1,12 +1,13 @@
+from apps.supervision.serializers import TaskDeptSerializer
 from django.urls import path, include
 from rest_framework import routers
-from .views import ContentViewSet, TaskViewSet,RecordViewSet
+from .views import ContentViewSet, TaskViewSet,RecordViewSet, TaskDeptViewSet
 
 router = routers.DefaultRouter()
 router.register('content', ContentViewSet, basename="content")
 router.register('task', TaskViewSet, basename="task")
 router.register('record', RecordViewSet, basename="record")
-
+router.register('taskdept', TaskDeptViewSet, basename="taskdept")
 urlpatterns = [
     path('', include(router.urls))
 ]
\ No newline at end of file
diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py
index 15efc2e..5f3cd1d 100644
--- a/server/apps/supervision/views.py
+++ b/server/apps/supervision/views.py
@@ -331,3 +331,26 @@ class RecordViewSet(PageOrNot, CreateUpdateCustomMixin, ModelViewSet):
         return Response('记录状态错误', status=status.HTTP_400_BAD_REQUEST)
     
     
+class TaskDeptViewSet(ModelViewSet):
+    """
+    任务关联部门 操作
+    """
+    perms_map = {'get': '*', 'post': 'task_update',
+                 'put': 'task_update', 'delete': 'task_update'}
+    queryset = TaskDept.objects.all()
+    serializer_class = TaskDeptSerializer
+    filterset_fields = ['task','dept']
+    ordering = ['dept__sort']
+
+    @action(methods=['put'], detail=True, perms_map = {'put':'record_confirm'})
+    def confirm(self, request, *args, **kwargs):
+        """
+        批量确认
+        """
+        obj = self.get_object()
+        if obj.up_rate == 100:
+            Record.objects.filter(task=obj.task, belong_dept=obj.dept).update(state='已确认')
+            obj.confirm_rate = 100
+            obj.save()
+            return Response(status=status.HTTP_200_OK)
+        return Response('报送未完成', status=status.HTTP_400_BAD_REQUEST)
\ No newline at end of file