修改了课程管理相关的标签

src/views/courseInformation/courseManagement/index.vue

@@ -59,7 +59,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="课程类型:" prop="lessonType">
-            <el-select v-model="queryParams.lessonType" multiple placeholder="课程类型" clearable>
+            <el-select v-model="queryParams.lessonType" placeholder="课程类型" multiple clearable>
               <el-option
                 v-for="item in lessonTypeOptions"
                 :key="item.dictValue"
@@ -68,8 +68,8 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="技术端课程方案:" prop="classPlan" v-if="queryParams.lessonType[0] == 0 || queryParams.lessonType.length == 2">
-            <el-select v-model="queryParams.classPlan" class="selectWidth" placeholder="企业课程方案" clearable>
+          <el-form-item label="技术端课程方案:" prop="classPlan" v-if="queryParams.lessonType[0] === '0' || queryParams.lessonType.length == 2">
+            <el-select v-model="queryParams.classPlan" class="selectWidth" placeholder="企业课程方案" multiple clearable>
               <el-option
                 v-for="item in coursePlanOptions"
                 :key="item.dictValue"
@@ -78,8 +78,8 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="技能端课程方案:" prop="classPlanSchool" v-if="queryParams.lessonType[0] == 1 || queryParams.lessonType.length == 2">
-            <el-select v-model="queryParams.classPlanSchool" class="selectWidth" placeholder="院校课程方案" clearable>
+          <el-form-item label="技能端课程方案:" prop="classPlanSchool" v-if="queryParams.lessonType[0] === '1' || queryParams.lessonType.length == 2">
+            <el-select v-model="queryParams.classPlanSchool" class="selectWidth" placeholder="院校课程方案" multiple clearable>
               <el-option
                 v-for="item in coursePlanOptionsC"
                 :key="item.dictValue"
@@ -88,7 +88,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="前沿讲堂分类:" prop="courseType">
+          <el-form-item label="前沿讲堂分类:" prop="courseType" v-if="queryParams.classPlan === '0' || queryParams.classPlanSchool === '0'">
             <el-select v-model="queryParams.courseType" placeholder="前沿讲堂分类" clearable>
               <el-option
                 v-for="item in courseTypeOptions"
@@ -98,7 +98,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="智联课堂分类:" prop="courseType">
+          <el-form-item label="智联课堂分类:" prop="courseType" v-if="queryParams.classPlan === '3'">
             <el-select v-model="queryParams.intelligentClassroom" placeholder="智联课堂分类" clearable>
               <el-option
                 v-for="item in intelligentClassroomOptions"
@@ -108,7 +108,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="难度等级:" prop="difficultyClassify">
+          <el-form-item label="难度等级:" prop="difficultyClassify" v-if="queryParams.classPlan === '2'">
             <el-select v-model="queryParams.difficultyClassify" placeholder="难度等级" clearable>
               <el-option
                 v-for="item in difficultyOptions"
@@ -118,7 +118,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="岗位分类:" prop="jobClassify">
+          <el-form-item label="岗位分类:" prop="jobClassify" v-if="queryParams.classPlan === '2'">
             <el-select v-model="queryParams.jobClassify" placeholder="岗位分类" clearable>
               <el-option
                 v-for="item in valueOptions"
@@ -128,6 +128,16 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="课程维度:" prop="courseDimensions" v-if="queryParams.classPlan === '2'">
+            <el-select v-model="queryParams.courseDimensions" placeholder="课程维度" clearable>
+              <el-option
+                v-for="item in courseDimensionsOptions"
+                :key="item.dictValue"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              />
+            </el-select>
+          </el-form-item>
 <!--          <el-form-item label="企业技术分类:" prop="tecClassify">-->
 <!--            <el-select v-model="queryParams.tecClassify" placeholder="技术分类" clearable>-->
 <!--              <el-option-->
@@ -138,8 +148,8 @@
 <!--              />-->
 <!--            </el-select>-->
 <!--          </el-form-item>-->
-          <el-form-item label="院校技术分类:" prop="tecClassifySchool">
-            <el-select v-model="queryParams.tecClassifySchool" placeholder="院校技术分类" clearable>
+          <el-form-item label="技术分类:" prop="tecClassifySchool" v-if="queryParams.classPlanSchool === '1'">
+            <el-select v-model="queryParams.tecClassifySchool" placeholder="技术分类" clearable>
               <el-option
                 v-for="item in courseDirection"
                 :key="item.dictValue"
