Merge branch 'master' into 02/23reviewBUG

debug.log

@@ -3,3 +3,4 @@
 [0122/094436.708:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
 [0125/095157.852:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
 [0126/093517.085:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[0226/154332.982:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)

dist/static/css/chunk-091d9e8c.605d2e8e.css

@@ -0,0 +1 @@
+.titlewrap[data-v-73651d10]{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.titlewrap[data-v-73651d10],.wrap[data-v-73651d10]{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}.wrap div[data-v-73651d10]{margin-right:20px}.countWrap[data-v-73651d10] .el-date-editor.el-input,.countWrap[data-v-73651d10] .el-date-editor.el-input__inner{width:100px!important}

dist/static/css/chunk-12525d56.6595e2e4.css

@@ -0,0 +1 @@
+.m-container[data-v-5789a30e]{-webkit-box-sizing:border-box;box-sizing:border-box;background-color:#fff}.newBand[data-v-5789a30e]{display:inline-block}

dist/static/css/chunk-24616ee3.f5214451.css

@@ -1 +0,0 @@
-.titlewrap[data-v-62706ef4]{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.titlewrap[data-v-62706ef4],.wrap[data-v-62706ef4]{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}.wrap div[data-v-62706ef4]{margin-right:20px}.countWrap[data-v-62706ef4] .el-date-editor.el-input,.countWrap[data-v-62706ef4] .el-date-editor.el-input__inner{width:100px!important}

dist/static/css/chunk-53a53536.274b199a.css

@@ -1 +0,0 @@
-.m-container[data-v-2923cee0]{-webkit-box-sizing:border-box;box-sizing:border-box;background-color:#fff}.newBand[data-v-2923cee0]{display:inline-block}

dist/static/css/chunk-07466946.ecba79ab.css → dist/static/css/chunk-63e8e558.19e3ac43.css

@@ -1 +1 @@
-[data-v-d5a8e81c] .dialog-footer{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:end;-ms-flex-pack:end;justify-content:flex-end}[data-v-cd4b7950] .el-calendar-day{-webkit-box-sizing:border-box;box-sizing:border-box;height:80px!important;min-width:118px}[data-v-cd4b7950] .current.is-selected{border:2px solid #137f79}[data-v-cd4b7950] .current.is-selected .el-calendar-day{height:76px!important}.vipDot[data-v-cd4b7950]{background-color:#2aaea6}.teamDot[data-v-cd4b7950],.vipDot[data-v-cd4b7950]{width:30px;height:30px;margin-top:10px;display:inline-block;border-radius:50%;text-align:center;line-height:30px;color:#fff;font-size:14px}.teamDot[data-v-cd4b7950]{background-color:#5a79f6}.newDot[data-v-cd4b7950]{width:30px;height:30px;margin-top:10px;background-color:#34b1f6;display:inline-block;border-radius:50%;text-align:center;line-height:30px;color:#fff;font-size:14px}
+[data-v-5279f58a] .dialog-footer{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:end;-ms-flex-pack:end;justify-content:flex-end}[data-v-cd4b7950] .el-calendar-day{-webkit-box-sizing:border-box;box-sizing:border-box;height:80px!important;min-width:118px}[data-v-cd4b7950] .current.is-selected{border:2px solid #137f79}[data-v-cd4b7950] .current.is-selected .el-calendar-day{height:76px!important}.vipDot[data-v-cd4b7950]{background-color:#2aaea6}.teamDot[data-v-cd4b7950],.vipDot[data-v-cd4b7950]{width:30px;height:30px;margin-top:10px;display:inline-block;border-radius:50%;text-align:center;line-height:30px;color:#fff;font-size:14px}.teamDot[data-v-cd4b7950]{background-color:#5a79f6}.newDot[data-v-cd4b7950]{width:30px;height:30px;margin-top:10px;background-color:#34b1f6;display:inline-block;border-radius:50%;text-align:center;line-height:30px;color:#fff;font-size:14px}

src/components/overflow-text/index.vue

@@ -23,7 +23,7 @@ export default {
     },
     width: {
       type: String,
-      default: '200px'
+      default: 'auto'
     },
     split: {
       type: Boolean,
@@ -36,13 +36,15 @@ export default {
 .tooltip-content{
   display: inline-block;
   max-width: 300px;
+  width: 100%;
 }
   .overflow-text{
     overflow : hidden;
     text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-line-clamp: 2;
-    -webkit-box-orient: vertical;
+    white-space: nowrap;
+    // display: -webkit-box;
+    // -webkit-line-clamp: 2;
+    // -webkit-box-orient: vertical;
   }
   .split {
     word-break: keep-all;

src/views/accompanyManager/accompanys.vue

@@ -295,11 +295,6 @@
             v-model.trim="maskForm.date"
             type="date"
             :picker-options="courseOption"
-            @change="
-              () => {
-                maskForm.startTime = '';
-              }
-            "
             value-format="yyyy-MM-dd"
             placeholder="选择日期"
           ></el-date-picker>
@@ -312,11 +307,6 @@
             type="date"
             value-format="yyyy-MM-dd"
             :picker-options="bigin"
-            @change="
-              () => {
-                maskForm.startTime = '';
-              }
-            "
             placeholder="选择日期"
           ></el-date-picker>
         </el-form-item>
@@ -334,7 +324,7 @@
             format="HH:mm"
             value-format="HH:mm"
             :picker-options="{
-              selectableRange: `${nowTime} - 23:30:00`,
+              selectableRange: `04:00:00 - 23:30:00`,
             }"
           ></el-time-picker>
         </el-form-item>
@@ -1023,6 +1013,12 @@ export default {
     },
     submitResetClass() {
       //   endClassTimeStr: this.maskForm.endTime,
+      let maskForm = this.maskForm;
+      let diff = dayjs(maskForm.date+' '+maskForm.startTime).diff(new Date,'second')
+      if(diff<=0){
+        this.$message.error("课程开始时间必须大于当前时间");
+        return
+      }
       this.$refs.maskForm.validate((valid) => {
         if (valid) {
           let obj = {
@@ -1355,15 +1351,6 @@ export default {
     },
   },
   computed: {
-    nowTime() {
-      // console.log(that.maskForm.date)
-      let str = "04:30:00";
-      if (that.maskForm.date == dayjs(new Date()).format("YYYY-MM-DD")) {
-        str = dayjs(new Date()).format("HH:mm:ss");
-      }
-
-      return str;
-    },
   },
 };
 </script>

src/views/teacherManager/teacherOperation/components/salarySet.vue

@@ -15,7 +15,7 @@
                         v-model.trim="scope.row.mainTeacher30MinSalary"
                         placeholder="请输入课酬">
                 <template slot="append"
-                          v-if="scope.row.courseScheduleType == 'HIGH'">元/45分钟</template>
+                          v-if="scope.row.courseScheduleType == 'HIGH'">元/人</template>
                 <template slot="append"
                           v-else-if="scope.row.courseScheduleType == 'CLASSROOM'">元/40分钟</template>
                 <template slot="append"
@@ -30,7 +30,7 @@
                         v-model.trim="scope.row.assistantTeacher30MinSalary"
                         placeholder="请输入课酬">
                 <template slot="append"
-                          v-if="scope.row.courseScheduleType == 'HIGH'">元/45分钟</template>
+                          v-if="scope.row.courseScheduleType == 'HIGH'">元/人</template>
                 <template slot="append"
                           v-else-if="scope.row.courseScheduleType == 'CLASSROOM'">元/40分钟</template>
                 <template slot="append"
@@ -46,7 +46,7 @@
                         v-model.trim="scope.row.mainTeacher90MinSalary"
                         placeholder="请输入课酬">
                 <template slot="append"
-                          v-if="scope.row.courseScheduleType == 'HIGH'">元/45分钟</template>
+                          v-if="scope.row.courseScheduleType == 'HIGH'">元/人</template>
                 <template slot="append"
                           v-else-if="scope.row.courseScheduleType == 'CLASSROOM'">元/40分钟</template>
                 <template slot="append"
@@ -63,7 +63,7 @@
                         v-model.trim="scope.row.assistantTeacher90MinSalary"
                         placeholder="请输入课酬">
                 <template slot="append"
-                          v-if="scope.row.courseScheduleType == 'HIGH'">元/45分钟</template>
+                          v-if="scope.row.courseScheduleType == 'HIGH'">元/人</template>
                 <template slot="append"
                           v-else-if="scope.row.courseScheduleType == 'CLASSROOM'">元/40分钟</template>
                 <template slot="append"
@@ -638,7 +638,9 @@ export default {
   }
 }
 /deep/.el-input-group__append {
+  min-width: 103px;
   background-color: #f5f7fa;
+  text-align: center;
   color: #909399;
   vertical-align: middle;
   display: table-cell;

src/views/teamDetail/componentCourse/resetClass.vue

@@ -50,9 +50,6 @@
           v-model.trim="maskForm.date"
           type="date"
           :picker-options="bigin"
-          @change="()=>{
-            maskForm.startTime = ''
-          }"
           value-format="yyyy-MM-dd"
           placeholder="选择日期"
         ></el-date-picker>
@@ -79,7 +76,7 @@
           format="HH:mm"
           value-format="HH:mm"
           :picker-options="{
-            selectableRange: `${nowTime} - 23:30:00`,
+            selectableRange: `04:30:00 - 23:30:00`,
           }"
         ></el-time-picker>
       </el-form-item>
@@ -200,6 +197,13 @@ export default {
         this.$message.error("请填写开始时间或结束时间");
         return;
       }
+      let diff = dayjs(maskForm.date+' '+maskForm.startTime).diff(new Date,'second')
+      if(diff<=0){
+        this.$message.error("课程开始时间必须大于当前时间");
+        return
+      }
+
+
       this.$confirm("是否确定?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -362,17 +366,6 @@ export default {
       });
     },
   },
-  computed: {
-    nowTime() {
-      // console.log(that.maskForm.date)
-      let str = "04:30:00";
-      if (that.maskForm.date == dayjs(new Date()).format("YYYY-MM-DD")) {
-        str = dayjs(new Date()).format("HH:mm:ss");
-      }
-
-      return str;
-    },
-  },
 };
 </script>
 <style lang="scss" scoped>

src/views/teamDetail/components/courseList.vue

@@ -213,7 +213,6 @@
           <el-date-picker v-model.trim="maskForm.date"
                           type="date"
                           :picker-options="beginDate()"
-                          @change="changeDate"
                           value-format="yyyy-MM-dd"
                           placeholder="选择日期"></el-date-picker>
         </el-form-item>
@@ -702,7 +701,13 @@ export default {
         .catch(() => {});
     },
     submitResetClass() {
+
       let maskForm = this.maskForm;
+       let diff = dayjs(maskForm.date+' '+maskForm.startTime).diff(new Date,'second')
+      if(diff<=0){
+        this.$message.error("课程开始时间必须大于当前时间");
+        return
+      }
       if (!maskForm.startTime || !maskForm.endTime) {
         this.$message.error("请填写开始时间或结束时间");
         return;
@@ -886,9 +891,7 @@ export default {
         },
       };
     },
-    changeDate(){
-      this.maskForm.startTime = ''
-    }
+
   },
   filters: {
     studentCallName: (value) => {

src/views/vipClass/vipList.vue

@@ -12,7 +12,7 @@
       v-permission="'export/vipGroupList'"
       @click="onVIPCourseExport"
     >
-      导出列表
+      导出
     </div>
     <div
       class="newBand"