|
|
|
@ -54,12 +54,14 @@ |
|
|
|
label="良好行为" |
|
|
|
align="left" |
|
|
|
prop="behavior" |
|
|
|
:formatter="behaviorFormat" |
|
|
|
min-width="120" |
|
|
|
/> |
|
|
|
<el-table-column |
|
|
|
label="表彰等级" |
|
|
|
align="left" |
|
|
|
prop="commendationLevel" |
|
|
|
:formatter="commendationLevelFormat" |
|
|
|
min-width="120" |
|
|
|
/> |
|
|
|
<el-table-column |
|
|
|
@ -67,6 +69,7 @@ |
|
|
|
align="left" |
|
|
|
prop="authority" |
|
|
|
min-width="120" |
|
|
|
:formatter="authorityFormat" |
|
|
|
/> |
|
|
|
<el-table-column |
|
|
|
label="加分值" |
|
|
|
@ -325,20 +328,53 @@ |
|
|
|
</el-col> |
|
|
|
<el-col :span="12"> |
|
|
|
<el-form-item label="良好行为" prop="behavior"> |
|
|
|
<el-input v-model="form.behavior" placeholder="请输入良好行为" /> |
|
|
|
<el-select |
|
|
|
v-model="form.behavior" |
|
|
|
placeholder="请选择良好行为" |
|
|
|
style="width: 100%" |
|
|
|
|
|
|
|
> |
|
|
|
<el-option |
|
|
|
v-for="dict in behaviorOption" |
|
|
|
:key="dict.dictValue" |
|
|
|
:label="dict.dictLabel" |
|
|
|
:value="dict.dictValue" |
|
|
|
></el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="12"> |
|
|
|
<el-form-item label="表彰等级" prop="commendationLevel"> |
|
|
|
<el-input |
|
|
|
<el-select |
|
|
|
v-model="form.commendationLevel" |
|
|
|
placeholder="请输入表彰等级" |
|
|
|
/> |
|
|
|
placeholder="请选择表彰等级" |
|
|
|
style="width: 100%" |
|
|
|
|
|
|
|
> |
|
|
|
<el-option |
|
|
|
v-for="dict in commendationLevelOption" |
|
|
|
:key="dict.dictValue" |
|
|
|
:label="dict.dictLabel" |
|
|
|
:value="dict.dictValue" |
|
|
|
></el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="12"> |
|
|
|
<el-form-item label="颁奖机构" prop="authority"> |
|
|
|
<el-input v-model="form.authority" placeholder="请输入颁发机构" /> |
|
|
|
<el-select |
|
|
|
v-model="form.authority" |
|
|
|
placeholder="请选择颁奖机构" |
|
|
|
style="width: 100%" |
|
|
|
|
|
|
|
> |
|
|
|
<el-option |
|
|
|
v-for="dict in authorityOption" |
|
|
|
:key="dict.dictValue" |
|
|
|
:label="dict.dictLabel" |
|
|
|
:value="dict.dictValue" |
|
|
|
></el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="12"> |
|
|
|
@ -440,9 +476,9 @@ |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="12"> |
|
|
|
<el-form-item label="是否省属项目" prop="provinceBelong"> |
|
|
|
<el-form-item label="是否省属项目" prop="remark"> |
|
|
|
<el-select |
|
|
|
v-model="form.provinceBelong" |
|
|
|
v-model="form.remark" |
|
|
|
placeholder="请选择是否" |
|
|
|
style="width: 100%" |
|
|
|
> |
|
|
|
@ -533,15 +569,15 @@ |
|
|
|
</el-descriptions-item> |
|
|
|
<el-descriptions-item> |
|
|
|
<template slot="label"> 良好行为 </template> |
|
|
|
{{ this.creditMsg.behavior }} |
|
|
|
{{ behaviorFormat(this.creditMsg) }} |
|
|
|
</el-descriptions-item> |
|
|
|
<el-descriptions-item> |
|
|
|
<template slot="label"> 表彰等级 </template> |
|
|
|
{{ this.creditMsg.commendationLevel }} |
|
|
|
{{ commendationLevelFormat(this.creditMsg) }} |
|
|
|
</el-descriptions-item> |
|
|
|
<el-descriptions-item> |
|
|
|
<template slot="label"> 颁发机构 </template> |
|
|
|
{{ this.creditMsg.authority }} |
|
|
|
{{ authorityFormat(this.creditMsg) }} |
|
|
|
</el-descriptions-item> |
|
|
|
<el-descriptions-item> |
|
|
|
<template slot="label"> 加分值 </template> |
|
|
|
@ -573,7 +609,10 @@ |
|
|
|
<template slot="label"> 是否在一年内填报 </template> |
|
|
|
{{ isFormat(this.creditMsg.fillOnYear) }} |
|
|
|
</el-descriptions-item> |
|
|
|
|
|
|
|
<el-descriptions-item> |
|
|
|
<template slot="label"> 是否省属项目 </template> |
|
|
|
{{ isFormat(this.creditMsg.remark) }} |
|
|
|
</el-descriptions-item> |
|
|
|
<el-descriptions-item> |
|
|
|
<template slot="label"> 附件 </template> |
|
|
|
<template v-if="this.creditMsg.attachment"> |
|
|
|
@ -813,7 +852,7 @@ export default { |
|
|
|
isWaterCon: [ |
|
|
|
{ required: true, message: "请选择是否", trigger: "blur" }, |
|
|
|
], |
|
|
|
provinceBelong: [ |
|
|
|
remark: [ |
|
|
|
{ required: true, message: "请选择是否", trigger: "blur" }, |
|
|
|
], |
|
|
|
fillOnYear: [ |
|
|
|
@ -865,9 +904,21 @@ export default { |
|
|
|
remark: "", |
|
|
|
processList: [], |
|
|
|
projectNameOption: [], |
|
|
|
behaviorOption:[], |
|
|
|
commendationLevelOption:[], |
|
|
|
authorityOption:[], |
|
|
|
}; |
|
|
|
}, |
|
|
|
created() { |
|
|
|
this.getDicts("resiger_institution").then((response) => { |
|
|
|
this.authorityOption = response.data; |
|
|
|
}); |
|
|
|
this.getDicts("good_level").then((response) => { |
|
|
|
this.commendationLevelOption = response.data; |
|
|
|
}); |
|
|
|
this.getDicts("good_havior").then((response) => { |
|
|
|
this.behaviorOption = response.data; |
|
|
|
}); |
|
|
|
this.getDicts("whether").then((response) => { |
|
|
|
this.isOptions = response.data; |
|
|
|
}); |
|
|
|
@ -889,6 +940,15 @@ export default { |
|
|
|
); |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
authorityFormat(row, column) { |
|
|
|
return this.selectDictLabel(this.authorityOption, row.authority); |
|
|
|
}, |
|
|
|
commendationLevelFormat(row, column) { |
|
|
|
return this.selectDictLabel(this.commendationLevelOption, row.commendationLevel); |
|
|
|
}, |
|
|
|
behaviorFormat(row, column) { |
|
|
|
return this.selectDictLabel(this.behaviorOption, row.behavior); |
|
|
|
}, |
|
|
|
isFormat(row, column) { |
|
|
|
return this.selectDictLabel(this.isFormat, row); |
|
|
|
}, |
|
|
|
@ -1206,28 +1266,28 @@ export default { |
|
|
|
passExamine() { |
|
|
|
this.creditMsg.status = "3"; |
|
|
|
this.creditMsg.bonusPointBegin = Date.now(); |
|
|
|
const currentDate = new Date(); |
|
|
|
currentDate.setFullYear( |
|
|
|
currentDate.getFullYear() + this.creditMsg.validity |
|
|
|
); |
|
|
|
const date = currentDate.getTime(); |
|
|
|
// this.creditMsg.validityPeriod=date |
|
|
|
console.log(currentDate.getTime()); |
|
|
|
|
|
|
|
console.log( |
|
|
|
"this.creditMsg.validityPeriod", |
|
|
|
this.creditMsg.validityPeriod |
|
|
|
); |
|
|
|
|
|
|
|
console.log("formattedDate", this.formatDate(currentDate)); |
|
|
|
// const currentDate = new Date(); |
|
|
|
// currentDate.setFullYear( |
|
|
|
// currentDate.getFullYear() + this.creditMsg.validity |
|
|
|
// ); |
|
|
|
// const date = currentDate.getTime(); |
|
|
|
// // this.creditMsg.validityPeriod=date |
|
|
|
// console.log(currentDate.getTime()); |
|
|
|
// |
|
|
|
// console.log( |
|
|
|
// "this.creditMsg.validityPeriod", |
|
|
|
// this.creditMsg.validityPeriod |
|
|
|
// ); |
|
|
|
// |
|
|
|
// console.log("formattedDate", this.formatDate(currentDate)); |
|
|
|
|
|
|
|
// updateCredit(this.creditMsg).then((response) => { |
|
|
|
// if (response.code === 200) { |
|
|
|
// this.msgSuccess("审核通过成功"); |
|
|
|
// this.viewOpen = false; |
|
|
|
// this.getList(); |
|
|
|
// } |
|
|
|
// }); |
|
|
|
updateCredit(this.creditMsg).then((response) => { |
|
|
|
if (response.code === 200) { |
|
|
|
this.msgSuccess("审核通过成功"); |
|
|
|
this.viewOpen = false; |
|
|
|
this.getList(); |
|
|
|
} |
|
|
|
}); |
|
|
|
}, |
|
|
|
|
|
|
|
publicity() { |
|
|
|
|
