Browse Source

修复bug

1
mo 3 years ago
parent
commit
facf7d711c

+ 2 - 2
src/constant/guide.js

@@ -8,8 +8,8 @@ export const guideList = {
   teamManager: {
   teamManager: {
     name: '乐团主管',
     name: '乐团主管',
     desc: '乐团主管是直接管理乐团的负责人,可在分部中设置各分部的乐团主管',
     desc: '乐团主管是直接管理乐团的负责人,可在分部中设置各分部的乐团主管',
-    path: '/sysBasics/branchSetting',
-    permission: '/branchSetting'
+    path: '/sysBasics/staffManager',
+    permission: '/staffManager'
   },
   },
   teamPayType: {
   teamPayType: {
     name: '乐团类型',
     name: '乐团类型',

+ 1 - 66
src/views/baseRulesManager/components/otherRules.vue

@@ -11,24 +11,7 @@
           type="info"
           type="info"
         >
         >
         </el-alert>
         </el-alert>
-        <el-row>
-          <el-form-item
-            prop="91"
-            :rules="[
-              {
-                required: false,
-                pattern:
-                  /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-                message: '请输入正确的人数',
-              },
-            ]"
-          >
-            基本课酬:
-            <el-input v-model="form['91']"  placeholder="请输入金额">
-              <template slot="append">元</template>
-            </el-input>
-          </el-form-item>
-        </el-row>
+
         <el-row>
         <el-row>
           <el-form-item
           <el-form-item
             prop="73"
             prop="73"
@@ -47,55 +30,7 @@
             </el-input>
             </el-input>
           </el-form-item>
           </el-form-item>
         </el-row>
         </el-row>
-        <el-alert
-          style="margin: 20px 0"
-          title="学员练习参数"
-          :closable="false"
-          type="info"
-        >
-        </el-alert>
-        <el-row>
-          <el-form-item
-            prop="106"
-            :rules="[
-              {
-                required: false,
-                pattern: /^[1-9][0-9]*$/,
-                message: '请输入正确的分钟数',
-              },
-            ]"
-          >
-            学员每周使用团练宝时长小于
-            <el-input
-              v-model="form['106']"
-
-              placeholder="请输入分钟数"
-            >
-              <template slot="append">分钟</template> </el-input
-            >时需要回访。
-          </el-form-item>
-        </el-row>
-        <el-row>
-          <el-form-item
-            prop="107"
-            :rules="[
-              {
-                required: false,
-                pattern: /^[1-9][0-9]*$/,
-                message: '请输入正确的次数',
-              },
-            ]"
-          >
-            学员每周使用团练宝练习次数小于
-            <el-input
-              v-model="form['107']"
 
 
-              placeholder="请输入次数"
-            >
-              <template slot="append">次</template> </el-input
-            >时需要回访。
-          </el-form-item>
-        </el-row>
         <el-alert
         <el-alert
           style="margin: 20px 0"
           style="margin: 20px 0"
           title="特殊参数"
           title="特殊参数"

+ 4 - 4
src/views/categroyManager/specialSetup/typesManager.vue

@@ -14,10 +14,10 @@
                            prop="name"
                            prop="name"
                            label="乐团类型">
                            label="乐团类型">
           </el-table-column>
           </el-table-column>
-          <el-table-column align='center'
+          <!-- <el-table-column align='center'
                            prop="description"
                            prop="description"
                            label="缴费名目">
                            label="缴费名目">
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column align='center'
           <el-table-column align='center'
                            label="操作">
                            label="操作">
             <template slot-scope="scope">
             <template slot-scope="scope">
@@ -53,13 +53,13 @@
                     placeholder="请输入收费类型"
                     placeholder="请输入收费类型"
                     autocomplete="off"></el-input>
                     autocomplete="off"></el-input>
         </el-form-item>
         </el-form-item>
-        <el-form-item label="缴费名目"
+        <!-- <el-form-item label="缴费名目"
                       prop="description"
                       prop="description"
                       :label-width="formLabelWidth">
                       :label-width="formLabelWidth">
           <el-input v-model.trim="form.description"
           <el-input v-model.trim="form.description"
                     placeholder="请输入缴费名目"
                     placeholder="请输入缴费名目"
                     autocomplete="off"></el-input>
                     autocomplete="off"></el-input>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       </el-form>
       <span slot="footer"
       <span slot="footer"
             class="dialog-footer">
             class="dialog-footer">

