diff --git a/src/assets/images/project/finish.png b/src/assets/images/project/finish.png new file mode 100644 index 00000000..a82b31ea Binary files /dev/null and b/src/assets/images/project/finish.png differ diff --git a/src/assets/images/project/reviewrecall.png b/src/assets/images/project/reviewrecall.png new file mode 100644 index 00000000..d7e7c004 Binary files /dev/null and b/src/assets/images/project/reviewrecall.png differ diff --git a/src/assets/images/project/reviewsubmit.png b/src/assets/images/project/reviewsubmit.png new file mode 100644 index 00000000..a9ad5186 Binary files /dev/null and b/src/assets/images/project/reviewsubmit.png differ diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index c08707e7..c17ff298 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -17,31 +17,33 @@ @click="showCodeModel2()" />
+ - - -
+ + + + + - {{ act }} -
- -
- {{ act }} -
+ class="img2" + src="../../assets/images/project/reviewrecall.png" + /> + +
{{ act }}
+ +
+ {{ act }} +
+ +
+ {{ act }} +
+ +
+ {{ act }} +
+
取消
-
+
确定
@@ -1725,7 +1755,37 @@
- + + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要撤回审核吗 +
+
+
+
+
取消
+
+
+
确定
+
+
+
+
+
{ + const submitReviewProject = () => { let obj = { projectId: state.projectId, type: 3, @@ -2887,6 +2948,8 @@ export default { message.success("提交成功"); state.reviewModal = false; getTaskInfo(); + // getTask(); + reget(); }) .catch((err) => { console.log("提交失败", err); @@ -3802,6 +3865,7 @@ export default { getTask({ projectId: state.projectId, }).then((res) => { + console.log("获取项目状态", res); state.action = res.data.data.projectInfo.status; state.act = state.action == 2 @@ -3809,7 +3873,9 @@ export default { : state.action == 0 ? "提交审核" : state.action == 1 - ? "撤回" + ? "撤回审核" + : state.action == 3 + ? "撤回发布" : state.action == -1 ? "" : "-"; @@ -3852,9 +3918,10 @@ export default { console.log("点击发布"); let obj = { projectId: state.releaseProjectId, + type: 4, }; apiproj - .releaseProject(obj) + .handleProject(obj) .then((res) => { console.log("发布成功", res); message.destroy(); @@ -3878,7 +3945,7 @@ export default { const recallProject = () => { let obj = { projectId: state.projectId, - type: 0, + type: -4, }; apiproj .handleProject(obj) @@ -3893,6 +3960,36 @@ export default { console.log("撤回失败", err); }); }; + + //打开撤回审核弹窗 + const showRecallReviewModal = () => { + state.recallReviewModal = true; + }; + //确认撤回审核 + const recallReviewProject = () => { + let obj = { + projectId: state.projectId, + type: -3, + }; + console.log("撤回成功obj", obj); + apiproj + .handleProject(obj) + .then((res) => { + console.log("撤回成功", res); + message.destroy(); + message.success("撤回成功"); + state.recallReviewModal = false; + reget(); + }) + .catch((err) => { + console.log("撤回成功", err); + }); + }; + //关闭提交审核弹窗 + const closeRecallReviewModal = () => { + state.recallReviewModal = false; + }; + //关闭结束弹窗 const closeStopModal = () => { state.stopModal = false; @@ -4162,7 +4259,10 @@ export default { checkedClose, submitExamine, closeReviewModal, + showRecallReviewModal, recallReviewProject, + closeRecallReviewModal, + submitReviewProject, showCodeModel, showCodeModel2, checkType,