Merge branch '03/03Lebao' into online

src/App.vue

@@ -91,6 +91,9 @@ input::-webkit-inner-spin-button {
 input[type="number"] {
   -moz-appearance: textfield;
 }
+.el-input__inner{
+  line-height: 1px!important;
+}
 .el-dialog {
   margin-bottom: 10vh;
   .el-dialog__header {

src/views/teamDetail/teamCourseList.vue

@@ -2,7 +2,13 @@
   <div class="m-container">
     <h2>
       <div class="squrt"></div>
-      课表列表 <filter-search ref='filterSearch' @reload="reloadSearch" :keys="['searchType']" :moreKeys="['start', 'end', 'organId']"/>
+      课表列表
+      <filter-search
+        ref="filterSearch"
+        @reload="reloadSearch"
+        :keys="['searchType']"
+        :moreKeys="['start', 'end', 'organId']"
+      />
     </h2>
     <div class="m-core">
       <!-- 搜索类型 -->
@@ -18,7 +24,15 @@
           <el-input
             v-model.trim="searchForm.search"
             clearable
-            placeholder="课程(组)编号/课程名称"
+            placeholder="课程组编号/课程名称"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-input
+          type="number"
+            v-model.trim="searchForm.courseIdSearch"
+            clearable
+            placeholder="课程编号"
           />
         </el-form-item>
         <el-form-item>
@@ -75,7 +89,7 @@
             placeholder="课程组类型"
           >
             <el-option
-              v-for="(item) in courseListType"
+              v-for="item in courseListType"
               :key="item.value"
               :value="item.value"
               :label="item.label"
@@ -197,14 +211,13 @@
               type="primary"
               >导出课表</el-button
             >
-                <el-button
-              v-permission=" 'courseSchedule/batchDelete?page=teamCourseList'"
-             @click="removeCourse"
-             :disabled='!deleteList.length>0'
+            <el-button
+              v-permission="'courseSchedule/batchDelete?page=teamCourseList'"
+              @click="removeCourse"
+              :disabled="!deleteList.length > 0"
               type="primary"
               >批量删除</el-button
             >
-
           </el-col>
         </el-row>
       </save-form>
@@ -213,12 +226,14 @@
         <el-table
           :data="tableList"
           :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
-          @selection-change="handleSelectionChange">
+          @selection-change="handleSelectionChange"
         >
-         <el-table-column
-          v-permission="'courseSchedule/batchDelete?page=teamCourseList'"
-      type="selection"
-      width="55"></el-table-column>
+          >
+          <el-table-column
+            v-permission="'courseSchedule/batchDelete?page=teamCourseList'"
+            type="selection"
+            width="55"
+          ></el-table-column>
           <el-table-column
             align="center"
             prop="organName"
@@ -390,7 +405,7 @@
                     !isAddCom(scope.row) &&
                     permission('courseSchedule/courseMerge') &&
                     scope.row.newCourseId <= 0 &&
-                    !scope.row.beMerged&&
+                    !scope.row.beMerged &&
                     !scope.row.isLock // 李焕辜临轩要求冻结课程不能合并
                   "
                   >添加合课</el-button
@@ -407,8 +422,9 @@
                 <el-button
                   type="text"
                   v-if="
-                    scope.row.newCourseId== scope.row.id&&
-                    permission('courseSchedule/mergeCourseSplit')&&scope.row.status!='OVER'
+                    scope.row.newCourseId == scope.row.id &&
+                    permission('courseSchedule/mergeCourseSplit') &&
+                    scope.row.status != 'OVER'
                   "
                   @click="resetCompound(scope.row)"
                   >取消合并</el-button
@@ -525,7 +541,10 @@
         <el-tab-pane label="学员列表" name="first">
           <div v-if="activeName == 'first'">
             <!-- studentRollCall  -->
-            <studentRollCall :courseScheduleId="maskForm.id" :isMainGo='isMainGo'></studentRollCall>
+            <studentRollCall
+              :courseScheduleId="maskForm.id"
+              :isMainGo="isMainGo"
+            ></studentRollCall>
           </div>
         </el-tab-pane>
         <!-- <el-tab-pane label="GPS定位"
@@ -634,7 +653,7 @@ const initSearch = {
   organIdList: null,
   courseStatus: null,
   courseType: null,
-  timer: [nowTime,nowTime], // 时间
+  timer: [nowTime, nowTime], // 时间
   class: null,
   teachType: null,
   mergeCourseType: null,
@@ -643,6 +662,7 @@ const initSearch = {
   teacherIdList: null, // 老师编号
   schoolId: null, // 教学点编号
   creatTimer: [],
+  courseIdSearch:null
 };
 export default {
   data() {
@@ -672,8 +692,8 @@ export default {
       id: null,
       show: false,
       compoundList: [],
-      deleteList:[],
-      isMainGo:false
+      deleteList: [],
+      isMainGo: false,
     };
   },
   components: {
@@ -688,9 +708,8 @@ export default {
     infoMsg,
     SchoolLocation,
   },
-  created(){
-      this.searchForm.timer = [nowTime, nowTime]
-
+  created() {
+    this.searchForm.timer = [nowTime, nowTime];
   },
   computed: {
     workTypeOptions() {
@@ -699,33 +718,32 @@ export default {
     mergeCourseTypeOptions() {
       return objectToOptions(mergeCourseType);
     },
-
   },
   mounted() {
-    const { query } = this.$route
+    const { query } = this.$route;
     if (query.start || query.end) {
-      this.searchForm.timer = [query.start, query.end]
+      this.searchForm.timer = [query.start, query.end];
     } else {
-      let flag = false
-      for(let item in this.searchForm){
-        if(typeof this.searchForm[item] == 'object'){
+      let flag = false;
+      for (let item in this.searchForm) {
+        if (typeof this.searchForm[item] == "object") {
           // 对象或者数组
-          if(this.searchForm[item]?.length >0){
-            flag = true
+          if (this.searchForm[item]?.length > 0) {
+            flag = true;
           }
-        }else{
-          if (this.searchForm[item]){
-            flag = true
+        } else {
+          if (this.searchForm[item]) {
+            flag = true;
           }
         }
       }
-      if(!flag){
-        this.searchForm.timer = [nowTime, nowTime]
+      if (!flag) {
+        this.searchForm.timer = [nowTime, nowTime];
       }
     }
 
     if (query.organId) {
-      this.searchForm.organIdList = Number(query.organId)
+      this.searchForm.organIdList = Number(query.organId);
     }
     this.$store.dispatch("setBranchs");
     this.$store.dispatch("setTeachers");
@@ -741,19 +759,19 @@ export default {
       return permission(str, parent);
     },
     reloadSearch() {
-      this.searchForm.timer = [nowTime, nowTime]
-      this.getList()
+      this.searchForm.timer = [nowTime, nowTime];
+      this.getList();
     },
     async removeCourse() {
-      if(this.deleteList.length < 1){
-        this.$message.error('请自少选择一个班级')
-        return
+      if (this.deleteList.length < 1) {
+        this.$message.error("请自少选择一个班级");
+        return;
       }
 
-      let arr = this.deleteList.map(course=>{
-        return course.id
-      })
-      let courseScheduleIds = arr.join(',')
+      let arr = this.deleteList.map((course) => {
+        return course.id;
+      });
+      let courseScheduleIds = arr.join(",");
       try {
         await this.$confirm("是否确认删除此数据?", "提示", {
           type: "warning",
@@ -823,8 +841,8 @@ export default {
     },
     onCourseExport() {
       // 课表导出
-        if(!this.getSearchForm()){
-        return
+      if (!this.getSearchForm()) {
+        return;
       }
       let url = "/api-web/export/superFindCourseSchedules";
 
@@ -877,8 +895,8 @@ export default {
         .catch(() => {});
     },
     getList() {
-      if(!this.getSearchForm()){
-        return
+      if (!this.getSearchForm()) {
+        return;
       }
       superFindCourseSchedules(this.getSearchForm()).then((res) => {
         if (res.code == 200) {
@@ -900,8 +918,8 @@ export default {
             this.maskForm.id = row.id;
             this.activeName = "first";
             this.classVisible = true;
-            this.isMainGo = this.$refs.filterSearch?.show
-            console.log(this.isMainGo)
+            this.isMainGo = this.$refs.filterSearch?.show;
+            console.log(this.isMainGo);
           }
         }
       );
@@ -978,9 +996,9 @@ export default {
         })
         .catch(() => {});
     },
-    handleSelectionChange(arr){
+    handleSelectionChange(arr) {
       this.deleteList = arr;
-    }
+    },
   },
   filters: {
     isCall(val) {