支持已报送时重报

client/src/views/supervision/record.vue

@@ -215,7 +215,7 @@
             >
             <el-link
               v-if="
-                (scope.row.state == '待报送' || scope.row.state == '待整改') &&
+                scope.row.state == '待报送'  &&
                 checkPermission(['record_up'])
               "
               type="primary"
@@ -223,6 +223,16 @@
               @click="handleRecord({ action: 'up', record: scope.row })"
               >报送</el-link
             >
+            <el-link
+              v-if="
+                (scope.row.state == '已报送' || scope.row.state == '待整改') &&
+                checkPermission(['record_up'])
+              "
+              type="primary"
+              size="small"
+              @click="handleRecord({ action: 'up', record: scope.row })"
+              >重报</el-link
+            >
             <el-link
               v-if="
                 scope.row.state == '已报送' &&

server/apps/supervision/views.py

@@ -196,6 +196,7 @@ def cal_task_rate(task, dept):
     instance.up_rate = int(up_rate*100)
     instance.confirm_rate = int(confirm_rate*100)
     instance.save()
+    
 from utils.queryset import get_child_queryset2
 
 from .permission import RecordPermission
@@ -278,7 +279,7 @@ class RecordViewSet(PageOrNot, CreateUpdateCustomMixin, ModelViewSet):
         obj = self.get_object()
         if obj.task and obj.task.state == '已关闭':
             return Response('该任务已关闭,无法报送', status=status.HTTP_400_BAD_REQUEST) 
-        if obj.state in ['待整改','待报送']:
+        if obj.state in ['待整改','待报送', '已报送']:
             if 'files' in request.data and (not request.data['files']):
                 if request.data.get('noteb', None) and (not request.data.get('is_yes', True)):
                     pass