Skip to content

Administrator / project_progress

Go to a project
Commit 80f3edd1 by liangzhen
Options

合规管理优化

1 parent 83010c0b
Inline Side-by-side
Showing with 175 additions and 62 deletions
src/utils/cache.js
......@@ -113,7 +113,6 @@ export function MaterialsListKY(type) {
}
}
export function generateYearOptions() {
console.log('获取时间')
const currentYear = new Date().getFullYear();
return Array.from({ length: 10 }, (_, i) => currentYear - i);
}
......
src/utils/leftBarRules.js
......@@ -52,7 +52,7 @@ export function trendsRules(type) {
url: "",
children: [
{ name: "合规检查结果", url: "/projectCheck/checkResault", children: [] },
{ name: "合规检查结果确认", url: "/projectCheck/confirmResault", children: [] },
// { name: "合规检查结果确认", url: "/projectCheck/confirmResault", children: [] },
{ name: "合规问题整改核验", url: "/projectCheck/verificationRectify", children: [] },
],
},
......@@ -140,6 +140,19 @@ export function trendsRules(type) {
},
],
},
{
name: "后评估合规性管理",
url: "",
children: [
{
name: "合规性检查规则库构建",
url: "",
children: [
{ name: "自动稽核任务配置", url: "/compliance/taskConfigure", children: [] },
],
},
]
}
];
break
......@@ -381,7 +394,7 @@ export function trendsRules(type) {
url: "",
children: [
{ name: "合规检查结果", url: "/projectCheck/checkResault", children: [] },
{ name: "合规检查结果确认", url: "/projectCheck/confirmResault", children: [] },
// { name: "合规检查结果确认", url: "/projectCheck/confirmResault", children: [] },
{ name: "合规问题整改", url: "/projectCheck/problemRectify", children: [] },
{ name: "合规问题整改核验", url: "/projectCheck/verificationRectify", children: [] },
],
......
src/views/assessChecks/confirmRelease.vue
......@@ -473,13 +473,6 @@
<el-option label="独立建设" value="03"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="承建单位:" prop="projectName" class="fromItem">
<el-input
v-model="ruleFormZJ.projectName"
placeholder="请输入"
clearable
></el-input>
</el-form-item> -->
<el-form-item label="负责人:" prop="personCharge" class="fromItem">
<el-input
v-model="ruleFormZJ.personCharge"
......
src/views/compliance/taskConfigure.vue
......@@ -333,8 +333,8 @@
>
</el-table-column>
</el-table-column>
<el-table-column prop="department" label="承建单位" width="150">
</el-table-column>
<!-- <el-table-column prop="department" label="承建单位" width="150">
</el-table-column> -->
<el-table-column prop="personCharge" label="负责人" width="110">
</el-table-column>
<el-table-column
......@@ -505,11 +505,33 @@
>
<div class="dialog">
<el-form :model="ruleFormZJ" label-width="100px" class="demo-ruleForm">
<el-form-item label="项目年度:" prop="projectYear" class="fromItem">
<el-form-item label="部门:" prop="department" class="fromItem">
<el-input
v-model="ruleFormZJ.department"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
<el-form-item label="项目编码:" prop="projectId" class="fromItem">
<el-input
v-model="ruleFormZJ.projectId"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
<el-form-item label="项目名称:" prop="projectName" class="fromItem">
<el-input
v-model="ruleFormZJ.projectName"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
<el-form-item label="项目年度:" prop="projectYearStr" class="fromItem">
<el-select
v-model="ruleForm.projectYear"
v-model="ruleFormZJ.projectYearStr"
placeholder="请选择"
clearable
multiple
>
<el-option
v-for="(item, index) in yearsList"
......@@ -519,27 +541,31 @@
/>
</el-select>
</el-form-item>
<el-form-item label="项目编码:" prop="projectId" class="fromItem">
<el-input
v-model="ruleFormZJ.projectId"
placeholder="请输入"
<el-form-item label="建设形式:" prop="projectCategory" class="fromItem">
<el-select
v-model="ruleFormZJ.projectCategory"
placeholder="请选择"
clearable
></el-input>
>
<el-option label="统推" value="01"></el-option>
<el-option label="自建" value="02"></el-option>
<el-option label="独立建设" value="03"></el-option>
</el-select>
</el-form-item>
<el-form-item label="项目名称:" prop="projectName" class="fromItem">
<el-form-item label="负责人:" prop="personCharge" class="fromItem">
<el-input
v-model="ruleFormZJ.projectName"
v-model="ruleFormZJ.personCharge"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
<el-form-item label="项目内容:" prop="projectInfo" class="fromItem">
<!-- <el-form-item label="项目内容:" prop="projectInfo" class="fromItem">
<el-input
v-model="ruleFormZJ.projectInfo"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
</el-form-item> -->
<el-form-item class="cxItem">
<span class="zjquery" @click="checkXM()"> 查询 </span>
......@@ -557,18 +583,13 @@
:row-class-name="tableRowClassName"
border
>
<el-table-column type="selection"> </el-table-column>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column prop="department" label="部门" width="150">
</el-table-column>
<el-table-column label="项目编码" width="200" prop="projectId">
</el-table-column>
<el-table-column prop="projectYear" label="项目年度" width="200">
<template slot-scope="scope">
{{ scope.row.projectYear }}年
</template>
<el-table-column label="项目编码" width="150" prop="projectId">
</el-table-column>
<el-table-column
......@@ -604,8 +625,8 @@
>
</el-table-column>
</el-table-column>
<el-table-column prop="department" label="承建单位" width="150">
</el-table-column>
<!-- <el-table-column prop="department" label="承建单位" width="150">
</el-table-column> -->
<el-table-column prop="personCharge" label="负责人" width="110">
</el-table-column>
<el-table-column
......@@ -796,8 +817,8 @@
>
</el-table-column>
</el-table-column>
<el-table-column prop="department" label="承建单位" width="150">
</el-table-column>
<!-- <el-table-column prop="department" label="承建单位" width="150">
</el-table-column> -->
<el-table-column prop="personCharge" label="负责人" width="110">
</el-table-column>
<el-table-column
......@@ -1019,8 +1040,8 @@
>
</el-table-column>
</el-table-column>
<el-table-column prop="department" label="承建单位" width="150">
</el-table-column>
<!-- <el-table-column prop="department" label="承建单位" width="150">
</el-table-column> -->
<el-table-column prop="personCharge" label="负责人" width="110">
</el-table-column>
<el-table-column
......@@ -2120,7 +2141,7 @@ h3 {
.cxItem {
position: absolute;
right: 0;
top: 121px;
// top: 121px;
width: 20%;
bottom: 10px;
.zjquery {
......@@ -2155,6 +2176,10 @@ h3 {
display: none !important;
}
.demo-ruleForm {
position: relative;
margin-bottom: 20px;
}
/deep/ .el-table thead.is-group th.el-table__cell{
background: #f5f5f5;
}
</style>
\ No newline at end of file
src/views/layout/leftBar.vue
......@@ -86,6 +86,10 @@ export default {
}
} else {
this.activeIndex = this.$route.path;
this.$nextTick(() => {
this.$refs.kzMenu.activeIndex = this.$route.path;
});
}
// this.$refs.kzMenu.activeIndex = this.$route.path;
// this.activeIndex = this.$route.path;
......
src/views/postConcentrationCheck/rectificationFeedbackQuery.vue
......@@ -236,7 +236,6 @@ export default {
methods: {
generateYearOptions() {
console.log('获取时间')
const currentYear = new Date().getFullYear();
return Array.from({ length: 10 }, (_, i) => currentYear - i);
},
......
src/views/projectCheck/problemRectify.vue
......@@ -83,7 +83,9 @@
<el-button @click="detailsForm('xq')">
<img class="buttonIcon" src="../../assets/ck.png" />详情</el-button
>
<el-button @click="detailsForm('xf')">
<el-button @click="detailsForm('xf')"
:disabled="confirmdisabled"
:class="confirmdisabled ? 'noclick' : ''">
<i class="el-icon-document-remove"></i
>&nbsp;&nbsp;&nbsp;整改提交</el-button
>
......@@ -401,6 +403,7 @@ export default {
ruleFormdialogXQ: {},
currentPageXQ: "",
pageSizeXQ: "",
confirmdisabled: false,
};
},
mounted() {
......@@ -437,8 +440,10 @@ export default {
if (res.code == "200") {
this.tableData = res.data.records;
this.tableData.forEach((item) => {
if (item.rectificationStatus == 1||!item.rectificationStatus) {
this.$set(item, "rectificationStatusText", "待整改 ");
if(item.rectificationStatus ==0||!item.rectificationStatus){
this.$set(item, "rectificationStatusText", "未下发");
}else if (item.rectificationStatus == 1 ) {
this.$set(item, "rectificationStatusText", "待整改");
} else if (item.rectificationStatus == 2) {
this.$set(item, "rectificationStatusText", "待提交");
} else if (item.rectificationStatus == 3) {
......@@ -446,7 +451,7 @@ export default {
} else if (item.rectificationStatus == 4) {
this.$set(item, "rectificationStatusText", "被退回");
} else if (item.rectificationStatus == 5) {
this.$set(item, "rectificationStatusTextt", "整改完成");
this.$set(item, "rectificationStatusText", "整改完成");
}
this.$set(
item,
......@@ -510,11 +515,18 @@ export default {
},
//主列表选中行信息
handleSelectionChange(selection) {
this.confirmdisabled = false;
if (Array.isArray(selection) && selection.length > 1) {
this.$refs.multipleTable.toggleRowSelection(selection[0], false);
this.$refs.multipleTable.toggleRowSelection(selection[1], true);
}
this.checkedList = this.$refs.multipleTable.selection;
if (this.checkedList[0]) {
this.ruleFormdialog = this.checkedList[0];
if (this.checkedList[0].rectificationStatusText != "待整改") {
this.confirmdisabled = true;
}
}
this.ruleFormdialog = this.checkedList[0];
console.log(this.checkedList, "2222");
},
......@@ -570,6 +582,7 @@ export default {
const formData = new FormData();
formData.append("file", this.file);
formData.append("typeCode",ruleType(row.ruleName) );
formData.append("prjId",this.checkedList[0].projectId);
ossupload(formData)
.then((response) => {
this.$message("上传成功")
......@@ -985,4 +998,7 @@ h3 {
white-space: normal;
height:auto;
}
.noclick {
opacity: 0.5;
}
</style>
\ No newline at end of file
src/views/projectCheck/verificationRectify.vue
......@@ -58,12 +58,15 @@
/>
</el-select>
</el-form-item>
<el-form-item label="问题整改复核状态:" prop="rectificationStatus" class="fromItem">
<el-form-item label="问题状态:" prop="rectificationStatus" class="fromItem">
<el-select
v-model="ruleForm.rectificationStatus"
placeholder="请选择"
clearable
>
<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-option label="被退回" value="4"></el-option>
<el-option label="整改完成" value="5"></el-option>
......@@ -80,7 +83,15 @@
<el-button @click="detailsForm('xq')">
<img class="buttonIcon" src="../../assets/ck.png" />详情</el-button
>
<el-button @click="detailsForm('xf')">
<el-button @click="questionXF()"
:disabled="inspectdisabled"
:class="inspectdisabled ? 'noclick' : ''">
<i class="el-icon-document-remove"></i
>&nbsp;&nbsp;&nbsp;问题下发</el-button
>
<el-button @click="detailsForm('xf')"
:disabled="confirmdisabled"
:class="confirmdisabled ? 'noclick' : ''">
<i class="el-icon-document-remove"></i
>&nbsp;&nbsp;&nbsp;整改复核</el-button
>
......@@ -122,7 +133,7 @@
</el-table-column>
<el-table-column
prop="rectificationStatusText"
label="问题整改复核状态"
label="问题状态"
>
</el-table-column>
</el-table>
......@@ -188,7 +199,7 @@
<el-table-column label="规则名称" width="auto" prop="ruleName">
</el-table-column>
<el-table-column label="问题申诉" width="auto">
<el-table-column label="问题申诉" width="auto" v-if="checkedList[0]&&checkedList[0].rectificationStatus==5">
<template slot-scope="scope">
<el-switch
disabled
......@@ -210,7 +221,7 @@
</el-switch>
</template>
</el-table-column>
<el-table-column prop="ruleType" label="申诉证明材料" width="auto">
<el-table-column prop="ruleType" label="申诉证明材料" width="auto" v-if="checkedList[0]&&checkedList[0].rectificationStatus==5">
<template
slot-scope="scope"
v-if="scope.row.confirmStatus == '1' && scope.row.sszmFileId"
......@@ -223,6 +234,7 @@
prop="ruleType"
label="问题解决佐证材料"
width="auto"
v-if="checkedList[0]&&checkedList[0].rectificationStatus==5"
>
<template
slot-scope="scope"
......@@ -236,6 +248,7 @@
prop="zgfhStatus"
label="问题整改复核"
width="auto"
v-if="checkedList[0]&&checkedList[0].rectificationStatus==5"
>
<template slot-scope="scope">
<el-select
......@@ -401,12 +414,14 @@
<script>
import {
auditTasksResultsNew,
auditTasksRuleProjectLinkZg,
zgxqRuleProjectLink,
savaRuleProjectLink,
tjRuleProjectLink,
ossupload,
downloadObject
downloadObject,
wtxfResults
} from "@/api/index";
import { generateYearOptions, projectCategoryText } from "@/utils/cache";
export default {
......@@ -433,6 +448,8 @@ export default {
ruleFormdialogXQ: {},
currentPageXQ: "",
pageSizeXQ: "",
confirmdisabled: false,
inspectdisabled: false,
};
},
mounted() {
......@@ -456,25 +473,16 @@ export default {
};
Object.assign(params, this.ruleForm);
console.log(params);
let res = await auditTasksRuleProjectLinkZg(params);
let res = await auditTasksResultsNew(params);
if (res.code == "200") {
this.tableData = res.data.records;
this.tableData.forEach((item) => {
if (item.auditFrequency == 0) {
this.$set(item, "auditFrequencyText", "仅一次");
} else if (item.auditFrequency == 1) {
this.$set(item, "auditFrequencyText", "每周");
} else if (item.auditFrequency == 2) {
this.$set(item, "auditFrequencyText", "每月");
} else if (item.auditFrequency == 3) {
this.$set(item, "auditFrequencyText", "每季度");
} else if (item.auditFrequency == 4) {
this.$set(item, "auditFrequencyText", "每年");
}
if (item.rectificationStatus == 1 || !item.rectificationStatus) {
this.$set(item, "rectificationStatusText", "待整改");
if(item.rectificationStatus ==0||!item.rectificationStatus){
this.$set(item, "rectificationStatusText", "未下发");
}else if (item.rectificationStatus == 1 ) {
this.$set(item, "rectificationStatusText", "已下发");
} else if (item.rectificationStatus == 2) {
this.$set(item, "rectificationStatusText", "待提交");
} else if (item.rectificationStatus == 3) {
......@@ -567,11 +575,22 @@ export default {
},
//主列表选中行信息
handleSelectionChange(selection) {
this.confirmdisabled = false
this.inspectdisabled = false
if (Array.isArray(selection) && selection.length > 1) {
this.$refs.multipleTable.toggleRowSelection(selection[0], false);
this.$refs.multipleTable.toggleRowSelection(selection[1], true);
}
this.checkedList = this.$refs.multipleTable.selection;
if (this.checkedList[0]) {
this.ruleFormdialog = this.checkedList[0];
if (this.checkedList[0].rectificationStatusText!= "已提交") {
this.confirmdisabled = true;
}
if (this.checkedList[0].rectificationStatusText!= "未下发") {
this.inspectdisabled = true;
}
}
this.ruleFormdialog = this.checkedList[0];
console.log(this.checkedList, "2222");
},
......@@ -620,6 +639,45 @@ export default {
this.resetForm();
}
},
//问题下发
async questionXF() {
if (this.checkedList.length < 1) {
this.$message("请选择");
return;
}
this.$confirm("是否确认下发?", "提示", {
confirmButtonText: "是",
cancelButtonText: "否",
distinguishCancelAndClose: true,
type: "warning",
})
.then(async () => {
this.checkedList.forEach(item=>{
if(item.confirmStatusText == "已下发") {
this.$message("请选择未下发的项目");
throw new Error("主动跳出循环");
}
})
let prjStrList = "";
let auditId = "";
this.checkedList.forEach((item) => {
prjStrList = prjStrList.concat(item.projectId + ",");
auditId = auditId.concat(item.auditId + ",");
});
let params = {
auditStr: auditId,
prjStr: prjStrList,
};
let res = await wtxfResults(params);
if (res.code == 200) {
this.$message("下发成功");
this.dialogXF = false;
this.resetForm();
}
})
.catch((action) => {});
},
handleFileUpload(event, row, type) {
console.log("来了么");
this.file = event.target.files[0];
......@@ -1022,4 +1080,7 @@ h3 {
position: relative;
overflow: auto;
}
.noclick {
opacity: 0.5;
}
</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!