提交修改

1

src/views/baseRulersManager/components/offlineTeamRules.vue

@@ -3,7 +3,37 @@
     <div class="m-core">
       <el-form :inline="true" :model="form">
         <el-alert
-          style="margin: 10px 0"
+          style="margin: 20px 0"
+          title="线下课考勤定位范围"
+          :closable="false"
+          type="info"
+        >
+        </el-alert>
+        <el-row>
+          <span>线下课考勤定位范围：</span><br />
+          GPS定位距离教学点<el-input
+            v-model="form.num"
+            placeholder="请输入距离"
+            size="mini"
+          >
+            <template slot="append">米</template>
+          </el-input>
+          以内
+        </el-row>
+        <el-row>
+          <span>签到签退定位异常：</span><br />
+          乐团线下课签到签退地点、VIP线下课点名地点未在定位范围内，扣减课酬
+          <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>
+                <el-option label="%" value="bi"> </el-option>
+              </el-select>
+            </template>
+          </el-input>
+        </el-row>
+        <el-alert
+          style="margin: 20px 0"
           title="签到规则"
           :closable="false"
           type="info"
@@ -14,10 +44,7 @@
           课程开始
           <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>
@@ -176,7 +203,7 @@ export default {
     return {
       form: {},
       roleList: [],
-      value1:null
+      value1: null,
     };
   },
 };
@@ -185,16 +212,25 @@ export default {
 /deep/.el-input-group {
   width: 180px;
 }
-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: 20px;
+  padding: 0 24px;
 }
 .subtitle {
   font-size: 14px;
   line-height: 32px;
 }
 .append {
-  width: 80px!important;
+  width: 80px !important;
 }
 </style>

src/views/baseRulersManager/components/remberRules.vue

@@ -12,7 +12,7 @@
         <el-row>
           <el-form-item>
             各声部不购买会员入团资格限制
-            <el-input v-model="form.num">
+            <el-input v-model="form.num" size="mini">
               <template slot="append">人</template>
             </el-input>
           </el-form-item>
@@ -20,16 +20,16 @@
         <el-row>
           <el-form-item>
             会员团每学期赠送
-            <el-input v-model="form.num">
+            <el-input v-model="form.num" size="mini">
               <template slot="append">分钟</template>
             </el-input>
             课程
           </el-form-item>
         </el-row>
-               <el-row>
+        <el-row>
           <el-form-item>
             每学期结束前
-            <el-input v-model="form.num">
+            <el-input v-model="form.num" size="mini">
               <template slot="append">天</template>
             </el-input>
             提醒乐团主管安排下学期课程
@@ -51,4 +51,33 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+/deep/.el-form--inline .el-form-item__content{
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+/deep/.el-form-item {
+  margin-bottom: 0;
+}
+/deep/.el-input-group {
+  width: 180px;
+}
+.el-row {
+  align-items: center;
+}
+/deep/.el-input-group {
+  width: 180px;
+}
+p,
+.el-row {
+  font-size: 14px;
+  line-height: 32px;
+  color: #000;
+  margin-bottom: 20px;
+  padding: 0 24px;
+}
+.subtitle {
+  font-size: 14px;
+  line-height: 32px;
+}
 </style>

src/views/baseRulersManager/components/teamRules.vue

@@ -5,14 +5,14 @@
 
       <el-form :inline="true" :model="form">
         <el-alert
-          style="margin: 10px 0"
+          style="margin: 20px 0"
           title="预报名规则"
           :closable="false"
           type="info"
         >
         </el-alert>
         <el-row>
-          乐团管理角色
+          是否开启乐团预报名调查
           <el-select
             size="mini"
             class="multiple"
@@ -21,93 +21,10 @@
             clearable
             placeholder="请选择角色"
           >
-            <el-option
-              v-for="item in roleList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option
-          ></el-select>
-        </el-row>
-        <el-row>
-          乐器维修角色
-          <el-select
-            size="mini"
-            class="multiple"
-            v-model.trim="form.organId"
-            filterable
-            clearable
-            placeholder="请选择角色"
-          >
-            <el-option
-              v-for="item in roleList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option
-          ></el-select>
-        </el-row>
-        <el-row>
-          新建乐团时，默认包含
-          <el-select
-            size="mini"
-            class="multiple"
-            v-model.trim="form.organId"
-            filterable
-            clearable
-            placeholder="请选择声部"
-          >
-            <el-option
-              v-for="item in roleList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option
-          ></el-select>
-          声部
-        </el-row>
-        <el-alert
-          style="margin: 10px 0"
-          title="预报名规则"
-          :closable="false"
-          type="info"
-        >
-        </el-alert>
-        <el-row>
-          乐团启蒙调查问卷
-          <el-select
-            size="mini"
-            class="multiple"
-            v-model.trim="form.organId"
-            filterable
-            clearable
-            placeholder="请选择问卷"
+            <el-option label="是" value="1"></el-option>
+            <el-option label="否" value="0"></el-option>
+            </el-select
           >
-            <el-option
-              v-for="item in roleList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option
-          ></el-select>
-        </el-row>
-        <el-row>
-          乐团预报名调查问卷
-          <el-select
-            size="mini"
-            class="multiple"
-            v-model.trim="form.organId"
-            filterable
-            clearable
-            placeholder="请选择问卷"
-          >
-            <el-option
-              v-for="item in roleList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option
-          ></el-select>
         </el-row>
         <el-row>
           乐团预报名人数达到
@@ -117,7 +34,7 @@
           时，可将乐团状态变更为创建缴费中
         </el-row>
         <el-alert
-          style="margin: 10px 0"
+          style="margin: 20px 0"
           title="报名缴费规则"
           :closable="false"
           type="info"
@@ -138,7 +55,7 @@
           时，可确认开团
         </el-row>
         <el-alert
-          style="margin: 10px 0"
+          style="margin: 20px 0"
           title="乐团筹备规则"
           :closable="false"
           type="info"
@@ -153,39 +70,21 @@
         </el-row>
 
         <el-alert
-          style="margin: 10px 0"
-          title="退团缴费规则"
+          style="margin: 20px 0"
+          title="乐团档案"
           :closable="false"
           type="info"
         >
         </el-alert>
         <el-row>
-          退团处理角色
-          <el-select
-            size="mini"
-            class="multiple"
-            v-model.trim="form.organId"
-            filterable
-            clearable
-            placeholder="请选择角色"
-          >
-            <el-option
-              v-for="item in roleList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option
-          ></el-select>
-        </el-row>
-        <el-row>
-          退团审批角色
+          乐团满意度调查问卷
           <el-select
             size="mini"
             class="multiple"
             v-model.trim="form.organId"
             filterable
             clearable
-            placeholder="请选择角色"
+            placeholder="请选择问卷"
           >
             <el-option
               v-for="item in roleList"
@@ -210,7 +109,7 @@ export default {
     };
   },
   mounted() {},
