From ab725d60d1ce6d543afc0384ad9b9270e06c6acd Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Tue, 20 Dec 2022 01:44:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=90=8D=E7=A7=B0=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 12 ++++------
 src/views/research/ResearchManage.vue        | 25 +++++++++++++-------
 2 files changed, 21 insertions(+), 16 deletions(-)

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/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();