@@ -872,14 +882,11 @@ export default {
       lessonTypeOptions: [],
       // 课程方向
       courseDirection: [],
-      valueOptions: [
-      ],
-      difficultyOptions: [
-      ],
-      value3Options: [
-      ],
-      value4Options: [
-      ],
+      valueOptions: [],
+      difficultyOptions: [],
+      value3Options: [],
+      value4Options: [],
+      courseDimensionsOptions: [],
       formLabelWidth: '90px',
       // 表格
       tableData: [],
@@ -922,6 +929,9 @@ export default {
         lessonName: '',
         classHour: '',
         classPlan: '',
+        classPlanSchool: '',
+        courseDimensions: '',
+        tecClassifySchool: '',
         jobClassify: '',
         tecClassify: '',
         difficultyClassify: '',
@@ -1001,6 +1011,7 @@ export default {
     this.getcourseTypeOptions()
     this.getCourseDirection()
     this.getJobClassification()
+    this.getCourseDimensions()
     this.getDifficultyLevel()
     this.getLessonType()
     this.getCoursePlan()
@@ -1118,6 +1129,8 @@ export default {
         lessonName: '',
         classHour: '',
         classPlan: '',
+        classPlanSchool: '',
+        tecClassifySchool: '',
         jobClassify: '',
         tecClassify: '',
         difficultyClassify: '',
@@ -1357,7 +1370,7 @@ export default {
     getCoursePlan() {
       getDict('class_plan').then(res => {
         this.coursePlanOptions = res.data
-        console.log('课程方案', this.coursePlanOptions)
+        console.log('技术端课程方案', this.coursePlanOptions)
       })
     },
     // 获取前沿讲堂分类
@@ -1376,7 +1389,7 @@ export default {
     getCoursePlanC() {
       getDict('class_plan_c').then(res => {
         this.coursePlanOptionsC = res.data
-        console.log('课程方案', this.coursePlanOptionsC)
+        console.log('技能端课程方案', this.coursePlanOptionsC)
       })
     },
     // 获取岗位类型
@@ -1385,6 +1398,12 @@ export default {
         this.valueOptions = res.data
       })
     },
+    // 获取岗位类型
+    getCourseDimensions() {
+      getDict('course_dimensions').then(res => {
+        this.courseDimensionsOptions = res.data
+      })
+    },
     // 获取技术分类
     getCourseDirection() {
       getDict('tec_classify').then(res => {

src/views/courseInformation/courseManagement/info/index.vue

@@ -43,7 +43,7 @@
         <el-row class="border-border" :gutter="100">
           <el-col :span="24">
             <el-form-item label="课程类型:" prop="lessonType">
-              <el-checkbox v-model="form.lessonType" true-label="1" false-label="0" @change="lessonTypeChange">企业</el-checkbox>
+              <el-checkbox v-model="form.lessonType" true-label="1" false-label="0" @change="lessonTypeChange">技术端</el-checkbox>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -138,7 +138,7 @@
         <el-row class="border-border" :gutter="100">
           <el-col :span="24">
             <el-form-item label="课程类型:" prop="lessonTypeSchool">
-              <el-checkbox v-model="form.lessonTypeSchool" true-label="1" false-label="0" @change="lessonTypeSchoolChange">院校</el-checkbox>
+              <el-checkbox v-model="form.lessonTypeSchool" true-label="1" false-label="0" @change="lessonTypeSchoolChange">技能端</el-checkbox>
             </el-form-item>
           </el-col>
           <el-col :span="12">

src/views/courseInformation/unitManagement/index.vue

@@ -157,7 +157,7 @@
     />
     <!-- 添加或修改单位管理配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="90px">
+      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
         <el-form-item label="单位类型:" prop="unitType">
           <el-select v-model="form.unitType" style="width: 100%" clearable placeholder="请选择单位类型">
             <el-option
@@ -285,7 +285,8 @@ export default {
         unitName: undefined,
         unitNumber: undefined,
         exitId: undefined,
-        flag: ''
+        flag: '',
+        lessonType: []
       },
       // 表单参数
       form: {
@@ -333,7 +334,21 @@ export default {
     /** 查询单位管理列表 */
     getList() {
       this.loading = true
-      listSysUnit(this.addDateRange(this.queryParams, this.dateRange)).then(
+      const params = {
+        page: this.queryParams.page,
+        rows: this.queryParams.rows,
+        createdBy: this.queryParams.createdBy,
+        createdDate: this.queryParams.createdDate,
+        updatedBy: this.queryParams.updatedBy,
+        updateByDate: this.queryParams.updateByDate,
+        unitType: this.queryParams.unitType,
+        unitName: this.queryParams.unitName,
+        unitNumber: this.queryParams.unitNumber,
+        exitId: this.queryParams.exitId,
+        flag: this.queryParams.flag,
+        lessonType: this.queryParams.lessonType.length > 1 ? '2' : this.queryParams.lessonType.join(',')
+      }
+      listSysUnit(this.addDateRange(params, this.dateRange)).then(
         response => {
           this.sysUnitList = response.rows
           this.total = response.total
@@ -359,7 +374,8 @@ export default {
         unitName: undefined,
         unitNumber: undefined,
         exitId: undefined,
-        flag: '1'
+        flag: '1',
+        lessonType: []
       }
       this.resetForm('form')
     },