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-02 17:17:40 +08:00
parent 936a186eee
commit f16bf41793
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/views/supervision/recorddo.vue
View File

@ -63,7 +63,7 @@
> >
<el-button size="small" type="primary">上传文件</el-button> <el-button size="small" type="primary">上传文件</el-button>
<span class="el-upload__tip"> <span class="el-upload__tip">
可上传pdf,word,ppt,excel,图片文件,大小不超过50M 可上传多个pdf,word,ppt,excel,图片文件,单文件大小不超过50M
</span> </span>
</el-upload> </el-upload>
</el-form-item> </el-form-item>

2
client/src/views/supervision/taskdo.vue
View File

@ -77,7 +77,7 @@
<el-button <el-button
type="primary" type="primary"
@click="append()" @click="append()"
v-if="task.state == '执行中'" v-if="task.state == '执行中' || task.state == '待发布'"
size="small" size="small"
>追加任务</el-button >追加任务</el-button
> >

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

@ -99,7 +99,7 @@ class TaskViewSet(CreateUpdateCustomMixin, ModelViewSet):
obj = self.get_object() obj = self.get_object()
depts = request.data['depts'] depts = request.data['depts']
contents = request.data['contents'] contents = request.data['contents']
if obj.state !='执行中': if obj.state in ['待发布', '执行中']:
return Response('任务状态错误', status=status.HTTP_400_BAD_REQUEST) return Response('任务状态错误', status=status.HTTP_400_BAD_REQUEST)
if depts and contents: if depts and contents:
for m in depts: for m in depts:
@ -237,7 +237,7 @@ class RecordViewSet(PageOrNot, CreateUpdateCustomMixin, ModelViewSet):
return Response(ret) return Response(ret)
def update(self, request, *args, **kwargs): def update(self, request, *args, **kwargs):
instance = self.get_object() instance = Record.objects.get(pk=kwargs['pk'])
instance.note = request.data.get('note', None) instance.note = request.data.get('note', None)
instance.update_by = request.user instance.update_by = request.user
instance.save() instance.save()