Commit 648d4684 by liangzhen

暂存一下

1 parent 4e246c6c
......@@ -317,11 +317,11 @@ export function trendsRules(type) {
// url: "/mainLayout/assistedFeedback",
// children: [],
// },
{
name: "申诉确认",
url: "/mainLayout/assistedConfirm",
children: [],
},
// {
// name: "申诉确认",
// url: "/mainLayout/assistedConfirm",
// children: [],
// },
// {
// name: "问题整改",
// url: "/mainLayout/assistedRect",
......
......@@ -92,13 +92,20 @@
<el-button @click="detailsForm('ruleForm')">
<img class="buttonIcon" src="../../assets/ck.png" />详情</el-button
>
<el-button @click="inspectNexts()"
<el-button
@click="inspectNexts()"
:disabled="inspectdisabled"
:class="inspectdisabled ? 'noclick' : ''"
><i class="el-icon-tickets"></i> &nbsp;&nbsp;合规性检查评估</el-button
>
<!-- <el-button @click="submitNexts()"
><i class="el-icon-finished"></i> &nbsp;&nbsp;提交问题清单</el-button
> -->
<el-button @click="rectificationReview('ruleForm')">
<el-button
@click="rectificationReview('ruleForm')"
:disabled="confirmdisabled"
:class="confirmdisabled ? 'noclick' : ''"
>
<i class="el-icon-chat-dot-square"></i
>&nbsp;&nbsp;&nbsp;整改复核</el-button
>
......@@ -135,7 +142,8 @@
</el-table-column>
<el-table-column prop="expertName" label="评审专家"> </el-table-column>
<el-table-column prop="projectId" label="项目编码" width="120"> </el-table-column>
<el-table-column prop="projectId" label="项目编码" width="120">
</el-table-column>
<el-table-column
prop="projectName"
label="项目名称"
......@@ -149,7 +157,11 @@
</el-table-column>
<el-table-column prop="projectCategory" label="建设形式" width="120">
</el-table-column>
<el-table-column prop="postEvalStateText" label="项目审核状态 " width="120">
<el-table-column
prop="postEvalStateText"
label="项目审核状态 "
width="120"
>
</el-table-column>
<!-- <el-table-column prop="reviewStatusText" label="项目审核状态" width="120">
</el-table-column> -->
......@@ -180,8 +192,8 @@
@close="closed"
>
<div class="dialog">
<h3 v-if="checkedList[0]&&checkedList[0].projectName">
项目名称:{{checkedList[0].projectName}}
<h3 v-if="checkedList[0] && checkedList[0].projectName">
项目名称:{{ checkedList[0].projectName }}
</h3>
<div class="continer">
<p class="xqtitle"><span></span>问题清单</p>
......@@ -211,7 +223,12 @@
width="200"
>
</el-table-column>
<el-table-column label="检查说明" prop="checkDesc" width="auto" show-overflow-tooltip>
<el-table-column
label="检查说明"
prop="checkDesc"
width="auto"
show-overflow-tooltip
>
</el-table-column>
<el-table-column label="评估问题" prop="evalQues" width="300">
</el-table-column>
......@@ -246,21 +263,24 @@
</template>
</el-table-column>
<el-table-column label="附加解释材料" prop="fileId" width="400">
<!-- <template slot-scope="scope" v-if="scope.row.confirmStatus=='1'">
<input type="file" @change="handleFileUpload($event,scope.row, 'fileId')" />
</template> -->
<template
slot-scope="scope"
v-if="scope.row.confirmStatus == '1' && scope.row.fileId"
>
{{ scope.row.fileName }}
<el-tag
v-if="scope.row.fileName"
size="small"
@click="handleClickXZ(scope.row.fileId, scope.row.fileName)"
>{{ scope.row.fileName }}</el-tag
>
<!-- {{ scope.row.fileName }}
<el-button
@click="handleClickXZ(scope.row.fileId, scope.row.fileName)"
>下载</el-button
>
> -->
</template>
</el-table-column>
<el-table-column
<!-- <el-table-column
label="复核情况"
prop="rectificationStatus"
width="200"
......@@ -281,16 +301,16 @@
<el-option label="申诉通过" :value="3"></el-option>
</el-select>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="上传整改材料" width="400">
<template slot-scope="scope" v-if="scope.row.zgFileId">
<el-tag
size="small"
v-for="(tag,index) in scope.row.tags"
v-for="(tag, index) in scope.row.tags"
:key="index"
@click="handleClickXZ(scope.row.tagId[index], tag)"
>
{{tag}}
{{ tag }}
</el-tag>
<!-- {{ scope.row.zgName}}
<el-button
......@@ -301,7 +321,18 @@
</el-table-column>
<el-table-column label="情况说明" prop="zgqkFileId" width="400">
<template slot-scope="scope" v-if="scope.row.zgqkFileId">
{{ scope.row.zgqkFileName }}
<el-tag
v-if="scope.row.zgqkFileName"
size="small"
@click="
handleClickXZ(
scope.row.zgqkFileId,
scope.row.zgqkFileName
)
"
>{{ scope.row.zgqkFileName }}</el-tag
>
<!-- {{ scope.row.zgqkFileName }}
<el-button
@click="
handleClickXZ(
......@@ -310,7 +341,7 @@
)
"
>下载</el-button
>
> -->
</template>
</el-table-column>
<el-table-column
......@@ -398,11 +429,13 @@ export default {
mergingPos: 0,
mergingRows: [],
tableDataQR: [],
confirmdisabled: false,
inspectdisabled: false,
};
},
mounted() {
console.log(this.$route.query,'this.$route.query')
this.ruleForm.batchName=this.$route.query.batchName
console.log(this.$route.query, "this.$route.query");
this.ruleForm.batchName = this.$route.query.batchName;
this.submitForm();
},
methods: {
......@@ -450,8 +483,8 @@ export default {
let arr = [];
let arrID = [];
if (item.zgName) {
arr =item.zgName.split(',')
arrID =item.zgFileId.split(',')
arr = item.zgName.split(",");
arrID = item.zgFileId.split(",");
this.$set(item, "tags", arr);
this.$set(item, "tagId", arrID);
}
......@@ -501,7 +534,7 @@ export default {
//给后端的参数
this.ruleForm.createStartTime = time[0];
this.ruleForm.createEndTime = time[1];
}else{
} else {
this.ruleForm.createStartTime = "";
this.ruleForm.createEndTime = "";
}
......@@ -510,12 +543,12 @@ export default {
let res = await bcrectificationVerification(this.tableDataQR);
if (res.code == "200") {
// this.dialogQR = false;
this.$message('保存成功')
this.$message("保存成功");
this.resetForm();
}
},
async savetj() {
console.log('提交')
console.log("提交");
let res = await tjrectificationVerification(this.tableDataQR);
if (res.code == "200") {
this.dialogQR = false;
......@@ -526,25 +559,22 @@ export default {
}
},
//提交归档
async subfinished(){
if(sessionStorage.getItem('authorName')==3){
this.$message('只有专家可以操作归档')
async subfinished() {
if (sessionStorage.getItem("authorName") == 3) {
this.$message("只有专家可以操作归档");
}
console.log('只有专家可以操作归档')
let params={
projectId:this.checkedList[0].projectId,
batchId:this.checkedList[0].batchId
console.log("只有专家可以操作归档");
let params = {
projectId: this.checkedList[0].projectId,
batchId: this.checkedList[0].batchId,
};
let res = await gdrectificationVerification(params);
if (res.code == "200") {
this.$message("归档成功");
} else {
this.$message("归档失败");
}
let res= await gdrectificationVerification(params)
if(res.code=='200'){
this.$message('归档成功')
}else{
this.$message('归档失败')
}
},
async submitForm() {
let params = {
......@@ -566,9 +596,9 @@ export default {
this.$set(item, "postEvalStateText", "待评估");
} else if (item.postEvalState == 2) {
this.$set(item, "postEvalStateText", "需整改");
}else if (item.postEvalState == 3) {
} else if (item.postEvalState == 3) {
this.$set(item, "postEvalStateText", "已整改");
}else if (item.postEvalState == 4) {
} else if (item.postEvalState == 4) {
this.$set(item, "postEvalStateText", "已归档");
}
// else if (item.postEvalState == 5) {
......@@ -592,7 +622,7 @@ export default {
this.pageSize = 10;
this.ruleForm.createStartTime = "";
this.ruleForm.createEndTime = "";
this.ruleForm.dates=[]
this.ruleForm.dates = [];
this.submitForm();
},
//合规性检查评估
......@@ -707,11 +737,22 @@ export default {
},
//主列表选中行信息
handleSelectionChange(selection) {
this.inspectdisabled = false;
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].postEvalStateText != "已整改") {
this.confirmdisabled = true;
}
if (this.checkedList[0].postEvalStateText != "待评估") {
this.inspectdisabled = true;
}
}
this.ruleFormdialog = this.checkedList[0];
console.log(this.checkedList, "2222");
},
......@@ -1003,7 +1044,6 @@ h3 {
background-color: #fff;
color: grey;
}
}
.setTable {
height: 560px;
......@@ -1019,15 +1059,16 @@ h3 {
}
/deep/.el-table__fixed-body-wrapper .el-table__body {
padding-bottom: 6px; // 6px为横向滚动条高度
}
}
/deep/.el-table--scrollable-x .el-table__body-wrapper {
overflow-x: hidden !important;
}
}
/deep/ .el-tag{
/deep/ .el-tag {
white-space: normal;
height:auto;
height: auto;
}
.noclick {
opacity: 0.5;
}
</style>
\ No newline at end of file
......@@ -1212,11 +1212,25 @@ export default {
this.$message("该项目已撤回");
return;
}
this.$confirm("是否撤回?", "提示", {
confirmButtonText: "是",
cancelButtonText: "否",
distinguishCancelAndClose: true,
type: "warning",
})
.then(async () => {
let res = await chEvalBatchInfo(this.checkedList[0]);
if (res.code == "200") {
this.$message('已撤回')
this.resetForm();
}
})
.catch((action) => {});
// let res = await chEvalBatchInfo(this.checkedList[0]);
// if (res.code == "200") {
// this.$message('已撤回')
// this.resetForm();
// }
},
},
};
......
......@@ -215,6 +215,7 @@ export default {
path: "/mainLayout/auxiliaryInspection",
});
this.$message("提交成功");
} else {
this.$message("提交失败");
}
......
......@@ -923,7 +923,9 @@ export default {
fbProjectInfo(params).then((res) => {
this.dialogAdd = false;
this.expertIdList = expertIdList;
this.$message('提交成功')
this.resetForm();
});
},
savepro() {
......@@ -947,6 +949,7 @@ export default {
console.log(params, "222");
// return
bcProjectInfo(params).then((res) => {
this.$message('保存成功')
// this.dialogAdd = false;
this.expertIdList = expertIdList;
// this.resetForm();
......@@ -998,6 +1001,7 @@ export default {
batchId: this.checkedList[0].batchId,
});
if ((res.code = "200")) {
this.$message('已撤回')
this.resetForm();
}
})
......
......@@ -105,10 +105,10 @@
<el-button @click="detailsForm()">
<img class="buttonIcon" src="../../assets/ck.png" />详情</el-button
>
<el-button @click="submitNexts()"
<el-button @click="submitNexts()" :disabled="subdisabled" :class="subdisabled?'noclick':''"
><i class="el-icon-finished"></i> 提交评估材料</el-button
>
<el-button @click="confirm()">
<el-button @click="confirm()" :disabled="confirmdisabled" :class="confirmdisabled?'noclick':''">
<i class="el-icon-chat-dot-square"></i
>&nbsp;&nbsp;&nbsp;问题整改</el-button
>
......@@ -258,7 +258,7 @@
:append-to-body="false"
@close="closeDialog"
>
<div class="dialog">
<div class="dialogFrom">
<p class="xqtitle"><span></span>批次详情</p>
<el-form
:model="ruleFormdialog"
......@@ -499,7 +499,8 @@ export default {
mergingRows: [],
tableDataQR: [],
fileList:[],
confirmdisabled:false
subdisabled:false,
confirmdisabled:false,
};
},
watch: {
......@@ -625,6 +626,7 @@ export default {
async saveSubmit() {
let res = await wtzgxfProblemRectification(this.tableDataQR);
if (res.code == "200") {
this.$message("提交成功");
this.dialogQR = false;
this.resetForm();
} else {
......@@ -785,6 +787,7 @@ export default {
//主列表选中行信息
handleSelectionChange(selection) {
this.confirmdisabled=false
this.subdisabled=false
if (Array.isArray(selection) && selection.length > 1) {
this.$refs.multipleTable.toggleRowSelection(selection[0], false);
this.$refs.multipleTable.toggleRowSelection(selection[1], true);
......@@ -795,6 +798,9 @@ export default {
if(this.checkedList[0].postEvalStateText!='需整改'){
this.confirmdisabled=true
}
if(this.checkedList[0].postEvalStateText!='材料未上传'){
this.subdisabled=true
}
}
console.log(this.checkedList, "2222");
},
......@@ -1288,5 +1294,8 @@ h3 {
// /deep/ .el-table .cell{
// padding-right: 0;
// }
.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!