取消
@@ -205,6 +304,9 @@ const props = defineProps({
default: () => []
}
})
+const person =ref(false)
+const dept =ref(false)
+const group =ref(false)
const visiable = ref(false)
const activeKey = ref(1)
const stageVisible = ref(false)
@@ -404,18 +506,23 @@ function stuDel(i) {
selectsData.value.studentList.splice(i, 1)
}
+function orgDel(i) {
+ orgSelectKeys.value = orgSelectKeys.value.filter(e => e !== selectsData.value.deptList[i].id)
+ selectsData.value.deptList.splice(i, 1)
+}
+
function AuditDel(i) {
auditSelectKeys.value = auditSelectKeys.value.filter(e => e !== selectsData.value.groupList[i].id)
selectsData.value.groupList.splice(i, 1)
}
-//
+
// function orgSelect(key, obj) {
-// console.log(obj)
-// request(ORG_CHILD_LIST, {orgId: null}).then(res => {
-// console.log(res.result)
-// })
-// }
+ // console.log(obj)
+ //request(ORG_CHILD_LIST, {orgId: null}).then(res => {
+ //console.log(res.result)
+ //})
+ //}
function onStuSelectChange(e, l) {
stuSelectKeys.value = e
@@ -516,7 +623,7 @@ watch(visiable, () => {
})
-
\ No newline at end of file
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 9b87b4f0..5a7932fd 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -118,7 +118,7 @@ const tablecolumns = ref([
title: "姓名",
dataIndex: "studentName",
key: "studentName",
- width: "20%",
+ width: "10%",
align: "left",
className: "h",
},
@@ -126,7 +126,7 @@ const tablecolumns = ref([
title: "工号",
dataIndex: "studentUserNo",
key: "studentUserNo",
- width: "10%",
+ width: "20%",
align: "center",
className: "h",
ellipsis: true,
@@ -135,7 +135,7 @@ const tablecolumns = ref([
title: "部门",
dataIndex: "studentDepartName",
key: "studentDepartName",
- width: "10%",
+ width: "20%",
align: "center",
className: "h",
ellipsis: true,
@@ -144,7 +144,7 @@ const tablecolumns = ref([
title: "加入方式",
dataIndex: "source",
key: "source",
- width: "10%",
+ width: "20%",
align: "center",
customRender: ({record: {source}}) =>
({1: "快速添加", 2: "组织", 3: "受众"}[source]),
@@ -174,7 +174,7 @@ const tableData = ref({
});
const stuRowSelection = computed(() => ({
- columnWidth: 20,
+ columnWidth: 10,
selectedRowKeys: stuSelectKeys.value,
onChange: onStuSelectChange,
preserveSelectedRowKeys: true,
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index f3c402a1..631f72f6 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -143,7 +143,7 @@
placeholder="请输入课程名称"
v-model:value="xzinputV1"
v-model:validate="validate"
- v-model:finished="finished"
+
:maxlength="20"
show-count
:type="2"
@@ -364,7 +364,7 @@
placeholder="请输入课程名称"
v-model:value="qdms_inputV1"
v-model:validate="validate"
- v-model:finished="finished"
+
:maxlength="20"
show-count
:type="2"
@@ -3732,7 +3732,7 @@ export default defineComponent({
codevisible: false, //二维码弹窗
codeInfo: null, //二维码内容
codeUrl: codeUrl,
- finished: false,
+
// 课程三级分类
options2222: [
{
@@ -4658,11 +4658,9 @@ export default defineComponent({
}
console.log("state.validate", state.validate);
- if (!state.finished) {
- return;
- }
+
- if (!state.validate && state.finished) {
+ if (!state.validate) {
message.destroy();
return message.warning("该课程名称已存在");
}
diff --git a/src/views/courselibrary/components/seeModal.vue b/src/views/courselibrary/components/seeModal.vue
index 1d9971d6..877cb44f 100644
--- a/src/views/courselibrary/components/seeModal.vue
+++ b/src/views/courselibrary/components/seeModal.vue
@@ -1,214 +1,154 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
课程名称:
-
-
-
- {{ filterTxt(detail.name) }}
-
-
-
-
-
-
-
-
-
封面图:
-
-
-
-
-
-
-
-
-
目标人群:
-
-
-
- {{ filterTxt(detail.targetUser) }}
-
-
-
-
-
- 课程价值:
-
-
-
- {{ filterTxt(detail.meaning) }}
-
-
-
-
-
-
-
-
-
内容分类:
-
-
-
- {{ filterClassTxt(detail.categoryId) }}
-
-
-
-
-
- 场景:
-
-
-
- {{ filterSenceTxt(detail.sceneId) }}
-
-
-
-
-
- 内容标签:
-
-
- {{ filterTxt(detail.tips) }}
-
-
-
-
-
-
-
-
-
-
授课教师:
-
-
-
- {{ filterTxt(detail.teacher) }}
-
-
-
-
-
- 课程简介:
-
-
-
- {{ filterTxt(detail.intro) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
课程名称:
+
+
+
+ {{ filterTxt(detail.name) }}
+
+
+
+
+
+
+
+
+
封面图:
+
+
+
+
+
+
+
+
+
目标人群:
+
+
+
+ {{ filterTxt(detail.targetUser) }}
+
+
+
+
+
+ 课程价值:
+
+
+
+ {{ filterTxt(detail.meaning) }}
+
+
+
+
+
+
+
+
+
内容分类:
+
+
+
+ {{ filterClassTxt(detail.categoryId) }}
+
+
+
+
+
+ 场景:
+
+
+
+ {{ filterSenceTxt(detail.sceneId) }}
+
+
+
+
+
+ 内容标签:
+
+
+ {{ filterTxt(detail.tips) }}
+
+
+
+
+
+
+
+
+
+
授课教师:
+
+
+
+ {{ filterTxt(detail.teacher) }}
+
+
+
+
+
+ 课程简介:
+
+
+
+ {{ filterTxt(detail.intro) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
- {{
- item.indexOf("-") !== -1
- ? item.slice(
- item.lastIndexOf("/") + 1,
- item.lastIndexOf("-")
- ) + item.slice(item.lastIndexOf("."))
- : item
- }}
-
-
+ ">
+ {{
+ item.indexOf("-") !== -1
+ ? item.slice(
+ item.lastIndexOf("/") + 1,
+ item.lastIndexOf("-")
+ ) + item.slice(item.lastIndexOf("."))
+ : item
+ }}
+
+
-
-
-
下载
-
-
-
-
-
-
-
-
-
-
+
+
+
下载
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index af0758d0..00cbb91d 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -110,7 +110,7 @@
placeholder="请输入评估名称"
v-model:value="assessmentName"
v-model:validate="validate"
- v-model:finished="finished"
+
:maxlength="15"
show-count
:type="4"
@@ -199,6 +199,7 @@ import { toDate } from "../../api/method.js";
import store from "@/store";
import { message } from "ant-design-vue";
import NameInput from "@/components/project/NameInput";
+import {validateName} from "@/api/index1";
export default {
name: "learningPath",
components: {
@@ -312,7 +313,7 @@ export default {
copy_hs: false,
back_hs: false,
pub_hs: false,
- finished:false,
+
validate: true,
});
const tableDataFunc = () => {
@@ -590,20 +591,26 @@ export default {
state.assessmentName = item.assessmentName;
state.newNext = true;
};
- const handleNext = () => {
+ const handleNext = async() => {
if (!state.assessmentId) {
if (!state.assessmentName) {
message.error("请输入评估名称");
return false;
}
- if (!state.finished) {
- return;
- }
-
- if (!state.validate && state.finished) {
+ if (!state.validate ) {
message.destroy();
return message.warning("该评估名称已存在");
- }
+ }
+ const offName = await validateName({name: state.assessmentName, type:4, id:state.assessmentId}).then(res => {
+ return res.data.data == 1;
+ });
+ if(offName){
+ message.destroy();
+ return message.warning("课程名称重复,请重新填写");
+ }
+
+
+
store.commit("SET_assessmentName", state.assessmentName);
router.push("/researchadd");
handleCancel();