Skip to content

Administrator / project_progress

Go to a project
Commit be71b77c by liangzhen
Options

暂存一下

1 parent e087fe0b
Inline Side-by-side
Showing with 129 additions and 47 deletions
src/views/assessChecks/assistedConfirm.vue
...@@ -23,15 +23,38 @@ ...@@ -23,15 +23,38 @@
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="batchState" class="fromItem">
<el-select
v-model="ruleForm.batchState"
placeholder="请选择"
clearable
>
<el-option label="执行中" value="3"></el-option>
<el-option label="已完成" value="5"></el-option>
</el-select>
</el-form-item>
<el-form-item label="项目审核状态:" prop="reviewStatus" class="fromItem">
<el-select
v-model="ruleForm.reviewStatus"
placeholder="请选择"
clearable
>
<el-option label="无问题" value="0"></el-option>
<el-option label="需整改" value="1"></el-option>
<el-option label="已整改" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="申诉状态:" prop="appealStatus" class="fromItem">
<el-select <el-select
v-model="ruleForm.reviewStatus" v-model="ruleForm.reviewStatus"
placeholder="请选择" placeholder="请选择"
clearable clearable
> >
<el-option label="复核未下发" value="3"></el-option> <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="2"></el-option>
<el-option label="申诉通过" value="3"></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">
...@@ -206,7 +229,7 @@ ...@@ -206,7 +229,7 @@
}} <el-button @click="handleClickXZ(scope.row)">下载</el-button> }} <el-button @click="handleClickXZ(scope.row)">下载</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="复核情况" prop="appealStatus"> <el-table-column label="申诉状态" prop="appealStatus">
<template slot-scope="scope" v-if="scope.row.confirmStatus == '1'"> <template slot-scope="scope" v-if="scope.row.confirmStatus == '1'">
<el-select <el-select
v-model="scope.row.appealStatus" v-model="scope.row.appealStatus"
...@@ -304,7 +327,7 @@ ...@@ -304,7 +327,7 @@
}} <el-button @click="handleClickXZ(scope.row)">下载</el-button> }} <el-button @click="handleClickXZ(scope.row)">下载</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="复核情况" prop="appealStatus"> <el-table-column label="申诉状态" prop="appealStatus">
<template slot-scope="scope" v-if="scope.row.confirmStatus == '1'"> <template slot-scope="scope" v-if="scope.row.confirmStatus == '1'">
<el-select <el-select
v-model="scope.row.appealStatus" v-model="scope.row.appealStatus"
...@@ -409,9 +432,7 @@ export default { ...@@ -409,9 +432,7 @@ export default {
} }
if (item.batchState == "3") { if (item.batchState == "3") {
this.$set(item, "batchStateText", "执行中"); this.$set(item, "batchStateText", "执行中");
} else if (item.batchState == "4") { } else if (item.batchState == "5") {
this.$set(item, "batchStateText", "已撤回");
} else if (item.batchState == "5") {
this.$set(item, "batchStateText", "已完成"); this.$set(item, "batchStateText", "已完成");
} }
if (item.reviewStatus == "0") { if (item.reviewStatus == "0") {
...@@ -582,7 +603,7 @@ export default { ...@@ -582,7 +603,7 @@ export default {
this.tableDataSS.forEach(item=>{ this.tableDataSS.forEach(item=>{
if(item.confirmStatus==1&&item.appealStatus!=2&&item.appealStatus!=3){ if(item.confirmStatus==1&&item.appealStatus!=2&&item.appealStatus!=3){
this.$message("有未选择的复核情况"); this.$message("有未选择的申诉状态");
throw new Error("主动跳出循环"); throw new Error("主动跳出循环");
} }
return return
......
src/views/assessChecks/assistedFeedback.vue
...@@ -24,6 +24,27 @@ ...@@ -24,6 +24,27 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="后评估批次状态:" prop="batchState" class="fromItem">
<el-select
v-model="ruleForm.batchState"
placeholder="请选择"
clearable
>
<el-option label="执行中" value="3"></el-option>
<el-option label="已完成" value="5"></el-option>
</el-select>
</el-form-item>
<el-form-item label="项目审核状态:" prop="reviewStatus" class="fromItem">
<el-select
v-model="ruleForm.reviewStatus"
placeholder="请选择"
clearable
>
<el-option label="无问题" value="0"></el-option>
<el-option label="需整改" value="1"></el-option>
<el-option label="已整改" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="申诉状态:" prop="appealStatus" class="fromItem"> <el-form-item label="申诉状态:" prop="appealStatus" class="fromItem">
<el-select <el-select
v-model="ruleForm.appealStatus" v-model="ruleForm.appealStatus"
...@@ -479,9 +500,7 @@ export default { ...@@ -479,9 +500,7 @@ export default {
} }
if (item.batchState == "3") { if (item.batchState == "3") {
this.$set(item, "batchStateText", "执行中"); this.$set(item, "batchStateText", "执行中");
} else if (item.batchState == "4") { } else if (item.batchState == "5") {
this.$set(item, "batchStateText", "已撤回");
} else if (item.batchState == "5") {
this.$set(item, "batchStateText", "已完成"); this.$set(item, "batchStateText", "已完成");
} }
if (item.reviewStatus == "0") { if (item.reviewStatus == "0") {
......
src/views/assessChecks/assistedViewing.vue
...@@ -24,18 +24,27 @@ ...@@ -24,18 +24,27 @@
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="batchState" class="fromItem">
<el-select <el-select
v-model="ruleForm.postEvalState" v-model="ruleForm.batchState"
placeholder="请选择" placeholder="请选择"
clearable clearable
> >
<el-option label="未下发" value="0"></el-option> <el-option label="执行中" value="3"></el-option>
<el-option label="已下发" value="1"></el-option> <el-option label="已完成" value="5"></el-option>
<el-option label="已撤回" value="2"></el-option>
</el-select> </el-select>
</el-form-item> --> </el-form-item>
<el-form-item label="项目审核状态:" prop="reviewStatus" class="fromItem">
<el-select
v-model="ruleForm.reviewStatus"
placeholder="请选择"
clearable
>
<el-option label="无问题" value="0"></el-option>
<el-option label="需整改" value="1"></el-option>
<el-option label="已整改" value="2"></el-option>
</el-select>
</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"
...@@ -352,13 +361,9 @@ export default { ...@@ -352,13 +361,9 @@ export default {
this.tableData.forEach(item=>{ this.tableData.forEach(item=>{
if (item.batchState == "3") { if (item.batchState == "3") {
this.$set(item, "batchStateText", "执行中"); this.$set(item, "batchStateText", "执行中");
} else if (item.batchState == "4") { } else if (item.batchState == "5") {
this.$set(item, "batchStateText", "已撤回");
} else if (item.batchState == "5") {
this.$set(item, "batchStateText", "已完成"); this.$set(item, "batchStateText", "已完成");
} else { }
this.$set(item, "batchStateText", "未确认");
}
if (item.reviewStatus == "0") { if (item.reviewStatus == "0") {
this.$set(item, "reviewStatusText", "无问题"); this.$set(item, "reviewStatusText", "无问题");
} else if (item.reviewStatus == "1") { } else if (item.reviewStatus == "1") {
......
src/views/assessChecks/auxiliaryInspection.vue
...@@ -19,6 +19,16 @@ ...@@ -19,6 +19,16 @@
<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="batchState" class="fromItem">
<el-select
v-model="ruleForm.batchState"
placeholder="请选择"
clearable
>
<el-option label="执行中" value="3"></el-option>
<el-option label="已完成" value="5"></el-option>
</el-select>
</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="2"></el-option> <el-option label="待提交" value="2"></el-option>
...@@ -193,13 +203,9 @@ export default { ...@@ -193,13 +203,9 @@ export default {
} }
if (item.batchState == "3") { if (item.batchState == "3") {
this.$set(item, "batchStateText", "执行中"); this.$set(item, "batchStateText", "执行中");
} else if (item.batchState == "4") { } else if (item.batchState == "5") {
this.$set(item, "batchStateText", "已撤回");
} else if (item.batchState == "5") {
this.$set(item, "batchStateText", "已完成"); this.$set(item, "batchStateText", "已完成");
} else { }
this.$set(item, "batchStateText", "未确认");
}
if (item.reviewStatus == "0") { if (item.reviewStatus == "0") {
this.$set(item, "reviewStatusText", "无问题"); this.$set(item, "reviewStatusText", "无问题");
} else if (item.reviewStatus == "1") { } else if (item.reviewStatus == "1") {
......
src/views/assessChecks/auxiliarySelection.vue
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
<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 class="button"> <el-form-item class="button">
...@@ -719,8 +721,12 @@ export default { ...@@ -719,8 +721,12 @@ export default {
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"){
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;
......
src/views/assessChecks/correctiveAssistanceVerification.vue
...@@ -19,9 +19,30 @@ ...@@ -19,9 +19,30 @@
<el-form-item label="后评估批次名称:" prop="batchName" class="fromItem"> <el-form-item label="后评估批次名称:" prop="batchName" class="fromItem">
<el-input v-model="ruleForm.batchName" clearable></el-input> <el-input v-model="ruleForm.batchName" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="整改复核状态:" prop="postEvalState" class="fromItem"> <el-form-item label="后评估批次状态:" prop="batchState" class="fromItem">
<el-select
v-model="ruleForm.batchState"
placeholder="请选择"
clearable
>
<el-option label="执行中" value="3"></el-option>
<el-option label="已完成" value="5"></el-option>
</el-select>
</el-form-item>
<el-form-item label="项目审核状态:" prop="reviewStatus" class="fromItem">
<el-select
v-model="ruleForm.reviewStatus"
placeholder="请选择"
clearable
>
<el-option label="无问题" value="0"></el-option>
<el-option label="需整改" value="1"></el-option>
<el-option label="已整改" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="问题整改状态:" prop="rectificationStatus" class="fromItem">
<el-select <el-select
v-model="ruleForm.postEvalState" v-model="ruleForm.rectificationStatus"
placeholder="请选择" placeholder="请选择"
clearable clearable
> >
...@@ -530,9 +551,7 @@ export default { ...@@ -530,9 +551,7 @@ export default {
} }
if (item.batchState == "3") { if (item.batchState == "3") {
this.$set(item, "batchStateText", "执行中"); this.$set(item, "batchStateText", "执行中");
} else if (item.batchState == "4") { } else if (item.batchState == "5") {
this.$set(item, "batchStateText", "已撤回");
} else if (item.batchState == "5") {
this.$set(item, "batchStateText", "已完成"); this.$set(item, "batchStateText", "已完成");
} }
if (item.reviewStatus == "0") { if (item.reviewStatus == "0") {
......
src/views/assessChecks/materialAcquisition.vue
...@@ -19,11 +19,21 @@ ...@@ -19,11 +19,21 @@
<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="batchState" class="fromItem">
<el-select
v-model="ruleForm.batchState"
placeholder="请选择"
clearable
>
<el-option label="执行中" value="3"></el-option>
<el-option label="已完成" value="5"></el-option>
</el-select>
</el-form-item>
<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="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-select> </el-select>
</el-form-item> </el-form-item>
...@@ -332,13 +342,9 @@ export default { ...@@ -332,13 +342,9 @@ export default {
} }
if (item.batchState == "3") { if (item.batchState == "3") {
this.$set(item, "batchStateText", "执行中"); this.$set(item, "batchStateText", "执行中");
} else if (item.batchState == "4") { }else if (item.batchState == "5") {
this.$set(item, "batchStateText", "已撤回");
} else if (item.batchState == "5") {
this.$set(item, "batchStateText", "已完成"); 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!