Merge branch '11/24SAAS' of http://git.dayaedu.com/yonge/dy-admin-manager into 11/24SAAS

src/router/index.js

@@ -461,10 +461,10 @@ export const asyncRoutes = {
   backManager:()=>import ('@/views/backManager'),
   // 教材列表
   teachManager:()=>import ('@/views/teachManager'),
+  // 课程规则设置
+  courseRulersManager:()=>import('@/views/courseRulersManager'),
   // 基础规则设置
-  baseRulersManager:()=>import('@/views/baseRulersManager'),
-  // 监控规则设置
-  monitorManager:()=>import('@/views/monitorManager'),
+  baseRulesManager:()=>import('@/views/baseRulesManager'),
   // 课程参数设置
   baseRulesClassSetting:()=>import('@/views/baseRulesClassSetting'),
   // 产品管理

src/router/notKeepAliveList.js

@@ -107,5 +107,5 @@ export default [
   '/business/reaplceMusicPlayer', // 乐器置换
   // '/business/feeAudit',
   '/baseRulersManager',
-  '/monitorManager'
+  '/courseRulersManager'
 ]

src/views/baseRulesClassSetting/index.vue

@@ -8,6 +8,14 @@
       <!-- navMenu -->
       <tab-router v-model.trim="activeIndex" @tab-click="handleClick">
         <el-tab-pane
+          label="乐团模式设置"
+          lazy
+          name="6"
+          v-if="permissionList.typesManager"
+        >
+          <typesManager v-if="activeIndex == 6" />
+        </el-tab-pane>
+        <el-tab-pane
           label="乐团课程设置"
           lazy
           name="1"
@@ -54,10 +62,11 @@
 <script>
 import courseTimerSetting from "@/views/categroyManager/specialSetup/courseTimerSetting";
 import musicCourseFee from "@/views/categroyManager/specialSetup/musicCourseFee";
+import typesManager from "@/views/categroyManager//specialSetup/typesManager";
 import chargesList from "@/views/categroyManager/specialSetup/chargesList";
 import vipCourseType from "@/views/categroyManager/generalSettings/vipCourseType";
 import auditionSetting from "./audition";
-import { permission } from '@/utils/directivePage'
+import { permission } from "@/utils/directivePage";
 export default {
   components: {
     courseTimerSetting,
@@ -65,16 +74,18 @@ export default {
     chargesList,
     vipCourseType,
     auditionSetting,
+    typesManager,
   },
   name: "baseRulersManager",
   data() {
     return {
-      activeIndex: "1",
+      activeIndex: "6",
       permissionList: {
         courseTimerSetting: permission("/globalConfig/courseTimerSetting"),
         musicCourseFee: permission("/globalConfig/musicCourseFee"),
         chargesList: permission("/globalConfig/chargesList"),
         vipCourseType: permission("/vipCourseType"),
+        typesManager: permission("/globalConfig/typesManager"),
       },
     };
   },

src/views/categroyManager/specialSetup/typesManager.vue

@@ -2,11 +2,13 @@
   <div class='m-container'>
     <!-- <h2>收费类型设置</h2> -->
     <div class="m-core">
-      <div class='newBand' v-permission="'chargeType/upSet/createSet'"
-           @click="openTypes('create')">添加</div>
+      <el-button style="margin-bottom:20px;" v-permission="'chargeType/upSet/createSet'" size="mini" type="primary" @click="openTypes('create')">添加</el-button>
+      <!-- <div class='newBand' v-permission="'chargeType/upSet/createSet'"
+           @click="openTypes('create')">添加</div> -->
       <!-- 列表 -->
       <div class="tableWrap">
         <el-table :data='tableList'
+        size="mini"
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}">
           <el-table-column align='center'
                            prop="name"
@@ -43,7 +45,7 @@
                width="500px">
       <el-form :model="form"
                :rules="rules"
-               ref="ruleForm">
+               ref="ruleForm" size="mini">
         <el-form-item label="收费类型"
                       prop="name"
                       :label-width="formLabelWidth">
@@ -61,9 +63,9 @@
       </el-form>
       <span slot="footer"
             class="dialog-footer">
-        <el-button @click="typeStatus = false">取 消</el-button>
+        <el-button @click="typeStatus = false" size="mini">取 消</el-button>
         <el-button type="primary"
-                   @click="onTypesSubmit('ruleForm')">确 定</el-button>
+                   @click="onTypesSubmit('ruleForm')" size="mini">确 定</el-button>
       </span>
     </el-dialog>
   </div>

src/views/baseRulersManager/components/offlineTeamRules.vue → src/views/courseRulersManager/components/offlineTeamRules.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="m-container">
     <div class="m-core">
-      <el-form :inline="true" :model="form">
+      <el-form :inline="true" :model="form" size="mini">
         <el-alert
           style="margin: 20px 0"
           title="线下课考勤定位范围"
@@ -9,8 +9,8 @@
           type="info"
         >
         </el-alert>
+        <p class="subtitle">线下课考勤定位范围:</p>
         <el-row>
-          <span>线下课考勤定位范围：</span><br />
           GPS定位距离教学点<el-input
             v-model="form.num"
             placeholder="请输入距离"
@@ -20,8 +20,8 @@
           </el-input>
           以内
         </el-row>
+        <p class="subtitle">签到签退定位异常:</p>
         <el-row>
-          <span>签到签退定位异常：</span><br />
           乐团线下课签到签退地点、VIP线下课点名地点未在定位范围内，扣减课酬
           <el-input v-model="form.num" placeholder="请输入金额" size="mini">
             <template slot="append">
@@ -32,33 +32,39 @@
             </template>
           </el-input>
         </el-row>
+
         <el-alert
           style="margin: 20px 0"
-          title="签到规则"
+          title="乐团课签到规则"
           :closable="false"
           type="info"
         >
         </el-alert>
+        <p class="subtitle">最早可签到时间:</p>
+        <el-row>
+          课程开始前
+          <el-form-item>
+            <el-input v-model="form.num" placeholder="请输入时间" size="mini">
+              <template slot="append">分钟</template> </el-input
+            >可进行签到
+          </el-form-item>
+        </el-row>
         <p class="subtitle">正常签到:</p>
         <el-row>
           课程开始
           <el-input v-model="form.num" placeholder="请输入时间" size="mini">
             <template slot="append">分钟</template> </el-input
-          >前,
+          >前，且在定位范围内签到
         </el-row>
         <p class="subtitle">异常签到:</p>
         <el-row>
-          课程开始前
+          未在课程开始
           <el-input v-model="form.num" placeholder="请输入时间" size="mini">
             <template slot="append">分钟</template> </el-input
-          >至课程开始时间前签到，或签到GPS定位距离教学点
-          <el-input v-model="form.num" placeholder="请输入距离" size="mini">
-            <template slot="append">米</template>
-          </el-input>
-          以外，扣减课酬
-          <el-input v-model="form.num" placeholder="请输入距离" size="mini">
+          >前签到，扣减课酬
+          <el-input v-model="form.num" placeholder="请输入金额" size="mini">
             <template slot="append">
-              <el-select class="append" v-model.trim="form.organId">
+              <el-select class="append" v-model.trim="form.organId" size="mini">
                 <el-option label="元" value="yuan"> </el-option>
                 <el-option label="%" value="bi"> </el-option>
               </el-select>
@@ -70,8 +76,8 @@
           课程开始
           <el-input v-model="form.num" placeholder="请输入时间" size="mini">
             <template slot="append">分钟</template> </el-input
-          >后签到，扣减课酬
-          <el-input v-model="form.num" placeholder="请输入距离" size="mini">
+          >内签到，扣减课酬
+          <el-input v-model="form.num" placeholder="请输入金额" size="mini">
             <template slot="append">
               <el-select class="append" v-model.trim="form.organId" size="mini">
                 <el-option label="元" value="yuan"> </el-option>
@@ -86,8 +92,8 @@
           <el-input v-model="form.num" placeholder="请输入时间" size="mini">
             <template slot="append">分钟</template>
           </el-input>
-          后签到，或未签到，扣减课酬
-          <el-input v-model="form.num" placeholder="请输入距离" size="mini">
+          后签到，扣减课酬
+          <el-input v-model="form.num" placeholder="请输入金额" size="mini">
             <template slot="append">
               <el-select class="append" v-model.trim="form.organId" size="mini">
                 <el-option label="元" value="yuan"> </el-option>
@@ -96,10 +102,10 @@
             </template>
           </el-input>
         </el-row>
-        <p class="subtitle">未点名</p>
+        <p class="subtitle">未签到：</p>
         <el-row>
-          课程未点名扣减课酬
-          <el-input v-model="form.num" placeholder="请输入距离" size="mini">
+          扣减课酬
+          <el-input v-model="form.num" placeholder="请输入金额" size="mini">
             <template slot="append">
               <el-select class="append" v-model.trim="form.organId">
                 <el-option label="元" value="yuan"> </el-option>
@@ -110,7 +116,7 @@
         </el-row>
         <el-alert
           style="margin: 10px 0"
-          title="签退规则"
+          title="乐团课签退规则"
           :closable="false"
           type="info"
         >
@@ -120,22 +126,14 @@
           课程结束后
           <el-input v-model="form.num" placeholder="请输入时间" size="mini">
             <template slot="append">分钟</template> </el-input
-          >内签退，且签退GPS定位距离教学点
-          <el-input v-model="form.num" placeholder="请输入距离" size="mini">
-            <template slot="append">米</template>
-          </el-input>
-          以内
+          >内签退，且在定位范围内签退
         </el-row>
         <p class="subtitle">异常签退:</p>
         <el-row>
           课程结束时间
           <el-input v-model="form.num" placeholder="请输入时间" size="mini">
             <template slot="append">分钟</template> </el-input
-          >内签退，或签退GPS定位距离教学点
-          <el-input v-model="form.num" placeholder="请输入距离" size="mini">
-            <template slot="append">米</template>
-          </el-input>
-          以外，扣减课酬
+          >内签退，扣减课酬
           <el-input v-model="form.num" placeholder="请输入金额" size="mini">
             <template slot="append">
               <el-select class="append" v-model.trim="form.organId" size="mini">
@@ -152,7 +150,7 @@
             <template slot="append">分钟</template>
           </el-input>
           前签退，扣减课酬
-          <el-input v-model="form.num" placeholder="请输入距离" size="mini">
+          <el-input v-model="form.num" placeholder="请输入金额" size="mini">
             <template slot="append">
               <el-select class="append" v-model.trim="form.organId" size="mini">
                 <el-option label="元" value="yuan"> </el-option>
@@ -173,25 +171,129 @@
             </template>
           </el-input>
         </el-row>
+        <p class="subtitle">签退提醒：</p>
+        <el-row>
+          课程结束
+          <el-input v-model="form.num" placeholder="请输入时间" size="mini">
+            <template slot="append">分钟</template>
+          </el-input>
+          后，对未签退老师发送短信提醒
+        </el-row>
         <el-alert
           style="margin: 10px 0"
-          title="考勤申诉规则"
+          title="乐团线下连堂课"
           :closable="false"
           type="info"
         >
         </el-alert>
-        <p class="subtitle">考勤申诉：</p>
+        <p class="subtitle">
+          乐团线下连堂课：
+          <el-tooltip placement="top" popper-class="mTooltip">
+            <div slot="content">
+              <p style="color: #fff">
+                1.同一天同一个老师，同一个教学点，上一节课的结束时间与下一节课的开始时间在N分钟内视为连堂课，老师第一节有签到记录，第二节课只要在考勤范围内，课程结束之前签到就是正常签到，签退按照正常考勤规则签退
+              </p>
+              <p style="color: #fff">
+                2.同一天同一个老师不同教学点，有两节以上的课程，第一节课有签到记录，后面的课程只要在考勤范围内，课程结束之前签到都是正常签到，退按照正常考勤规则签退。
+              </p>
+            </div>
+            <i
+              class="el-icon-question micon el-tooltip"
+              style="font-size: 18px; color: #f56c6c"
+            ></i>
+          </el-tooltip>
+        </p>
         <el-row>
-          课程结束后
+          乐团线下课程间隔
+          <el-input v-model="form.num" placeholder="请输入时间" size="mini">
+            <template slot="append">分钟</template>
+          </el-input>
+          以内视为连堂课
+        </el-row>
+        <el-alert
+          style="margin: 10px 0"
+          title="VIP课点名规则"
+          :closable="false"
+          type="info"
+        >
+        </el-alert>
+        <p class="subtitle">未点名：</p>
+        <el-row>
+          未点名扣减课酬
           <el-input v-model="form.num" placeholder="请输入金额" size="mini">
             <template slot="append">
-              <el-select class="append" v-model.trim="form.organId">
-                <el-option label="小时" value="hour"> </el-option>
-                <el-option label="天" value="day"> </el-option>
+              <el-select class="append" v-model.trim="form.organId" size="mini">
+                <el-option label="元" value="yuan"> </el-option>
+                <el-option label="%" value="bi"> </el-option>
               </el-select>
             </template>
           </el-input>
         </el-row>
+        <p class="subtitle">点名时间范围：</p>
+        <el-row>
+          VIP课可点名时间范围为课程开始前
+          <el-input v-model="form.num" placeholder="请输入时间" size="mini">
+            <template slot="append">分钟</template>
+          </el-input>
+          至课程结束后
+          <el-input v-model="form.num" placeholder="请输入时间" size="mini">
+            <template slot="append">分钟</template>
+          </el-input>
+        </el-row>
+        <el-alert
+          style="margin: 10px 0"
+          title="试用期课酬"
+          :closable="false"
+          type="info"
+        />
+        <p class="subtitle">试用期课酬规则：</p>
+        <el-row>
+          试用期老师课酬按默认课酬的
+          <el-input v-model="form.num" placeholder="请输入时间" size="mini">
+            <template slot="append">%</template> 发放
+          </el-input>
+        </el-row>
+        <el-alert
+          style="margin: 10px 0"
+          title="考勤申诉规则"
+          :closable="false"
+          type="info"
+        />
+
+        <p class="subtitle">考勤申诉：</p>
+        <el-row>
+          全职老师
+          <el-select v-model.trim="form.organId" size="mini">
+            <el-option label="按时间" value="hour"> </el-option>
+            <el-option label="按日期" value="day"> </el-option>
+          </el-select>
+          在课程结束后
+          <el-input v-model="form.num" placeholder="请输入时间" size="mini">
+            <template slot="append">分钟</template> </el-input
+          >内可以提交考勤申诉
+        </el-row>
+        <el-row>
+          兼职老师
+          <el-select v-model.trim="form.organId" size="mini">
+            <el-option label="按时间" value="hour"> </el-option>
+            <el-option label="按日期" value="day"> </el-option>
+          </el-select>
+          在课程结束后
+          <el-input v-model="form.num" placeholder="请输入时间" size="mini">
+            <template slot="append">分钟</template> </el-input
+          >内可以提交考勤申诉
+        </el-row>
+        <el-row>
+          劳务老师
+          <el-select v-model.trim="form.organId" size="mini">
+            <el-option label="按时间" value="hour"> </el-option>
+            <el-option label="按日期" value="day"> </el-option>
+          </el-select>
+          在课程结束后
+          <el-input v-model="form.num" placeholder="请输入时间" size="mini">
+            <template slot="append">分钟</template> </el-input
+          >内可以提交考勤申诉
+        </el-row>
       </el-form>
       <el-button size="mini" type="primary"> 保存 </el-button>
     </div>
@@ -209,8 +311,15 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+/deep/.el-form-item--mini.el-form-item {
+  margin-bottom: 0px;
+}
+.mTooltip {
+  width: 300px;
+}
 /deep/.el-input-group {
   width: 180px;
+  margin: 0 5px;
 }
 .el-row {
   align-items: center;
@@ -223,9 +332,13 @@ p,
   font-size: 14px;
   line-height: 32px;
   color: #000;
-  margin-bottom: 20px;
+  margin-bottom: 10px;
   padding: 0 24px;
 }
+p {
+  font-weight: bold;
+  margin-bottom: 0;
+}
 .subtitle {
   font-size: 14px;
   line-height: 32px;

src/views/baseRulersManager/components/onlineCloudRules.vue → src/views/courseRulersManager/components/onlineCloudRules.vue

@@ -97,19 +97,39 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+/deep/.el-form-item--mini.el-form-item {
+  margin-bottom: 0px;
+}
+.mTooltip {
+  width: 300px;
+}
 /deep/.el-input-group {
   width: 180px;
+  margin: 0 5px;
 }
-p,.el-row {
+.el-row {
+  align-items: center;
+}
+/deep/.el-input-group {
+  width: 180px;
+}
+p,
+.el-row {
   font-size: 14px;
   line-height: 32px;
   color: #000;
+  margin-bottom: 10px;
+  padding: 0 24px;
+}
+p {
+  font-weight: bold;
+  margin-bottom: 0;
 }
 .subtitle {
   font-size: 14px;
   line-height: 32px;
 }
 .append {
-  max-width: 80px!important;
+  width: 80px !important;
 }
 </style>

src/views/baseRulersManager/components/remberRules.vue → src/views/courseRulersManager/components/remberRules.vue

@@ -11,28 +11,24 @@
         </el-alert>
         <el-row>
           <el-form-item>
-            各声部不购买会员入团资格限制
-            <el-input v-model="form.num" size="mini">
+             各声部不购买会员入团资格限制  <el-input v-model="form.num" size="mini">
               <template slot="append">人</template>
             </el-input>
+
           </el-form-item>
         </el-row>
         <el-row>
           <el-form-item>
-            会员团每学期赠送
-            <el-input v-model="form.num" size="mini">
+            会员团每学期赠送  <el-input v-model="form.num" size="mini">
               <template slot="append">分钟</template>
-            </el-input>
-            课程
+            </el-input> 课程
           </el-form-item>
         </el-row>
         <el-row>
           <el-form-item>
-            每学期结束前
-            <el-input v-model="form.num" size="mini">
+            每学期结束前   <el-input v-model="form.num" size="mini">
               <template slot="append">天</template>
-            </el-input>
-            提醒乐团主管安排下学期课程
+            </el-input> 提醒乐团主管安排下学期课程
           </el-form-item>
         </el-row>
       </el-form>
@@ -61,6 +57,7 @@ export default {
 }
 /deep/.el-input-group {
   width: 180px;
+   margin: 0 5px;
 }
 .el-row {
   align-items: center;

src/views/baseRulersManager/components/teamRules.vue → src/views/courseRulersManager/components/teamRules.vue

@@ -115,6 +115,7 @@ export default {
 <style lang="scss" scoped>
 /deep/.el-input-group {
   width: 180px;
+   margin: 0 5px;
 }
 .el-row {
   align-items: center;

src/views/baseRulersManager/index.vue → src/views/courseRulersManager/index.vue

@@ -2,7 +2,7 @@
   <div class="m-container">
     <h2>
       <div class="squrt"></div>
-      基础规则设置
+      课程规则设置
     </h2>
     <div class="m-core">
       <!-- navMenu -->
@@ -26,21 +26,21 @@
         </el-tab-pane>
         <!--  -->
         <el-tab-pane
-          label="乐团线下课考勤规则"
+          label="线下课考勤规则"
           lazy
           name="3"
           v-if="permissionList.discountManage"
         >
           <offlineTeamRules />
         </el-tab-pane>
-        <el-tab-pane
+        <!-- <el-tab-pane
           label="VIP线下课考勤规则"
           lazy
           name="4"
           v-if="permissionList.chargesList"
         >
           <offlineVipRules />
-        </el-tab-pane>
+        </el-tab-pane> -->
         <el-tab-pane
           label="云教室考勤规则"
           lazy