取消
@@ -203,10 +203,10 @@
upHeaders: upHeaders(),
upUrl: upUrl(),
fileList1:[],
- fileList2:[],
- fileList3:[],
- fileList4:[],
- fileList5:[],
+ // fileList2:[],
+ // fileList3:[],
+ // fileList4:[],
+ // fileList5:[],
dialogType:"new",
form: defaultForm,
listLoading:false,
@@ -242,37 +242,51 @@
}
},
handleUpSuccess1(res, file, filelist) {
- this.form.pgoal_1_file = res.data.id;
debugger;
+ console.log(res)
+ console.log(file)
+ console.log(filelist)
+ // this.form.pgoal_1_file = res.data.id;
+ console.log(filelist)
+ this.form.pgoal_1_file = '';
+ this.form.pgoal_2_file = '';
+ this.form.pgoal_3_file = '';
+ this.form.pgoal_4_file = '';
+ this.form.pgoal_5_file = '';
+ for(let i=0;i
{
@@ -341,7 +376,7 @@
if (valid) {
const isEdit = this.dialogType === "edit";
if (isEdit) {
- updatePgoal(this.task.id, this.form).then((res) => {
+ updatePgoal(this.form.id, this.form).then((res) => {
if (res.code >= 200) {
debugger;
this.getList();
diff --git a/client/src/views/supervisionNew/mytask.vue b/client/src/views/supervisionNew/mytask.vue
index e9b6529..d303caa 100644
--- a/client/src/views/supervisionNew/mytask.vue
+++ b/client/src/views/supervisionNew/mytask.vue
@@ -4,6 +4,18 @@
任务列表
+
+
+
@@ -86,38 +98,60 @@
- {{task2Item.task2_.year}}年目标制定
+ {{deptName}} {{task2Item.task2_.year}}年目标制定
添加新目标
+
+
指导文件:
+
+ {{task.pgoal_1_file_.name}}
+
+
+ {{task.pgoal_2_file_.name}}
+
+
+ {{task.pgoal_3_file_.name}}
+
+
+ {{task.pgoal_4_file_.name}}
+
+
+ {{task.pgoal_5_file_.name}}
+
+
-
+
{{item.goal_name}}
(件)
(%)
-
自定义目标
+
自定义目标
基础目标
-
新增目标
-
- 目标名称：
+
新增目标
+
+ 目标名称：
-
-
- 集团目标值：{{ item. goal_value_a}}
+
+ 集团目标值：{{ item. goal_value_a}}
+
+
+
公司目标：
-
- 集团目标文件：{{item.goal_o_file_.name}}
-
- 公司文件：
+
+
+ 公司文件：
上传文件
-
+
+ 历史文件
删除
保存
+
+
+
+
+ {{item.name}}
+
+
+
+ 关闭
+
+
- {{task2Item.task2_.year}}年{{ cycleList[task2Item.task2_.cycle] }}日常监督
+ {{deptName}}{{task2Item.task2_.year}}年{{ cycleList[task2Item.task2_.cycle] }}日常监督
-
-
-
- 件
-
-
-
-
-
- 件
-
-
-
+
- 件
+ 件
+
+
+
+
+
+ 件
+
+
+
+
+
+ 件
-
-
-
+
不准确报告
- 无记录
- 导入
-
+ 无记录
+ 导入
+
-
+
超期报告
- 无记录
- 导入
-
+ 无记录
+ 导入
+
-
+
能力验证结果
- 无记录
- 导入
-
+ 无记录
+ 导入
+
-
+
客户投诉
- 无记录
- 导入
-
+ 无记录
+ 导入
+
-
+
风险识别
- 无记录
- 导入
-
+ 无记录
+ 导入
+
-
+
外部监督检查
- 无记录
- 导入
-
+ 无记录
+ 导入
+
-
{{ cateOptions[scope.row.cate] }}
@@ -552,7 +602,8 @@
import { getMyTask2Do,getPgoalDeptList,createPgoalDept,updatePgoalDept,noNum,
deletePgoalDept,saveNum,getPtList,deletePt,getRcList,deleteRc,getRiskList,
deleteRisk,getComplaintList,deleteComplaint,getOinspectList,deleteOinspect,
- impPt,impRc,impOverdue,impRisk,impComplaint,impOinspect} from "@/api/task";
+ impPt,impRc,impOverdue,impRisk,impComplaint,impOinspect,getPgoalList} from "@/api/task";
+ import { getOrgList, getSubOrgList } from "@/api/org";
import checkPermission from "@/utils/permission";
import Pagination from "@/components/Pagination";
import { upUrl, upHeaders } from "@/api/file";
@@ -561,6 +612,7 @@
import saveriskDialog from "./risk_form.vue";
import savecomDialog from "./complaint_form.vue";
import saveoinDialog from "./oinspect_form.vue";
+import user from "@/store/modules/user";
const defaulttask = {
year: "",
cycle: "",
@@ -577,15 +629,20 @@
upHeaders: upHeaders(),
upUrl: upUrl(),
dialogType:"new",
+ orgData:[],
subData:[],
+ fileList:[],
task2do:'',
taskYear:'',
+ deptName:'',
numbers:{
num_issue:null,//已发放报告数量
num_expect:null,//应发报告数
num_acc:0,
},
task2Item:{},
+ task:{},
+ historyFile:false,
saveLoading:false,
listLoading:false,
dialogVisible:false,
@@ -596,6 +653,7 @@
},
listQuery:{
page: 1,
+ dept:null,
page_size: 20,
},
typeOptions:{
@@ -655,14 +713,174 @@
mounted(){
let height1 = document.getElementsByClassName('app-main')[0].clientHeight;
this.leftHeight = height1-15;
+ this.listQuery.dept =this.$store.getters.dept;
+ this.getOrgList();
this.getList();
},
methods:{
-
+ checkPermission,
+ getOrgList() {
+ let that = this;
+ if (that.checkPermission(["record_confirm"])) {
+ getOrgList({ can_supervision: true }).then((res) => {
+ that.orgData = res.data;
+ that.orgData.filter(item=>{
+ if(item.id==that.listQuery.dept){
+ that.deptName = item.name;
+ }
+ })
+ });
+ } else {
+ getSubOrgList().then((res) => {
+ that.orgData = res.data;
+ that.orgData.filter(item=>{
+ if(item.id==that.listQuery.dept){
+ that.deptName = item.name;
+ }
+ })
+ });
+ }
+ },
+ getList(){
+ this.listLoading = true;
+ this.dataList.results =[];
+ this.dataList.count =0;
+ getMyTask2Do(this.listQuery).then((response) => {
+ if (response.data) {
+ this.dataList.results = response.data;
+ this.dataList.count = response.data.length;
+ }
+ this.listLoading = false;
+ });
+ },
+ handleFilter() {
+ let that = this;
+ that.subData = [];
+ that.rcList=[],//报告证书{应发/超期}
+ that.rc2List=[]
+ that.ptList=[],//能力验证
+ that.riskList=[],//风险
+ that.complaintList=[],//投诉
+ that.oinspectList=[],//外部监查
+ that.numbers.num_acc = '';
+ that.numbers.num_expect = '';
+ that.numbers.num_issue = '';
+ that.listQuery.page = 1;
+ that.orgData.filter(item=>{
+ if(item.id==that.listQuery.dept){
+ that.deptName = item.name;
+ }
+ })
+ that.getList();
+ },
+ resetFilter() {
+ this.listQuery = {
+ page: 1,
+ search:'',
+ page_size: 20,
+ }
+ this.getList();
+ },
+ itemClick(item){
+ console.log(item);
+ let that = this;
+ that.task2Item = item;
+ that.task2do = item.id;
+ that.type = item.task2_.type;
+ if(item.task2_.type==10){
+ that.taskYear = item.task2_.year;
+ //获取任务目标值
+ getPgoalDeptList({task2do:item.id}).then(res=>{
+ let data = res.data.results;
+ that.subData = [];
+ data.forEach(item => {
+ let obj = item;
+ obj.fileLists = [];
+ if(item.goal_file!==null){
+ let file = {};
+ file.name = item.goal_file_.name;
+ file.value = item.goal_file_.path;
+ obj.fileLists.push(file);
+ that.subData.push(obj);
+ }else{
+ that.subData.push(obj);
+ }
+ });
+ })
+ //获取集团指导文件
+ getPgoalList({year:item.task2_.year,page:0}).then(resp=>{
+ that.task= resp.data[0];
+ console.log(that.task)
+ debugger;
+ })
+ }else{//日常监督
+ this.numbers.num_expect = item.num_expect;
+ this.numbers.num_issue = item.num_issue;
+ this.$nextTick(re=>{
+ let height1 = document.getElementsByClassName('app-main')[0].clientHeight;
+ let height2 = document.getElementById('numCard').clientHeight;
+ let height3 = (height1 - height2 - 200) / 3;
+ this.tableHeight = height3;
+ })
+ //获取6个列表
+ this.getPtList();
+ this.getRcList();
+ this.getRiskList();
+ this.getComplaintList();
+ this.getOinspectList();
+ }
+ },
+ getRcList(){
+ let that = this;
+ getRcList({task2do:that.task2do,etype:10}).then((res) => {
+ if (res.code >= 200) {
+ that.rcList =res.data.results;
+ }
+ });
+ getRcList({task2do:that.task2do,etype:20}).then((res) => {
+ if (res.code >= 200) {
+ that.rc2List =res.data.results;
+ }
+ });
+ },
+ getPtList(){
+ let that = this;
+ getPtList({task2do:that.task2do}).then((res) => {
+ if (res.code >= 200) {
+ that.ptList=res.data.results;
+ }
+ });
+ },
+ getRiskList(){
+ let that = this;
+ getRiskList({task2do:that.task2do}).then((res) => {
+ if (res.code >= 200) {
+ that.riskList = res.data.results;
+ }
+ });
+ },
+ getComplaintList(){
+ let that = this;
+ getComplaintList({task2do:that.task2do}).then((res) => {
+ if (res.code >= 200) {
+ that.complaintList = res.data.results;
+ }
+ });
+ },
+ getOinspectList(){
+ let that = this;
+ getOinspectList({task2do:that.task2do}).then((res) => {
+ if (res.code >= 200) {
+ that.oinspectList=res.data.results;
+ }
+ });
+ },
+ historyFiles(item){
+ this.historyFile = true;
+ this.fileList = item.goal_files_;
+ },
addNewGoal(){
- // debugger;
this.subData.push({goal_name:'',goal_file:'',goal_value_b:0,year:this.taskYear});
- console.log(this.subData)
},
delGoal(item,index){
if(item.id){
@@ -723,145 +941,18 @@
this.subData[index].goal_file = null;
},
handleSuccessImp(res, file, fileList){
- // debugger;
- console.log(res)
this.impForm.path = res.data.path;
},
handleRemoveImp(file, fileList){
this.impForm.path = '';
},
- checkPermission,
- getList(){
- this.listLoading = true;
- getMyTask2Do(this.listQuery).then((response) => {
- if (response.data) {
- this.dataList.results = response.data;
- this.dataList.count = response.data.length;
- }
- this.listLoading = false;
- });
- },
- handleFilter() {
- this.listQuery.page = 1;
- this.getList();
- },
- resetFilter() {
- this.listQuery = {
- page: 1,
- search:'',
- page_size: 20,
- }
- this.getList();
- },
- itemClick(item){
- console.log(item);
- let that = this;
- that.task2Item = item;
- that.task2do = item.id;
- that.type = item.task2_.type;
- if(item.task2_.type==10){
- that.taskYear = item.task2_.year;
- //获取任务目标值
- getPgoalDeptList({task2do:item.id}).then(res=>{
- let data = res.data.results;
- that.subData = [];
- data.forEach(item => {
- let obj = item;
- obj.fileLists = [];
- if(item.goal_file!==null){
- let file = {};
- file.name = item.goal_file_.name;
- file.value = item.goal_file_.path;
- obj.fileLists.push(file);
- that.subData.push(obj);
- }else{
- that.subData.push(obj);
- }
-
- });
- })
- }else{//日常监督
- this.numbers.num_expect = item.num_expect;
- this.numbers.num_issue = item.num_issue;
- this.$nextTick(re=>{
- let height1 = document.getElementsByClassName('app-main')[0].clientHeight;
- let height2 = document.getElementById('numCard').clientHeight;
- let height3 = (height1 - height2 - 195) / 3;
- this.tableHeight = height3;
- })
- //获取6个列表
- this.getPtList();
- this.getRcList();
- this.getRiskList();
- this.getComplaintList();
- this.getOinspectList();
-
- }
- },
- getRcList(){
- let that = this;
- getRcList({task2do:that.task2do,etype:10}).then((res) => {
- if (res.code >= 200) {
- // debugger;
- console.log(res)
- that.rcList =res.data.results;
- }
- });
- getRcList({task2do:that.task2do,etype:20}).then((res) => {
- if (res.code >= 200) {
- // debugger;
- console.log(res)
- that.rc2List =res.data.results;
- }
- });
- },
- getPtList(){
- let that = this;
- getPtList({task2do:that.task2do}).then((res) => {
- if (res.code >= 200) {
- // debugger;
- console.log(res.data.results)
- that.ptList=res.data.results;
- }
- });
- },
- getRiskList(){
- let that = this;
- getRiskList({task2do:that.task2do}).then((res) => {
- if (res.code >= 200) {
- // debugger;
- console.log(res)
- that.riskList = res.data.results;
- }
- });
- },
- getComplaintList(){
- let that = this;
- getComplaintList({task2do:that.task2do}).then((res) => {
- if (res.code >= 200) {
- // debugger;
- console.log(res)
- that.complaintList = res.data.results;
- }
- });
- },
- getOinspectList(){
- let that = this;
- getOinspectList({task2do:that.task2do}).then((res) => {
- if (res.code >= 200) {
- // debugger;
- console.log(res)
- that.oinspectList=res.data.results;
- }
- });
- },
numsConfirm(form){
this.$refs[form].validate((valid) => {
if (valid) {
saveNum(this.task2do,this.numbers).then((res) => {
if (res.code >= 200) {
- this.$message.success("成功");
- this.getList();
+ this.$message.success("成功");
+ this.getList();
}
});
} else {
@@ -978,7 +1069,6 @@
}
let base_url = this.downloadUrl.substr(0, this.downloadUrl.length - 3);
this.downloadUrl = base_url+file_url;
- // this.downloads();
},
imporCconfirm(){
this.impForm.task2do =this.task2do;
@@ -1055,28 +1145,6 @@
});
},
- // downloadFile(type){
- // let file_url = '';
- // if(type=='rc'){
- // form.key = "num_error";
- // }else if(type=='rc2'){
- // form.key = "num_overdue"
- // }else if(type=='pt'){
- // form.key = "num_pt"
- // }else if(type=='risk'){
- // form.key = "num_risk"
- // }else if(type=='complaint'){
- // form.key = "num_complaint"
- // }else if(type=='oinspect'){
- // form.key = "num_oinspect "
- // }
- // noNum(this.task2do,form).then(res=>{
- // if(res.code>=200){
- // this.$message.success("提交成功");
- // }else{}
- // })
-
- // },
rcSaveSuccess(){
this.dialogRc = false;
this.getRcList();
@@ -1157,7 +1225,9 @@
margin-bottom: 0;
width: 200px
}
-
+.danwei{
+ position: absolute;
+}
.taskUpload>.el-upload-list{
/* position:relative; */
diff --git a/client/src/views/supervisionNew/statistics.vue b/client/src/views/supervisionNew/statistics.vue
index 63b256c..6cae279 100644
--- a/client/src/views/supervisionNew/statistics.vue
+++ b/client/src/views/supervisionNew/statistics.vue
@@ -109,17 +109,17 @@
{{item[1]}} |
{{item[2]}} |
{{item[3]}} |
+ {{item[4]}} |
{{item[5]}} |
- {{item[6]}} |
- {{item[7]}} |
+ {{item[6]}} |
-
+
-
+
@@ -600,7 +600,6 @@
let data = res.data.filter(item=>{
return item.task2_.type==20
});
- console.log(data)
data.forEach(element => {
let obj = element;
if(element.num_issue!==null&&element.num_error!==null&&element.num_issue!==0){
@@ -654,8 +653,6 @@
}
}
}
- // debugger;
- console.log(that.tableDatas)
that.timeStamp++;
for(let k=0;k
\ No newline at end of file
diff --git a/client/src/views/supervisionNew/statisticsGroup.vue b/client/src/views/supervisionNew/statisticsGroup.vue
new file mode 100644
index 0000000..c107bca
--- /dev/null
+++ b/client/src/views/supervisionNew/statisticsGroup.vue
@@ -0,0 +1,562 @@
+
+
+
+
+
+
+
+
+
+ 查看
+ 打印
+
+
+
+
+
{{ fileName }}
+
{{ listQuery.task2__year }}年 1—12月质量目标双月报
+
+
+
+
+
+
+
取消
@@ -149,6 +160,7 @@
year: "",
cycle: "",
type: 10,
+ end_date:''
};
export default {
components:{Pagination},
@@ -185,6 +197,7 @@
rule1: {
year: [{ required: true, message: "请选择", trigger: "blur" }],
cycle: [{ required: true, message: "请选择", trigger: "blur" }],
+ end_date: [{ required: true, message: "请选择", trigger: "blur" }],
},
};
},
@@ -228,6 +241,7 @@
handleEdit(scope) {
this.task = Object.assign({}, scope.row); // copy obj
this.task.year = ''+this.task.year;
+ this.task.end_date = ''+this.task.end_date;
this.dialogType = "edit";
this.dialogVisible = true;
this.$nextTick(() => {
diff --git a/client/src/views/supervisionNew/taskdo.vue b/client/src/views/supervisionNew/taskdo.vue
index 7f54521..53cc5ea 100644
--- a/client/src/views/supervisionNew/taskdo.vue
+++ b/client/src/views/supervisionNew/taskdo.vue
@@ -7,26 +7,32 @@
-
+
任务类型：
目标制定
日常监督
-
+
年份：
{{ task.year }}
-
+
周期：
{{ cycleOptions[task.cycle] }}
-
+
+
+ 截止日期：
+ {{ task.end_date }}
+
+
+
任务状态
@@ -46,7 +52,7 @@
-
+
创建人：
{{ task.create_by_name }}
@@ -95,7 +101,12 @@
{{scope.row.belong_dept_.name}}
-
+
+
+ {{ scope.row.pross }}%
+
+
+
是
否
@@ -537,7 +548,15 @@ export default {
.then((res) => {
// debugger;
this.listLoading = false;
- this.taskdeptall = res.data.results;
+ this.taskdeptall = [];
+ let taskdept = res.data.results;
+ taskdept.forEach(item=>{
+ let obj = item;
+ // debugger;
+ let pross = Number((item.count_up/item.count_all).toFixed(4))
+ obj.pross = parseFloat((pross*100).toPrecision(12));
+ this.taskdeptall.push(obj);
+ })
})
.catch((e) => {
this.listLoading = false;