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

fix supervision

This commit is contained in:
zty 2024-07-04 08:59:01 +08:00
parent bde49e291a
commit 0ecc6317a5
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/dist/index.html vendored
View File

File diff suppressed because one or more lines are too long

21
client/src/views/supervisionNew/mytask.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="6"> <el-col :span="8">
<el-card :style="{height:leftHeight+'px'}" class="leftCard"> <el-card :style="{'min-height':leftHeight+'px'}" class="leftCard">
<h5>任务列表</h5> <h5>任务列表</h5>
<el-select <el-select
v-model="listQuery.belong_dept" v-model="listQuery.belong_dept"
@ -98,7 +98,7 @@
/> />
</el-card> </el-card>
</el-col> </el-col>
<el-col :span="18" :style="{height:leftHeight+'px','overflow-y': 'scroll'}"> <el-col :span="16" :style="{'min-height':leftHeight+'px','overflow-y': 'scroll'}">
<div v-if="type==10"> <div v-if="type==10">
<el-card> <el-card>
<div style="display: flex;justify-content: space-between;"> <div style="display: flex;justify-content: space-between;">
@ -107,19 +107,19 @@
</div> </div>
<div> <div>
<span>指导文件:</span> <span>指导文件:</span>
<div v-if="task.pgoal_1_file_!==null"> <div v-if="task.pgoal_1_file_">
<el-link :href="task.pgoal_1_file_.path" target="_blank" type="primary">{{task.pgoal_1_file_.name}}</el-link> <el-link :href="task.pgoal_1_file_.path" target="_blank" type="primary">{{task.pgoal_1_file_.name}}</el-link>
</div> </div>
<div v-if="task.pgoal_2_file_!==null"> <div v-if="task.pgoal_2_file_">
<el-link :href="task.pgoal_2_file_.path" target="_blank" type="primary">{{task.pgoal_2_file_.name}}</el-link> <el-link :href="task.pgoal_2_file_.path" target="_blank" type="primary">{{task.pgoal_2_file_.name}}</el-link>
</div> </div>
<div v-if="task.pgoal_3_file_!==null"> <div v-if="task.pgoal_3_file_">
<el-link :href="task.pgoal_3_file_.path" target="_blank" type="primary">{{task.pgoal_3_file_.name}}</el-link> <el-link :href="task.pgoal_3_file_.path" target="_blank" type="primary">{{task.pgoal_3_file_.name}}</el-link>
</div> </div>
<div v-if="task.pgoal_4_file_!==null"> <div v-if="task.pgoal_4_file_">
<el-link :href="task.pgoal_4_file_.path" target="_blank" type="primary">{{task.pgoal_4_file_.name}}</el-link> <el-link :href="task.pgoal_4_file_.path" target="_blank" type="primary">{{task.pgoal_4_file_.name}}</el-link>
</div> </div>
<div v-if="task.pgoal_5_file_!==null"> <div v-if="task.pgoal_5_file_">
<el-link :href="task.pgoal_5_file_.path" target="_blank" type="primary">{{task.pgoal_5_file_.name}}</el-link> <el-link :href="task.pgoal_5_file_.path" target="_blank" type="primary">{{task.pgoal_5_file_.name}}</el-link>
</div> </div>
</div> </div>
@ -1135,7 +1135,7 @@
}, },
getPtList(){ getPtList(){
let that = this; let that = this;
getPtList({task2do__task2__year:that.task2Item.task2_.year,page:0}).then((res) => { getPtList({task2do__task2__year:that.task2Item.task2_.year,page:0, task2do__belong_dept:that.task2Item.belong_dept}).then((res) => {
if (res.code >= 200) { if (res.code >= 200) {
that.ptList=res.data; that.ptList=res.data;
} }
@ -1159,7 +1159,7 @@
}, },
getOinspectList(){ getOinspectList(){
let that = this; let that = this;
getOinspectList({task2do__task2__year:that.task2Item.task2_.year,page:0}).then((res) => { getOinspectList({task2do__task2__year:that.task2Item.task2_.year,page:0, task2do__belong_dept:that.task2Item.belong_dept}).then((res) => {
if (res.code >= 200) { if (res.code >= 200) {
that.oinspectList=res.data; that.oinspectList=res.data;
} }
@ -1215,6 +1215,7 @@
} }
}else{ }else{
this.$message.warning('请上传实施细则文件') this.$message.warning('请上传实施细则文件')
this.saveLoading = false;
} }
}, },
beforeUpload(){ beforeUpload(){

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

@ -811,7 +811,6 @@ class PtViewSet(ImpMixin, Domixin, CreateUpdateCustomMixin, BulkDeleteModelViewS
} }
filterset_fields = ['task2do', 'task2do__belong_dept', 'task2do__task2__year', 'task2do__task2'] filterset_fields = ['task2do', 'task2do__belong_dept', 'task2do__task2__year', 'task2do__task2']
def make_data(self, data, sheet, i, etype): def make_data(self, data, sheet, i, etype):
data['name'] = sheet['b'+str(i)].value data['name'] = sheet['b'+str(i)].value
data['number'] = sheet['c'+str(i)].value data['number'] = sheet['c'+str(i)].value