Merge branch 'dev_1.2.0' of http://git.qmth.com.cn/union-question/union-question-web into dev_1.2.0

src/modules/questions/views/CourseProperty.vue

@@ -190,16 +190,20 @@
         <el-form-item label="课程名称" prop="courseId">
           <el-select
             v-model="coursePropertyForm.courseId"
-            class="dialog-input-width"
+            :remote-method="getCoursesForAdd"
+            :loading="courseAddSearch"
+            remote
             filterable
             clearable
+            class="dialog-input-width"
             placeholder="请选择课程"
+            @clear="getCoursesForAdd('')"
           >
             <el-option
-              v-for="item in courseInfoSelect"
-              :key="item.courseId"
-              :label="item.courseInfo"
-              :value="item.courseId"
+              v-for="item in courseAddList"
+              :key="item.id"
+              :label="item.name + '(' + item.code + ')'"
+              :value="item.id"
             >
             </el-option>
           </el-select>
@@ -303,6 +307,7 @@ import { mapState } from "vuex";
 export default {
   data() {
     return {
+      courseAddSearch: false,
       courseLoading4Search: false,
       formSearch: {
         name: "",
@@ -319,6 +324,7 @@ export default {
       fileList: [],
 
       courseList: [],
+      courseAddList: [],
       loading: false,
       tableData: [],
       currentPage: 1,
@@ -380,6 +386,7 @@ export default {
       token: this.user.token,
     };
     this.getCourses("");
+    this.getCoursesForAdd("");
   },
 
   methods: {
@@ -681,6 +688,15 @@ export default {
           this.courseLoading4Search = false;
         });
     },
+    getCoursesForAdd(query) {
+      this.courseAddSearch = true;
+      this.$httpWithMsg
+        .get(QUESTION_API + "/course/query?name=" + query)
+        .then((response) => {
+          this.courseAddList = response.data;
+          this.courseAddSearch = false;
+        });
+    },
     removeItem() {
       sessionStorage.removeItem("course_property_name");
       sessionStorage.removeItem("course_property_courseId");