文案更改以及其他一些小改动
This commit is contained in:
parent
6bba84dbef
commit
dd54864b23
|
|
@ -4,6 +4,7 @@ const getters = {
|
|||
token: state => state.user.token,
|
||||
avatar: state => state.user.avatar,
|
||||
dept: state => state.user.dept,
|
||||
dept_name: state => state.user.dept_name,
|
||||
name: state => state.user.name,
|
||||
perms: state => state.user.perms,
|
||||
permission_routes: state => state.permission.routes
|
||||
|
|
|
|||
|
|
@ -8,7 +8,8 @@ const getDefaultState = () => {
|
|||
name: '',
|
||||
avatar: '',
|
||||
perms: [],
|
||||
dept:''
|
||||
dept:'',
|
||||
dept_name:'',
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -32,7 +33,10 @@ const mutations = {
|
|||
},
|
||||
SET_DEPT: (state, dept) => {
|
||||
state.dept = dept
|
||||
}
|
||||
},
|
||||
SET_DEPTNAME: (state, dept_name) => {
|
||||
state.dept_name = dept_name
|
||||
},
|
||||
}
|
||||
|
||||
const actions = {
|
||||
|
|
@ -51,6 +55,7 @@ const actions = {
|
|||
})
|
||||
})
|
||||
},
|
||||
|
||||
fulllogin({ commit }, userInfo) {
|
||||
const { username, password } = userInfo
|
||||
return new Promise((resolve, reject) => {
|
||||
|
|
@ -104,7 +109,7 @@ const actions = {
|
|||
reject('验证失败,重新登陆.')
|
||||
}
|
||||
|
||||
const { perms, name, avatar, dept } = data
|
||||
const { perms, name, avatar, dept, dept_name} = data
|
||||
|
||||
// perms must be a non-empty array
|
||||
if (!perms || perms.length <= 0) {
|
||||
|
|
@ -115,6 +120,7 @@ const actions = {
|
|||
commit('SET_NAME', name)
|
||||
commit('SET_AVATAR', avatar)
|
||||
commit('SET_DEPT', dept)
|
||||
commit('SET_DEPTNAME', dept_name)
|
||||
resolve(data)
|
||||
}).catch(error => {
|
||||
reject(error)
|
||||
|
|
|
|||
|
|
@ -65,6 +65,7 @@
|
|||
page: 0,
|
||||
year:'',
|
||||
goal_key__in:'pgoal_1,pgoal_2,pgoal_3,pgoal_4,pgoal_5',
|
||||
belong_dept__in:''
|
||||
},
|
||||
taskList:[],
|
||||
heightTable:null,
|
||||
|
|
@ -72,7 +73,7 @@
|
|||
};
|
||||
},
|
||||
mounted(){
|
||||
this.getList();
|
||||
this.getOrgList();
|
||||
let height = document.getElementsByClassName('app-main')[0].clientHeight;
|
||||
this.heightTable = height-90;
|
||||
},
|
||||
|
|
@ -84,8 +85,9 @@
|
|||
if (that.checkPermission(["record_confirm"])) {
|
||||
getOrgList({ can_supervision: true }).then((res) => {
|
||||
let data = res.data;
|
||||
debugger;
|
||||
for(let i=0;i<data.length;i++){
|
||||
ids= ids+item.id+',';
|
||||
ids= ids+data[i].id+',';
|
||||
}
|
||||
that.listQuery.belong_dept__in=ids;
|
||||
that.getList();
|
||||
|
|
@ -93,8 +95,9 @@
|
|||
} else {
|
||||
getSubOrgList().then((res) => {
|
||||
let data = res.data;
|
||||
debugger;
|
||||
for(let i=0;i<data.length;i++){
|
||||
ids= ids+item.id+',';
|
||||
ids= ids+data[i].id+',';
|
||||
}
|
||||
that.listQuery.belong_dept__in=ids;
|
||||
that.getList();
|
||||
|
|
@ -111,7 +114,8 @@
|
|||
let date = new Date();
|
||||
that.listQuery.year = date.getFullYear()+'';
|
||||
}
|
||||
that.listQuery.page=0;
|
||||
|
||||
console.log(that.listQuery)
|
||||
getPgoalDeptList(that.listQuery).then((res) => {
|
||||
if (res.data) {
|
||||
let data0 = res.data;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<el-card :style="{height:leftHeight+'px'}" class="leftCard">
|
||||
<h5>任务列表</h5>
|
||||
<el-select
|
||||
v-model="listQuery.dept"
|
||||
v-model="listQuery.belong_dept"
|
||||
placeholder="报送部门"
|
||||
@change="handleFilter"
|
||||
>
|
||||
|
|
@ -151,7 +151,7 @@
|
|||
</el-col>
|
||||
<el-col :span="24">
|
||||
<div style="display:flex;position:relative">
|
||||
<span style="display: inline-block;line-height: 33px;">公司文件：</span>
|
||||
<span style="display: inline-block;line-height: 33px;">相应实施细则：</span>
|
||||
<el-upload
|
||||
ref="upload1"
|
||||
:action="upUrl"
|
||||
|
|
@ -653,7 +653,7 @@ import user from "@/store/modules/user";
|
|||
},
|
||||
listQuery:{
|
||||
page: 1,
|
||||
dept:null,
|
||||
belong_dept:null,
|
||||
page_size: 20,
|
||||
},
|
||||
typeOptions:{
|
||||
|
|
@ -713,7 +713,7 @@ import user from "@/store/modules/user";
|
|||
mounted(){
|
||||
let height1 = document.getElementsByClassName('app-main')[0].clientHeight;
|
||||
this.leftHeight = height1-15;
|
||||
this.listQuery.dept =this.$store.getters.dept;
|
||||
this.listQuery.belong_dept =this.$store.getters.dept;
|
||||
this.getOrgList();
|
||||
this.getList();
|
||||
},
|
||||
|
|
@ -725,7 +725,7 @@ import user from "@/store/modules/user";
|
|||
getOrgList({ can_supervision: true }).then((res) => {
|
||||
that.orgData = res.data;
|
||||
that.orgData.filter(item=>{
|
||||
if(item.id==that.listQuery.dept){
|
||||
if(item.id==that.listQuery.belong_dept){
|
||||
that.deptName = item.name;
|
||||
}
|
||||
})
|
||||
|
|
@ -734,7 +734,7 @@ import user from "@/store/modules/user";
|
|||
getSubOrgList().then((res) => {
|
||||
that.orgData = res.data;
|
||||
that.orgData.filter(item=>{
|
||||
if(item.id==that.listQuery.dept){
|
||||
if(item.id==that.listQuery.belong_dept){
|
||||
that.deptName = item.name;
|
||||
}
|
||||
})
|
||||
|
|
@ -747,8 +747,7 @@ import user from "@/store/modules/user";
|
|||
this.dataList.count =0;
|
||||
getMyTask2Do(this.listQuery).then((response) => {
|
||||
if (response.data) {
|
||||
this.dataList.results = response.data;
|
||||
this.dataList.count = response.data.length;
|
||||
this.dataList = response.data;
|
||||
}
|
||||
this.listLoading = false;
|
||||
});
|
||||
|
|
@ -767,7 +766,7 @@ import user from "@/store/modules/user";
|
|||
that.numbers.num_issue = '';
|
||||
that.listQuery.page = 1;
|
||||
that.orgData.filter(item=>{
|
||||
if(item.id==that.listQuery.dept){
|
||||
if(item.id==that.listQuery.belong_dept){
|
||||
that.deptName = item.name;
|
||||
}
|
||||
})
|
||||
|
|
@ -776,7 +775,7 @@ import user from "@/store/modules/user";
|
|||
resetFilter() {
|
||||
this.listQuery = {
|
||||
page: 1,
|
||||
search:'',
|
||||
belong_dept:'',
|
||||
page_size: 20,
|
||||
}
|
||||
this.getList();
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
>
|
||||
</el-row>
|
||||
</el-card>
|
||||
<el-card style="margin-top:10px">
|
||||
<el-card style="margin-top:6px">
|
||||
<div ref="print" id="myReport" class="printContainer">
|
||||
<!-- <el-table
|
||||
ref="tableRef"
|
||||
|
|
@ -71,8 +71,8 @@
|
|||
<template slot-scope="scope" v-if="scope.row.all">{{ scope.row.all }}</template>
|
||||
</el-table-column>
|
||||
</el-table> -->
|
||||
<h3 style="text-align: center;">{{ fileName }}</h3>
|
||||
<p v-if="fileName!==''" style="text-align: center;">{{ listQuery.task2__year }}年 1—12月质量目标双月报</p>
|
||||
<h3 style="text-align: center;">{{ deptName }}</h3>
|
||||
<p v-if="deptName!==''" style="text-align: center;">{{ listQuery.task2__year }}年 1—12月质量目标双月报</p>
|
||||
<table border="1" width="1000" cellspacing="0" :key="timeStamp" id="numTable">
|
||||
<thead style="background: #efefef;height: 40px;">
|
||||
<tr>
|
||||
|
|
@ -310,7 +310,6 @@
|
|||
],
|
||||
orgData:[],
|
||||
barChart1:null,
|
||||
bar1option:{},
|
||||
barchart2:null,
|
||||
lineChart1:null,
|
||||
lineChart2:null,
|
||||
|
|
@ -332,16 +331,31 @@
|
|||
};
|
||||
},
|
||||
mounted() {
|
||||
this.getGroup();
|
||||
this.supTate = this.checkPermission(["record_confirm"]);
|
||||
if(this.supTate ){
|
||||
}else{
|
||||
let date = new Date();
|
||||
this.listQuery.task2__year = date.getFullYear()+'';
|
||||
this.deptName = this.$store.getters.dept_name;
|
||||
this.listQuery.belong_dept = this.$store.getters.dept;
|
||||
this.handleFilter();
|
||||
}
|
||||
this.optionSet();
|
||||
this.getGroup();
|
||||
},
|
||||
methods: {
|
||||
belongDeptChange(a){
|
||||
this.fileName = '';
|
||||
let selectItem = this.orgData.filter(item=>{
|
||||
return item.id==a
|
||||
})
|
||||
this.deptName = selectItem[0].name;
|
||||
this.bar1Data=[];
|
||||
this.bar2Data=[];
|
||||
this.line1Data=[];
|
||||
this.line2Data =[];
|
||||
this.line3Data=[];
|
||||
this.line4Data=[];
|
||||
this.tableDatas=[[],[],[],[],[],[],[],[],[],[],[],[],[]];
|
||||
},
|
||||
optionSet(){
|
||||
let chartDom1 = document.getElementById('bar1');
|
||||
|
|
@ -405,9 +419,11 @@
|
|||
text: '报告/证书合格率(%)'
|
||||
},
|
||||
tooltip: {
|
||||
trigger: 'axis'
|
||||
trigger: 'axis',
|
||||
|
||||
},
|
||||
legend: {
|
||||
right:30,
|
||||
data: ['报告/证书合格率']
|
||||
},
|
||||
grid: {
|
||||
|
|
@ -454,6 +470,7 @@
|
|||
trigger: 'axis'
|
||||
},
|
||||
legend: {
|
||||
right:30,
|
||||
data: ['报告/证书及时率']
|
||||
},
|
||||
grid: {
|
||||
|
|
@ -500,6 +517,7 @@
|
|||
trigger: 'axis'
|
||||
},
|
||||
legend: {
|
||||
right:30,
|
||||
data: ['能力验证满意率']
|
||||
},
|
||||
grid: {
|
||||
|
|
@ -546,6 +564,7 @@
|
|||
trigger: 'axis'
|
||||
},
|
||||
legend: {
|
||||
right:30,
|
||||
data: ['客户投诉处理满意率']
|
||||
},
|
||||
grid: {
|
||||
|
|
@ -593,7 +612,6 @@
|
|||
that.line2Data = [];
|
||||
that.line3Data = [];
|
||||
that.line4Data = [];
|
||||
that.fileName = that.deptName;
|
||||
that.tableData1 = [];
|
||||
that.tableDatas = [ [],[],[],[],[],[],[],[],[],[],[],[],[]];
|
||||
getTask2Do(that.listQuery).then(res=>{
|
||||
|
|
@ -746,7 +764,6 @@
|
|||
}else{
|
||||
this.$message.warning('请选择部门')
|
||||
}
|
||||
|
||||
},
|
||||
handlePrint() {
|
||||
this.$PRINT('#myReport');
|
||||
|
|
|
|||
Loading…
Reference in New Issue