1128 17:55

1111

src/views/buildVip/index.vue

@@ -955,7 +955,6 @@ export default {
 
     },
     setSection (val) {
-      console.log(val);
       this.leftForm.section = '';
       this.rightForm.offlineCourse = '';
       this.rightForm.onlineCourse = '';

src/views/resetTeaming/index.vue

@@ -10,19 +10,23 @@
       <el-tabs v-model="activeIndex"
                type="card"
                @tab-click="handleClick">
-        <el-tab-pane label="基本信息" v-if="permission('/resetTeaming/teamBaseInfo')"
+        <el-tab-pane label="基本信息"
+                     v-if="permission('/resetTeaming/teamBaseInfo')"
                      name="1">
           <teamBaseInfo v-if="activeIndex == 1" />
         </el-tab-pane>
-        <el-tab-pane label="缴费调整" v-if="permission('/resetTeaming/resetSound')"
+        <el-tab-pane label="缴费调整"
+                     v-if="permission('/resetTeaming/resetSound')"
                      name="2">
           <resetSound v-if="activeIndex == 2" />
         </el-tab-pane>
-        <el-tab-pane label="班级调整" v-if="permission('/resetTeaming/resetClass')"
+        <el-tab-pane label="班级调整"
+                     v-if="permission('/resetTeaming/resetClass')"
                      name="3">
           <resetClass v-if="activeIndex == 3" />
         </el-tab-pane>
-        <el-tab-pane label="新增排课" v-if="permission('/resetTeaming/coursePlan')"
+        <el-tab-pane label="新增排课"
+                     v-if="permission('/resetTeaming/coursePlan')"
                      name="4">
           <coursePlan :teamid='teamid'
                       v-if="activeIndex == 4" />
@@ -57,11 +61,19 @@ export default {
       //   resetSound: true,
       //   coursePlan: true,
       // }
+      Fsearch: null,
+      Frules: null
     }
   },
   created () {
     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
+    }
   },
   beforeDestroy () {
     sessionStorage.setItem('setStep', 0)
@@ -74,12 +86,12 @@ export default {
 
   }, methods: {
     onCancel () {
-      this.$router.push('/business/teamDetail')
+      this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
     },
     handleClick (val) {
       this.activeIndex = val.name
     },
-    permission(str) {
+    permission (str) {
       return permission(str)
     }
   },

src/views/teamBuild/signupList.vue

@@ -9,15 +9,19 @@
           <!-- {{ teamName }}报名详情 -->
         </h2>
         <div class="btnList">
-          <div class='newBand close' v-permission="'musicGroup/cancelMusicGroup'"
+          <div class='newBand close'
+               v-permission="'musicGroup/cancelMusicGroup'"
                @click="onClose">停止乐团</div>
           <div class='newBand'
-               @click="payStart" v-permission="'musicGroup/openPay'"
+               @click="payStart"
+               v-permission="'musicGroup/openPay'"
                v-if="status=='APPLY'">开始缴费</div>
-          <div class='newBand' v-permission="'musicGroup/found'"
+          <div class='newBand'
+               v-permission="'musicGroup/found'"
                @click="onGoHome"
                v-if="status=='PAY'">确认开团</div>
-          <div class='newBand' v-permission="'musicGroup/extensionPayment'"
+          <div class='newBand'
+               v-permission="'musicGroup/extensionPayment'"
                @click="extendPaymentStatus = true"
                v-if="status=='PAY'">延长缴费</div>
           <div class='newBand'
@@ -99,9 +103,11 @@
         </el-table>
         <div class="btnWrap"
              style="margin-right:20px;  margin-top:20px;">
-          <el-button v-if="!isEdit" v-permission="'musicGroup/updateExpectedStudentNum'"
+          <el-button v-if="!isEdit"
+                     v-permission="'musicGroup/updateExpectedStudentNum'"
                      @click="isEdit = true">编辑</el-button>
-          <el-button v-if="isEdit" v-permission="'musicGroup/updateExpectedStudentNum'"
+          <el-button v-if="isEdit"
+                     v-permission="'musicGroup/updateExpectedStudentNum'"
                      @click="saveIsEdit">保存</el-button>
         </div>
       </div>
@@ -173,7 +179,8 @@
                            align='center'>
             <template slot-scope="scope">
               <div>
-                <el-button type='text' v-permission="'studentRegistration/batchUpdateSubject'"
+                <el-button type='text'
+                           v-permission="'studentRegistration/batchUpdateSubject'"
                            v-if="scope.row.paymentStatus != 2"
                            @click='resetSubject(scope.row)'>修改专业</el-button>
                 <!-- APPLY -->
@@ -187,7 +194,8 @@
                              slot="reference">备注</el-button>
                 </el-popover>
                 <!-- PAY -->
-                <el-button type='text' v-permission="'studentRegistration/queryFeeDetail'"
+                <el-button type='text'
+                           v-permission="'studentRegistration/queryFeeDetail'"
                            v-if='status == "PAY"&&scope.row.paymentStatus==1'
                            @click='lookdetail(scope.row)'>查看</el-button>
               </div>
@@ -198,7 +206,8 @@
              v-if="status=='APPLY'">
           <el-button @click="onSelectAll">全选/取消</el-button>
           <el-button style="background-color: #14928a;border: 1px solid #14928a;"
-                     @click="onPartPayment" v-permission="'studentRegistration/openPayment'"
+                     @click="onPartPayment"
+                     v-permission="'studentRegistration/openPayment'"
                      type="primary">提前缴费</el-button>
           <!-- <div class='newBand' v-if="status=='APPLY'">允许缴费</div> -->
         </div>
@@ -432,7 +441,9 @@ export default {
       },
       extendRule: {
         expireDate: [{ required: true, message: '请选择延长时间', trigger: 'change' }]
-      }
+      },
+      Fsearch: null,
+      Frules: null
     }
   },
   created () {
@@ -441,6 +452,13 @@ export default {
     // 通过乐团id 获取乐团招生状态
     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
+    }
 
   },
   mounted () {
@@ -466,7 +484,7 @@ export default {
       this.getList();
     },
     onCancel () {
-      this.$router.push('/business/teamDetail')
+      this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
     },
     payStart () {
       this.paymentStatus = true;

src/views/teamBuild/teamSeting/components/coursePlan.vue

@@ -426,7 +426,7 @@ export default {
       let classCount = parseInt(this.leftFrom.num);
       let date = this.leftFrom.time;
       // 1 排课时间 2.排课次数 3.排课周期集合 4.排课合奏班的信息 
-      this.workOut(date, classCount, this.week, this.leftFrom.all)
+      this.workOut(date, classCount, this.week, this.leftFrom.all);
       this.$refs['leftFrom'].resetFields();
       this.week = this.$options.data().week;
       this.checkList = [];
@@ -488,7 +488,7 @@ export default {
     },
     // 修改
     resetMixCourse (row) {
-      // console.log(row);
+      console.log(this.classCardList)
       this.resetAllClassVisible = true;
       this.resetAllTitle = `将${row.classDate} ,${row.week}修改`;
       this.buttonType = row.type;
@@ -514,6 +514,7 @@ export default {
     },
     skipClass (row) {
       // 这里是跳过此天
+      this.chioseType = row.type;
       let loadingInstance = Loading.service({
         lock: true,
         text: '加载中……',
@@ -570,6 +571,7 @@ export default {
     },
     resetMix (row) {
       // 当前行的课程类型
+      console.log(this.classCardList)
       this.activeTime = row.classDate; // 选中那一行的日期
       this.startClassTimeStr = row.startClassTimeStr
       this.endClassTimeStr = row.endClassTimeStr;
@@ -611,11 +613,11 @@ export default {
         let activeTableItem = {};
         // 修改提交表里的状态
         for (let j = 0; j < this.classCardList.length; j++) {
-          for (let i in this.tableList) {
+          for (let i = 0; i < this.tableList.length; i++) {
             if (row.classDate == this.classCardList[j].classDate && this.startClassTimeStr == this.classCardList[j].startClassTimeStr && this.endClassTimeStr == this.classCardList[j].endClassTimeStr) {
-
               this.classCardList.splice(j, 1);
-              j--
+              j--;
+              i--;
             }
             if (row.classDate == this.tableList[i].classDate && this.startClassTimeStr == this.tableList[i].startClassTimeStr && this.endClassTimeStr == this.tableList[i].endClassTimeStr) {
               activeTableItem = this.tableList[i];
@@ -640,9 +642,6 @@ export default {
           this.classCardList.push(obj);
         }
       }
-
-
-      console.log(this.classCardList)
       this.resetAllClassVisible = false;
     },
     // 排课逻辑
@@ -685,11 +684,18 @@ export default {
           let nowStartTime = this.week[i].startTime || startTime;
           let nowEndTime = this.week[i].endTime || endTime;
           //       date: this.getNowFormatDate(date),
-
+          let courseType;
+          if (type == 1) {
+            // 正常排课
+            courseType = 'SINGLE'
+          } else {
+            // 跳过次天加课
+            courseType = this.chioseType;
+          }
           this.tableList.push({
             'classDate': dataStr,
             'week': this.weekDay[weekArr[i].weekNum],
-            'type': 'SINGLE',
+            'type': courseType,
             'id': id,
             'mixid': id,
             'name': className,
@@ -701,13 +707,14 @@ export default {
           })
           // 这里我排单技课
           //               date: this.getNowFormatDate(date),
+
           for (let j in this.activeSingleList) {
             this.classCardList.push({
               'classDate': dataStr,
               'classGroupId': this.activeSingleList[j].id,
               'startClassTimeStr': nowStartTime,
               'endClassTimeStr': nowEndTime,
-              'type': 'SINGLE',
+              'type': courseType,
               'mixid': this.activeSingleList[j].mixid,
               'weekNum': weekArr[i].weekNum,
               'name': this.activeSingleList[j].name,

src/views/teamBuild/teamSeting/components/improvementClass.vue

@@ -225,9 +225,13 @@ export default {
       topFormRules: {
         count: [{ required: true, message: '请输入排课数量', trigger: 'blur' }],
         timer: [{ required: true, message: '请选择开课时间', trigger: 'blur' }]
-      }
+      },
+      organId: ''
     }
   },
+  created () {
+    this.organId = sessionStorage.getItem('createTeamOrgnId') || null
+  },
   mounted () {
     // 获取乐团声部
     findSound({ musicGroupId: this.teamid }).then(res => {
@@ -241,7 +245,7 @@ export default {
     //     // console.log(res.data);
     //   }
     // })
-    getTeacher().then(res => {
+    getTeacher({ organId: this.organId }).then(res => {
       if (res.code == 200) {
         this.teacherList = res.data
       }
@@ -265,7 +269,7 @@ export default {
     })
   },
   methods: {
-    permission(str) {
+    permission (str) {
       return permission(str)
     },
     addraiseClass () {
@@ -346,11 +350,11 @@ export default {
           addHighClass(this.tableList).then(res => {
             if (res.code == 200) {
               this.$message.success('恭喜您创建成功')
-             
-              if(this.permission('/teamSetting/salarySet')) {
+
+              if (this.permission('/teamSetting/salarySet')) {
                 this.$router.push({ path: '/business/teamDetail' })
               } else {
-                 this.$emit('gotoNav', 4)
+                this.$emit('gotoNav', 4)
               }
             }
           })

src/views/teamBuild/teamSeting/components/setClass.vue

@@ -268,7 +268,8 @@ export default {
       teacherForm: {
         name: ''
       },
-      hightNum: ''
+      hightNum: '',
+      organId: ''
 
     }
   },
@@ -284,6 +285,9 @@ export default {
       }
     }
   },
+  created () {
+    this.organId = sessionStorage.getItem('createTeamOrgnId') || null
+  },
   mounted () {
     sessionStorage.setItem('setStep', 0)
     getTeamRecruit({ musicGroupId: this.teamid }).then(res => {
@@ -295,7 +299,7 @@ export default {
     this.getSingleClass();
     this.getAllClass();
     // 获取所有老师的列表
-    queryEmployByOrganId({ organId: null, rows: 1000 }).then(res => {
+    queryEmployByOrganId({ organId: this.organId, rows: 1000 }).then(res => {
       if (res.code == 200) {
         this.teacherList = res.data.rows;
         // console.log(this.teacherList)
@@ -303,7 +307,7 @@ export default {
     })
     getTeamBaseInfo({ musicGroupId: this.teamid }).then(res => {
       if (res.code == 200) {
-        res.data.musicGroup.directorUserId ? this.teacherForm.name = '' : this.teacherForm.name = res.data.musicGroup.directorUserId
+        res.data.musicGroup.directorUserId ? this.teacherForm.name = res.data.musicGroup.directorUserId : this.teacherForm.name = ''
       }
     })
 

src/views/teamBuild/teamSeting/components/setImprovement.vue

@@ -5,7 +5,8 @@
                       content="基础技能班报名详情"></el-page-header>
       <!-- <div class='squrt'></div>  -->
       <!-- <span @click="onCreateQRCode" style="font-size: 16px; padding-left: 20px; font-weight: 400;cursor: pointer; ">查看报名连接</span> -->
-      <span @click="onApply" v-permission="'musicGroup/pushMessage'"
+      <span @click="onApply"
+            v-permission="'musicGroup/pushMessage'"
             style="font-size: 16px; padding-left: 20px; font-weight: 400;cursor: pointer;">开启报名</span>
     </h2>
     <div class='m-core'>
@@ -27,9 +28,11 @@
           <el-table-column label="操作">
             <template slot-scope="scope">
               <div>
-                <el-button type="text" v-permission="'classGroupStudent/findAllStudent'"
+                <el-button type="text"
+                           v-permission="'classGroupStudent/findAllStudent'"
                            @click='lookDeatil(scope.row)'>查看</el-button>
-                <el-button type="text" v-permission="'classGroupStudent/addStudents'"
+                <el-button type="text"
+                           v-permission="'classGroupStudent/addStudents'"
                            @click="addstudentBtn(scope.row)">添加学员</el-button>
               </div>
             </template>
@@ -67,7 +70,8 @@
       </el-table>
       <div slot="footer"
            class="dialog-footer">
-        <el-button type="primary" v-permission="'classGroupStudent/addStudents'"
+        <el-button type="primary"
+                   v-permission="'classGroupStudent/addStudents'"
                    @click="addStudnt">确 定</el-button>
       </div>
     </el-dialog>
@@ -95,10 +99,11 @@
                              size="mini"
                              @click="removeStudent(scope)">确定</el-button>
                 </div>
-                <el-button type="text" 
+                <el-button type="text"
                            slot="reference">删除</el-button>
               </el-popover>
-              <el-button type="text" v-permission="'classGroupStudent/adjustClassGroup'"
+              <el-button type="text"
+                         v-permission="'classGroupStudent/adjustClassGroup'"
                          @click="resetClass(scope.row)">调整班级</el-button>
             </div>
           </template>
@@ -149,12 +154,19 @@ export default {
       qrcodes: true,
       qrcode: null,
       codeUrl: null,
+      Fsearch: null,
+      Frules: null
     }
   },
   mounted () {
     this.teamid = this.$route.query.id;
     // console.log(this.teamid)
-
+    if (this.$route.query.search) {
+      this.Fsearch = this.$route.query.search;
+    }
+    if (this.$route.query.rules) {
+      this.Frules = this.$route.query.rules
+    }
     this.getList();
     teamSoundStudent({ musicGroupId: this.teamid }).then(res => {
       if (res.code == 200) {
@@ -259,7 +271,7 @@ export default {
 
     },
     onCancel () {
-      this.$router.push('/business/teamDetail')
+      this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
     },
     resetClass (row) {
       this.activeStudent = row.userId;

src/views/teamBuild/teamSeting/components/setTeacher.vue

@@ -136,10 +136,11 @@ export default {
   },
   mounted () {
     sessionStorage.setItem('setStep', 1)
+    this.organId = sessionStorage.getItem('createTeamOrgnId') || null
     // 该乐团里所有的单技班与合奏班
     this.getEveryClass();
     // 获取所有的老师列表
-    getTeacher().then(res => {
+    getTeacher({ organId: this.organId }).then(res => {
       if (res.code == 200) {
         this.teacherList = res.data;
       }

src/views/teamBuild/teamSeting/index.vue

@@ -52,7 +52,8 @@
                class="
                arrow">
         </span>
-        <span class='stepspan  stepspan2' v-permission="'/teamSetting/salarySet'"
+        <span class='stepspan  stepspan2'
+              v-permission="'/teamSetting/salarySet'"
               @click="activeIndex=4">
           <div class="step2 sptep"
                :class="activeIndex >= 4?'activestep':''">
@@ -90,7 +91,8 @@
                      :isSetSalary='isSetSalary'
                      @gotoNav='gotoNav' />
       </div>
-      <div v-if='activeIndex==4' v-permission="'/teamSetting/salarySet'">
+      <div v-if='activeIndex==4'
+           v-permission="'/teamSetting/salarySet'">
         <salarySet :teamid='id'
                    :isSetSalary='isSetSalary' />
       </div>
@@ -124,11 +126,20 @@ export default {
       id: '',
       chargeTypeId: '',
       name: '',
-      isSetSalary: false
+      isSetSalary: false,
+      Fsearch: null,
+      Frules: null
     }
   },
   created () {
     this.id = 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
+    }
 
     this.activeIndex = sessionStorage.getItem('setStep') || 0;
     getTeamBaseInfo({ musicGroupId: this.id }).then(res => {
@@ -136,6 +147,7 @@ export default {
         this.chargeTypeId = res.data.musicGroup.chargeTypeId;
         this.name = res.data.musicGroup.name;
         sessionStorage.setItem('chargeTypeId', this.chargeTypeId);
+        sessionStorage.setItem('createTeamOrgnId', res.data.musicGroup.organId)
       }
     })
     // 获取是否设置课酬
@@ -158,7 +170,7 @@ export default {
       this.activeIndex = val;
     },
     goBack () {
-      this.$router.push('/business/teamDetail')
+      this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
     }
   },
 }

src/views/teamDetail/components/salaryList.vue

@@ -27,8 +27,10 @@
       <el-table :data='tableList'
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}">
         <el-table-column align='center'
-                         prop="classDate"
                          label="时间">
+          <template slot-scope="scope">
+            {{ scope.row.classDate }} {{ scope.row.startClassTime ? scope.row.startClassTime.substr(0, 5) : '' }}-{{ scope.row.endClassTime ? scope.row.endClassTime.substr(0, 5) : '' }}
+          </template>
         </el-table-column>
         <el-table-column align='center'
                          prop="classGroupName"

src/views/teamDetail/index.vue

@@ -2,7 +2,8 @@
   <div class='m-container'>
     <h2>
       <!-- <div class='squrt'></div> -->
-      <el-page-header @back="onCancel" :content="name"></el-page-header>
+      <el-page-header @back="onCancel"
+                      :content="name"></el-page-header>
       <!-- <div class="term">第一学期</div>
       <div class="term active">第二学期</div> -->
     </h2>
@@ -76,7 +77,9 @@ export default {
         PROGRESS: require('@/assets/images/base/ing.png'),
         PAUSE: require('@/assets/images/base/end.png')
       },
-      status: ''
+      status: '',
+      Fsearch: null,
+      Frules: null
     }
   },
   created () {
@@ -85,7 +88,14 @@ export default {
     let teamInfo = this.$route.query;
     this.status = this.$route.query.status;
     this.teamid = teamInfo.id;
-    this.name = teamInfo.name
+    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
+    }
   },
   mounted () {
 
@@ -94,8 +104,8 @@ export default {
     handleClick (val) {
       this.activeIndex = val.name;
     },
-    onCancel() {
-      this.$router.push('/business/teamDetail')
+    onCancel () {
+      this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
     },
     getname (name) {
       // console.log(name);

src/views/teamDetail/teamDetailedList.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="m-container">
-    <h2><el-page-header @back="onCancel" content="发放清单"></el-page-header></h2>
+    <h2>
+      <el-page-header @back="onCancel"
+                      content="发放清单"></el-page-header>
+    </h2>
     <!-- <div class="headWrap">
       <div class="left">
         <div class="headItem">
@@ -52,7 +55,8 @@
         </el-table>
       </div>
     </div>
-    <div class="btnWrap" v-permission="'order/verifyMusicalList'"
+    <div class="btnWrap"
+         v-permission="'order/verifyMusicalList'"
          style="margin-top:20px;">
       <div class="okBtn"
            @click="okDetailList">确认</div>
@@ -67,9 +71,17 @@ export default {
     return {
       teamid: '',
       tableList: [],
+      Fsearch: null,
+      Frules: null
     }
   },
   mounted () {
+    if (this.$route.query.search) {
+      this.Fsearch = this.$route.query.search;
+    }
+    if (this.$route.query.rules) {
+      this.Frules = this.$route.query.rules
+    }
     this.teamid = this.$route.query.id;
     getTeamDetailList({ musicGroupId: this.teamid }).then(res => {
       if (res.code == 200) {
@@ -78,8 +90,8 @@ export default {
     })
   },
   methods: {
-    onCancel() {
-      this.$router.push('/business/teamDetail')
+    onCancel () {
+      this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
     },
     okDetailList () {
       verifyMusicalList({ musicGroupId: this.teamid }).then(res => {

src/views/teamDetail/teamList.vue

@@ -230,6 +230,7 @@ import pagination from '@/components/Pagination/index'
 import { getTeamList, getPayType } from '@/api/teamServer'
 import { getCooperation, cancelMusicGroup, startTeam, getEmployeeOrgan, pauseMusicGroup, resumeMusicGroup } from '@/api/buildTeam'
 import { musicGroupStatus } from '@/utils/searchArray'
+import { isObject } from 'util'
 export default {
   name: "Main",
   data () {
@@ -260,6 +261,12 @@ export default {
     pagination
   },
   mounted () {
+    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')
     this.getList();
     getEmployeeOrgan().then(res => {
@@ -299,7 +306,9 @@ export default {
       })
     },
     createNewTeam () {
-      this.$router.push({ path: '/business/teamBuild', query: { type: 'newTeam', search: this.topForm, rules: this.rules } })
+      let search = JSON.stringify(this.topForm)
+      let rules = JSON.stringify(this.rules)
+      this.$router.push({ path: '/business/teamBuild', query: { type: 'newTeam', search, rules } })
     },
     resetTeam () {
       // 这里还有勾选的乐团信息
@@ -307,11 +316,15 @@ export default {
         this.$message.error('请至少选择一个乐团进行调整')
         return
       }
-      this.$router.push({ path: '/business/teamBuild', query: { type: 'teamList', teamList: this.passed, search: this.topForm, rules: this.rules } })
+      let search = JSON.stringify(this.topForm)
+      let rules = JSON.stringify(this.rules)
+      this.$router.push({ path: '/business/teamBuild', query: { type: 'teamList', teamList: this.passed, search, rules } })
     },
     resetTeaming (row) {
       // 修改进行中的乐团
-      this.$router.push({ path: '/business/resetTeaming', query: { type: 'resetTeam', id: row.id, search: this.topForm, rules: this.rules } })
+      let search = JSON.stringify(this.topForm)
+      let rules = JSON.stringify(this.rules)
+      this.$router.push({ path: '/business/resetTeaming', query: { type: 'resetTeam', id: row.id, search, rules } })
     },
     setSearchList (obj) {
       // 
@@ -398,41 +411,43 @@ export default {
       this.searchLsit = [];
     },
     lookTeamDetail (row) {
+      let search = JSON.stringify(this.topForm)
+      let rules = JSON.stringify(this.rules)
       switch (row.status) {
         case 'DRAFT': {
           // 编辑中
-          this.$router.push({ path: '/business/teamBuild', query: { type: 'teamDraft', id: row.id, search: this.topForm, rules: this.rules } })
+          this.$router.push({ path: '/business/teamBuild', query: { type: 'teamDraft', id: row.id, search, rules } })
           break;
         }
         case 'AUDIT': {
           // 审核中
-          this.$router.push({ path: '/business/teamBuild', query: { type: 'teamAudit', id: row.id, search: this.topForm, rules: this.rules } })
+          this.$router.push({ path: '/business/teamBuild', query: { type: 'teamAudit', id: row.id, search, rules } })
           break;
         }
         case 'AUDIT_FAILED': {
           // 审核失败
-          this.$router.push({ path: '/business/teamBuild', query: { type: 'teamDraft', id: row.id, search: this.topForm, rules: this.rules } })
+          this.$router.push({ path: '/business/teamBuild', query: { type: 'teamDraft', id: row.id, search, rules } })
           break;
         }
         case 'APPLY': {
           // 报名中
-          this.$router.push({ path: `/business/signupList`, query: { status: row.status, id: row.id, name: row.name, search: this.topForm, rules: this.rules } })
+          this.$router.push({ path: `/business/signupList`, query: { status: row.status, id: row.id, name: row.name, search, rules } })
           break;
         }
         case 'PAY': {
           // 缴费中
-          this.$router.push({ path: `/business/signupList`, query: { status: row.status, id: row.id, name: row.name, search: this.topForm, rules: this.rules } })
+          this.$router.push({ path: `/business/signupList`, query: { status: row.status, id: row.id, name: row.name, search, rules } })
           break;
         }
         case 'PREPARE': {
           // 筹备中 跳转到乐团设置界面
-          this.$router.push({ path: `/business/teamSeting`, query: { status: row.status, id: row.id, name: row.name, search: this.topForm, rules: this.rules } })
+          this.$router.push({ path: `/business/teamSeting`, query: { status: row.status, id: row.id, name: row.name, search, rules } })
           break;
         }
         case 'PROGRESS': {
           // 进行中
           // 调到乐团详情 teamDetails
-          this.$router.push({ path: `/business/teamDetails`, query: { status: row.status, id: row.id, name: row.name, search: this.topForm, rules: this.rules } })
+          this.$router.push({ path: `/business/teamDetails`, query: { status: row.status, id: row.id, name: row.name, search, rules } })
           break
         }
         case 'CANCELED': {
@@ -441,7 +456,7 @@ export default {
         }
         case 'PAUSE': {
           // 暂停
-          this.$router.push({ path: `/business/teamDetails`, query: { status: row.status, id: row.id, name: row.name, search: this.topForm, rules: this.rules } })
+          this.$router.push({ path: `/business/teamDetails`, query: { status: row.status, id: row.id, name: row.name, search, rules } })
           break;
         }
       }
@@ -459,12 +474,15 @@ export default {
       }
     },
     gotodetailList (row) {
-      // row.id
-      this.$router.push({ path: '/business/teamDetailedList', query: { id: row.id, search: this.topForm, rules: this.rules } })
+      let search = JSON.stringify(this.topForm)
+      let rules = JSON.stringify(this.rules)
+      this.$router.push({ path: '/business/teamDetailedList', query: { id: row.id, search, rules } })
     },
     // setImprovement 设置基础技能班
     gotoImprovement (row) {
-      this.$router.push({ path: '/business/setImprovement', query: { id: row.id, search: this.topForm, rules: this.rules } })
+      let search = JSON.stringify(this.topForm)
+      let rules = JSON.stringify(this.rules)
+      this.$router.push({ path: '/business/setImprovement', query: { id: row.id, search, rules } })
     },
     // 停止乐团
     stopTeam (row) {

vue.config.js

@@ -20,8 +20,8 @@ const name = defaultSettings.title || '大雅后台管理系统' // page title
 // let target = 'http://192.168.3.27:8000' // 箭河
 // let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:8000' //勇哥
-// let target = 'http://47.99.212.176:8000' // 测试服
-let target = 'http://192.168.3.48:8080' // 乔
+let target = 'http://47.99.212.176:8000' // 测试服
+// let target = 'http://192.168.3.48:8080' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**