Merge branch '07/06musicArchives'

src/views/resetTeaming/components/archicesComponents/trainTimer.vue

@@ -52,7 +52,7 @@
         </el-select>
       </el-form-item>
     </save-form>
-    <div v-if="dataList.length > 4">
+    <div v-if="dataList.length >= 4">
       <!--  {{ item.name }}{{item.type | classType}}: -->
       <!-- <el-row class="row">
         <el-col
@@ -96,7 +96,7 @@
           {{item.name}}
         </div>
         <div
-          class="descriptionItemConcat col-value"
+          class="descriptionItemConcat"
         >
          {{ item.currentClassTimes }}/{{ item.totalClassTimes }}课时
         </div>

src/views/resetTeaming/components/training-photos/upload/index.vue

@@ -61,6 +61,7 @@
       <el-button
         type="primary"
         native-type="submit"
+        :disabled="uploading"
       >确 定</el-button>
     </div>
     <el-dialog :visible.sync="dialogVisible">

src/views/teamDetail/teamCourseList.vue

@@ -180,24 +180,6 @@
             }"
           ></el-date-picker>
         </el-form-item>
-        <el-form-item>
-          <el-time-picker
-            is-range
-            :picker-options="{
-              selectableRange: '04:00:00 - 23:59:59',
-            }"
-            style="width: 375px !important"
-            v-model="searchForm.courseTime"
-            range-separator="-"
-            start-placeholder="上课开始时间"
-            end-placeholder="上课结束时间"
-            placeholder="选择时间范围"
-            value-format="HH:mm:ss"
-            format="HH:mm"
-            @change="changeCourseTime"
-          >
-          </el-time-picker>
-        </el-form-item>
 
         <el-form-item>
           <el-button
@@ -815,6 +797,24 @@
             }"
           ></el-date-picker>
         </el-form-item>
+        <el-form-item label="课程时间" prop="courseTime">
+          <el-time-picker
+            is-range
+            :picker-options="{
+              selectableRange: '04:00:00 - 23:59:59',
+            }"
+            style="width: 350px !important"
+            v-model="searchForm.courseTime"
+            range-separator="-"
+            start-placeholder="上课开始时间"
+            end-placeholder="上课结束时间"
+            placeholder="选择时间范围"
+            value-format="HH:mm:ss"
+            format="HH:mm"
+            @change="changeCourseTime"
+          >
+          </el-time-picker>
+        </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="cancleMore">取 消</el-button>
@@ -885,7 +885,7 @@ const initSearch = {
   creatTimer: [],
   courseIdSearch: null,
   memberFlag: null,
-  courseTime: ['00:00:00','23:59:59'],
+  courseTime: ["", ""],
 };
 export default {
   name: "teamCourseList",
@@ -955,7 +955,7 @@ export default {
         this.searchForm.teachType ||
         this.searchForm.isCallNames ||
         this.searchForm.memberFlag ||
-        this.searchForm.creatTimer?.length > 0
+        this.searchForm.creatTimer?.length > 0 || (this.searchForm.courseTime?.length > 0&&this.searchForm.courseTime[0])
       );
     },
   },
@@ -971,7 +971,7 @@ export default {
       for (let item in this.searchForm) {
         if (typeof this.searchForm[item] == "object") {
           // 对象或者数组
-          if (this.searchForm[item]?.length > 0) {
+          if (this.searchForm[item]?.length > 0 && this.searchForm[item][0]) {
             flag = true;
           }
         } else {
@@ -995,7 +995,7 @@ export default {
       this.searchForm.organIdList = Number(query.organId);
     }
 
-    console.log(this.searchForm)
+    console.log(this.searchForm);
     this.$store.dispatch("setBranchs");
     this.$store.dispatch("setTeachers");
     this.$store.dispatch("setSchools");
@@ -1003,8 +1003,8 @@ export default {
     this.init();
   },
   methods: {
-    changeCourseTime(val){
-      console.log(val)
+    changeCourseTime(val) {
+      console.log(val);
     },
     init() {
       this.getList();
@@ -1111,14 +1111,14 @@ export default {
       //   this.$message.error("请至少选择一个搜索条件");
       //   return false;
       // }
-      if(searchForm.courseTime?.length>0){
-      searchForm.startClassTimeStr = searchForm.courseTime[0]
-       searchForm.endClassTimeStr = searchForm.courseTime[1]
-      }else{
-        searchForm.startClassTimeStr = null
-        searchForm.endClassTimeStr = null
+      if (searchForm.courseTime?.length > 0) {
+        searchForm.startClassTimeStr = searchForm.courseTime[0];
+        searchForm.endClassTimeStr = searchForm.courseTime[1];
+      } else {
+        searchForm.startClassTimeStr = null;
+        searchForm.endClassTimeStr = null;
       }
-      const { creatTimer, timer,courseTime, ...rest } = searchForm;
+      const { creatTimer, timer, courseTime, ...rest } = searchForm;
 
       return {
         ...rest,