Skip to content

Administrator / project_progress

Go to a project
Commit 1467ef07 by liangzhen
Options

增加退回功能

1 parent 70454be9
Inline Side-by-side
Showing with 178 additions and 75 deletions
src/api/index.js
...@@ -458,4 +458,13 @@ export function postExist(params){ ...@@ -458,4 +458,13 @@ export function postExist(params){
export function xzwtpostEvalQuesInfo(params) { export function xzwtpostEvalQuesInfo(params) {
return post(`${ARCH_EVALUATION}/postEvalQuesInfo/xzwt`, params) return post(`${ARCH_EVALUATION}/postEvalQuesInfo/xzwt`, params)
} }
//材料退回
export function postEvalQuesInfoTh(params){
return post(`${ARCH_EVALUATION}/postEvalQuesInfo/th`, params)
}
//重新长传状态
export function postEvalQuesInfocxtj(params){
return post(`${ARCH_EVALUATION}/postEvalQuesInfo/cxtj`, params)
}
src/api/indexzc.js
...@@ -455,4 +455,14 @@ export function HistoryVersion(params){ ...@@ -455,4 +455,14 @@ export function HistoryVersion(params){
return post(`${ARCH_EVALUATION}/pmProInitiation/HistoryVersion`, params) return post(`${ARCH_EVALUATION}/pmProInitiation/HistoryVersion`, params)
} }
//材料退回
export function postEvalQuesInfoTh(params){
return post(`${ARCH_EVALUATION}/postEvalQuesInfoZc/th`, params)
}
//重新长传状态
export function postEvalQuesInfocxtj(params){
return post(`${ARCH_EVALUATION}/postEvalQuesInfoZc/cxtj`, params)
}
src/views/assessChecks/auxiliaryInspection.vue
...@@ -106,6 +106,12 @@ ...@@ -106,6 +106,12 @@
<i class="el-icon-chat-dot-square"></i <i class="el-icon-chat-dot-square"></i
>&nbsp;&nbsp;&nbsp;整改复核</el-button >&nbsp;&nbsp;&nbsp;整改复核</el-button
> >
<el-button
@click="inspectBack()"
:disabled="inspectdisabled"
:class="inspectdisabled ? 'noclick' : ''"
><i class="el-icon-document-delete"></i>&nbsp;&nbsp;&nbsp;材料退回</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscroll"> <div class="setscroll">
...@@ -229,10 +235,10 @@ ...@@ -229,10 +235,10 @@
<el-table-column <el-table-column
label="项目环节" label="项目环节"
prop="projectStagetext" prop="projectStagetext"
width="120" width="100"
> >
</el-table-column> </el-table-column>
<el-table-column label="序号" width="70" type="index"> <el-table-column label="序号" width="40" type="index">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -273,7 +279,7 @@ ...@@ -273,7 +279,7 @@
</el-switch> </el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="解释批注" prop="feedback" width="auto" show-overflow-tooltip> <el-table-column label="解释批注" prop="feedback" width="auto" show-overflow-tooltip>
<!-- <template <!-- <template
slot-scope="scope" slot-scope="scope"
v-if="scope.row.confirmStatus == '1'" v-if="scope.row.confirmStatus == '1'"
...@@ -455,7 +461,8 @@ import { ...@@ -455,7 +461,8 @@ import {
MaterialWarehous, MaterialWarehous,
downloadObjectStr, downloadObjectStr,
selWtqdFZ, selWtqdFZ,
xzwtpostEvalQuesInfo xzwtpostEvalQuesInfo,
postEvalQuesInfoTh
} from "@/api/index"; } from "@/api/index";
import { generateYearOptions, constructionFormText } from "@/utils/cache"; import { generateYearOptions, constructionFormText } from "@/utils/cache";
export default { export default {
...@@ -779,7 +786,7 @@ export default { ...@@ -779,7 +786,7 @@ export default {
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 == 1) { } else if (item.postEvalState == 1) {
this.$set(item, "postEvalStateText", "待评估"); this.$set(item, "postEvalStateText", "待评估");
} else if (item.postEvalState == 2) { } else if (item.postEvalState == 2) {
...@@ -1016,6 +1023,30 @@ export default { ...@@ -1016,6 +1023,30 @@ export default {
} }
this.innerVisible = true this.innerVisible = true
}, },
async inspectBack(){
this.$confirm(
"是否材料不全，将退回重新上传?",
"提示",
{
confirmButtonText: "是",
cancelButtonText: "否",
type: "warning",
}
).then(async () => {
let params={
...this.checkedList[0]
}
let res= await postEvalQuesInfoTh(params)
if (res.code == "200") {
this.$message("已成功退回");
this.resetForm();
} else {
this.$message("退回失败");
}
});
}
}, },
}; };
</script> </script>
......
src/views/assessChecks/materialAcquisition.vue
...@@ -101,9 +101,8 @@ ...@@ -101,9 +101,8 @@
<el-button @click="detailsForm()"> <el-button @click="detailsForm()">
<img class="buttonIcon" src="../../assets/ck.png" />详情</el-button <img class="buttonIcon" src="../../assets/ck.png" />详情</el-button
> >
<!-- <el-button @click="submitNexts()" :disabled="subdisabled" :class="subdisabled?'noclick':''"
><i class="el-icon-finished"></i> 提交评估材料</el-button
> -->
<el-button <el-button
@click="confirm()" @click="confirm()"
:disabled="confirmdisabled" :disabled="confirmdisabled"
...@@ -112,6 +111,9 @@ ...@@ -112,6 +111,9 @@
<i class="el-icon-chat-dot-square"></i <i class="el-icon-chat-dot-square"></i
>&nbsp;&nbsp;&nbsp;问题整改</el-button >&nbsp;&nbsp;&nbsp;问题整改</el-button
> >
<el-button @click="submitNexts()" :disabled="subdisabled" :class="subdisabled?'noclick':''"
><i class="el-icon-finished"></i> 材料已重新上传</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscroll"> <div class="setscroll">
...@@ -163,6 +165,20 @@ ...@@ -163,6 +165,20 @@
label="项目审核状态" label="项目审核状态"
width="120" width="120"
> >
<template v-slot="scope">
<router-link
v-if=" scope.row.postEvalStateText=='已退回'"
:to="{
path: '/assesszc/projectView',
query: { projectId: scope.row.projectCode },
}"
>
<el-button type="text" size="small">{{
scope.row.postEvalStateText
}}</el-button>
</router-link>
<span v-else>{{ scope.row.postEvalStateText }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="contractNumber" prop="contractNumber"
...@@ -482,6 +498,7 @@ import { ...@@ -482,6 +498,7 @@ import {
wtzgxfProblemRectification, wtzgxfProblemRectification,
ossuploadStr, ossuploadStr,
MaterialWarehous, MaterialWarehous,
postEvalQuesInfocxtj
} from "@/api/index"; } from "@/api/index";
import { generateYearOptions, constructionFormText } from "@/utils/cache"; import { generateYearOptions, constructionFormText } from "@/utils/cache";
export default { export default {
...@@ -804,8 +821,8 @@ export default { ...@@ -804,8 +821,8 @@ export default {
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 == 1) { } else if (item.postEvalState == 1) {
this.$set(item, "postEvalStateText", "待评估"); this.$set(item, "postEvalStateText", "待评估");
} else if (item.postEvalState == 2) { } else if (item.postEvalState == 2) {
...@@ -835,35 +852,26 @@ export default { ...@@ -835,35 +852,26 @@ export default {
}, },
//提交评估材料 //提交评估材料
async submitNexts() { async submitNexts() {
if (this.checkedList.length != 1) { this.$confirm(
this.$message("请选择"); "材料是否材重新上传完成?",
return; "提示",
} {
this.dialog = true; confirmButtonText: "是",
let params = { cancelButtonText: "否",
current: this.currentPage, type: "warning",
pageSize: this.pageSize, }
projectId: this.checkedList[0].projectCode, ).then(async () => {
batchId: this.checkedList[0].batchId, let params={
}; ...this.checkedList[0]
let res = await clqdevaluationMaterials(params); }
// this.tableDataQD =this.tableDataNew let res= await postEvalQuesInfocxtj(params)
this.tableDataQD = JSON.parse(JSON.stringify(this.tableDataNew)); if (res.code == "200") {
if (res.data.records.length > 0) { this.$message("重新上传成功");
this.tableDataQD = this.tableDataQD this.resetForm();
.concat(res.data.records) } else {
.reduce((accumulator, currentObj) => { this.$message("重新上传失败");
const existingObj = accumulator.find( }
(obj) => obj.typeCode == currentObj.typeCode });
);
if (existingObj) {
Object.assign(existingObj, currentObj);
} else {
accumulator.push(currentObj);
}
return accumulator;
}, []);
}
}, },
//详情 //详情
async detailsForm() { async detailsForm() {
...@@ -924,6 +932,9 @@ export default { ...@@ -924,6 +932,9 @@ export default {
if (this.checkedList[0].postEvalStateText != "需整改") { if (this.checkedList[0].postEvalStateText != "需整改") {
this.confirmdisabled = true; this.confirmdisabled = true;
} }
if (this.checkedList[0].postEvalStateText != "已退回") {
this.subdisabled = true;
}
} }
}, },
handleSizeChange(val) { handleSizeChange(val) {
......
src/views/assessZC/auxiliaryInspection.vue
...@@ -106,6 +106,12 @@ ...@@ -106,6 +106,12 @@
<i class="el-icon-chat-dot-square"></i <i class="el-icon-chat-dot-square"></i
>&nbsp;&nbsp;&nbsp;整改复核</el-button >&nbsp;&nbsp;&nbsp;整改复核</el-button
> >
<el-button
@click="inspectBack()"
:disabled="inspectdisabled"
:class="inspectdisabled ? 'noclick' : ''"
><i class="el-icon-document-delete"></i>&nbsp;&nbsp;&nbsp;材料退回</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscroll"> <div class="setscroll">
...@@ -455,7 +461,8 @@ import { ...@@ -455,7 +461,8 @@ import {
MaterialWarehous, MaterialWarehous,
downloadObjectStr, downloadObjectStr,
selWtqdFZ, selWtqdFZ,
xzwtpostEvalQuesInfo xzwtpostEvalQuesInfo,
postEvalQuesInfoTh
} from "@/api/indexzc"; } from "@/api/indexzc";
import { generateYearOptions, constructionFormText } from "@/utils/cache"; import { generateYearOptions, constructionFormText } from "@/utils/cache";
export default { export default {
...@@ -779,7 +786,7 @@ export default { ...@@ -779,7 +786,7 @@ export default {
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 == 1) { } else if (item.postEvalState == 1) {
this.$set(item, "postEvalStateText", "待评估"); this.$set(item, "postEvalStateText", "待评估");
} else if (item.postEvalState == 2) { } else if (item.postEvalState == 2) {
...@@ -1016,6 +1023,30 @@ export default { ...@@ -1016,6 +1023,30 @@ export default {
} }
this.innerVisible = true this.innerVisible = true
}, },
async inspectBack(){
this.$confirm(
"是否材料不全，将退回重新上传?",
"提示",
{
confirmButtonText: "是",
cancelButtonText: "否",
type: "warning",
}
).then(async () => {
let params={
...this.checkedList[0]
}
let res= await postEvalQuesInfoTh(params)
if (res.code == "200") {
this.$message("已成功退回");
this.resetForm();
} else {
this.$message("退回失败");
}
});
}
}, },
}; };
</script> </script>
......
src/views/assessZC/materialAcquisition.vue
...@@ -101,9 +101,8 @@ ...@@ -101,9 +101,8 @@
<el-button @click="detailsForm()"> <el-button @click="detailsForm()">
<img class="buttonIcon" src="../../assets/ck.png" />详情</el-button <img class="buttonIcon" src="../../assets/ck.png" />详情</el-button
> >
<!-- <el-button @click="submitNexts()" :disabled="subdisabled" :class="subdisabled?'noclick':''"
><i class="el-icon-finished"></i> 提交评估材料</el-button
> -->
<el-button <el-button
@click="confirm()" @click="confirm()"
:disabled="confirmdisabled" :disabled="confirmdisabled"
...@@ -112,6 +111,9 @@ ...@@ -112,6 +111,9 @@
<i class="el-icon-chat-dot-square"></i <i class="el-icon-chat-dot-square"></i
>&nbsp;&nbsp;&nbsp;问题整改</el-button >&nbsp;&nbsp;&nbsp;问题整改</el-button
> >
<el-button @click="submitNexts()" :disabled="subdisabled" :class="subdisabled?'noclick':''"
><i class="el-icon-finished"></i> 材料已重新上传</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscroll"> <div class="setscroll">
...@@ -163,6 +165,20 @@ ...@@ -163,6 +165,20 @@
label="项目审核状态" label="项目审核状态"
width="120" width="120"
> >
<template v-slot="scope">
<router-link
v-if=" scope.row.postEvalStateText=='已退回'"
:to="{
path: '/assesszc/projectView',
query: { projectId: scope.row.projectCode },
}"
>
<el-button type="text" size="small">{{
scope.row.postEvalStateText
}}</el-button>
</router-link>
<span v-else>{{ scope.row.postEvalStateText }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="contractNumber" prop="contractNumber"
...@@ -482,6 +498,7 @@ import { ...@@ -482,6 +498,7 @@ import {
wtzgxfProblemRectification, wtzgxfProblemRectification,
ossuploadStr, ossuploadStr,
MaterialWarehous, MaterialWarehous,
postEvalQuesInfocxtj
} from "@/api/indexzc"; } from "@/api/indexzc";
import { generateYearOptions, constructionFormText } from "@/utils/cache"; import { generateYearOptions, constructionFormText } from "@/utils/cache";
export default { export default {
...@@ -804,8 +821,8 @@ export default { ...@@ -804,8 +821,8 @@ export default {
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 == 1) { } else if (item.postEvalState == 1) {
this.$set(item, "postEvalStateText", "待评估"); this.$set(item, "postEvalStateText", "待评估");
} else if (item.postEvalState == 2) { } else if (item.postEvalState == 2) {
...@@ -835,35 +852,26 @@ export default { ...@@ -835,35 +852,26 @@ export default {
}, },
//提交评估材料 //提交评估材料
async submitNexts() { async submitNexts() {
if (this.checkedList.length != 1) { this.$confirm(
this.$message("请选择"); "材料是否材重新上传完成?",
return; "提示",
} {
this.dialog = true; confirmButtonText: "是",
let params = { cancelButtonText: "否",
current: this.currentPage, type: "warning",
pageSize: this.pageSize, }
projectId: this.checkedList[0].projectCode, ).then(async () => {
batchId: this.checkedList[0].batchId, let params={
}; ...this.checkedList[0]
let res = await clqdevaluationMaterials(params); }
// this.tableDataQD =this.tableDataNew let res= await postEvalQuesInfocxtj(params)
this.tableDataQD = JSON.parse(JSON.stringify(this.tableDataNew)); if (res.code == "200") {
if (res.data.records.length > 0) { this.$message("重新上传成功");
this.tableDataQD = this.tableDataQD this.resetForm();
.concat(res.data.records) } else {
.reduce((accumulator, currentObj) => { this.$message("重新上传失败");
const existingObj = accumulator.find( }
(obj) => obj.typeCode == currentObj.typeCode });
);
if (existingObj) {
Object.assign(existingObj, currentObj);
} else {
accumulator.push(currentObj);
}
return accumulator;
}, []);
}
}, },
//详情 //详情
async detailsForm() { async detailsForm() {
...@@ -924,6 +932,9 @@ export default { ...@@ -924,6 +932,9 @@ export default {
if (this.checkedList[0].postEvalStateText != "需整改") { if (this.checkedList[0].postEvalStateText != "需整改") {
this.confirmdisabled = true; this.confirmdisabled = true;
} }
if (this.checkedList[0].postEvalStateText != "已退回") {
this.subdisabled = true;
}
} }
}, },
handleSizeChange(val) { handleSizeChange(val) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!