hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-14 21:36:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix:增加课程审核时间字段，类型搜索问题修复

Browse Source
This commit is contained in:
wuyx
2022-11-30 15:41:00 +08:00
parent a2e699571c
commit 29ba6dd15d
2 changed files with 104 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
src/components/drawers/ProjectAudit.vue
View File

@@ -1,19 +1,11 @@
<template> <template>
<a-drawer <a-drawer :visible="ProjAuditvisible" class="drawerStyle ProjectAudit" placement="right" width="60%"
:visible="ProjAuditvisible" @after-visible-change="afterVisibleChange">
class="drawerStyle ProjectAudit"
placement="right"
width="60%"
@after-visible-change="afterVisibleChange"
>
<div class="drawerMain"> <div class="drawerMain">
<div class="header"> <div class="header">
<div class="headerTitle">审核项目</div> <div class="headerTitle">审核项目</div>
<img <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
style="width: 29px; height: 29px; cursor: pointer" @click="closeDrawer" />
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div> </div>
<div class="main" style="padding-right: 10px"> <div class="main" style="padding-right: 10px">
<a-tabs v-model:activeKey="activeSetKey"> <a-tabs v-model:activeKey="activeSetKey">
@@ -29,19 +21,13 @@
<div class="set_content"> <div class="set_content">
<div class="setc_name"><span>封面图：</span></div> <div class="setc_name"><span>封面图：</span></div>
<div class="setc_main"> <div class="setc_main">
<img <img style="width: 151px; height: 84px" :src="picUrl" alt="" />
style="width: 151px; height: 84px"
:src="picUrl"
alt=""
/>
</div> </div>
</div> </div>
<div class="set_content"> <div class="set_content">
<div class="setc_name"><span>项目时间：</span></div> <div class="setc_name"><span>项目时间：</span></div>
<div class="setc_main"> <div class="setc_main">
<span style="color: #999999" <span style="color: #999999">{{ startTime }} ～ {{ endTime }}</span>
>{{ startTime }} ～ {{ endTime }}</span
>
</div> </div>
</div> </div>
<div class="set_content"> <div class="set_content">
@@ -65,11 +51,8 @@
<div class="set_content"> <div class="set_content">
<div class="setc_name"><span>同步学习记录：</span></div> <div class="setc_name"><span>同步学习记录：</span></div>
<div class="setc_main"> <div class="setc_main">
<a-radio v-model:checked="checkedSty" <a-radio v-model:checked="checkedSty"><span
><span style="color: #333333" style="color: #333333">同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span></a-radio>
>同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
></a-radio
>
</div> </div>
</div> </div>
<div class="set_content"> <div class="set_content">
@@ -87,9 +70,7 @@
<div class="set_content"> <div class="set_content">
<div class="setc_name"><span>是否BOEU实施：</span></div> <div class="setc_name"><span>是否BOEU实施：</span></div>
<div class="setc_main"> <div class="setc_main">
<a-radio v-model:checked="checkedBOEU" <a-radio v-model:checked="checkedBOEU"><span style="color: #333333">BOEU实施</span></a-radio>
><span style="color: #333333">BOEU实施</span></a-radio
>
</div> </div>
</div> </div>
</div> </div>
@@ -101,7 +82,7 @@
</button> </button>
</div> </div>
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="2" tab="修改记录"></a-tab-pane> <!-- <a-tab-pane key="2" tab="修改记录"></a-tab-pane> -->
</a-tabs> </a-tabs>
<div class="audit"> <div class="audit">
<div class="set_content"> <div class="set_content">
@@ -116,7 +97,7 @@
<div class="set_content"> <div class="set_content">
<div class="setc_name"><span>审核意见：</span></div> <div class="setc_name"><span>审核意见：</span></div>
<div class="setc_main"> <div class="setc_main">
<a-textarea v-model:value="valueSuggest" :rows="4"/> <a-textarea v-model:value="valueSuggest" :rows="4" />
</div> </div>
</div> </div>
</div> </div>
@@ -130,11 +111,11 @@
</template> </template>
<script> <script>
import {toRefs, reactive} from "vue"; import { toRefs, reactive } from "vue";
import {getTask} from "../../api/indexTaskadd"; import { getTask } from "../../api/indexTaskadd";
import {toDate} from "../../api/method"; import { toDate } from "../../api/method";
import {auditView} from "../../api/indexAudit"; import { auditView } from "../../api/indexAudit";
import {message} from "ant-design-vue"; import { message } from "ant-design-vue";
export default { export default {
name: "ProjectAudit", name: "ProjectAudit",
@@ -225,26 +206,26 @@ export default {
state.manager = info.manager; state.manager = info.manager;
state.remark = info.remark; state.remark = info.remark;
state.level = state.level =
info.level == 1 info.level == 1
? "集团级" ? "集团级"
: info.level == 2 : info.level == 2
? "组织级" ? "组织级"
: info.level == 3 : info.level == 3
? "现地级" ? "现地级"
: info.level == 4 : info.level == 4
? "部门级" ? "部门级"
: "-"; : "-";
state.tlevel = info.level; state.tlevel = info.level;
state.systemId = state.systemId =
info.systemId == 1 info.systemId == 1
? "集团级" ? "集团级"
: info.systemId == 2 : info.systemId == 2
? "组织级" ? "组织级"
: info.systemId == 3 : info.systemId == 3
? "现地级" ? "现地级"
: info.systemId == 4 : info.systemId == 4
? "部门级" ? "部门级"
: "-"; : "-";
state.tsystemId = info.systemId; state.tsystemId = info.systemId;
state.checkedSty = info.courseSyncFlag == 1 ? true : false; state.checkedSty = info.courseSyncFlag == 1 ? true : false;
state.courseSyncFlag = info.courseSyncFlag; state.courseSyncFlag = info.courseSyncFlag;
@@ -260,13 +241,13 @@ export default {
// state.attach = info.attach; // state.attach = info.attach;
// state.templateId = info.templateId; // state.templateId = info.templateId;
state.sourceBelong = state.sourceBelong =
info.sourceBelongId == 1 info.sourceBelongId == 1
? "项目一" ? "项目一"
: info.sourceBelongId == 2 : info.sourceBelongId == 2
? "项目二" ? "项目二"
: info.sourceBelongId == 3 : info.sourceBelongId == 3
? "项目三" ? "项目三"
: "-"; : "-";
}); });
}; };
@@ -284,16 +265,16 @@ export default {
pass: state.valuePass == "1" ? 1 : -1, pass: state.valuePass == "1" ? 1 : -1,
projectId: props.chooseProject, projectId: props.chooseProject,
}) })
.then((res) => { .then((res) => {
console.log("提交成功", res); console.log("提交成功", res);
message.destroy(); message.destroy();
message.success("提交成功"); message.success("提交成功");
closeDrawer(); closeDrawer();
}) })
.catch((err) => { .catch((err) => {
console.log(err); console.log(err);
message.warning("提交失败"); message.warning("提交失败");
}); });
}; };
return { return {

125
src/views/examine/CourseReviewed.vue
View File

@@ -14,35 +14,24 @@
<div class="tmplh_inp"> <div class="tmplh_inp">
<div class="inpbox"> <div class="inpbox">
<div class="inpbox1"> <div class="inpbox1">
<a-select <a-select v-model:value="valueproj" value-key="value"
v-model:value="valueproj" :options="[{ label: '请选择内容分类', value: '' }, ...calssifyList]" />
value-key="value"
:options="[{label:'请选择内容分类',value:''},...calssifyList]"
/>
</div> </div>
<div class="inpbox1"> <div class="inpbox1">
<a-input <a-input v-model:value="valuecreater" style="
v-model:value="valuecreater"
style="
width: 270px; width: 270px;
height: 40px; height: 40px;
border-radius: 8px; border-radius: 8px;
margin-right: 14px; margin-right: 14px;
" " placeholder="请输入创建人" />
placeholder="请输入创建人"
/>
</div> </div>
<div class="inpbox1"> <div class="inpbox1">
<a-input <a-input v-model:value="valuename" style="
v-model:value="valuename"
style="
width: 270px; width: 270px;
height: 40px; height: 40px;
border-radius: 8px; border-radius: 8px;
margin-right: 14px; margin-right: 14px;
" " placeholder="请输入名称" />
placeholder="请输入名称"
/>
</div> </div>
</div> </div>
</div> </div>
@@ -59,28 +48,13 @@
</div> </div>
<div class="tmpl_body"> <div class="tmpl_body">
<div class="tmpl_tabbox"> <div class="tmpl_tabbox">
<a-table <a-table :columns="columns1" :data-source="tableData1" :loading="tableDataTotal === -1 ? true : false"
:columns="columns1" expandRowByClick="true" @expand="expandTable" :scroll="{ x: 1300 }" :pagination="false" />
:data-source="tableData1"
:loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
@expand="expandTable"
:scroll="{ x: 1300 }"
:pagination="false"
/>
</div> </div>
<div class="tableBox"> <div class="tableBox">
<div class="pa"> <div class="pa">
<a-pagination <a-pagination v-if="total > 10" showSizeChanger="true" show-quick-jumper :pageSize="pageSize"
v-if="total > 10" v-model:current="currentPage" :total="total" class="pagination" @change="changePagination" />
showSizeChanger="true"
show-quick-jumper
:pageSize="pageSize"
v-model:current="currentPage"
:total="total"
class="pagination"
@change="changePagination"
/>
</div> </div>
</div> </div>
</div> </div>
@@ -88,9 +62,10 @@
</div> </div>
</template> </template>
<script> <script>
import {reactive, toRefs, onMounted} from "vue"; import { reactive, toRefs, onMounted } from "vue";
import {courseListView} from "../../api/indexAudit"; import { courseListView } from "../../api/indexAudit";
import * as api1 from "@/api/index1"; import * as api1 from "@/api/index1";
import { toDate } from "../../api/method";
export default { export default {
name: "CoursereViewed", name: "CoursereViewed",
@@ -128,7 +103,7 @@ export default {
dataIndex: "content", dataIndex: "content",
key: "content", key: "content",
align: "center", align: "center",
customRender: ({text}) => state.calssifyList.find(e => e.value == text)?.label, customRender: ({ text }) => state.calssifyList.find(e => e.value == text)?.label,
}, },
{ {
title: "审核状态", title: "审核状态",
@@ -147,6 +122,11 @@ export default {
dataIndex: "time", dataIndex: "time",
key: "time", key: "time",
align: "center", align: "center",
customRender: (time) => {
console.log(time)
return <div style="color:#387DF7">{toDate(time, "Y-M-D h:m")}</div>;
},
}, },
{ {
title: "审核说明", title: "审核说明",
@@ -154,15 +134,15 @@ export default {
key: "msg", key: "msg",
align: "center", align: "center",
}, },
{ // {
title: "操作", // title: "操作",
dataIndex: "opt", // dataIndex: "opt",
key: "opt", // key: "opt",
align: "center", // align: "center",
customRender: () => { // customRender: () => {
return <div style="color:#387DF7">审核日志</div>; // return <div style="color:#387DF7">审核日志</div>;
}, // },
}, // },
], ],
tableData1: [ tableData1: [
// { // {
@@ -180,24 +160,25 @@ export default {
const getList = () => { const getList = () => {
let objn = { let objn = {
auditStatus: 0, auditStatus: 0,
categoryId: state.valueproj, categoryId: Number(state.valueproj),
createName: state.valuecreater, createName: state.valuecreater,
name: state.valuename, name: state.valuename,
pageNo: state.currentPage, pageNo: state.currentPage,
pageSize: 10, pageSize: 10,
}; };
console.log(objn)
courseListView(objn) courseListView(objn)
.then((res) => { .then((res) => {
console.log("获取已审核课程成功", res.data.data); console.log("获取已审核课程成功", res.data.data);
state.total = res.data.data.total; state.total = res.data.data.total;
setTableData(res.data.data.rows); setTableData(res.data.data.rows);
}) })
.catch((err) => { .catch((err) => {
console.log("获取已审核课程失败", err); console.log("获取已审核课程失败", err);
}); });
}; };
const setTableData = (table) => { const setTableData = (table) => {
if(!table || !table.length){ if (!table || !table.length) {
state.tableData1 = [] state.tableData1 = []
return return
} }
@@ -210,17 +191,17 @@ export default {
type: item.type == 1 ? "线上" : "线下", type: item.type == 1 ? "线上" : "线下",
content: item.categoryId, content: item.categoryId,
status: status:
item.auditStatus == 0 item.auditStatus == 0
? "未提交" ? "未提交"
: item.auditStatus == 1 : item.auditStatus == 1
? "提交待审核" ? "提交待审核"
: item.auditStatus == 2 : item.auditStatus == 2
? "通过" ? "通过"
: item.auditStatus == -1 : item.auditStatus == -1
? "拒绝" ? "拒绝"
: "-", : "-",
creater: item.createName, creater: item.createName,
time: "-", time: item.createTime,
msg: item.description || "-", msg: item.description || "-",
}; };
array.push(obj); array.push(obj);
@@ -229,9 +210,9 @@ export default {
}; };
const reset = () => { const reset = () => {
(state.valueproj = ''), (state.valueproj = ''),
(state.valuecreater = null), (state.valuecreater = null),
(state.valuename = null), (state.valuename = null),
getList(); getList();
}; };
const changePagination = (pagina) => { const changePagination = (pagina) => {
state.currentPage = pagina; state.currentPage = pagina;
@@ -246,7 +227,7 @@ export default {
onMounted(async () => { onMounted(async () => {
getList(); getList();
//获取分类列表 //获取分类列表
state.calssifyList = (await getDictList("faceclassClass")).map(e => ({label: e.dictName, value: e.dictCode})) state.calssifyList = (await getDictList("faceclassClass")).map(e => ({ label: e.dictName, value: e.dictCode }))
}); });
return { return {
...toRefs(state), ...toRefs(state),