Skip to content

Administrator / project_progress

Go to a project
Commit 5e692720 by liangzhen
Options

自查菜单修改

1 parent 726796d1
Expand all
Inline Side-by-side
Showing with 273 additions and 238 deletions
src/utils/leftBarRules.js
...@@ -205,68 +205,68 @@ export function trendsRules(type) { ...@@ -205,68 +205,68 @@ export function trendsRules(type) {
name: "后评估检查", name: "后评估检查",
url: "", url: "",
children: [ children: [
// { {
// name: "后评估自查", name: "后评估自查",
// url: "", url: "",
// children: [ children: [
// { {
// name: "自查评估批次发起", name: "自查评估批次发起",
// url: "/assesszc/auxiliarySelection", url: "/assesszc/auxiliarySelection",
// children: [], children: [],
// }, },
// { {
// name: "自查批次确认发布", name: "自查评估项目确认",
// url: "/assesszc/confirmRelease", url: "/assesszc/confirmRelease",
// children: [], children: [],
// }, },
// { {
// name: "自查材料自动获取", name: "自查评估材料获取",
// url: "/assesszc/materialAcquisition", url: "/assesszc/materialAcquisition",
// children: [], children: [],
// }, },
// { {
// name: "自查项目辅助检查", name: "自查项目辅助检查",
// url: "/assesszc/auxiliaryInspection", url: "/assesszc/auxiliaryInspection",
// children: [], children: [],
// }, },
// { {
// name: "自查结果确认更改", name: "自查结果确认更改",
// url: "/assesszc/confirmChanges", url: "/assesszc/confirmChanges",
// children: [], children: [],
// }, },
// // {
// // name: "自查问题下发",
// // url: "/assesszc/assitedDistribution",
// // children: [],
// // },
// {
// name: "自查问题反馈",
// url: "/assesszc/assistedFeedback",
// children: [],
// },
// {
// name: "自查申诉确认",
// url: "/assesszc/assistedConfirm",
// children: [],
// },
// {
// name: "自查问题整改",
// url: "/assesszc/assistedRect",
// children: [],
// },
// {
// name: "自查整改核验",
// url: "/assesszc/correctiveAssistanceVerification",
// children: [],
// },
// { // {
// name: "自查专家同步归档", // name: "自查问题下发",
// url: "/assesszc/attachSynchronousArchiving", // url: "/assesszc/assitedDistribution",
// children: [], // children: [],
// }, // },
// ], {
// }, name: "自查问题反馈",
url: "/assesszc/assistedFeedback",
children: [],
},
{
name: "自查申诉确认",
url: "/assesszc/assistedConfirm",
children: [],
},
{
name: "自查问题整改",
url: "/assesszc/assistedRect",
children: [],
},
{
name: "自查整改核验",
url: "/assesszc/correctiveAssistanceVerification",
children: [],
},
{
name: "自查同步归档",
url: "/assesszc/attachSynchronousArchiving",
children: [],
},
],
},
{ {
name: "后评估互查", name: "后评估互查",
url: "", url: "",
...@@ -344,7 +344,7 @@ export function trendsRules(type) { ...@@ -344,7 +344,7 @@ export function trendsRules(type) {
url: "", url: "",
children: [ children: [
{ {
name: "项目辅助检查问题查询", name: "项目检查问题查询",
url: "/mainLayout/projectCheckQuestionQuery", url: "/mainLayout/projectCheckQuestionQuery",
children: [], children: [],
}, },
...@@ -441,7 +441,7 @@ export function defaultRouter() { ...@@ -441,7 +441,7 @@ export function defaultRouter() {
return "/mainLayout/materialAcquisition" return "/mainLayout/materialAcquisition"
break; break;
case '99': case '99':
return "/mainLayout/auxiliarySelection" return "/assesszc/auxiliarySelection"
break; break;
......
src/views/assessZC/assistedRect.vue
...@@ -24,17 +24,32 @@ ...@@ -24,17 +24,32 @@
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="4"></el-option>
<el-option label="已下发" value="1"></el-option> <el-option label="整改提交" value="5"></el-option>
<el-option label="已撤回" value="2"></el-option> <el-option label="整改未完成" value="6"></el-option>
<el-option label="整改已完成" value="7"></el-option>
</el-select> </el-select>
</el-form-item> --> </el-form-item>
<el-form-item label="评估项目名称:" prop="projectName" class="fromItem">
<el-input
v-model="ruleForm.projectName"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
<el-form-item label="项目编码:" prop="projectId" class="fromItem">
<el-input
v-model="ruleForm.projectId"
placeholder="请输入"
clearable
></el-input>
</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
...@@ -227,7 +242,7 @@ ...@@ -227,7 +242,7 @@
<el-table-column label="上传整改材料" prop="zgFileId" width="400"> <el-table-column label="上传整改材料" prop="zgFileId" width="400">
<template <template
slot-scope="scope" slot-scope="scope"
v-if="scope.row.confirmStatus == '1'"
> >
<input <input
type="file" type="file"
...@@ -238,7 +253,7 @@ ...@@ -238,7 +253,7 @@
<el-table-column label="情况说明" prop="zgqkFileId" width="400"> <el-table-column label="情况说明" prop="zgqkFileId" width="400">
<template <template
slot-scope="scope" slot-scope="scope"
v-if="scope.row.confirmStatus == '1'"
> >
<input <input
type="file" type="file"
...@@ -407,7 +422,7 @@ import { ...@@ -407,7 +422,7 @@ import {
ossupload, ossupload,
downloadObject, downloadObject,
} from "@/api/index"; } from "@/api/index";
import { generateYearOptions } from "@/utils/cache"; import { generateYearOptions,projectCategoryText } from "@/utils/cache";
export default { export default {
data() { data() {
return { return {
...@@ -457,6 +472,7 @@ export default { ...@@ -457,6 +472,7 @@ export default {
} else if (item.reviewStatus == "7") { } else if (item.reviewStatus == "7") {
this.$set(item, "postEvalState", "整改已完成"); this.$set(item, "postEvalState", "整改已完成");
} }
this.$set(item, "projectCategory",projectCategoryText(item.projectCategory));
}); });
this.total = res.data.total * 1; this.total = res.data.total * 1;
} }
......
src/views/assessZC/assistedVerif.vue
...@@ -261,8 +261,8 @@ ...@@ -261,8 +261,8 @@
</el-table-column> </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 prop="projectStatus" label="项目建设阶段" width="auto"> --> <!-- <el-table-column prop="projectStatus" label="项目建设阶段" width="auto">
<!-- </el-table-column> </el-table-column>
<el-table-column prop="哪个字段" label="历史核查状态" width="auto"> <el-table-column prop="哪个字段" label="历史核查状态" width="auto">
</el-table-column> --> </el-table-column> -->
<el-table-column prop="email" label="部门" width="auto"> <el-table-column prop="email" label="部门" width="auto">
...@@ -390,13 +390,13 @@ ...@@ -390,13 +390,13 @@
<el-table-column prop="字段待确认" label="历史核查状态" width="200"> <el-table-column prop="字段待确认" label="历史核查状态" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="字段待确认" label="是否处于正在执行批次" width="200"> <el-table-column prop="字段待确认" label="是否处于正在执行批次" width="200">
</el-table-column> -->
<!-- <el-table-column prop="字段待确认" label="计划文号" width="300">
<el-table-column prop="expertLevel" label="省公司" width="auto">
</el-table-column> </el-table-column>
<el-table-column prop="expertLevel" label="信通公司" width="auto"> <el-table-column prop="字段待确认" label="计划文号" width="300">
<el-table-column prop="expertLevel" label="省公司" width="auto">
</el-table-column> --> </el-table-column> -->
<!-- </el-table-column> --> <el-table-column prop="expertLevel" label="信通公司" width="auto">
</el-table-column>
</el-table-column>
<el-table-column label="总投资计划（万元）" width="300"> <el-table-column label="总投资计划（万元）" width="300">
<el-table-column prop="costAmountTotal" label="成本金" width="auto"> <el-table-column prop="costAmountTotal" label="成本金" width="auto">
</el-table-column> </el-table-column>
...@@ -543,67 +543,6 @@ export default { ...@@ -543,67 +543,6 @@ export default {
}; };
Object.assign(params, this.ruleForm); Object.assign(params, this.ruleForm);
console.log(params); console.log(params);
(this.tableData = [
{
expertId: 1,
fullName: "王小明",
gender: 1,
birthday: "2024-04-23",
compId: 10001,
qualification: "硕士",
contact: "13241375678",
email: "115485@qq.com",
fields: "1",
expertLevel: 1,
description: "1",
expertState: 1,
creator: 1,
createTime: "2024-04-23 14:47:07",
lastUpdatedby: 1,
lastUpdateTime: "2024-04-23 14:47:12",
column14: 1,
},
{
expertId: 2,
fullName: "李晓帅",
gender: 0,
birthday: "2024-04-23",
compId: 10001,
qualification: "博士",
contact: "13241375678",
email: "115485@qq.com",
fields: "1",
expertLevel: 1,
description: "1",
expertState: 1,
creator: 1,
createTime: "2024-04-23 14:47:07",
lastUpdatedby: 1,
lastUpdateTime: "2024-04-23 14:47:12",
column14: 1,
},
{
expertId: 3,
fullName: "张晓楠",
gender: 1,
birthday: "2024-04-23",
compId: 10002,
qualification: "博士后",
contact: "13241375678",
email: "115485@qq.com",
fields: "1",
expertLevel: 1,
description: "1",
expertState: 1,
creator: 1,
createTime: "2024-04-23 14:47:07",
lastUpdatedby: 1,
lastUpdateTime: "2024-04-23 14:47:12",
column14: 1,
},
]),
(this.total = 2);
return;
let res = await projectInfo(params); let res = await projectInfo(params);
if (res.code == "200") { if (res.code == "200") {
......
src/views/assessZC/assitedDistribution.vue
...@@ -14,14 +14,14 @@ ...@@ -14,14 +14,14 @@
<el-form-item label="后评估批次名称:" prop="batchName" class="fromItem"> <el-form-item label="后评估批次名称:" prop="batchName" class="fromItem">
<el-input v-model="ruleForm.batchName" placeholder="请输入" clearable></el-input> <el-input v-model="ruleForm.batchName" placeholder="请输入" clearable></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="后评估状态:" prop="postEvalState" class="fromItem"> <el-form-item label="问题下发状态:" prop="reviewStatus" class="fromItem">
<el-select v-model="ruleForm.postEvalState" placeholder="请选择" clearable> <el-select v-model="ruleForm.reviewStatus" placeholder="请选择" 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>
<el-form-item label="项目名称:" prop="projectName" class="fromItem"> <el-form-item label="评估项目名称:" prop="projectName" class="fromItem">
<el-input <el-input
v-model="ruleForm.projectName" v-model="ruleForm.projectName"
placeholder="请输入" placeholder="请输入"
...@@ -165,7 +165,7 @@ import { ...@@ -165,7 +165,7 @@ import {
wtplxfproblemAssistedDistribution, wtplxfproblemAssistedDistribution,
chproblemAssistedDistribution chproblemAssistedDistribution
} from "@/api/index"; } from "@/api/index";
import { generateYearOptions } from "@/utils/cache"; import { generateYearOptions,projectCategoryText } from "@/utils/cache";
export default { export default {
data() { data() {
return { return {
...@@ -233,6 +233,7 @@ export default { ...@@ -233,6 +233,7 @@ export default {
} else { } else {
this.$set(item, "postEvalState", "已下发"); this.$set(item, "postEvalState", "已下发");
} }
this.$set(item, "projectCategory",projectCategoryText(item.projectCategory));
}); });
this.total = res.data.total * 1; this.total = res.data.total * 1;
} }
......
src/views/assessZC/auxiliaryQuery.vue
...@@ -14,13 +14,27 @@ ...@@ -14,13 +14,27 @@
<el-form-item label="后评估批次名称:" prop="batchName" class="fromItem"> <el-form-item label="后评估批次名称:" prop="batchName" class="fromItem">
<el-input v-model="ruleForm.batchName" placeholder="请输入" clearable></el-input> <el-input v-model="ruleForm.batchName" placeholder="请输入" clearable></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="后评估状态:" prop="postEvalState" class="fromItem"> <el-form-item label="问题下发状态:" prop="reviewStatus" class="fromItem">
<el-select v-model="ruleForm.postEvalState" placeholder="请选择" clearable> <el-select v-model="ruleForm.reviewStatus" placeholder="请选择" 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>
<el-form-item label="评估项目名称:" prop="projectName" class="fromItem">
<el-input
v-model="ruleForm.projectName"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
<el-form-item label="项目编码:" prop="projectId" class="fromItem">
<el-input
v-model="ruleForm.projectId"
placeholder="请输入"
clearable
></el-input>
</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
...@@ -144,7 +158,7 @@ ...@@ -144,7 +158,7 @@
import { import {
fzcxpostSelect fzcxpostSelect
} from "@/api/index"; } from "@/api/index";
import { generateYearOptions } from "@/utils/cache"; import { generateYearOptions, projectCategoryText} from "@/utils/cache";
export default { export default {
data() { data() {
return { return {
...@@ -205,6 +219,7 @@ export default { ...@@ -205,6 +219,7 @@ export default {
} else { } else {
this.$set(item, "postEvalState", "未下发"); this.$set(item, "postEvalState", "未下发");
} }
this.$set(item, "projectCategory",projectCategoryText(item.projectCategory));
}); });
this.total = res.data.total * 1; this.total = res.data.total * 1;
} }
......
src/views/assessZC/auxiliarySelection.vue
...@@ -24,17 +24,35 @@ ...@@ -24,17 +24,35 @@
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-option label="执行中" value="3"></el-option>
<el-option label="已完成" value="5"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="创建时间:" prop="batchName" class="fromItem">
<el-date-picker
@change="timeChange"
v-model="ruleForm.dates"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</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
...@@ -77,28 +95,30 @@ ...@@ -77,28 +95,30 @@
<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="120" prop="batchYear">
<template slot-scope="scope"> {{ scope.row.batchYear }}年 </template> <template slot-scope="scope"> {{ scope.row.batchYear }}年 </template>
</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="expertName" label="后评估专家" width="auto">
</el-table-column>
<el-table-column <el-table-column
prop="planReviewDate" prop="planReviewDate"
label="计划评估日期" label="计划评估日期"
width="auto" width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column prop="expertName" label="后评估专家" width="auto">
</el-table-column>
<el-table-column <el-table-column
prop="postEvalStateText" prop="postEvalStateText"
label="批次下发状态" label="后评估批次状态"
width="auto" width="120"
> >
</el-table-column> </el-table-column>
<!-- <el-table-column prop="postEvalState" label="后评估状态" width="auto"> <!-- <el-table-column prop="postEvalState" label="后评估状态" width="auto">
</el-table-column> --> </el-table-column> -->
<el-table-column prop="creator" label="创建人" width="auto"> <el-table-column prop="creator" label="创建人" width="120">
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="创建时间" width="auto"> <el-table-column prop="createTime" label="创建时间" width="auto">
</el-table-column> </el-table-column>
...@@ -108,7 +128,7 @@ ...@@ -108,7 +128,7 @@
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="currentPage" :current-page="currentPage"
:page-sizes="[10, 15, 20, 50,100]" :page-sizes="[10, 15, 20, 50, 100]"
:page-size="1000" :page-size="1000"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="total" :total="total"
...@@ -602,6 +622,7 @@ import { generateYearOptions } from "@/utils/cache"; ...@@ -602,6 +622,7 @@ import { generateYearOptions } from "@/utils/cache";
export default { export default {
data() { data() {
return { return {
value1: "",
yearsList: generateYearOptions(), yearsList: generateYearOptions(),
totalXQ: 0, totalXQ: 0,
XQtableData: [], XQtableData: [],
...@@ -611,6 +632,7 @@ export default { ...@@ -611,6 +632,7 @@ export default {
batchYear: "", batchYear: "",
batchName: "", batchName: "",
postEvalState: "", postEvalState: "",
dates: [],
}, },
ruleFormdialog: { ruleFormdialog: {
batchYear: "", batchYear: "",
...@@ -695,11 +717,21 @@ export default { ...@@ -695,11 +717,21 @@ export default {
}; };
}, },
mounted() { mounted() {
console.log(getCurrentDate(), "222222");
this.submitForm(); this.submitForm();
}, },
methods: { methods: {
timeChange(time) {
console.log('tttttt',time)
if (time) {
//给后端的参数
this.ruleForm.createStartTime = time[0];
this.ruleForm.createEndTime = time[1];
}else{
this.ruleForm.createStartTime = "";
this.ruleForm.createEndTime = "";
}
},
async submitForm() { async submitForm() {
let params = { let params = {
current: this.currentPage, current: this.currentPage,
...@@ -714,13 +746,17 @@ export default { ...@@ -714,13 +746,17 @@ 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 if (item.postEvalState == "1") {
this.$set(item, "postEvalStateText", "已下发"); this.$set(item, "postEvalStateText", "已发起");
} else if (item.postEvalState == "3"||item.postEvalState == "4") {
this.$set(item, "postEvalStateText", "执行中");
} else if (item.postEvalState == "5") {
this.$set(item, "postEvalStateText", "已完成");
} }
}); });
this.total = res.data.total * 1; this.total = res.data.total * 1;
...@@ -730,6 +766,8 @@ export default { ...@@ -730,6 +766,8 @@ export default {
this.$refs.formName.resetFields(); this.$refs.formName.resetFields();
this.currentPage = 1; this.currentPage = 1;
this.pageSize = 10; this.pageSize = 10;
this.ruleForm.createStartTime = "";
this.ruleForm.createEndTime = "";
this.submitForm(); this.submitForm();
}, },
//点击新增 //点击新增
...@@ -952,13 +990,13 @@ export default { ...@@ -952,13 +990,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 +1053,13 @@ export default { ...@@ -1015,13 +1053,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 +1078,13 @@ export default { ...@@ -1040,13 +1078,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 == "已撤回") {
...@@ -1128,7 +1166,7 @@ export default { ...@@ -1128,7 +1166,7 @@ export default {
// color: #2785e6; // color: #2785e6;
} }
.elpagination { .elpagination {
text-align: right; text-align: center;
margin-right: 100px; margin-right: 100px;
} }
/deep/ .el-dialog { /deep/ .el-dialog {
......
src/views/assessZC/checkComplianceFZ.vue
...@@ -32,10 +32,10 @@ ...@@ -32,10 +32,10 @@
width="auto" width="auto"
> >
</el-table-column> </el-table-column>
<el-table-column label="评估问题" width="auto"> <el-table-column label="评估问题" width="auto" prop="evalQues" >
<template slot-scope="scope"> <!-- <template slot-scope="scope">
<el-input v-model="scope.row.evalQues" :disabled="ishow"></el-input> <el-input v-model="scope.row.evalQues" :disabled="ishow"></el-input>
</template> </template> -->
</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">
...@@ -65,6 +65,7 @@ import { ...@@ -65,6 +65,7 @@ import {
tjpostEvalQuesInfo, tjpostEvalQuesInfo,
presignedUrl, presignedUrl,
} from "@/api/index"; } from "@/api/index";
import { getCurrentDate } from "@/utils/format";
export default { export default {
data() { data() {
return { return {
...@@ -186,12 +187,15 @@ export default { ...@@ -186,12 +187,15 @@ export default {
handleImageClick() {}, handleImageClick() {},
//保存 //保存
async save(type) { async save(type) {
console.log(this.clqparams, "this.clqparams");
let params = { let params = {
projectId: this.clqparams.projectId, projectId: this.clqparams.projectId,
batchId: this.clqparams.batchId, batchId: this.clqparams.batchId,
list: this.tableData, list: this.tableData,
lastUpdateTime: getCurrentDate(),
}; };
console.log(params, "this.clqparams");
// return
if (type == "add") { if (type == "add") {
console.log(params, "this.zjtableDatathis.zjtableData"); console.log(params, "this.zjtableDatathis.zjtableData");
...@@ -307,7 +311,7 @@ export default { ...@@ -307,7 +311,7 @@ export default {
// color: #2785e6; // color: #2785e6;
} }
.elpagination { .elpagination {
text-align: right; text-align: center;
margin-right: 100px; margin-right: 100px;
} }
/deep/.el-table { /deep/.el-table {
......
src/views/assessZC/confirmChanges.vue
...@@ -16,17 +16,18 @@ ...@@ -16,17 +16,18 @@
:value="item"/> :value="item"/>
</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" placeholder="请输入" clearable></el-input> <el-input v-model="ruleForm.batchName" placeholder="请输入" clearable></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 v-model="ruleForm.postEvalState" placeholder="请选择" clearable> <el-select v-model="ruleForm.postEvalState" placeholder="请选择" clearable>
<el-option label="待确认" value="3"></el-option>
<el-option label="确认需整改" value="5"></el-option> <el-option label="确认需整改" value="5"></el-option>
<el-option label="确认无需整改" value="6"></el-option> <el-option label="确认无需整改" value="6"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="项目名称:" prop="projectName" class="fromItem"> <el-form-item label="评估项目名称:" prop="projectName" class="fromItem">
<el-input <el-input
v-model="ruleForm.projectName" v-model="ruleForm.projectName"
placeholder="请输入" placeholder="请输入"
...@@ -187,7 +188,7 @@ ...@@ -187,7 +188,7 @@
clqdevaluationMaterials, clqdevaluationMaterials,
qrscevaluationMaterials, qrscevaluationMaterials,
} from "@/api/index"; } from "@/api/index";
import { generateYearOptions } from "@/utils/cache"; import { generateYearOptions,projectCategoryText} from "@/utils/cache";
export default { export default {
data() { data() {
return { return {
...@@ -251,6 +252,7 @@ export default { ...@@ -251,6 +252,7 @@ export default {
}else{ }else{
this.$set( item,'postEvalState','待确认') this.$set( item,'postEvalState','待确认')
} }
this.$set(item, "projectCategory",projectCategoryText(item.projectCategory));
}) })
this.total = res.data.total * 1; this.total = res.data.total * 1;
} }
......
src/views/postConcentrationCheck/projectCheckQuestionQuery.vue
...@@ -16,16 +16,13 @@ ...@@ -16,16 +16,13 @@
:value="item"/> :value="item"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="单位名称:" prop="dwmc" class="fromItem"> <!-- <el-form-item label="单位名称:" prop="dwmc" class="fromItem">
<el-input <el-input
v-model="ruleForm.companyName" v-model="ruleForm.companyName"
placeholder="请输入" placeholder="请输入"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item> -->
<!--<el-form-item label="项目编码:" prop="projectCode" class="fromItem">
<el-input v-model="ruleForm.projectCode" placeholder="请输入"></el-input>
</el-form-item>-->
<el-form-item label="项目名称:" prop="projectName" class="fromItem"> <el-form-item label="项目名称:" prop="projectName" class="fromItem">
<el-input <el-input
v-model="ruleForm.projectName" v-model="ruleForm.projectName"
...@@ -34,36 +31,43 @@ ...@@ -34,36 +31,43 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目阶段:" prop="projectStatus" class="fromItem"> <el-form-item label="项目阶段:" prop="projectStatus" class="fromItem">
<el-input
v-model="ruleForm.projectName" <el-select v-model="ruleForm.projectStatus" placeholder="请选择" clearable>
placeholder="请输入" <el-option label="项目验收" value="项目验收"></el-option>
clearable <el-option label="项目建设" value="项目建设"></el-option>
></el-input> <el-option label="项目前期" value="项目前期"></el-option>
<!-- <el-select v-model="ruleForm.projectPhase" placeholder="请选择" clearable> </el-select>
<el-option label="项目验收" value="1"></el-option>
<el-option label="项目建设" value="2"></el-option>
<el-option label="项目前期" value="3"></el-option>
</el-select> -->
</el-form-item> </el-form-item>
<el-form-item label="项目环节:" prop="projectFlowStatus" class="fromItem"> <el-form-item label="项目环节:" prop="projectFlowStatus" class="fromItem">
<el-select v-model="ruleForm.projectFlowStatus" placeholder="请选择" clearable> <el-select v-model="ruleForm.projectFlowStatus" placeholder="请选择" clearable>
<el-option label="可研" value="1"></el-option> <el-option label="可研" value="可研"></el-option>
<el-option label="计划" value="2"></el-option> <el-option label="计划" value="计划"></el-option>
<el-option label="采购" value="3"></el-option> <el-option label="采购" value="采购"></el-option>
<el-option label="合同" value="4"></el-option> <el-option label="合同" value="合同"></el-option>
<el-option label="执行" value="5"></el-option> <el-option label="执行" value="执行"></el-option>
<el-option label="结决算" value="6"></el-option> <el-option label="结决算" value="结决算"></el-option>
<el-option label="转资" value="7"></el-option> <el-option label="转资" value="转资"></el-option>
<el-option label="其他" value="其他"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="问题检查项:" prop="quesCheckItem" class="fromItem">
<el-input
v-model="ruleForm.quesCheckItem"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
<el-form-item label="提出时间:" prop="createTime" class="fromItem"> <el-form-item label="提出时间:" prop="createTime" class="fromItem">
<el-date-picker <el-date-picker
v-model="ruleForm.createTime" @change="timeChange"
type="date" v-model="ruleForm.dates"
placeholder="选择日期" style="width: 240px"
value-format="yyyy-MM-dd hh:mm:ss" value-format="yyyy-MM-dd"
> type="daterange"
</el-date-picker> range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="整改状态:" prop="isRectificationStatus" class="fromItem"> <el-form-item label="整改状态:" prop="isRectificationStatus" class="fromItem">
<el-select v-model="ruleForm.isRectificationStatus" placeholder="请选择" clearable> <el-select v-model="ruleForm.isRectificationStatus" placeholder="请选择" clearable>
...@@ -112,7 +116,7 @@ ...@@ -112,7 +116,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="projectFlowStatus" label="项目环节" width="auto"> <el-table-column prop="projectFlowStatus" label="项目环节" width="auto">
</el-table-column> </el-table-column>
<el-table-column prop="quesCheckItem" label="问题检查项" width="auto"> <el-table-column prop="quesCheckItem" label="问题检查项" width="auto" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column prop="quesSource" label="问题来源" width="auto"> <el-table-column prop="quesSource" label="问题来源" width="auto">
</el-table-column> </el-table-column>
...@@ -190,12 +194,7 @@ export default { ...@@ -190,12 +194,7 @@ export default {
yearsList:generateYearOptions(), yearsList:generateYearOptions(),
ruleForm: { ruleForm: {
projectYear:"", //默认展示当前年 projectYear:"", //默认展示当前年
companyName: "", dates: [],
projectName: "",
projectPhase: "",
projectLink: "",
submitTime: "",
abarbeitungStatus: "",
}, },
ruleFormdialog: { ruleFormdialog: {
projectYear: "", projectYear: "",
...@@ -222,6 +221,17 @@ export default { ...@@ -222,6 +221,17 @@ export default {
}, },
methods: { methods: {
timeChange(time) {
console.log('tttttt',time)
if (time) {
//给后端的参数
this.ruleForm.createStartTime = time[0];
this.ruleForm.createEndTime = time[1];
}else{
this.ruleForm.createStartTime = "";
this.ruleForm.createEndTime = "";
}
},
async submitForm() { async submitForm() {
let params = { let params = {
current: this.currentPage, current: this.currentPage,
...@@ -274,6 +284,8 @@ export default { ...@@ -274,6 +284,8 @@ export default {
this.$refs.formName.resetFields(); this.$refs.formName.resetFields();
this.currentPage = 1; this.currentPage = 1;
this.pageSize = 10; this.pageSize = 10;
this.ruleForm.createStartTime = "";
this.ruleForm.createEndTime = "";
this.submitForm(); this.submitForm();
}, },
uploadForm() { uploadForm() {
......
src/views/postConcentrationCheck/rectificationFeedbackQuery.vue
...@@ -32,44 +32,52 @@ ...@@ -32,44 +32,52 @@
</el-form-item> </el-form-item>
<el-form-item label="项目阶段:" prop="projectStatus" class="fromItem"> <el-form-item label="项目阶段:" prop="projectStatus" class="fromItem">
<el-select v-model="ruleForm.projectStatus" placeholder="请选择" clearable> <el-select v-model="ruleForm.projectStatus" placeholder="请选择" clearable>
<el-option label="项目验收" value="1"></el-option> <el-option label="项目验收" value="项目验收"></el-option>
<el-option label="项目建设" value="2"></el-option> <el-option label="项目建设" value="项目建设"></el-option>
<el-option label="项目前期" value="3"></el-option> <el-option label="项目前期" value="项目前期"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="项目环节:" prop="projectFlowStatus" class="fromItem"> <el-form-item label="项目环节:" prop="projectFlowStatus" class="fromItem">
<el-select v-model="ruleForm.projectFlowStatus" placeholder="请选择" clearable> <el-select v-model="ruleForm.projectFlowStatus" placeholder="请选择" clearable>
<el-option label="可研" value="1"></el-option> <el-option label="可研" value="可研"></el-option>
<el-option label="计划" value="2"></el-option> <el-option label="计划" value="计划"></el-option>
<el-option label="采购" value="3"></el-option> <el-option label="采购" value="采购"></el-option>
<el-option label="合同" value="4"></el-option> <el-option label="合同" value="合同"></el-option>
<el-option label="执行" value="5"></el-option> <el-option label="执行" value="执行"></el-option>
<el-option label="结决算" value="6"></el-option> <el-option label="结决算" value="结决算"></el-option>
<el-option label="转资" value="7"></el-option> <el-option label="转资" value="转资"></el-option>
<el-option label="其他" value="其他"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="是否申诉:" prop="appealFlag" class="fromItem"> <el-form-item label="问题检查项:" prop="quesCheckItem" class="fromItem">
<el-select v-model="ruleForm.appealFlag" placeholder="请选择" clearable> <el-input
<el-option label="是" value="Y"></el-option> v-model="ruleForm.quesCheckItem"
<el-option label="否" value="N"></el-option> placeholder="请输入"
clearable
></el-input>
</el-form-item>
<el-form-item label="是否申诉:" prop="appealStatus" class="fromItem">
<el-select v-model="ruleForm.appealStatus" placeholder="请选择" clearable>
<el-option label="是" value="1"></el-option>
<el-option label="否" value="0"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="申诉是否通过:" label="申诉是否通过:"
prop="appealPassFlag" prop="isAppealStatus"
class="fromItem" class="fromItem"
> >
<el-select v-model="ruleForm.appealPassFlag" placeholder="请选择" clearable> <el-select v-model="ruleForm.isAppealStatus" placeholder="请选择" clearable>
<el-option label="是" value="1"></el-option> <el-option label="是" value="1"></el-option>
<el-option label="否" value="0"></el-option> <el-option label="否" value="0"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="是否完成整改:" prop="rectificationText" class="fromItem"> <!-- <el-form-item label="是否完成整改:" prop="rectificationStatus" class="fromItem">
<el-select v-model="ruleForm.rectificationText" placeholder="请选择" clearable> <el-select v-model="ruleForm.rectificationStatus" placeholder="请选择" clearable>
<el-option label="是" value="1"></el-option> <el-option label="是" value="1"></el-option>
<el-option label="否" value="0"></el-option> <el-option label="否" value="0"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item class="button"> <el-form-item class="button">
<el-button @click="submitForm()"> <el-button @click="submitForm()">
...@@ -112,21 +120,21 @@ ...@@ -112,21 +120,21 @@
</el-table-column> </el-table-column>
<el-table-column prop="checkDesc" label="问题描述" width="auto" show-overflow-tooltip> <el-table-column prop="checkDesc" label="问题描述" width="auto" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column prop="appealText" label="是否申诉" width="auto"> <el-table-column prop="appealText" label="是否申诉" width="80">
</el-table-column> </el-table-column>
<el-table-column prop="feedback" label="申诉理由" width="auto" show-overflow-tooltip> <el-table-column prop="feedback" label="申诉理由" width="auto" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column prop="isAppealText" label="申诉是否通过" width="auto"> <el-table-column prop="isAppealText" label="申诉是否通过" width="120">
</el-table-column> </el-table-column>
<el-table-column prop="reviewStatus" label="申诉复核情况" width="auto" show-overflow-tooltip> <el-table-column prop="reviewStatus" label="申诉复核情况" width="auto" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column prop="rectificationText" label="是否完成整改" width="auto"> <el-table-column prop="rectificationText" label="是否完成整改" width="120">
</el-table-column> </el-table-column>
<el-table-column prop="rectificationFeedback" label="整改情况" width="auto" show-overflow-tooltip> <el-table-column prop="rectificationFeedback" label="整改情况" width="auto" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column prop="isRectificationText" label="整改是否通过" width="auto"> <el-table-column prop="isRectificationText" label="整改是否通过" width="120">
</el-table-column> </el-table-column>
<el-table-column prop="reviewRectification" label="整改复核情况" width="auto"> <el-table-column prop="reviewRectification" label="整改复核情况" width="120">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!