elink-star
/
esua-epdc-admin
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

考核规则新增考核部门类别

master
尹作梅 6 years ago
parent
ae082d43f0
commit
e53277a7a3
4 changed files with 67 additions and 64 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      src/views/modules/kpi/kpiformula-add-or-update.vue
  2. 5
      src/views/modules/kpi/kpiformula.vue
  3. 53
      src/views/modules/kpi/kpirule-add-or-update.vue
  4. 29
      src/views/modules/kpi/kpirule.vue

44
src/views/modules/kpi/kpiformula-add-or-update.vue
View File

@ -21,24 +21,6 @@
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="dataForm.remark" placeholder="备注" type="textarea"></el-input> <el-input v-model="dataForm.remark" placeholder="备注" type="textarea"></el-input>
</el-form-item>
<el-form-item label="乐观锁" prop="revision" v-if="false">
<el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
</el-form-item>
<el-form-item label="创建人" prop="createdBy" v-if="false">
<el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
</el-form-item>
<el-form-item label="创建时间" prop="createdTime" v-if="false">
<el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
</el-form-item>
<el-form-item label="更新人" prop="updatedBy" v-if="false">
<el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
</el-form-item>
<el-form-item label="更新时间" prop="updatedTime" v-if="false">
<el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
</el-form-item>
<el-form-item label="删除标记" prop="delFlag" v-if="false">
<el-input v-model="dataForm.delFlag" placeholder="删除标记"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template slot="footer"> <template slot="footer">
@ -62,13 +44,7 @@ export default {
formula: '', formula: '',
paramAmount: '', paramAmount: '',
description: '', description: '',
remark: '', remark: ''
revision: '',
createdBy: '',
createdTime: '',
updatedBy: '',
updatedTime: '',
delFlag: ''
} }
} }
}, },
@ -95,24 +71,6 @@ export default {
], ],
remark: [ remark: [
{ required: false, message: this.$t('validate.required'), trigger: 'blur' } { required: false, message: this.$t('validate.required'), trigger: 'blur' }
],
revision: [
{ required: false, message: this.$t('validate.required'), trigger: 'blur' }
],
createdBy: [
{ required: false, message: this.$t('validate.required'), trigger: 'blur' }
],
createdTime: [
{ required: false, message: this.$t('validate.required'), trigger: 'blur' }
],
updatedBy: [
{ required: false, message: this.$t('validate.required'), trigger: 'blur' }
],
updatedTime: [
{ required: false, message: this.$t('validate.required'), trigger: 'blur' }
],
delFlag: [
{ required: false, message: this.$t('validate.required'), trigger: 'blur' }
] ]
} }
} }

5
src/views/modules/kpi/kpiformula.vue
View File

@ -26,12 +26,7 @@
<el-table-column prop="paramAmount" label="公式参数数量" header-align="center" align="center" ></el-table-column> <el-table-column prop="paramAmount" label="公式参数数量" header-align="center" align="center" ></el-table-column>
<el-table-column prop="description" label="公式描述" header-align="center" align="center"></el-table-column> <el-table-column prop="description" label="公式描述" header-align="center" align="center"></el-table-column>
<el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column> <el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>
<el-table-column prop="revision" label="乐观锁" header-align="center" align="center" v-if="false"></el-table-column>
<el-table-column prop="createdBy" label="创建人" header-align="center" align="center" v-if="false"></el-table-column>
<el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column> <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
<el-table-column prop="updatedBy" label="更新人" header-align="center" align="center" v-if="false"></el-table-column>
<el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center" v-if="false"></el-table-column>
<el-table-column prop="delFlag" label="删除标记" header-align="center" align="center" v-if="false"></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="$hasPermission('kpi:kpiformula:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button> <el-button v-if="$hasPermission('kpi:kpiformula:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>

53
src/views/modules/kpi/kpirule-add-or-update.vue
View File

@ -37,21 +37,21 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="引用" prop="referenceId" v-if="dataForm.ruleMode === '0'"> <el-form-item label="考核周期" prop="kpiCycle">
<el-select v-model="dataForm.referenceId" clearable placeholder="引用" @change="handlereference(dataForm.referenceId)"> <el-select v-model="dataForm.kpiCycle" placeholder="考核周期">
<el-option <el-option
v-for="item in kpiFormulaList" v-for="item in kpiCycleList"
:key="item.id" :key="item.dictValue"
:label="item.formulaName" :label="item.dictName"
:value="item.id" :value="item.dictValue"
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="考核周期" prop="kpiCycle"> <el-form-item label="考核部门类别" prop="deptTypeKey">
<el-select v-model="dataForm.kpiCycle" placeholder="考核周期"> <el-select v-model="dataForm.deptTypeKey" placeholder="考核周期">
<el-option <el-option
v-for="item in kpiCycleList" v-for="item in deptTypeKeyList"
:key="item.dictValue" :key="item.dictValue"
:label="item.dictName" :label="item.dictName"
:value="item.dictValue" :value="item.dictValue"
@ -59,6 +59,17 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="引用" prop="referenceId" v-if="dataForm.ruleMode === '0'">
<el-select v-model="dataForm.referenceId" clearable placeholder="引用" @change="handlereference(dataForm.referenceId)">
<el-option
v-for="item in kpiFormulaList"
:key="item.id"
:label="item.formulaName"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="入参" prop="metaDataCode" v-if="dataForm.ruleMode === '0'"> <el-form-item label="入参" prop="metaDataCode" v-if="dataForm.ruleMode === '0'">
<el-select <el-select
v-model="dataForm.metaDataCode" v-model="dataForm.metaDataCode"
@ -123,9 +134,11 @@ export default {
ruleMode: '', ruleMode: '',
referenceId: '', referenceId: '',
kpiCycle: '', kpiCycle: '',
deptTypeKey: '',
metaDataCode: '', metaDataCode: '',
ruleParamList: [] ruleParamList: []
} },
deptTypeKeyList: []
} }
}, },
computed: { computed: {
@ -166,6 +179,13 @@ export default {
trigger: 'blur' trigger: 'blur'
} }
], ],
deptTypeKey: [
{
required: true,
message: this.$t('validate.required'),
trigger: 'blur'
}
],
ruleParam: [ ruleParam: [
{ {
required: false, required: false,
@ -181,12 +201,16 @@ export default {
this.getKpiCycleList() this.getKpiCycleList()
this.getKpiFormulaList() this.getKpiFormulaList()
this.getMetaDataCodeList() this.getMetaDataCodeList()
this.getDeptTypeKeyList()
}, },
methods: { methods: {
init () { init () {
this.visible = true this.visible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
this.dataForm.ruleParamList = []
this.dataForm.referenceId = ''
this.dataForm.metaDataCode = ''
if (this.dataForm.id) { if (this.dataForm.id) {
this.getInfo() this.getInfo()
} }
@ -334,6 +358,15 @@ export default {
this.paramAmount = kpiFormulaArray[i].paramAmount this.paramAmount = kpiFormulaArray[i].paramAmount
} }
} }
},
// 获取考核部门类别下拉框
getDeptTypeKeyList () {
this.$http.get(`/sys/dict/listSimple/org_type`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.deptTypeKeyList = res.data
}).catch(() => { })
} }
} }
} }

