Merge remote-tracking branch 'origin/develop' into develop

src/views/courselibrary/CoursewareManage.vue

@@ -145,6 +145,7 @@
                   placeholder="请输入课程名称"
                   v-model:value="xzinputV1"
                   v-model:validate="validate"
+                  v-model:finished="finished"
                   :maxlength="20"
                   show-count
                   :type="2"
@@ -306,6 +307,7 @@
     <!-- 确定新建面授课弹窗 -->
     <CourseModal
       ref="CourseModalRef"
+      v-model:xzinputV1="xzinputV1"
       @visibleClose="closeOnlineCoursevisible"
     />
     <!-- 查看面授课弹框 start -->
@@ -364,6 +366,7 @@
                         placeholder="请输入课程名称"
                         v-model:value="qdms_inputV1"
                         v-model:validate="validate"
+                        v-model:finished="finished"
                         :maxlength="20"
                         show-count
                         :type="2"
@@ -628,8 +631,8 @@
                     <span style="margin-right: 14px">授课教师</span>
                   </div>
                   <div class="item_inp">
-                    <div class="i1_input">
-                      <ProjectManager
+                    <div class="select" style="width:436px; " >
+                      <ProjectManager 
                         v-model:value="member.value"
                         v-model:name="member.name"
                       ></ProjectManager>
@@ -2010,18 +2013,20 @@
               />
             </div>
           </div>
+           <!--
           <div class="cstm_items">
             <div class="signbox">
               <span style="margin-right: 3px">完成规则</span>
             </div>
             <div class="b_input">
-              <!--
+             
               <a-checkbox
                 v-model:checked="regisCom"
                 @click="regisCom = !regisCom"
               >
                 <span style="color: #6d7584">报名即完成</span>
               </a-checkbox> -->
+               <!--
               <a-checkbox v-model:checked="signCom" @click="signCom = !signCom">
                 <span style="color: #6d7584">签到即完成</span>
               </a-checkbox>
@@ -2032,7 +2037,7 @@
                 <span style="color: #6d7584">请假算完成</span>
               </a-checkbox>
             </div>
-          </div>
+          </div> -->
           <div class="cstm_items items_fj">
             <div class="signbox">
               <span style="margin-right: 3px">附件</span>
@@ -2145,6 +2150,9 @@
           </div>
         </div>
       </div>
+      <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
+    <a-spin :spinning="addLoading" tip="" />
+  </div>
     </a-modal>
     <!--新建开课页面 -->
     <!--开课学员管理页面 -->
@@ -2793,6 +2801,7 @@ import {
   onBeforeUnmount,
   watch,
 } from "vue";
+
 import * as api from "../../api/indexInvist.js";
 
 import { message } from "ant-design-vue";
@@ -3547,7 +3556,7 @@ export default defineComponent({
       value4: "",
       //选择线上还是面授
       xzinputV1: "",
-      valueE1: 2,
+      valueE1: "",
       valueE2: "",
       //确定面授
       ft_eidt: false,
@@ -3591,7 +3600,7 @@ export default defineComponent({
 
       imageUrl: "",
       imgList: [],
-      validate: true,
+      validate:false,
 
       pageSize2: 10,
       currentPage2: 0,
@@ -3638,6 +3647,7 @@ export default defineComponent({
       codevisible: false, //二维码弹窗
       codeInfo: null, //二维码内容
       codeUrl: codeUrl,
+      finished:false,
       // 课程三级分类
       options2222: [
         {
@@ -4540,15 +4550,26 @@ export default defineComponent({
         message.destroy();
         return message.warning("请输入必填项");
       }
-      if (!state.validate) {
+      
+      console.log("state.validate",state.validate);
+      if(!state.finished){
+        return;
+      }
+   
+      if (!state.validate && state.finished) {
         message.destroy();
-        return message.warning("路径图名称重复");
+        return message.warning("该课程名称已存在");
       }
       console.log(
         "state.bs_hs && state.valueE1 == 2",
         state.bs_hs,
         state.valueE1 == 2
       );
+      if( !state.valueE1 && !state.valueE2){
+        message.destroy();
+        return message.warning("请选择课程形式");
+      }
+      
 
       if (state.valueE1 === 2) {
         state.of_hs = false;
@@ -4659,7 +4680,7 @@ export default defineComponent({
       }
       if (!state.validate) {
         message.destroy();
-        return message.warning("路径图名称重复");
+        return message.warning("面授课名称重复");
       }
       edit(postData).then((res) => {
         if (res.data.code === 200) {
@@ -4713,6 +4734,7 @@ export default defineComponent({
     };
     //保存开课
     const handleSureStu = () => {
+      state.addLoading = true;
       let startTime,
         endTime = 0;
       if (state.xjkkinputV3) {
@@ -5772,7 +5794,7 @@ export default defineComponent({
 }
 
 .aeLoading {
-  z-index: 10000;
+  z-index: 100000;
 }
 
 .courseManage {