Skip to content

Administrator / project_progress

Go to a project
Commit acb84dc5 by liangzhen
Options

评估结果查看

1 parent 509c05cc
Inline Side-by-side
Showing with 314 additions and 172 deletions
src/views/assessChecks/assistedViewing.vue
...@@ -25,15 +25,40 @@ ...@@ -25,15 +25,40 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="后评估批次状态:" prop="batchState" class="fromItem"> <el-form-item label="后评估批次状态:" prop="batchState" class="fromItem">
<el-select v-model="ruleForm.batchState" placeholder="请选择" clearable>
<el-option label="执行中" value="3"></el-option>
<el-option label="已完成" value="5"></el-option>
</el-select>
</el-form-item>
<el-form-item label="项目编码:" prop="projectId" class="fromItem">
<el-input
v-model="ruleForm.projectId"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
<el-form-item label="项目名称:" prop="projectName" class="fromItem">
<el-input
v-model="ruleForm.projectName"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
<el-form-item label="项目年度:" prop="projectYear" class="fromItem">
<el-select <el-select
v-model="ruleForm.batchState" v-model="ruleForm.projectYear"
placeholder="请选择" placeholder="请选择"
clearable clearable
> >
<el-option label="执行中" value="3"></el-option> <el-option
<el-option label="已完成" value="5"></el-option> v-for="(item, index) in yearsList"
:key="index"
:label="item + '年'"
:value="item"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="项目审核状态:" prop="reviewStatus" class="fromItem"> <el-form-item label="项目审核状态:" prop="reviewStatus" class="fromItem">
<el-select <el-select
v-model="ruleForm.reviewStatus" v-model="ruleForm.reviewStatus"
...@@ -45,19 +70,21 @@ ...@@ -45,19 +70,21 @@
<el-option label="已整改" value="2"></el-option> <el-option label="已整改" value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="评估项目名称:" prop="projectName" class="fromItem"> <el-form-item
<el-input label="实际评估日期:"
v-model="ruleForm.projectName" prop="actualReviewTime"
placeholder="请输入" class="fromItem"
clearable >
></el-input> <el-date-picker
</el-form-item> @change="timeChange"
<el-form-item label="项目编码:" prop="projectId" class="fromItem"> v-model="ruleForm.dates"
<el-input style="width: 240px"
v-model="ruleForm.projectId" value-format="yyyy-MM-dd"
placeholder="请输入" type="daterange"
clearable range-separator="-"
></el-input> start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item class="button"> <el-form-item class="button">
...@@ -94,38 +121,43 @@ ...@@ -94,38 +121,43 @@
> >
<el-table-column prop="batchName" label="后评估批次名称"> <el-table-column prop="batchName" label="后评估批次名称">
</el-table-column> </el-table-column>
<el-table-column prop="expertName" label="评审专家"> </el-table-column>
<el-table-column <el-table-column
prop="batchStateText" prop="batchStateText"
label="后评估批次状态" label="后评估批次状态"
width="auto" width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column prop="projectId" label="项目编码"> </el-table-column>
<el-table-column <el-table-column
prop="projectName" prop="projectName"
label="评估项目名称" label="项目名称"
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column prop="reviewStatusText" label="项目审核状态"> <el-table-column prop="projectYear" label="项目年度">
<template slot-scope="scope">
{{ scope.row.projectYear }}年
</template>
</el-table-column> </el-table-column>
<el-table-column prop="projectCategory" label="建设形式"> <el-table-column prop="projectCategory" label="建设形式">
</el-table-column> </el-table-column>
<!-- <el-table-column prop="projectStatus" label="项目建设阶段">
</el-table-column> -->
<!-- <el-table-column prop="createTime" label="历史审核状态">
</el-table-column> -->
<el-table-column prop="expertName" label="评审专家名单"> <el-table-column prop="reviewStatusText" label="项目审核状态">
</el-table-column>
<el-table-column prop="planReviewDate" label="计划评估日期">
</el-table-column>
<el-table-column prop="actualReviewTime" label="实际评估日期">
</el-table-column> </el-table-column>
<!-- <el-table-column prop="字段待确认" label="后评估状态"> </el-table-column> -->
<el-table-column prop="planReviewDate" label="评估日期"> </el-table-column>
</el-table> </el-table>
</div> </div>
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="currentPage" :current-page="currentPage"
:page-sizes="[10, 15, 20, 50,100]" :page-sizes="[10, 15, 20, 50, 100]"
:page-size="1000" :page-size="1000"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="total" :total="total"
...@@ -313,9 +345,9 @@ import { ...@@ -313,9 +345,9 @@ import {
clqdselect, clqdselect,
selLcb, selLcb,
presignedUrl, presignedUrl,
downloadObject downloadObject,
} from "@/api/index"; } from "@/api/index";
import { generateYearOptions ,projectCategoryText} from "@/utils/cache"; import { generateYearOptions, projectCategoryText } from "@/utils/cache";
export default { export default {
data() { data() {
return { return {
...@@ -368,7 +400,7 @@ export default { ...@@ -368,7 +400,7 @@ export default {
if (res.code == "200") { if (res.code == "200") {
this.tableData = res.data.records; this.tableData = res.data.records;
this.tableData.forEach(item=>{ this.tableData.forEach((item) => {
if (item.batchState == "3") { if (item.batchState == "3") {
this.$set(item, "batchStateText", "执行中"); this.$set(item, "batchStateText", "执行中");
} else if (item.batchState == "5") { } else if (item.batchState == "5") {
...@@ -381,8 +413,12 @@ export default { ...@@ -381,8 +413,12 @@ export default {
} else if (item.reviewStatus == "2") { } else if (item.reviewStatus == "2") {
this.$set(item, "reviewStatusText", "已整改"); this.$set(item, "reviewStatusText", "已整改");
} }
this.$set(item, "projectCategory",projectCategoryText(item.projectCategory)); this.$set(
}) item,
"projectCategory",
projectCategoryText(item.projectCategory)
);
});
this.total = res.data.total * 1; this.total = res.data.total * 1;
} }
}, },
...@@ -405,7 +441,9 @@ export default { ...@@ -405,7 +441,9 @@ export default {
}; };
Promise.all([fzcxXqselect(params), clqdselect(params)]).then((res) => { Promise.all([fzcxXqselect(params), clqdselect(params)]).then((res) => {
this.listData = res[0].data.records[0]; this.listData = res[0].data.records[0];
this.listData.projectCategory=projectCategoryText(this.listData.projectCategory) this.listData.projectCategory = projectCategoryText(
this.listData.projectCategory
);
this.qdtableData = JSON.parse(JSON.stringify(this.tableDataNew)); this.qdtableData = JSON.parse(JSON.stringify(this.tableDataNew));
if (res[1].data.records.length > 0) { if (res[1].data.records.length > 0) {
this.qdtableData = this.qdtableData this.qdtableData = this.qdtableData
......
src/views/assessChecks/auxiliaryInspection.vue
...@@ -29,6 +29,31 @@ ...@@ -29,6 +29,31 @@
<el-option label="已完成" value="5"></el-option> <el-option label="已完成" value="5"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="项目编码:" prop="projectId" class="fromItem">
<el-input v-model="ruleForm.projectId" placeholder="请输入" clearable></el-input>
</el-form-item>
<el-form-item label="项目名称:" prop="projectName" class="fromItem">
<el-input
v-model="ruleForm.projectName"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
<el-form-item label="项目年度:" prop="projectYear" class="fromItem">
<el-select
v-model="ruleForm.projectYear"
placeholder="请选择"
clearable
>
<el-option
v-for="(item, index) in yearsList"
:key="index"
:label="item + '年'"
:value="item"
/>
</el-select>
</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="请选择" clearable> <el-select v-model="ruleForm.postEvalState" placeholder="请选择" clearable>
<el-option label="待提交" value="2"></el-option> <el-option label="待提交" value="2"></el-option>
...@@ -37,18 +62,20 @@ ...@@ -37,18 +62,20 @@
<el-option label="待评估" value="1"></el-option> <el-option label="待评估" value="1"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="实际评估日期:" prop="actualReviewTime" class="fromItem">
<el-form-item label="评估项目名称:" prop="projectName" class="fromItem"> <el-date-picker
<el-input @change="timeChange"
v-model="ruleForm.projectName" v-model="ruleForm.dates"
placeholder="请输入" style="width: 240px"
clearable value-format="yyyy-MM-dd"
></el-input> type="daterange"
</el-form-item> range-separator="-"
<el-form-item label="项目编码:" prop="projectId" class="fromItem"> start-placeholder="开始日期"
<el-input v-model="ruleForm.projectId" placeholder="请输入" clearable></el-input> end-placeholder="结束日期"
></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item class="button"> <el-form-item class="button">
<el-button @click="submitForm()"> <el-button @click="submitForm()">
<img class="buttonIcon" src="../../assets/cx.png" />查询</el-button <img class="buttonIcon" src="../../assets/cx.png" />查询</el-button
...@@ -103,6 +130,11 @@ ...@@ -103,6 +130,11 @@
<el-table-column prop="projectName" label="项目名称" show-overflow-tooltip> <el-table-column prop="projectName" label="项目名称" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column prop="projectYear" label="项目年度">
<template slot-scope="scope">
{{scope.row.projectYear}}年
</template>
</el-table-column>
<el-table-column prop="projectCategory" label="建设形式"> <el-table-column prop="projectCategory" label="建设形式">
</el-table-column> </el-table-column>
<el-table-column prop="postEvalState" label="检查评估状态"> <el-table-column prop="postEvalState" label="检查评估状态">
...@@ -110,6 +142,7 @@ ...@@ -110,6 +142,7 @@
<el-table-column prop="reviewStatusText" label="项目审核状态"> <el-table-column prop="reviewStatusText" label="项目审核状态">
</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-column prop="actualReviewDate" label="实际评估日期"> </el-table-column>
</el-table> </el-table>
</div> </div>
<el-pagination <el-pagination
...@@ -144,6 +177,7 @@ export default { ...@@ -144,6 +177,7 @@ export default {
postEvalState: "", postEvalState: "",
projectName: "", projectName: "",
projectId: "", projectId: "",
dates:[],
}, },
ruleFormdialog: { ruleFormdialog: {
batchYear: "", batchYear: "",
......
src/views/assessChecks/checkComplianceFZ.vue
...@@ -65,6 +65,7 @@ import { ...@@ -65,6 +65,7 @@ import {
tjpostEvalQuesInfo, tjpostEvalQuesInfo,
presignedUrl, presignedUrl,
} from "@/api/index"; } from "@/api/index";
import { getCurrentDate } from "@/utils/format";
export default { export default {
data() { data() {
return { return {
...@@ -186,12 +187,15 @@ export default { ...@@ -186,12 +187,15 @@ export default {
handleImageClick() {}, handleImageClick() {},
//保存 //保存
async save(type) { async save(type) {
console.log(this.clqparams, "this.clqparams");
let params = { let params = {
projectId: this.clqparams.projectId, projectId: this.clqparams.projectId,
batchId: this.clqparams.batchId, batchId: this.clqparams.batchId,
list: this.tableData, list: this.tableData,
actualReviewTime: getCurrentDate(),
}; };
console.log(params, "this.clqparams");
return
if (type == "add") { if (type == "add") {
console.log(params, "this.zjtableDatathis.zjtableData"); console.log(params, "this.zjtableDatathis.zjtableData");
......
src/views/assessChecks/confirmRelease.vue
...@@ -40,6 +40,18 @@ ...@@ -40,6 +40,18 @@
<el-option label="已完成" value="5"></el-option> <el-option label="已完成" value="5"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="创建时间:" prop="batchName" class="fromItem">
<el-date-picker
@change="timeChange"
v-model="ruleForm.dates"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item class="button"> <el-form-item class="button">
<el-button @click="submitForm()"> <el-button @click="submitForm()">
<img class="buttonIcon" src="../../assets/cx.png" />查询</el-button <img class="buttonIcon" src="../../assets/cx.png" />查询</el-button
...@@ -60,7 +72,6 @@ ...@@ -60,7 +72,6 @@
</el-form> </el-form>
<div class="setscroll"> <div class="setscroll">
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
ref="multipleTable" ref="multipleTable"
:data="tableData" :data="tableData"
...@@ -80,11 +91,15 @@ ...@@ -80,11 +91,15 @@
<el-table-column prop="batchName" label="后评估批次名称"> <el-table-column prop="batchName" label="后评估批次名称">
</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="projectName" label="待评估项目" width="auto" show-overflow-tooltip> <el-table-column
prop="projectName"
label="待评估项目"
width="auto"
show-overflow-tooltip
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="planReviewDate" prop="planReviewDate"
...@@ -97,7 +112,6 @@ ...@@ -97,7 +112,6 @@
label="后评估批次状态" label="后评估批次状态"
width="auto" width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column prop="creator" label="创建人" width="auto"> <el-table-column prop="creator" label="创建人" width="auto">
</el-table-column> </el-table-column>
...@@ -199,11 +213,7 @@ ...@@ -199,11 +213,7 @@
width="100" width="100"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="projectYear" label="项目年度" width="100">
prop="projectYear"
label="项目年度"
width="100"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.projectYear }}年 {{ scope.row.projectYear }}年
</template> </template>
...@@ -233,7 +243,6 @@ ...@@ -233,7 +243,6 @@
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<el-pagination <el-pagination
...@@ -335,11 +344,7 @@ ...@@ -335,11 +344,7 @@
width="100" width="100"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="projectYear" label="项目年度" width="100">
prop="projectYear"
label="项目年度"
width="100"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.projectYear }}年 {{ scope.row.projectYear }}年
</template> </template>
...@@ -409,11 +414,7 @@ ...@@ -409,11 +414,7 @@
> >
<div class="adzjdialog"> <div class="adzjdialog">
<el-form :model="ruleFormZJ" label-width="100px" class="demo-ruleForm"> <el-form :model="ruleFormZJ" label-width="100px" class="demo-ruleForm">
<el-form-item <el-form-item label="项目年度:" prop="projectYear" class="fromItem">
label="项目年度:"
prop="projectYear"
class="fromItem"
>
<el-select <el-select
v-model="ruleFormZJ.projectYear" v-model="ruleFormZJ.projectYear"
placeholder="请选择" placeholder="请选择"
...@@ -441,7 +442,7 @@ ...@@ -441,7 +442,7 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目内容:" prop="projectInfo" class="fromItem" > <el-form-item label="项目内容:" prop="projectInfo" class="fromItem">
<el-input <el-input
v-model="ruleFormZJ.projectInfo" v-model="ruleFormZJ.projectInfo"
placeholder="请输入" placeholder="请输入"
...@@ -526,11 +527,7 @@ ...@@ -526,11 +527,7 @@
width="100" width="100"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="projectYear" label="项目年度" width="100">
prop="projectYear"
label="项目年度"
width="100"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.projectYear }}年 {{ scope.row.projectYear }}年
</template> </template>
...@@ -560,7 +557,6 @@ ...@@ -560,7 +557,6 @@
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
...@@ -604,6 +600,7 @@ export default { ...@@ -604,6 +600,7 @@ export default {
batchYear: "", batchYear: "",
batchName: "", batchName: "",
postEvalState: "", postEvalState: "",
dates: [],
}, },
ruleFormdialog: { ruleFormdialog: {
batchYear: "", batchYear: "",
...@@ -630,16 +627,6 @@ export default { ...@@ -630,16 +627,6 @@ export default {
prjsOfExpert: "", prjsOfExpert: "",
description: "", description: "",
}, },
// rules: {
// prjsOfExpert: [
// {
// required: true,
// message: "请选择每位专家可评估项目数",
// trigger: "change",
// },
// ]
// },
tableData: [], tableData: [],
tableDataQD: [], //清单列表 tableDataQD: [], //清单列表
checkedList: [], checkedList: [],
...@@ -688,12 +675,17 @@ export default { ...@@ -688,12 +675,17 @@ export default {
}, },
}, },
mounted() { mounted() {
console.log("author");
// this.submitForm(); // this.submitForm();
}, },
methods: { methods: {
timeChange(time) {
if (time) {
//给后端的参数
this.ruleForm.createStartTime = time[0];
this.ruleForm.createEndTime = time[1];
}
},
async submitForm() { async submitForm() {
console.log("来了几次");
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
...@@ -729,8 +721,6 @@ export default { ...@@ -729,8 +721,6 @@ export default {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
console.log("222", this.checkedList);
this.ruleFormdialogBJ = this.checkedList[0]; this.ruleFormdialogBJ = this.checkedList[0];
let params = { let params = {
...@@ -794,9 +784,7 @@ export default { ...@@ -794,9 +784,7 @@ export default {
} }
} }
}, },
closeXQ() { closeXQ() {},
console.log("关闭详情");
},
//表格颜色 //表格颜色
tableRowClassName({ row, rowIndex }) { tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 1) { if (rowIndex % 2 == 1) {
...@@ -1255,11 +1243,10 @@ export default { ...@@ -1255,11 +1243,10 @@ export default {
::v-deep.el-table::before { ::v-deep.el-table::before {
display: none !important; display: none !important;
} }
</style> </style>
<style> <style>
.myTooltips{ .myTooltips {
width: 80% !important; width: 80% !important;
background: gainsboro !important ; background: gainsboro !important ;
color: #333 !important; color: #333 !important;
......
src/views/assessChecks/materialAcquisition.vue
...@@ -12,40 +12,84 @@ ...@@ -12,40 +12,84 @@
<el-option <el-option
v-for="(item, index) in yearsList" v-for="(item, index) in yearsList"
:key="index" :key="index"
:label="item+'年'" :label="item + '年'"
:value="item"/> :value="item"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="后评估批次名称:" prop="batchName" class="fromItem"> <el-form-item label="后评估批次名称:" prop="batchName" class="fromItem">
<el-input v-model="ruleForm.batchName" placeholder="请输入" clearable></el-input> <el-input
v-model="ruleForm.batchName"
placeholder="请输入"
clearable
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="后评估批次状态:" prop="batchState" class="fromItem"> <el-form-item label="后评估批次状态:" prop="batchState" class="fromItem">
<el-select <el-select v-model="ruleForm.batchState" placeholder="请选择" clearable>
v-model="ruleForm.batchState"
placeholder="请选择"
clearable
>
<el-option label="执行中" value="3"></el-option> <el-option label="执行中" value="3"></el-option>
<el-option label="已完成" value="5"></el-option> <el-option label="已完成" value="5"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="提交评估材料状态:" prop="postEvalState" class="fromItem">
<el-select v-model="ruleForm.postEvalState" placeholder="请选择" clearable>
<el-option label="未上传" value="0"></el-option>
<el-option label="已上传" value="1"></el-option>
</el-select> <el-form-item label="项目编码:" prop="projectId" class="fromItem">
<el-input
v-model="ruleForm.projectId"
placeholder="请输入"
clearable
></el-input>
</el-form-item> </el-form-item>
<el-form-item
<el-form-item label="评估项目名称:" prop="projectName" class="fromItem" show-overflow-tooltip> label="项目名称:"
prop="projectName"
class="fromItem"
show-overflow-tooltip
>
<el-input <el-input
v-model="ruleForm.projectName" v-model="ruleForm.projectName"
placeholder="请输入" placeholder="请输入"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目编码:" prop="projectId" class="fromItem"> <el-form-item label="项目年度:" prop="projectYear" class="fromItem">
<el-input v-model="ruleForm.projectId" placeholder="请输入" clearable></el-input> <el-select
v-model="ruleForm.projectYear"
placeholder="请选择"
clearable
>
<el-option
v-for="(item, index) in yearsList"
:key="index"
:label="item + '年'"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item
label="提交评估材料状态:"
prop="postEvalState"
class="fromItem"
>
<el-select
v-model="ruleForm.postEvalState"
placeholder="请选择"
clearable
>
<el-option label="未上传" value="0"></el-option>
<el-option label="已上传" value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item label="计划评估日期:" prop="planTime" class="fromItem">
<el-date-picker
@change="timeChange"
v-model="ruleForm.dates"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item class="button"> <el-form-item class="button">
...@@ -79,43 +123,46 @@ ...@@ -79,43 +123,46 @@
</el-table-column> </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 label="批次年度" prop="batchYear">
<template slot-scope="scope"> <template slot-scope="scope"> {{ scope.row.batchYear }}年 </template>
{{scope.row.batchYear}}年
</template>
</el-table-column> </el-table-column>
<el-table-column prop="batchName" label="后评估批次名称"> <el-table-column prop="batchName" label="后评估批次名称">
</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 <el-table-column
prop="batchStateText" prop="batchStateText"
label="后评估批次状态" label="后评估批次状态"
width="auto" width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column prop="projectId" label="项目编码"> <el-table-column prop="projectId" label="项目编码"> </el-table-column>
</el-table-column>
<el-table-column prop="projectName" label="项目名称" show-overflow-tooltip> <el-table-column
prop="projectName"
label="项目名称"
show-overflow-tooltip
>
</el-table-column>
<el-table-column prop="projectYear" label="项目年度">
<template slot-scope="scope">
{{ scope.row.projectYear }}年
</template>
</el-table-column> </el-table-column>
<el-table-column prop="projectCategory" label="建设形式"> <el-table-column prop="projectCategory" label="建设形式">
</el-table-column> </el-table-column>
<!-- <el-table-column prop="projectStatus" label="项目建设阶段"> <!-- <el-table-column prop="projectStatus" label="项目建设阶段">
</el-table-column> --> </el-table-column> -->
<!-- <el-table-column prop="待确认" label="历史审核状态"> </el-table-column> --> <!-- <el-table-column prop="待确认" label="历史审核状态"> </el-table-column> -->
<el-table-column prop="planReviewDate" label="计划评估日期">
</el-table-column>
<el-table-column prop="postEvalStateText" label="提交评估材料"> <el-table-column prop="postEvalStateText" label="提交评估材料">
</el-table-column> </el-table-column>
<el-table-column prop="planReviewDate" label="计划评估日期">
</el-table-column>
</el-table> </el-table>
</div> </div>
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="currentPage" :current-page="currentPage"
:page-sizes="[10, 15, 20, 50,100]" :page-sizes="[10, 15, 20, 50, 100]"
:page-size="1000" :page-size="1000"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="total" :total="total"
...@@ -179,20 +226,30 @@ ...@@ -179,20 +226,30 @@
> >
<el-table-column label="序号" width="55" type="index"> <el-table-column label="序号" width="55" type="index">
</el-table-column> </el-table-column>
<el-table-column label="材料类别" prop="batchtype">
<el-table-column label="材料类别" prop="batchtype"> </el-table-column> </el-table-column>
<el-table-column prop="typeText" label="资料类型"> </el-table-column> <el-table-column prop="typeText" label="资料类型">
<el-table-column prop="fileName" label="资料名称" show-overflow-tooltip> </el-table-column> </el-table-column>
<el-table-column
prop="fileName"
label="资料名称"
show-overflow-tooltip
>
</el-table-column>
<el-table-column prop="projectCategory" label="操作"> <el-table-column prop="projectCategory" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<input type="file" @change="handleFileUpload($event,scope.row)" /> <input
type="file"
@change="handleFileUpload($event, scope.row)"
/>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<p class="Btn"> <p class="Btn">
<span @click="cancel()">取消</span <span @click="cancel()">取消</span>
><span @click="save()">确认上传</span> <span @click="preserve()">保存</span>
<span @click="save()">确认上传</span>
</p> </p>
</div> </div>
</el-dialog> </el-dialog>
...@@ -255,13 +312,17 @@ ...@@ -255,13 +312,17 @@
<el-table-column label="序号" width="55" type="index"> <el-table-column label="序号" width="55" type="index">
</el-table-column> </el-table-column>
<el-table-column label="材料类别" prop="batchtype"> </el-table-column> <el-table-column label="材料类别" prop="batchtype">
<el-table-column prop="typeText" label="资料类型"> </el-table-column> </el-table-column>
<el-table-column prop="fileName" label="资料名称" > <el-table-column prop="typeText" label="资料类型">
</el-table-column>
<el-table-column prop="fileName" label="资料名称">
<template slot-scope="scope" v-if="scope.row.fileName"> <template slot-scope="scope" v-if="scope.row.fileName">
{{scope.row.fileName}}&nbsp;&nbsp;<el-button @click="handleClickXZ(scope.row)">下载</el-button> {{ scope.row.fileName }}&nbsp;&nbsp;<el-button
@click="handleClickXZ(scope.row)"
>下载</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
...@@ -271,19 +332,19 @@ ...@@ -271,19 +332,19 @@
</template> </template>
<script> <script>
import { MaterialsList } from '@/utils/cache' import { MaterialsList } from "@/utils/cache";
import { import {
evaluationMaterials, evaluationMaterials,
clqdevaluationMaterials, clqdevaluationMaterials,
qrscevaluationMaterials, qrscevaluationMaterials,
ossupload, ossupload,
downloadObject downloadObject,
} from "@/api/index"; } from "@/api/index";
import { generateYearOptions,projectCategoryText } from "@/utils/cache"; import { generateYearOptions, projectCategoryText } from "@/utils/cache";
export default { export default {
data() { data() {
return { return {
yearsList:generateYearOptions(), yearsList: generateYearOptions(),
dialogXQ: false, dialogXQ: false,
file: "", file: "",
showButton: true, showButton: true,
...@@ -293,6 +354,7 @@ export default { ...@@ -293,6 +354,7 @@ export default {
postEvalState: "", postEvalState: "",
projectName: "", projectName: "",
projectId: "", projectId: "",
dates: [],
}, },
ruleFormdialog: { ruleFormdialog: {
batchYear: "", batchYear: "",
...@@ -302,8 +364,8 @@ export default { ...@@ -302,8 +364,8 @@ export default {
}, },
tableData: [], tableData: [],
tableDataNew:MaterialsList(), tableDataNew: MaterialsList(),
tableDataQD:[], tableDataQD: [],
checkedList: [], checkedList: [],
currentPage: 1, currentPage: 1,
pageSize: 10, pageSize: 10,
...@@ -313,19 +375,26 @@ export default { ...@@ -313,19 +375,26 @@ export default {
dialog: false, dialog: false,
}; };
}, },
watch:{ watch: {
// 监听路由对象中的参数部分 // 监听路由对象中的参数部分
'$route.params': { "$route.params": {
immediate: true, immediate: true,
handler(newParams, oldParams) { handler(newParams, oldParams) {
this.submitForm(); this.submitForm();
} },
} },
}, },
mounted() { mounted() {
// this.submitForm(); // this.submitForm();
}, },
methods: { methods: {
timeChange(time) {
if (time) {
//给后端的参数
this.ruleForm.planStartTime = time[0];
this.ruleForm.planEndTime = time[1];
}
},
async submitForm() { async submitForm() {
let params = { let params = {
current: this.currentPage, current: this.currentPage,
...@@ -343,15 +412,19 @@ export default { ...@@ -343,15 +412,19 @@ export default {
this.$set(item, "postEvalStateText", "未上传"); this.$set(item, "postEvalStateText", "未上传");
} else if (item.postEvalState == "0") { } else if (item.postEvalState == "0") {
this.$set(item, "postEvalStateText", "未上传"); this.$set(item, "postEvalStateText", "未上传");
} else if (item.postEvalState >=1) { } else if (item.postEvalState >= 1) {
this.$set(item, "postEvalStateText", "已上传"); this.$set(item, "postEvalStateText", "已上传");
} }
if (item.batchState == "3") { if (item.batchState == "3") {
this.$set(item, "batchStateText", "执行中"); this.$set(item, "batchStateText", "执行中");
}else if (item.batchState == "5") { } else if (item.batchState == "5") {
this.$set(item, "batchStateText", "已完成"); this.$set(item, "batchStateText", "已完成");
} }
this.$set(item, "projectCategory",projectCategoryText(item.projectCategory)); this.$set(
item,
"projectCategory",
projectCategoryText(item.projectCategory)
);
}); });
this.total = res.data.total * 1; this.total = res.data.total * 1;
} }
...@@ -379,11 +452,11 @@ export default { ...@@ -379,11 +452,11 @@ export default {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
projectId: this.checkedList[0].projectId, projectId: this.checkedList[0].projectId,
batchId:this.checkedList[0].batchId batchId: this.checkedList[0].batchId,
}; };
let res = await clqdevaluationMaterials(params); let res = await clqdevaluationMaterials(params);
// this.tableDataQD =this.tableDataNew // this.tableDataQD =this.tableDataNew
this.tableDataQD =JSON.parse(JSON.stringify(this.tableDataNew)) this.tableDataQD = JSON.parse(JSON.stringify(this.tableDataNew));
if (res.data.records.length > 0) { if (res.data.records.length > 0) {
this.tableDataQD = this.tableDataQD this.tableDataQD = this.tableDataQD
.concat(res.data.records) .concat(res.data.records)
...@@ -398,14 +471,12 @@ export default { ...@@ -398,14 +471,12 @@ export default {
} }
return accumulator; return accumulator;
}, []); }, []);
console.log( this.tableDataQD,' mergedArray mergedArray mergedArray') console.log(this.tableDataQD, " mergedArray mergedArray mergedArray");
// this.tableDataQD.forEach((item) => { // this.tableDataQD.forEach((item) => {
// // this.$set(item, "batchtype", "开发、实施类"); // // this.$set(item, "batchtype", "开发、实施类");
// }); // });
} }
}, },
//详情 //详情
async detailsForm() { async detailsForm() {
...@@ -419,10 +490,10 @@ export default { ...@@ -419,10 +490,10 @@ export default {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
projectId: this.checkedList[0].projectId, projectId: this.checkedList[0].projectId,
batchId:this.checkedList[0].batchId batchId: this.checkedList[0].batchId,
}; };
let res = await clqdevaluationMaterials(params); let res = await clqdevaluationMaterials(params);
this.tableDataQD =this.tableDataNew this.tableDataQD = this.tableDataNew;
this.tableDataQD = this.tableDataQD this.tableDataQD = this.tableDataQD
.concat(res.data.records) .concat(res.data.records)
.reduce((accumulator, currentObj) => { .reduce((accumulator, currentObj) => {
...@@ -476,6 +547,10 @@ export default { ...@@ -476,6 +547,10 @@ export default {
this.dialog = false; this.dialog = false;
// this.dialogXQ = false; // this.dialogXQ = false;
}, },
preserve() {
this.dialog = false;
// this.dialogXQ = false;
},
closeDialog() { closeDialog() {
console.log("guanbi"); console.log("guanbi");
this.showButton = true; this.showButton = true;
...@@ -489,10 +564,10 @@ export default { ...@@ -489,10 +564,10 @@ export default {
let res = await qrscevaluationMaterials(params); let res = await qrscevaluationMaterials(params);
this.resetForm(); this.resetForm();
}, },
handleFileUpload(event,row) { handleFileUpload(event, row) {
console.log("来了么",event,row); console.log("来了么", event, row);
this.file = event.target.files[0]; this.file = event.target.files[0];
this.submitFile(row) this.submitFile(row);
}, },
submitFile(row) { submitFile(row) {
console.log(row); console.log(row);
...@@ -506,17 +581,16 @@ export default { ...@@ -506,17 +581,16 @@ export default {
ossupload(formData) ossupload(formData)
.then((response) => { .then((response) => {
console.log(response); console.log(response);
if(response.code=='200'){ if (response.code == "200") {
this.$message('上传成功') this.$message("上传成功");
this.$set(row, "fileName", response.data.fileName); this.$set(row, "fileName", response.data.fileName);
}else{ } else {
this.$message('上传失败') this.$message("上传失败");
} }
}) })
.catch((error) => { .catch((error) => {
console.error(error); console.error(error);
this.$message('上传失败') this.$message("上传失败");
}); });
} }
}, },
...@@ -602,9 +676,9 @@ export default { ...@@ -602,9 +676,9 @@ export default {
} }
} }
.eltable { .eltable {
width: 100%; width: 100%;
// height: 650px; // height: 650px;
// overflow-y: auto; // overflow-y: auto;
box-sizing: border-box; box-sizing: border-box;
} }
/deep/ .el-table .warning-row { /deep/ .el-table .warning-row {
...@@ -672,7 +746,7 @@ width: 100%; ...@@ -672,7 +746,7 @@ width: 100%;
} }
.textarea { .textarea {
width: 100%; width: 100%;
/deep/ .el-form-item__content{ /deep/ .el-form-item__content {
display: flex; display: flex;
} }
.el-textarea { .el-textarea {
...@@ -680,7 +754,7 @@ width: 100%; ...@@ -680,7 +754,7 @@ width: 100%;
} }
} }
.Btn { .Btn {
width: 200px; width: 300px;
margin: 0 auto; margin: 0 auto;
margin-top: 20px; margin-top: 20px;
span { span {
...@@ -691,15 +765,20 @@ width: 100%; ...@@ -691,15 +765,20 @@ width: 100%;
text-align: center; text-align: center;
border-radius: 4px; border-radius: 4px;
margin-right: 12px; margin-right: 12px;
}
span:first-of-type {
border: 1px solid #000;
}
span:last-of-type {
background-color: #0d867f; background-color: #0d867f;
border: 1px solid #0d867f; border: 1px solid #0d867f;
color: #fff; color: #fff;
} }
span:first-of-type {
border: 1px solid #000;
background: #fff;
color: #333;
}
// span:last-of-type {
// background-color: #0d867f;
// border: 1px solid #0d867f;
// color: #fff;
// }
} }
/deep/ .el-dialog__headerbtn .el-dialog__close { /deep/ .el-dialog__headerbtn .el-dialog__close {
color: #fff; color: #fff;
...@@ -728,8 +807,8 @@ width: 100%; ...@@ -728,8 +807,8 @@ width: 100%;
overflow: auto; overflow: auto;
} }
} }
.dialog{ .dialog {
.eltable{ .eltable {
height: 650px; height: 650px;
overflow-y: auto; overflow-y: auto;
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!