Skip to content

Administrator / project_progress

Go to a project
Commit 7a9ac276 by liangzhen
Options

暂存

1 parent c5410595
Inline Side-by-side
Showing with 64 additions and 94 deletions
src/views/assessChecks/auxiliarySelection.vue
...@@ -919,6 +919,11 @@ export default { ...@@ -919,6 +919,11 @@ export default {
// this.$message("该项目已撤回"); // this.$message("该项目已撤回");
// return; // return;
// } // }
if(this.checkedList[0].postEvalState=='已撤回'){
this.$set(this.checkedList[0],'postEvalState','2')
}else{
this.$set(this.checkedList[0],'postEvalState','0')
}
let res= await sendEvalBatchInfo(this.checkedList[0]) let res= await sendEvalBatchInfo(this.checkedList[0])
if(res.code=='200'){ if(res.code=='200'){
this.resetForm() this.resetForm()
......
src/views/assessChecks/confirmRelease.vue
<!-- 辅助核验 --> <!-- 辅助核验 -->
<template> <template>
<div class="main"> <div class="main">
<el-form :model="ruleForm" label-width="100px" class="demo-ruleForm"> <el-form :model="ruleForm" label-width="100px" class="demo-ruleForm" ref="formName">
<el-form-item label="批次年度:" prop="batchYear" class="fromItem"> <el-form-item label="批次年度:" prop="batchYear" class="fromItem">
<el-select v-model="ruleForm.batchYear" placeholder="请选择"> <el-select v-model="ruleForm.batchYear" placeholder="请选择">
<el-option label="2024年" value="2024"></el-option> <el-option label="2024年" value="2024"></el-option>
...@@ -91,11 +91,10 @@ ...@@ -91,11 +91,10 @@
> >
<div class="dialog"> <div class="dialog">
<el-form <el-form
ref="formName" ref="formNames"
:model="ruleFormdialogBJ" :model="ruleFormdialogBJ"
label-width="100px" label-width="100px"
class="demo-ruleForm" class="demo-ruleForm"
:rules="rules"
> >
<el-form-item label="批次年度:" prop="batchYear" class="fromItem"> <el-form-item label="批次年度:" prop="batchYear" class="fromItem">
<el-input v-model="ruleFormdialogBJ.batchYear" disabled></el-input> <el-input v-model="ruleFormdialogBJ.batchYear" disabled></el-input>
...@@ -165,7 +164,7 @@ ...@@ -165,7 +164,7 @@
</el-table-column> --> </el-table-column> -->
</el-table> </el-table>
<!-- <el-pagination <el-pagination
@size-change="handleSizeChangeAdd" @size-change="handleSizeChangeAdd"
@current-change="handleCurrentChangeAdd" @current-change="handleCurrentChangeAdd"
:current-page="addcurrentPage" :current-page="addcurrentPage"
...@@ -175,7 +174,7 @@ ...@@ -175,7 +174,7 @@
:total="addtotal" :total="addtotal"
class="elpagination" class="elpagination"
> >
</el-pagination> --> </el-pagination>
<!-- <p class="midBtn"> <!-- <p class="midBtn">
<span @click="cancelXZ()">取消</span <span @click="cancelXZ()">取消</span
><span @click="saveXZ()">确认发布</span> ><span @click="saveXZ()">确认发布</span>
...@@ -192,8 +191,8 @@ ...@@ -192,8 +191,8 @@
> >
<div class="dialog"> <div class="dialog">
<el-form <el-form
ref="formName" ref="formNames"
:model="ruleFormdialogAdd" :model="ruleFormdialogBJ"
label-width="150px" label-width="150px"
class="demo-ruleForm" class="demo-ruleForm"
:rules="rules" :rules="rules"
...@@ -486,8 +485,12 @@ export default { ...@@ -486,8 +485,12 @@ export default {
}, },
rules: { rules: {
prjsOfExpert: [ prjsOfExpert: [
{ required: true, message: "请选择每位专家可评估项目数", trigger: "prjsOfExpert" }, {
], required: true,
message: "请选择每位专家可评估项目数",
trigger: "change",
},
]
}, },
tableData: [], tableData: [],
...@@ -531,83 +534,32 @@ export default { ...@@ -531,83 +534,32 @@ export default {
this.submitForm(); this.submitForm();
}, },
methods: { methods: {
async submitForm(formName) { async submitForm() {
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
}; };
Object.assign(params, this.ruleForm); Object.assign(params, this.ruleForm);
console.log(params); console.log(params);
(this.tableData = [
{
expertId: 1,
fullName: "王小明",
gender: 1,
birthday: "2024-04-23",
compId: 10001,
qualification: "硕士",
contact: "13241375678",
email: "115485@qq.com",
fields: "1",
expertLevel: 1,
description: "1",
expertState: 1,
creator: 1,
createTime: "2024-04-23 14:47:07",
lastUpdatedby: 1,
lastUpdateTime: "2024-04-23 14:47:12",
column14: 1,
},
{
expertId: 2,
fullName: "李晓帅",
gender: 0,
birthday: "2024-04-23",
compId: 10001,
qualification: "博士",
contact: "13241375678",
email: "115485@qq.com",
fields: "1",
expertLevel: 1,
description: "1",
expertState: 1,
creator: 1,
createTime: "2024-04-23 14:47:07",
lastUpdatedby: 1,
lastUpdateTime: "2024-04-23 14:47:12",
column14: 1,
},
{
expertId: 3,
fullName: "张晓楠",
gender: 1,
birthday: "2024-04-23",
compId: 10002,
qualification: "博士后",
contact: "13241375678",
email: "115485@qq.com",
fields: "1",
expertLevel: 1,
description: "1",
expertState: 1,
creator: 1,
createTime: "2024-04-23 14:47:07",
lastUpdatedby: 1,
lastUpdateTime: "2024-04-23 14:47:12",
column14: 1,
},
]),
(this.total = 2);
return;
let res = await projectInfo(params); let res = await projectInfo(params);
if (res.code == "200") { if (res.code == "200") {
this.tableData = res.data.records; this.tableData = res.data.records;
this.tableData.forEach(item=>{
if (item.postEvalState==''||item.postEvalState==null){
// this.$set( item,'postEvalState','')
}else if (item.postEvalState=='0'){
this.$set( item,'postEvalState','未下发')
}else if(item.postEvalState=='2'){
this.$set( item,'postEvalState','已撤回')
}else{
this.$set( item,'postEvalState','已下发')
}
})
this.total = res.data.total * 1; this.total = res.data.total * 1;
} }
}, },
resetForm() { resetForm() {
this.$refs[formName].resetFields(); this.$refs.formName.resetFields();
this.currentPage = 1; this.currentPage = 1;
this.pageSize = 10; this.pageSize = 10;
this.submitForm(); this.submitForm();
...@@ -643,14 +595,14 @@ export default { ...@@ -643,14 +595,14 @@ export default {
this.ruleFormdialogBJ=this.checkedList[0] this.ruleFormdialogBJ=this.checkedList[0]
this.dialogAdd=true this.dialogAdd=true
let params={ let params={
// current:1, current:this.addcurrentPage,
// pageSize:10, pageSize:this.pageSizeAdd,
} }
Object.assign(params, this.ruleFormdialogAdd); Object.assign(params, this.ruleFormdialogAdd);
let res=await joinProjectInfo(params) let res=await joinProjectInfo(params)
if (res.code == "200") { if (res.code == "200") {
this.tableData = res.data.records; this.addtableData = res.data.records;
// this.total = res.data.total * 1; this.addtotal = res.data.total * 1;
} }
}, },
//表格颜色 //表格颜色
...@@ -727,7 +679,7 @@ export default { ...@@ -727,7 +679,7 @@ export default {
saveXZ() { saveXZ() {
console.log("保存验证", this.$refs); console.log("保存验证", this.$refs);
this.$refs.formName.validate((valid) => { this.$refs.formNames.validate((valid) => {
if (!valid) { if (!valid) {
console.log("error submit!!"); console.log("error submit!!");
return false; return false;
...@@ -738,22 +690,28 @@ export default { ...@@ -738,22 +690,28 @@ export default {
console.log(this.addZJList, "this.addZJList"); console.log(this.addZJList, "this.addZJList");
// 确认发布入参 // 确认发布入参
let expertIdList = []; let expertIdList = [];
// this.addZJList.forEach((item) => { let expertStr='';
// expertIdList.push(item.expertId); this.addtableData.forEach((item) => {
// }); expertIdList.push(item.projectId);
// let expertStr = JSON.stringify(expertIdList).slice(1, -1);
// console.log(expertIdList, "expertIdList", expertStr); });
// let params = {
// expertStr: expertStr, expertStr = JSON.stringify(expertIdList).slice(1, -1);
// }; console.log(expertStr,'expertStexpertSt')
// Object.assign(params, this.ruleFormdialogAdd);
// this.xfParams = JSON.parse(JSON.stringify(params)); let params = {
// console.log(params, "222"); expertStr: expertStr,
// fbProjectInfo(params).then((res) => { };
// this.dialogAdd = false; params.batchId=this.ruleFormdialogBJ.batchId
// this.expertIdList=expertIdList params.prjsOfExpert=this.ruleFormdialogBJ.prjsOfExpert
// this.resetForm(); // this.ruleFormdialogBJ.expertStr={...expertIdList}
// }); // Object.assign(this.ruleFormdialogBJ,params,);
console.log(params, "222");
fbProjectInfo(params).then((res) => {
this.dialogAdd = false;
this.expertIdList=expertIdList
this.resetForm();
});
} }
}); });
...@@ -1008,4 +966,10 @@ text-align: center; ...@@ -1008,4 +966,10 @@ text-align: center;
color: #fff; color: #fff;
} }
} }
/deep/.el-table th.el-table__cell.is-leaf, .el-table td.el-table__cell{
text-align: center;
}
/deep/ .el-table__cell{
text-align: center;
}
</style> </style>
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!