Merge remote-tracking branch 'origin/master'

src/modules/course/create/components/stepOneComponents/AddLecturer.vue

@@ -80,24 +80,25 @@ const handlePrimary = () => {
         <el-button plain @click="handelRemove(row.id)">删除</el-button>
       </template>
     </AppList>
-    <el-dialog v-model="dialogVisible" width="400px" title="添加讲师">
-      <div style="display: flex; justify-content: center">
-        讲师姓名：
-        <el-select
-          v-model="selectList"
-          multiple
-          filterable
-          remote
-          placeholder="请输入讲师姓名"
-          value-key="id"
-          :reserve-keyword="false"
-          :remote-method="remoteMethod"
-          :loading="loading"
-          style="flex: 1"
-        >
-          <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item" />
-        </el-select>
-      </div>
+    <el-dialog v-model="dialogVisible" width="400px" title="添加讲师" append-to-body>
+      <el-form label-suffix="：" label-position="left">
+        <el-form-item label="讲师姓名">
+          <el-select
+            v-model="selectList"
+            multiple
+            filterable
+            remote
+            placeholder="请输入讲师姓名"
+            value-key="id"
+            :reserve-keyword="false"
+            :remote-method="remoteMethod"
+            :loading="loading"
+            style="width: 100%"
+          >
+            <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item" />
+          </el-select>
+        </el-form-item>
+      </el-form>
       <template #footer>
         <span class="dialog-footer">
           <el-button type="primary" @click="handlePrimary">确认</el-button>

src/modules/course/create/components/stepOneComponents/AddLive.vue

@@ -96,24 +96,25 @@ const handlePrimary = () => {
         <el-button plain @click="handleRemove(row.id)">删除</el-button>
       </template>
     </AppList>
-    <el-dialog v-model="dialogVisible" width="400px" title="添加直播">
-      <div style="display: flex; justify-content: center">
-        直播会议号：
-        <el-select
-          v-model="selectList"
-          multiple
-          filterable
-          remote
-          placeholder="会议主题或者会议code"
-          value-key="id"
-          :reserve-keyword="false"
-          :remote-method="remoteMethod"
-          :loading="loading"
-          style="flex: 1"
-        >
-          <el-option v-for="item in options" :key="item.id" :label="item.subject" :value="item" />
-        </el-select>
-      </div>
+    <el-dialog v-model="dialogVisible" width="400px" title="添加直播" append-to-body>
+      <el-form label-suffix="：" label-position="left">
+        <el-form-item label="直播会议号">
+          <el-select
+            v-model="selectList"
+            multiple
+            filterable
+            remote
+            placeholder="会议主题或者会议code"
+            value-key="id"
+            :reserve-keyword="false"
+            :remote-method="remoteMethod"
+            :loading="loading"
+            style="width: 100%"
+          >
+            <el-option v-for="item in options" :key="item.id" :label="item.subject" :value="item" />
+          </el-select>
+        </el-form-item>
+      </el-form>
       <template #footer>
         <span class="dialog-footer">
           <el-button type="primary" @click="handlePrimary">确认</el-button>

src/modules/course/create/views/StepOne.vue

@@ -29,6 +29,10 @@ interface ICourseList {
   label: string
   value: string
 }
+
+const ruleFormRef = $ref<FormInstance>()
+const ruleFormRef2 = $ref<FormInstance>()
+
 // 课程类型
 const courseType = computed<ICourseList[]>(() => {
   return store.getMapValuesByKey('system_online_type')
@@ -83,7 +87,6 @@ const coverChange = (url: string) => {
 
 // 选择考试
 const changeExam = (data: any) => {
-  console.log(data, 'data')
   form.exam_id = JSON.parse(JSON.stringify(data))
     .map((item: any) => {
       return item.id
@@ -114,11 +117,15 @@ watchEffect(() => {
   form.live_id = setDefaultData(form.meetings)
 })
 
+watch(
+  () => form.lecturer_id,
+  () => {
+    ruleFormRef?.validateField('lecturer_id')
+  }
+)
 function setDefaultData(data: any[] = []) {
   return data.map((item: any) => item.id).join()
 }
-const ruleFormRef = $ref<FormInstance>()
-const ruleFormRef2 = $ref<FormInstance>()
 
 // 提交
 function handleSubmit() {