Skip to content

Administrator / project_progress

Go to a project
Commit 749d903e by liangzhen
Options

暂存

1 parent 736f4fd7
Expand all
Inline Side-by-side
Showing with 230 additions and 99 deletions
src/router/index.js
......@@ -155,29 +155,86 @@ export const routes = [
//项目合规检查
{
path: '/projectCheck/checkResault',
name: '/projectCheck/checkResault',
name: 'projectCheck/checkResault',
component: () => import('@/views/projectCheck/checkResault.vue'),
},
{
path: '/projectCheck/confirmResault',
name: '/projectCheck/confirmResault',
name: 'projectCheck/confirmResault',
component: () => import('@/views/projectCheck/confirmResault.vue'),
},
{
path: '/projectCheck/problemRectify',
name: '/projectCheck/problemRectify',
name: 'projectCheck/problemRectify',
component: () => import('@/views/projectCheck/problemRectify.vue'),
},
{
path: '/projectCheck/verificationRectify',
name: '/projectCheck/verificationRectify',
name: 'projectCheck/verificationRectify',
component: () => import('@/views/projectCheck/verificationRectify.vue'),
},
{
path: '/checkCompliance/automaticCheck',
name: '/checkCompliance/automaticCheck',
name: 'checkCompliance/automaticCheck',
component: () => import('@/views/checkCompliance/automaticCheck.vue'),
},
//后评估结果管理
{
path: '/managementResult/releaseResultpublicity',
name: 'releaseResultpublicity',
component: () => import('@/views/managementResult/releaseResult/publicity.vue'),
},
{
path: '/managementResult/releaseResultEvaluate',
name: 'releaseResultEvaluate',
component: () => import('@/views/managementResult/releaseResult/evaluate.vue'),
},
{
path: '/managementResult/situationResaultschedule',
name: 'situationResaultschedule',
component: () => import('@/views/managementResult/situationResault/schedule.vue'),
},
{
path: '/managementResult/situationResaultissuesLink',
name: 'situationResaultissuesLink',
component: () => import('@/views/managementResult/situationResault/issuesLink.vue'),
},
{
path: '/managementResult/situationResaultissuesType',
name: 'situationResaultissuesType',
component: () => import('@/views/managementResult/situationResault/issueType.vue'),
},
{
path: '/managementResult/reportInspection',
name: 'reportInspection',
component: () => import('@/views/managementResult/situationResault/reportInspection.vue'),
},
{
path: '/managementResult/issuesInspection',
name: 'issuesInspection',
component: () => import('@/views/managementResult/situationResault/issuesInspection.vue'),
},
{
path: '/managementResult/reportInspectionHg',
name: 'reportInspectionHg',
component: () => import('@/views/managementResult/situationResault/reportInspectionHg.vue'),
},
{
path: '/managementResult/maintenancePg',
name: 'maintenancePg',
component: () => import('@/views/managementResult/pgReportManagement/maintenancePg.vue'),
},
{
path: '/managementResult/pgAdministration',
name: 'pgAdministration',
component: () => import('@/views/managementResult/pgReportManagement/pgAdministration.vue'),
},
{
path: '/managementResult/maintenanceHg',
name: 'maintenanceHg',
component: () => import('@/views/managementResult/hgReportManagement/maintenanceHg.vue'),
},
]
},
......
src/views/assessChecks/assistedViewing.vue
......@@ -16,10 +16,18 @@
</el-select>
</el-form-item>
<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 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="0"></el-option>
<el-option label="已下发" value="1"></el-option>
<el-option label="已撤回" value="2"></el-option>
......@@ -34,7 +42,11 @@
></el-input>
</el-form-item>
<el-form-item label="项目ID:" prop="projectId" class="fromItem">
<el-input v-model="ruleForm.projectId" placeholder="请输入" clearable></el-input>
<el-input
v-model="ruleForm.projectId"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
<el-form-item class="button">
......@@ -68,7 +80,11 @@
<el-table-column prop="batchName" label="后评估批次名称">
</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="projectCategory" label="建设形式">
</el-table-column>
......@@ -113,7 +129,10 @@
<div class="content">
<p><label>项目编号:</label>{{ listData.projectId }}</p>
<p><label>项目下达年度:</label>{{ listData.projectYear }}</p>
<p><label>项目名称:</label> <span>{{ listData.projectName }}</span> </p>
<p>
<label>项目名称:</label>
<span>{{ listData.projectName }}</span>
</p>
<p><label>建设形式:</label>{{ listData.projectCategory }}</p>
<p>
<label>总投资计划(万元)-成本金:</label
......@@ -131,7 +150,7 @@
</div>
<div class="table">
<p>项目后评估资料:</p>
<el-table
<!-- <el-table
@selection-change="handleSelectionChange"
:data="qdtableData"
tooltip-effect="dark"
......@@ -150,7 +169,35 @@
</el-table-column>
<el-table-column prop="fileName" label="资料名称">
</el-table-column>
</el-table>
</el-table> -->
<div class="setscrolldialog">
<el-table
@selection-change="handleSelectionChange"
:data="qdtableData"
tooltip-effect="dark"
style="width: 100%"
header-cell-class-name="custom-th-background"
class="eltable"
:row-class-name="tableRowClassName"
border
>
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column label="材料类别" prop="batchtype">
</el-table-column>
<el-table-column prop="typeText" label="资料类型">
</el-table-column>
<el-table-column prop="fileName" label="资料名称">
<template slot-scope="scope" v-if="scope.row.fileName">
{{ scope.row.fileName }}&nbsp;&nbsp;<el-button
@click="handleClickXZ(scope.row)"
>下载</el-button
>
</template>
</el-table-column>
</el-table>
</div>
</div>
<p class="title"><span></span>批次详情</p>
<div class="content">
......@@ -187,7 +234,11 @@
<el-table-column label="问题检查项" prop="quesCheckItem">
</el-table-column>
<el-table-column label="检查说明" prop="checkDesc" show-overflow-tooltip>
<el-table-column
label="检查说明"
prop="checkDesc"
show-overflow-tooltip
>
</el-table-column>
<el-table-column label="评估问题" prop="evalQues">
<!-- <template slot-scope="scope">
......@@ -206,11 +257,7 @@
:row-class-name="tableRowClassName"
border
>
<el-table-column
label="流程节点"
prop="processNodes"
width="150"
>
<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">
......@@ -227,7 +274,7 @@
</template>
<script>
import { MaterialsList } from '@/utils/cache'
import { MaterialsList } from "@/utils/cache";
import {
fzcxselect,
fzcxXqselect,
......@@ -240,8 +287,8 @@ export default {
return {
listData: {},
qdtableData: JSON.parse(JSON.stringify(MaterialsList())),
tableDataNew:MaterialsList(),
xxtableData:[],
tableDataNew: MaterialsList(),
xxtableData: [],
showButton: true,
ruleForm: {
batchYear: "",
......@@ -268,7 +315,7 @@ export default {
dialog: false,
activeName: "first",
mergingRows: [],
lctableData:[],
lctableData: [],
};
},
mounted() {
......@@ -309,11 +356,12 @@ export default {
Promise.all([fzcxXqselect(params), clqdselect(params)]).then((res) => {
console.log(res[0], res[1], "2222222");
this.listData = res[0].data.records[0];
this.qdtableData=this.tableDataNew
this.qdtableData = this.tableDataNew;
if (res[1].data.records.length > 0) {
// this.qdtableData = res[1].data.records;
this.qdtableData = this.qdtableData.concat(res[1].data.records)
this.qdtableData = this.qdtableData
.concat(res[1].data.records)
.reduce((accumulator, currentObj) => {
const existingObj = accumulator.find(
(obj) => obj.typeCode == currentObj.typeCode
......@@ -325,13 +373,12 @@ export default {
}
return accumulator;
}, []);
console.log( this.tableDataQD,' mergedArray mergedArray mergedArray')
// this.tableDataQD.forEach((item) => {
// // this.$set(item, "batchtype", "开发、实施类");
console.log(this.tableDataQD, " mergedArray mergedArray mergedArray");
// this.tableDataQD.forEach((item) => {
// // this.$set(item, "batchtype", "开发、实施类");
// });
}
// });
}
});
},
......@@ -354,8 +401,8 @@ export default {
}
},
dataPretreatment() {
this.mergingRows=[]
this.mergingPos = 0;
this.mergingRows = [];
this.mergingPos = 0;
for (let i = 0; i < this.xxtableData.length; i++) {
// tabledata 表格数据源
if (i == 0) {
......@@ -383,7 +430,7 @@ export default {
batchId: this.checkedList[0].batchId,
projectId: this.checkedList[0].projectId,
};
this.xxtableData=[]
this.xxtableData = [];
let res = await wtqdqselect(params);
if (res.code == "200") {
this.xxtableData = res.data.records;
......@@ -437,12 +484,12 @@ export default {
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
this.pageSize = val;
this.submitForm()
this.submitForm();
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.currentPage = val;
this.submitForm()
this.submitForm();
},
cancel() {
this.dialog = false;
......@@ -606,9 +653,9 @@ export default {
margin-right: 20px;
vertical-align: middle;
}
span{
span {
display: inline-block;
text-align: left
text-align: left;
}
}
}
......
src/views/assessChecks/assitedDistribution.vue
......@@ -115,6 +115,7 @@
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd hh:mm:ss"
:picker-options="pickerOptions"
>
</el-date-picker>
</el-form-item>
......@@ -128,6 +129,7 @@
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd hh:mm:ss"
:picker-options="pickerOptions"
>
</el-date-picker>
</el-form-item>
......@@ -149,6 +151,11 @@ import {
export default {
data() {
return {
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
}
},
ruleForm: {
batchYear: "",
batchName: "",
......@@ -420,6 +427,8 @@ export default {
}
/deep/ .el-dialog {
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 {
......@@ -573,7 +582,7 @@ export default {
.fromItem {
text-align: center;
width: 51%;
// width: 51%;
margin: 0 auto;
margin-bottom: 20px;
.el-input {
......
src/views/assessChecks/auxiliarySelection.vue
......@@ -691,7 +691,7 @@ export default {
this.tableData = res.data.records;
this.tableData.forEach((item) => {
if (item.postEvalState == "" || item.postEvalState == null) {
this.$set(item, "postEvalStateText", "未下发");
} else if (item.postEvalState == "0") {
this.$set(item, "postEvalStateText", "未下发");
} else if (item.postEvalState == "2") {
......
src/views/assessChecks/checkComplianceXF.vue
......@@ -53,6 +53,7 @@
placeholder="选择日期"
value-format="yyyy-MM-dd hh:mm:ss"
:disabled="fromType"
:picker-options="pickerOptions"
>
</el-date-picker>
</el-form-item>
......@@ -67,6 +68,7 @@
placeholder="选择日期"
value-format="yyyy-MM-dd hh:mm:ss"
:disabled="fromType"
:picker-options="pickerOptions"
>
</el-date-picker>
</el-form-item>
......@@ -87,6 +89,11 @@ import {
export default {
data() {
return {
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
}
},
tableData: [],
mergingRows: [],
mergingPos: 0,
......
src/views/assessChecks/confirmRelease.vue
......@@ -64,7 +64,7 @@
</el-table-column>
<el-table-column prop="expertName" label="评审专家" width="auto">
</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 prop="batchName" label="评估项目" width="auto">
</el-table-column>
......@@ -566,13 +566,12 @@ export default {
if (res.code == "200") {
this.tableData = res.data.records;
this.tableData.forEach(item=>{
if (item.postEvalState==''||item.postEvalState==null){
}else if (item.postEvalState=='3'){
this.$set( item,'postEvalState','已确认')
if (item.postEvalState=='3'){
this.$set( item,'postEvalStateText','已确认')
}else if(item.postEvalState=='4'){
this.$set( item,'postEvalState','已撤回')
this.$set( item,'postEvalStateText','已撤回')
}else{
this.$set( item,'postEvalState','未确认')
this.$set( item,'postEvalStateText','未确认')
}
})
this.total = res.data.total * 1;
......@@ -616,7 +615,7 @@ export default {
this.$message("请选择");
return;
}
if(this.checkedList[0].postEvalState=='已确认'){
if(this.checkedList[0].postEvalStateText=='已确认'){
this.$message("该项目已确认");
return;
}
......@@ -788,15 +787,18 @@ export default {
},
//点击撤回
async withdraw(){
//只能选择已下发未确认的 这块需要加一下
if (this.checkedList.length != 1) {
this.$message("请选择");
return;
}
if(this.checkedList[0].postEvalState=='已撤回'){
if(this.checkedList[0].postEvalStateText=='已撤回'){
this.$message("该项目已撤回");
return;
}
if(this.checkedList[0].postEvalStateText=='未确认'){
this.$message("该项目还未确认");
return;
}
let res= await chProjectInfo({batchId:this.checkedList[0].batchId})
if(res.code='200'){
this.resetForm()
......
src/views/assessChecks/correctiveAssistanceVerification.vue
......@@ -68,10 +68,10 @@
<i class="el-icon-chat-dot-square"></i
>&nbsp;&nbsp;&nbsp;整改复核</el-button
>
<el-button @click="submmitRectificationReview('ruleForm')">
<!-- <el-button @click="submmitRectificationReview('ruleForm')">
<i class="el-icon-document-remove"></i
>&nbsp;&nbsp;&nbsp;提交整改复核</el-button
>
> -->
</el-form-item>
</el-form>
<div class="setscroll">
......@@ -217,14 +217,19 @@
</template>
</el-table-column>
<el-table-column label="解释批注" width="200">
<template slot-scope="scope" v-if="scope.row.confirmStatus=='1'">
<el-input v-model="scope.row.feedback"></el-input>
<template slot-scope="scope" v-if="scope.row.confirmStatus=='1'" >
<el-input v-model="scope.row.feedback" disabled></el-input>
</template>
</el-table-column>
<el-table-column label="附加解释材料" prop="fileId" width="400">
<template slot-scope="scope" v-if="scope.row.confirmStatus=='1'">
<!-- <template slot-scope="scope" v-if="scope.row.confirmStatus=='1'">
<input type="file" @change="handleFileUpload($event,scope.row, 'fileId')" />
</template>
</template> -->
<template slot-scope="scope" v-if="scope.row.confirmStatus == '1'&&scope.row.fileId">
{{
scope.row.fileName
}} <el-button @click="handleClickXZ(scope.row.fileId,scope.row.fileName)">下载</el-button>
</template>
</el-table-column>
<el-table-column
label="复核情况"
......@@ -250,14 +255,24 @@
prop="zgFileId"
width="400"
>
<template slot-scope="scope" v-if="scope.row.confirmStatus=='1'">
<template slot-scope="scope" v-if="scope.row.confirmStatus == '1'&&scope.row.zgFileId">
{{
scope.row.zgFileName
}} <el-button @click="handleClickXZ(scope.row.zgFileId,scope.row.zgFileName)">下载</el-button>
</template>
<!-- <template slot-scope="scope" v-if="scope.row.confirmStatus=='1'">
<input type="file" @change="handleFileUpload($event,scope.row, 'zgFileId')" />
</template>
</template> -->
</el-table-column>
<el-table-column label="情况说明" prop="zgqkFileId" width="400">
<template slot-scope="scope" v-if="scope.row.confirmStatus=='1'">
<!-- <template slot-scope="scope" v-if="scope.row.confirmStatus=='1'">
<input type="file" @change="handleFileUpload($event,scope.row, 'zgqkFileId')" />
</template>
</template> -->
<template slot-scope="scope" v-if="scope.row.confirmStatus == '1'&&scope.row.zgqkFileId">
{{
scope.row.zgqkFileName
}} <el-button @click="handleClickXZ(scope.row.zgqkFileId,scope.row.zgqkFileName)">下载</el-button>
</template>
</el-table-column>
<el-table-column
label="整改复核"
......@@ -281,11 +296,11 @@
</div>
</div>
<p class="midBtn">
<span @click="cancelSS()">取消</span><span @click="saveSS()">保存</span>
<span @click="cancelSS()">取消</span><span @click="saveSS()">保存</span><span @click="save()">提交</span>
</p>
</el-dialog>
<!-- 复核下发 -->
<el-dialog
<!-- <el-dialog
title="复核情况"
:visible.sync="dialogSS"
width="79%"
......@@ -406,7 +421,7 @@
<p class="midBtn">
<span @click="cancel()">取消</span><span @click="save()">提交</span>
</p>
</el-dialog>
</el-dialog> -->
</div>
</template>
......@@ -629,7 +644,7 @@ export default {
async save() {
let res = await tjrectificationVerification(this.tableDataSS);
if (res.code == "200") {
this.dialogSS = false;
this.dialogQR = false;
this.resetForm();
} else {
this.$message("整改复核提交失败");
......@@ -642,6 +657,7 @@ export default {
let res = await bcrectificationVerification(this.tableDataQR);
if (res.code == "200") {
this.dialogQR = false;
// this.$message('保存成功')
this.resetForm();
}
},
......@@ -723,15 +739,15 @@ export default {
console.log("关闭");
this.handleSelectionChange();
},
async handleClickXZ(scope) {
console.log(scope.fileId);
async handleClickXZ(fileId,fileName) {
console.log(fileId);
let response = await downloadObject({
fileId: scope.fileId * 1,
fileId: fileId * 1,
});
let blob = new Blob([response]);
if ("download" in document.createElement("a")) {
let elink = document.createElement("a");
elink.download = scope.fileName;
elink.download = fileName;
elink.style.display = "none";
elink.href = URL.createObjectURL(blob);
document.body.appendChild(elink);
......@@ -743,7 +759,7 @@ export default {
},
};
</script>
<style scoped lang="scss">
<style scoped lang="scss">
.main {
font-size: 14px;
position: relative;
......@@ -939,8 +955,8 @@ export default {
}
}
.midBtn {
margin: 0 auto;
margin-top: 20px;
margin: 20px auto;
// margin-top: 20px;
span {
display: inline-block;
width: 80px;
......@@ -950,15 +966,20 @@ export default {
margin-right: 10px;
border-radius: 5px;
box-sizing: border-box;
}
span:first-of-type {
border: 1px solid grey;
}
span:last-of-type {
background-color: #4ca6a7;
color: #fff;
border: 1px solid #4ca6a7;
}
span:first-of-type {
border: 1px solid grey;
background-color: #fff;
color: grey;
}
// span:last-of-type {
// background-color: #4ca6a7;
// color: #fff;
// border: 1px solid #4ca6a7;
// }
}
.setTable {
height: 500px;
......
src/views/assessChecks/materialAcquisition.vue
......@@ -129,7 +129,7 @@
></el-input>
</el-form-item>
<el-form-item label="后评估专家:" prop="expertName" class="fromItem">
<el-input v-model="ruleFormdialog.fullName" disabled></el-input>
<el-input v-model="ruleFormdialog.expertName" disabled></el-input>
</el-form-item>
<el-form-item label="工作组织情况:" class="textarea">
<el-input
......@@ -141,6 +141,7 @@
</el-form>
<p class="xqtitle"><span></span>本项目材料清单</p>
<div class="setscrolldialog">
<el-table
@selection-change="handleSelectionChange"
:data="tableDataQD"
......@@ -156,13 +157,14 @@
<el-table-column label="材料类别" prop="batchtype"> </el-table-column>
<el-table-column prop="typeText" label="资料类型"> </el-table-column>
<el-table-column prop="fileName" label="资料名称"> </el-table-column>
<el-table-column prop="fileName" label="资料名称" show-overflow-tooltip> </el-table-column>
<el-table-column prop="projectCategory" label="操作">
<template slot-scope="scope">
<input type="file" @change="handleFileUpload($event,scope.row)" />
</template>
</el-table-column>
</el-table>
</div>
<p class="Btn">
<span @click="cancel()">取消</span
><span @click="save()">确认上传</span>
......@@ -202,7 +204,7 @@
></el-input>
</el-form-item>
<el-form-item label="后评估专家:" prop="expertName" class="fromItem">
<el-input v-model="ruleFormdialog.fullName" disabled></el-input>
<el-input v-model="ruleFormdialog.expertName" disabled></el-input>
</el-form-item>
<el-form-item label="工作组织情况:" class="textarea">
<el-input
......@@ -214,6 +216,7 @@
</el-form>
<p class="xqtitle"><span></span>本项目材料清单</p>
<div class="setscrolldialog">
<el-table
@selection-change="handleSelectionChange"
:data="tableDataQD"
......@@ -229,7 +232,7 @@
<el-table-column label="材料类别" prop="batchtype"> </el-table-column>
<el-table-column prop="typeText" label="资料类型"> </el-table-column>
<el-table-column prop="fileName" label="资料名称">
<el-table-column prop="fileName" label="资料名称" >
<template slot-scope="scope" v-if="scope.row.fileName">
{{scope.row.fileName}}&nbsp;&nbsp;<el-button @click="handleClickXZ(scope.row)">下载</el-button>
</template>
......@@ -237,6 +240,7 @@
</el-table-column>
</el-table>
</div>
</div>
</el-dialog>
</div>
</template>
......@@ -270,25 +274,7 @@ export default {
fullName: "",
},
tableData: [],
// tableDataQD: [
// { batchtype: "开发、实施类", typeText: "技术规范书", typeCode: "0" },
// {
// batchtype: "开发、实施类",
// typeText: "可行性研究报告",
// typeCode: "1",
// },
// {
// batchtype: "开发、实施类",
// typeText: "需求规格说明书",
// typeCode: "2",
// },
// {
// batchtype: "开发、实施类",
// typeText: "概要设计说明书",
// typeCode: "3",
// },
// { batchtype: "开发、实施类", typeText: "安全防护方案", typeCode: "4" },
// ], //清单列表
// tableDataNew: [
// { batchtype: "开发、实施类", typeText: "技术规范书", typeCode: "0" },
// {
......@@ -719,7 +705,7 @@ width: 100%;
}
.setscrolldialog {
width: 100%;
height: 300px;
height: 290px;
overflow: auto;
box-sizing: border-box;
/deep/ .el-table {
......
src/views/managementResult/releaseResult/publicity.vue 0 → 100644
<!-- 结果公示 -->
\ 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!