+
{{task.pgoal_4_file_.name}}
-
+
{{task.pgoal_5_file_.name}}
@@ -1135,7 +1135,7 @@
},
getPtList(){
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) {
that.ptList=res.data;
}
@@ -1159,7 +1159,7 @@
},
getOinspectList(){
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) {
that.oinspectList=res.data;
}
@@ -1215,6 +1215,7 @@
}
}else{
this.$message.warning('请上传实施细则文件')
+ this.saveLoading = false;
}
},
beforeUpload(){
diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py
index 9650e19..1195d86 100644
--- a/server/apps/supervision/views.py
+++ b/server/apps/supervision/views.py
@@ -811,7 +811,6 @@ class PtViewSet(ImpMixin, Domixin, CreateUpdateCustomMixin, BulkDeleteModelViewS
}
filterset_fields = ['task2do', 'task2do__belong_dept', 'task2do__task2__year', 'task2do__task2']
-
def make_data(self, data, sheet, i, etype):
data['name'] = sheet['b'+str(i)].value
data['number'] = sheet['c'+str(i)].value