Skip to content

Administrator / project_progress

Go to a project
Commit e087fe0b by liangzhen
Options

新增状态字段

1 parent d8b6f8bf
Inline Side-by-side
Showing with 227 additions and 74 deletions
src/views/assessChecks/assistedConfirm.vue
...@@ -86,9 +86,16 @@ ...@@ -86,9 +86,16 @@
</el-table-column> </el-table-column>
<el-table-column prop="batchName" label="后评估批次名称"> <el-table-column prop="batchName" label="后评估批次名称">
</el-table-column> </el-table-column>
<el-table-column
prop="batchStateText"
label="后评估批次状态"
width="auto"
>
</el-table-column>
<el-table-column prop="projectName" label="评估项目名称" show-overflow-tooltip > <el-table-column prop="projectName" label="评估项目名称" show-overflow-tooltip >
</el-table-column> </el-table-column>
<el-table-column prop="reviewText" label="项目审核状态">
</el-table-column>
<el-table-column prop="projectCategory" label="建设形式"> <el-table-column prop="projectCategory" label="建设形式">
</el-table-column> </el-table-column>
<!-- <el-table-column prop="projectStatus" label="项目建设阶段"> <!-- <el-table-column prop="projectStatus" label="项目建设阶段">
...@@ -102,10 +109,10 @@ ...@@ -102,10 +109,10 @@
</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="postEvalStateText" label="复核状态"> <el-table-column prop="postEvalStateText" label="申诉状态">
</el-table-column> </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="planReviewDate" label="评估日期"> </el-table-column>
</el-table> </el-table>
</div> </div>
<el-pagination <el-pagination
...@@ -391,10 +398,28 @@ export default { ...@@ -391,10 +398,28 @@ export default {
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 >= "4") { if (item.appealStatus == "0") {
this.$set(item, "postEvalStateText", "复核已下发"); this.$set(item, "postEvalStateText", "未申诉");
} else { } else if (item.appealStatus == "1") {
this.$set(item, "postEvalStateText", "复核未下发"); this.$set(item, "postEvalStateText", "已申诉");
} else if (item.appealStatus == "2") {
this.$set(item, "postEvalStateText", "申诉驳回");
}else if (item.appealStatus == "3") {
this.$set(item, "postEvalStateText", "申诉通过");
}
if (item.batchState == "3") {
this.$set(item, "batchStateText", "执行中");
} else if (item.batchState == "4") {
this.$set(item, "batchStateText", "已撤回");
} else if (item.batchState == "5") {
this.$set(item, "batchStateText", "已完成");
}
if (item.reviewStatus == "0") {
this.$set(item, "reviewText", "无问题");
} else if (item.reviewStatus == "1") {
this.$set(item, "reviewText", "需整改");
} else if (item.reviewStatus == "2") {
this.$set(item, "reviewText", "已整改");
} }
this.$set(item, "projectCategory",projectCategoryText(item.projectCategory)); this.$set(item, "projectCategory",projectCategoryText(item.projectCategory));
...@@ -592,10 +617,10 @@ export default { ...@@ -592,10 +617,10 @@ export default {
this.$message("请选择一条数据进行复核"); this.$message("请选择一条数据进行复核");
return; return;
} }
if (this.checkedList[0].postEvalStateText == "复核已下发") { // if (this.checkedList[0].postEvalStateText == "复核已下发") {
this.$message("请选择未下发的数据"); // this.$message("请选择未下发的数据");
return; // return;
} // }
this.dialogSS = true; this.dialogSS = true;
let params = { let params = {
projectId: this.checkedList[0].projectId, projectId: this.checkedList[0].projectId,
......
src/views/assessChecks/assistedFeedback.vue
...@@ -103,13 +103,20 @@ ...@@ -103,13 +103,20 @@
</el-table-column> </el-table-column>
<el-table-column prop="batchName" label="后评估批次名称"> <el-table-column prop="batchName" label="后评估批次名称">
</el-table-column> </el-table-column>
<el-table-column
prop="batchStateText"
label="后评估批次状态"
width="auto"
>
</el-table-column>
<el-table-column <el-table-column
prop="projectName" prop="projectName"
label="评估项目名称" label="评估项目名称"
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column prop="reviewText" label="项目审核状态">
</el-table-column>
<el-table-column prop="projectCategory" label="建设形式"> <el-table-column prop="projectCategory" label="建设形式">
</el-table-column> </el-table-column>
<!-- <el-table-column prop="projectStatus" label="项目建设阶段"> <!-- <el-table-column prop="projectStatus" label="项目建设阶段">
...@@ -128,7 +135,7 @@ ...@@ -128,7 +135,7 @@
<el-table-column prop="reviewStatusText" label="问题整改状态"> <el-table-column prop="reviewStatusText" label="问题整改状态">
</el-table-column> </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="planReviewDate" label="评估日期"> </el-table-column>
</el-table> </el-table>
</div> </div>
<el-pagination <el-pagination
...@@ -286,7 +293,7 @@ ...@@ -286,7 +293,7 @@
</div> </div>
<p class="midBtn"> <p class="midBtn">
<span @click="cancelSS()">取消</span><span @click="saveSS()">保存</span <span @click="cancelSS()">取消</span><span @click="saveSS()">保存</span
><span @click="save()">提交</span> ><span @click="saveSubmit()">提交</span>
</p> </p>
</el-dialog> </el-dialog>
<!-- 申诉 --> <!-- 申诉 -->
...@@ -388,7 +395,8 @@ import { ...@@ -388,7 +395,8 @@ import {
qrProblemAssistedFeedback, qrProblemAssistedFeedback,
wtssSelProblemAssistedFeedback, wtssSelProblemAssistedFeedback,
ssProblemAssistedFeedback, ssProblemAssistedFeedback,
wtssSelProblemRectification wtssSelProblemRectification,
wtzgxfProblemRectification
} from "@/api/index"; } from "@/api/index";
import { generateYearOptions,projectCategoryText } from "@/utils/cache"; import { generateYearOptions,projectCategoryText } from "@/utils/cache";
export default { export default {
...@@ -460,15 +468,29 @@ export default { ...@@ -460,15 +468,29 @@ export default {
} else { } else {
this.$set(item, "postEvalStateText", "未申诉"); this.$set(item, "postEvalStateText", "未申诉");
} }
if (item.reviewStatus == "4") { if (item.rectificationStatus == "0") {
this.$set(item, "reviewStatusText", "未整改"); this.$set(item, "reviewStatusText", "问题未整改");
} else if (item.reviewStatus == "5") { } else if (item.rectificationStatus == "1") {
this.$set(item, "reviewStatusText", "整改提交"); this.$set(item, "reviewStatusText", "已整改");
} else if (item.reviewStatus == "6") { } else if (item.rectificationStatus== "2") {
this.$set(item, "reviewStatusText", "整改未完成"); this.$set(item, "reviewStatusText", "整改不合格");
} else if (item.reviewStatus == "7") { } else if (item.rectificationStatus== "3") {
this.$set(item, "reviewStatusText", "整改已完成"); this.$set(item, "reviewStatusText", "整改已完成");
} }
if (item.batchState == "3") {
this.$set(item, "batchStateText", "执行中");
} else if (item.batchState == "4") {
this.$set(item, "batchStateText", "已撤回");
} else if (item.batchState == "5") {
this.$set(item, "batchStateText", "已完成");
}
if (item.reviewStatus == "0") {
this.$set(item, "reviewText", "无问题");
} else if (item.reviewStatus == "1") {
this.$set(item, "reviewText", "需整改");
} else if (item.reviewStatus == "2") {
this.$set(item, "reviewText", "已整改");
}
this.$set(item, "projectCategory",projectCategoryText(item.projectCategory)); this.$set(item, "projectCategory",projectCategoryText(item.projectCategory));
}); });
this.total = res.data.total * 1; this.total = res.data.total * 1;
...@@ -785,6 +807,15 @@ export default { ...@@ -785,6 +807,15 @@ export default {
this.dataPretreatment(); this.dataPretreatment();
} }
}, },
async saveSubmit(){
let res = await wtzgxfProblemRectification(this.tableDataQR);
if (res.code == "200") {
this.dialogQR = false;
this.resetForm();
} else {
this.$message("整改提交失败");
}
}
}, },
}; };
</script> </script>
......
src/views/assessChecks/assistedViewing.vue
...@@ -85,13 +85,20 @@ ...@@ -85,13 +85,20 @@
> >
<el-table-column prop="batchName" label="后评估批次名称"> <el-table-column prop="batchName" label="后评估批次名称">
</el-table-column> </el-table-column>
<el-table-column
prop="batchStateText"
label="后评估批次状态"
width="auto"
>
</el-table-column>
<el-table-column <el-table-column
prop="projectName" prop="projectName"
label="评估项目名称" label="评估项目名称"
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column prop="reviewStatusText" label="项目审核状态">
</el-table-column>
<el-table-column prop="projectCategory" label="建设形式"> <el-table-column prop="projectCategory" label="建设形式">
</el-table-column> </el-table-column>
<!-- <el-table-column prop="projectStatus" label="项目建设阶段"> <!-- <el-table-column prop="projectStatus" label="项目建设阶段">
...@@ -102,7 +109,7 @@ ...@@ -102,7 +109,7 @@
<el-table-column prop="expertName" label="评审专家名单"> <el-table-column prop="expertName" label="评审专家名单">
</el-table-column> </el-table-column>
<!-- <el-table-column prop="字段待确认" label="后评估状态"> </el-table-column> --> <!-- <el-table-column prop="字段待确认" label="后评估状态"> </el-table-column> -->
<el-table-column prop="reviewDate" label="评估日期"> </el-table-column> <el-table-column prop="planReviewDate" label="评估日期"> </el-table-column>
</el-table> </el-table>
</div> </div>
<el-pagination <el-pagination
...@@ -343,7 +350,22 @@ export default { ...@@ -343,7 +350,22 @@ export default {
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.batchState == "3") {
this.$set(item, "batchStateText", "执行中");
} else if (item.batchState == "4") {
this.$set(item, "batchStateText", "已撤回");
} else if (item.batchState == "5") {
this.$set(item, "batchStateText", "已完成");
} else {
this.$set(item, "batchStateText", "未确认");
}
if (item.reviewStatus == "0") {
this.$set(item, "reviewStatusText", "无问题");
} else if (item.reviewStatus == "1") {
this.$set(item, "reviewStatusText", "需整改");
} else if (item.reviewStatus == "2") {
this.$set(item, "reviewStatusText", "已整改");
}
this.$set(item, "projectCategory",projectCategoryText(item.projectCategory)); this.$set(item, "projectCategory",projectCategoryText(item.projectCategory));
}) })
this.total = res.data.total * 1; this.total = res.data.total * 1;
......
src/views/assessChecks/auxiliaryInspection.vue
...@@ -79,9 +79,17 @@ ...@@ -79,9 +79,17 @@
</template></el-table-column> </template></el-table-column>
<el-table-column prop="batchName" label="后评估批次名称"> <el-table-column prop="batchName" label="后评估批次名称">
</el-table-column> </el-table-column>
<el-table-column
prop="batchStateText"
label="后评估批次状态"
width="auto"
>
</el-table-column>
<el-table-column prop="projectName" label="评估项目名称" show-overflow-tooltip> <el-table-column prop="projectName" label="评估项目名称" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column prop="reviewStatusText" label="项目审核状态">
</el-table-column>
<el-table-column prop="projectCategory" label="建设形式"> <el-table-column prop="projectCategory" label="建设形式">
</el-table-column> </el-table-column>
<!-- <el-table-column prop="projectStatus" label="项目建设阶段"> <!-- <el-table-column prop="projectStatus" label="项目建设阶段">
...@@ -183,6 +191,22 @@ export default { ...@@ -183,6 +191,22 @@ export default {
}else { }else {
this.$set( item,'postEvalState','已提交') this.$set( item,'postEvalState','已提交')
} }
if (item.batchState == "3") {
this.$set(item, "batchStateText", "执行中");
} else if (item.batchState == "4") {
this.$set(item, "batchStateText", "已撤回");
} else if (item.batchState == "5") {
this.$set(item, "batchStateText", "已完成");
} else {
this.$set(item, "batchStateText", "未确认");
}
if (item.reviewStatus == "0") {
this.$set(item, "reviewStatusText", "无问题");
} else if (item.reviewStatus == "1") {
this.$set(item, "reviewStatusText", "需整改");
} else if (item.reviewStatus == "2") {
this.$set(item, "reviewStatusText", "已整改");
}
this.$set(item, "projectCategory",projectCategoryText(item.projectCategory)); this.$set(item, "projectCategory",projectCategoryText(item.projectCategory));
}) })
this.total = res.data.total * 1; this.total = res.data.total * 1;
......
src/views/assessChecks/auxiliarySelection.vue
...@@ -24,14 +24,14 @@ ...@@ -24,14 +24,14 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="批次下发状态:" prop="postEvalState" class="fromItem"> <el-form-item label="后评估批次状态:" prop="postEvalState" class="fromItem">
<el-select <el-select
v-model="ruleForm.postEvalState" v-model="ruleForm.postEvalState"
placeholder="请选择" placeholder="请选择"
clearable clearable
> >
<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>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="postEvalStateText" prop="postEvalStateText"
label="批次下发状态" label="后评估批次状态"
width="auto" width="auto"
> >
</el-table-column> </el-table-column>
...@@ -714,13 +714,13 @@ export default { ...@@ -714,13 +714,13 @@ export default {
this.tableData = res.data.records; this.tableData = res.data.records;
this.tableData.forEach((item) => { this.tableData.forEach((item) => {
if (item.postEvalState == "" || item.postEvalState == null) { if (item.postEvalState == "" || item.postEvalState == null) {
this.$set(item, "postEvalStateText", "未下发"); this.$set(item, "postEvalStateText", "未发起");
} else if (item.postEvalState == "0") { } else if (item.postEvalState == "0") {
this.$set(item, "postEvalStateText", "未下发"); this.$set(item, "postEvalStateText", "未发起");
} else if (item.postEvalState == "2") { } else if (item.postEvalState == "2") {
this.$set(item, "postEvalStateText", "已撤回"); this.$set(item, "postEvalStateText", "已撤回");
} else { } else {
this.$set(item, "postEvalStateText", "已下发"); this.$set(item, "postEvalStateText", "已发起");
} }
}); });
this.total = res.data.total * 1; this.total = res.data.total * 1;
...@@ -952,13 +952,13 @@ export default { ...@@ -952,13 +952,13 @@ export default {
}, },
//点击编辑 //点击编辑
async edit() { async edit() {
//只能选择编辑未下发 待增加 //只能选择编辑未发起 待增加
if (this.checkedList.length != 1) { if (this.checkedList.length != 1) {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
if (this.checkedList[0].postEvalStateText == "已下发") { if (this.checkedList[0].postEvalStateText == "已发起") {
this.$message("不能编辑已下发的项目"); this.$message("不能编辑已发起的项目");
return; return;
} }
this.addtableData = []; this.addtableData = [];
...@@ -1015,13 +1015,13 @@ export default { ...@@ -1015,13 +1015,13 @@ export default {
}, },
//点击下发 //点击下发
async sendMsg() { async sendMsg() {
//只能选择未下发的 这块需要加一下 //只能选择未发起的 这块需要加一下
if (this.checkedList.length != 1) { if (this.checkedList.length != 1) {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
if (this.checkedList[0].postEvalStateText == "已下发") { if (this.checkedList[0].postEvalStateText == "已发起") {
this.$message("该项目已下发"); this.$message("该项目已发起");
return; return;
} }
let res = await sendEvalBatchInfo(this.checkedList[0]); let res = await sendEvalBatchInfo(this.checkedList[0]);
...@@ -1040,13 +1040,13 @@ export default { ...@@ -1040,13 +1040,13 @@ export default {
}, },
//点击撤回 //点击撤回
async withdraw() { async withdraw() {
//只能选择已下发未确认的 这块需要加一下 //只能选择已发起未确认的 这块需要加一下
if (this.checkedList.length != 1) { if (this.checkedList.length != 1) {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
if (this.checkedList[0].postEvalStateText == "未下发") { if (this.checkedList[0].postEvalStateText == "未发起") {
this.$message("该项目未下发"); this.$message("该项目未发起");
return; return;
} }
if (this.checkedList[0].postEvalStateText == "已撤回") { if (this.checkedList[0].postEvalStateText == "已撤回") {
......
src/views/assessChecks/checkCompliance.vue
...@@ -310,21 +310,24 @@ export default { ...@@ -310,21 +310,24 @@ export default {
Promise.all([selFile(params), selWtqdFZ(params)]).then(async (res) => { Promise.all([selFile(params), selWtqdFZ(params)]).then(async (res) => {
console.log(res[0], res[1], "777777"); console.log(res[0], res[1], "777777");
this.urlList = res[0].data; this.urlList = res[0].data;
if (res[1].data) { if (res[1].data) {
this.questionList = res[1].data.records; this.questionList = res[1].data.records;
let counterNum = 0;
this.questionList.forEach(async (item) => { this.questionList.forEach(async (item) => {
// let promiseArray = [] if (item.isProblem == 0) {
// let p = new Promise((resolve, reject) => { console.log("未发现问题");
this.$set(item, "checked", true);
// }) this.changeChecked(item);
}
let respon = await selWtmx({ qid: item.qid }); let respon = await selWtmx({ qid: item.qid });
let paramsFX = { let paramsFX = {
batchId: this.clqparams.batchId, batchId: this.clqparams.batchId,
projectId: this.clqparams.projectId, projectId: this.clqparams.projectId,
projectStage: item.questionId, projectStage: item.questionId,
}; };
let responfx = await selZnfx(paramsFX); let responfx = await selZnfx(paramsFX);
counterNum++
if (respon.data.records && respon.data.records.length > 0) { if (respon.data.records && respon.data.records.length > 0) {
respon.data.records.forEach(async (itemImg) => { respon.data.records.forEach(async (itemImg) => {
if (itemImg.url) { if (itemImg.url) {
...@@ -354,11 +357,7 @@ export default { ...@@ -354,11 +357,7 @@ export default {
}, },
]); ]);
} }
if (item.isProblem == 0) {
console.log("未发现问题");
this.$set(item, "checked", true);
this.changeChecked(item);
}
if (responfx.data.records && responfx.data.records.length > 0) { if (responfx.data.records && responfx.data.records.length > 0) {
let znfxList = responfx.data.records.filter((item) => { let znfxList = responfx.data.records.filter((item) => {
if (item.checkDesc) { if (item.checkDesc) {
...@@ -375,7 +374,13 @@ export default { ...@@ -375,7 +374,13 @@ export default {
this.$set(item, "znfxList", []); this.$set(item, "znfxList", []);
this.$set(item, "fzfxList", []); this.$set(item, "fzfxList", []);
} }
}); if(counterNum==this.questionList.length){
setTimeout(() => {
this.oldQuestionList = JSON.parse(JSON.stringify(this.questionList));
console.log(this.questionList, this.oldQuestionList, "总列表");
}, 300);
}
})
} }
if (this.urlList.length <= 0) { if (this.urlList.length <= 0) {
...@@ -390,10 +395,10 @@ export default { ...@@ -390,10 +395,10 @@ export default {
this.iframeUrl = "/pdf/web/viewer.html?file=" + resUrl.msg; this.iframeUrl = "/pdf/web/viewer.html?file=" + resUrl.msg;
} }
setTimeout(() => { // setTimeout(() => {
this.oldQuestionList = JSON.parse(JSON.stringify(this.questionList)); // this.oldQuestionList = JSON.parse(JSON.stringify(this.questionList));
console.log(this.questionList, this.oldQuestionList, "总列表"); // console.log(this.questionList, this.oldQuestionList, "总列表");
}, 1000); // }, 1000);
}); });
}, },
async handleClick(tab) { async handleClick(tab) {
...@@ -565,7 +570,6 @@ export default { ...@@ -565,7 +570,6 @@ export default {
// list.fileId= response.data.fileId // list.fileId= response.data.fileId
this.$set(list, "url", response.data.downLoadUrl); this.$set(list, "url", response.data.downLoadUrl);
this.$set(list, "fileId", response.data.fileId); this.$set(list, "fileId", response.data.fileId);
console.log(this.questionList, "总列表");
this.$message("上传成功"); this.$message("上传成功");
} else { } else {
this.$message("上传失败"); this.$message("上传失败");
......
src/views/assessChecks/confirmRelease.vue
...@@ -24,15 +24,16 @@ ...@@ -24,15 +24,16 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="批次确认状态:" prop="postEvalState" class="fromItem"> <el-form-item label="后评估批次状态:" prop="postEvalState" class="fromItem">
<el-select <el-select
v-model="ruleForm.postEvalState" v-model="ruleForm.postEvalState"
placeholder="请选择" placeholder="请选择"
clearable clearable
> >
<el-option label="已确认" value="3"></el-option> <el-option label="执行中" value="3"></el-option>
<el-option label="未确认" value="1"></el-option> <el-option label="未确认" value="1"></el-option>
<el-option label="已撤回" value="4"></el-option> <el-option label="已撤回" value="4"></el-option>
<el-option label="已完成" value="5"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="button"> <el-form-item class="button">
...@@ -86,12 +87,16 @@ ...@@ -86,12 +87,16 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="postEvalStateText" prop="postEvalStateText"
label="批次确认状态" label="后评估批次状态"
width="auto" width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column prop="batchName" label="评估项目" width="auto"> <el-table-column prop="creator" label="创建人" width="auto">
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="创建时间" width="auto">
</el-table-column>
<!-- <el-table-column prop="batchName" label="评估项目" width="auto">
</el-table-column> -->
<!-- <el-table-column prop="prjsOfExpert" label="已选择数量" width="auto"> <!-- <el-table-column prop="prjsOfExpert" label="已选择数量" width="auto">
</el-table-column> --> </el-table-column> -->
</el-table> </el-table>
...@@ -693,9 +698,11 @@ export default { ...@@ -693,9 +698,11 @@ export default {
this.tableData = res.data.records; this.tableData = res.data.records;
this.tableData.forEach((item) => { this.tableData.forEach((item) => {
if (item.postEvalState == "3") { if (item.postEvalState == "3") {
this.$set(item, "postEvalStateText", "已确认"); this.$set(item, "postEvalStateText", "执行中");
} else if (item.postEvalState == "4") { } else if (item.postEvalState == "4") {
this.$set(item, "postEvalStateText", "已撤回"); this.$set(item, "postEvalStateText", "已撤回");
} else if (item.postEvalState == "5") {
this.$set(item, "postEvalStateText", "已完成");
} else { } else {
this.$set(item, "postEvalStateText", "未确认"); this.$set(item, "postEvalStateText", "未确认");
} }
...@@ -742,8 +749,8 @@ export default { ...@@ -742,8 +749,8 @@ export default {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
if (this.checkedList[0].postEvalStateText == "已确认") { if (this.checkedList[0].postEvalStateText == "执行中") {
this.$message("该项目已确认"); this.$message("该项目已在执行中");
return; return;
} }
this.ruleFormdialogBJ = this.checkedList[0]; this.ruleFormdialogBJ = this.checkedList[0];
......
src/views/assessChecks/correctiveAssistanceVerification.vue
...@@ -120,8 +120,16 @@ ...@@ -120,8 +120,16 @@
</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="batchStateText"
label="后评估批次状态"
width="auto"
>
</el-table-column>
<el-table-column prop="projectName" label="评估项目名称" show-overflow-tooltip> <el-table-column prop="projectName" label="评估项目名称" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column prop="reviewText" label="项目审核状态">
</el-table-column>
<el-table-column prop="projectCategory" label="建设形式" width="auto"> <el-table-column prop="projectCategory" label="建设形式" width="auto">
</el-table-column> </el-table-column>
<!-- <el-table-column <!-- <el-table-column
...@@ -156,12 +164,12 @@ ...@@ -156,12 +164,12 @@
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="postEvalState" prop="reviewStatusText"
label="整改复核状态" label="问题整改状态"
width="auto" width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column prop="reviewDate" label="评估日期" width="auto"> <el-table-column prop="planReviewDate" label="评估日期" width="auto">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
...@@ -511,15 +519,32 @@ export default { ...@@ -511,15 +519,32 @@ export default {
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.rectificationStatus == "0") {
this.$set(item, "postEvalState", "整改提交"); this.$set(item, "reviewStatusText", "问题未整改");
} else if (item.reviewStatus == "6"){ } else if (item.rectificationStatus == "1") {
this.$set(item, "postEvalState", "整改未完成"); this.$set(item, "reviewStatusText", "已整改");
}else{ } else if (item.rectificationStatus== "2") {
this.$set(item, "postEvalState", "整改已完成"); this.$set(item, "reviewStatusText", "整改不合格");
} else if (item.rectificationStatus== "3") {
this.$set(item, "reviewStatusText", "整改已完成");
}
if (item.batchState == "3") {
this.$set(item, "batchStateText", "执行中");
} else if (item.batchState == "4") {
this.$set(item, "batchStateText", "已撤回");
} else if (item.batchState == "5") {
this.$set(item, "batchStateText", "已完成");
}
if (item.reviewStatus == "0") {
this.$set(item, "reviewText", "无问题");
} else if (item.reviewStatus == "1") {
this.$set(item, "reviewText", "需整改");
} else if (item.reviewStatus == "2") {
this.$set(item, "reviewText", "已整改");
} }
this.$set(item, "projectCategory",projectCategoryText(item.projectCategory)); this.$set(item, "projectCategory",projectCategoryText(item.projectCategory));
}); });
this.total = res.data.total * 1; this.total = res.data.total * 1;
} }
}, },
......
src/views/assessChecks/materialAcquisition.vue
...@@ -73,7 +73,12 @@ ...@@ -73,7 +73,12 @@
</template></el-table-column> </template></el-table-column>
<el-table-column prop="batchName" label="后评估批次名称"> <el-table-column prop="batchName" label="后评估批次名称">
</el-table-column> </el-table-column>
<el-table-column
prop="batchStateText"
label="后评估批次状态"
width="auto"
>
</el-table-column>
<el-table-column prop="projectName" label="评估项目名称" show-overflow-tooltip> <el-table-column prop="projectName" label="评估项目名称" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column prop="projectCategory" label="建设形式"> <el-table-column prop="projectCategory" label="建设形式">
...@@ -85,6 +90,7 @@ ...@@ -85,6 +90,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="expertName" label="评审专家名单"> <el-table-column prop="expertName" label="评审专家名单">
</el-table-column> </el-table-column>
<el-table-column prop="postEvalStateText" label="提交评估材料"> <el-table-column prop="postEvalStateText" label="提交评估材料">
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -324,6 +330,15 @@ export default { ...@@ -324,6 +330,15 @@ export default {
} else if (item.postEvalState >=1) { } else if (item.postEvalState >=1) {
this.$set(item, "postEvalStateText", "已上传"); this.$set(item, "postEvalStateText", "已上传");
} }
if (item.batchState == "3") {
this.$set(item, "batchStateText", "执行中");
} else if (item.batchState == "4") {
this.$set(item, "batchStateText", "已撤回");
} else if (item.batchState == "5") {
this.$set(item, "batchStateText", "已完成");
} else {
this.$set(item, "batchStateText", "未确认");
}
this.$set(item, "projectCategory",projectCategoryText(item.projectCategory)); this.$set(item, "projectCategory",projectCategoryText(item.projectCategory));
}); });
this.total = res.data.total * 1; this.total = res.data.total * 1;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!