Skip to content

Administrator / project_progress

Go to a project
Commit 73b21deb by liangzhen
Options

评估材料自动获取

1 parent 7a9ac276
Expand all
Inline Side-by-side
Showing with 67 additions and 42 deletions
src/api/index.js
...@@ -74,6 +74,11 @@ export function updProjectInfo(params) { ...@@ -74,6 +74,11 @@ export function updProjectInfo(params) {
export function evaluationMaterials(params) { export function evaluationMaterials(params) {
return post(`/api/evaluationMaterials/`, params) return post(`/api/evaluationMaterials/`, params)
} }
//上传
export function ossupload(params) {
return post(`/api/oss/upload`, params)
}
//查询材料清单 //查询材料清单
export function clqdevaluationMaterials(params) { export function clqdevaluationMaterials(params) {
return post(`/api/evaluationMaterials/clqd`, params) return post(`/api/evaluationMaterials/clqd`, params)
......
src/views/assessChecks/confirmChanges.vue
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<img class="buttonIcon" src="../../assets/cz.png" />重置</el-button <img class="buttonIcon" src="../../assets/cz.png" />重置</el-button
> >
<el-button @click="submitNexts()" <el-button @click="submitNexts()"
><i class="el-icon-finished"></i> 确认问题清单</el-button ><i class="el-icon-finished"></i>&nbsp;&nbsp;确认问题清单</el-button
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
......
src/views/assessChecks/confirmRelease.vue
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
</el-form-item> </el-form-item>
<el-form-item label="后评估状态:" prop="postEvalState" class="fromItem"> <el-form-item label="后评估状态:" prop="postEvalState" class="fromItem">
<el-select v-model="ruleForm.postEvalState" placeholder="请选择"> <el-select v-model="ruleForm.postEvalState" placeholder="请选择">
<el-option label="未下发" value="0"></el-option> <el-option label="已确认" value="3"></el-option>
<el-option label="已下发" value="1"></el-option> <el-option label="未确认" value="1"></el-option>
<el-option label="已撤回" value="2"></el-option> <el-option label="已撤回" value="4"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="button"> <el-form-item class="button">
...@@ -85,9 +85,10 @@ ...@@ -85,9 +85,10 @@
<el-dialog <el-dialog
title="提交评估材料" title="提交评估材料"
:visible.sync="dialogXQ" :visible.sync="dialogXQ"
width="90%" width="90%"
:modal-append-to-body="false" :modal-append-to-body="false"
:append-to-body="false" :append-to-body="false"
close="closeXQ"
> >
<div class="dialog"> <div class="dialog">
<el-form <el-form
...@@ -265,7 +266,7 @@ ...@@ -265,7 +266,7 @@
</el-table-column> </el-table-column>
<el-table-column fixed="right" label="操作" width="auto"> <el-table-column fixed="right" label="操作" width="auto">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small">删除</el-button> <el-button @click="handleClick(scope.row,scope.$index,addtableData)" type="text" size="small">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
...@@ -325,7 +326,7 @@ ...@@ -325,7 +326,7 @@
placeholder="请输入" placeholder="请输入"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="省公司计划文件号:" prop="字段待确认" class="fromItem"> <!-- <el-form-item label="省公司计划文件号:" prop="字段待确认" class="fromItem">
<el-input <el-input
v-model="ruleFormZJ.fullName" v-model="ruleFormZJ.fullName"
placeholder="请输入" placeholder="请输入"
...@@ -336,7 +337,7 @@ ...@@ -336,7 +337,7 @@
v-model="ruleFormZJ.fullName" v-model="ruleFormZJ.fullName"
placeholder="请输入" placeholder="请输入"
></el-input> ></el-input>
</el-form-item> </el-form-item> -->
<el-form-item label="建设形式:" prop="projectCategory" class="fromItem"> <el-form-item label="建设形式:" prop="projectCategory" class="fromItem">
<el-select v-model="ruleFormZJ.projectCategory" placeholder="请选择"> <el-select v-model="ruleFormZJ.projectCategory" placeholder="请选择">
<el-option label="2024年" value="2024"></el-option> <el-option label="2024年" value="2024"></el-option>
...@@ -362,7 +363,7 @@ ...@@ -362,7 +363,7 @@
ref="multipleTableZJ" ref="multipleTableZJ"
:data="zjtableData" :data="zjtableData"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%;height: 100% "
header-cell-class-name="custom-th-background" header-cell-class-name="custom-th-background"
class="eltable" class="eltable"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
...@@ -383,16 +384,16 @@ ...@@ -383,16 +384,16 @@
</el-table-column> </el-table-column>
<el-table-column prop="projectStatus" label="项目建设阶段" width="200"> <el-table-column prop="projectStatus" label="项目建设阶段" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="字段待确认" label="历史核查状态" width="200"> <!-- <el-table-column prop="字段待确认" label="历史核查状态" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="字段待确认" label="是否处于正在执行批次" width="200"> <el-table-column prop="字段待确认" label="是否处于正在执行批次" width="200">
</el-table-column> </el-table-column> -->
<el-table-column prop="字段待确认" label="计划文号" width="300"> <!-- <el-table-column prop="字段待确认" label="计划文号" width="300">
<el-table-column prop="expertLevel" label="省公司" width="auto"> <el-table-column prop="expertLevel" label="省公司" width="auto">
</el-table-column> </el-table-column>
<el-table-column prop="expertLevel" label="信通公司" width="auto"> <el-table-column prop="expertLevel" label="信通公司" width="auto">
</el-table-column> </el-table-column>
</el-table-column> </el-table-column> -->
<el-table-column label="总投资计划（万元）" width="300"> <el-table-column label="总投资计划（万元）" width="300">
<el-table-column prop=" costAmountTotal" label="成本金" width="auto"> <el-table-column prop=" costAmountTotal" label="成本金" width="auto">
</el-table-column> </el-table-column>
...@@ -408,9 +409,9 @@ ...@@ -408,9 +409,9 @@
<el-table-column prop="department" label="部门" width="200"> <el-table-column prop="department" label="部门" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="字段待确认" label="承建单位" width="200"> <el-table-column prop="department" label="承建单位" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="字段待确认" label="项目经理" width="200"> <el-table-column prop="personCharge" label="项目经理" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="projectInfo" label="项目内容" width="200"> <el-table-column prop="projectInfo" label="项目内容" width="200">
</el-table-column> </el-table-column>
...@@ -546,13 +547,12 @@ export default { ...@@ -546,13 +547,12 @@ export default {
this.tableData = res.data.records; this.tableData = res.data.records;
this.tableData.forEach(item=>{ this.tableData.forEach(item=>{
if (item.postEvalState==''||item.postEvalState==null){ if (item.postEvalState==''||item.postEvalState==null){
// this.$set( item,'postEvalState','') }else if (item.postEvalState=='3'){
}else if (item.postEvalState=='0'){ this.$set( item,'postEvalState','已确认')
this.$set( item,'postEvalState','未下发') }else if(item.postEvalState=='4'){
}else if(item.postEvalState=='2'){
this.$set( item,'postEvalState','已撤回') this.$set( item,'postEvalState','已撤回')
}else{ }else{
this.$set( item,'postEvalState','已下发') this.$set( item,'postEvalState','未确认')
} }
}) })
this.total = res.data.total * 1; this.total = res.data.total * 1;
...@@ -574,14 +574,15 @@ export default { ...@@ -574,14 +574,15 @@ export default {
this.dialogXQ = true; this.dialogXQ = true;
this.ruleFormdialogBJ=this.checkedList[0] this.ruleFormdialogBJ=this.checkedList[0]
let params={ let params={
// current:1, current:1,
// pageSize:10, pageSize:10,
batchId:this.checkedList[0].batchId
} }
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;
} }
}, },
...@@ -592,11 +593,16 @@ export default { ...@@ -592,11 +593,16 @@ export default {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
if(this.checkedList[0].postEvalState=='已确认'){
this.$message("该项目已确认");
return;
}
this.ruleFormdialogBJ=this.checkedList[0] this.ruleFormdialogBJ=this.checkedList[0]
this.dialogAdd=true this.dialogAdd=true
let params={ let params={
current:this.addcurrentPage, current:this.addcurrentPage,
pageSize:this.pageSizeAdd, pageSize:this.pageSizeAdd,
batchId:this.checkedList[0].batchId
} }
Object.assign(params, this.ruleFormdialogAdd); Object.assign(params, this.ruleFormdialogAdd);
let res=await joinProjectInfo(params) let res=await joinProjectInfo(params)
...@@ -605,6 +611,9 @@ export default { ...@@ -605,6 +611,9 @@ export default {
this.addtotal = res.data.total * 1; this.addtotal = res.data.total * 1;
} }
}, },
closeXQ(){
console.log('关闭详情')
},
//表格颜色 //表格颜色
tableRowClassName({ row, rowIndex }) { tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 1) { if (rowIndex % 2 == 1) {
...@@ -655,7 +664,12 @@ export default { ...@@ -655,7 +664,12 @@ export default {
this.$message("请选择项目"); this.$message("请选择项目");
return; return;
} }
this.addtableData=this.addZJList; this.addtableData=[...this.addtableData,...this.addZJList]
this.addtableData = this.addtableData.filter((obj, index, self)=>{
return index == self.findIndex(t =>t.projectId == obj.projectId)
})
console.log(this.addtableData, "addtableData"); console.log(this.addtableData, "addtableData");
this.addtotal = this.addtableData.length; this.addtotal = this.addtableData.length;
this.dialogAddzj = false; this.dialogAddzj = false;
...@@ -689,23 +703,20 @@ export default { ...@@ -689,23 +703,20 @@ export default {
} }
console.log(this.addZJList, "this.addZJList"); console.log(this.addZJList, "this.addZJList");
// 确认发布入参 // 确认发布入参
let expertIdList = []; let expertIdList ="";
let expertStr=''; if(this.addZJList.length>0){
this.addtableData.forEach((item) => { this.addZJList.forEach((item) => {
expertIdList.push(item.projectId); expertIdList= expertIdList.concat(item.projectId+',')
}); });
}
expertStr = JSON.stringify(expertIdList).slice(1, -1);
console.log(expertStr,'expertStexpertSt')
let params = { let params = {
expertStr: expertStr, expertStr:expertIdList,
}; };
params.batchId=this.ruleFormdialogBJ.batchId params.batchId=this.ruleFormdialogBJ.batchId
params.prjsOfExpert=this.ruleFormdialogBJ.prjsOfExpert params.prjsOfExpert=this.ruleFormdialogBJ.prjsOfExpert
// this.ruleFormdialogBJ.expertStr={...expertIdList}
// Object.assign(this.ruleFormdialogBJ,params,);
console.log(params, "222"); console.log(params, "222");
fbProjectInfo(params).then((res) => { fbProjectInfo(params).then((res) => {
this.dialogAdd = false; this.dialogAdd = false;
...@@ -730,12 +741,14 @@ export default { ...@@ -730,12 +741,14 @@ export default {
console.log(this.$refs.multipleTableZJ.selection, "2222"); console.log(this.$refs.multipleTableZJ.selection, "2222");
}, },
//点击删除 //点击删除
async handleClick(index, row) { async handleClick(row,index,rows) {
console.log("删除",index, row) console.log("删除",row)
rows.splice(index, 1);
let params={ let params={
projectId:row.projectId,
batchId:this.checkedList[0].batchId
} }
let res = await delProjectInfo(row); let res = await delProjectInfo(params);
// this.configs() // this.configs()
}, },
//点击撤回 //点击撤回
...@@ -745,7 +758,14 @@ export default { ...@@ -745,7 +758,14 @@ export default {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
let res= await chProjectInfo(this.checkedList[0]) if(this.checkedList[0].postEvalState=='已撤回'){
this.$message("该项目已撤回");
return;
}
let res= await chProjectInfo({batchId:this.checkedList[0].batchId})
if(res.code='200'){
this.resetForm()
}
}, },
}, },
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!