Pārlūkot izejas kodu

Merge branch '03/23resetCourse' into test

wolyshaw 4 gadi atpakaļ
vecāks
revīzija
f6486618fc

+ 1 - 0
src/views/repairManager/repairList.vue

@@ -206,6 +206,7 @@
     <el-dialog
       title="维修单详情"
       :close-on-click-modal="false"
+      :close-on-press-escape="false"
       :visible.sync="repairVisible"
       width="600px"
     >

+ 1 - 1
src/views/teamDetail/components/modals/class-pay-list.vue

@@ -80,7 +80,7 @@
 <script>
 import classNewInfo from "./class-new-info";
 import classPayListItem from "./class-pay-list-item";
-import classSetting from "./classroom-setting";
+import classSetting from "./classroom-setting-merge";
 import { getCourseType } from "@/utils/utils";
 import { courseType, classTime } from "@/constant";
 import { getOrganCourseDurationSettings } from "@/api/buildTeam";

+ 220 - 0
src/views/teamDetail/components/modals/classroom-setting-item-merge.vue

@@ -0,0 +1,220 @@
+<template>
+  <div>
+    <!-- <el-form-item
+      label="排课次数"
+      prop="courseTimes"
+    >
+      <el-input v-model="form.courseTimes" placeholder="请输入排课次数"/>
+    </el-form-item> -->
+    <el-form-item
+      label="排课起始时间"
+      label-width="112px"
+      :prop="'classs.' + type + '.courseTime'"
+      :rules="[{ required: true, message: '请选择排课起始时间' }]"
+    >
+      <el-date-picker v-model.trim="form.courseTime"
+        :picker-options="pickerOptions"
+        style="width:100%!important;"
+        type="date"
+        value-format="yyyy-MM-dd"
+        placeholder="选择日期">
+      </el-date-picker>
+    </el-form-item>
+    <el-form-item
+      label="跳过节假日"
+      :prop="'classs.' + type + '.holiday'"
+      :rules="[{ required: true, message: '否跳过节假日' }]"
+    >
+      <el-radio-group v-model="form.holiday">
+        <el-radio :label="true">是</el-radio>
+        <el-radio :label="false">否</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-table
+      v-if="form && form.cycle"
+      :data="form.cycle"
+    >
+      <el-table-column
+        prop="dayOfWeek"
+        label="循环周期"
+        width="160">
+        <template slot-scope="scope">
+          <el-form-item
+            inline-message
+            :rules="[{ required: true, message: '请选择循环周期' }]"
+            :prop="'classs.' + type + '.cycle.' + scope.$index + '.dayOfWeek'"
+          >
+            <el-select v-model.trim="scope.row.dayOfWeek"
+              style="width:100%!important"
+              placeholder="请选择循环周期"
+              clearable
+              filterable>
+              <el-option v-for="(item,index) in weekDateList"
+                :key="index"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="time"
+        label="课程时长(分)"
+        width="160">
+        <template slot-scope="scope">
+          <el-form-item
+            :prop="'classs.' + type + '.cycle.' + scope.$index + '.time'"
+            :rules="[{ required: true, message: '请选择课程时长' }]"
+            inline-message>
+            <el-select v-model.trim="scope.row.time"
+              style="width:100%!important"
+              placeholder="请选择课程时长"
+              clearable
+              :disabled="!!selectPrice"
+              @change="startTimeChange(scope.row)"
+              filterable>
+              <el-option v-for="(item,index) in pricesArray"
+                :key="index"
+                :disabled="(surplustime + (parseFloat(scope.row.time) || 0)) < item"
+                :label="item"
+                :value="item">
+              </el-option>
+            </el-select>
+            <!-- <el-input disabled v-model="scope.row.time" placeholder="请输入课程时长"/> -->
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="startClassTime"
+        label="开始时间"
+        width="160">
+        <template slot-scope="scope">
+          <el-form-item
+            :prop="'classs.' + type + '.cycle.' + scope.$index + '.startClassTime'"
+            :rules="[{ required: true, message: '请选择开始时间' }]"
+            inline-message>
+            <el-time-picker style="width: 100%!important;"
+              v-model.trim="scope.row.startClassTime"
+              format='HH:mm'
+              value-format='HH:mm'
+              placeholder="请选择时间"
+              @change="startTimeChange(scope.row)"
+              :picker-options="{
+                selectableRange: ['04:30:00 - 23:59:59']
+              }">
+            </el-time-picker>
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="endClassTime"
+        label="结束时间"
+        width="160">
+        <template slot-scope="scope">
+          <el-form-item
+            :prop="'classs.' + type + '.cycle.' + scope.$index + '.endClassTime'"
+            inline-message>
+            <el-time-picker style="width: 100%!important;"
+              v-model.trim="scope.row.endClassTime"
+              format='HH:mm'
+              disabled
+              value-format='HH:mm'
+              placeholder="请选择时间"
+              :picker-options="{
+                selectableRange: [scope.row.startClassTime + ':00 - 23:59:59']
+              }">
+            </el-time-picker>
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="date"
+        label=""
+        >
+        <template slot-scope="scope">
+          <i @click="remove(scope.$index)" v-if="form.cycle.length > 1" class="close-icon el-icon-circle-close"></i>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-button
+      icon="el-icon-circle-plus-outline"
+      type="info"
+      size="small"
+      plain
+      :disabled="surplustime < ((selectPrice || 0) || Math.min(...pricesArray))"
+      @click="create"
+      style="margin-top: 10px;width: 100%;"
+    >添加循环</el-button>
+  </div>
+</template>
+<script>
+import { diffTimerFormMinute, addTimerFormMinute } from '@/utils/date'
+import { classTimeList } from '@/utils/searchArray'
+import dayjs from 'dayjs'
+
+const classTimeListByType = {}
+for (const item of classTimeList) {
+  classTimeListByType[item.value] = item.label
+}
+
+export default {
+  props: ['form', 'type', 'surplustime', 'prices', 'selectPrice'],
+  data() {
+    return {
+      classTimeListByType,
+    }
+  },
+  computed: {
+    pickerOptions() {
+      return {
+        firstDayOfWeek: 1,
+        disabledDate (time) {
+          return time.getTime() + 86400000 <= new Date().getTime();
+        }
+      }
+    },
+    weekDateList() {
+      return [
+        { value: "1", label: "星期一" },
+        { value: "2", label: "星期二" },
+        { value: "3", label: "星期三" },
+        { value: "4", label: "星期四" },
+        { value: "5", label: "星期五" },
+        { value: "6", label: "星期六" },
+        { value: "7", label: "星期日" }
+      ]
+    },
+    pricesArray() {
+      return (this.prices[this.type] || '').split(',').filter(item => !!item)
+    }
+  },
+  methods: {
+    create() {
+      const initVal = {}
+      if (this.selectPrice) {
+        initVal.time = this.selectPrice
+      }
+      this.form.cycle.push(initVal)
+    },
+    remove(index) {
+      this.form.cycle.splice(index, 1)
+    },
+    startTimeChange(item) {
+      if (item.time && item.startClassTime) {
+        let str = dayjs(new Date()).format('YYYY-MM-DD')
+        this.$set(item, 'endClassTime', addTimerFormMinute(str, item.startClassTime, item.time))
+      } else {
+        this.$set(item, 'endClassTime', '')
+      }
+    }
+  },
+}
+</script>
+<style lang="less" scoped>
+  /deep/ .close-icon{
+    cursor: pointer;
+    font-size: 16px;
+    margin-bottom: 24px;
+  }
+</style>

