Skip to content

Administrator / project_progress

Go to a project
Commit 024ad798 by liangzhen
Options

自查流程调整

1 parent a0a9c416
Inline Side-by-side
Showing with 218 additions and 123 deletions
src/utils/leftBarRules.js
......@@ -354,8 +354,8 @@ export function trendsRules(type) {
children: [
{ name: "后评估检查报告维护", url: "/managementResult/maintenancePg", children: [] },
{ name: "后评估报告模板管理", url: "/managementResult/managementPg", children: [] },
{ name: "合规性检查报告维护", url: "/managementResult/maintenanceHg", children: [] },
{ name: "合规性检查报告模板管理", url: "/managementResult/managementHg", children: [] },
// { name: "合规性检查报告维护", url: "/managementResult/maintenanceHg", children: [] },
// { name: "合规性检查报告模板管理", url: "/managementResult/managementHg", children: [] },
],
},
......
src/views/assessChecks/mianHome.vue
......@@ -22,7 +22,7 @@
<h3>后评估项目</h3>
<ul>
<li>项目总数量: <span>{{ info.proCount }}</span> 个 </li>
<li>未上传材料:<span>{{ info.proNscCount }}</span> 个</li>
<!-- <li>未上传材料:<span>{{ info.proNscCount }}</span> 个</li> -->
<li>待评估:<span>{{ info.proDpgCount }}</span> 个</li>
<li>需整改:<span>{{ info.proXzgCount }}</span> 个</li>
<li>己整改:<span>{{ info.proYzgCount }}</span> 个</li>
......@@ -159,7 +159,7 @@ export default {
.xm {
position: absolute;
width: 400px;
height:230px;
height:200px;
background-image: linear-gradient(
to right,
rgb(220, 250, 250),
......
src/views/assessZC/auxiliaryInspection.vue
......@@ -199,7 +199,7 @@
<el-dialog
title="复核情况"
:visible.sync="dialogQR"
width="79%"
width="91%"
:modal-append-to-body="false"
:append-to-body="false"
@close="closed"
......@@ -224,10 +224,10 @@
<el-table-column
label="项目环节"
prop="projectStagetext"
width="150"
width="120"
>
</el-table-column>
<el-table-column label="序号" width="100" type="index">
<el-table-column label="序号" width="50" type="index">
</el-table-column>
<el-table-column
......@@ -243,9 +243,9 @@
show-overflow-tooltip
>
</el-table-column>
<el-table-column label="评估问题" prop="evalQues" width="300">
<el-table-column label="评估问题" prop="evalQues" width="auto">
</el-table-column>
<el-table-column label="问题确认" width="auto">
<el-table-column label="问题响应" width="100">
<template slot-scope="scope">
<el-switch
v-model="scope.row.confirmStatus"
......@@ -275,7 +275,17 @@
<el-input v-model="scope.row.feedback" disabled></el-input>
</template>
</el-table-column>
<el-table-column label="附加解释材料" prop="fileId" width="400">
<el-table-column label="整改材料下载" width="200">
<template
slot-scope="scope"
>
<router-link :to="{path:'/assesszc/projectView',query:{projectId:scope.row.projectId}}">
<el-button type="text" size="small">下载材料</el-button>
</router-link>
</template>
</el-table-column>
<el-table-column label="附加解释材料" prop="fileId" width="300">
<template
slot-scope="scope"
v-if="scope.row.confirmStatus == '1' && scope.row.fileId"
......@@ -286,11 +296,6 @@
@click="handleClickXZ(scope.row.fileId, scope.row.fileName)"
>{{ scope.row.fileName }}</el-tag
>
<!-- {{ scope.row.fileName }}
<el-button
@click="handleClickXZ(scope.row.fileId, scope.row.fileName)"
>下载</el-button
> -->
</template>
</el-table-column>
<!-- <el-table-column
......@@ -315,7 +320,7 @@
</el-select>
</template>
</el-table-column> -->
<el-table-column
<!-- <el-table-column
label="整改材料"
width="600"
show-overflow-tooltip
......@@ -334,44 +339,23 @@
><span>{{ item.values }}</span>
</p>
<el-button
size="small"
type="primary"
class="btn-search btnTop"
@click="downloadObjectStr(item)"
v-if="
scope.row.prob.indexOf(scope.row.projectStage) !=
-1
"
>下载</el-button
>
size="small"
type="primary"
class="btn-search btnTop"
@click="downloadObjectStr(item)"
v-if="
scope.row.prob.indexOf(scope.row.projectStage) != -1
"
>下载</el-button
>
</div>
</el-tooltip>
</div>
</template>
</el-table-column>
<el-table-column label="情况说明" prop="zgqkFileId" width="400">
<template slot-scope="scope" v-if="scope.row.zgqkFileId">
<el-tag
v-if="scope.row.zgqkFileName"
size="small"
@click="
handleClickXZ(
scope.row.zgqkFileId,
scope.row.zgqkFileName
)
"
>{{ scope.row.zgqkFileName }}</el-tag
>
<!-- {{ scope.row.zgqkFileName }}
<el-button
@click="
handleClickXZ(
scope.row.zgqkFileId,
scope.row.zgqkFileName
)
"
>下载</el-button
> -->
</el-table-column> -->
<el-table-column label="复核情况说明" prop="zgqkFileId" width="200">
<template slot-scope="scope" >
<el-input v-model="scope.row.zgqkFileId" ></el-input>
</template>
</el-table-column>
<el-table-column
......@@ -384,7 +368,7 @@
v-model="scope.row.rectificationStatus"
placeholder="请选择"
>
<el-option label="请选择" value=""></el-option>
<!-- <el-option label="请选择" value=""></el-option> -->
<el-option label="问题未整改" :value="0"></el-option>
<el-option label="整改不合格" :value="1"></el-option>
<el-option label="整改完成" :value="2"></el-option>
......@@ -642,7 +626,7 @@ export default {
this.handleSelectionChange();
},
arraySpanMethod({ row, column, rowIndex, columnIndex }) {
if (columnIndex === 0 || columnIndex === 8) {
if (columnIndex === 0) {
//第一列
const _row = this.mergingRows[rowIndex];
const _col = _row > 0 ? 1 : 0;
......@@ -671,7 +655,19 @@ export default {
}
},
async savetj() {
this.$confirm(
this.tableDataQR.forEach(item=>{
console.log(item.rectificationStatus,'item.rectificationStatus')
if(!item.rectificationStatus&&item.rectificationStatus!==0){
this.$message({
message: '请完成所有整改复核后在进行提交',
type: 'warning'
});
throw new Error()
}
})
const isallwc = this.tableDataQR.every(element => element.rectificationStatus==2);
if(isallwc){
this.$confirm(
"若所有整改复核状态均为整改完成即为完成归档, 是否继续?",
"提示",
{
......@@ -689,6 +685,21 @@ export default {
this.$message("提交失败");
}
});
}else{
let res = await tjrectificationVerification(this.tableDataQR);
if (res.code == "200") {
this.dialogQR = false;
this.$message("提交成功");
this.resetForm();
} else {
this.$message("提交失败");
}
}
},
async submitForm() {
let params = {
......@@ -1164,8 +1175,8 @@ h3 {
.eltable {
box-sizing: border-box;
text-align: center;
width: 190%;
min-width: 190%;
width: 100%;
min-width: 100%;
}
/deep/.el-table__fixed-body-wrapper .el-table__body {
padding-bottom: 6px; // 6px为横向滚动条高度
......@@ -1206,7 +1217,7 @@ h3 {
text-overflow: ellipsis;
}
}
.btn-search{
.btn-search {
vertical-align: top;
}
::v-deep.el-table::before {
......
src/views/assessZC/checkCompliance.vue
......@@ -616,10 +616,25 @@ docxOptions: {
});
evals = evals.slice(0, -1);
item.evalQues = evals;
if(item.evalList.length>=1&&item.evalList[0].evalQues){
item.isProblem=1
}
});
this.questionList.forEach((item) => {
if(!item.evalQues&&item.isProblem!=0){
console.log(item.evalQues,item.isProblem,'2222')
this.$message({
message: '请完成录入全部问题或选择未发现问题',
type: 'warning'
});
throw new Error()
}
});
console.log(this.questionList, "questionList");
// return
let params = {
list: this.questionList,
...this.clqparams,
......
src/views/assessZC/checkComplianceFZ.vue
......@@ -26,16 +26,15 @@
<el-table-column label="问题检查项" prop="quesCheckItem" width="auto">
</el-table-column>
<el-table-column
label="检查说明"
prop="checkDesc"
show-overflow-tooltip
width="auto"
label="是否有问题"
prop="isProblem"
width="100"
>
<template slot-scope="scope"> {{ scope.row.isProblem|isProblemFilter }} </template>
</el-table-column>
<el-table-column label="评估问题" width="auto" prop="evalQues" >
<!-- <template slot-scope="scope">
<el-input v-model="scope.row.evalQues" :disabled="ishow"></el-input>
</template> -->
</el-table-column>
<el-table-column label="问题截图" width="auto">
<template slot-scope="scope">
......@@ -49,6 +48,13 @@
></el-image>
</template>
</el-table-column>
<el-table-column
label="检查说明"
prop="checkDesc"
show-overflow-tooltip
width="auto"
>
</el-table-column>
</el-table>
</div>
<p class="Btn" v-if="!ishow">
......@@ -77,6 +83,15 @@ export default {
projectName:""
};
},
filters: {
isProblemFilter(val) {
if (val == 1) {
return "是";
} else {
return "否";
}
},
},
mounted() {
this.clqparams = JSON.parse(this.$route.query.clqparams);
......@@ -306,7 +321,7 @@ export default {
}
/deep/ .el-table .warning-row {
background: #f0ffff;
color: #2785e6;
// color: #2785e6;
}
.eltable {
......
src/views/assessZC/confirmRelease.vue
......@@ -325,7 +325,7 @@
<p class="zjBtn">
待评估项目 <span @click="xzExperts()">手动选择待评估项目</span>
</p>
<div class="setscrolldialog">
<div class="setscrolldialogxz">
<el-table
@selection-change="handleSelectionChange"
:data="
......@@ -650,15 +650,15 @@ export default {
dialogAddzj: false,
pageSize: 10,
current: 1,
pageSizeZJ: 5,
pageSizeXQ: 5,
pageSizeZJ: 10,
pageSizeXQ:10,
currentPageXQ: 1,
currentZJ: 1,
addtotal: 0,
currentAdd: 1,
pageSizeAdd: 5,
pageSizeAdd: 10,
currentedit: 1,
pageSizeedit: 5,
pageSizeedit:10,
xfParam: "",
dialogedit: false,
expertIdList: [],
......@@ -1294,7 +1294,25 @@ export default {
}
.setscrolldialog {
// width: 100%;
height: 300px;
height: 400px;
overflow-y: auto;
overflow-x: scroll;
position: relative;
overflow: auto;
.eltable {
box-sizing: border-box;
text-align: center;
width: 190%;
min-width: 190%;
}
/deep/.el-table--scrollable-x .el-table__body-wrapper {
overflow-x: hidden !important;
}
}
.setscrolldialogxz {
// width: 100%;
height: 350px;
overflow-y: auto;
overflow-x: scroll;
position: relative;
......@@ -1305,6 +1323,7 @@ export default {
width: 190%;
min-width: 190%;
}
/deep/.el-table--scrollable-x .el-table__body-wrapper {
overflow-x: hidden !important;
}
......@@ -1323,7 +1342,7 @@ export default {
// }
// }
.setscrolldialogx {
height: 300px;
height: 430px;
overflow-y: auto;
overflow-x: scroll;
position: relative;
......
src/views/assessZC/materialAcquisition.vue
......@@ -277,7 +277,7 @@
<el-dialog
title="问题整改"
:visible.sync="dialogQR"
width="79%"
width="91%"
:modal-append-to-body="false"
:append-to-body="false"
@close="closed"
......@@ -304,10 +304,10 @@
<el-table-column
label="项目环节"
prop="projectStagetext"
width="150"
width="110"
>
</el-table-column>
<el-table-column label="序号" width="100" type="index">
<el-table-column label="序号" width="50" type="index">
</el-table-column>
<el-table-column
......@@ -316,19 +316,15 @@
width="200"
>
</el-table-column>
<el-table-column
label="检查说明"
prop="checkDesc"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
label="评估问题"
prop="evalQues"
show-overflow-tooltip
>
</el-table-column>
<el-table-column label="问题确认" width="auto">
<el-table-column label="问题响应" width="100">
<template slot-scope="scope">
<el-switch
v-if="scope.row.evalQues"
......@@ -350,6 +346,17 @@
</el-switch>
</template>
</el-table-column>
<el-table-column
label="上传档案材料"
prop="dacl"
width="120"
>
<template slot-scope="scope">
<router-link :to="{path:'/assesszc/projectView',query:{projectId:scope.row.projectId}}">
<el-button type="text" size="small">上传材料</el-button>
</router-link>
</template>
</el-table-column>
<el-table-column label="解释批注">
<template slot-scope="scope">
<el-input
......@@ -358,7 +365,7 @@
></el-input>
</template>
</el-table-column>
<el-table-column label="附加解释材料" prop="fileId" width="auto">
<el-table-column label="附加其他情况说明" prop="fileId" width="300">
<template
slot-scope="scope"
v-if="scope.row.evalQues && scope.row.confirmStatus == '1'"
......@@ -369,8 +376,35 @@
/>
</template>
</el-table-column>
<el-table-column
label="检查说明"
prop="checkDesc"
show-overflow-tooltip
>
</el-table-column>
<el-table-column label="复核情况说明" prop="zgqkFileId" width="auto" >
</el-table-column>
<el-table-column
label="整改复核状态"
prop="checkDesc"
>
<template slot-scope="scope" >
<el-select
v-model="scope.row.rectificationStatus"
placeholder="请选择"
disabled
>
<el-option label="待复核" :value="null"></el-option>
<el-option label="问题未整改" :value="0"></el-option>
<el-option label="整改不合格" :value="1"></el-option>
<el-option label="整改完成" :value="2"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="材料整改" prop="filed" width="600">
<!-- <el-table-column label="材料整改" prop="filed" width="600">
<template slot-scope="scope" v-if="scope.row.filed">
<div v-for="(item, index) in scope.row.filed" :key="index">
<el-tooltip
......@@ -411,8 +445,8 @@
</el-tooltip>
</div>
</template>
</el-table-column>
</el-table-column> -->
<!--
<el-table-column label="情况说明" prop="zgqkFileId" width="400">
<template slot-scope="scope" v-if="scope.row.evalQues">
<input
......@@ -422,7 +456,7 @@
"
/>
</template>
</el-table-column>
</el-table-column> -->
</el-table>
</div>
</div>
......@@ -559,7 +593,7 @@ export default {
contractNumber: this.checkedList[0].contractNumber,
prjId: this.checkedList[0].projectCode,
};
let resMat = await MaterialWarehous(paramsMat);
// let resMat = await MaterialWarehous(paramsMat);
this.tableDataQR = res.data.records;
let arr=[]
this.tableDataQR.forEach((item) => {
......@@ -571,51 +605,51 @@ export default {
}
switch (item.projectStage) {
case "1":
this.$set(
item,
"filed",
this.filtersTable(1, resMat.data.records)
);
// this.$set(
// item,
// "filed",
// this.filtersTable(1, resMat.data.records)
// );
this.$set(item, "projectStagetext", "1.可研");
break;
case "2":
this.$set(
item,
"filed",
this.filtersTable(2, resMat.data.records)
);
// this.$set(
// item,
// "filed",
// this.filtersTable(2, resMat.data.records)
// );
this.$set(item, "projectStagetext", "2.计划");
break;
case "3":
this.$set(
item,
"filed",
this.filtersTable(3, resMat.data.records)
);
// this.$set(
// item,
// "filed",
// this.filtersTable(3, resMat.data.records)
// );
this.$set(item, "projectStagetext", "3.采购");
break;
case "4":
this.$set(
item,
"filed",
this.filtersTable(4, resMat.data.records)
);
// this.$set(
// item,
// "filed",
// this.filtersTable(4, resMat.data.records)
// );
this.$set(item, "projectStagetext", "4.合同");
break;
case "5":
this.$set(
item,
"filed",
this.filtersTable(5, resMat.data.records)
);
// this.$set(
// item,
// "filed",
// this.filtersTable(5, resMat.data.records)
// );
this.$set(item, "projectStagetext", "5.执行");
break;
case "6":
this.$set(
item,
"filed",
this.filtersTable(6, resMat.data.records)
);
// this.$set(
// item,
// "filed",
// this.filtersTable(6, resMat.data.records)
// );
this.$set(item, "projectStagetext", "6.结决算及转资");
break;
}
......@@ -740,7 +774,7 @@ export default {
this.dialogQR = false;
},
arraySpanMethod({ row, column, rowIndex, columnIndex }) {
if (columnIndex === 0 || columnIndex === 8) {
if (columnIndex === 0 ) {
//第一列
const _row = this.mergingRows[rowIndex];
const _col = _row > 0 ? 1 : 0;
......@@ -1340,8 +1374,8 @@ h3 {
.eltable {
box-sizing: border-box;
text-align: center;
width: 250%;
min-width: 250%;
width: 100%;
// min-width: 150%;
}
/deep/.el-table--scrollable-x .el-table__body-wrapper {
overflow-x: hidden !important;
......
src/views/assessZC/projectView.vue
......@@ -465,6 +465,7 @@ export default {
},
},
mounted() {
this.ruleForm.projectCode = this.$route.query.projectId;
this.submitForm();
this.processenv = process.env.VUE_APP_BASE_URL;
},
......
src/views/layout/index.vue
<template>
<div class="mian">
<div class="head-container">
<!-- <div class="head-container">
<div class="logo" style="z-index: 10">
<div class="logo-inner">
<img src="../../assets/logo.png" alt="" />
......@@ -46,7 +46,7 @@
</div>
</div>
</div>
</div>
</div> -->
<router-view></router-view>
<!-- <MainLayout class="continer">
<router-view></router-view>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!