-  methods:{}
+  methods: {},
 };
 </script>
 <style lang="scss" scoped>
@@ -228,7 +127,8 @@ p,
   font-size: 14px;
   line-height: 32px;
   color: #000;
-  margin-bottom: 10px;
+  margin-bottom: 20px;
+  padding: 0 24px;
 }
 .subtitle {
   font-size: 14px;

src/views/baseRulersManager/index.vue

@@ -13,24 +13,25 @@
           name="1"
           v-if="permissionList.typesManager"
         >
-        <teamRules />
+          <teamRules />
         </el-tab-pane>
 
         <el-tab-pane
-          label="排课规则设置"
+          label="会员规则设置"
           lazy
           name="2"
-          v-if="permissionList.courseTimerSetting"
+          v-if="permissionList.typesManager"
         >
-        <courseRules />
+          <remberRules />
         </el-tab-pane>
+        <!--  -->
         <el-tab-pane
           label="乐团线下课考勤规则"
           lazy
           name="3"
           v-if="permissionList.discountManage"
         >
-        <offlineTeamRules />
+          <offlineTeamRules />
         </el-tab-pane>
         <el-tab-pane
           label="VIP线下课考勤规则"
@@ -38,7 +39,7 @@
           name="4"
           v-if="permissionList.chargesList"
         >
-        <offlineVipRules />
+          <offlineVipRules />
         </el-tab-pane>
         <el-tab-pane
           label="云教室考勤规则"
@@ -46,7 +47,7 @@
           name="5"
           v-if="permissionList.musicCourseFee"
         >
-        <onlineCloudRules />
+          <onlineCloudRules />
         </el-tab-pane>
         <el-tab-pane
           label="学员考勤规则设置"
@@ -54,7 +55,7 @@
           name="6"
           v-if="permissionList.jobTemplateSetting"
         >
-        <studentAttRules />
+          <studentAttRules />
         </el-tab-pane>
         <el-tab-pane
           label="乐保设置"
@@ -62,7 +63,7 @@
           name="7"
           v-if="permissionList.errorManager"
         >
-        <leBaoRules />
+          <leBaoRules />
         </el-tab-pane>
         <el-tab-pane
           label="登录设置"
@@ -70,7 +71,7 @@
           name="8"
           v-if="permissionList.errorManager"
         >
-        <loginRules />
+          <loginRules />
         </el-tab-pane>
       </tab-router>
     </div>
@@ -78,7 +79,6 @@
 </template>
 <script>
 import teamRules from "./components/teamRules";
-import courseRules from "./components/courseRules";
 import leBaoRules from "./components/leBaoRules";
 import loginRules from "./components/loginRules";
 import offlineTeamRules from "./components/offlineTeamRules";
@@ -90,7 +90,6 @@ import { permission } from "@/utils/directivePage";
 export default {
   components: {
     teamRules,
-    courseRules,
     leBaoRules,
     loginRules,
     offlineTeamRules,