+ 59 - 8
src/views/teamDetail/components/modals/classroom-setting-item.vue

@@ -365,19 +365,38 @@ export default {
       return num
     },
     updateEndTime(row) {
-      if (row.dayOfWeek && row.startDate && typeof row.holiday === 'boolean') {
-          const num = this.addData(row.startDate, row.dayOfWeek)
-          const exp = Math.max(row.expectCourseNum - 1, 0)
-          let end = dayjs(row.startDate).add(num + (exp*7), 'day')
+      console.log(row)
+        if (row.dayOfWeek && row.startDate && typeof row.holiday === 'boolean') {
+          // const num = this.addData(row.startDate, row.dayOfWeek)
+          // const week = dayjs(row.startDate).get('day') == 0 ? 7 : dayjs(row.startDate).get('day')
+          const selectWeek = row.dayOfWeek == 7 ? 0 : row.dayOfWeek
+          let exp = Math.max(row.expectCourseNum, 0)
+          let end = dayjs(row.startDate)
+          // console.log(selectWeek, end.get('day'))
           if (row.holiday) {
-            for (const d of this.holidays) {
-              if (dayjs(d).isBetween(row.startDate, end.format('YYYY-MM-DD'), null, '[]')) {
-                end = end.add(1, 'day')
+            while (exp > 0) {
+              if (selectWeek == end.get('day') && !this.holidays.includes(end.format('YYYY-MM-DD'))) {
+                exp--
+              }
+              end = end.add(1, 'day')
+              if (exp === 0) {
+                end = end.subtract(1, 'day')
+              }
+            }
+          } else {
+            while (exp > 0) {
+              if (selectWeek == end.get('day')) {
+                exp--
+              }
+              end = end.add(1, 'day')
+              if (exp === 0) {
+                end = end.subtract(1, 'day')
               }
             }
           }
           const enumd = this.addData(end.format('YYYY-MM-DD'), row.dayOfWeek)
-          end = end.add(enumd, 'day')
+          console.log(enumd)
+          // end = end.add(enumd, 'day')
           this.$set(
           row,
           "endDate",
@@ -390,6 +409,38 @@ export default {
           ''
         );
       }
+
+
+
+
+
+      // if (row.dayOfWeek && row.startDate && typeof row.holiday === 'boolean') {
+      //     // const num = this.addData(row.startDate, row.dayOfWeek)
+      //     const week = dayjs(row.startDate).get('day') == 0 ? 7 : dayjs(row.startDate).get('day')
+      //     const selectWeek = row.dayOfWeek
+      //     const exp = Math.max(row.expectCourseNum - (selectWeek >= week ? 1 : 0), 0)
+      //     let end = dayjs(row.startDate).add((exp*7), 'day')
+      //     if (row.holiday) {
+      //       for (const d of this.holidays) {
+      //         if (dayjs(d).isBetween(row.startDate, end.format('YYYY-MM-DD'), null, '[]') && row.dayOfWeek - 1 == dayjs(d).get('day')) {
+      //           end = end.add(7, 'day')
+      //         }
+      //       }
+      //     }
+      //     const enumd = this.addData(end.format('YYYY-MM-DD'), row.dayOfWeek)
+      //     end = end.add(enumd, 'day')
+      //     this.$set(
+      //     row,
+      //     "endDate",
+      //     end.format('YYYY-MM-DD')
+      //   );
+      // } else {
+      //   this.$set(
+      //     row,
+      //     "endDate",
+      //     ''
+      //   );
+      // }
     },
     changeStartDate(val, row) {
       this.updateEndTime(row)

+ 435 - 0
src/views/teamDetail/components/modals/classroom-setting-merge.vue

@@ -0,0 +1,435 @@
+<template>
+  <div>
+    <el-form
+      :model="form"
+      inline
+      ref="form"
+      label-suffix=": "
+      label-width="130px"
+    >
+      <el-row v-if="classType == 5">
+        <el-form-item
+          label="班级名称"
+          prop="className"
+          label-width="88px"
+          :rules="[{ required: true, message: '请填写班级名称' }]"
+        >
+          <el-input
+            v-model.trim="form.className"
+            placeholder="请输入班级名称"
+            style="width: 180px"
+          ></el-input>
+        </el-form-item>
+      </el-row>
+      <el-form-item
+        label="主教老师"
+        prop="coreTeacher"
+        label-width="88px"
+        :rules="[{ required: true, message: '请选择主教老师' }]"
+      >
+        <el-select
+          v-model.trim="form.coreTeacher"
+          placeholder="请选择主教老师"
+          clearable
+          filterable
+          @change="changecoreTeacher"
+        >
+          <el-option
+            v-for="(item, index) in teacherList"
+            :key="index"
+            :label="item.realName"
+            :value="String(item.id)"
+          ></el-option>
+        </el-select>
+        <!-- <remote-search :commit="'setTeachers'" v-model="form.coreTeacher"  /> -->
+      </el-form-item>
+      <el-form-item
+        label="助教老师"
+        prop="assistant"
+        v-if="
+          activeType != 'HIGH' &&
+          activeType != 'HIGH_ONLINE' &&
+          activeType != 'MUSIC_NETWORK'
+        "
+      >
+        <!-- <remote-search :commit="'setTeachers'" v-model="form.assistant"  :multiple='true'/> -->
+        <el-select
+          v-model.trim="form.assistant"
+          placeholder="请选择助教老师"
+          filterable
+          clearable
+          multiple
+        >
+          <el-option
+            v-for="(item, index) in cooperationList"
+            :key="index"
+            :label="item.realName"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-if="!!Object.keys(allClasss).length"
+        style="display: block"
+        label="排课类型"
+        label-width="88px"
+      >
+        <el-tag
+          class="tag"
+          :effect="form.classs[key] ? 'dark' : 'plain'"
+          v-for="(item, key) in allClasss"
+          :key="key"
+          @click="changeTag(key)"
+          >{{ courseTypeListByName[key] }}</el-tag
+        >
+      </el-form-item>
+      <empty v-if="isEmpty" desc="暂无可排课时长" />
+      <el-collapse v-model="collapses" @change="collapseChange">
+        <el-collapse-item
+          v-for="(item, key, index) in form.classs"
+          :name="index"
+          :key="key"
+        >
+          <template #title>
+            <p class="title">
+              {{ courseTypeListByName[key] }},
+              <span>可排课时长{{ musicCourseSettings[key] }}分钟</span>
+            </p>
+          </template>
+          <courseItem
+            :surplustime="surplustime[key]"
+            :type="key"
+            :form="item"
+            :prices="prices"
+            :selectPrice="selectPrices ? selectPrices[key] : ''"
+          />
+        </el-collapse-item>
+      </el-collapse>
+    </el-form>
+    <div slot="footer" class="dialog-footer" v-if="classType != 5">
+      <el-button @click="$listeners.close">取 消</el-button>
+      <el-button type="primary" :disabled="isEmpty" @click="submit"
+        >确 定</el-button
+      >
+    </div>
+  </div>
+</template>
+<script>
+import {
+  getMusicCourseSettingsWithStudents,
+  classGroupUpdate,
+  revisionClassGroup,
+  revisionAddClassGroup,
+  findClassCourseMinute,
+  mergeClassSplitClassAffirm,
+} from "@/api/buildTeam";
+import courseItem from "./classroom-setting-item-merge";
+import { classTimeList } from "@/utils/searchArray";
+import MusicStore from "@/views/resetTeaming/store";
+import { queryByOrganIdAndCourseType } from "@/views/resetTeaming/api";
+import { isEmpty } from "lodash";
+
+const classTimeListByType = {};
+for (const item of classTimeList) {
+  classTimeListByType[item.value] = item.label;
+}
+
+const formatClassGroupTeacherMapperList = (core, ass) => {
+  const list = [];
+  if (core) {
+    list.push({ userId: core, teacherRole: "BISHOP" });
+  }
+  if (ass) {
+    for (const item of ass) {
+      list.push({ userId: item, teacherRole: "TEACHING" });
+    }
+  }
+  return list;
+};
+
+const plusNum = (items = [], key) => {
+  let money = 0;
+  for (const item of items) {
+    money += parseFloat(parseFloat(item[key] || 0).toFixed(2) || 0);
+  }
+  return money;
+};
+
+export default {
+  props: [
+    "activeType",
+    "courseTypeList",
+    "musicGroupId",
+    "detail",
+    "studentSubmitedData",
+    "classType",
+    "musicGroupPaymentCalenderDtos",
+    "classIdList",
+    "classGroupStudents",
+    "selectPrices",
+    "classCouresTimeList",
+    "teacherList",
+    "cooperationList",
+  ],
+  components: {
+    courseItem,
+  },
+  data() {
+    return {
+      form: {
+        coreTeacher: "",
+        assistant: "",
+        classs: {},
+      },
+      allClasss: {},
+      prices: {},
+      collapses: [0],
+      courseTimes: {},
+      courseTypeListByName: {},
+      classTimeListByType,
+      musicCourseSettings: {},
+    };
+  },
+  watch: {
+    courseTypeList() {
+      this.setCourseTypeListByName();
+    },
+    studentSubmitedData() {
+      this.formatClasss();
+    },
+    detail() {
+      this.formatClasss();
+    },
+  },
+  computed: {
+    surplustime() {
+      const _ = {};
+      for (const key in this.form.classs) {
+        if (this.form.classs.hasOwnProperty(key)) {
+          const item = this.form.classs[key];
+          _[key] = item.courseTotalMinuties - plusNum(item.cycle, "time");
+        }
+      }
+      return _;
+    },
+    isEmpty() {
+      return isEmpty(this.form.classs);
+    },
+    musicGroup() {
+      return MusicStore.state.musicGroup;
+    },
+  },
+  async mounted() {
+    try {
+      await MusicStore.dispatch("getBaseInfo", {
+        data: { musicGroupId: this.musicGroupId },
+      });
+      const res = await queryByOrganIdAndCourseType({
+        organId: this.musicGroup.organId,
+      });
+      this.prices = res.data;
+    } catch (error) {}
+    this.setCourseTypeListByName();
+    this.formatClasss();
+  },
+  methods: {
+    setCourseTypeListByName() {
+      const courseTypeListByName = {};
+      for (const item of this.courseTypeList) {
+        courseTypeListByName[item.value] = item.label;
+      }
+      this.courseTypeListByName = courseTypeListByName;
+    },
+    async formatClasss() {
+      if (this.detail) {
+        let coreid = "";
+        const assistant = [];
+        const { classGroupTeacherMapperList } = this.detail;
+        for (const item of classGroupTeacherMapperList || []) {
+          if (item.teacherRole === "BISHOP") {
+            coreid = String(item.userId);
+          }
+          if (item.teacherRole === "TEACHING") {
+            assistant.push(item.userId);
+          }
+        }
+        this.$set(this.form, "coreTeacher", String(coreid));
+        this.$set(this.form, "assistant", assistant);
+      }
+      const studentIds = this.detail
+        ? undefined
+        : this.studentSubmitedData?.seleched.join(",");
+      const classGroupId = this.detail?.id;
+      if (!studentIds && !classGroupId) {
+        return;
+      }
+
+      let res = {};
+      if (this.classType == 5) {
+        // res = await findClassCourseMinute(this.classIdList);
+        res.data = this.classCouresTimeList;
+      } else {
+        try {
+          res = await getMusicCourseSettingsWithStudents({
+            musicGroupId: this.musicGroupId,
+            studentIds,
+            classGroupId,
+          });
+        } catch (error) {
+          console.log(error);
+        }
+      }
+      // console.log(res);
+      if (Object.keys(res).length <= 0) return;
+      this.musicCourseSettings = res.data;
+
+      const classs = {};
+      for (const item of this.courseTypeList) {
+        const key = item.value;
+        if (res.data[key]) {
+          classs[key] = {
+            courseTotalMinuties: res.data[key],
+            cycle: [
+              {
+                time: this.selectPrices ? this.selectPrices[key] : undefined,
+              },
+            ],
+          };
+        }
+      }
+      this.allClasss = { ...classs };
+      this.$set(this.form, "classs", classs);
+      // this.courseTimes = courseTimes
+    },
+    changeTag(key) {
+      const clas = { ...this.form.classs };
+      if (clas[key]) {
+        delete clas[key];
+      } else {
+        clas[key] = this.allClasss[key];
+      }
+      this.$set(this.form, "classs", clas);
+    },
+    submit() {
+      this.$refs.form.validate(async (valid) => {
+        if (valid) {
+          const list = [];
+          for (const key in this.form.classs) {
+            if (this.form.classs.hasOwnProperty(key)) {
+              const item = this.form.classs[key];
+              list.push({
+                type: this.detail ? undefined : this.activeType,
+                courseType: key,
+                classGroupName:
+                  this.studentSubmitedData?.name ||
+                  this.detail?.name ||
+                  this.form.className,
+                classGroupId: this.detail?.id,
+                musicGroupId: this.musicGroupId,
+                startDate: item.courseTime,
+                classGroupTeacherMapperList: formatClassGroupTeacherMapperList(
+                  this.form.coreTeacher,
+                  this.form.assistant
+                ),
+                holiday: item.holiday,
+                students: this.studentSubmitedData?.seleched,
+                courseTimes: item.cycle.length,
+                courseTimeDtoList: item.cycle.map((_) => ({
+                  courseType: key,
+                  dayOfWeek: _.dayOfWeek,
+                  endClassTime: _.endClassTime,
+                  startClassTime: _.startClassTime,
+                })),
+              });
+            }
+          }
+          try {
+            if (this.detail) {
+              let result = await classGroupUpdate(list);
+              if (result.code == 206) {
+                this.$confirm(`当前课程课酬预计为0,是否继续`, "提示", {
+                  confirmButtonText: "确定",
+                  cancelButtonText: "取消",
+                  type: "warning",
+                })
+                  .then(async () => {
+                    // obj.allowZeroSalary = true;
+                    list.forEach((item) => {
+                      item.allowZeroSalary = true;
+                    });
+                    await classGroupUpdate(list);
+                    this.$listeners.submited();
+                    this.$listeners.close();
+                  })
+                  .catch(() => {
+                    return;
+                  });
+                return;
+              }
+              this.$message.success("排课修改成功");
+            } else {
+              if (this.classType == 1) {
+                // 0新建班级 2 3 4新增班级修改
+                await revisionClassGroup(list);
+                this.$message.success("排课成功");
+              } else if (
+                this.classType == 2 ||
+                this.classType == 3 ||
+                this.classType == 4
+              ) {
+                await revisionAddClassGroup(list);
+                this.$message.success("排课成功");
+              } else if (this.classType == 5) {
+                // 这里是合班拆班
+                let obj = {};
+                obj.musicGroupPaymentCalenderDtos = this.musicGroupPaymentCalenderDtos;
+                obj.classGroup4MixDtos = list;
+                obj.classGroupIds = this.classIdList;
+                obj.studentIds = this.studentSubmitedData.seleched;
+                obj.classGroupStudents = this.classGroupStudents;
+                obj.classCourseMinuteMap = this.selectPrices;
+                await mergeClassSplitClassAffirm(obj);
+                let grend = this.$parent.$parent.$parent.$parent.$parent.$parent
+                  .$parent;
+                grend.closeStudentReset();
+                grend.getList();
+                return;
+              }
+            }
+            this.$listeners.submited();
+            this.$listeners.close();
+          } catch (error) {
+            console.log(error);
+          }
+        } else {
+          this.$message.error("请先填写所有表单");
+        }
+      });
+    },
+    collapseChange(val) {
+      this.collapses = val;
+    },
+    changecoreTeacher(val) {},
+  },
+};
+</script>
+<style lang="less" scoped>
+.dialog-footer {
+  margin-top: 20px;
+  display: block;
+  text-align: right;
+}
+.title {
+  font-size: 16px;
+  padding: 10px;
+  font-weight: normal;
+  > span {
+    color: tomato;
+    font-size: 14px;
+  }
+}
+.tag {
+  margin-right: 5px;
+  cursor: pointer;
+}
+</style>

+ 1 - 1
vue.config.js

@@ -16,7 +16,7 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // const port = process.env.port || process.env.npm_config_port || 9528 // dev port
 // http://47.99.212.176:8000
 // //  https://online.dayaedu.com
-// let target = 'https://online.dayaedu.com' //线上
+let target = 'https://online.dayaedu.com' //线上
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.38:8000' //邹璇
 // let target = 'http://192.168.3.57:8000' //勇哥