1028 19:09

11

src/layout/components/Sidebar/SidebarItem.vue

@@ -65,7 +65,7 @@ export default {
   },
   mounted () {
     this.onlyOneChild = null
-    console.log(this.item)
+    // console.log(this.item)
   }
   ,
   methods: {

src/views/categroyManager/vipNewActive.vue

@@ -2,7 +2,8 @@
   <div class="m-container">
     <!-- <h2>VIP活动方案新增 <div class="squrt"></div> </h2> -->
     <h2>
-      <el-page-header @back="onCancel" :content="'VIP活动方案' + (pageType == 'create' ? '新增' : '修改')"></el-page-header>
+      <el-page-header @back="onCancel"
+                      :content="'VIP活动方案' + (pageType == 'create' ? '新增' : '修改')"></el-page-header>
     </h2>
     <div class="m-core">
       <el-form :label-position="labelPosition"
@@ -71,10 +72,19 @@
                          value="FIXED_SALARY"></el-option>
             </el-select>
             <el-input placeholder="请输入"
-                      style="width:100px"
+                      v-if='onlineSalary== "RATIO_DISCOUNT"'
+                      style="width:200px;"
                       type="number"
-                      v-if='onlineSalary!= 1'
-                      v-model="onlineprice"></el-input>
+                      v-model="onlineprice">
+              <template slot="append">%</template>
+            </el-input>
+            <el-input placeholder="请输入"
+                      v-if='onlineSalary == "FIXED_SALARY"'
+                      style="width:200px;"
+                      type="number"
+                      v-model="onlineprice">
+              <template slot="append">元</template>
+            </el-input>
           </div>
           <div class="chioseWrap">
             <el-checkbox label="线下课"
@@ -88,10 +98,19 @@
                          value="FIXED_SALARY"></el-option>
             </el-select>
             <el-input placeholder="请输入"
-                      style="width:100px"
-                      v-if='unonlineSalary!= 1'
+                      v-if='unonlineSalary== "RATIO_DISCOUNT"'
+                      style="width:200px;"
+                      type="number"
+                      v-model="unonlineprice">
+              <template slot="append">%</template>
+            </el-input>
+            <el-input placeholder="请输入"
+                      style="width:200px;"
+                      v-if='unonlineSalary== "FIXED_SALARY"'
                       type="number"
-                      v-model="unonlineprice"></el-input>
+                      v-model="unonlineprice">
+              <template slot="append">元</template>
+            </el-input>
           </div>
           <div class="chioseWrap">
             <el-checkbox v-model="salaryReadonlyFlag"
@@ -117,7 +136,10 @@
                  @click="activeType='DISCOUNT'">折扣</div>
             <el-input v-if="activeType=='DISCOUNT'"
                       v-model="attribute1"
-                      placeholder="请输入折扣数值"></el-input>
+                      style="width:200px!important"
+                      placeholder="请输入折扣数值">
+              <template slot="append">%</template>
+            </el-input>
           </div>
           <div>
             <div class="head"
@@ -127,12 +149,16 @@
                       v-if="activeType=='GIVE_CLASS'"
                       v-model="attribute1"
                       type="number"
-                      style='margin-right:10px;'></el-input> <span v-if="activeType=='GIVE_CLASS'">赠</span>
+                      style='margin-right:10px;width:200px!important'>
+              <template slot="append">节</template>
+            </el-input> <span v-if="activeType=='GIVE_CLASS'">赠</span>
             <el-input v-if="activeType=='GIVE_CLASS'"
                       placeholder="请输入赠送课时数"
                       type="number"
                       v-model="attribute2"
-                      style='margin:0 10px;'></el-input>
+                      style='margin:0 10px;width:200px!important'>
+              <template slot="append">节</template>
+            </el-input>
             <el-checkbox v-if="activeType=='GIVE_CLASS'"
                          v-model="giveClassPaySalaryFlag"
                          label="赠送课时是否结算课酬"></el-checkbox>
@@ -140,9 +166,12 @@
         </div>
       </div>
     </div>
-    <div class="btnWrap" style="justify-content:flex-start">
-      <div class="closeBtn" @click="onReSet">重置</div>
-      <div class="okBtn" @click='submitFrom'>确定</div>
+    <div class="btnWrap"
+         style="justify-content:flex-start">
+      <div class="closeBtn"
+           @click="onReSet">重置</div>
+      <div class="okBtn"
+           @click='submitFrom'>确定</div>
     </div>
   </div>
 </template>
@@ -264,10 +293,10 @@ export default {
       // 线上线下课 勾选就传不勾选就不传
       // addVipActive().then(res => { })
     },
-    onCancel() {
+    onCancel () {
       this.$router.push("/insideSetting/vipActiveList")
     },
-    onReSet() {
+    onReSet () {
       this.vipform = {
         name: '',
         desc: '',

src/views/teamBuild/components/teamBaseInfo.vue

@@ -273,7 +273,7 @@
         <div class="chioseWrap"
              v-if='payList.student.chiose == "loop"'>
           <p>请选择缴费月份:</p>
-          <el-checkbox-group v-model="chioseMonth"
+          <el-checkbox-group v-model="payList.chioseMonth"
                              fill="#14928A"
                              text-color='#474747'>
 
@@ -369,7 +369,8 @@ export default {
         time: '', // 报名截止时间
         startClass: '', // 招生年级起始
         address: '', // 教学地点
-        salary: '' // 收费模式
+        salary: '', // 收费模式
+        head: ''
       },
       checkList: {
         soundInfo: { // 声部
@@ -393,7 +394,7 @@ export default {
           value: '年度安排个月共xxx课时,课时,原价xxx元,现价xxxx元/月(约 xxxx元/月 )'
         }
       }, // 选中的集合
-      chioseMonth: [], // 选中的月份
+
       baseInfo: {},
       money: 580,
       orderInfo: {
@@ -421,17 +422,22 @@ export default {
         student: {
           ischeck: true,
           chiose: 'loop'
-        }
+        },
+        chioseMonth: [], // 选中的月份
       },
       activeTeam: [],
-      teamid: ''
+      teamid: '',
+      teamStatus: ''
     }
   },
   created () {
     //, { id: 191015094822001, name: '测试2团' }
     // 传过来的乐团信息
-    this.activeTeam = [{ id: 191014135135001, name: '测试1团' }]
+    this.activeTeam = [{ id: 191014135135001, name: '测试1团' }, { id: 191015094822001, name: '测试2团' }]
+    // 分为3种 1.
     if (this.activeTeam && this.activeTeam.length == 1) {
+      // 单团修改
+      this.teamStatus = 'resetOne'
       this.teamid = this.activeTeam[0].id;
       getTeamBaseInfo({ musicGroupId: this.teamid }).then(res => {
         if (res.code == 200) {
@@ -476,6 +482,15 @@ export default {
       })
     }
 
+    if (!this.activeTeam || this.activeTeam.length == 0) {
+      // 新建团
+      this.teamStatus = 'newTeam'
+    }
+    if (this.activeTeam && this.activeTeam.length > 1) {
+      // 多团合并
+      this.teamStatus = 'newTeam'
+    }
+
   },
   mounted () {
     // 1.获取各个选项卡的数据内容
@@ -534,20 +549,12 @@ export default {
         if (!valid) {
           this.$message.error('请填写建团必要参数')
         } else {
-          // 我存三个对象
-          // 1. topFromm
-          // 2. checkList
-          // // 3. payList
           this.$store.dispatch('topinfo', this.topFrom);
           this.$store.dispatch('checkinfo', this.checkList);
           this.$store.dispatch('getpayInfo', this.payList);
-          // checkinfo getpayInfo
-
           this.$emit('chiosetab', num);
-
         }
       })
-
     },
     resetSubmit () {
       this.$refs['topinfo'].validate((valid, object) => {
@@ -569,7 +576,8 @@ export default {
             // paymentMonths:obj.months  有待确认
             schoolId: this.topFrom.address,
             courseForm: JSON.stringify(this.checkfor),
-            id: this.teamid
+            id: this.teamid,
+            directorUserId: this.topFrom.head
           }
           obj.musicGroupPaymentEntities = []
           // 添加学校主体付费方式
@@ -594,7 +602,10 @@ export default {
           }
           // 发请求
           resetTeamBaseInfo(obj).then(res => {
-
+            if (res.code == 200) {
+              this.$message.success('修改乐团成功')
+              this.$router.push({ path: '/business/teamDetails', query: { id: this.teamid, name: this.topFrom.name } })
+            }
           })
         }
       })

src/views/teamBuild/components/teamResetSound.vue

@@ -1,33 +1,10 @@
 <template>
   <div>
-    <p class="subTitle">按月缴费时，将在所选月份的1号的前一周提醒用户缴费操作，单次的缴费金额为当前列表「预计收费」的设置金额</p>
-    <div class="chioseWrap"
-         v-if='isLoop=="loop"'>
-      <p>请选择缴费月份:</p>
-      <el-checkbox-group v-model="checkList"
-                         fill="#14928A"
-                         text-color='#474747'>
-        <el-checkbox label="1">一月</el-checkbox>
-        <el-checkbox label="2">二月</el-checkbox>
-        <el-checkbox label="3">三月</el-checkbox>
-        <el-checkbox label="4">四月</el-checkbox>
-        <el-checkbox label="5">五月</el-checkbox>
-        <el-checkbox label="6">六月</el-checkbox>
-        <el-checkbox label="7">七月</el-checkbox>
-        <el-checkbox label="8">八月</el-checkbox>
-        <el-checkbox label="9">九月</el-checkbox>
-        <el-checkbox label="10">十月</el-checkbox>
-        <el-checkbox label="11">十一月</el-checkbox>
-        <el-checkbox label="12">十二月</el-checkbox>
-      </el-checkbox-group>
-    </div>
     <div class="listWrap">
       <el-table :data='activeSoundList'
                 ref="multipleTable"
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}"
-                highlight-current-row
-                @selection-change='handleSelectionChange'
-                @row-click='handleclick'>
+                highlight-current-row>
         <el-table-column type="selection"
                          width="55">
         </el-table-column>
@@ -182,6 +159,7 @@
                    @click="studentVisible = false">确 定</el-button>
       </div>
     </el-dialog>
+    <!--   @click="goback1"  @click="submitInfo1" -->
     <div class="btnWrap">
       <div class="PrevBtn"
            @click="goback">上一步</div>
@@ -216,14 +194,15 @@ export default {
       activeSoundId: '', //
     }
   },
-  created () {
-    this.teamList = this.getTeamList;
-  },
+  // created () {
+
+  // },
   mounted () {
+    this.teamList = this.getTeamList;
+
     this.payfor = this.$store.getters.payList;
-    this.isLoop = this.payfor.student.chiose || 0;
+
     getSoundTree().then(res => {
-      // console.log(res);
       if (res.code == 200) {
         this.soundList = res.data.rows;
         // // 生成动态的checkList
@@ -235,10 +214,6 @@ export default {
 
   },
   methods: {
-    handleSelectionChange (e) {
-      console.log(e);
-    },
-    handleclick () { },
     // 删除声部
     removeListItem () {
       for (let i = 0; i < this.activeSoundList.length; i++) {
@@ -342,6 +317,7 @@ export default {
             item.musicGroupName = teamName;
             return item;
           });
+          console.log(this.studentList)
           // 若学生在全局中被选中  则下次更新列表的时候不显示该学生
           for (let i in this.studentList) {
             for (let j in this.allActiveStudent) {
@@ -440,8 +416,14 @@ export default {
         }
       }
       return result;
+    },
+    submitInfo () {
+      let obj = {}
+      this.payfor.student.chiose == 'loop' ? obj.months = this.payfor.chioseMonth : obj.months = [];
+    },
+    goback () {
+      this.$emit('chiosetab', 0);
     }
-
   },
   computed: {
     // 返回当前选中声部数量
@@ -453,14 +435,11 @@ export default {
       }
       return num;
     },
-    goback () {
-      this.$emit('chiosetab', 0);
-    },
-    submitInfo () { }
+
+
   },
   watch: {
     studentVisible (val) {
-
       if (!val) {
         // 1.选择的团
         this.activeTeam = ''

src/views/teamBuild/components/teamSoundMoney.vue

@@ -403,7 +403,7 @@ export default {
     submitInfo () {
       // 整理数据提交
       let obj = {};
-      this.payfor.student.chiose == 'loop' ? obj.months = this.checkList : obj.months = [];
+      this.payfor.student.chiose == 'loop' ? obj.months = this.payfor.chioseMonth : obj.months = [];
       obj.musicGroup = {
         settlementType: this.topfor.salary,
         applyExpireDate: this.topfor.time + ' 00:00:01',
@@ -479,7 +479,7 @@ export default {
       createTeam(obj).then(res => {
         if (res.code == 200) {
           // 成功 跳转到乐团报名详情
-          this.$router.push({ path: '/teamBuild/teamSeting', query: { id: res.data } })
+          this.$router.push({ path: '/business/teamDetail' })
         }
       })
     }
@@ -556,8 +556,7 @@ export default {
     // console.log(this.topfor);
     // console.log(this.checkfor);
     // console.log(this.payfor);
-    this.isLoop = this.payfor.student.chiose || 1;
-    // 获取存储的type值获取默认值
+
   },
   watch: {
 

src/views/teamBuild/index.vue

@@ -72,7 +72,7 @@ export default {
   name: 'teamBuild',
   data () {
     return {
-      activeIndex: '0',
+      activeIndex: 0,
       stepImgs: {
         nol: require('@/assets/images/base/step-arrow-active.png'),
         active: require('@/assets/images/base/step-arrow.png')

src/views/teamDetail/index.vue

@@ -75,7 +75,9 @@ export default {
   created () {
     // this.teamid = '191014135135001';
     // 191015094822001
-    this.teamid = '191015094822001';
+    let teamInfo = this.$route.query;
+    this.teamid = teamInfo.id;
+    this.name = teamInfo.name
   },
   mounted () {
 

vue.config.js

@@ -17,10 +17,10 @@ const name = defaultSettings.title || 'vue Admin Template' // page title
 // http://47.99.212.176:8000
 // 
 // let target = 'http://192.168.3.27:8000' // 箭河
-let target = 'http://192.168.3.28: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:8000' // 乔
+let target = 'http://192.168.3.48:8000' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**