+ 26 - 9
src/views/courseRulersManager/components/serverMinitor.vue

@@ -4,6 +4,31 @@
       <el-form :inline="true" :model="form" ref="form">
       <el-form :inline="true" :model="form" ref="form">
         <el-alert
         <el-alert
           style="margin: 10px 0"
           style="margin: 10px 0"
+          title="财务规则"
+          :closable="false"
+          type="info"
+        >
+        </el-alert>
+        <el-row>
+          <el-form-item
+            prop="91"
+            :rules="[
+              {
+                required: false,
+                pattern:
+                  /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
+                message: '请输入正确的人数',
+              },
+            ]"
+          >
+            基本课酬:
+            <el-input v-model="form['91']" placeholder="请输入金额">
+              <template slot="append">元</template>
+            </el-input>
+          </el-form-item>
+        </el-row>
+        <el-alert
+          style="margin: 10px 0"
           title="课后服务异常提醒设置"
           title="课后服务异常提醒设置"
           :closable="false"
           :closable="false"
           type="info"
           type="info"
@@ -57,7 +82,6 @@
         <el-row>
         <el-row>
           课程开始时间早于
           课程开始时间早于
           <el-time-picker
           <el-time-picker
-
             v-model="form['195']"
             v-model="form['195']"
             :picker-options="{
             :picker-options="{
               selectableRange: '00:00:00 - 23:59:59',
               selectableRange: '00:00:00 - 23:59:59',
@@ -69,7 +93,6 @@
           </el-time-picker>
           </el-time-picker>
           结束时间晚于
           结束时间晚于
           <el-time-picker
           <el-time-picker
-
             v-model="form['196']"
             v-model="form['196']"
             :picker-options="{
             :picker-options="{
               selectableRange: '00:00:00 - 23:59:59',
               selectableRange: '00:00:00 - 23:59:59',
@@ -101,11 +124,7 @@
             ]"
             ]"
           >
           >
             学员单月请假次数达到
             学员单月请假次数达到
-            <el-input
-              v-model="form['194']"
-              placeholder="请输入次数"
-
-            >
+            <el-input v-model="form['194']" placeholder="请输入次数">
               <template slot="append"> 次 </template> </el-input
               <template slot="append"> 次 </template> </el-input
             >时提醒异常。
             >时提醒异常。
           </el-form-item>
           </el-form-item>
@@ -115,7 +134,6 @@
 
 
     <el-button
     <el-button
       v-if="!isPlatform"
       v-if="!isPlatform"
-
       type="primary"
       type="primary"
       @click="save"
       @click="save"
       class="saveBtn"
       class="saveBtn"
@@ -124,7 +142,6 @@
     >
     >
     <el-button
     <el-button
       v-else
       v-else
-
       type="primary"
       type="primary"
       @click="save"
       @click="save"
       class="saveBtn"
       class="saveBtn"

+ 83 - 13
src/views/courseRulersManager/components/studentAttRules.vue

@@ -4,6 +4,31 @@
       <el-form :inline="true" :model="form" ref="form">
       <el-form :inline="true" :model="form" ref="form">
         <el-alert
         <el-alert
           style="margin: 10px 0"
           style="margin: 10px 0"
+          title="财务规则"
+          :closable="false"
+          type="info"
+        >
+        </el-alert>
+        <el-row>
+          <el-form-item
+            prop="123"
+            :rules="[
+              {
+                required: false,
+                pattern:
+                  /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
+                message: '请输入正确的人数',
+              },
+            ]"
+          >
+            基本课酬:
+            <el-input v-model="form['123']" placeholder="请输入金额">
+              <template slot="append">元</template>
+            </el-input>
+          </el-form-item>
+        </el-row>
+        <el-alert
+          style="margin: 10px 0"
           title="学员请假规则设置"
           title="学员请假规则设置"
           :closable="false"
           :closable="false"
           type="info"
           type="info"
