zcdsj
/
cma_search
mirror of https://e.coding.net/ctcdevteam/cma_search.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

支持已报送时重报

This commit is contained in:
caoqianming 2021-04-08 21:29:55 +08:00
parent dda86a2d10
commit 1b3913dbc4
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/src/views/supervision/record.vue
View File

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

3
server/apps/supervision/views.py
View File

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