fix
This commit is contained in:
parent
d388ed7827
commit
a6fcea59b2
@ -13,7 +13,8 @@ module.exports = {
|
||||
assetsPublicPath: '/',
|
||||
proxyTable: {
|
||||
'/lz_management': {
|
||||
target: 'https://tlzmanagement.ldxinyong.com',
|
||||
// target: 'https://tlzmanagement.ldxinyong.com',
|
||||
target: 'http://localhost:8080/',
|
||||
changeOrigin: true
|
||||
}
|
||||
},
|
||||
|
||||
@ -5,7 +5,7 @@ export const apiResultChart = data => {
|
||||
return http({ url: '/lz_management/result/chart', method: 'get', params: data })
|
||||
}
|
||||
|
||||
// 业绩列表
|
||||
// 绩效列表
|
||||
export const apiResultReport = data => {
|
||||
return http({ url: '/lz_management/result/report', method: 'post', params: data })
|
||||
}
|
||||
@ -16,5 +16,5 @@ export const apiResultDistribution = data => {
|
||||
}
|
||||
|
||||
export const apiDepartmentSelfList = data => {
|
||||
return http({ url: '/lz_management/result/departmentTreeByStaffId', method: 'post', data })
|
||||
return http({ url: '/lz_management/result/departmentTreeByStaffId', method: 'get', data })
|
||||
}
|
||||
|
||||
@ -76,9 +76,6 @@
|
||||
this.handleChangeData()
|
||||
},
|
||||
mounted () {},
|
||||
beforeUpdate () {
|
||||
// this.selectMonthTime = this.monthTime
|
||||
},
|
||||
methods: {
|
||||
async handleChangeData () {
|
||||
this.onSubmit()
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
<template>
|
||||
<div>
|
||||
<div class="staff-archives-title"></div>
|
||||
<el-form :inline="true" :model="formInline" class="demo-form-inline staff-archives-form">
|
||||
<el-form-item label="选择部门">
|
||||
<el-form :inline="true" :model="formInline" class="demo-form-inline staff-archives-form" >
|
||||
<el-form-item label="选择部门" >
|
||||
<el-input
|
||||
placeholder="选择部门"
|
||||
@focus="isChoose=true"
|
||||
@ -27,7 +27,7 @@
|
||||
|
||||
|
||||
<el-form-item :label="`审批进度`">
|
||||
<el-select v-model="status" placeholder="请选择" style="width: 120px" >
|
||||
<el-select v-model="status" placeholder="请选择" style="width: 120px" @change="resetPage">
|
||||
<el-option
|
||||
v-for="item in statusList"
|
||||
:key="item.value"
|
||||
@ -39,7 +39,7 @@
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item :label="`等级`">
|
||||
<el-select v-model="level" placeholder="请选择" clearable style="width: 120px">
|
||||
<el-select v-model="level" placeholder="请选择" clearable style="width: 120px" @change="resetPage">
|
||||
<el-option
|
||||
v-for="item in levelList"
|
||||
:key="item.value"
|
||||
@ -56,6 +56,7 @@
|
||||
placeholder="姓名"
|
||||
clearable
|
||||
style="width: 120px"
|
||||
@change="resetPage"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
|
||||
@ -81,7 +82,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { apiOrganizationList } from '@/api/api_staff'
|
||||
import { apiDepartmentSelfList } from '@/api/api_report'
|
||||
export default {
|
||||
props: {
|
||||
monthTime: {
|
||||
@ -92,9 +93,9 @@
|
||||
data: function () {
|
||||
return {
|
||||
selectMonthTime: this.nowDate(),
|
||||
staffName: '',
|
||||
level: '',
|
||||
status: '',
|
||||
staffName: null,
|
||||
level: null,
|
||||
status: null,
|
||||
isChooseObj: {},
|
||||
isChoose: false,
|
||||
menuList: [],
|
||||
@ -109,10 +110,10 @@
|
||||
{'value': 0,
|
||||
'label': '未提交'
|
||||
},
|
||||
{'value': 1,
|
||||
{'value': 108,
|
||||
'label': '审批中'
|
||||
},
|
||||
{'value': 4,
|
||||
{'value': 109,
|
||||
'label': '已完成'
|
||||
}
|
||||
],
|
||||
@ -159,11 +160,12 @@
|
||||
},
|
||||
// 获取侧边架构列表
|
||||
async handleGetMenuList () {
|
||||
let result = await apiOrganizationList()
|
||||
this.menuList = result
|
||||
let result = await apiDepartmentSelfList()
|
||||
this.menuList = result.data
|
||||
},
|
||||
// 修改月份
|
||||
changeApplyMonth (val) {
|
||||
this.$emit('listenQuery')
|
||||
this.selectMonthTime = val
|
||||
console.log(val)
|
||||
},
|
||||
@ -198,6 +200,9 @@
|
||||
var data = new Date()
|
||||
var month = data.getMonth() < 9 ? '0' + (data.getMonth() + 1) : data.getMonth() + 1
|
||||
return data.getFullYear() + '-' + month
|
||||
},
|
||||
resetPage () {
|
||||
this.$emit('listenQuery')
|
||||
}
|
||||
},
|
||||
watch: {}
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<template>
|
||||
<div class="mod-config">
|
||||
<div class="mod-config" >
|
||||
<el-card class="mod-config">
|
||||
<el-form :inline="true" :model="dataForm" @keyup.enter.native="handleGetTableList()">
|
||||
<query-form @submit="submit"/>
|
||||
<query-form @submit="submit" v-on:listenQuery="initPage"/>
|
||||
</el-form>
|
||||
<el-table
|
||||
:data="dataList"
|
||||
@ -109,9 +109,9 @@
|
||||
selectionDataList: [],
|
||||
departmentId: '',
|
||||
selectMonthTime: '',
|
||||
staffName: '',
|
||||
level: '',
|
||||
status: 0,
|
||||
staffName: null,
|
||||
level: null,
|
||||
status: null,
|
||||
type: 1
|
||||
}
|
||||
},
|
||||
@ -171,6 +171,11 @@
|
||||
this.level = data.level
|
||||
this.status = data.status
|
||||
this.handleGetTableList()
|
||||
},
|
||||
initPage () {
|
||||
this.pageIndex = 1
|
||||
this.pageSize = 10
|
||||
console.log('int page')
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user