@@ -21,7 +46,7 @@
             ]"
             ]"
           >
           >
             课程开始前
             课程开始前
-            <el-input v-model="form['7']" placeholder="请输入时间" >
+            <el-input v-model="form['7']" placeholder="请输入时间">
               <template slot="append">
               <template slot="append">
                 <!-- class="chiose" <el-select class="append" v-model.trim="form.organId">
                 <!-- class="chiose" <el-select class="append" v-model.trim="form.organId">
                 <el-option label="天" value="yuan"> </el-option>
                 <el-option label="天" value="yuan"> </el-option>
@@ -55,34 +80,79 @@
             ]"
             ]"
           >
           >
             老师可在开课
             老师可在开课
-            <el-input v-model="form['41']" placeholder="请输入时间" >
+            <el-input v-model="form['41']" placeholder="请输入时间">
               <template slot="append">小时</template>
               <template slot="append">小时</template>
             </el-input>
             </el-input>
             前调整VIP、网管课程。
             前调整VIP、网管课程。
           </el-form-item>
           </el-form-item>
         </el-row>
         </el-row>
+
+        <el-alert
+          style="margin: 20px 0"
+          title="学员练习参数"
+          :closable="false"
+          type="info"
+        >
+        </el-alert>
+        <el-row>
+          <el-form-item
+            prop="106"
+            :rules="[
+              {
+                required: false,
+                pattern: /^[1-9][0-9]*$/,
+                message: '请输入正确的分钟数',
+              },
+            ]"
+          >
+            学员每周使用团练宝时长小于
+            <el-input v-model="form['106']" placeholder="请输入分钟数">
+              <template slot="append">分钟</template> </el-input
+            >时需要回访。
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item
+            prop="107"
+            :rules="[
+              {
+                required: false,
+                pattern: /^[1-9][0-9]*$/,
+                message: '请输入正确的次数',
+              },
+            ]"
+          >
+            学员每周使用团练宝练习次数小于
+            <el-input v-model="form['107']" placeholder="请输入次数">
+              <template slot="append">次</template> </el-input
+            >时需要回访。
+          </el-form-item>
+        </el-row>
       </el-form>
       </el-form>
     </div>
     </div>
-    <el-button  type="primary" @click="save" class="saveBtn"
+    <el-button
+      type="primary"
+      @click="save"
+      class="saveBtn"
       v-if="!isPlatform"
       v-if="!isPlatform"
-     v-permission="'sysTenantConfig/batchUpSet_studentAttRules'"
+      v-permission="'sysTenantConfig/batchUpSet_studentAttRules'"
       >保存</el-button
       >保存</el-button
     >
     >
-       <el-button  type="primary" @click="save" class="saveBtn"
+    <el-button
+      type="primary"
+      @click="save"
+      class="saveBtn"
       v-else
       v-else
-     v-permission="'sysConfig/batchUpdate_studentAttRules'"
+      v-permission="'sysConfig/batchUpdate_studentAttRules'"
       >保存</el-button
       >保存</el-button
     >
     >
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
-import {
-  getSysTenantConfig,
-  setSysTenantConfig,
-} from "../api";
+import { getSysTenantConfig, setSysTenantConfig } from "../api";
 import { sysConfigList, sysConfigUpdate } from "@/api/generalSettings"; // 平台的修改和查
 import { sysConfigList, sysConfigUpdate } from "@/api/generalSettings"; // 平台的修改和查
 export default {
 export default {
-    props: ["isPlatform"],
+  props: ["isPlatform"],
   data() {
   data() {
     return {
     return {
       form: {},
       form: {},
@@ -93,7 +163,7 @@ export default {
   async mounted() {
   async mounted() {
     this.getRules();
     this.getRules();
   },
   },
- methods: {
+  methods: {
     getRules() {
     getRules() {
       if (this.isPlatform) {
       if (this.isPlatform) {
         this.getPlatformRules();
         this.getPlatformRules();
@@ -168,7 +238,7 @@ export default {
       });
       });
     },
     },
     save() {
     save() {
-        if (this.isPlatform) {
+      if (this.isPlatform) {
         this.savePlatform();
         this.savePlatform();
       } else {
       } else {
         this.saveInstitution();
         this.saveInstitution();