合并

dist/static/css/chunk-8dcdda7e.b7c9b58c.css

@@ -0,0 +1 @@
+.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-7a44cd83]{margin-top:20px;display:block;text-align:right}.select[data-v-f9adf27c]{font-size:14px}.btnList[data-v-f9adf27c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-f9adf27c]{margin-right:15px}

dist/static/css/chunk-ca85d3e2.2c1c107d.css

@@ -0,0 +1 @@
+.alert[data-v-2fc363a8]{margin:10px 0}[data-v-2fc363a8] .el-icon-check,[data-v-2fc363a8] .el-icon-close{font-size:18px;font-weight:700}[data-v-2fc363a8] .el-icon-close{color:red}[data-v-2fc363a8] .el-icon-check{color:#14928a}.title[data-v-03796907]{margin-bottom:20px}.amap-demo[data-v-03796907]{height:500px}[data-v-b563d9ca] .el-dialog__body{padding:10px 20px}[data-v-b563d9ca] .description-title{margin:0!important}

dist/static/css/chunk-de03e272.c9ab11db.css

@@ -0,0 +1 @@
+.number-input[data-v-5ec13f8a]{width:100%}.number-input[data-v-5ec13f8a] .el-input__inner,.number-input[data-v-57cd9361] .el-input__inner{text-align:left}.number-input[data-v-55ad3016]{width:100%}.number-input[data-v-55ad3016] .el-input__inner{text-align:left}

dist/static/css/chunk-ea30f2da.ac9fbe72.css

@@ -0,0 +1 @@
+[data-v-ce3060a2] .dialog-footer{margin-top:10px}.dialog-footer[data-v-ce3060a2]{float:right}.number-input[data-v-5ec13f8a]{width:100%}.number-input[data-v-5ec13f8a] .el-input__inner{text-align:left}.number-input[data-v-55ad3016]{width:100%}.number-input[data-v-55ad3016] .el-input__inner{text-align:left}.courseDiv[data-v-6ec91910]{height:45px;line-height:45px;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.courseDiv[data-v-6ec91910],[data-v-6ec91910] .header{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}[data-v-6ec91910] .header{width:100%;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}[data-v-6ec91910] .header>span:first-child{display:-webkit-box;display:-ms-flexbox;display:flex}[data-v-6ec91910] .header>span:first-child:before{content:"";display:block;width:5px;background-color:#14928a;margin-right:10px;border-radius:2px;height:48px}[data-v-6ec91910] .header .icon{font-size:18px;font-weight:400;margin-right:20px}[data-v-6ec91910] .header /deep/.el-collapse-item__wrap{border-bottom:none!important}.title[data-v-225a961a]{line-height:44px}.fixedBox[data-v-225a961a]{position:fixed;bottom:20px;right:10px;z-index:100;width:200px;background-color:#fff;font-size:14px}.fixedBox .boxWrap[data-v-225a961a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.fixedBox .boxWrap i[data-v-225a961a]{font-size:18px;cursor:pointer}[data-v-225a961a] .el-divider--horizontal{margin:0!important}.minus[data-v-225a961a]{float:right;line-height:44px;padding-right:20px;font-size:20px;cursor:pointer}

src/views/stuRecodeManager/index.vue

@@ -212,41 +212,50 @@
             </template>
           </el-table-column> -->
           <el-table-column
-          width="180px"
             align="center"
             prop="startClassTime"
-            label="上课时间"
+            label="课程组类型"
           >
             <template slot-scope="scope">
               <div>
-                   {{ scope.row.courseSchedule.classDate | dayjsFormat }}
-                {{
-                  scope.row.courseSchedule.startClassTime | dayjsFormatMinute
-                }}-{{
-                  scope.row.courseSchedule.endClassTime | dayjsFormatMinute
-                }}
+                {{ scope.row.groupType | coursesType }}
               </div>
             </template>
           </el-table-column>
           <el-table-column
             align="center"
             prop="startClassTime"
-            label="课程组类型"
+            label="课程类型"
           >
             <template slot-scope="scope">
               <div>
-                {{ scope.row.groupType | coursesType }}
+                {{ scope.row.courseSchedule.type | coursesType }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="合并类型">
+            <template slot-scope="scope">
+              <div>
+                <!-- {{ scope.row.courseSchedule.newCourseId > 0 ? "是" : "否" }} -->
+                {{ scope.row.courseSchedule.newCourseId > 0 && scope.row.courseSchedule.newCourseId == scope.row.courseScheduleId ? '合并课' : null }}
+                {{ scope.row.courseSchedule.newCourseId > 0 && scope.row.courseSchedule.newCourseId != scope.row.courseScheduleId ? '被合并课' : null }}
               </div>
             </template>
           </el-table-column>
           <el-table-column
+          width="180px"
             align="center"
             prop="startClassTime"
-            label="课程类型"
+            label="上课时间"
           >
             <template slot-scope="scope">
               <div>
-                {{ scope.row.courseSchedule.type | coursesType }}
+                   {{ scope.row.courseSchedule.classDate | dayjsFormat }}
+                {{
+                  scope.row.courseSchedule.startClassTime | dayjsFormatMinute
+                }}-{{
+                  scope.row.courseSchedule.endClassTime | dayjsFormatMinute
+                }}
               </div>
             </template>
           </el-table-column>
@@ -257,15 +266,6 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="合并类型">
-            <template slot-scope="scope">
-              <div>
-                <!-- {{ scope.row.courseSchedule.newCourseId > 0 ? "是" : "否" }} -->
-                {{ scope.row.courseSchedule.newCourseId > 0 && scope.row.courseSchedule.newCourseId == scope.row.courseScheduleId ? '合并课' : null }}
-                {{ scope.row.courseSchedule.newCourseId > 0 && scope.row.courseSchedule.newCourseId != scope.row.courseScheduleId ? '被合并课' : null }}
-              </div>
-            </template>
-          </el-table-column>
           <el-table-column
             align="center"
             prop="startClassTime"

src/views/teacherManager/teacherDetail/components/teacherInfo.vue

@@ -228,9 +228,11 @@ export default {
         let tempData = this.teacherInfo
           tempData.subjectName = this.joinArray(tempData.subjectName)
           let sn = []
-          tempData.teacherSchools.forEach(item => {
-            sn.push(item.name)
-          })
+          if(tempData.teacherSchools && tempData.teacherSchools.length > 0) {
+            tempData.teacherSchools.forEach(item => {
+              sn.push(item.name)
+            })
+          }
           tempData.teacherSchools = this.joinArray(sn, ',') // 教学点
           tempData.entryDate = this.formatTimer(tempData.entryDate)
           tempData.jobNature = this.jobNature(tempData.jobNature)

src/views/teamDetail/components/studentList.vue

@@ -1091,6 +1091,7 @@ export default {
         search: this.searchForm.search || null,
         isActive: this.searchForm.isActive || null,
         classGroupId: this.searchForm.classGroupId || null,
+        oweFlag: this.searchForm.oweFlag || null,
         hasCourse: this.searchForm.hasCourse || null,
         oweFlag: this.searchForm.oweFlag || null,
         comeOnPackage: this.searchForm.comeOnPackage,