Bläddra i källkod

提交一下

1
mo 4 år sedan
förälder
incheckning
2c8f2aa926

+ 24 - 2
src/views/teamDetail/components/modals/create-user-pay.vue

@@ -57,7 +57,25 @@
             </select-all>
           </el-form-item>
         </el-col>
+              <el-col :span="12">
+          <el-form-item label="线上基础技能班">
+            <select-all
+              v-model.trim="form.highonline"
+              filterable
+              clearable
+              multiple
+            >
+              <el-option
+                v-for="(item, index) in highonlineList.filter(item => item.lockFlag != 1)"
+                :key="index"
+                :value="item.id"
+                :label="item.name"
+              ></el-option>
+            </select-all>
+          </el-form-item>
+        </el-col>
       </el-row>
+      <!-- highonlineList -->
     </el-form>
     <el-alert title="课程信息设置" :closable="false" class="alert" type="info">
     </el-alert>
@@ -155,7 +173,7 @@ import { courseType } from '@/constant'
 import { getTimes, objectToOptions } from "@/utils";
 import { paymentPatternType } from '@/constant'
 export default {
-  props: ["snapList", "highList", "mixList", "signList", 'createdUserId', 'organizationCourseUnitPriceSettings', 'musicGroupId', 'baseInfo'],
+  props: ["snapList", "highList", "mixList", "signList", 'highonlineList','createdUserId', 'organizationCourseUnitPriceSettings', 'musicGroupId', 'baseInfo'],
   components: {
     paymentCycle,
     otherform,
@@ -170,6 +188,7 @@ export default {
         mixClass: '',
         highClass: '',
         snapClass: '',
+        highonline:''
       },
       payment: {
         paymentPattern: null,
@@ -196,6 +215,9 @@ export default {
     'form.snapClass'() {
       this.classChange()
     },
+    'form.highonline'(){
+      this.classChange()
+    },
     'payment.paymentPattern'() {
       this.syncAllMoney()
     },
@@ -270,7 +292,7 @@ export default {
       return _
     },
     getAllIds() {
-      return [this.form.signClass, this.form.mixClass, this.form.highClass, ...this.form.snapClass].filter(item => !!item)
+      return [this.form.signClass, this.form.mixClass, this.form.highClass, this.form.highonline,...this.form.snapClass].filter(item => !!item)
     },
     async classChange() {
       try {

+ 8 - 5
src/views/teamDetail/components/studentList.vue

@@ -721,6 +721,7 @@
         :mixList="mixList"
         :highList="highList"
         :snapList="snapList"
+        :highonlineList="highonlineList"
         :musicGroupId="this.teamid"
         :organizationCourseUnitPriceSettings="
           organizationCourseUnitPriceSettings
@@ -1145,17 +1146,19 @@ export default {
           this.mixList = [];
           this.highList = [];
           this.snapList = [];
-          // else if (item.type == "HIGH_ONLINE") {
-          //    this.highonlineList.push(item);
-          //  }
+
           this.classList.forEach((item) => {
             if (item.type == "NORMAL") {
               this.signList.push(item);
             } else if (item.type == "MIX") {
               this.mixList.push(item);
-            } else if (item.type == "HIGH" || (item.type=="HIGH_ONLINE"&&item.studentNum<6)) {
+            } else if (item.type == "HIGH") {
               this.highList.push(item);
-            } else if (item.type == "SNAP") {
+            }
+            else if (item.type == "HIGH_ONLINE"&&item.studentNum<6) {
+             this.highonlineList.push(item);
+           }
+            else if (item.type == "SNAP") {
               this.snapList.push(item);
             }  else if (item.type == "MUSIC_NETWORK") {
               this.muiscnetworkList.push(item);

+ 2 - 2
vue.config.js

@@ -20,8 +20,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.148:8000' //邹璇
 // let target = 'http://192.168.3.57:8000' //勇哥
-// let target = 'http://dev.dayaedu.com' // 开发环境
-let target = 'https://test.dayaedu.com' //测试环境
+let target = 'http://dev.dayaedu.com' // 开发环境
+// let target = 'https://test.dayaedu.com' //测试环境
 // let target = 'http://192.168.3.134' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {