From d5541652fe46317bf296daa3f7e7a5c1e9408cb9 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Tue, 6 Dec 2022 18:52:16 +0800
Subject: [PATCH 01/12] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E5=B7=B2=E5=AE=A1?=
=?UTF-8?q?=E6=A0=B8=E8=AF=BE=E7=A8=8B=E5=AE=A1=E6=A0=B8=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/examine/CourseReviewed.vue | 37 +++++++++++++++++++++++++++-
1 file changed, 36 insertions(+), 1 deletion(-)
diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue
index 6535e016..dec15056 100644
--- a/src/views/examine/CourseReviewed.vue
+++ b/src/views/examine/CourseReviewed.vue
@@ -117,6 +117,38 @@ export default {
currentPage: 1,
total: null,
pageSize: 10,
+ //审核记录的表
+ columnsAudit: [
+ {
+ title: "审核人",
+ dataIndex: "createName",
+ key: "createName",
+ align: "center",
+ },
+
+ {
+ title: "审核状态",
+ dataIndex: "status",
+ key: "status",
+ align: "center",
+ customRender: ({record: {status}}) => {{'2': '审核通过', '-2': '审核拒绝'}[(status + '')]}
,
+ },
+
+ {
+ title: "审核时间",
+ dataIndex: "createTime",
+ key: "createTime",
+ align: "center",
+ width: 220
+ },
+
+ {
+ title: "备注",
+ dataIndex: "description",
+ key: "description",
+ align: "center",
+ },
+ ],
columns1: [
{
title: "序号",
@@ -180,7 +212,8 @@ export default {
return {
- showProjAuditModal(value.record.auditList);
+ console.log(value)
+ showProjAuditModal(value.record.auditLogDtoList);
}}>审核日志
;
},
},
@@ -247,10 +280,12 @@ export default {
creater: item.createName,
time: item.createTime,
msg: item.description || "-",
+ auditLogDtoList: item.auditLogDtoList
};
array.push(obj);
});
state.tableData1 = array;
+ console.log(data)
};
const reset = () => {
(state.valueproj = ''),
From 0248c94382798400c01ca158b3202b248a3a018d Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 6 Dec 2022 19:08:52 +0800
Subject: [PATCH 02/12] =?UTF-8?q?--=20=E9=A1=B9=E7=9B=AE=E5=88=9B=E5=BB=BA?=
=?UTF-8?q?=E5=BD=92=E5=B1=9E=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/projectcenter/ProjectManage.vue | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 95a35e22..32964e4e 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -816,6 +816,7 @@ import ProjectClass from "@/components/project/ProjectClass";
import OrgClass from "@/components/project/OrgClass";
import dayjs from "dayjs";
import * as moment from 'moment'
+import {changeOwnership} from "@/api/method";
export default {
name: "projectManage",
@@ -951,11 +952,16 @@ export default {
if (!validate(state.projectInfo, errorMsgs)) {
return;
}
- api.createProject(state.projectInfo).then(() => {
+ api.createProject(state.projectInfo).then((res) => {
state.doublepro = false;
message.destroy();
message.success("创建成功");
state.currentPage = 1;
+ state.projectInfo.projectId || changeOwnership(
+ "project",
+ res.data.data.projectId,
+ [{id: res.data.data.createId, name: res.data.data.createName}]
+ );
getTableDate();
});
};
From a89f3b76223ecbbc9513983202b604fe745f11ff Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 6 Dec 2022 19:14:29 +0800
Subject: [PATCH 03/12] =?UTF-8?q?--=20=E9=A1=B9=E7=9B=AE=E5=88=9B=E5=BB=BA?=
=?UTF-8?q?=E5=BD=92=E5=B1=9E=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/projectcenter/ProjectAdd.vue | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index b2a0f7f8..b8162c14 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -326,7 +326,7 @@ import TrainClass from "@/components/project/TrainClass";
import OrgClass from "@/components/project/OrgClass";
import ProjectManager from "@/components/project/ProjectManagerNew";
import ProjectLevel from "@/components/project/ProjectLevel";
-import { scrollLoad } from "@/api/method";
+import {changeOwnership, scrollLoad} from "@/api/method";
export default {
name: "projectAdd",
@@ -475,7 +475,12 @@ export default {
}
state.projectInfo.type = 3;
state.projectInfo.courseSyncFlag = state.courseSyncFlag ? 1 : 0;
- api.createProject(state.projectInfo).then(() => {
+ api.createProject(state.projectInfo).then((res) => {
+ state.projectInfo.projectId || changeOwnership(
+ "project",
+ res.data.data.projectId,
+ [{id: res.data.data.createId, name: res.data.data.createName}]
+ );
message.destroy();
message.success("编辑成功");
router.back();
From 4f866fd70ced2303ade0af832518fc20f1f28663 Mon Sep 17 00:00:00 2001
From: kclf <1195754634@qq.com>
Date: Tue, 6 Dec 2022 19:15:06 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E5=85=AC=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/drawers/NoticePub.vue | 43 +++++++++++++++++++++++++---
1 file changed, 39 insertions(+), 4 deletions(-)
diff --git a/src/components/drawers/NoticePub.vue b/src/components/drawers/NoticePub.vue
index 28929cb6..c14707d9 100644
--- a/src/components/drawers/NoticePub.vue
+++ b/src/components/drawers/NoticePub.vue
@@ -14,8 +14,8 @@
公告内容
-
- {{ noticeContent }}
+
+ {{ noticeContent ? noticeContent : "暂无公告" }}
编辑
@@ -23,9 +23,13 @@
-
- {{ noticeContent }}
+
+
预览：
+
+ {{ noticeContent }}
+
+
编辑：
{
console.log("公告获取项目", res.data.data.projectInfo);
state.projectInfo = res.data.data.projectInfo;
+ state.noticeContent = state.projectInfo.notice;
});
};
@@ -183,5 +188,35 @@ export default {
margin-right: 10px;
}
}
+ .txt-content {
+ margin: 24px 0 32px;
+ text-indent: 2em;
+ font-size: 14px;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #000000;
+ line-height: 22px;
+ }
+ .txt-contain {
+ margin-bottom: 18px;
+ display: flex;
+ span {
+ display: inline-block;
+ width: 50px;
+ }
+ .txt-content-tip {
+ width: calc(100% - 50px);
+ font-size: 14px;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #000000;
+ line-height: 22px;
+ display: -webkit-box;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ -webkit-box-orient: vertical;
+ word-break: break-all;
+ }
+ }
}
\ No newline at end of file
From e39377840d352a131424276578c94da0d1f4f3af Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 6 Dec 2022 19:18:22 +0800
Subject: [PATCH 05/12] =?UTF-8?q?--=20=E9=A1=B9=E7=9B=AE=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/projectcenter/ProjectAdd.vue | 36 ++++----------------------
1 file changed, 5 insertions(+), 31 deletions(-)
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index b8162c14..e788de34 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -60,8 +60,8 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -500,6 +471,9 @@ export default {
};
