Skip to content

Administrator / project_progress

Go to a project
Commit 0fa24916 by liangzhen
Options

提交一版

1 parent 1bacad2a
Expand all
Inline Side-by-side
Showing with 526 additions and 116 deletions
src/api/index.js
...@@ -187,6 +187,10 @@ export function wtqdqselect(params) { ...@@ -187,6 +187,10 @@ export function wtqdqselect(params) {
export function clqdselect(params) { export function clqdselect(params) {
return post(`/api/select/clqd`, params) return post(`/api/select/clqd`, params)
} }
//流程列表
export function selLcb(params) {
return post(`/api/select/selLcb`, params)
}
//申诉辅助确认 //申诉辅助确认
// 申诉辅助确认分页查询 // 申诉辅助确认分页查询
export function appealAssistanceConfirmatio(params) { export function appealAssistanceConfirmatio(params) {
......
src/views/assessChecks/assistedVerif.vue
...@@ -395,7 +395,7 @@ ...@@ -395,7 +395,7 @@
</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>
<el-table-column prop="capitalAmountTotal" label="资本金" width="auto"> <el-table-column prop="capitalAmountTotal" label="资本金" width="auto">
</el-table-column> </el-table-column>
......
src/views/assessChecks/assistedViewing.vue
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscroll">
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
ref="multipleTable" ref="multipleTable"
...@@ -59,7 +60,8 @@ ...@@ -59,7 +60,8 @@
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
border border
> >
<el-table-column label="序号" width="55" type="index"> </el-table-column> <el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column type="selection"> </el-table-column> <el-table-column type="selection"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear"> </el-table-column> <el-table-column label="批次年度" prop="batchYear"> </el-table-column>
<el-table-column prop="batchName" label="后评估批次名称"> <el-table-column prop="batchName" label="后评估批次名称">
...@@ -79,6 +81,7 @@ ...@@ -79,6 +81,7 @@
<!-- <el-table-column prop="字段待确认" label="后评估状态"> </el-table-column> --> <!-- <el-table-column prop="字段待确认" label="后评估状态"> </el-table-column> -->
<el-table-column prop="reviewDate" label="评估日期"> </el-table-column> <el-table-column prop="reviewDate" label="评估日期"> </el-table-column>
</el-table> </el-table>
</div>
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
...@@ -133,7 +136,6 @@ ...@@ -133,7 +136,6 @@
<p>项目后评估资料:</p> <p>项目后评估资料:</p>
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
ref="multipleTable"
:data="qdtableData" :data="qdtableData"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
...@@ -168,7 +170,6 @@ ...@@ -168,7 +170,6 @@
<el-tab-pane label="问题清单" name="second"> <el-tab-pane label="问题清单" name="second">
<p class="title"><span></span>项目基本信息</p> <p class="title"><span></span>项目基本信息</p>
<el-table <el-table
ref="multipleTable"
:data="qdtableData" :data="qdtableData"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
...@@ -198,16 +199,44 @@ ...@@ -198,16 +199,44 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="评审流程" name="third">评审流程</el-tab-pane> <el-tab-pane label="评审流程" name="third">
<el-table
:data="lctableData"
tooltip-effect="dark"
style="width: 100%"
header-cell-class-name="custom-th-background"
class="eltable"
:row-class-name="tableRowClassName"
border
>
<el-table-column
label="流程节点"
prop="processNodes"
width="150"
>
</el-table-column>
<el-table-column label="状态" prop="state"> </el-table-column>
<el-table-column label="处理人" prop="processedBy">
</el-table-column>
<el-table-column label="处理时间" prop="processingTime">
</el-table-column>
</el-table>
</el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
<p class="close"> <span @click="cancel()">关闭</span></p> <p class="close"><span @click="cancel()">关闭</span></p>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { fzcxselect, fzcxXqselect, wtqdqselect, clqdselect } from "@/api/index"; import {
fzcxselect,
fzcxXqselect,
wtqdqselect,
clqdselect,
selLcb,
} from "@/api/index";
export default { export default {
data() { data() {
return { return {
...@@ -238,7 +267,8 @@ export default { ...@@ -238,7 +267,8 @@ export default {
total: 0, total: 0,
dialog: false, dialog: false,
activeName: "first", activeName: "first",
mergingRows:[], mergingRows: [],
lctableData:[],
}; };
}, },
mounted() { mounted() {
...@@ -326,13 +356,13 @@ export default { ...@@ -326,13 +356,13 @@ export default {
} }
}, },
async handleClick() { async handleClick() {
console.log(this.activeName,'this.activeName') console.log(this.activeName, "this.activeName");
if(this.activeName=='second'){ if (this.activeName == "second") {
let params = { let params = {
batchId: this.checkedList[0].batchId, batchId: this.checkedList[0].batchId,
projectId: this.checkedList[0].projectId, projectId: this.checkedList[0].projectId,
}; };
let res= await wtqdqselect(params) let res = await wtqdqselect(params);
if (res.code == "200") { if (res.code == "200") {
this.qdtableData = res.data.records; this.qdtableData = res.data.records;
this.total = res.data.total * 1; this.total = res.data.total * 1;
...@@ -361,10 +391,16 @@ export default { ...@@ -361,10 +391,16 @@ export default {
} }
}); });
this.dataPretreatment(); this.dataPretreatment();
} else if (this.activeName == "third") {
let params = {
batchId: this.checkedList[0].batchId,
projectId: this.checkedList[0].projectId,
};
let res = await selLcb(params);
if (res.code == "200") {
this.lctableData = res.data;
}
} }
}, },
//主列表选中行信息 //主列表选中行信息
handleSelectionChange(selection) { handleSelectionChange(selection) {
...@@ -387,7 +423,6 @@ export default { ...@@ -387,7 +423,6 @@ export default {
cancel() { cancel() {
this.dialog = false; this.dialog = false;
}, },
}, },
}; };
</script> </script>
...@@ -614,17 +649,34 @@ h3 { ...@@ -614,17 +649,34 @@ h3 {
height: 500px; height: 500px;
padding-bottom: 20px; padding-bottom: 20px;
} }
.close{ .close {
width: 100%; width: 100%;
height: 40px; height: 40px;
line-height: 20px; line-height: 20px;
span{ span {
display: inline-block; display: inline-block;
width:80px; width: 80px;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
border: 1px solid grey; border: 1px solid grey;
border-radius: 5px; border-radius: 5px;
} }
} }
.setscroll {
width: 100%;
height: 650px;
position: relative;
overflow: auto;
}
.setscrolldialog {
width: 100%;
height: 300px;
overflow: auto;
box-sizing: border-box;
/deep/ .el-table {
width: 96% !important;
height: 300px;
overflow: auto;
}
}
</style> </style>
\ No newline at end of file
src/views/assessChecks/auxiliaryInspection.vue
...@@ -57,6 +57,7 @@ ...@@ -57,6 +57,7 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscroll">
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
ref="multipleTable" ref="multipleTable"
...@@ -89,6 +90,7 @@ ...@@ -89,6 +90,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="planReviewDate" label="评估日期"> </el-table-column> <el-table-column prop="planReviewDate" label="评估日期"> </el-table-column>
</el-table> </el-table>
</div>
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
...@@ -544,4 +546,10 @@ export default { ...@@ -544,4 +546,10 @@ export default {
/deep/ .el-table__cell { /deep/ .el-table__cell {
text-align: center; text-align: center;
} }
.setscroll {
width: 100%;
height: 650px;
position: relative;
overflow: auto;
}
</style> </style>
\ No newline at end of file
src/views/assessChecks/auxiliarySelection.vue
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="expertName" label="后评估专家" width="auto"> <el-table-column prop="expertName" label="后评估专家" width="auto">
</el-table-column> </el-table-column>
<el-table-column prop="postEvalState" label="批次下发状态" width="auto"> <el-table-column prop="postEvalStateText" label="批次下发状态" width="auto">
</el-table-column> </el-table-column>
<!-- <el-table-column prop="postEvalState" label="后评估状态" width="auto"> <!-- <el-table-column prop="postEvalState" label="后评估状态" width="auto">
</el-table-column> --> </el-table-column> -->
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
<div class="setscrolldialog"> <div class="setscrolldialog">
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:data="addtableData" :data="XQtableData"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
header-cell-class-name="custom-th-background" header-cell-class-name="custom-th-background"
...@@ -188,13 +188,13 @@ ...@@ -188,13 +188,13 @@
</el-table> </el-table>
</div> </div>
<el-pagination <el-pagination
@size-change="handleSizeChangeBJ" @size-change="handleSizeChangeXQ"
@current-change="handleCurrentChangeBJ" @current-change="handleCurrentChangeXQ"
:current-page="currentPageBJ" :current-page="currentPageXQ"
:page-sizes="[5, 10, 20, 50]" :page-sizes="[5, 10, 20, 50]"
:page-size="100" :page-size="100"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="totalBJ" :total="totalXQ"
class="elpagination" class="elpagination"
> >
</el-pagination> </el-pagination>
...@@ -262,7 +262,6 @@ ...@@ -262,7 +262,6 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<p class="zjBtn"> <p class="zjBtn">
后评估专家 <span @click="xzExperts()">选择专家</span> 后评估专家 <span @click="xzExperts()">选择专家</span>
</p> </p>
...@@ -564,13 +563,10 @@ import { ...@@ -564,13 +563,10 @@ import {
export default { export default {
data() { data() {
return { return {
category: [ totalXQ: 0,
{ name: "2024", id: 1 }, XQtableData: [],
{ name: "2023", id: 2 }, currentPageXQ: 1,
{ name: "2022", id: 3 }, pageSizeXQ: 5,
{ name: "2021", id: 4 },
], //专业领域
showButton: true,
ruleForm: { ruleForm: {
batchYear: "", batchYear: "",
batchName: "", batchName: "",
...@@ -626,23 +622,23 @@ export default { ...@@ -626,23 +622,23 @@ export default {
checkedList: [], checkedList: [],
currentPage: 1, currentPage: 1,
currentPagetjcl: 1, currentPagetjcl: 1,
pageSizetjcl: 10, pageSizetjcl: 5,
total: 0, total: 0,
dialogXQ: false, dialogXQ: false,
currentPageBJ: 1, currentPageBJ: 1,
pageSizeBJ: 10, pageSizeBJ: 5,
dialogAdd: false, dialogAdd: false,
dialogAddzj: false, dialogAddzj: false,
pageSize: 10, pageSize: 10,
current: 1, current: 1,
pageSizeZJ: 10, pageSizeZJ: 5,
currentZJ: 1, currentZJ: 1,
addtotal: 0, addtotal: 0,
currentAdd: 1, currentAdd: 1,
pageSizeAdd: 10, pageSizeAdd: 5,
currentedit: 1, currentedit: 1,
pageSizeedit: 10, pageSizeedit: 5,
xfParam: "", xfParam: "",
dialogedit: false, dialogedit: false,
expertIdList: [], expertIdList: [],
...@@ -676,13 +672,13 @@ export default { ...@@ -676,13 +672,13 @@ 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 == "0") { } else if (item.postEvalState == "0") {
this.$set(item, "postEvalState", "未下发"); this.$set(item, "postEvalStateText", "未下发");
} else if (item.postEvalState == "2") { } else if (item.postEvalState == "2") {
this.$set(item, "postEvalState", "已撤回"); this.$set(item, "postEvalStateText", "已撤回");
} else { } else {
this.$set(item, "postEvalState", "已下发"); this.$set(item, "postEvalStateText", "已下发");
} }
}); });
this.total = res.data.total * 1; this.total = res.data.total * 1;
...@@ -709,15 +705,15 @@ export default { ...@@ -709,15 +705,15 @@ export default {
this.dialogXQ = true; this.dialogXQ = true;
this.ruleFormdialogBJ = this.checkedList[0]; this.ruleFormdialogBJ = this.checkedList[0];
let params = { let params = {
current: this.currentedit, current: this.currentPageXQ,
pageSize: this.pageSizeedit, pageSize: this.pageSizeXQ,
batchId: this.checkedList[0].batchId, batchId: this.checkedList[0].batchId,
}; };
console.log(params, "params"); console.log(params, "params");
let res = await expert(params); let res = await expert(params);
this.addtableData = res.data.records; this.XQtableData = res.data.records;
this.totalBJ = res.data.total * 1; this.totalXQ = res.data.total * 1;
}, },
//表格颜色 //表格颜色
tableRowClassName({ row, rowIndex }) { tableRowClassName({ row, rowIndex }) {
...@@ -771,10 +767,23 @@ export default { ...@@ -771,10 +767,23 @@ export default {
handleSizeChangeBJ(val) { handleSizeChangeBJ(val) {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
this.pageSizeBJ = val; this.pageSizeBJ = val;
this.edit();
}, },
handleCurrentChangeBJ(val) { handleCurrentChangeBJ(val) {
console.log(`当前页: ${val}`); console.log(`当前页: ${val}`);
this.currentPageBJ = val; this.currentPageBJ = val;
this.edit();
},
//详情分页
handleSizeChangeXQ(val) {
console.log(`每页 ${val} 条`);
this.pageSizeXQ = val;
this.detailsForm();
},
handleCurrentChangeXQ(val) {
console.log(`当前页: ${val}`);
this.currentPageXQ = val;
this.detailsForm();
}, },
cancel() { cancel() {
this.dialog = false; this.dialog = false;
...@@ -792,14 +801,11 @@ export default { ...@@ -792,14 +801,11 @@ export default {
this.$message("请选择专家"); this.$message("请选择专家");
return; return;
} }
// this.addtableData = this.addZJList;
this.addtableData = [...this.addtableData, ...this.addZJList]; this.addtableData = [...this.addtableData, ...this.addZJList];
this.addtableData= this.addtableData.filter((obj, index, self) => this.addtableData = this.addtableData.filter(
index === self.findIndex((t) => ( (obj, index, self) =>
t.expertId === obj.expertId index === self.findIndex((t) => t.expertId === obj.expertId)
)) );
)
this.addtotal = this.addtableData.length; this.addtotal = this.addtableData.length;
this.dialogAddzj = false; this.dialogAddzj = false;
...@@ -907,10 +913,11 @@ export default { ...@@ -907,10 +913,11 @@ export default {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
if (this.checkedList[0].postEvalState == "已下发") { if (this.checkedList[0].postEvalStateText == "已下发") {
this.$message("不能编辑已下发的项目"); this.$message("不能编辑已下发的项目");
return; return;
} }
this.addtableData = [];
this.ruleFormdialogBJ = this.checkedList[0]; this.ruleFormdialogBJ = this.checkedList[0];
this.dialogedit = true; this.dialogedit = true;
let params = { let params = {
...@@ -928,14 +935,39 @@ export default { ...@@ -928,14 +935,39 @@ export default {
}); });
}, },
//点击删除 //点击删除
async deletes() { deletes() {
console.log("删除"); console.log("删除");
if (this.checkedList.length != 1) { if (this.checkedList.length != 1) {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
this.$confirm("此操作将删除该批次, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(async () => {
let res = await delEvalBatchInfo(this.checkedList[0]); let res = await delEvalBatchInfo(this.checkedList[0]);
if (res.code == 200) {
this.$message({
type: "success",
message: "删除成功!",
});
this.resetForm(); this.resetForm();
} else {
this.$message({
type: "info",
message: "删除失败!",
});
this.resetForm();
}
})
.catch(() => {
this.$message({
type: "info",
message: "已取消删除",
});
});
}, },
//点击下发 //点击下发
async sendMsg() { async sendMsg() {
...@@ -944,22 +976,22 @@ export default { ...@@ -944,22 +976,22 @@ export default {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
if (this.checkedList[0].postEvalState == "已下发") { if (this.checkedList[0].postEvalStateText == "已下发") {
this.$message("该项目已下发"); this.$message("该项目已下发");
return; return;
} }
// if(this.checkedList[0].postEvalState=='已撤回'){
// this.$message("该项目已撤回");
// 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.$message({
type: "success",
message: "下发成功!",
});
this.resetForm(); this.resetForm();
} else {
this.$message({
type: "info",
message: "下发失败!",
});
} }
}, },
//点击撤回 //点击撤回
...@@ -969,15 +1001,14 @@ export default { ...@@ -969,15 +1001,14 @@ export default {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
if (this.checkedList[0].postEvalState == "未下发") { if (this.checkedList[0].postEvalStateText == "未下发") {
this.$message("该项目未下发"); this.$message("该项目未下发");
return; return;
} }
if (this.checkedList[0].postEvalState == "已撤回") { if (this.checkedList[0].postEvalStateText == "已撤回") {
this.$message("该项目已撤回"); this.$message("该项目已撤回");
return; return;
} }
this.$set(this.checkedList[0], "postEvalState", "2");
let res = await chEvalBatchInfo(this.checkedList[0]); let res = await chEvalBatchInfo(this.checkedList[0]);
if (res.code == "200") { if (res.code == "200") {
this.resetForm(); this.resetForm();
...@@ -1055,7 +1086,8 @@ export default { ...@@ -1055,7 +1086,8 @@ export default {
} }
/deep/ .el-dialog { /deep/ .el-dialog {
border-radius: 10px; border-radius: 10px;
margin-top: 5vh !important; margin-top: 3vh !important;
margin-left: 3vw !important;
} }
/deep/ .el-dialog__wrapper { /deep/ .el-dialog__wrapper {
position: absolute; position: absolute;
...@@ -1215,15 +1247,15 @@ export default { ...@@ -1215,15 +1247,15 @@ export default {
height: 300px; height: 300px;
overflow: auto; overflow: auto;
box-sizing: border-box; box-sizing: border-box;
/deep/ .el-table{ /deep/ .el-table {
width: 96% !important; width: 96% !important;
height: 300px;
overflow: auto;
} }
} }
/deep/ .el-table__body-wrapper::-webkit-scrollbar { // /deep/ .el-table__body-wrapper::-webkit-scrollbar {
// width: 6px; // 横向滚动条
width: 6px; // 横向滚动条
height: 6px; // 纵向滚动条必写 // height: 6px; // 纵向滚动条必写
// }
}
</style> </style>
\ No newline at end of file
src/views/assessChecks/confirmRelease.vue
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscroll">
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
ref="multipleTable" ref="multipleTable"
...@@ -70,6 +71,7 @@ ...@@ -70,6 +71,7 @@
<el-table-column prop="prjsOfExpert" label="已选择数量" width="auto"> <el-table-column prop="prjsOfExpert" label="已选择数量" width="auto">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
...@@ -130,6 +132,7 @@ ...@@ -130,6 +132,7 @@
<p class="zjBtn"> <p class="zjBtn">
待评估项目 待评估项目
</p> </p>
<div class="setscrolldialog">
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:data="addtableData" :data="addtableData"
...@@ -153,8 +156,8 @@ ...@@ -153,8 +156,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="projectStatus" label="项目建设阶段" width="auto"> <el-table-column prop="projectStatus" label="项目建设阶段" width="auto">
</el-table-column> </el-table-column>
<el-table-column prop="哪个字段" label="历史核查状态" width="auto"> <!-- <el-table-column prop="哪个字段" label="历史核查状态" width="auto">
</el-table-column> </el-table-column> -->
<el-table-column prop="email" label="部门" width="auto"> <el-table-column prop="email" label="部门" width="auto">
</el-table-column> </el-table-column>
<!-- <el-table-column fixed="right" label="操作" width="auto"> <!-- <el-table-column fixed="right" label="操作" width="auto">
...@@ -165,6 +168,7 @@ ...@@ -165,6 +168,7 @@
</el-table-column> --> </el-table-column> -->
</el-table> </el-table>
</div>
<el-pagination <el-pagination
@size-change="handleSizeChangeAdd" @size-change="handleSizeChangeAdd"
@current-change="handleCurrentChangeAdd" @current-change="handleCurrentChangeAdd"
...@@ -176,10 +180,6 @@ ...@@ -176,10 +180,6 @@
class="elpagination" class="elpagination"
> >
</el-pagination> </el-pagination>
<!-- <p class="midBtn">
<span @click="cancelXZ()">取消</span
><span @click="saveXZ()">确认发布</span>
</p> -->
</div> </div>
</el-dialog> </el-dialog>
<!-- 确认评估项目 --> <!-- 确认评估项目 -->
...@@ -237,6 +237,7 @@ ...@@ -237,6 +237,7 @@
<p class="zjBtn"> <p class="zjBtn">
待评估项目 <span @click="xzExperts()">手动选择待评估项目</span> 待评估项目 <span @click="xzExperts()">手动选择待评估项目</span>
</p> </p>
<div class="setscrolldialog">
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:data="addtableData" :data="addtableData"
...@@ -260,11 +261,11 @@ ...@@ -260,11 +261,11 @@
</el-table-column> </el-table-column>
<el-table-column prop="projectStatus" label="项目建设阶段" width="auto"> <el-table-column prop="projectStatus" label="项目建设阶段" width="auto">
</el-table-column> </el-table-column>
<el-table-column prop="哪个字段" label="历史核查状态" width="auto"> <!-- <el-table-column prop="哪个字段" label="历史核查状态" width="auto">
</el-table-column> </el-table-column> -->
<el-table-column prop="email" label="部门" width="auto"> <el-table-column prop="department" label="部门" width="auto">
</el-table-column> </el-table-column>
<el-table-column fixed="right" label="操作" width="auto"> <el-table-column label="操作" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button @click="handleClick(scope.row,scope.$index,addtableData)" type="text" size="small">删除</el-button> <el-button @click="handleClick(scope.row,scope.$index,addtableData)" type="text" size="small">删除</el-button>
...@@ -272,6 +273,7 @@ ...@@ -272,6 +273,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
<el-pagination <el-pagination
@size-change="handleSizeChangeAdd" @size-change="handleSizeChangeAdd"
@current-change="handleCurrentChangeAdd" @current-change="handleCurrentChangeAdd"
...@@ -294,7 +296,6 @@ ...@@ -294,7 +296,6 @@
title="选择待评估项目" title="选择待评估项目"
:visible.sync="dialogAddzj" :visible.sync="dialogAddzj"
width="90%" width="90%"
height="80%"
:modal-append-to-body="false" :modal-append-to-body="false"
:append-to-body="false" :append-to-body="false"
> >
...@@ -359,7 +360,7 @@ ...@@ -359,7 +360,7 @@
<span class="zjquery" @click="xzExperts()"> 查询 </span> <span class="zjquery" @click="xzExperts()"> 查询 </span>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="dialogHeigth"> <div class="setscrolldialogx">
<el-table <el-table
@selection-change="handleSelectionChangeZJ" @selection-change="handleSelectionChangeZJ"
ref="multipleTableZJ" ref="multipleTableZJ"
...@@ -370,11 +371,11 @@ ...@@ -370,11 +371,11 @@
class="eltable" class="eltable"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
border > border >
<el-table-column type="selection"> </el-table-column> <el-table-column type="selection">
</el-table-column>
<el-table-column label="序号" width="55" type="index"> <el-table-column label="序号" width="55" type="index">
<!-- <template slot-scope="scope">{{ scope.row.id }}</template> -->
</el-table-column> </el-table-column>
<!-- <el-table-column type="selection"> </el-table-column> -->
<el-table-column label="项目编码" width="200" prop="projectId"> <el-table-column label="项目编码" width="200" prop="projectId">
</el-table-column> </el-table-column>
<el-table-column prop="projectYear" label="项目下达年度" width="200"> <el-table-column prop="projectYear" label="项目下达年度" width="200">
...@@ -582,6 +583,7 @@ export default { ...@@ -582,6 +583,7 @@ export default {
batchId:this.checkedList[0].batchId batchId:this.checkedList[0].batchId
} }
Object.assign(params, this.ruleFormdialogAdd); Object.assign(params, this.ruleFormdialogAdd);
this.addtableData=[]
let res=await joinProjectInfo(params) let res=await joinProjectInfo(params)
if (res.code == "200") { if (res.code == "200") {
this.addtableData = res.data.records; this.addtableData = res.data.records;
...@@ -602,6 +604,7 @@ export default { ...@@ -602,6 +604,7 @@ export default {
} }
this.ruleFormdialogBJ=this.checkedList[0] this.ruleFormdialogBJ=this.checkedList[0]
this.dialogAdd=true this.dialogAdd=true
this.addtableData=[]
let params={ let params={
current:this.addcurrentPage, current:this.addcurrentPage,
pageSize:this.pageSizeAdd, pageSize:this.pageSizeAdd,
...@@ -637,10 +640,12 @@ export default { ...@@ -637,10 +640,12 @@ export default {
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
this.pageSize = val; this.pageSize = val;
this.submitForm();
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
console.log(`当前页: ${val}`); console.log(`当前页: ${val}`);
this.currentPage = val; this.currentPage = val;
this.submitForm();
}, },
handleSizeChangeZJ(val) { handleSizeChangeZJ(val) {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
...@@ -667,6 +672,7 @@ export default { ...@@ -667,6 +672,7 @@ export default {
this.$message("请选择项目"); this.$message("请选择项目");
return; return;
} }
console.log(this.addtableData,this.addZJList,'55555')
this.addtableData=[...this.addtableData,...this.addZJList] this.addtableData=[...this.addtableData,...this.addZJList]
this.addtableData = this.addtableData.filter((obj, index, self)=>{ this.addtableData = this.addtableData.filter((obj, index, self)=>{
...@@ -689,6 +695,7 @@ export default { ...@@ -689,6 +695,7 @@ export default {
}; };
Object.assign(params, this.ruleFormZJ); Object.assign(params, this.ruleFormZJ);
let res = await getProjectInfo(params); let res = await getProjectInfo(params);
console.log(res.data.records,'res.data.recordsres.data.records')
this.zjtableData = res.data.records; this.zjtableData = res.data.records;
// this.zjtotal = res.data.total * 1; // this.zjtotal = res.data.total * 1;
console.log(res, "xxx"); console.log(res, "xxx");
...@@ -848,6 +855,8 @@ export default { ...@@ -848,6 +855,8 @@ export default {
} }
/deep/ .el-dialog { /deep/ .el-dialog {
border-radius: 10px; border-radius: 10px;
margin-top: 3vh !important;
margin-left: 3vw !important;
} }
/deep/.el-table th.el-table__cell.is-leaf, .el-table td.el-table__cell{ /deep/.el-table th.el-table__cell.is-leaf, .el-table td.el-table__cell{
text-align: center; text-align: center;
...@@ -1003,4 +1012,42 @@ box-sizing: border-box; ...@@ -1003,4 +1012,42 @@ box-sizing: border-box;
overflow-y: auto; overflow-y: auto;
} }
.setscroll {
width: 100%;
height: 650px;
position: relative;
overflow: auto;
}
.setscrolldialog {
width: 100%;
height: 300px;
position: relative;
overflow: auto;
box-sizing: border-box;
/deep/ .el-table {
height: 300px;
overflow: auto;
position: absolute;
min-width:100% ;
}
}
.setscrolldialogx{
width: 100%;
height: 300px;
position: relative;
overflow: auto;
box-sizing: border-box;
/deep/ .el-table {
position: absolute;
width: auto !important;
max-width: none;
}
}
::v-deep.el-table::before {
display: none !important;
}
</style> </style>
\ No newline at end of file
src/views/assessChecks/materialAcquisition.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="main"> <div class="main">
<el-form <el-form
:model="ruleForm" :model="ruleForm"
ref="ruleForm" ref="formName"
label-width="100px" label-width="100px"
class="demo-ruleForm" class="demo-ruleForm"
> >
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscroll">
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
ref="multipleTable" ref="multipleTable"
...@@ -79,9 +80,10 @@ ...@@ -79,9 +80,10 @@
</el-table-column> </el-table-column>
<el-table-column prop="expertName" label="评审专家名单"> <el-table-column prop="expertName" label="评审专家名单">
</el-table-column> </el-table-column>
<el-table-column prop="postEvalState" label="提交评估材料"> <el-table-column prop="postEvalStateText" label="提交评估材料">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
...@@ -142,7 +144,6 @@ ...@@ -142,7 +144,6 @@
<p class="xqtitle"><span></span>本项目材料清单</p> <p class="xqtitle"><span></span>本项目材料清单</p>
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
ref="multipleTable"
:data="tableDataQD" :data="tableDataQD"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
...@@ -231,7 +232,6 @@ ...@@ -231,7 +232,6 @@
<p class="xqtitle"><span></span>本项目材料清单</p> <p class="xqtitle"><span></span>本项目材料清单</p>
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
ref="multipleTable"
:data="tableDataQD" :data="tableDataQD"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
...@@ -297,7 +297,25 @@ export default { ...@@ -297,7 +297,25 @@ export default {
fullName: "", fullName: "",
}, },
tableData: [], tableData: [],
tableDataQD: [], //清单列表 tableDataQD: [
{batchtype:'开发、实施类',
typeCode:'技术规范书',
},
{batchtype:'开发、实施类',
typeCode:'可行性研究报告',
},
{batchtype:'开发、实施类',
typeCode:'需求规格说明书',
},
{batchtype:'开发、实施类',
typeCode:'概要设计说明书',
},
{batchtype:'开发、实施类',
typeCode:'安全防护方案',
},
], //清单列表
checkedList: [], checkedList: [],
currentPage: 1, currentPage: 1,
pageSize: 10, pageSize: 10,
...@@ -311,7 +329,7 @@ export default { ...@@ -311,7 +329,7 @@ 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,
...@@ -325,18 +343,18 @@ export default { ...@@ -325,18 +343,18 @@ 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", "未上传"); this.$set(item, "postEvalStateText", "未上传");
} else if (item.postEvalState == "0") { } else if (item.postEvalState == "0") {
this.$set(item, "postEvalState", "未上传"); this.$set(item, "postEvalStateText", "未上传");
} else if (item.postEvalState == "1") { } else if (item.postEvalState == "1") {
this.$set(item, "postEvalState", "已上传"); this.$set(item, "postEvalStateText", "已上传");
} }
}); });
this.total = res.data.total * 1; this.total = res.data.total * 1;
} }
}, },
resetForm(formName) { 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();
...@@ -347,6 +365,10 @@ export default { ...@@ -347,6 +365,10 @@ export default {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
if (this.checkedList[0].postEvalStateText =="已上传") {
this.$message("已上传评估材料");
return;
}
console.log("222"); console.log("222");
this.dialog = true; this.dialog = true;
let params = { let params = {
...@@ -355,10 +377,16 @@ export default { ...@@ -355,10 +377,16 @@ export default {
projectId: this.checkedList[0].projectId, projectId: this.checkedList[0].projectId,
}; };
let res = await clqdevaluationMaterials(params); let res = await clqdevaluationMaterials(params);
if(res.data.records.length>0){
this.tableDataQD = res.data.records; this.tableDataQD = res.data.records;
this.tableDataQD.forEach((item) => { this.tableDataQD.forEach((item) => {
this.$set(item, "batchtype", "开发、实施类"); this.$set(item, "batchtype", "开发、实施类");
}); });
}
// this.tableDataQD.forEach((item) => {
// this.$set(item, "batchtype", "开发、实施类");
// });
// this.total = res.data.total * 1; // this.total = res.data.total * 1;
}, },
//详情 //详情
...@@ -400,10 +428,12 @@ export default { ...@@ -400,10 +428,12 @@ export default {
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
this.pageSize = val; this.pageSize = val;
this.submitForm();
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
console.log(`当前页: ${val}`); console.log(`当前页: ${val}`);
this.currentPage = val; this.currentPage = val;
this.submitForm();
}, },
handleSizeChangetjcl(val) { handleSizeChangetjcl(val) {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
...@@ -616,4 +646,21 @@ export default { ...@@ -616,4 +646,21 @@ export default {
/deep/ .el-table__cell { /deep/ .el-table__cell {
text-align: center; text-align: center;
} }
.setscroll {
width: 100%;
height: 650px;
position: relative;
overflow: auto;
}
.setscrolldialog {
width: 100%;
height: 300px;
overflow: auto;
box-sizing: border-box;
/deep/ .el-table {
width: 96% !important;
height: 300px;
overflow: auto;
}
}
</style> </style>
\ No newline at end of file
src/views/layout/index.vue
...@@ -12,19 +12,8 @@ ...@@ -12,19 +12,8 @@
<div style="margin-right: 5px"> <div style="margin-right: 5px">
<img src="../../assets/user.png" alt="user" /> <img src="../../assets/user.png" alt="user" />
</div> </div>
<!-- <div style="margin-right: 35px" >您好，管理员</div> --> <div style="margin-right: 35px" >您好，管理员</div>
<el-dropdown>
<el-button type="primary">
<div style="margin-right: 35px" @click="changeSelect()">您好，管理员</div>
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item>黄金糕</el-dropdown-item>
<el-dropdown-item>狮子头</el-dropdown-item>
<el-dropdown-item>螺蛳粉</el-dropdown-item>
<el-dropdown-item>双皮奶</el-dropdown-item>
<el-dropdown-item>蚵仔煎</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<div style="margin-right: 5px"> <div style="margin-right: 5px">
<img src="../../assets/exit.png" alt="exit" /> <img src="../../assets/exit.png" alt="exit" />
</div> </div>
......
src/views/layout/leftBar.vue
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
@open="handleOpen" @open="handleOpen"
@close="handleClose" @close="handleClose"
:default-active="activeIndex" :default-active="activeIndex"
ref="kzMenu"
> >
<!-- :default-openeds="['submenu1']" --> <!-- :default-openeds="['submenu1']" -->
<el-submenu <el-submenu
...@@ -322,12 +323,193 @@ export default { ...@@ -322,12 +323,193 @@ export default {
], ],
isOpen: false, isOpen: false,
openeds: ["0"], //默认展开导航栏 openeds: ["0"], //默认展开导航栏
activeIndex: "/mainLayout/auxiliarySelection", activeIndex: "",
// menuList: [
// {
// name: "后评估检查",
// url: "",
// children: [
// {
// name: "后评估互查",
// url: "",
// children: [
// {
// name: "评估项目辅助选定",
// url: "/mainLayout/auxiliarySelection",
// children: [],
// },
// {
// name: "项目评估结果确认更改",
// url: "/mainLayout/confirmChanges",
// children: [],
// },
// {
// name: "评估结果辅助查看",
// url: "/mainLayout/assistedViewing",
// children: [],
// },
// {
// name: "问题辅助查询",
// url: "/mainLayout/auxiliaryQuery",
// children: [],
// },
// ],
// },
// ],
// },
// ],
// openeds:["/mainLayout/confirmRelease"] // openeds:["/mainLayout/confirmRelease"]
}; };
}, },
props: {
authority: {
type: Number,
default: "",
},
},
watch: {
authority(newVal, oldVal) {
console.log("oldVal:", oldVal); // coderkey
console.log("newVal:", newVal); // pink
if (newVal == 1) {
this.menuList = [
{
name: "后评估检查",
url: "",
children: [
{
name: "后评估互查",
url: "",
children: [
{
name: "评估项目辅助选定",
url: "/mainLayout/auxiliarySelection",
children: [],
},
{
name: "项目评估结果确认更改",
url: "/mainLayout/confirmChanges",
children: [],
},
{
name: "评估结果辅助查看",
url: "/mainLayout/assistedViewing",
children: [],
},
{
name: "问题辅助查询",
url: "/mainLayout/auxiliaryQuery",
children: [],
},
],
},
],
},
];
this.$router.push({
path: "/mainLayout/auxiliarySelection",
});
this.$refs.kzMenu.activeIndex =this.$route.path
} else if (newVal == 2) {
this.menuList = [
{
name: "后评估检查",
url: "",
children: [
{
name: "后评估互查",
url: "",
children: [
{
name: "评估批次确认发布",
url: "/mainLayout/confirmRelease",
children: [],
},
// { name: "评估材料自动解析", url: "/mainLayout/materialAnalysis", children: [] },
{
name: "项目辅助检查",
url: "/mainLayout/auxiliaryInspection",
children: [],
},
{
name: "问题辅助下发",
url: "/mainLayout/assitedDistribution",
children: [],
},
{
name: "申诉辅助确认",
url: "/mainLayout/assistedConfirm",
children: [],
},
{
name: "整改辅助核验",
url: "/mainLayout/correctiveAssistanceVerification",
children: [],
},
],
},
],
},
];
this.$router.push({
path: "/mainLayout/confirmRelease",
});
this.$refs.kzMenu.activeIndex =this.$route.path;
} else if (newVal == 3) {
this.menuList = [
{
name: "后评估检查",
url: "",
children: [
{
name: "后评估互查",
url: "",
children: [
{
name: "评估材料自动获取",
url: "/mainLayout/materialAcquisition",
children: [],
},
{
name: "问题辅助反馈",
url: "/mainLayout/assistedFeedback",
children: [],
},
{
name: "问题辅助整改",
url: "/mainLayout/assistedRect",
children: [],
},
{
name: "材料同步归档",
url: "/mainLayout/attachSynchronousArchiving",
children: [],
},
],
},
],
},
];
this.$router.push({
path: "/mainLayout/materialAcquisition",
});
this.$refs.kzMenu.activeIndex =this.$route.path;
}
},
},
mounted() { mounted() {
console.log("重新来了么");
this.activeIndex = this.$route.path; this.activeIndex = this.$route.path;
this.handleOpen(0,['0'])
// this.$refs.kzMenu.open(0-0,['0','0-0'])
console.log( this.$refs.kzMenu,' this.$refs.kzMenu.open')
// this.handleOpen(0-0,['0','0-0'])
}, },
methods: { methods: {
......
src/views/layout/mainLayout.vue
<template> <template>
<div class="layout"> <div class="layout">
<LeftBar class="bar"></LeftBar> <LeftBar class="bar" :authority='authority'></LeftBar>
<ContinerView class="continer" id="myElement"> <ContinerView class="continer" id="myElement">
<router-view></router-view> <router-view></router-view>
</ContinerView> </ContinerView>
<div class="changeqx">
<el-dropdown @command="handleCommand">
<el-button type="primary">
<div style="margin-right: 35px" >权限切换</div>
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-for="(item) in submenu"
:value="item.id"
:command="item.id"
:key="item.id">{{item.menu}}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
</div> </div>
</template> </template>
...@@ -19,6 +32,25 @@ export default { ...@@ -19,6 +32,25 @@ export default {
data() { data() {
return { return {
title: "确认更改", title: "确认更改",
submenu:[
{
id:1,
menu:'省公司管理'
},
{
id:2,
menu:'省公司专家'
},
{
id:3,
menu:'项目建设单位专员'
},
],
authority:null,
}; };
}, },
mounted() { mounted() {
...@@ -38,6 +70,11 @@ export default { ...@@ -38,6 +70,11 @@ export default {
element.style.left = maxWidth - elementWidth + "px"; element.style.left = maxWidth - elementWidth + "px";
} }
}, },
handleCommand(item) {
console.log(item,"item")//下拉菜单里面的值
this.authority=item
}
}, },
}; };
</script> </script>
...@@ -49,6 +86,7 @@ export default { ...@@ -49,6 +86,7 @@ export default {
display: flex; display: flex;
padding: 15px; padding: 15px;
background-color: #fff; background-color: #fff;
position: relative;
// overflow: hidden; // overflow: hidden;
.bar { .bar {
width: 235px; width: 235px;
...@@ -62,5 +100,10 @@ export default { ...@@ -62,5 +100,10 @@ export default {
box-sizing: border-box; box-sizing: border-box;
// overflow: auto; // overflow: auto;
} }
.changeqx{
position: absolute;
right: 0;
top: 5px;
}
} }
</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!