修改bug

src/views/courseInformation/courseManagement/index.vue

@@ -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="企业课程方案" multiple clearable>
+          <el-form-item label="技术端课程方案:" prop="classPlan" v-if="queryParams.lessonType.includes('0')">
+            <el-select v-model="queryParams.classPlan" class="selectWidth" placeholder="技术端课程方案" multiple clearable>
               <el-option
                 v-for="item in coursePlanOptions"
                 :key="item.dictValue"
@@ -78,7 +78,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="技能端课程方案:" prop="classPlanSchool" v-if="queryParams.lessonType[0] === '1' || queryParams.lessonType.length == 2">
+          <el-form-item label="技能端课程方案:" prop="classPlanSchool" v-if="queryParams.lessonType.includes('1')">
             <el-select v-model="queryParams.classPlanSchool" class="selectWidth" placeholder="院校课程方案" multiple clearable>
               <el-option
                 v-for="item in coursePlanOptionsC"
@@ -88,7 +88,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="前沿讲堂分类:" prop="courseType" v-if="queryParams.classPlan === '0' || queryParams.classPlanSchool === '0'">
+          <el-form-item label="前沿讲堂分类:" prop="courseType" v-if="queryParams.classPlan.includes('0') || queryParams.classPlanSchool.includes('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" v-if="queryParams.classPlan === '3'">
+          <el-form-item label="智联课堂分类:" prop="courseType" v-if="queryParams.classPlan.includes('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" v-if="queryParams.classPlan === '2'">
+          <el-form-item label="难度等级:" prop="difficultyClassify" v-if="queryParams.classPlan.includes('1')">
             <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" v-if="queryParams.classPlan === '2'">
+          <el-form-item label="岗位分类:" prop="jobClassify" v-if="queryParams.classPlan.includes('1')">
             <el-select v-model="queryParams.jobClassify" placeholder="岗位分类" clearable>
               <el-option
                 v-for="item in valueOptions"
@@ -128,7 +128,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="课程维度:" prop="courseDimensions" v-if="queryParams.classPlan === '2'">
+          <el-form-item label="课程维度:" prop="courseDimensions" v-if="queryParams.classPlan.includes('1')">
             <el-select v-model="queryParams.courseDimensions" placeholder="课程维度" clearable>
               <el-option
                 v-for="item in courseDimensionsOptions"
@@ -148,7 +148,7 @@
 <!--              />-->
 <!--            </el-select>-->
 <!--          </el-form-item>-->
-          <el-form-item label="技术分类:" prop="tecClassifySchool" v-if="queryParams.classPlanSchool === '1'">
+          <el-form-item label="技术分类:" prop="tecClassifySchool" v-if="queryParams.classPlanSchool.includes('1')">
             <el-select v-model="queryParams.tecClassifySchool" placeholder="技术分类" clearable>
               <el-option
                 v-for="item in courseDirection"
@@ -358,37 +358,57 @@
               <span>{{ scope.row.classHour }}</span>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="难度等级" prop="difficultyClassify" min-width="140px" :show-overflow-tooltip="true">
-            <template slot-scope="scope">
-              <span>{{ getDifficultyLevelName(scope.row.difficultyClassify) }}</span>
-            </template>
-          </el-table-column>
           <el-table-column align="center" label="课程类型" prop="lessonType" min-width="140px" :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <span>{{ getLessonTypeName( scope.row.lessonType,scope.row.lessonTypeSchool) }}</span>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="企业课程方案" prop="classPlan" min-width="200px" :show-overflow-tooltip="true">
+          <el-table-column align="center" label="技术端-课程方案" prop="classPlan" min-width="200px" :show-overflow-tooltip="true" v-if="queryParams.lessonType.includes('0') || queryParams.lessonType.length === 0">
             <template slot-scope="scope">
               <span>{{ getCoursePlanName( scope.row.classPlan) }}</span>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="岗位分类" prop="jobClassify" min-width="140px" :show-overflow-tooltip="true">
