12345678

src/api/buildTeam.js

@@ -6,7 +6,7 @@ export function getSection (data) {
   return request({
     url: api + '/organization/queryPage',
     method: 'get',
-    params: qs.stringify(data)
+    params: data
   })
 }
 // 获取收费类型
@@ -14,7 +14,7 @@ export function getType (data) {
   return request({
     url: api + '/chargeType/queryPage',
     method: 'get',
-    params: qs.stringify(data)
+    params: data
   })
 }
 // 获取合作单位
@@ -22,7 +22,7 @@ export function getCooperation (data) {
   return request({
     url: api + '/cooperationOrgan/queryPage',
     method: 'get',
-    params: qs.stringify(data)
+    params: data
   })
 }
 // 获取教学地点
@@ -30,7 +30,7 @@ export function getAddress (data) {
   return request({
     url: api + '/school/queryPage',
     method: 'get',
-    params: qs.stringify(data)
+    params: data
   })
 }
 // 获取所有老师信息
@@ -38,7 +38,7 @@ export function getTeacher (data) {
   return request({
     url: api + '/teacher/findTeachers',
     method: 'get',
-    params: qs.stringify(data)
+    params: data
   })
 }
 
@@ -47,7 +47,7 @@ export function getSubject (data) {
   return request({
     url: api + '/subject/findSubSubjects',
     method: 'get',
-    params: qs.stringify(data)
+    params: data
   })
 }
 // 查询付费主体
@@ -478,7 +478,7 @@ export function musicGroupOpenPay (data) {
   return request({
     url: api + `/musicGroup/openPay`,
     method: 'POST',
-    data
+    data: qs.stringify(data)
   })
 }
 

src/views/businessManager/shopManager/shopOperation.vue

@@ -12,7 +12,7 @@
         <el-form-item label="商品名称" prop="name">
           <el-input  v-model="form.name"></el-input>
         </el-form-item>
-        <el-form-item label="商品分类" prop="type">
+        <el-form-item label="商品类型" prop="type">
           <el-select v-model="form.type">
               <el-option label="乐器" value="INSTRUMENT"></el-option>
               <el-option label="辅件" value="ACCESSORIES"></el-option>
@@ -21,7 +21,7 @@
               <el-option label="其它" value="OTHER"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="商品类型" prop="goodsCategoryId">
+        <el-form-item label="商品分类" prop="goodsCategoryId">
           <el-select v-model="form.goodsCategoryId">
               <el-option
                 v-for="item in categoryList"
@@ -46,7 +46,7 @@
         <el-form-item label="商品图片" prop="image">
           <el-upload
             class="avatar-uploader"
-            action="/web-server/uploadFile"
+            action="/api-web/uploadFile"
             :headers="headers"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"

src/views/categroyManager/insideSetting/branchActiveOperation.vue

@@ -227,7 +227,7 @@ export default {
             form.errorText = '最大值不能为空'
             return
         } else if(parseInt(lastDate.max) <= parseInt(lastDate.min)) {
-            form.errorText = '最小值不能小于或等于上一个梯度的最大值'
+            form.errorText = '最大值应大于该梯度的最小值'
             return
         }
 

src/views/teamBuild/components/teamBaseInfo.vue

@@ -360,11 +360,13 @@
 import { getSection, getType, getCooperation, getTeacher, getAddress, getPayMaster, getPayStatus, getTeamBaseInfo, resetTeamBaseInfo } from '@/api/buildTeam'
 import { scrollTo } from '@/utils/scroll-to'
 import axios from 'axios'
+import store from '@/store'
 import qs from 'qs'
 export default {
   props: ['getTeamList'],
   data () {
     return {
+      organId: store.getters.organ,
       topFrom: {
         type: '', // 收费类型
         section: '', //所属分部
@@ -373,7 +375,7 @@ export default {
         name: '', //乐团名称
         boss: '', // 运营主管
         time: '', // 报名截止时间
-        startClass: '', // 招生年级起始
+        startClass: [], // 招生年级起始
         address: '', // 教学地点
         salary: '', // 收费模式
         head: ''
@@ -445,7 +447,6 @@ export default {
       // this.holidayList = Object.keys(res.data[year])
     })
     this.teamStatus = this.$route.query.type;
-    console.log();
     // 传过来的乐团信息
     this.activeTeam = this.getTeamList;
 
@@ -505,25 +506,25 @@ export default {
 
     }).catch()
     // 2.获取收费类型选项卡
-    getType({ 'rows': 1000 }).then(res => {
+    getType({ 'rows': 1000, organId: this.organId }).then(res => {
       if (res.code == 200) {
         this.typeList = res.data.rows;
       }
     })
     // 3.获取合作单位选项卡
-    getCooperation({ 'rows': 1000 }).then(res => {
+    getCooperation({ 'rows': 1000, organId: this.organId }).then(res => {
       if (res.code == 200) {
         this.cooperationList = res.data.rows;
       }
     })
     // 4.获取老师选项卡
-    getTeacher({ 'rows': 1000 }).then(res => {
+    getTeacher({ 'rows': 1000, organId: this.organId }).then(res => {
       if (res.code == 200) {
         this.teacherList = res.data;
       }
     })
     // 5.获取教学地点选项卡
-    getAddress({ 'rows': 1000 }).then(res => {
+    getAddress({ 'rows': 1000, organId: this.organId }).then(res => {
       if (res.code == 200) {
         this.addList = res.data.rows;
       }

src/views/teamBuild/components/teamSoundMoney.vue

@@ -476,12 +476,14 @@ export default {
         obj.musicGroupSubjectPlans.push(item);
       }
 
-      createTeam(obj).then(res => {
-        if (res.code == 200) {
-          // 成功 跳转到乐团报名详情
-          this.$router.push({ path: '/business/teamDetail' })
-        }
-      })
+      console.log(obj)
+
+      // createTeam(obj).then(res => {
+      //   if (res.code == 200) {
+      //     // 成功 跳转到乐团报名详情
+      //     this.$router.push({ path: '/business/teamDetail' })
+      //   }
+      // })
     }
   },
   filters: {

src/views/teamBuild/index.vue

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

src/views/teamBuild/signupList.vue

@@ -252,6 +252,7 @@
           <el-date-picker
             v-model="paymentForm.paymentExpireDate"
             type="date"
+            value-format="yyyy-MM-dd"
             style="width: 100%"
             placeholder="选择日期">
           </el-date-picker>
@@ -389,20 +390,21 @@ export default {
             musicGroupId: this.id,
             expireDate: this.paymentForm.paymentExpireDate
           }).then(res => {
-            let result = res.data
-            console.log(result)
-            if(result.code == 200) {
+            if(res.code == 200) {
               this.$message({
                 type: 'success',
                 message: '开启成功'
               })
+              this.paymentStatus = false
               this.$router.push({
                 path: '/business/signupList',
                 query: {
                   status: 'PAY',
+                  id: this.$route.query.id,
                   name: this.$route.query.name
                 }
               })
+              this.status = 'PAY'
             }
           })
         } else {