Skip to content

Administrator / project_progress

Go to a project
Commit 1bacad2a by liangzhen
Options

整改辅助核验

1 parent 1191e62e
Inline Side-by-side
Showing with 1208 additions and 545 deletions
src/api/index.js
...@@ -222,6 +222,26 @@ export function wtzgProblemRectification(params) { ...@@ -222,6 +222,26 @@ export function wtzgProblemRectification(params) {
export function wtzgxfProblemRectification(params) { export function wtzgxfProblemRectification(params) {
return post(`/api/ProblemRectification/wtzgxf`, params) return post(`/api/ProblemRectification/wtzgxf`, params)
} }
//整改辅助核验
//分页
export function rectificationVerification(params) {
return post(`/api/rectificationVerification/`, params)
}
//问题清单查询
export function wtssSelectificationVerification(params) {
return post(`/api/rectificationVerification/wtssSel`, params)
}
//保存
export function bcrectificationVerification(params) {
return post(`/api/rectificationVerification/zgfhbc`, params)
}
//提交
export function tjrectificationVerification(params) {
return post(`/api/rectificationVerification/wtfhtj`, params)
}
//材料同步归档 //材料同步归档
//列表 //列表
export function materialSync(params) { export function materialSync(params) {
......
src/views/assessChecks/assistedConfirm.vue
...@@ -151,13 +151,13 @@ ...@@ -151,13 +151,13 @@
<el-input v-model="scope.row.feedback"></el-input> <el-input v-model="scope.row.feedback"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="附加解释材料" prop="zgFileId" width="400"> <el-table-column label="附加解释材料" prop="fileId" width="400">
<template slot-scope="scope"> <template slot-scope="scope">
<input type="file" @change="handleFileUpload"> <input type="file" @change="handleFileUpload">
<button @click="submitFile(scope.row)">上传</button> <button @click="submitFile(scope.row)">上传</button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="复核情况" prop="zgFileId"> <el-table-column label="复核情况" prop="rectificationStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.appealStatus" placeholder="请选择"> <el-select v-model="scope.row.appealStatus" placeholder="请选择">
<el-option label="请选择" value=""></el-option> <el-option label="请选择" value=""></el-option>
...@@ -242,13 +242,13 @@ ...@@ -242,13 +242,13 @@
<el-input v-model="scope.row.feedback"></el-input> <el-input v-model="scope.row.feedback"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="附加解释材料" prop="zgFileId" width="400"> <el-table-column label="附加解释材料" prop="fileId" width="400">
<template slot-scope="scope"> <template slot-scope="scope">
<input type="file" @change="handleFileUpload"> <input type="file" @change="handleFileUpload">
<button @click="submitFile(scope.row)">上传</button> <button @click="submitFile(scope.row)">上传</button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="复核情况" prop="zgFileId"> <el-table-column label="复核情况" prop="rectificationStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.appealStatus" placeholder="请选择"> <el-select v-model="scope.row.appealStatus" placeholder="请选择">
<el-option label="请选择" :value="null"></el-option> <el-option label="请选择" :value="null"></el-option>
...@@ -534,22 +534,22 @@ ...@@ -534,22 +534,22 @@
this.tableDataSS.forEach((item) => { this.tableDataSS.forEach((item) => {
this.$set(item, "confirmStatus", "2") this.$set(item, "confirmStatus", "2")
switch (item.projectStage) { switch (item.projectStage) {
case 1: case "1":
this.$set(item, "projectStagetext", "1.可研"); this.$set(item, "projectStagetext", "1.可研");
break; break;
case 2: case "2":
this.$set(item, "projectStagetext", "2.计划"); this.$set(item, "projectStagetext", "2.计划");
break; break;
case 3: case "3":
this.$set(item, "projectStagetext", "3.采购"); this.$set(item, "projectStagetext", "3.采购");
break; break;
case 4: case "4":
this.$set(item, "projectStagetext", "4.合同"); this.$set(item, "projectStagetext", "4.合同");
break; break;
case 5: case "5":
this.$set(item, "projectStagetext", "5.执行"); this.$set(item, "projectStagetext", "5.执行");
break; break;
case 6: case "6":
this.$set(item, "projectStagetext", "6.结决算及转资"); this.$set(item, "projectStagetext", "6.结决算及转资");
break; break;
} }
...@@ -655,7 +655,7 @@ ...@@ -655,7 +655,7 @@
text-align: center; text-align: center;
width: 150%; width: 150%;
min-width: 150%; min-width: 150%;
margin-right: 210px; // margin-right: 210px;
// margin-top: 3vh; // margin-top: 3vh;
} }
/deep/ .el-table .warning-row { /deep/ .el-table .warning-row {
...@@ -669,6 +669,7 @@ ...@@ -669,6 +669,7 @@
/deep/ .el-dialog { /deep/ .el-dialog {
border-radius: 10px; border-radius: 10px;
margin-top: 3vh !important; margin-top: 3vh !important;
margin-left: 3vw !important;
} }
/deep/.el-table th.el-table__cell.is-leaf, /deep/.el-table th.el-table__cell.is-leaf,
...@@ -921,11 +922,11 @@ ...@@ -921,11 +922,11 @@
line-height: 30px; line-height: 30px;
} }
/deep/ .el-dialog__body{ /deep/ .el-dialog__body{
padding-bottom: 15px; padding-bottom: 5px;
} }
.setscroll{ .setscroll{
width: 100%; width: 100%;
height: 600px; height: 650px;
overflow: auto; overflow: auto;
} }
.dialog{ .dialog{
......
src/views/assessChecks/assistedFeedback.vue
...@@ -219,7 +219,7 @@ ...@@ -219,7 +219,7 @@
<el-input v-model="scope.row.feedback"></el-input> <el-input v-model="scope.row.feedback"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="附加解释材料" prop="zgFileId"> <el-table-column label="附加解释材料" prop="fileId">
<template slot-scope="scope"> <template slot-scope="scope">
<input type="file" @change="handleFileUpload"> <input type="file" @change="handleFileUpload">
<button @click="submitFile(scope.row)">上传</button> <button @click="submitFile(scope.row)">上传</button>
......
src/views/assessChecks/assistedRect.vue
<template> <template>
<div class="main"> <div class="main">
<el-form :model="ruleForm" label-width="100px" class="demo-ruleForm" ref="formName"> <el-form
:model="ruleForm"
label-width="100px"
class="demo-ruleForm"
ref="formName"
>
<el-form-item label="批次年度:" prop="batchYear" class="fromItem"> <el-form-item label="批次年度:" prop="batchYear" class="fromItem">
<el-select v-model="ruleForm.batchYear" placeholder="请选择"> <el-select v-model="ruleForm.batchYear" placeholder="请选择">
<el-option label="2024年" value="2024"></el-option> <el-option label="2024年" value="2024"></el-option>
...@@ -48,7 +53,8 @@ ...@@ -48,7 +53,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="后评估批次名称">
...@@ -69,7 +75,8 @@ ...@@ -69,7 +75,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="rectificationDeadline" label="问题整改截止时间"> <el-table-column prop="rectificationDeadline" label="问题整改截止时间">
</el-table-column> </el-table-column>
<el-table-column prop="postEvalState" label="问题整改状态"> </el-table-column> <el-table-column prop="postEvalState" label="问题整改状态">
</el-table-column>
<!-- <el-table-column prop="reviewStatus" label="后评估状态"> </el-table-column> --> <!-- <el-table-column prop="reviewStatus" 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>
...@@ -85,9 +92,9 @@ ...@@ -85,9 +92,9 @@
class="elpagination" class="elpagination"
> >
</el-pagination> </el-pagination>
<!-- 问题复核 --> <!-- 问题整改 -->
<el-dialog <el-dialog
title="问题确认" title="复核情况"
:visible.sync="dialogQR" :visible.sync="dialogQR"
width="79%" width="79%"
:modal-append-to-body="false" :modal-append-to-body="false"
...@@ -100,6 +107,7 @@ ...@@ -100,6 +107,7 @@
</h3> </h3>
<div class="continer"> <div class="continer">
<p class="xqtitle"><span></span>问题清单</p> <p class="xqtitle"><span></span>问题清单</p>
<div class="setTable">
<el-table <el-table
:data="tableDataQR" :data="tableDataQR"
tooltip-effect="dark" tooltip-effect="dark"
...@@ -119,11 +127,11 @@ ...@@ -119,11 +127,11 @@
<el-table-column label="序号" width="100" prop="questionId"> <el-table-column label="序号" width="100" prop="questionId">
</el-table-column> </el-table-column>
<el-table-column label="问题检查项" prop="quesCheckItem"> <el-table-column label="问题检查项" prop="quesCheckItem" width="200">
</el-table-column> </el-table-column>
<el-table-column label="检查说明" prop="checkDesc"> <el-table-column label="检查说明" prop="checkDesc" width="300">
</el-table-column> </el-table-column>
<el-table-column label="评估问题" prop="evalQues"> <el-table-column label="评估问题" prop="evalQues" width="300">
</el-table-column> </el-table-column>
<el-table-column label="问题确认" width="auto"> <el-table-column label="问题确认" width="auto">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -146,20 +154,27 @@ ...@@ -146,20 +154,27 @@
</el-switch> </el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="解释批注" > <el-table-column label="解释批注" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.feedback"></el-input> <el-input v-model="scope.row.feedback"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="附加解释材料" prop="zgFileId" width="400"> <el-table-column label="附加解释材料" prop="fileId" width="400">
<template slot-scope="scope"> <template slot-scope="scope">
<input type="file" @change="handleFileUpload"> <input type="file" @change="handleFileUpload" />
<button @click="submitFile(scope.row)">上传</button> <button @click="submitFile(scope.row)">上传</button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="复核情况" prop="zgFileId"> <el-table-column
label="复核情况"
prop="rectificationStatus"
width="200"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.appealStatus" placeholder="请选择"> <el-select
v-model="scope.row.appealStatus"
placeholder="请选择"
>
<el-option label="请选择" value=""></el-option> <el-option label="请选择" value=""></el-option>
<el-option label="未申诉" :value="0"></el-option> <el-option label="未申诉" :value="0"></el-option>
<el-option label="已申诉" :value="1"></el-option> <el-option label="已申诉" :value="1"></el-option>
...@@ -168,13 +183,28 @@ ...@@ -168,13 +183,28 @@
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
label="上传整改材料"
prop="rectificationStatus"
width="400"
>
<template slot-scope="scope">
<input type="file" @change="handleFileUpload" />
<button @click="submitFile(scope.row)">上传</button>
</template>
</el-table-column>
<el-table-column label="情况说明" prop="zgqkFileId" width="400">
<template slot-scope="scope">
<input type="file" @change="handleFileUpload" />
<button @click="submitFile(scope.row)">上传</button>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</div>
</div> </div>
<p class="midBtn"> <p class="midBtn">
<span @click="cancelSS()">取消</span <span @click="cancelSS()">取消</span><span @click="saveSS()">保存</span>
><span @click="saveSS()">保存</span>
</p> </p>
</el-dialog> </el-dialog>
<!-- 复核下发 --> <!-- 复核下发 -->
...@@ -191,6 +221,7 @@ ...@@ -191,6 +221,7 @@
</h3> </h3>
<div class="continer"> <div class="continer">
<p class="xqtitle"><span></span>问题清单</p> <p class="xqtitle"><span></span>问题清单</p>
<div class="setTable">
<el-table <el-table
:data="tableDataSS" :data="tableDataSS"
tooltip-effect="dark" tooltip-effect="dark"
...@@ -210,11 +241,11 @@ ...@@ -210,11 +241,11 @@
<el-table-column label="序号" width="100" prop="questionId"> <el-table-column label="序号" width="100" prop="questionId">
</el-table-column> </el-table-column>
<el-table-column label="问题检查项" prop="quesCheckItem"> <el-table-column label="问题检查项" prop="quesCheckItem" width="200">
</el-table-column> </el-table-column>
<el-table-column label="检查说明" prop="checkDesc"> <el-table-column label="检查说明" prop="checkDesc" width="300">
</el-table-column> </el-table-column>
<el-table-column label="评估问题" prop="evalQues"> <el-table-column label="评估问题" prop="evalQues" width="300">
</el-table-column> </el-table-column>
<el-table-column label="问题确认" width="auto"> <el-table-column label="问题确认" width="auto">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -237,21 +268,28 @@ ...@@ -237,21 +268,28 @@
</el-switch> </el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="解释批注" > <el-table-column label="解释批注" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.feedback"></el-input> <el-input v-model="scope.row.feedback"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="附加解释材料" prop="zgFileId" width="400"> <el-table-column label="附加解释材料" prop="fileId" width="400">
<template slot-scope="scope"> <template slot-scope="scope">
<input type="file" @change="handleFileUpload"> <input type="file" @change="handleFileUpload" />
<button @click="submitFile(scope.row)">上传</button> <button @click="submitFile(scope.row)">上传</button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="复核情况" prop="zgFileId"> <el-table-column
label="复核情况"
prop="rectificationStatus"
width="200"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.appealStatus" placeholder="请选择"> <el-select
<el-option label="请选择" :value="null"></el-option> v-model="scope.row.appealStatus"
placeholder="请选择"
>
<el-option label="请选择" value=""></el-option>
<el-option label="未申诉" :value="0"></el-option> <el-option label="未申诉" :value="0"></el-option>
<el-option label="已申诉" :value="1"></el-option> <el-option label="已申诉" :value="1"></el-option>
<el-option label="申诉驳回" :value="2"></el-option> <el-option label="申诉驳回" :value="2"></el-option>
...@@ -259,53 +297,52 @@ ...@@ -259,53 +297,52 @@
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
label="上传整改材料"
prop="rectificationStatus"
width="400"
>
<template slot-scope="scope">
<input type="file" @change="handleFileUpload" />
<button @click="submitFile(scope.row)">上传</button>
</template>
</el-table-column>
<el-table-column label="情况说明" prop="zgqkFileId" width="400">
<template slot-scope="scope">
<input type="file" @change="handleFileUpload" />
<button @click="submitFile(scope.row)">上传</button>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</div>
</div> </div>
<p class="midBtn"> <p class="midBtn">
<span @click="cancel()">取消</span <span @click="cancel()">取消</span><span @click="save()">提交</span>
><span @click="save()">问题下发</span>
</p> </p>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { ProblemRectification, wtssSelProblemRectification,wtzgProblemRectification,wtzgxfProblemRectification} from "@/api/index"; import {
export default { ProblemRectification,
wtssSelProblemRectification,
wtzgProblemRectification,
wtzgxfProblemRectification,
} from "@/api/index";
export default {
data() { data() {
return { return {
dialogSS:false, dialogSS: false,
ruleForm: { ruleForm: {
batchYear: "", batchYear: "",
batchName: "", batchName: "",
postEvalState: "", postEvalState: "",
}, },
ruleFormdialogBJ: {
appealDeadline: "",
rectificationDeadline: "",
},
rules: {
appealDeadline: [
{
required: true,
message: "请选择问题申诉截止时间",
trigger: "change",
},
],
rectificationDeadline: [
{
required: true,
message: "问题整改截止时间",
trigger: "change",
},
],
},
tableData: [], tableData: [],
tableDataQR: [], tableDataQR: [],
tableDataSS:[], tableDataSS: [],
checkedList: [], checkedList: [],
currentPage: 1, currentPage: 1,
pageSizetjcl: 10, pageSizetjcl: 10,
...@@ -333,10 +370,12 @@ ...@@ -333,10 +370,12 @@
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.reviewStatus >= "5") { if (item.reviewStatus == "6") {
this.$set(item, "postEvalState", "整改未完成");
}else if (item.reviewStatus == "7") {
this.$set(item, "postEvalState", "整改已完成");
}else {
this.$set(item, "postEvalState", "整改提交"); this.$set(item, "postEvalState", "整改提交");
} else {
this.$set(item, "postEvalState", "整改未提交");
} }
}); });
this.total = res.data.total * 1; this.total = res.data.total * 1;
...@@ -350,8 +389,8 @@ ...@@ -350,8 +389,8 @@
}, },
//问题整改 //问题整改
async confirm() { async confirm() {
this.mergingPos=0; this.mergingPos = 0;
this.mergingRows=[] this.mergingRows = [];
if (this.checkedList.length != 1) { if (this.checkedList.length != 1) {
this.$message("请选择一条数据进行整改"); this.$message("请选择一条数据进行整改");
return; return;
...@@ -362,11 +401,10 @@ ...@@ -362,11 +401,10 @@
batchId: this.checkedList[0].batchId, batchId: this.checkedList[0].batchId,
}; };
let res = await wtssSelAssistanceConfirmatio(params); let res = await wtssSelProblemRectification(params);
if (res.code == "200") { if (res.code == "200") {
this.tableDataQR = res.data.records; this.tableDataQR = res.data.records;
this.tableDataQR.forEach((item) => { this.tableDataQR.forEach((item) => {
switch (item.projectStage) { switch (item.projectStage) {
case "1": case "1":
this.$set(item, "projectStagetext", "1.可研"); this.$set(item, "projectStagetext", "1.可研");
...@@ -387,9 +425,8 @@ ...@@ -387,9 +425,8 @@
this.$set(item, "projectStagetext", "6.结决算及转资"); this.$set(item, "projectStagetext", "6.结决算及转资");
break; break;
} }
}); });
console.log(this.tableDataQR,'加不进去？') console.log(this.tableDataQR, "加不进去？");
this.dataPretreatment(); this.dataPretreatment();
} }
}, },
...@@ -436,7 +473,6 @@ ...@@ -436,7 +473,6 @@
} }
}, },
//表格颜色 //表格颜色
tableRowClassName({ row, rowIndex }) { tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 1) { if (rowIndex % 2 == 1) {
...@@ -446,10 +482,10 @@ ...@@ -446,10 +482,10 @@
}, },
//主列表选中行信息 //主列表选中行信息
handleSelectionChange(selection) { handleSelectionChange(selection) {
console.log('222222') console.log("222222");
if (Array.isArray(selection) && selection.length > 1) { if (Array.isArray(selection) && selection.length > 1) {
console.log('222222333',this.checkedList) console.log("222222333", this.checkedList);
this.$refs.multipleTable.toggleRowSelection(selection[0], false); this.$refs.multipleTable.toggleRowSelection(selection[0], false);
this.$refs.multipleTable.toggleRowSelection(selection[1], true); this.$refs.multipleTable.toggleRowSelection(selection[1], true);
} }
...@@ -491,33 +527,32 @@ ...@@ -491,33 +527,32 @@
controlSwitch(val, row) { controlSwitch(val, row) {
console.log("333", val, row); console.log("333", val, row);
}, },
cancelSS(){ cancelSS() {
this.dialogQR=false this.dialogQR = false;
}, },
async save(){ async save() {
let res= await xfappealAssistanceConfirmatio(this.tableDataSS) let res = await wtzgxfProblemRectification(this.tableDataSS);
if(res.code=='200'){ if (res.code == "200") {
this.dialogSS=false this.dialogSS = false;
this.resetForm() this.resetForm();
}else{ } else {
this.$message('复核下发失败') this.$message("整改提交失败");
} }
}, },
cancel(){ cancel() {
this.dialogSS=false this.dialogSS = false;
}, },
async saveSS(){ async saveSS() {
let res= await wtfhappealAssistanceConfirmatio(this.tableDataQR) let res = await wtzgProblemRectification(this.tableDataQR);
if(res.code=='200'){ if (res.code == "200") {
this.dialogQR=false this.dialogQR = false;
this.resetForm() this.resetForm();
} }
}, },
//问题提交 //问题提交
async appeal(){ async appeal() {
this.mergingPosss=0; this.mergingPosss = 0;
this.mergingRowsss=[]; this.mergingRowsss = [];
if (this.checkedList.length != 1) { if (this.checkedList.length != 1) {
this.$message("请选择一条数据进行提交"); this.$message("请选择一条数据进行提交");
return; return;
...@@ -528,79 +563,76 @@ ...@@ -528,79 +563,76 @@
batchId: this.checkedList[0].batchId, batchId: this.checkedList[0].batchId,
}; };
let res = await wtssSelAssistanceConfirmatio(params); let res = await wtssSelProblemRectification(params);
if (res.code == "200") { if (res.code == "200") {
this.tableDataSS = res.data.records; this.tableDataSS = res.data.records;
this.tableDataSS.forEach((item) => { this.tableDataSS.forEach((item) => {
this.$set(item, "confirmStatus", "2") this.$set(item, "confirmStatus", "2");
switch (item.projectStage) { switch (item.projectStage) {
case 1: case "1":
this.$set(item, "projectStagetext", "1.可研"); this.$set(item, "projectStagetext", "1.可研");
break; break;
case 2: case "2":
this.$set(item, "projectStagetext", "2.计划"); this.$set(item, "projectStagetext", "2.计划");
break; break;
case 3: case "3":
this.$set(item, "projectStagetext", "3.采购"); this.$set(item, "projectStagetext", "3.采购");
break; break;
case 4: case "4":
this.$set(item, "projectStagetext", "4.合同"); this.$set(item, "projectStagetext", "4.合同");
break; break;
case 5: case "5":
this.$set(item, "projectStagetext", "5.执行"); this.$set(item, "projectStagetext", "5.执行");
break; break;
case 6: case "6":
this.$set(item, "projectStagetext", "6.结决算及转资"); this.$set(item, "projectStagetext", "6.结决算及转资");
break; break;
} }
}); });
console.log(this.tableDataSS) console.log(this.tableDataSS);
this.dataPretreatmentSS(); this.dataPretreatmentSS();
} }
}, },
handleFileUpload(event) { handleFileUpload(event) {
console.log('来了么') console.log("来了么");
this.file = event.target.files[0]; this.file = event.target.files[0];
}, },
submitFile(row) { submitFile(row) {
this.$message('上传还没做') this.$message("上传还没做");
return return;
console.log(row) console.log(row);
if (this.file) { if (this.file) {
const formData = new FormData(); const formData = new FormData();
formData.append('file', this.file); formData.append("file", this.file);
formData.append('prjId',this.checkedList[0].projectId); formData.append("prjId", this.checkedList[0].projectId);
formData.append('typeCode',row.typeCode); formData.append("typeCode", row.typeCode);
ossupload(formData).then(response => { ossupload(formData)
.then((response) => {
console.log(response); console.log(response);
this.$set(row,'fileName',response.data.fileName) this.$set(row, "fileName", response.data.fileName);
}) })
.catch(error => { .catch((error) => {
console.error(error); console.error(error);
}); });
} }
}, },
closed(){ closed() {
console.log("关闭") console.log("关闭");
this.handleSelectionChange() this.handleSelectionChange();
}
}, },
}; },
</script> };
</script>
<style scoped lang="scss"> <style scoped lang="scss">
.main { .main {
font-size: 14px; font-size: 14px;
position: relative; position: relative;
height: 100%; height: 100%;
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
} }
.el-form { .el-form {
display: flex; display: flex;
width: 99%; width: 99%;
flex-wrap: wrap; flex-wrap: wrap;
...@@ -649,39 +681,37 @@ ...@@ -649,39 +681,37 @@
color: #fff; color: #fff;
} }
} }
} }
.eltable { .eltable {
box-sizing: border-box; box-sizing: border-box;
text-align: center; text-align: center;
width: 150%; width: 150%;
min-width: 150%; min-width: 150%;
margin-right: 210px; }
// margin-top: 3vh; /deep/ .el-table .warning-row {
}
/deep/ .el-table .warning-row {
background: #f0ffff; background: #f0ffff;
color: #2785e6; color: #2785e6;
} }
.elpagination { .elpagination {
text-align: right; text-align: right;
margin-right: 100px; margin-right: 100px;
} }
/deep/ .el-dialog { /deep/ .el-dialog {
border-radius: 10px; border-radius: 10px;
margin-top: 3vh !important; margin-top: 3vh !important;
margin-left: 3vw !important;
} }
/deep/.el-table th.el-table__cell.is-leaf, /deep/.el-table th.el-table__cell.is-leaf,
.el-table td.el-table__cell { .el-table td.el-table__cell {
text-align: center; text-align: center;
} }
/deep/ .el-dialog__wrapper { /deep/ .el-dialog__wrapper {
position: absolute; position: absolute;
} }
/deep/ .v-modal { /deep/ .v-modal {
position: absolute; position: absolute;
} }
/deep/ .el-dialog__header { /deep/ .el-dialog__header {
background-color: #0d867f; background-color: #0d867f;
padding-bottom: 20px; padding-bottom: 20px;
text-align: left; text-align: left;
...@@ -689,16 +719,19 @@ ...@@ -689,16 +719,19 @@
.el-dialog__title { .el-dialog__title {
color: #fff; color: #fff;
} }
} }
/deep/ .el-table__header th { /deep/ .el-table__header th {
background-color: #eeeeee; background-color: #eeeeee;
font-weight: bold; font-weight: bold;
.cell { .cell {
color: #333; color: #333;
} }
} }
/deep/.el-table { /deep/.el-table {
position: absolute;
width: auto !important;
max-width: none;
// width: 100%; // width: 100%;
.el-table__header-wrapper table, .el-table__header-wrapper table,
.el-table__body-wrapper table { .el-table__body-wrapper table {
...@@ -709,15 +742,15 @@ ...@@ -709,15 +742,15 @@
.el-table__header { .el-table__header {
table-layout: auto; table-layout: auto;
} }
} }
.textarea { .textarea {
width: 100%; width: 100%;
.el-textarea { .el-textarea {
width: 60%; width: 60%;
} }
} }
.Btn { .Btn {
width: 200px; width: 200px;
margin: 0 auto; margin: 0 auto;
height: 30px; height: 30px;
...@@ -739,11 +772,11 @@ ...@@ -739,11 +772,11 @@
border: 1px solid #0d867f; border: 1px solid #0d867f;
color: #fff; color: #fff;
} }
} }
/deep/ .el-dialog__headerbtn .el-dialog__close { /deep/ .el-dialog__headerbtn .el-dialog__close {
color: #fff; color: #fff;
} }
.zjBtn { .zjBtn {
width: 400px; width: 400px;
text-align: left; text-align: left;
vertical-align: middle; vertical-align: middle;
...@@ -762,14 +795,14 @@ ...@@ -762,14 +795,14 @@
padding: 5px 10px; padding: 5px 10px;
margin-left: 10px; margin-left: 10px;
} }
} }
/deep/ .el-icon-position { /deep/ .el-icon-position {
margin-right: 10px; margin-right: 10px;
} }
/deep/ .el-icon-folder-delete { /deep/ .el-icon-folder-delete {
margin-right: 10px; margin-right: 10px;
} }
.cxItem { .cxItem {
text-align: right; text-align: right;
width: 20%; width: 20%;
.zjquery { .zjquery {
...@@ -782,8 +815,8 @@ ...@@ -782,8 +815,8 @@
line-height: 40px; line-height: 40px;
border-radius: 5px; border-radius: 5px;
} }
} }
.midBtn { .midBtn {
margin: 0 auto; margin: 0 auto;
margin-top: 20px; margin-top: 20px;
span { span {
...@@ -804,10 +837,18 @@ ...@@ -804,10 +837,18 @@
color: #fff; color: #fff;
border: 1px solid #4ca6a7; border: 1px solid #4ca6a7;
} }
} }
.dialog { .setTable {
height: 700px; height: 500px;
overflow-y: auto; overflow-y: auto;
overflow-x: scroll;
position: relative;
overflow: auto;
}
.dialog {
// height: 700px;
// overflow-y: auto;
// overflow-x: auto;
.xqtitle { .xqtitle {
text-align: left; text-align: left;
font-size: 18px; font-size: 18px;
...@@ -851,93 +892,91 @@ ...@@ -851,93 +892,91 @@
width: 160px !important; width: 160px !important;
} }
} }
} }
/deep/.el-table th.el-table__cell.is-leaf, /deep/.el-table th.el-table__cell.is-leaf,
.el-table td.el-table__cell { .el-table td.el-table__cell {
text-align: center; text-align: center;
} }
/deep/ .el-table__cell { /deep/ .el-table__cell {
text-align: center; text-align: center;
} }
h3 { h3 {
text-align: left; text-align: left;
} }
/deep/.el-switch__core { /deep/.el-switch__core {
height: 30px; height: 30px;
width: 79px !important; width: 79px !important;
border-radius: 20px; border-radius: 20px;
} }
/deep/.el-switch.is-checked .el-switch__core::after { /deep/.el-switch.is-checked .el-switch__core::after {
margin-left: -28px; margin-left: -28px;
} }
/deep/ .el-switch_label { /deep/ .el-switch_label {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
} }
/deep/.el-switch { /deep/.el-switch {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
border-radius: 20px; border-radius: 20px;
} }
/deep/ .el-switch__label * { /deep/ .el-switch__label * {
font-size: 12px; font-size: 12px;
} }
/deep/.el-switch__core:after { /deep/.el-switch__core:after {
width: 26px; width: 26px;
height: 26px; height: 26px;
} }
/deep/.el-switch__label--left { /deep/.el-switch__label--left {
position: absolute; position: absolute;
left: 30px; left: 30px;
color: #fff; color: #fff;
z-index: -1111; z-index: -1111;
cursor: default; cursor: default;
user-select: none; user-select: none;
} }
/deep/.el-switch__label--right { /deep/.el-switch__label--right {
position: absolute; position: absolute;
right: 30px; right: 30px;
color: #fff; color: #fff;
z-index: -1111; z-index: -1111;
cursor: default; cursor: default;
user-select: none; user-select: none;
} }
/deep/.el-switch__label--right.is-active { /deep/.el-switch__label--right.is-active {
z-index: 1111; z-index: 1111;
color: grey !important; color: grey !important;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
}
} /deep/.el-switch__label--left.is-active {
/deep/.el-switch__label--left.is-active {
z-index: 1111; z-index: 1111;
color: #fff !important; color: #fff !important;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
} }
/deep/ .el-dialog__body{ /deep/ .el-dialog__body {
padding-bottom: 15px; padding-bottom: 15px;
} }
.setscroll{ .setscroll {
width: 100%; width: 100%;
height: 600px; height: 650px;
position: relative;
overflow: auto; overflow: auto;
} }
.dialog{ .dialog {
.eltable { .eltable {
box-sizing: border-box; box-sizing: border-box;
text-align: center; text-align: center;
width: 100%; width: 100%;
min-width: 100%; min-width: 100%;
// margin-right: 210px;
// margin-top: 3vh;
}
} }
}
// ::-webkit-scrollbar { // ::-webkit-scrollbar {
// width: 6px; // 横向滚动条 // width: 6px; // 横向滚动条
...@@ -945,5 +984,4 @@ ...@@ -945,5 +984,4 @@
// height: 6px; // 纵向滚动条必写 // height: 6px; // 纵向滚动条必写
// } // }
</style>
</style> \ No newline at end of file
\ No newline at end of file
src/views/assessChecks/assistedVerif.vue
...@@ -810,7 +810,7 @@ export default { ...@@ -810,7 +810,7 @@ export default {
border-right: 1px solid #dee5e7; border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7; border-bottom: 1px solid #dee5e7;
padding: 20px 10px; padding: 20px 10px;
margin-bottom: 20px; margin: 20px 0;
.fromItem { .fromItem {
width: 24%; width: 24%;
margin: 0 0.5%; margin: 0 0.5%;
......
src/views/assessChecks/auxiliarySelection.vue
...@@ -1044,10 +1044,6 @@ export default { ...@@ -1044,10 +1044,6 @@ export default {
} }
} }
} }
.eltable {
widows: 100%;
box-sizing: border-box;
}
/deep/ .el-table .warning-row { /deep/ .el-table .warning-row {
background: #f0ffff; background: #f0ffff;
...@@ -1085,7 +1081,10 @@ export default { ...@@ -1085,7 +1081,10 @@ export default {
} }
/deep/.el-table { /deep/.el-table {
width: 100%; // width: 100%;
position: absolute;
// width: auto !important;
max-width: none;
.el-table__header-wrapper table, .el-table__header-wrapper table,
.el-table__body-wrapper table { .el-table__body-wrapper table {
width: 100% !important; width: 100% !important;
...@@ -1207,13 +1206,18 @@ export default { ...@@ -1207,13 +1206,18 @@ export default {
} }
.setscroll { .setscroll {
width: 100%; width: 100%;
height: 600px; height: 650px;
position: relative;
overflow: auto; overflow: auto;
} }
.setscrolldialog { .setscrolldialog {
width: 100%; width: 100%;
height: 300px; height: 300px;
overflow: auto; overflow: auto;
box-sizing: border-box;
/deep/ .el-table{
width: 96% !important;
}
} }
/deep/ .el-table__body-wrapper::-webkit-scrollbar { /deep/ .el-table__body-wrapper::-webkit-scrollbar {
......
src/views/assessChecks/checkComplianceXF.vue
...@@ -239,7 +239,7 @@ export default { ...@@ -239,7 +239,7 @@ export default {
width: 99%; width: 99%;
position: absolute; position: absolute;
// height: 80px; // height: 80px;
bottom: 150px; bottom: 130px;
right: 0; right: 0;
// left: 50%; // left: 50%;
z-index: 100; z-index: 100;
......
src/views/assessChecks/confirmChanges.vue
...@@ -71,8 +71,8 @@ ...@@ -71,8 +71,8 @@
</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="createTime" label="历史审核状态"> <!-- <el-table-column prop="createTime" 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>
......
src/views/assessChecks/confirmRelease.vue
...@@ -791,7 +791,7 @@ export default { ...@@ -791,7 +791,7 @@ export default {
border-right: 1px solid #dee5e7; border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7; border-bottom: 1px solid #dee5e7;
padding: 20px 10px; padding: 20px 10px;
margin-bottom: 20px; margin: 20px 0;
.fromItem { .fromItem {
width: 24%; width: 24%;
margin: 0 0.5%; margin: 0 0.5%;
......
src/views/assessChecks/correctiveAssistanceVerification.vue
<!-- 整改辅助核验 --> <!-- 整改辅助核验 -->
<template> <template>
<div class="main"> <div class="main">
<el-form :model="ruleForm" label-width="100px" class="demo-ruleForm" ref="formName"> <el-form
<el-form-item label="批次年度:" prop="batchYear" class="fromItem" > :model="ruleForm"
label-width="100px"
class="demo-ruleForm"
ref="formName"
>
<el-form-item label="批次年度:" prop="batchYear" class="fromItem">
<el-select v-model="ruleForm.batchYear" placeholder="请选择"> <el-select v-model="ruleForm.batchYear" placeholder="请选择">
<el-option label="2024年" value="2024"></el-option> <el-option label="2024年" value="2024"></el-option>
<el-option label="2023年" value="2023"></el-option> <el-option label="2023年" value="2023"></el-option>
...@@ -11,7 +16,7 @@ ...@@ -11,7 +16,7 @@
</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" ></el-input> <el-input v-model="ruleForm.batchName"></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="计划评审日期:" label="计划评审日期:"
...@@ -42,11 +47,7 @@ ...@@ -42,11 +47,7 @@
<el-form-item label="创建人:" prop="creator" class="fromItem"> <el-form-item label="创建人:" prop="creator" class="fromItem">
<el-input v-model="ruleForm.creator" placeholder="请输入"></el-input> <el-input v-model="ruleForm.creator" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="创建时间:" prop="createTime" class="fromItem">
label="创建时间:"
prop="createTime"
class="fromItem"
>
<el-date-picker <el-date-picker
v-model="ruleForm.createTime" v-model="ruleForm.createTime"
type="date" type="date"
...@@ -56,8 +57,6 @@ ...@@ -56,8 +57,6 @@
</el-date-picker> </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
...@@ -66,13 +65,16 @@ ...@@ -66,13 +65,16 @@
<img class="buttonIcon" src="../../assets/cz.png" />重置</el-button <img class="buttonIcon" src="../../assets/cz.png" />重置</el-button
> >
<el-button @click="rectificationReview('ruleForm')"> <el-button @click="rectificationReview('ruleForm')">
<img class="buttonIcon" src="../../assets/fh.png" />整改复核</el-button <i class="el-icon-chat-dot-square"></i
>&nbsp;&nbsp;&nbsp;整改复核</el-button
> >
<el-button @click="submmitRectificationReview('ruleForm')"> <el-button @click="submmitRectificationReview('ruleForm')">
<img class="buttonIcon" src="../../assets/fh.png" />提交整改复核</el-button <i class="el-icon-document-remove"></i
>&nbsp;&nbsp;&nbsp;提交整改复核</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"
...@@ -84,33 +86,57 @@ ...@@ -84,33 +86,57 @@
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
border border
> >
<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 type="selection"> </el-table-column> <el-table-column type="selection"> </el-table-column>
<el-table-column label="批次年度" width="auto" prop="batchYear"> <el-table-column label="批次年度" width="auto" prop="batchYear">
</el-table-column> </el-table-column>
<el-table-column prop="batchName" label="后评估批次名称" width="auto"> <el-table-column prop="batchName" label="后评估批次名称" width="auto">
</el-table-column> </el-table-column>
<el-table-column prop="postProjectName" label="评估项目名称" width="auto"> <el-table-column prop="projectName" label="评估项目名称" width="auto">
</el-table-column>
<el-table-column prop="buildStyle" label="建设形式" width="auto">
</el-table-column>
<el-table-column prop="historyCheckStatus" label="历史审核状态" width="auto">
</el-table-column> </el-table-column>
<el-table-column prop="formerYearsCheckStatus" label="往年审核状态" width="auto"> <el-table-column prop="projectCategory" label="建设形式" width="auto">
</el-table-column> </el-table-column>
<el-table-column prop="evaluationExpertList" label="评审专家名单" width="auto"> <!-- <el-table-column
prop="historyCheckStatus"
label="历史审核状态"
width="auto"
>
</el-table-column> -->
<!-- <el-table-column
prop="formerYearsCheckStatus"
label="往年审核状态"
width="auto"
>
</el-table-column> -->
<el-table-column
prop="expertName"
label="评审专家名单"
width="auto"
>
</el-table-column> </el-table-column>
<el-table-column prop="problemAppealEndTime" label="问题申诉截止时间" width="auto"> <el-table-column
prop="appealDeadline"
label="问题申诉截止时间"
width="auto"
>
</el-table-column> </el-table-column>
<el-table-column prop="problemAbarbeitEndTime" label="问题整改截止时间" width="auto"> <el-table-column
prop="rectificationDeadline"
label="问题整改截止时间"
width="auto"
>
</el-table-column> </el-table-column>
<el-table-column prop="RectifyReviewStatus" label="整改复核状态" width="auto"> <el-table-column
prop="postEvalState"
label="整改复核状态"
width="auto"
>
</el-table-column> </el-table-column>
<el-table-column prop="postDate" label="评估日期" width="auto"> <el-table-column prop="reviewDate" 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"
...@@ -122,145 +148,324 @@ ...@@ -122,145 +148,324 @@
class="elpagination" class="elpagination"
> >
</el-pagination> </el-pagination>
<!-- 详情弹窗 -->
<!-- 问题整改 -->
<el-dialog <el-dialog
title="材料同步归档详情" title="复核情况"
:visible.sync="dialogXQ" :visible.sync="dialogQR"
width="90%" width="79%"
:modal-append-to-body="false" :modal-append-to-body="false"
:append-to-body="false" :append-to-body="false"
@close="closed"
> >
<div class="dialog"> <div class="dialog">
<el-form <h3>
:model="ruleFormdialogData" 项目名称：一期项目-电力营销-2023年网上国网（网上国网V1.0）-设计开发项目
label-width="100px" </h3>
class="demo-ruleForm" <div class="continer">
<p class="xqtitle"><span></span>问题清单</p>
<div class="setTable">
<el-table
:data="tableDataQR"
tooltip-effect="dark"
style="width: 100%"
header-cell-class-name="custom-th-background"
class="eltable"
:row-class-name="tableRowClassName"
:span-method="arraySpanMethod"
border
> >
<el-form-item label="项目年度:" prop="projectYear" class="fromItem"> <el-table-column
<el-input v-model="ruleFormdialogData.projectYear" disabled></el-input> label="项目环节"
</el-form-item> prop="projectStagetext"
<el-form-item label="项目编码:" prop="projectCode" class="fromItem"> width="150"
<el-input v-model="ruleFormdialogData.projectCode" disabled></el-input> >
</el-form-item> </el-table-column>
<el-form-item label="项目名称:" prop="projectName" class="fromItem"> <el-table-column label="序号" width="100" prop="questionId">
<el-input v-model="ruleFormdialogData.projectName" disabled></el-input> </el-table-column>
</el-form-item>
<el-form-item label="项目阶段:" prop="projectPhase" class="fromItem"> <el-table-column
<el-input v-model="ruleFormdialogData.projectPhase" disabled></el-input> label="问题检查项"
</el-form-item> prop="quesCheckItem"
<el-form-item label="项目环节:" prop="projectLink" class="fromItem"> width="200"
<el-input v-model="ruleFormdialogData.projectLink" disabled></el-input> >
</el-form-item> </el-table-column>
<el-form-item label="问题检查项:" class="textarea"> <el-table-column label="检查说明" prop="checkDesc" width="300">
<el-input </el-table-column>
type="textarea" <el-table-column label="评估问题" prop="evalQues" width="300">
v-model="ruleFormdialogData.checkProblem" </el-table-column>
disabled <el-table-column label="问题确认" width="auto">
></el-input> <template slot-scope="scope">
</el-form-item> <el-switch
<el-form-item label="是否申诉:" prop="appealFlag" class="fromItem"> v-model="scope.row.confirmStatus"
<el-input v-model="ruleFormdialogData.appealFlag" disabled></el-input> active-color="#C0C0C0"
</el-form-item> inactive-color="#13ce66"
<el-form-item label="申诉是否通过:" prop="appealPassFlag" class="fromItem"> active-value="2"
<el-input v-model="ruleFormdialogData.appealPassFlag" disabled></el-input> inactive-value="1"
</el-form-item> active-text="无异议"
<el-form-item label="是否完成整改:" prop="completeFlag" class="fromItem"> inactive-text="有异议"
<el-input v-model="ruleFormdialogData.completeFlag" disabled></el-input> @change="controlSwitch($event, scope.row)"
</el-form-item> >
</el-form> <template v-slot:active>
<span>开启</span>
</template>
<template v-slot:inactive>
<span>关闭</span>
</template>
</el-switch>
</template>
</el-table-column>
<el-table-column label="解释批注" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.feedback"></el-input>
</template>
</el-table-column>
<el-table-column label="附加解释材料" prop="fileId" width="400">
<template slot-scope="scope">
<input type="file" @change="handleFileUpload" />
<button @click="submitFile(scope.row)">上传</button>
</template>
</el-table-column>
<el-table-column
label="复核情况"
prop="rectificationStatus"
width="200"
>
<template slot-scope="scope">
<el-select
v-model="scope.row.appealStatus"
placeholder="请选择"
>
<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>
<el-option label="申诉通过" :value="3"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column
label="上传整改材料"
prop="rectificationStatus"
width="400"
>
<template slot-scope="scope">
<input type="file" @change="handleFileUpload" />
<button @click="submitFile(scope.row)">上传</button>
</template>
</el-table-column>
<el-table-column label="情况说明" prop="zgqkFileId" width="400">
<template slot-scope="scope">
<input type="file" @change="handleFileUpload" />
<button @click="submitFile(scope.row)">上传</button>
</template>
</el-table-column>
<el-table-column
label="整改复核"
prop="rectificationStatus"
width="200"
>
<template slot-scope="scope">
<el-select
v-model="scope.row.rectificationStatus"
placeholder="请选择"
>
<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>
</el-select>
</template>
</el-table-column>
</el-table>
</div> </div>
</div>
</div>
<p class="midBtn">
<span @click="cancelSS()">取消</span><span @click="saveSS()">保存</span>
</p>
</el-dialog>
<!-- 复核下发 -->
<el-dialog
title="复核情况"
:visible.sync="dialogSS"
width="79%"
:modal-append-to-body="false"
:append-to-body="false"
>
<div class="dialog">
<h3>
项目名称：一期项目-电力营销-2023年网上国网（网上国网V1.0）-设计开发项目
</h3>
<div class="continer">
<p class="xqtitle"><span></span>问题清单</p>
<div class="setTable">
<el-table
:data="tableDataSS"
tooltip-effect="dark"
style="width: 100%"
header-cell-class-name="custom-th-background"
class="eltable"
:row-class-name="tableRowClassName"
:span-method="arraySpanMethodss"
border
>
<el-table-column
label="项目环节"
prop="projectStagetext"
width="150"
>
</el-table-column>
<el-table-column label="序号" width="100" prop="questionId">
</el-table-column>
<el-table-column
label="问题检查项"
prop="quesCheckItem"
width="200"
>
</el-table-column>
<el-table-column label="检查说明" prop="checkDesc" width="300">
</el-table-column>
<el-table-column label="评估问题" prop="evalQues" width="300">
</el-table-column>
<el-table-column label="问题确认" width="auto">
<template slot-scope="scope">
<el-switch
v-model="scope.row.confirmStatus"
active-color="#C0C0C0"
inactive-color="#13ce66"
active-value="2"
inactive-value="1"
active-text="无异议"
inactive-text="有异议"
@change="controlSwitch($event, scope.row)"
>
<template v-slot:active>
<span>开启</span>
</template>
<template v-slot:inactive>
<span>关闭</span>
</template>
</el-switch>
</template>
</el-table-column>
<el-table-column label="解释批注" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.feedback"></el-input>
</template>
</el-table-column>
<el-table-column label="附加解释材料" prop="fileId" width="400">
<template slot-scope="scope">
<input type="file" @change="handleFileUpload" />
<button @click="submitFile(scope.row)">上传</button>
</template>
</el-table-column>
<el-table-column
label="复核情况"
prop="rectificationStatus"
width="200"
>
<template slot-scope="scope">
<el-select
v-model="scope.row.appealStatus"
placeholder="请选择"
>
<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>
<el-option label="申诉通过" :value="3"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column
label="上传整改材料"
prop="rectificationStatus"
width="400"
>
<template slot-scope="scope">
<input type="file" @change="handleFileUpload" />
<button @click="submitFile(scope.row)">上传</button>
</template>
</el-table-column>
<el-table-column label="情况说明" prop="zgqkFileId" width="400">
<template slot-scope="scope">
<input type="file" @change="handleFileUpload" />
<button @click="submitFile(scope.row)">上传</button>
</template>
</el-table-column>
</el-table>
</div>
</div>
</div>
<p class="midBtn">
<span @click="cancel()">取消</span><span @click="save()">提交</span>
</p>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { import {
evalBatchInfo, rectificationVerification,
} from "@/api/index"; wtssSelectificationVerification,
export default { bcrectificationVerification,
tjrectificationVerification,
} from "@/api/index";
export default {
data() { data() {
return { return {
category: [ dialogSS: false,
{ name: "2024", id: 1 },
{ name: "2023", id: 2 },
{ name: "2022", id: 3 },
{ name: "2021", id: 4 },
], //专业领域
showButton: true,
ruleForm: { ruleForm: {
batchYear: "", batchYear: "",
batchName: "", batchName: "",
planReviewDate:"", planReviewDate: "",
fullName: "", fullName: "",
postEvalState: "", postEvalState: "",
creator: "", creator: "",
createTime: "", createTime: "",
}, },
ruleFormdialogRow: {
batchYear: "",
batchName: "",
buildStyle: "",
historyCheckStatus: "",
formerYearsCheckStatus: "",
evaluationExpertList: "",
problemAppealEndTime: "",
problemAbarbeitEndTime: "",
RectifyReviewStatus: "",
postDate: "",
},
ruleFormdialogData: {
batchYear: "",
batchName: "",
},
xfParams: "", //下发入参
tableData: [], tableData: [],
tableDataQD: [], //清单列表 tableDataQR: [],
tableDataSS: [],
checkedList: [], checkedList: [],
currentPage: 1, currentPage: 1,
currentPagetjcl: 1,
pageSizetjcl: 10, pageSizetjcl: 10,
total: 0, total: 0,
dialogXQ: false, dialogQR: false,
currentPageBJ:1,
pageSizeBJ:10,
dialogAdd: false,
dialogAddzj: false,
pageSize: 10, pageSize: 10,
current: 1, mergingPos: 0,
addtotal: 0, mergingRows: [],
currentAdd: 1, mergingPosss: 0,
pageSizeAdd: 10, mergingRowsss: [],
currentedit: 1,
pageSizeedit: 10,
xfParam: "",
dialogedit: false,
expertIdList: [],
totalBJ:0,
addZJList: [],
expertState: "",
fields: "",
addcurrentPage: 1,
addtableData: [],
message: {},
}; };
}, },
mounted() { mounted() {
this.submitForm(); this.submitForm();
}, },
mounted() {
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,
}; };
Object.assign(params, this.ruleForm); Object.assign(params, this.ruleForm);
console.log(params); console.log(params);
let res = await evalBatchInfo(params); let res = await rectificationVerification(params);
if (res.code == "200") { if (res.code == "200") {
this.tableData = res.data.records; this.tableData = res.data.records;
this.tableData.forEach((item) => {
if (item.reviewStatus >= "5") {
this.$set(item, "postEvalState", "整改提交");
} else {
this.$set(item, "postEvalState", "整改未提交");
}
});
this.total = res.data.total * 1; this.total = res.data.total * 1;
} }
}, },
...@@ -270,32 +475,92 @@ ...@@ -270,32 +475,92 @@
this.pageSize = 10; this.pageSize = 10;
this.submitForm(); this.submitForm();
}, },
//详情 //整改复核
async detailsForm() { async rectificationReview() {
this.mergingPos = 0;
this.mergingRows = [];
if (this.checkedList.length != 1) { if (this.checkedList.length != 1) {
this.$message("请选择"); this.$message("请选择一条数据进行整改");
return; return;
} }
console.log("222",this.checkedList); this.dialogQR = true;
this.dialogXQ = true;
this.ruleFormdialogData=this.checkedList[0]
let params = { let params = {
current: this.currentedit, projectId: this.checkedList[0].projectId,
pageSize: this.pageSizeedit, batchId: this.checkedList[0].batchId,
batchId:this.checkedList[0].batchId
}; };
console.log(params,'params')
let res = await expert(params);
this.addtableData=res.data.records let res = await wtssSelectificationVerification(params);
this.totalBJ=res.data.total * 1; if (res.code == "200") {
this.tableDataQR = res.data.records;
this.tableDataQR.forEach((item) => {
switch (item.projectStage) {
case "1":
this.$set(item, "projectStagetext", "1.可研");
break;
case "2":
this.$set(item, "projectStagetext", "2.计划");
break;
case "3":
this.$set(item, "projectStagetext", "3.采购");
break;
case "4":
this.$set(item, "projectStagetext", "4.合同");
break;
case "5":
this.$set(item, "projectStagetext", "5.执行");
break;
case "6":
this.$set(item, "projectStagetext", "6.结决算及转资");
break;
}
});
console.log(this.tableDataQR, "加不进去？");
this.dataPretreatment();
}
}, },
rectificationReview(){ dataPretreatment() {
alert("整改复核"); for (let i = 0; i < this.tableDataQR.length; i++) {
// tabledata 表格数据源
if (i === 0) {
this.mergingRows.push(1);
this.mergingPos = 0;
} else {
if (
this.tableDataQR[i].projectStage ===
this.tableDataQR[i - 1].projectStage
) {
//哪些数据是要合并的 合并的条件是什么
this.mergingRows[this.mergingPos] += 1;
this.mergingRows.push(0);
} else {
this.mergingRows.push(1);
this.mergingPos = i;
}
}
}
}, },
submmitRectificationReview(){ dataPretreatmentSS() {
alert("提交整改复核"); for (let i = 0; i < this.tableDataSS.length; i++) {
// tabledata 表格数据源
if (i === 0) {
this.mergingRowsss.push(1);
this.mergingPosss = 0;
} else {
if (
this.tableDataSS[i].projectStage ===
this.tableDataSS[i - 1].projectStage
) {
//哪些数据是要合并的 合并的条件是什么
this.mergingRowsss[this.mergingPosss] += 1;
this.mergingRowsss.push(0);
} else {
this.mergingRowsss.push(1);
this.mergingPosss = i;
}
}
}
}, },
//表格颜色 //表格颜色
tableRowClassName({ row, rowIndex }) { tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 1) { if (rowIndex % 2 == 1) {
...@@ -305,12 +570,15 @@ ...@@ -305,12 +570,15 @@
}, },
//主列表选中行信息 //主列表选中行信息
handleSelectionChange(selection) { handleSelectionChange(selection) {
console.log("222222");
if (Array.isArray(selection) && selection.length > 1) { if (Array.isArray(selection) && selection.length > 1) {
console.log("222222333", this.checkedList);
this.$refs.multipleTable.toggleRowSelection(selection[0], false); this.$refs.multipleTable.toggleRowSelection(selection[0], false);
this.$refs.multipleTable.toggleRowSelection(selection[1], true); this.$refs.multipleTable.toggleRowSelection(selection[1], true);
} }
this.checkedList = this.$refs.multipleTable.selection; this.checkedList = this.$refs.multipleTable.selection;
this.ruleFormdialogRow = this.checkedList[0]; this.$forceUpdate();
console.log(this.checkedList, "2222"); console.log(this.checkedList, "2222");
}, },
handleSizeChange(val) { handleSizeChange(val) {
...@@ -321,51 +589,138 @@ ...@@ -321,51 +589,138 @@
console.log(`当前页: ${val}`); console.log(`当前页: ${val}`);
this.currentPage = val; this.currentPage = val;
}, },
handleSizeChangeZJ(val) { arraySpanMethod({ row, column, rowIndex, columnIndex }) {
console.log(`每页 ${val} 条`); if (columnIndex === 0) {
this.pageSizeZJ = val; //第一列
const _row = this.mergingRows[rowIndex];
const _col = _row > 0 ? 1 : 0;
return {
rowspan: _row,
colspan: _col,
};
}
}, },
handleCurrentChangeZJ(val) { arraySpanMethodss({ row, column, rowIndex, columnIndex }) {
console.log(`当前页: ${val}`); if (columnIndex === 0) {
this.currentZJ = val; //第一列
const _row = this.mergingRowsss[rowIndex];
const _col = _row > 0 ? 1 : 0;
return {
rowspan: _row,
colspan: _col,
};
}
}, },
handleSizeChangetjcl(val) { //问题确认开关
console.log(`每页 ${val} 条`); controlSwitch(val, row) {
this.pageSizetjcl = val; console.log("333", val, row);
}, },
handleCurrentChangetjcl(val) { cancelSS() {
console.log(`当前页: ${val}`); this.dialogQR = false;
this.currentPagetjcl = val;
}, },
handleSizeChangeAdd(val) { async save() {
this.pageSizeAdd = val; let res = await tjrectificationVerification(this.tableDataSS);
if (res.code == "200") {
this.dialogSS = false;
this.resetForm();
} else {
this.$message("整改复核提交失败");
}
}, },
handleCurrentChangeAdd(val) { cancel() {
this.currentAdd = val; this.dialogSS = false;
}, },
handleSizeChangeBJ(val) { async saveSS() {
console.log(`每页 ${val} 条`); let res = await bcrectificationVerification(this.tableDataQR);
this.pageSizeBJ = val; if (res.code == "200") {
this.dialogQR = false;
this.resetForm();
}
}, },
handleCurrentChangeBJ(val) { //提交整改复核
console.log(`当前页: ${val}`); async submmitRectificationReview() {
this.currentPageBJ = val; this.mergingPosss = 0;
this.mergingRowsss = [];
if (this.checkedList.length != 1) {
this.$message("请选择一条数据进行提交");
return;
}
this.dialogSS = true;
let params = {
projectId: this.checkedList[0].projectId,
batchId: this.checkedList[0].batchId,
};
let res = await wtssSelectificationVerification(params);
if (res.code == "200") {
this.tableDataSS = res.data.records;
this.tableDataSS.forEach((item) => {
this.$set(item, "confirmStatus", "2");
switch (item.projectStage) {
case "1":
this.$set(item, "projectStagetext", "1.可研");
break;
case "2":
this.$set(item, "projectStagetext", "2.计划");
break;
case "3":
this.$set(item, "projectStagetext", "3.采购");
break;
case "4":
this.$set(item, "projectStagetext", "4.合同");
break;
case "5":
this.$set(item, "projectStagetext", "5.执行");
break;
case "6":
this.$set(item, "projectStagetext", "6.结决算及转资");
break;
}
});
console.log(this.tableDataSS);
this.dataPretreatmentSS();
}
}, },
cancel() { handleFileUpload(event) {
this.dialog = false; console.log("来了么");
this.file = event.target.files[0];
},
submitFile(row) {
this.$message("上传还没做");
return;
console.log(row);
if (this.file) {
const formData = new FormData();
formData.append("file", this.file);
formData.append("prjId", this.checkedList[0].projectId);
formData.append("typeCode", row.typeCode);
ossupload(formData)
.then((response) => {
console.log(response);
this.$set(row, "fileName", response.data.fileName);
})
.catch((error) => {
console.error(error);
});
}
}, },
closed() {
console.log("关闭");
this.handleSelectionChange();
}, },
}; },
};
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.main { .main {
font-size: 14px; font-size: 14px;
position: relative; position: relative;
height: 100%; height: 100%;
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
} }
.el-form { .el-form {
display: flex; display: flex;
width: 99%; width: 99%;
flex-wrap: wrap; flex-wrap: wrap;
...@@ -414,29 +769,37 @@ ...@@ -414,29 +769,37 @@
color: #fff; color: #fff;
} }
} }
} }
.eltable { .eltable {
widows: 100%;
box-sizing: border-box; box-sizing: border-box;
} text-align: center;
/deep/ .el-table .warning-row { width: 150%;
min-width: 150%;
}
/deep/ .el-table .warning-row {
background: #f0ffff; background: #f0ffff;
color: #2785e6; color: #2785e6;
} }
.elpagination { .elpagination {
text-align: right; text-align: right;
margin-right: 100px; margin-right: 100px;
} }
/deep/ .el-dialog { /deep/ .el-dialog {
border-radius: 10px; border-radius: 10px;
} margin-top: 3vh !important;
/deep/ .el-dialog__wrapper { margin-left: 3vw !important;
}
/deep/.el-table th.el-table__cell.is-leaf,
.el-table td.el-table__cell {
text-align: center;
}
/deep/ .el-dialog__wrapper {
position: absolute; position: absolute;
} }
/deep/ .v-modal { /deep/ .v-modal {
position: absolute; position: absolute;
} }
/deep/ .el-dialog__header { /deep/ .el-dialog__header {
background-color: #0d867f; background-color: #0d867f;
padding-bottom: 20px; padding-bottom: 20px;
text-align: left; text-align: left;
...@@ -444,51 +807,42 @@ ...@@ -444,51 +807,42 @@
.el-dialog__title { .el-dialog__title {
color: #fff; color: #fff;
} }
} }
/deep/ .el-table__header th { /deep/ .el-table__header th {
background-color: #eeeeee; background-color: #eeeeee;
font-weight: bold; font-weight: bold;
.cell { .cell {
color: #333; color: #333;
} }
} }
/deep/.el-table { /deep/.el-table {
width: 100%; position: absolute;
width: auto !important;
max-width: none;
// width: 100%;
.el-table__header-wrapper table, .el-table__header-wrapper table,
.el-table__body-wrapper table { .el-table__body-wrapper table {
width: 100% !important; // width: 100% !important;
} }
.el-table__body, .el-table__body,
.el-table__footer, .el-table__footer,
.el-table__header { .el-table__header {
table-layout: auto; table-layout: auto;
} }
} }
.dialog {
.xqtitle {
text-align: left;
font-size: 18px;
span { .textarea {
display: inline-block;
width: 5px;
height: 20px;
background: #0d867f;
margin-right: 14px;
vertical-align: middle;
}
}
}
.textarea {
width: 100%; width: 100%;
.el-textarea { .el-textarea {
width: 60%; width: 60%;
} }
} }
.Btn { .Btn {
width: 200px; width: 200px;
margin: 0 auto; margin: 0 auto;
height: 30px;
line-height: 30px;
span { span {
display: inline-block; display: inline-block;
width: 80px; width: 80px;
...@@ -506,20 +860,22 @@ ...@@ -506,20 +860,22 @@
border: 1px solid #0d867f; border: 1px solid #0d867f;
color: #fff; color: #fff;
} }
} }
/deep/ .el-dialog__headerbtn .el-dialog__close { /deep/ .el-dialog__headerbtn .el-dialog__close {
color: #fff; color: #fff;
} }
.zjBtn { .zjBtn {
width: 200px; width: 400px;
text-align: left; text-align: left;
vertical-align: middle;
span { span {
display: inline-block; display: inline-block;
width: 80px; width: 140px;
height: 25px; height: 25px;
line-height: 25px; line-height: 25px;
text-align: center; text-align: center;
border-radius: 5px; border-radius: 5px;
vertical-align: middle;
} }
span:last-of-type { span:last-of-type {
background-color: #4ca6a7; background-color: #4ca6a7;
...@@ -527,14 +883,14 @@ ...@@ -527,14 +883,14 @@
padding: 5px 10px; padding: 5px 10px;
margin-left: 10px; margin-left: 10px;
} }
} }
/deep/ .el-icon-position { /deep/ .el-icon-position {
margin-right: 10px; margin-right: 10px;
} }
/deep/ .el-icon-folder-delete { /deep/ .el-icon-folder-delete {
margin-right: 10px; margin-right: 10px;
} }
.cxItem { .cxItem {
text-align: right; text-align: right;
width: 20%; width: 20%;
.zjquery { .zjquery {
...@@ -547,17 +903,19 @@ ...@@ -547,17 +903,19 @@
line-height: 40px; line-height: 40px;
border-radius: 5px; border-radius: 5px;
} }
} }
.midBtn { .midBtn {
margin: 0 auto; margin: 0 auto;
margin-top: 20px;
span { span {
display: inline-block; display: inline-block;
width: 80px; width: 80px;
height: 25px; height: 29px;
line-height: 25px; line-height: 29px;
text-align: center; text-align: center;
margin-right: 10px; margin-right: 10px;
border-radius: 5px; border-radius: 5px;
box-sizing: border-box;
} }
span:first-of-type { span:first-of-type {
border: 1px solid grey; border: 1px solid grey;
...@@ -565,12 +923,153 @@ ...@@ -565,12 +923,153 @@
span:last-of-type { span:last-of-type {
background-color: #4ca6a7; background-color: #4ca6a7;
color: #fff; color: #fff;
border: 1px solid #4ca6a7;
} }
}
.setTable {
height: 500px;
overflow-y: auto;
overflow-x: scroll;
position: relative;
overflow: auto;
}
.dialog {
// height: 700px;
// overflow-y: auto;
// overflow-x: auto;
.xqtitle {
text-align: left;
font-size: 18px;
border-bottom: 1px solid gainsboro;
padding-bottom: 10px;
span {
display: inline-block;
width: 5px;
height: 20px;
background: #0d867f;
margin-right: 14px;
vertical-align: middle;
} }
/deep/.el-table th.el-table__cell.is-leaf, .el-table td.el-table__cell{ }
/deep/ .el-form {
width: 65%;
flex-wrap: wrap;
padding: 0 10px;
text-align: center; text-align: center;
margin: 100px auto;
border: none;
.fromItem {
text-align: center;
width: 51%;
margin: 0 auto;
margin-bottom: 20px;
.el-input {
width: 226px;
} }
/deep/ .el-table__cell{ .el-select {
width: 226px;
}
}
/deep/ .el-form-item__content {
text-align: left;
}
/deep/ .el-form-item__label {
font-weight: 400;
// color: #000;
width: 160px !important;
}
}
}
/deep/.el-table th.el-table__cell.is-leaf,
.el-table td.el-table__cell {
text-align: center;
}
/deep/ .el-table__cell {
text-align: center; text-align: center;
}
h3 {
text-align: left;
}
/deep/.el-switch__core {
height: 30px;
width: 79px !important;
border-radius: 20px;
}
/deep/.el-switch.is-checked .el-switch__core::after {
margin-left: -28px;
}
/deep/ .el-switch_label {
height: 30px;
line-height: 30px;
}
/deep/.el-switch {
height: 30px;
line-height: 30px;
border-radius: 20px;
}
/deep/ .el-switch__label * {
font-size: 12px;
}
/deep/.el-switch__core:after {
width: 26px;
height: 26px;
}
/deep/.el-switch__label--left {
position: absolute;
left: 30px;
color: #fff;
z-index: -1111;
cursor: default;
user-select: none;
}
/deep/.el-switch__label--right {
position: absolute;
right: 30px;
color: #fff;
z-index: -1111;
cursor: default;
user-select: none;
}
/deep/.el-switch__label--right.is-active {
z-index: 1111;
color: grey !important;
height: 30px;
line-height: 30px;
}
/deep/.el-switch__label--left.is-active {
z-index: 1111;
color: #fff !important;
height: 30px;
line-height: 30px;
}
/deep/ .el-dialog__body {
padding-bottom: 15px;
}
.setscroll {
width: 100%;
height: 650px;
position: relative;
overflow: auto;
}
.dialog {
.eltable {
box-sizing: border-box;
text-align: center;
width: 100%;
min-width: 100%;
} }
}
// ::-webkit-scrollbar {
// width: 6px; // 横向滚动条
// height: 6px; // 纵向滚动条必写
// }
</style> </style>
\ No newline at end of file
src/views/assessChecks/materialAcquisition.vue
...@@ -296,18 +296,6 @@ export default { ...@@ -296,18 +296,6 @@ export default {
planReviewDate: "", planReviewDate: "",
fullName: "", fullName: "",
}, },
rules: {
batchYear: [
{ required: true, message: "请选择批次年度", trigger: "change" },
],
batchName: [
{
required: true,
message: "请选择后评估批次名称",
trigger: "change",
},
],
},
tableData: [], tableData: [],
tableDataQD: [], //清单列表 tableDataQD: [], //清单列表
checkedList: [], checkedList: [],
......
src/views/layout/continerView.vue
...@@ -12,8 +12,13 @@ export default { ...@@ -12,8 +12,13 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.main{ .main{
height: 100%;
padding: 10px; padding: 10px;
padding-top:5px; padding-top:5px;
padding-bottom: 0;
// overflow-y: auto;
// overflow-x: hidden;
// overflow: auto;
} }
</style> </style>
\ No newline at end of file
src/views/layout/index.vue
...@@ -12,7 +12,19 @@ ...@@ -12,7 +12,19 @@
<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>
...@@ -109,7 +121,10 @@ export default { ...@@ -109,7 +121,10 @@ export default {
navigateToChild(num,pushUrl){ navigateToChild(num,pushUrl){
this.active=num this.active=num
this.$router.push({ path: pushUrl }); this.$router.push({ path: pushUrl });
} },
changeSelect(){
},
} }
}; };
</script> </script>
......
src/views/layout/leftBar.vue
<template> <template>
<div class="navbar"> <div class="navbar">
<el-scrollbar style="height: 900px" ref="scroll">
<el-scrollbar style="height:900px;" ref="scroll">
<el-menu <el-menu
router router
class="el-menu-vertical-demo" class="el-menu-vertical-demo"
...@@ -31,7 +30,8 @@ ...@@ -31,7 +30,8 @@
<span class="iconfont treeIcon2">&#xe644;</span> <span class="iconfont treeIcon2">&#xe644;</span>
<span>{{ item2.name }}</span> <span>{{ item2.name }}</span>
</template> </template>
<el-menu-item v-for="(item3, index3) in item2.children" <el-menu-item
v-for="(item3, index3) in item2.children"
:key="index3" :key="index3"
:index="item3.url" :index="item3.url"
class="submenu3" class="submenu3"
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</el-submenu> </el-submenu>
</el-submenu> </el-submenu>
</el-menu> </el-menu>
</el-scrollbar> </el-scrollbar>
</div> </div>
</template> </template>
...@@ -58,10 +58,72 @@ export default { ...@@ -58,10 +58,72 @@ export default {
name: "后评估自查", name: "后评估自查",
url: "", url: "",
children: [ children: [
{ name: "自查流程发起", url: "", children: [] }, {
{ name: "项目自评估", url: "", children: [] }, name: "评估项目辅助选定",
{ name: "自查问题整改", url: "", children: [] }, url: "/mainLayout/auxiliarySelection",
{ name: "自查问题复核", url: "", children: [] }, children: [],
},
{
name: "评估批次确认发布",
url: "/mainLayout/confirmRelease",
children: [],
},
{
name: "评估材料自动获取",
url: "/mainLayout/materialAcquisition",
children: [],
},
// { name: "评估材料自动解析", url: "/mainLayout/materialAnalysis", children: [] },
{
name: "项目辅助检查",
url: "/mainLayout/auxiliaryInspection",
children: [],
},
{
name: "项目评估结果确认更改",
url: "/mainLayout/confirmChanges",
children: [],
},
{
name: "评估结果辅助查看",
url: "/mainLayout/assistedViewing",
children: [],
},
{
name: "问题辅助下发",
url: "/mainLayout/assitedDistribution",
children: [],
},
{
name: "问题辅助查询",
url: "/mainLayout/auxiliaryQuery",
children: [],
},
{
name: "问题辅助反馈",
url: "/mainLayout/assistedFeedback",
children: [],
},
{
name: "申诉辅助确认",
url: "/mainLayout/assistedConfirm",
children: [],
},
{
name: "问题辅助整改",
url: "/mainLayout/assistedRect",
children: [],
},
{
name: "整改辅助核验",
url: "/mainLayout/correctiveAssistanceVerification",
children: [],
},
{
name: "材料同步归档",
url: "/mainLayout/attachSynchronousArchiving",
children: [],
},
], ],
}, },
{ {
...@@ -84,18 +146,56 @@ export default { ...@@ -84,18 +146,56 @@ export default {
children: [], children: [],
}, },
// { name: "评估材料自动解析", url: "/mainLayout/materialAnalysis", children: [] }, // { name: "评估材料自动解析", url: "/mainLayout/materialAnalysis", children: [] },
{ name: "项目辅助检查", url: "/mainLayout/auxiliaryInspection", children: [] }, {
{ name: "项目评估结果确认更改", url: "/mainLayout/confirmChanges", children: [] }, name: "项目辅助检查",
{ name: "评估结果辅助查看", url: "/mainLayout/assistedViewing", children: [] }, url: "/mainLayout/auxiliaryInspection",
{ name: "问题辅助下发", url: "/mainLayout/assitedDistribution", children: [] }, children: [],
{ name: "问题辅助查询", url: "/mainLayout/auxiliaryQuery", children: [] }, },
{ name: "问题辅助反馈", url: "/mainLayout/assistedFeedback", children: [] }, {
{ name: "申诉辅助确认", url: "/mainLayout/assistedConfirm", children: [] }, name: "项目评估结果确认更改",
{ name: "问题辅助整改", url: "/mainLayout/assistedRect", children: [] }, url: "/mainLayout/confirmChanges",
{ name: "整改辅助核验", url: "/mainLayout/correctiveAssistanceVerification", children: [] }, children: [],
{ name: "材料同步归档", },
{
name: "评估结果辅助查看",
url: "/mainLayout/assistedViewing",
children: [],
},
{
name: "问题辅助下发",
url: "/mainLayout/assitedDistribution",
children: [],
},
{
name: "问题辅助查询",
url: "/mainLayout/auxiliaryQuery",
children: [],
},
{
name: "问题辅助反馈",
url: "/mainLayout/assistedFeedback",
children: [],
},
{
name: "申诉辅助确认",
url: "/mainLayout/assistedConfirm",
children: [],
},
{
name: "问题辅助整改",
url: "/mainLayout/assistedRect",
children: [],
},
{
name: "整改辅助核验",
url: "/mainLayout/correctiveAssistanceVerification",
children: [],
},
{
name: "材料同步归档",
url: "/mainLayout/attachSynchronousArchiving", url: "/mainLayout/attachSynchronousArchiving",
children: [] }, children: [],
},
], ],
}, },
{ {
...@@ -105,12 +205,12 @@ export default { ...@@ -105,12 +205,12 @@ export default {
{ {
name: "项目检查问题查询", name: "项目检查问题查询",
url: "/mainLayout/projectCheckQuestionQuery", url: "/mainLayout/projectCheckQuestionQuery",
children: [] children: [],
}, },
{ {
name: "整改反馈查询", name: "整改反馈查询",
url: "/mainLayout/rectificationFeedbackQuery", url: "/mainLayout/rectificationFeedbackQuery",
children: [] children: [],
}, },
], ],
}, },
...@@ -221,25 +321,24 @@ export default { ...@@ -221,25 +321,24 @@ export default {
}, },
], ],
isOpen: false, isOpen: false,
openeds: ['0'],//默认展开导航栏 openeds: ["0"], //默认展开导航栏
activeIndex:"/mainLayout/auxiliarySelection", activeIndex: "/mainLayout/auxiliarySelection",
// openeds:["/mainLayout/confirmRelease"] // openeds:["/mainLayout/confirmRelease"]
}; };
}, },
mounted(){ mounted() {
this.activeIndex = this.$route.path;
this.activeIndex = this.$route.path
}, },
methods: { methods: {
handleOpen(e, a) { handleOpen(e, a) {
this.$nextTick(() => { this.$nextTick(() => {
console.log(this.$refs.scroll,'this.$refs.scroll') console.log(this.$refs.scroll, "this.$refs.scroll");
this.$refs.scroll.update() this.$refs.scroll.update();
}) });
console.log("打开", e, a); console.log("打开", e, a);
if (a.length == 1) { if (a.length == 1) {
console.log('一级菜单') console.log("一级菜单");
let treeIcon1 = document.getElementsByClassName("treeIcon1"); let treeIcon1 = document.getElementsByClassName("treeIcon1");
for (var i = 0; i < treeIcon1.length; i++) { for (var i = 0; i < treeIcon1.length; i++) {
...@@ -248,16 +347,14 @@ export default { ...@@ -248,16 +347,14 @@ export default {
treeIcon1[e].style.transform = "rotate(90deg)"; treeIcon1[e].style.transform = "rotate(90deg)";
} else if (a.length == 2) { } else if (a.length == 2) {
let opened = document.getElementsByClassName("is-opened"); let opened = document.getElementsByClassName("is-opened");
console.log('二级菜单', opened) console.log("二级菜单", opened);
let treeIcon2=opened[0].querySelectorAll('.treeIcon2') let treeIcon2 = opened[0].querySelectorAll(".treeIcon2");
console.log( treeIcon2,'333') console.log(treeIcon2, "333");
for (var i = 0; i < treeIcon2.length; i++) { for (var i = 0; i < treeIcon2.length; i++) {
treeIcon2[i].style.transform = "rotate(0deg)"; treeIcon2[i].style.transform = "rotate(0deg)";
} }
treeIcon2[e.slice(2)].style.transform = "rotate(90deg)"; treeIcon2[e.slice(2)].style.transform = "rotate(90deg)";
} }
}, },
handleClose(e, a) { handleClose(e, a) {
...@@ -267,7 +364,7 @@ export default { ...@@ -267,7 +364,7 @@ export default {
treeIcon1[e].style.transform = "rotate(0deg)"; treeIcon1[e].style.transform = "rotate(0deg)";
} else if (a.length == 2) { } else if (a.length == 2) {
let opened = document.getElementsByClassName("is-opened"); let opened = document.getElementsByClassName("is-opened");
let treeIcon2=opened[0].querySelectorAll('.treeIcon2') let treeIcon2 = opened[0].querySelectorAll(".treeIcon2");
treeIcon2[e.slice(2)].style.transform = "rotate(0deg)"; treeIcon2[e.slice(2)].style.transform = "rotate(0deg)";
} }
}, },
...@@ -279,10 +376,10 @@ export default { ...@@ -279,10 +376,10 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.navbar { .navbar {
width: 235px; width: 235px;
height:100%; height: 100%;
padding-top: 10px; padding-top: 10px;
} }
/deep/.el-menu{ /deep/.el-menu {
border: none !important; border: none !important;
box-sizing: border-box; box-sizing: border-box;
} }
...@@ -291,13 +388,13 @@ export default { ...@@ -291,13 +388,13 @@ export default {
background-color: #63a4a6; background-color: #63a4a6;
margin-bottom: 10px; margin-bottom: 10px;
border-radius: 5px; border-radius: 5px;
box-shadow: 1px 2px 4px 0px #0068624C; box-shadow: 1px 2px 4px 0px #0068624c;
} }
.submenu1 /deep/ .el-submenu__title { .submenu1 /deep/ .el-submenu__title {
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
box-shadow: 1px 2px 4px 0px #0068624C; box-shadow: 1px 2px 4px 0px #0068624c;
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
color: #fff; color: #fff;
...@@ -307,12 +404,12 @@ export default { ...@@ -307,12 +404,12 @@ export default {
background-color: #effbfa; background-color: #effbfa;
margin-top: 8px; margin-top: 8px;
border-radius: 5px; border-radius: 5px;
box-shadow: 1px 2px 4px 0px #0068624C; box-shadow: 1px 2px 4px 0px #0068624c;
} }
.submenu2 /deep/ .el-submenu__title { .submenu2 /deep/ .el-submenu__title {
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
box-shadow: 1px 2px 4px 0px #0068624C; box-shadow: 1px 2px 4px 0px #0068624c;
font-size: 15px; font-size: 15px;
font-weight: bold; font-weight: bold;
color: grey; color: grey;
...@@ -364,7 +461,7 @@ export default { ...@@ -364,7 +461,7 @@ export default {
font-style: normal; font-style: normal;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
} }
.title3{ .title3 {
display: inline-block; display: inline-block;
width: 5px; width: 5px;
height: 5px; height: 5px;
...@@ -373,10 +470,9 @@ export default { ...@@ -373,10 +470,9 @@ export default {
vertical-align: middle; vertical-align: middle;
background-color: #63a4a6; background-color: #63a4a6;
text-align: left; text-align: left;
} }
.submenu3 { .submenu3 {
border-radius:5px; border-radius: 5px;
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
font-size: 15px; font-size: 15px;
...@@ -386,14 +482,14 @@ export default { ...@@ -386,14 +482,14 @@ export default {
padding-left: 40px !important; padding-left: 40px !important;
background-color: #effbfa; background-color: #effbfa;
margin-top: 8px; margin-top: 8px;
box-shadow: 1px 2px 4px 0px #0068624C; box-shadow: 1px 2px 4px 0px #0068624c;
padding-right: 0; padding-right: 0;
} }
.submenu2 /deep/ .is-active{ .submenu2 /deep/ .is-active {
background: rgba(99, 164, 166, 0.6); background: rgba(99, 164, 166, 0.6);
color:#FFF; color: #fff;
} }
.menu-scrollbar /deep/ .el-scrollbar__view { .menu-scrollbar /deep/ .el-scrollbar__view {
height: 100%; /* 设置高度以填满父容器 */ height: 100%; /* 设置高度以填满父容器 */
} }
/deep/.el-scrollbar__thumb { /deep/.el-scrollbar__thumb {
......
src/views/layout/mainLayout.vue
<template> <template>
<div class="layout" > <div class="layout">
<LeftBar class="bar"></LeftBar> <LeftBar class="bar"></LeftBar>
<ContinerView class="continer" id="myElement"> <ContinerView class="continer" id="myElement">
<router-view></router-view> <router-view></router-view>
</ContinerView> </ContinerView>
</div> </div>
</template> </template>
<script> <script>
import ContinerView from './continerView' import ContinerView from "./continerView";
import LeftBar from './leftBar' import LeftBar from "./leftBar";
export default { export default {
components: { components: {
ContinerView, ContinerView,
LeftBar LeftBar,
}, },
data() { data() {
return{ return {
title:'确认更改' title: "确认更改",
} };
}, },
mounted(){ mounted() {
window.addEventListener('resize', this.handleResize); window.addEventListener("resize", this.handleResize);
}, },
methods: { methods: {
handleResize() { handleResize() {
// 处理窗口大小变化的逻辑 // 处理窗口大小变化的逻辑
console.log('Window was resized!'); console.log("Window was resized!");
var element = document.getElementById('myElement'); // 获取元素 var element = document.getElementById("myElement"); // 获取元素
var maxWidth = window.innerWidth; // 窗口宽度 var maxWidth = window.innerWidth; // 窗口宽度
var elementWidth = element.offsetWidth; // 元素宽度 var elementWidth = element.offsetWidth; // 元素宽度
var elementLeft = element.offsetLeft; // 元素左边缘到文档左边缘的距离 var elementLeft = element.offsetLeft; // 元素左边缘到文档左边缘的距离
if (elementLeft + elementWidth > maxWidth) { if (elementLeft + elementWidth > maxWidth) {
// 如果元素右边界超出窗口右边界，将元素左边缘设置为窗口宽度减去元素宽度 // 如果元素右边界超出窗口右边界，将元素左边缘设置为窗口宽度减去元素宽度
element.style.left = maxWidth - elementWidth + 'px'; element.style.left = maxWidth - elementWidth + "px";
} }
} },
},
} };
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.layout{ .layout {
width: 100%; width: 100%;
// height: 100%; // height: 100%;
height: 100vh; height: 100vh;
display: flex; display: flex;
padding: 15px; padding: 15px;
background-color: #fff; background-color: #fff;
overflow: hidden; // overflow: hidden;
.bar{ .bar {
width: 235px; width: 235px;
height: 100%; height: 100%;
} }
.continer{ .continer {
width: 100%; width: 100%;
// height: 100%; height: 100%;
flex:1; // height:86vh;
flex: 1;
box-sizing: border-box; box-sizing: border-box;
// overflow: auto;
} }
}
}
</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!