Merge branch 'iteration_adminOptimiz' of http://git.dayaedu.com/molingzhide/dy-admin-manager into iteration_adminOptimiz

src/router/notKeepAliveList.js

@@ -5,7 +5,6 @@ export default [
   '/business/teamCourseList', // 课表列表
   '/business/auditList', // 审核列表
   '/orderList/financeManager', // 财务管理
-  // '/operateManager/HumanResources'
   '/vipClassSet/vipParameterManager', // VIP参数设置
   '/vipClassSet/branchActive', // VIP分部活动列表
   '/vipClassSet/branchActiveOperation', // VIP分部活动修改

src/views/categroyManager/vipActiveList.vue

@@ -414,7 +414,7 @@ import { getEmployeeOrgan } from "@/api/buildTeam";
 import Tooltip from '@/components/Tooltip'
 export default {
   name: "vipActiveList",
-  components: { pagination },
+  components: { pagination,Tooltip },
   data() {
     return {
       labelPosition: "right",

src/views/resetTeaming/index.vue

@@ -89,8 +89,6 @@ export default {
       //   resetSound: true,
       //   coursePlan: true,
       // }
-      Fsearch: null,
-      Frules: null,
       name: null,
       teamName: '乐团修改',
       musicGroupInfo:null
@@ -119,15 +117,9 @@ export default {
     __init () {
       this.activeIndex = sessionStorage.getItem('resetCode') || '1';
       this.teamid = this.$route.query.id;
-      if (this.$route.query.search) {
-        this.Fsearch = this.$route.query.search;
-      }
-      if (this.$route.query.rules) {
-        this.Frules = this.$route.query.rules
-      }
     },
     onCancel () {
-      this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
+      this.$router.push({ path: '/business/teamDetail' })
     },
     getBaseInfo (baseInfo) {
       this.baseInfo = baseInfo

src/views/teamBuild/components/teamBaseInfo.vue

@@ -308,19 +308,6 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item label="乐团网管课"
-                      :rules="[{ required: true, message: '请选择是否排乐团网管课' }]"
-                      prop="feeType">
-          <el-select v-model="topFrom.feeType"
-                     placeholder="是否排乐团网管课"
-                     :disabled="basdisabled"
-                     @change="changeFeeType">
-            <el-option label="需要排一次线上课"
-                       value="ONLINE"></el-option>
-            <el-option label="只排线下课"
-                       value="OFFLINE"></el-option>
-          </el-select>
-        </el-form-item> -->
         <el-form-item label prop="isClass">
           <el-checkbox v-model.trim="topFrom.isClass" :disabled="basdisabled"
             >课堂课乐团</el-checkbox
@@ -333,180 +320,6 @@
           </p>
         </el-form-item>
       </el-form>
-
-      <!-- <div class="checkList">
-        <div class="head noMargin">乐团课程:</div>
-        <div class="checkRow">
-          <el-checkbox label="乐团声部训练"
-                       :disabled="basdisabled"
-                       v-model.trim="checkList.soundInfo.ischeck"></el-checkbox>
-          <div class="inputWrap">
-            原价:
-            <el-input type="text"
-                      placeholder="请输入"
-                      :disabled="basdisabled"
-                      v-model.trim="checkList.soundInfo.value" />
-          </div>
-        </div>
-        <div class="checkRow">
-          <el-checkbox label="乐团合奏训练"
-                       :disabled="basdisabled"
-                       v-model.trim="checkList.allInfo.ischeck"></el-checkbox>
-          <div class="inputWrap">
-            原价:
-            <el-input type="text"
-                      placeholder="请输入"
-                      :disabled="basdisabled"
-                      v-model.trim="checkList.allInfo.value" />
-          </div>
-        </div>
-        <div class="checkRow">
-          <el-checkbox label="假期集中训练"
-                       :disabled="basdisabled"
-                       v-model.trim="checkList.holidayInfo.ischeck"></el-checkbox>
-          <div class="inputWrap">
-            原价:
-            <el-input type="number"
-                      @mousewheel.native.prevent
-                      :disabled="basdisabled"
-                      placeholder="请输入"
-                      v-model.trim="checkList.holidayInfo.value" />
-          </div>
-        </div>
-        <div class="checkRow"
-             v-if="checkList.networkInfo">
-          <el-checkbox label="乐团云课堂"
-                       :disabled="basdisabled"
-                       v-model="checkList.networkInfo.ischeck"></el-checkbox>
-          <div class="inputWrap">
-            原价:
-            <el-input type="number"
-                      :disabled="basdisabled"
-                      @mousewheel.native.prevent
-                      placeholder="请输入"
-                      v-model.trim="checkList.networkInfo.value" />
-          </div>
-        </div>
-        <div class="checkRow">
-          <el-checkbox label="网络基础训练"
-                       :disabled="basdisabled"
-                       v-model.trim="checkList.baseInfo.ischeck"></el-checkbox>
-          <div class="inputWrap">
-            原价:
-            <el-input type="number"
-                      :disabled="basdisabled"
-                      @mousewheel.native.prevent
-                      placeholder="请输入"
-                      v-model.trim="checkList.baseInfo.value" />
-          </div>
-        </div>
-        <div class="checkRow">
-          <el-checkbox label="课程提示"
-                       :disabled="basdisabled"
-                       class="classCheckBox"
-                       v-model.trim="checkList.submit.ischeck"></el-checkbox>
-          <div class="textWrap"
-               v-if="checkList.submit.ischeck">
-            <el-input type="textarea"
-                      :disabled="basdisabled"
-                      :rows="1"
-                      style="width: 500px"
-                      v-model.trim="checkList.submit.value"></el-input>
-          </div>
-        </div>
-        <div class="head noMargin">新生专享:</div>
-
-        <div class="checkRow"
-             v-if="newStudentList.baseInfo">
-          <el-checkbox label="网络基础训练"
-                       :disabled="basdisabled"
-                       v-model="newStudentList.baseInfo.ischeck"></el-checkbox>
-          <div class="inputWrap">
-            原价:
-            <el-input type="number"
-                      @mousewheel.native.prevent
-                      :disabled="basdisabled"
-                      placeholder="请输入"
-                      v-model.trim="newStudentList.baseInfo.nowValue" />
-          </div>
-          <div class="inputWrap">
-            现价:
-            <el-input type="number"
-                      :disabled="basdisabled"
-                      @mousewheel.native.prevent
-                      placeholder="请输入"
-                      v-model.trim="newStudentList.baseInfo.value" />
-          </div>
-        </div>
-        <div class="head noMargin">付费方式：</div>
-        <div class="checkRow">
-          <el-checkbox label="学校"
-                       :disabled="basdisabled"
-                       class="classCheckBox"
-                       v-model.trim="payList.school.ischeck"></el-checkbox>
-
-          <div class="chioseList">
-            <el-radio-group v-model="payList.school.chiose"
-                            size="small">
-              <el-radio-button label="ONE_OFF">一次性</el-radio-button>
-              <el-radio-button label="MONTHLY">一个月</el-radio-button>
-              <el-radio-button label="TERM">一学期</el-radio-button>
-              <el-radio-button label="YEAR">一学年</el-radio-button>
-            </el-radio-group>
-          </div>
-          <div class="inputWrap">
-            <div>
-              预计收费:
-              <el-input v-model.trim="payList.school.price"
-                        :disabled="basdisabled"
-                        placeholder="请输入" />
-            </div>
-
-          </div>
-          <div class="inputWrap">
-            <div>
-              备注:
-              <el-input v-model.trim="payList.school.value"
-                        :disabled="basdisabled"
-                        placeholder="请输入" />
-            </div>
-
-          </div>
-        </div>
-        <div class="checkRow">
-          <el-checkbox label="公司"
-                       class="classCheckBox"
-                       :disabled="basdisabled"
-                       v-model.trim="payList.company.ischeck"></el-checkbox>
-          <div class="chioseList">
-            <el-radio-group v-model="payList.company.chiose"
-                            size="small">
-              <el-radio-button label="ONE_OFF">一次性</el-radio-button>
-              <el-radio-button label="MONTHLY">一个月</el-radio-button>
-              <el-radio-button label="TERM">一学期</el-radio-button>
-              <el-radio-button label="YEAR">一学年</el-radio-button>
-            </el-radio-group>
-          </div>
-          <div class="inputWrap">
-            <div>
-              预计收费:
-              <el-input placeholder="请输入"
-                        :disabled="basdisabled"
-                        v-model.trim="payList.company.price" />
-            </div>
-
-          </div>
-          <div class="inputWrap">
-            <div>
-              备注:
-              <el-input placeholder="请输入"
-                        :disabled="basdisabled"
-                        v-model.trim="payList.company.value" />
-            </div>
-
-          </div>
-        </div>
-      </div> -->
       <div class="btnWrap">
         <div
           class="nextBtn"
@@ -768,7 +581,6 @@ export default {
       //          3.teamList  跨团修改
       //          4.teamDraft 乐团草稿
       this.teamStatus = this.$route.query.type;
-      console.log(this.teamStatus);
       // 传过来的乐团信息
       this.activeTeam = this.getTeamList;
       if (
@@ -791,7 +603,6 @@ export default {
         this.teamid = this.$route.query.id;
         getTeamBaseInfo({ musicGroupId: this.teamid }).then((res) => {
           if (res.code == 200) {
-            console.log({...res.data.musicGroup})
             // if (this.$listeners.getBaseInfo) {
             //   this.$listeners.getBaseInfo(res.data);
             // }

src/views/teamBuild/index.vue

@@ -81,8 +81,6 @@ export default {
       pageName: "建团申请",
       getTeamList: [],
       teamStatus: "",
-      Fsearch: null,
-      Frules: null,
     };
   },
   created () {
@@ -99,13 +97,6 @@ export default {
       if (this.$route.query.teamList) {
         this.getTeamList = this.$route.query.teamList;
       }
-      // 判断是否带缓存参数
-      if (this.$route.query.search) {
-        this.Fsearch = this.$route.query.search;
-      }
-      if (this.$route.query.rules) {
-        this.Frules = this.$route.query.rules;
-      }
 
       if (this.teamStatus == "newTeam") {
         // 新建团
@@ -125,7 +116,6 @@ export default {
     goBack () {
       this.$router.push({
         path: "/business/teamDetail",
-        query: { search: this.Fsearch, rules: this.Frules },
       });
     },
     getBaseInfo (baseInfo) {
@@ -201,4 +191,4 @@ export default {
   border-top: 1px solid #dcdfe6;
   padding-top: 30px;
 }
-</style>
+</style>

src/views/teamBuild/signupList.vue

@@ -653,8 +653,6 @@ export default {
         ],
         reason: [{ required: true, message: "请填写退团退费原因" }]
       },
-      Fsearch: null,
-      Frules: null,
       applyExpireDate: '',
       paymentExpireDate: '',
       activeRow: null,
@@ -701,12 +699,6 @@ export default {
       this.id = this.$route.query.id;
       this.teamName = this.$route.query.name
       // 判断是否带缓存参数
-      if (this.$route.query.search) {
-        this.Fsearch = this.$route.query.search;
-      }
-      if (this.$route.query.rules) {
-        this.Frules = this.$route.query.rules
-      }
       this.pickerOptions = this.beginDate(new Date());
       getTeamBaseInfo({ musicGroupId: this.id }).then(res => {
         if (res.code == 200) {
@@ -739,7 +731,7 @@ export default {
       this.getList()
     },
     onCancel () {
-      this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
+      this.$router.push({ path: '/business/teamDetail'})
     },
     payStart () {
       this.paymentStatus = true;
@@ -978,7 +970,6 @@ export default {
             this.$message.success('停止成功')
             this.$router.push({
               path: '/business/teamDetail',
-              query: { search: this.Fsearch, rules: this.Frules }
             })
           }
         })

src/views/teamDetail/index.vue

@@ -84,8 +84,6 @@ export default {
         PAUSE: require('@/assets/images/base/end.png')
       },
       status: '',
-      Fsearch: null,
-      Frules: null
     }
   },
   mounted () {
@@ -108,19 +106,13 @@ export default {
       this.teamid = this.$route.query.id;
       this.name = this.$route.query.name;
       // 判断是否带缓存参数
-      if (this.$route.query.search) {
-        this.Fsearch = this.$route.query.search;
-      }
-      if (this.$route.query.rules) {
-        this.Frules = this.$route.query.rules
-      }
     },
     handleClick (val) {
       this.activeIndex = val.name;
 
     },
     onCancel () {
-      this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
+      this.$router.push({ path: '/business/teamDetail'})
     },
     // getname (name) {
     //   this.name = name;

src/views/teamDetail/indexCourse.vue

@@ -63,25 +63,19 @@ export default {
       this.teamid = teamInfo.id;
       this.name = teamInfo.name;
       // 判断是否带缓存参数
-      if (this.$route.query.search) {
-        this.Fsearch = this.$route.query.search;
-      }
-      if (this.$route.query.rules) {
-        this.Frules = this.$route.query.rules
-      }
     },
     handleClick (val) {
       this.activeIndex = val.name;
     },
     onCancel () {
-      this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
+      this.$router.push({ path: '/business/teamDetail' })
     },
     getname (name) {
       this.name = name;
       localStorage.setItem('teamName', name);
     },
     resetTeam () {
-      // id  type 
+      // id  type
       this.$router.push({ path: '/business/teamBuild', query: { type: 'resetTeam', id: this.teamid } })
     }
   },
@@ -140,4 +134,4 @@ export default {
 }
 </style>
 <style lang='scss'>
-</style>
+</style>

src/views/teamDetail/teamInfo.vue

@@ -52,8 +52,6 @@ export default {
         PAUSE: require('@/assets/images/base/end.png')
       },
       status: '',
-      Fsearch: null,
-      Frules: null
     }
   },
   created () {
@@ -75,25 +73,19 @@ export default {
       this.teamid = teamInfo.id;
       this.name = teamInfo.name;
       // 判断是否带缓存参数
-      if (this.$route.query.search) {
-        this.Fsearch = this.$route.query.search;
-      }
-      if (this.$route.query.rules) {
-        this.Frules = this.$route.query.rules
-      }
     },
     handleClick (val) {
       this.activeIndex = val.name;
     },
     onCancel () {
-      this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
+      this.$router.push({ path: '/business/teamDetail'})
     },
     getname (name) {
       this.name = name;
       localStorage.setItem('teamName', name);
     },
     resetTeam () {
-      // id  type 
+      // id  type
       this.$router.push({ path: '/business/teamBuild', query: { type: 'resetTeam', id: this.teamid } })
     }
   },
@@ -153,4 +145,4 @@ export default {
 }
 </style>
 <style lang='scss'>
-</style>
+</style>

src/views/teamDetail/teamList.vue

@@ -323,13 +323,6 @@ export default {
   },
   methods: {
     init () {
-      if (this.$route.query.search) {
-        this.$route.query.search instanceof Object ? this.topForm = this.$route.query.search : this.topForm = JSON.parse(this.$route.query.search);
-      }
-      if (this.$route.query.rules) {
-        this.$route.query.rules instanceof Object ? this.rules = this.$route.query.rules : this.rules = JSON.parse(this.$route.query.rules);
-      }
-
       sessionStorage.setItem('resetCode', '1')
 
       getEmployeeOrgan().then(res => {
@@ -358,6 +351,7 @@ export default {
     },
     search () {
       this.rules.page = 1;
+      console.log(this.rules)
       this.getList();
     },
     getList () {