|
|
@@ -71,8 +71,8 @@
|
|
|
<el-table-column label="考评规则ID" prop="evaluateRuleId" />
|
|
|
<el-table-column label="业务版块" prop="binSection" />
|
|
|
<el-table-column label="业务阶段" prop="binStage" />
|
|
|
- <!-- <el-table-column label="年" prop="year" />
|
|
|
- <el-table-column label="月" prop="month" /> -->
|
|
|
+ <el-table-column label="年" prop="year" />
|
|
|
+ <el-table-column label="月" prop="month" />
|
|
|
<el-table-column label="创建时间" prop="createTime" />
|
|
|
</el-table>
|
|
|
<el-pagination
|
|
|
@@ -131,7 +131,18 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="指标顺序" prop="orderNum">
|
|
|
+ <el-form-item label="年份" prop="year">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="ruleForm.year"
|
|
|
+ type="year"
|
|
|
+ value-format="YYYY"
|
|
|
+ placeholder="请选择年份"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="月份">
|
|
|
+ <el-input-number v-model="ruleForm.month" :min="1" :max="12" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="指标顺序">
|
|
|
<el-input-number v-model="ruleForm.orderNum" :min="1" />
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
@@ -175,6 +186,8 @@ export default {
|
|
|
binSection: '',
|
|
|
binStage: '',
|
|
|
evaluationCycle: '',
|
|
|
+ year: '',
|
|
|
+ month: 1,
|
|
|
orderNum: 1
|
|
|
},
|
|
|
rules: {
|
|
|
@@ -193,8 +206,8 @@ export default {
|
|
|
evaluationCycle: [
|
|
|
{ required: true, message: '请选择考评周期', trigger: 'change' }
|
|
|
],
|
|
|
- orderNum: [
|
|
|
- { required: true, message: '请输入指标顺序', trigger: 'blur' }
|
|
|
+ year: [
|
|
|
+ { required: true, message: '请选择年份', trigger: 'change' }
|
|
|
]
|
|
|
},
|
|
|
page:{
|
|
|
@@ -264,7 +277,7 @@ export default {
|
|
|
}
|
|
|
apiGetdatadictionaryList(params).then(datas =>{
|
|
|
if (datas && datas.data) {
|
|
|
- that.periodData = datas
|
|
|
+ that.periodData = datas.data
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
@@ -289,6 +302,8 @@ export default {
|
|
|
binSection: '',
|
|
|
binStage: '',
|
|
|
evaluationCycle: '',
|
|
|
+ year: '',
|
|
|
+ month: 1,
|
|
|
orderNum: 1
|
|
|
}
|
|
|
})
|
|
|
@@ -304,6 +319,8 @@ export default {
|
|
|
evaluateRule: this.evalradio.evaluateRuleId,
|
|
|
binSection: this.evalradio.binSection,
|
|
|
binStage: this.evalradio.binStage,
|
|
|
+ year: this.evalradio.year,
|
|
|
+ month: this.evalradio.month,
|
|
|
orderNum: this.evalradio.orderNum
|
|
|
}
|
|
|
},
|
|
|
@@ -325,7 +342,9 @@ export default {
|
|
|
evaluateRuleId: that.ruleForm.evaluateRule,
|
|
|
binSection: that.ruleForm.binSection,
|
|
|
binStage: that.ruleForm.binStage,
|
|
|
- orderNum: that.ruleForm.orderNum
|
|
|
+ orderNum: that.ruleForm.orderNum,
|
|
|
+ year: that.ruleForm.year,
|
|
|
+ month: that.ruleForm.month
|
|
|
}
|
|
|
if (that.isSave) {
|
|
|
params.id = this.evalradio.id
|
|
|
@@ -475,6 +494,9 @@ export default {
|
|
|
.el-select, .el-input{
|
|
|
width: 100%;
|
|
|
}
|
|
|
+ .el-input{
|
|
|
+ height: 30px;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