29
src/views/modules/kpi/kpirule.vue
View File

@ -25,12 +25,8 @@
<el-table-column prop="referenceId" label="引用ID" header-align="center" align="center" v-if="false"></el-table-column> <el-table-column prop="referenceId" label="引用ID" header-align="center" align="center" v-if="false"></el-table-column>
<el-table-column prop="referenceName" label="引用" header-align="center" align="center"></el-table-column> <el-table-column prop="referenceName" label="引用" header-align="center" align="center"></el-table-column>
<el-table-column prop="kpiCycle" label="考核周期" header-align="center" align="center" :formatter="showKpiCycleFormatter"></el-table-column> <el-table-column prop="kpiCycle" label="考核周期" header-align="center" align="center" :formatter="showKpiCycleFormatter"></el-table-column>
<el-table-column prop="revision" label="乐观锁" header-align="center" align="center" v-if="false"></el-table-column> <el-table-column prop="deptTypeKey" label="考核部门类别" header-align="center" align="center" :formatter="showDeptTypeKeyFormatter"></el-table-column>
<el-table-column prop="createdBy" label="创建人" header-align="center" align="center" v-if="false"></el-table-column>
<el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column> <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
<el-table-column prop="updatedBy" label="更新人" header-align="center" align="center" v-if="false"></el-table-column>
<el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center" v-if="false"></el-table-column>
<el-table-column prop="delFlag" label="删除标记" header-align="center" align="center" v-if="false"></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="$hasPermission('kpi:kpirule:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button> <el-button v-if="$hasPermission('kpi:kpirule:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
@ -70,7 +66,8 @@ export default {
ruleName: '' ruleName: ''
}, },
ruleModeList: [], ruleModeList: [],
kpiCycleList: [] kpiCycleList: [],
deptTypeKeyList: []
} }
}, },
components: { components: {
@ -79,6 +76,7 @@ export default {
created () { created () {
this.getRuleModeList() this.getRuleModeList()
this.getKpiCycleList() this.getKpiCycleList()
this.getDeptTypeKeyList()
}, },
methods: { methods: {
// 获取绩效考核规则生成方式 // 获取绩效考核规则生成方式
@ -116,6 +114,25 @@ export default {
} }
} }
return '' return ''
},
// 获取考核部门类别下拉框
getDeptTypeKeyList () {
this.$http.get(`/sys/dict/listSimple/org_type`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.deptTypeKeyList = res.data
}).catch(() => { })
},
// 转换考核部门显示名称
showDeptTypeKeyFormatter: function (row, column) {
if (row.deptTypeKey) {
let dict = this.deptTypeKeyList.filter(item => item.dictValue === row.deptTypeKey)[0]
if (dict) {
return dict.dictName
}
}
return ''
} }
} }
} }

Write Preview
Loading…
Cancel
Save