Skip to content

Administrator / project_progress

Go to a project
Commit 6ed6e0be by liangzhen
Options

更新

1 parent 2ebe0e18
Inline Side-by-side
Showing with 165 additions and 129 deletions
src/api/index.js
......@@ -321,10 +321,14 @@ export function delProject(params){
}
//合规检查结果
//分页
//合规检查结果分页
export function auditTasksResults(params){
return post(`${ARCH_EVALUATION}/auditTasksResults/`, params)
}
//合规检查结果确认分页
export function auditTasksResultsNew(params){
return post(`${ARCH_EVALUATION}/auditTasksResults/ipage`, params)
}
//详情
export function xqauditTasksResults(params){
return post(`${ARCH_EVALUATION}/auditTasksResults/xq`, params)
......
src/views/compliance/taskConfigure.vue
......@@ -1164,15 +1164,12 @@ export default {
ruleFormdialogBJ: {
auditName: "",
auditTime: "",
auditFrequency: "",
auditType: "",
},
dialogAdd: false,
ruleFormdialogAdd: {
auditName: "",
delivery: true,
auditFrequency: "",
auditTime: "",
auditType: "",
},
......@@ -1301,17 +1298,7 @@ export default {
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", "每年");
}
});
this.total = res.data.total * 1;
}
......
src/views/projectCheck/checkResault.vue
......@@ -143,7 +143,7 @@
<el-input v-model="ruleFormdialogXQ.projectCategory" disabled></el-input>
</el-form-item> -->
</el-form>
<p class="zjBtn">稽核结果</p>
<p class="zjBtn">稽核异常项目清单</p>
<div class="setscroll">
<el-table
:data="XQtableData"
......@@ -200,7 +200,7 @@ export default {
listData: {},
showButton: true,
ruleForm: {
dates:[]
},
ruleFormdialogXQ: {},
currentPageXQ:1,
......
src/views/projectCheck/confirmResault.vue
......@@ -7,19 +7,15 @@
label-width="100px"
class="demo-ruleForm"
>
<el-form-item label="稽核名称:" prop="auditName" class="fromItem">
<el-form-item label="稽核名称:" prop="auditName" class="fromItem">
<el-input
v-model="ruleForm.auditName"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
<el-form-item
label="稽核时间:"
prop="auditTime"
class="fromItem"
>
<el-date-picker
<el-form-item label="稽核时间:" prop="auditTime" class="fromItem">
<el-date-picker
@change="timeChange"
v-model="ruleForm.dates"
style="width: 240px"
......@@ -58,15 +54,18 @@
/>
</el-select>
</el-form-item>
<el-form-item label="结果确认状态:" prop="confirmStatus" class="fromItem">
<el-form-item
label="结果确认状态:"
prop="rectificationStatus"
class="fromItem"
>
<el-select
v-model="ruleForm.confirmStatus"
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="0"></el-option>
<el-option label="已下发" value="1"></el-option>
</el-select>
</el-form-item>
......@@ -84,7 +83,7 @@
<i class="el-icon-chat-dot-square"></i
>&nbsp;&nbsp;&nbsp;结果确认</el-button
> -->
<el-button @click="detailsForm('xf')">
<el-button @click="resaultXF()">
<i class="el-icon-document-remove"></i
>&nbsp;&nbsp;&nbsp;问题下发</el-button
>
......@@ -95,17 +94,18 @@
@selection-change="handleSelectionChange"
ref="multipleTable"
:data="tableData"
tooltip-effect="dark myTooltips"
tooltip-effect="dark myTooltips"
style="width: 100%"
header-cell-class-name="custom-th-background"
class="eltable"
:row-class-name="tableRowClassName"
border
>
<el-table-column label="序号" width="55" type="index">
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="稽核名称" prop="auditName" width="320"> </el-table-column>
<el-table-column label="稽核名称" prop="auditName" width="320">
</el-table-column>
<el-table-column prop="auditTime" label="稽核时间" width="250">
</el-table-column>
<el-table-column prop="projectId" label="项目编码" width="220">
......@@ -124,7 +124,11 @@
</el-table-column>
<el-table-column prop="projectCategory" label="建设形式" width="200">
</el-table-column>
<el-table-column prop="confirmStatusText" label="结果确认状态">
<el-table-column
prop="confirmStatusText"
label="结果确认状态"
width="200"
>
</el-table-column>
</el-table>
</div>
......@@ -132,7 +136,7 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
:page-sizes="[10, 15, 20, 50,100]"
:page-sizes="[10, 15, 20, 50, 100]"
:page-size="1000"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
......@@ -156,17 +160,16 @@
<el-form-item label="稽核名称:" prop="auditName" class="fromItem">
<el-input v-model="ruleFormdialogXQ.auditName" disabled></el-input>
</el-form-item>
<el-form-item label="稽核时间:" prop="auditTime" class="fromItem">
<el-input v-model="ruleFormdialogXQ.auditTime" disabled></el-input>
</el-form-item>
</el-form>
<p class="zjBtn">稽核稽核结果</p>
<div class="setscroll">
<el-table
:data="XQtableData"
tooltip-effect="dark myTooltips"
tooltip-effect="dark myTooltips"
style="width: 100%"
header-cell-class-name="custom-th-background"
class="eltable"
......@@ -176,11 +179,10 @@
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column label="规则名称" width="auto" prop="ruleName">
</el-table-column>
<el-table-column prop="ruleType" label="规则类型" width="auto">
<el-table-column label="规则名称" width="auto" prop="ruleName">
</el-table-column>
<!-- <el-table-column prop="ruleType" label="规则类型" width="auto">
</el-table-column> -->
<el-table-column
prop="projectName"
label="稽核异常项目清单"
......@@ -243,7 +245,7 @@
<div class="setscroll">
<el-table
:data="XQtableData"
tooltip-effect="dark myTooltips"
tooltip-effect="dark myTooltips"
style="width: 100%"
header-cell-class-name="custom-th-background"
class="eltable"
......@@ -253,11 +255,10 @@
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column label="规则名称" width="auto" prop="ruleName">
</el-table-column>
<el-table-column prop="ruleType" label="规则类型" width="auto">
</el-table-column>
<!-- <el-table-column prop="ruleType" label="规则类型" width="auto">
</el-table-column> -->
<el-table-column
prop="projectName"
label="稽核异常项目清单"
......@@ -268,9 +269,7 @@
<el-table-column label="操作" width="130">
<template slot-scope="scope">
<el-button
@click="
handleClick(scope.row, scope.$index, XQtableData)
"
@click="handleClick(scope.row, scope.$index, XQtableData)"
type="text"
size="small"
>删除</el-button
......@@ -291,8 +290,8 @@
>
</el-pagination> -->
<p class="midBtn">
<span @click="cancelXQ()">取消</span
><span @click="saveXF()">结果确认</span>
<span @click="cancelXQ()">取消</span>
<!-- <span @click="saveXF()">结果确认</span> -->
<span @click="resaultXF()">结果下发</span>
</p>
</div>
......@@ -302,7 +301,11 @@
<script>
import {
auditTasksResults, xqauditTasksResults,scauditTasksResults,jgxqResults,wtxfResults
auditTasksResultsNew,
xqauditTasksResults,
scauditTasksResults,
jgxqResults,
wtxfResults,
} from "@/api/index";
import { generateYearOptions, projectCategoryText } from "@/utils/cache";
export default {
......@@ -315,10 +318,8 @@ export default {
XFtableData: [],
dialogXF: false,
showButton: true,
ruleForm: {
},
ruleFormdialog:{},
ruleForm: {},
ruleFormdialog: {},
tableData: [],
checkedList: [],
......@@ -329,8 +330,8 @@ export default {
XQtableData: [],
ruleFormdialogXQ: {},
currentPageXQ:'',
pageSizeXQ:'',
currentPageXQ: "",
pageSizeXQ: "",
};
},
mounted() {
......@@ -342,7 +343,7 @@ export default {
//给后端的参数
this.ruleForm.auditStartTime = time[0];
this.ruleForm.auditEndTime = time[1];
}else{
} else {
this.ruleForm.auditStartTime = "";
this.ruleForm.auditEndTime = "";
}
......@@ -354,18 +355,19 @@ export default {
};
Object.assign(params, this.ruleForm);
console.log(params);
let res = await auditTasksResults(params);
let res = await auditTasksResultsNew(params);
if (res.code == "200") {
this.tableData = res.data.records;
this.tableData.forEach((item) => {
if (item.confirmStatus == 0||item.confirmStatus==null) {
this.$set(item, "confirmStatusText", "未确认");
} else if (item.confirmStatus == 1) {
if (
item.rectificationStatus == 0 ||
item.rectificationStatus == null
) {
this.$set(item, "confirmStatusText", "未下发");
} else if (item.confirmStatus == 2) {
} else {
this.$set(item, "confirmStatusText", "已下发");
}
}
this.$set(
item,
"projectCategory",
......@@ -381,19 +383,20 @@ export default {
this.pageSize = 10;
this.ruleForm.auditStartTime = "";
this.ruleForm.auditEndTime = "";
this.ruleForm.dates=[]
this.ruleForm.dates = [];
this.submitForm();
},
//详情
async detailsForm(type) {
if (this.checkedList.length != 1) {
this.$message("请选择");
this.$message("请选择一条项目进行查看");
return;
}
let params = {
current: this.currentPageXQ,
pageSize: this.pageSizeXQ,
auditId: this.checkedList[0].auditId,
projectId: this.checkedList[0].projectId,
};
let res = await xqauditTasksResults(params);
if (res.code == 200) {
......@@ -403,19 +406,19 @@ export default {
this.checkedList[0].auditEndTime,
];
this.XQtableData = res.data.records;
console.log(this.XQtableData,'XQtableDataXQtableData')
if(type=='xq'){
this.dialog = true;
}else{
if (this.checkedList[0].confirmStatusText == '已下发') {
this.$message("已完成下发");
return;
}
this.dialogXF = true;
}
console.log(this.XQtableData, "XQtableDataXQtableData");
if (type == "xq") {
this.dialog = true;
} else {
if (this.checkedList[0].confirmStatusText == "已下发") {
this.$message("已完成下发");
return;
}
this.dialogXF = true;
}
}
},
send() {},
//表格颜色
tableRowClassName({ row, rowIndex }) {
......@@ -426,12 +429,12 @@ export default {
},
//主列表选中行信息
handleSelectionChange(selection) {
if (Array.isArray(selection) && selection.length > 1) {
this.$refs.multipleTable.toggleRowSelection(selection[0], false);
this.$refs.multipleTable.toggleRowSelection(selection[1], true);
}
// 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;
this.ruleFormdialog = this.checkedList[0];
// this.ruleFormdialog = this.checkedList[0];
console.log(this.checkedList, "2222");
},
handleSizeChange(val) {
......@@ -446,41 +449,69 @@ export default {
},
cancelXQ() {
this.dialog = false;
this.dialogXF=false;
this.dialogXF = false;
},
async handleClick(row, index, rows) {
console.log("删除", row);
rows.splice(index, 1);
this.XQtableData = rows;
let params={
let params = {
auditId: this.checkedList[0].auditId,
ruleId:row.ruleId,
projectId:row.projectId,
}
let res= await scauditTasksResults(params)
ruleId: row.ruleId,
projectId: row.projectId,
};
let res = await scauditTasksResults(params);
},
//结果确认
async saveXF(){
let params={
async saveXF() {
let params = {
auditId: this.checkedList[0].auditId,
}
let res= await jgxqResults(params)
if(res.code==200){
this.$message('确认完成')
projectId: this.checkedList[0].projectId,
};
let res = await jgxqResults(params);
if (res.code == 200) {
this.$message("确认完成");
}
},
//结果下发
async resaultXF(){
let params={
auditId: this.checkedList[0].auditId,
}
let res= await wtxfResults(params)
if(res.code==200){
this.$message('下发成功')
this.dialogXF=false;
this.resetForm();
async resaultXF() {
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) => {});
},
},
};
</script>
......@@ -776,7 +807,6 @@ h3 {
background-color: #fff;
color: #333;
}
}
.setscrollOut {
width: 100%;
......
src/views/projectCheck/problemRectify.vue
......@@ -64,11 +64,11 @@
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="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>
</el-select>
</el-form-item>
......@@ -324,20 +324,23 @@
</template>
</el-table-column>
<el-table-column prop="ruleType" label="申诉证明材料" width="auto">
<template slot-scope="scope">
<template slot-scope="scope" v-if="scope.row.confirmStatus == '1'">
<el-tag type="info" v-if="scope.row.sszmFileName" closable size="small" @close="handleClose(scope)" >{{scope.row.sszmFileName}}</el-tag>
<input
v-else
type="file"
@change="handleFileUpload($event,scope.row,'sszmFileId')"
v-if="scope.row.confirmStatus == '1'"
/>
</template>
</el-table-column>
<el-table-column prop="ruleType" label="问题解决佐证材料" width="auto">
<template slot-scope="scope">
<el-tag type="info" v-if="scope.row.sszzFileName" closable size="small" @close="handleCloseZZ(scope)" >{{scope.row.sszzFileName}}</el-tag>
<input
v-else
type="file"
@change="handleFileUpload($event,scope.row,'sszzFileId')"
v-if="scope.row.confirmStatus == '1'"
/>
</template>
</el-table-column>
......@@ -404,6 +407,14 @@ export default {
this.submitForm();
},
methods: {
handleClose(fileName){
// console.log('关闭',fileName)
fileName.row.sszmFileName = ""
},
handleCloseZZ(fileName){
// console.log('关闭',fileName)
fileName.row.sszzFileName = ""
},
timeChange(time) {
if (time) {
//给后端的参数
......@@ -426,15 +437,15 @@ export default {
if (res.code == "200") {
this.tableData = res.data.records;
this.tableData.forEach((item) => {
if (item.rectificationStatus == 0||!item.rectificationStatus) {
if (item.rectificationStatus == 1||!item.rectificationStatus) {
this.$set(item, "rectificationStatusText", "待整改 ");
} else if (item.rectificationStatus == 1) {
this.$set(item, "rectificationStatusText", "待提交");
} else if (item.rectificationStatus == 2) {
this.$set(item, "rectificationStatusText", "已提交");
this.$set(item, "rectificationStatusText", "待提交");
} else if (item.rectificationStatus == 3) {
this.$set(item, "rectificationStatusText", "已提交");
} else if (item.rectificationStatus == 4) {
this.$set(item, "rectificationStatusText", "被退回");
} else if (item.rectificationStatus == 2) {
} else if (item.rectificationStatus == 5) {
this.$set(item, "rectificationStatusTextt", "整改完成");
}
this.$set(
......@@ -560,6 +571,7 @@ export default {
formData.append("file", this.file);
ossupload(formData)
.then((response) => {
this.$message("上传成功")
console.log(response);
this.file = [];
this.$set(row, type, response.data.fileId);
......@@ -968,4 +980,8 @@ h3 {
position: relative;
overflow: auto;
}
/deep/ .el-tag{
white-space: normal;
height:auto;
}
</style>
\ No newline at end of file
src/views/projectCheck/verificationRectify.vue
......@@ -64,11 +64,9 @@
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="3"></el-option>
<el-option label="被退回" value="4"></el-option>
<el-option label="整改完成" value="5"></el-option>
</el-select>
</el-form-item>
......@@ -475,15 +473,15 @@ export default {
this.$set(item, "auditFrequencyText", "每年");
}
if (item.rectificationStatus == 0 || !item.rectificationStatus) {
if (item.rectificationStatus == 1 || !item.rectificationStatus) {
this.$set(item, "rectificationStatusText", "待整改");
} else if (item.rectificationStatus == 1) {
this.$set(item, "rectificationStatusText", "待提交");
} else if (item.rectificationStatus == 2) {
this.$set(item, "rectificationStatusText", "已提交");
this.$set(item, "rectificationStatusText", "待提交");
} else if (item.rectificationStatus == 3) {
this.$set(item, "rectificationStatusText", "被退回");
this.$set(item, "rectificationStatusText", "已提交");
} else if (item.rectificationStatus == 4) {
this.$set(item, "rectificationStatusText", "被退回");
} else if (item.rectificationStatus == 5) {
this.$set(item, "rectificationStatusText", "整改完成");
}
this.$set(
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!