lex 1 vuosi sitten
vanhempi
commit
b3f0687dd7

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/js/ArrangeWork.2b702573.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/js/addVisit.b7b44ccd.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/js/visitList.66875915.js


+ 2 - 2
src/constant/index.js

@@ -1,4 +1,4 @@
-export const courseType = { 
+export const courseType = {
   NORMAL: "声部课",
   SINGLE: "声部课",
   MIX: "合奏课",
@@ -46,5 +46,5 @@ export const coupontypeDetail = {
   MIX: "合奏课优惠券",
   VIP: "VIP优惠券",
   FULLCOUPON: "全类优惠券",
-  MEMBER: "云练优惠券",
+  MEMBER: "云练优惠券",
 };

+ 24 - 132
src/views/audition/ArrangeWork.vue

@@ -1,35 +1,19 @@
 <template>
   <div class="arrangeWork">
     <m-header v-if="headerStatus" />
-    <van-cell
-      :title="classGroupName"
-      title-style="font-size: .18rem; color: #333333;"
-    >
+    <van-cell :title="classGroupName" title-style="font-size: .18rem; color: #333333;">
       <template #extra>
-        <van-tag type="primary" plain style="background-color: #f1fcf9"
-          >课后训练</van-tag
-        >
+        <van-tag type="primary" plain style="background-color: #f1fcf9">课后训练</van-tag>
       </template>
     </van-cell>
-    <van-cell
-      class="endTime"
-      readonly
-      is-link
-      title-style="font-size: .16rem; color: #333333;"
-      @click="studentStatus = true"
-    >
+    <van-cell class="endTime" readonly is-link title-style="font-size: .16rem; color: #333333;" @click="studentStatus = true">
       <template #title>
         <span style="padding-right: 0.3rem"
-          >学员共<i style="font-style: normal; color: #01c1b5">{{
-            params.studentCount
-          }}</i
+          >学员共<i style="font-style: normal; color: #01c1b5">{{ params.studentCount }}</i
           >人</span
         >
         <span
-          >会员
-          <i style="font-style: normal; color: #ff802c">{{
-            params.studentMemberCount
-          }}</i
+          >会员 <i style="font-style: normal; color: #ff802c">{{ params.studentMemberCount }}</i
           >人</span
         >
       </template>
@@ -38,25 +22,12 @@
       <div class="formGroup">
         <div class="dot"></div>
         <div class="formTitle">训练标题</div>
-        <van-field
-          v-model="title"
-          type="text"
-          maxlength="25"
-          show-word-limit
-          placeholder="请输入训练标题"
-        />
+        <van-field v-model="title" type="text" maxlength="25" show-word-limit placeholder="请输入训练标题" />
       </div>
       <div class="formGroup">
         <div class="dot"></div>
         <div class="formTitle">训练内容</div>
-        <van-field
-          rows="4"
-          v-model="content"
-          maxlength="600"
-          show-word-limit
-          type="textarea"
-          placeholder="请输入训练内容"
-        />
+        <van-field rows="4" v-model="content" maxlength="600" show-word-limit type="textarea" placeholder="请输入训练内容" />
       </div>
     </div>
     <!-- <van-cell
@@ -77,28 +48,10 @@
       </template>
     </van-cell> -->
 
-    <div class="accompanyHeader">
-      云教练曲目选择<span>(若作业内容非云教练曲目则无需选择)</span>
-    </div>
+    <div class="accompanyHeader">云练习曲目选择<span>(若作业内容非云练习曲目则无需选择)</span></div>
     <van-tabs v-model="tabActive" color="#01C1B5">
-      <van-tab
-        v-for="(item, i) in params.subjectList"
-        :title="item.subjectName"
-        :name="item.id"
-        :key="i"
-        class="van-hairline--bottom"
-      >
-        <van-cell
-          class="endTime"
-          v-for="(music, index) in item.musicScoreIdList"
-          :key="index"
-          style="margin-top: 0; padding: 0.12rem 0.21rem"
-          title="训练曲目"
-          @click="onSelectAccompany(item, index)"
-          readonly
-          is-link
-          placeholder="请选择训练曲目"
-        >
+      <van-tab v-for="(item, i) in params.subjectList" :title="item.subjectName" :name="item.id" :key="i" class="van-hairline--bottom">
+        <van-cell class="endTime" v-for="(music, index) in item.musicScoreIdList" :key="index" style="margin-top: 0; padding: 0.12rem 0.21rem" title="训练曲目" @click="onSelectAccompany(item, index)" readonly is-link placeholder="请选择训练曲目">
           <template #title>
             <div class="dot"></div>
             训练曲目
@@ -110,92 +63,43 @@
             <span v-else style="color: #808080">请选择</span>
           </template>
           <template #right-icon>
-            <span
-              v-if="music.name"
-              @click.stop="delAccompany(item.musicScoreIdList, index)"
-              style="color: #999999; font-size: 0.12rem; padding-left: 0.12rem"
-              ><van-icon size="14" name="delete-o" />删除</span
-            >
+            <span v-if="music.name" @click.stop="delAccompany(item.musicScoreIdList, index)" style="color: #999999; font-size: 0.12rem; padding-left: 0.12rem"><van-icon size="14" name="delete-o" />删除</span>
           </template>
           <template #extra>
             <!-- <span><van-icon name="delete-o" />删除</span> -->
-            <span
-              style="
-                height: 24px;
-                font-size: 16px;
-                line-height: 24px;
-                color: #dadada !important;
-              "
-              ><van-icon name="arrow"
-            /></span>
+            <span style="height: 24px; font-size: 16px; line-height: 24px; color: #dadada !important"><van-icon name="arrow" /></span>
           </template>
         </van-cell>
-        <div
-          class="addAccompaniment"
-          v-if="item.musicScoreIdList.length < 3"
-          @click="addCloud(item)"
-        >
-          <van-icon name="plus" size="16px" />增加云教练训练曲目
-        </div>
+        <div class="addAccompaniment" v-if="item.musicScoreIdList.length < 3" @click="addCloud(item)"><van-icon name="plus" size="16px" />增加云练习训练曲目</div>
       </van-tab>
     </van-tabs>
 
     <div class="button-group">
-      <van-button type="primary" round size="large" @click="onSubmit"
-        >确定</van-button
-      >
+      <van-button type="primary" round size="large" @click="onSubmit">确定</van-button>
     </div>
 
     <!-- 日期开始弹窗 -->
     <van-popup position="bottom" v-model="dateSection.status">
-      <van-datetime-picker
-        v-model="dateSection.currentDate"
-        type="date"
-        :min-date="dateSection.minDate"
-        :max-date="dateSection.maxDate"
-        :formatter="formatter"
-        @confirm="confirmStartTime()"
-        @cancel="dateSection.status = false"
-      />
+      <van-datetime-picker v-model="dateSection.currentDate" type="date" :min-date="dateSection.minDate" :max-date="dateSection.maxDate" :formatter="formatter" @confirm="confirmStartTime()" @cancel="dateSection.status = false" />
     </van-popup>
 
-    <van-popup
-      position="bottom"
-      v-model="accompanimentStatus"
-      :style="{ height: '100%' }"
-      style="border-radius: 0; overflow: inherit"
-    >
+    <van-popup position="bottom" v-model="accompanimentStatus" :style="{ height: '100%' }" style="border-radius: 0; overflow: inherit">
       <!-- <van-sticky>
         <m-header name="作业曲目" :backUrl="backUrl" />
       </van-sticky> -->
       <!-- <accompaniment-modal @onSelectMusic="onSelectMusic" ref="accompaniment" style="margin-bottom: 0.8rem;" :searchSubjectId="tabActive" /> -->
       <!-- style="margin-bottom: 0.8rem;" -->
-      <workModel
-        @onSelectMusic="onSelectMusic"
-        @close="accompanimentStatus = false"
-        ref="accompaniment"
-        :searchSubjectId="tabActive"
-      />
+      <workModel @onSelectMusic="onSelectMusic" @close="accompanimentStatus = false" ref="accompaniment" :searchSubjectId="tabActive" />
       <!-- <div class="button-group-popup">
         <span class="btn" @click="accompanimentStatus = false">关闭</span>
       </div> -->
     </van-popup>
 
-    <van-popup
-      v-model="studentStatus"
-      :lock-scroll="true"
-      position="bottom"
-      :style="{ height: '180%' }"
-    >
+    <van-popup v-model="studentStatus" :lock-scroll="true" position="bottom" :style="{ height: '180%' }">
       <!-- <van-sticky>
         <m-header name="学员列表" :backUrl="backUrlStudent" />
       </van-sticky> -->
-      <student-list-model
-        :dataList="dataList"
-        style="margin-bottom: 0.8rem"
-        @close="studentStatus = false"
-        :dataSubjectList="dataSubjectList"
-      ></student-list-model>
+      <student-list-model :dataList="dataList" style="margin-bottom: 0.8rem" @close="studentStatus = false" :dataSubjectList="dataSubjectList"></student-list-model>
     </van-popup>
   </div>
 </template>
@@ -390,9 +294,7 @@ export default {
       this.accompanimentStatus = false;
     },
     confirmStartTime() {
-      this.dateSection.showStartDate = dayjs(
-        this.dateSection.currentDate
-      ).format("YYYY年MM月DD日");
+      this.dateSection.showStartDate = dayjs(this.dateSection.currentDate).format("YYYY年MM月DD日");
       this.dateSection.status = false;
     },
     onEndTime() {
@@ -432,17 +334,11 @@ export default {
           musicScoreHomeworkDtoList: scoreList,
         });
       });
