|
|
@@ -98,11 +98,11 @@
|
|
|
<el-table-column label="公开状态" align="center" prop="isOpen">
|
|
|
<template slot-scope="r">{{ r.row.isOpen == 0 ? '未公开' : '公开' }}</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column label="上传人" align="center" prop="createBy"/>
|
|
|
+ <el-table-column label="上传时间" align="center" prop="createTime"/>
|
|
|
<el-table-column label="附件" align="center" prop="file"/>
|
|
|
<el-table-column label="备注" align="center" prop="remark"/>
|
|
|
- <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
|
|
|
|
|
|
- </el-table-column>
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope">
|
|
|
<!-- 公开 按钮显示逻辑: 仅当前用户上传的学习资料且处于未公开状态-->
|
|
|
@@ -196,10 +196,10 @@ import {
|
|
|
addMaterials,
|
|
|
updateMaterials,
|
|
|
editOpen
|
|
|
-} from "@/api/system/materials";
|
|
|
+} from "@/api/core/materials";
|
|
|
import {deptTreeSelect} from "@/api/system/public";
|
|
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|
|
-import {queryKnowledgeList} from "@/api/system/knowledge";
|
|
|
+import {queryKnowledgeList} from "@/api/core/knowledge";
|
|
|
import OrgTree from "@/components/orgTree/index.vue";
|
|
|
import kOrgTree from "@/components/k-orgTree/index.vue";
|
|
|
|
|
|
@@ -282,7 +282,6 @@ export default {
|
|
|
this.loading = true;
|
|
|
listMaterials(this.queryParams).then(response => {
|
|
|
this.materialsList = response.rows;
|
|
|
- console.log("this.materialsList", this.materialsList);
|
|
|
this.total = response.total;
|
|
|
this.loading = false;
|
|
|
});
|
|
|
@@ -426,6 +425,7 @@ export default {
|
|
|
/** 提交按钮 */
|
|
|
submitForm() {
|
|
|
this.$refs["form"].validate(valid => {
|
|
|
+ console.log("this.form",this.form)
|
|
|
if (valid) {
|
|
|
if (this.form.id != null) {
|
|
|
updateMaterials(this.form).then(response => {
|
|
|
@@ -443,20 +443,9 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
- /** 删除按钮操作 */
|
|
|
- handleDelete(row) {
|
|
|
- const ids = row.id || this.ids;
|
|
|
- this.$modal.confirm('是否确认删除?').then(function () {
|
|
|
- return delMaterials(ids);
|
|
|
- }).then(() => {
|
|
|
- this.getList();
|
|
|
- this.$modal.msgSuccess("删除成功");
|
|
|
- }).catch(() => {
|
|
|
- });
|
|
|
- },
|
|
|
/** 导出按钮操作 */
|
|
|
handleExport() {
|
|
|
- this.download('system/materials/export', {
|
|
|
+ this.download('core/materials/export', {
|
|
|
...this.queryParams
|
|
|
}, `materials_${new Date().getTime()}.xlsx`)
|
|
|
}
|