+          <el-table-column align="center" label="技术端-前沿讲堂" prop="courseType" min-width="200px" :show-overflow-tooltip="true" v-if="queryParams.lessonType.includes('0') || queryParams.lessonType.length === 0">
+            <template slot-scope="scope">
+              <span>{{ getCourseTypeName( scope.row.courseType) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="岗位分类" prop="jobClassify" min-width="140px" :show-overflow-tooltip="true" v-if="queryParams.lessonType.includes('0') || queryParams.lessonType.length === 0">
             <template slot-scope="scope">
               <span>{{ getJobClassificationName(scope.row.jobClassify) }}</span>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="企业技术分类" prop="tecClassify" min-width="200px" :show-overflow-tooltip="true">
+          <el-table-column align="center" label="难度等级" prop="difficultyClassify" min-width="140px" :show-overflow-tooltip="true" v-if="queryParams.lessonType.includes('0') || queryParams.lessonType.length === 0">
+            <template slot-scope="scope">
+              <span>{{ getDifficultyLevelName(scope.row.difficultyClassify) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="课程维度" prop="courseDimensions" min-width="200px" :show-overflow-tooltip="true" v-if="queryParams.lessonType.includes('0') || queryParams.lessonType.length === 0">
+            <template slot-scope="scope">
+              <span>{{ getCourseDimensionsName( scope.row.enterpriseCourseDimensions) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="智联课堂分类" prop="intelligentClassroom" min-width="200px" :show-overflow-tooltip="true" v-if="queryParams.lessonType.includes('0') || queryParams.lessonType.length === 0">
             <template slot-scope="scope">
-              <span>{{ getCourseDirectionName(scope.row.tecClassify) }}</span>
+              <span>{{ getIntelligentClassroomName( scope.row.intelligentClassroom) }}</span>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="院校课程方案" prop="classPlan" min-width="200px" :show-overflow-tooltip="true">
+<!--          <el-table-column align="center" label="企业技术分类" prop="tecClassify" min-width="200px" :show-overflow-tooltip="true">-->
+<!--            <template slot-scope="scope">-->
+<!--              <span>{{ getCourseDirectionName(scope.row.tecClassify) }}</span>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <el-table-column align="center" label="技能端-课程方案" prop="classPlanSchool" min-width="200px" :show-overflow-tooltip="true" v-if="queryParams.lessonType.includes('1') || queryParams.lessonType.length === 0">
             <template slot-scope="scope">
               <span>{{ getCoursePlanNameC( scope.row.classPlanSchool) }}</span>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="院校技术分类" prop="tecClassify" min-width="200px" :show-overflow-tooltip="true">
+          <el-table-column align="center" label="技能端-前沿讲堂" prop="classPlan" min-width="200px" :show-overflow-tooltip="true" v-if="queryParams.lessonType.includes('1') || queryParams.lessonType.length === 0">
+            <template slot-scope="scope">
+              <span>{{ getCoursePlanName( scope.row.classPlan) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="技术分类" prop="tecClassifySchool" min-width="200px" :show-overflow-tooltip="true" v-if="queryParams.lessonType.includes('1') || queryParams.lessonType.length === 0">
             <template slot-scope="scope">
               <span>{{ getCourseDirectionName(scope.row.tecClassifySchool) }}</span>
             </template>
@@ -1462,6 +1482,33 @@ export default {
       })
       return name
     },
+    // 根据id获取课程维度
+    getCourseDimensionsName(dictValue) {
+      if (!dictValue) {
+        return ''
+      }
+      const values = dictValue.split(',') // 将逗号分隔的多个值分割成数组
+      const names = []
+      this.courseDimensionsOptions.forEach(item => {
+        if (values.includes(item.dictValue)) {
+          names.push(item.dictLabel) // 将找到的名称添加到数组中
+        }
+      })
+      return names.join(',') // 将名称数组拼接成逗号分隔的字符串
+    },
+    getIntelligentClassroomName(dictValue) {
+      if (!dictValue) {
+        return ''
+      }
+      const values = dictValue.split(',') // 将逗号分隔的多个值分割成数组
+      const names = []
+      this.intelligentClassroomOptions.forEach(item => {
+        if (values.includes(item.dictValue)) {
+          names.push(item.dictLabel) // 将找到的名称添加到数组中
+        }
+      })
+      return names.join(',') // 将名称数组拼接成逗号分隔的字符串
+    },
     // 根据课程类型的id获取类型的名称
     getLessonTypeName(dictValue, dictValue1) {
       let name = ''
@@ -1496,6 +1543,20 @@ export default {
       })
       return names.join(',') // 将名称数组拼接成逗号分隔的字符串
     },
+    // 根据根据id获取前沿讲堂的名称
+    getCourseTypeName(dictValue) {
+      if (!dictValue) {
+        return ''
+      }
+      const values = dictValue.split(',') // 将逗号分隔的多个值分割成数组
+      const names = []
+      this.courseTypeOptions.forEach(item => {
+        if (values.includes(item.dictValue)) {
+          names.push(item.dictLabel) // 将找到的名称添加到数组中
+        }
+      })
+      return names.join(',') // 将名称数组拼接成逗号分隔的字符串
+    },
     // 根据id获取课程方案的名称
     getCoursePlanNameC(dictValue) {
       if (!dictValue) {
@@ -1503,7 +1564,7 @@ export default {
       }
       const values = dictValue.split(',') // 将逗号分隔的多个值分割成数组
       const names = []
-      this.coursePlanOptionsC.forEach(item => {
+      this.courseTypeOptions.forEach(item => {
         if (values.includes(item.dictValue)) {
           names.push(item.dictLabel) // 将找到的名称添加到数组中
         }

src/views/courseInformation/tryoutCommencement/index.vue

@@ -705,16 +705,17 @@
                   />
                 </el-select>
               </el-form-item>
-              <el-form-item label="难度等级:" prop="teDirection">
-                <el-select v-model="form.difficultyClassify" clearable style="width: 200px" filterable placeholder="难度等级" clearable>
-                  <el-option
-                    v-for="item in difficultyOptions"
-                    :key="item.dictValue"
-                    :label="item.dictLabel"
-                    :value="item.dictValue"
-                  />
-                </el-select>
-              </el-form-item> <br>
+<!--              <el-form-item label="难度等级:" prop="teDirection">-->
+<!--                <el-select v-model="form.difficultyClassify" clearable style="width: 200px" filterable placeholder="难度等级" clearable>-->
+<!--                  <el-option-->
+<!--                    v-for="item in difficultyOptions"-->
+<!--                    :key="item.dictValue"-->
+<!--                    :label="item.dictLabel"-->
+<!--                    :value="item.dictValue"-->
+<!--                  />-->
+<!--                </el-select>-->
+<!--              </el-form-item> -->
+              <br>
               <el-form-item>
                 <el-button
                   class="fourWordsBtn"
@@ -786,11 +787,11 @@
                   <span>{{ getJobClassificationLabelAndName(scope.row.jobClassify) }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="难度等级" prop="difficultyClassify" show-overflow-tooltip>
-                <template slot-scope="scope">
-                  {{ getDifficultyLevelName(scope.row.difficultyClassify) }}
-                </template>
-              </el-table-column>
+<!--              <el-table-column label="难度等级" prop="difficultyClassify" show-overflow-tooltip>-->
+<!--                <template slot-scope="scope">-->
+<!--                  {{ getDifficultyLevelName(scope.row.difficultyClassify) }}-->
+<!--                </template>-->
+<!--              </el-table-column>-->
 <!--              <el-table-column label="价格" prop="lessonPrice" show-overflow-tooltip>-->
 <!--                <template slot-scope="scope">-->
 <!--                  {{ scope.row.lessonPrice }}-->
@@ -1118,14 +1119,14 @@ export default {
       if (this.lessonTypeOptions) {
         this.lessonTypeOptions.forEach(item => {
           if (item.dictValue === dictValue && dictValue === '1') {
-            name = '企业课程'
+            name = '技术端'
           }
         })
       }
       if (this.lessonTypeOptions) {
         this.lessonTypeOptions.forEach(item => {
           if (item.dictValue === dictValue1 && dictValue1 === '1') {
-            name1 = '院校课程'
+            name1 = '技能端'
           }
         })
       }

src/views/courseInformation/unitManagement/index.vue

@@ -99,9 +99,9 @@
             {{ scope.row.exitId || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="所需课程类型" prop="lessonType" :show-overflow-tooltip="true">
+        <el-table-column align="center" label="所需课程类型" prop="lessonType" min-width="140px" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.lessonType || '-' }}
+            <span>{{ getLessonTypeName( scope.row.lessonType,scope.row.lessonTypeSchool) }}</span>
           </template>
         </el-table-column>
         <el-table-column label="备注"  prop="remarks" :show-overflow-tooltip="true">
@@ -186,7 +186,7 @@
           <div class="tip">出口ip可以填写多个,用逗号分隔</div>
         </el-form-item>
         <el-form-item prop="lessonType" label="所需课程类型:">
-          <el-select v-model="queryParams.lessonType" clearable multiple placeholder="所需课程类型">
+          <el-select v-model="form.lessonType" clearable multiple placeholder="所需课程类型">
             <el-option
               v-for="(item,index) in lessonTypeOptions"
               :key="index"
@@ -290,7 +290,12 @@ export default {
       },
       // 表单参数
       form: {
-        unitType: '0'
+        unitType: '0',
+        unitName: '',
+        userId: '',
+        exitId: '',
+        lessonType: '',
+        remarks: ''
       },
       // 表单校验
       rules: {
@@ -310,10 +315,31 @@ export default {
     this.getLessonType()
   },
   methods: {
+    // 根据课程类型的id获取类型的名称
+    getLessonTypeName(dictValue, dictValue1) {
+      let name = ''
+      let name1 = ''
+      if (this.lessonTypeOptions) {
+        this.lessonTypeOptions.forEach(item => {
+          if (item.dictValue === dictValue && dictValue === '1') {
+            name = '技术端'
+          }
+        })
+      }
+      if (this.lessonTypeOptions) {
+        this.lessonTypeOptions.forEach(item => {
+          if (item.dictValue === dictValue1 && dictValue1 === '1') {
+            name1 = '技能端'
+          }
+        })
+      }
+      return (name !== '' && name1 !== '' ? name + ',' : name) + name1
+    },
     // 获取课程类型
     getLessonType() {
       getDict('lesson_type').then(res => {
         this.lessonTypeOptions = res.data
+        console.log('this.lessonTypeOptions:', this.lessonTypeOptions)
       })
     },
     getUserList() {
@@ -398,7 +424,8 @@ export default {
         unitName: undefined,
         unitNumber: undefined,
         exitId: undefined,
-        flag: ''
+        flag: '',
+        lessonType: []
       }
       this.handleQuery()
     },
@@ -414,6 +441,15 @@ export default {
       const id = row.businessId
       getSysUnit(id).then(response => {
         this.form = response.data
+        if (response.data.lessonType === '1' && response.data.lessonTypeSchool === '1') {
+          this.form.lessonType = ['0', '1']
+        }
+        if (response.data.lessonType === '0' && response.data.lessonTypeSchool === '1') {
+          this.form.lessonType = ['1']
+        }
+        if (response.data.lessonType === '1' && response.data.lessonTypeSchool === '0') {
+          this.form.lessonType = ['0']
+        }
         this.open = true
         this.title = '修改单位'
       })
@@ -440,6 +476,7 @@ export default {
     submitForm: function() {
       this.$refs['form'].validate(valid => {
         if (valid) {
+          this.form.lessonType = this.form.lessonType.length > 1 ? '2' : this.form.lessonType.join(',')
           if (this.form.businessId !== undefined) {
             updateSysUnit(this.form).then(response => {
               this.msgSuccess('修改成功')