-      if (
-        notAccompanySong.length - subjectLength <= 0 &&
-        notAccompanySong != 0 &&
-        type[0] != 1
-      ) {
+      if (notAccompanySong.length - subjectLength <= 0 && notAccompanySong != 0 && type[0] != 1) {
         // console.log('选择曲目')
         this.$dialog
           .confirm({
-            message:
-              notAccompanySong.join(",") +
-              "声部未选择云教练训练曲目,是否继续布置作业?",
+            message: notAccompanySong.join(",") + "声部未选择云练习训练曲目,是否继续布置作业?",
             confirmButtonColor: "#01C1B5",
           })
           .then(() => {
@@ -475,10 +371,7 @@ export default {
           this.$toast("作业布置成功");
           setTimeout(() => {
             let query = this.$route.query;
-            const path =
-              query.isNewJoin == 1
-                ? "/afterClassEvaluateDetail"
-                : "/courseEvaluation";
+            const path = query.isNewJoin == 1 ? "/afterClassEvaluateDetail" : "/courseEvaluation";
             this.$router.replace({
               path,
               query: {
@@ -516,8 +409,7 @@ export default {
   margin-left: 0.1rem;
   width: 0.1rem;
   height: 0.07rem;
-  background: url("../../assets/images/audition/arrow_down.png") no-repeat
-    center center;
+  background: url("../../assets/images/audition/arrow_down.png") no-repeat center center;
   background-size: 100%;
 }
 

+ 4 - 4
src/views/visitManager/addVisit.vue

@@ -130,7 +130,7 @@ export default {
         headerStatus: true, // 头部是否展示
         studentStatus: false, // 上课学生状态
       },
-      typeList: [{ name: "课程推荐" }, { name: "常规回访" }, { name: "小课回访" }, { name: "云练" }, { name: "其它" }],
+      typeList: [{ name: "课程推荐" }, { name: "常规回访" }, { name: "小课回访" }, { name: "云练" }, { name: "其它" }],
       visit: {
         status: false,
         type: null,
@@ -142,7 +142,7 @@ export default {
       form: {
         teacherId: null,
         studentId: query.userId || query.studentId || query.beforeId || null,
-        type: query.userId ? "云练" : query.beforeId ? "常规回访" : null,
+        type: query.userId ? "云练" : query.beforeId ? "常规回访" : null,
         purpose: query.userId ? "体验回访" : query.beforeId ? "教学内容未达标" : null,
         overview: "",
         feedback: "",
@@ -420,7 +420,7 @@ export default {
           visit.data = [{ name: "课后及作业回访" }, { name: "练习及乐团表现" }, { name: "考勤申诉" }, { name: "异常请假回访" }];
         } else if (form.type == "小课回访") {
           visit.data = [{ name: "续费类回访" }, { name: "服务回访" }, { name: "其他" }];
-        } else if (form.type == "云练") {
+        } else if (form.type == "云练") {
           visit.data = [{ name: "体验回访" }];
         } else {
           this.$toast("请选择回访类型");
@@ -465,7 +465,7 @@ export default {
       this.dataForm.status = false;
     },
     onEnListShow() {
-      // 从云练统计来的,不许改时间,默认当前时间
+      // 从云练统计来的,不许改时间,默认当前时间
       if (this.id || this.visitFlag) {
         return;
       }

+ 21 - 84
src/views/visitManager/afterVisitList.vue

@@ -2,77 +2,23 @@
   <div class="visitList">
     <!-- <m-header v-if="headerStatus" /> -->
     <van-dropdown-menu :close-on-click-outside="false" active-color="#01C1B5">
-      <van-dropdown-item
-        v-model="value1"
-        @change="onTypeChange"
-        title="回访类型"
-        :options="option1"
-      />
-      <van-dropdown-item
-        v-model="value2"
-        @change="onPurposeChange"
-        :disabled="purposeStatus"
-        title="回访目的"
-        :options="option2"
-      />
-      <van-dropdown-item
-        v-model="value3"
-        @change="onPurposeChange"
-        title="回访状态"
-        :options="option3"
-      />
+      <van-dropdown-item v-model="value1" @change="onTypeChange" title="回访类型" :options="option1" />
+      <van-dropdown-item v-model="value2" @change="onPurposeChange" :disabled="purposeStatus" title="回访目的" :options="option2" />
+      <van-dropdown-item v-model="value3" @change="onPurposeChange" title="回访状态" :options="option3" />
       <van-dropdown-item title="回访时间" ref="item" class="visitTime">
-        <van-cell
-          title="开始时间"
-          is-link
-          @click="onChangeDate('showStart')"
-          :value="formatStartTime"
-        ></van-cell>
-        <van-cell
-          title="结束时间"
-          is-link
-          @click="onChangeDate('showEnd')"
-          :value="formatEndTime"
-        ></van-cell>
+        <van-cell title="开始时间" is-link @click="onChangeDate('showStart')" :value="formatStartTime"></van-cell>
+        <van-cell title="结束时间" is-link @click="onChangeDate('showEnd')" :value="formatEndTime"></van-cell>
         <div class="btnWrap">
           <div class="cancelBtn" @click="cancelBtn">重置</div>
           <div class="okBtn" @click="okBtn">确定</div>
         </div>
       </van-dropdown-item>
     </van-dropdown-menu>
-    <van-popup
-      v-model="dataForm.status"
-      position="bottom"
-      :style="{ height: '40%' }"
-    >
-      <van-datetime-picker
-        v-model="dataForm.currentDate"
-        :min-date="dataForm.minDate"
-        :max-date="dataForm.maxDate"
-        :min-hour="6"
-        :max-hour="21"
-        :formatter="formatter"
-        @cancel="dataForm.status = false"
-        type="date"
-        @confirm="chioseDate"
-      />
+    <van-popup v-model="dataForm.status" position="bottom" :style="{ height: '40%' }">
+      <van-datetime-picker v-model="dataForm.currentDate" :min-date="dataForm.minDate" :max-date="dataForm.maxDate" :min-hour="6" :max-hour="21" :formatter="formatter" @cancel="dataForm.status = false" type="date" @confirm="chioseDate" />
     </van-popup>
-    <van-list
-      v-model="loading"
-      v-if="dataShow"
-      :finished="finished"
-      finished-text="- 没有更多了 -"
-      @load="getList"
-    >
-      <van-cell
-        v-for="(item, index) in list"
-        :key="index"
-        class="cellGroup"
-        title-class="sectionTitle"
-        value-class="sectionValue"
-        is-link
-        @click="onHref(item)"
-      >
+    <van-list v-model="loading" v-if="dataShow" :finished="finished" finished-text="- 没有更多了 -" @load="getList">
+      <van-cell v-for="(item, index) in list" :key="index" class="cellGroup" title-class="sectionTitle" value-class="sectionValue" is-link @click="onHref(item)">
         <template slot="title">
           <p>{{ item.type }}</p>
           <p class="type">{{ item.studentName }}</p>
@@ -116,7 +62,7 @@ export default {
         { text: "课程推荐", value: "课程推荐" },
         { text: "常规回访", value: "常规回访" },
         { text: "小课回访", value: "小课回访" },
-        { text: "云练", value: "云练" },
+        { text: "云练", value: "云练" },
         { text: "其它", value: "其它" },
       ],
       option2: [],
@@ -190,16 +136,12 @@ export default {
           dataForm.minDate = new Date(dayjs(this.formatStartTime));
         }
         setTimeout(() => {
-          dataForm.currentDate = this.formatEndTime
-            ? new Date(dayjs(this.formatEndTime))
-            : new Date();
+          dataForm.currentDate = this.formatEndTime ? new Date(dayjs(this.formatEndTime)) : new Date();
         }, 500);
       } else if (type == "showStart") {
         dataForm.minDate = new Date(2000, 0, 1);
         setTimeout(() => {
-          dataForm.currentDate = this.formatStartTime
-            ? new Date(dayjs(this.formatStartTime))
-            : new Date();
+          dataForm.currentDate = this.formatStartTime ? new Date(dayjs(this.formatStartTime)) : new Date();
         }, 500);
       }
       dataForm.status = true;
@@ -209,10 +151,7 @@ export default {
       let dataForm = this.dataForm;
       if (dataForm.type == "showStart") {
         this.formatStartTime = dayjs(value).format("YYYY/MM/DD");
-        if (
-          this.formatEndTime &&
-          dayjs(value).unix() > dayjs(this.formatEndTime).unix()
-        ) {
+        if (this.formatEndTime && dayjs(value).unix() > dayjs(this.formatEndTime).unix()) {
           this.formatEndTime = null;
         }
       } else if (dataForm.type == "showEnd") {
@@ -239,13 +178,15 @@ export default {
           { text: "练习及乐团表现", value: "练习及乐团表现" },
           { text: "教学内容未达标", value: "教学内容未达标" },
         ];
-      }else if (this.value1 == "小课回访") {
+      } else if (this.value1 == "小课回访") {
         this.purposeStatus = false;
         this.option2 = [
           { text: "全部", value: "全部" },
-          { text: "续费类回访",value: "续费类回访"  }, { text: "服务回访",value: "服务回访"}, { text: "其他",value: "其他" }
+          { text: "续费类回访", value: "续费类回访" },
+          { text: "服务回访", value: "服务回访" },
+          { text: "其他", value: "其他" },
         ];
-      } else if (this.value1 == "云教练") {
+      } else if (this.value1 == "云练") {
         this.purposeStatus = false;
         this.option2 = [{ text: "体验回访", value: "体验回访" }];
       } else if (this.value1 == "其它") {
@@ -263,12 +204,8 @@ export default {
       params.purpose = this.value2 == "全部" ? null : this.value2;
       params.probStatus = this.value3 == "全部" ? null : this.value3;
       if (this.formatStartTime && this.formatEndTime) {
-        params.startTime = dayjs(new Date(this.formatStartTime)).format(
-          "YYYY-MM-DD"
-        );
-        params.endTime = dayjs(new Date(this.formatEndTime)).format(
-          "YYYY-MM-DD"
-        );
+        params.startTime = dayjs(new Date(this.formatStartTime)).format("YYYY-MM-DD");
+        params.endTime = dayjs(new Date(this.formatEndTime)).format("YYYY-MM-DD");
       } else {
         params.startTime = null;
         params.endTime = null;
@@ -423,4 +360,4 @@ export default {
   line-height: 0.36rem !important;
   font-size: 0.16rem;
 }
-</style>
+</style>

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä