Merge branch 'master' into wxl

dist/static/css/chunk-ff51b55c.d7074c03.css → dist/static/css/chunk-0e1d63af.28d02d19.css

@@ -1 +1 @@
-.setBtn[data-v-3b267e69]{width:120px;height:40px;line-height:40px;text-align:center;border-radius:4px;color:#fff;background-color:#444;cursor:pointer;margin:20px 0}.imc[data-v-258c987e]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:30px 42px;background-color:#fff;min-height:80vh}.imc .addBtn[data-v-258c987e]{line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;width:120px;height:40px;background-color:#4eada7}
+.setBtn[data-v-3b267e69]{width:120px;height:40px;line-height:40px;text-align:center;border-radius:4px;color:#fff;background-color:#444;cursor:pointer;margin:20px 0}.imc[data-v-237969bd]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:30px 42px;background-color:#fff;min-height:80vh}.imc .addBtn[data-v-237969bd]{line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;width:120px;height:40px;background-color:#4eada7}

dist/static/css/chunk-23a813f0.340b5b49.css

@@ -1 +0,0 @@
-.floor[data-v-b2f807a4]{padding-right:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;width:100%;height:48px;line-height:48px;background:#edeef0;font-size:14px;color:#444;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:relative;z-index:1}.floor .remove[data-v-b2f807a4]{background:#f85043;margin-left:164px}.floor .add[data-v-b2f807a4],.floor .remove[data-v-b2f807a4]{width:98px;height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-b2f807a4]{background:#14928a;margin-left:20px}.studentMask[data-v-b2f807a4]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.studentMask .left[data-v-b2f807a4]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-b2f807a4]{margin-bottom:20px}.studentMask .left h4[data-v-b2f807a4]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-b2f807a4]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-b2f807a4]{padding-left:10px;line-height:25px}.studentMask .right[data-v-b2f807a4]{width:calc(100% - 200px)}.studentMask .right .tableList[data-v-b2f807a4]{max-height:500px;overflow-y:auto}.resetClassForm .el-date-editor.el-input[data-v-b2f807a4],.resetClassForm .el-date-editor.el-input__inner[data-v-b2f807a4]{width:180px}.el-date-editor.el-input[data-v-b2f807a4],.el-date-editor.el-input__inner[data-v-b2f807a4]{width:100px}

dist/static/css/chunk-3a11e0dd.199ebe8f.css → dist/static/css/chunk-5d453422.abefc249.css

@@ -1 +1 @@
-.m-core[data-v-0c267af4]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-0c267af4]{width:180px}.m-core h4[data-v-0c267af4]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-0c267af4],.m-core .right[data-v-0c267af4],.m-core .vipLeft[data-v-0c267af4]{width:400px}.planList[data-v-0c267af4]{padding:0 25px}.planList .planTop[data-v-0c267af4]{height:40px;line-height:40px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-0c267af4]{font-size:14px}.planList .planCore .row[data-v-0c267af4]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-0c267af4]{width:87px}.okBtn[data-v-0c267af4]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}
+.m-core[data-v-3d27f5b0]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-3d27f5b0]{width:180px}.m-core h4[data-v-3d27f5b0]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-3d27f5b0],.m-core .right[data-v-3d27f5b0],.m-core .vipLeft[data-v-3d27f5b0]{width:400px}.planList[data-v-3d27f5b0]{padding:0 25px}.planList .planTop[data-v-3d27f5b0]{height:40px;line-height:40px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-3d27f5b0]{font-size:14px}.planList .planCore .row[data-v-3d27f5b0]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-3d27f5b0]{width:87px}.okBtn[data-v-3d27f5b0]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}

dist/static/css/chunk-8f5e867e.b1406e93.css

@@ -0,0 +1 @@
+.floor[data-v-473fdee8]{padding-right:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;width:100%;height:48px;line-height:48px;background:#edeef0;font-size:14px;color:#444;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:relative;z-index:1}.floor .remove[data-v-473fdee8]{background:#f85043;margin-left:164px}.floor .add[data-v-473fdee8],.floor .remove[data-v-473fdee8]{width:98px;height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-473fdee8]{background:#14928a;margin-left:20px}.studentMask[data-v-473fdee8]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.studentMask .left[data-v-473fdee8]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-473fdee8]{margin-bottom:20px}.studentMask .left h4[data-v-473fdee8]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-473fdee8]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-473fdee8]{padding-left:10px;line-height:25px}.studentMask .right[data-v-473fdee8]{width:calc(100% - 200px)}.studentMask .right .tableList[data-v-473fdee8]{max-height:500px;overflow-y:auto}.resetClassForm .el-date-editor.el-input[data-v-473fdee8],.resetClassForm .el-date-editor.el-input__inner[data-v-473fdee8]{width:180px}.el-date-editor.el-input[data-v-473fdee8],.el-date-editor.el-input__inner[data-v-473fdee8]{width:100px}

dist/static/css/chunk-3c160738.f257ab29.css → dist/static/css/chunk-eb900642.dde7b697.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.select[data-v-5d615f3f]{font-size:14px}.btnList[data-v-5d615f3f]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-5d615f3f]{margin-right:15px}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.select[data-v-1588124c]{font-size:14px}.btnList[data-v-1588124c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-1588124c]{margin-right:15px}

src/App.vue

@@ -157,7 +157,7 @@ input[type="number"] {
     align-items: center;
     flex-wrap: wrap;
     .headItem {
-      width: 364px;
+      width: 320px;
       height: 30px;
       color: #444;
       border-right: 1px solid #979797;

src/views/buildVip/index.vue

@@ -814,7 +814,7 @@ export default {
           if (online == 0) break
         }
         // 加一周
-        date.setDate(date.getDate() + 7);
+        // date.setDate(date.getDate() + 7);
       }
 
       // console.log(date1)
@@ -835,7 +835,7 @@ export default {
           if (offline == 0) break
         }
         // 加一周
-        date1.setDate(date1.getDate() + 7);
+        // date1.setDate(date1.getDate() + 7);
       }
       // console.log(this.timeTable);
       this.dialogFormVisible = false;

src/views/businessManager/orderManager/backMoney.vue

@@ -31,7 +31,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getList"
+          <el-button @click="search"
                      type="danger">搜索</el-button>
           <el-button @click="onReSet"
                      type="primary">重置</el-button>
@@ -172,6 +172,10 @@ export default {
     this.getList()
   },
   methods: {
+    search () {
+      this.pageInfo.page = 1;
+      this.getList()
+    },
     onTeachingSubmit (formName, status) { // 添加数据
       this.$refs[formName].validate((valid) => {
         if (valid) {

src/views/businessManager/orderManager/expend.vue

@@ -20,7 +20,7 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getList"
+          <el-button @click="search"
                      type="danger">搜索</el-button>
           <!-- <el-button @click="onReSet"
                      type="primary">重置</el-button> -->
@@ -152,6 +152,10 @@ export default {
     this.getList()
   },
   methods: {
+    search () {
+      this.pageInfo.page = 1;
+      this.getList()
+    },
     getList () {
       let params = this.searchForm
       params.rows = this.pageInfo.limit

src/views/businessManager/orderManager/incomebuy.vue

@@ -1,54 +1,70 @@
 <template>
   <div class="m-container">
-    <h2><div class="squrt"></div>充值列表</h2>
+    <h2>
+      <div class="squrt"></div>充值列表
+    </h2>
     <div class="m-core">
       <!-- 搜索类型 -->
       <el-form :inline="true"
-              class="searchForm"
-              v-model="searchForm">
+               class="searchForm"
+               v-model="searchForm">
         <el-form-item>
-          <el-select v-model="searchForm.paymentType" placeholder="交易类型">
-            <el-option v-for="(item, index) in orderStatus" :key="index" 
-              :label="item.label" :value="item.value"></el-option>
+          <el-select v-model="searchForm.paymentType"
+                     placeholder="交易类型">
+            <el-option v-for="(item, index) in orderStatus"
+                       :key="index"
+                       :label="item.label"
+                       :value="item.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select v-model="searchForm.paymentStatus" placeholder="交易状态">
-            <el-option v-for="(item, index) in dealStatus" :key="index" 
-              :label="item.label" :value="item.value"></el-option>
+          <el-select v-model="searchForm.paymentStatus"
+                     placeholder="交易状态">
+            <el-option v-for="(item, index) in dealStatus"
+                       :key="index"
+                       :label="item.label"
+                       :value="item.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getList" type="danger">搜索</el-button>
-          <el-button @click="onReSet" type="primary">重置</el-button>
+          <el-button @click="search"
+                     type="danger">搜索</el-button>
+          <el-button @click="onReSet"
+                     type="primary">重置</el-button>
         </el-form-item>
       </el-form>
       <!-- 列表 -->
       <div class="tableWrap">
-        <el-table :data='tableList' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          <el-table-column align='center' prop="transNo"
-                          label="交易流水号">
+        <el-table :data='tableList'
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+          <el-table-column align='center'
+                           prop="transNo"
+                           label="交易流水号">
           </el-table-column>
-          <el-table-column align='center' prop="payTime"
-                          label="订单日期">
+          <el-table-column align='center'
+                           prop="payTime"
+                           label="订单日期">
           </el-table-column>
-          <el-table-column align='center' prop="actualAmount"
-                          label="实付金额">
+          <el-table-column align='center'
+                           prop="actualAmount"
+                           label="实付金额">
           </el-table-column>
-          <el-table-column align='center' prop="user.username"
-                          label="学员姓名">
+          <el-table-column align='center'
+                           prop="user.username"
+                           label="学员姓名">
           </el-table-column>
-          <el-table-column align='center' prop="paymentChannel"
-                          label="交易方式">
+          <el-table-column align='center'
+                           prop="paymentChannel"
+                           label="交易方式">
           </el-table-column>
           <el-table-column align='center'
-                          label="收款账户">
+                           label="收款账户">
             <template slot-scope="scope">
               {{ scope.row.paymentChannelType | paymentChannelType }}
             </template>
           </el-table-column>
           <el-table-column align='center'
-                          label="交易状态">
+                           label="交易状态">
             <template slot-scope="scope">
               {{ scope.row.status | dealStatus }}
             </template>
@@ -92,24 +108,28 @@ export default {
       },
     }
   },
-  mounted() {
+  mounted () {
     this.getList()
   },
   methods: {
-    getList () { 
+    search () {
+      this.pageInfo.page = 1;
+      this.getList();
+    },
+    getList () {
       let params = this.searchForm
       params.rows = this.pageInfo.limit
       params.page = this.pageInfo.page
       studentRechargeList(params).then(res => {
         let result = res.data
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.tableList = result.rows
           this.pageInfo.total = result.total
         }
       })
     },
-    searchOrderDate(value) {
-      if(value) {
+    searchOrderDate (value) {
+      if (value) {
         this.searchForm.orderStartDate = value[0]
         this.searchForm.orderEndDate = value[1]
       } else {
@@ -117,7 +137,7 @@ export default {
         this.searchForm.orderEndDate = null
       }
     },
-    onReSet() { // 重置搜索
+    onReSet () { // 重置搜索
       this.orderDate = null
       this.searchForm = {
         orderStartDate: null,

src/views/categroyManager/insideSetting/addressManager.vue

@@ -113,7 +113,7 @@
                       prop="cooperationOrganId"
                       label="合作单位"
                       :label-width="formLabelWidth">
-          <el-select v-model="form.cooperationOrganId">
+          <el-select v-model="form.cooperationOrganId" @change="onCooperationChange">
             <el-option v-for="item in cooperationList"
                        :key="item.value"
                        :label="item.label"
@@ -255,6 +255,7 @@ export default {
         subsidy: null, // 课酬补贴
         organId: null, // 分部编号
       },
+      selectOrganId: null, // 选中的分部编号
       rules: {
         name: [{ required: true, message: '请输入教学点名称', trigger: 'blur' }],
         source: [{ required: true, message: '请选择教学点来源', trigger: 'change' }],
@@ -292,6 +293,7 @@ export default {
         if (valid) {
           this.form.address = this.addressDetail.address
           this.form.longitudeLatitude = this.addressDetail.poi
+          this.form.organId = this.selectOrganId
           if (this.formActionTitle == 'create') {
             schoolAdd(this.form).then(res => {
               if (res.code == 200) {
@@ -349,6 +351,13 @@ export default {
         })
       }
     },
+    onCooperationChange(value) {
+      this.cooperationList.forEach(item => {
+        if(item.value == value) {
+          this.selectOrganId = item.organId
+        }
+      })
+    },
     onSearchResult (pois) { // 搜索出来的Marker
       this.markers = [] // 搜索时进行数据重置
       let latSum = 0
@@ -423,6 +432,7 @@ export default {
               res.data.forEach(r => {
                 this.cooperationList.push({
                   value: r.id,
+                  organId: r.organId,
                   label: r.name
                 })
               })
@@ -446,6 +456,7 @@ export default {
       // }
       this.teachingStatus = true
       this.formActionTitle = type
+      this.form.organId = null
       // 修改的时候赋值
       if (type == 'update') {
         this.addressDetail = {
@@ -460,7 +471,7 @@ export default {
           remark: row.remark,  // 费用
           address: row.address.split(',').join(''), // 上课地点
           subsidy: row.subsidy, // 课酬补贴
-          
+          organId: row.organId
         }
       }
     },

src/views/categroyManager/insideSetting/staffManager.vue

@@ -14,7 +14,7 @@
         <el-form-item>
           <el-input type="text"
                     v-model="searchForm.search"
-                    @keyup.enter.native='getList'
+                    @keyup.enter.native='search'
                     placeholder="姓名或手机号"></el-input>
         </el-form-item>
         <el-form-item>

src/views/categroyManager/vipActiveList.vue

@@ -1,6 +1,7 @@
 <template >
   <div class="m-container">
-    <h2><div class="squrt"></div>vip活动方案 
+    <h2>
+      <div class="squrt"></div>vip活动方案
     </h2>
 
     <div class="m-core">
@@ -74,7 +75,7 @@
                            :formatter="fommatterEnable">
           </el-table-column>
           <el-table-column align='center'
-                           width="180px"
+                           width="130px"
                            label="活动持续时间">
             <template slot-scope="scope">
               <div>
@@ -84,7 +85,7 @@
             </template>
           </el-table-column>
           <el-table-column align='center'
-                           width="180px"
+                           width="130px"
                            label="课程安排时间">
             <template slot-scope="scope">
               <div>
@@ -129,6 +130,7 @@
       </div>
     </div>
     <el-dialog title='提示'
+               width="60%"
                :visible.sync="dialogVisible">
       <div>
         <el-form :label-position="labelPosition"
@@ -151,6 +153,7 @@
                          :label="item.name"
                          :value="item.id"></el-option>
             </el-select>
+            <el-button @click="onCheckAllBranch">适用所有分部</el-button>
           </el-form-item>
           <el-form-item label="活动描述"
                         prop="desc">
@@ -238,7 +241,7 @@
         </div>
         <div class="activeType">
           <div class="left">
-            <p>活动类型</p>
+            <p style='width:60px;'>活动类型</p>
           </div>
           <div class="right">
             <div>
@@ -270,7 +273,7 @@
                         style='margin:0 10px;'></el-input>
               <el-checkbox v-if="activeType=='GIVE_CLASS'"
                            v-model="giveClassPaySalaryFlag"
-                           label="赠送课时是否结算课酬"></el-checkbox>
+                           label="赠送课时结算课酬"></el-checkbox>
             </div>
           </div>
         </div>
@@ -436,6 +439,13 @@ export default {
     }
   },
   methods: {
+    onCheckAllBranch () {
+      // 适用所有分部
+      this.resetForm.organ = []
+      this.organList.forEach(item => {
+        this.resetForm.organ.push(item.id)
+      })
+    },
     search () {
       this.rules.page = 1;
       this.getList();
@@ -505,12 +515,26 @@ export default {
       this.dialogVisible = true;
       this.resetForm.name = row.name;
       this.resetForm.desc = row.description;
-      this.resetForm.stauts = row.vipGroupCategoryIdList.split(',').map(res => {
-        return parseInt(res);
-      });
+
+      if (row.organId) {
+        this.resetForm.organ = row.organId.split(',').map(res => {
+          return parseInt(res);
+        });
+      }
+      if (row.vipGroupCategoryIdList) {
+        this.resetForm.stauts = row.vipGroupCategoryIdList.split(',').map(res => {
+          return parseInt(res);
+        });
+      }
+
+
       // 同步活动时间
-      this.resetForm.activeTime = [row.startTime, row.endTime];
-      this.resetForm.courseTime = [row.coursesStartTime, row.coursesEndTime];
+      if (row.startTime && row.endTime) {
+        this.resetForm.activeTime = [row.startTime, row.endTime];
+      }
+      if (row.coursesStartTime && row.coursesEndTime) {
+        this.resetForm.courseTime = [row.coursesStartTime, row.coursesEndTime];
+      }
       // 同步适用范围
       let obj = JSON.parse(row.salarySettlementJson);
       // 同步线上课状态
@@ -703,10 +727,12 @@ export default {
     }
   }
 }
-.el-select {
-  width: 400px !important;
-  .el-input__inner {
-    width: 400px;
+.vipform {
+  .el-select {
+    width: 400px !important;
+    .el-input__inner {
+      width: 400px;
+    }
   }
 }
 </style>

src/views/studentManager/components/studentOrder.vue

@@ -58,6 +58,7 @@
       </el-form-item>
       <el-form-item>
         <el-input type="text"
+                  @keyup.enter.native='search'
                   v-model="searchForm.remark"
                   placeholder="订单说明"></el-input>
       </el-form-item>

src/views/studentManager/components/studentVip.vue

@@ -30,6 +30,7 @@
              v-model="searchForm">
       <el-form-item>
         <el-input placeholder="课程名称"
+                  @keyup.enter.native='onSearch'
                   v-model="searchForm.classGroupName"></el-input>
       </el-form-item>
       <el-form-item>
@@ -41,32 +42,42 @@
     <div class="tableWrap">
       <el-table :header-cell-style="{background:'#EDEEF0',color:'#444'}"
                 :data='tableList'>
-        <el-table-column label="VIP编号" align='center'
+        <el-table-column label="VIP编号"
+                         align='center'
                          prop='vipGroupId'>
         </el-table-column>
-        <el-table-column label="VIP课名称" align='center'
+        <el-table-column label="VIP课名称"
+                         align='center'
                          prop="vipGroupName">
         </el-table-column>
-        <el-table-column label="VIP课状态" align='center'>
+        <el-table-column label="VIP课状态"
+                         align='center'>
           <template slot-scope="scope">
             {{ scope.row.vipGroupStatus | vipCourseStatus }}
           </template>
         </el-table-column>
-        <el-table-column label="指导老师" align='center'
+        <el-table-column label="指导老师"
+                         align='center'
                          prop="teacherName">
         </el-table-column>
-        <el-table-column label="班级人数" align='center'
+        <el-table-column label="班级人数"
+                         align='center'
                          prop="studentNum">
         </el-table-column>
-        <el-table-column label="活动方案" align='center'
+        <el-table-column label="活动方案"
+                         align='center'
                          prop="activeName">
         </el-table-column>
-        <el-table-column label="开课时间" align='center'
+        <el-table-column label="开课时间"
+                         align='center'
                          prop="courseStartDate">
         </el-table-column>
-        <el-table-column label="当前课次" align='center' prop="currentClassTimes">
+        <el-table-column label="当前课次"
+                         align='center'
+                         prop="currentClassTimes">
         </el-table-column>
-        <el-table-column label="操作" align='center'>
+        <el-table-column label="操作"
+                         align='center'>
           <template slot-scope="scope">
             <el-button @click="onCourse(scope.row)"
                        type="text">课表</el-button>
@@ -78,18 +89,27 @@
                   :limit.sync="pageInfo.limit"
                   :page-sizes="pageInfo.page_size"
                   @pagination="getCourseList" />
-      
 
-      <el-dialog :title="dialogTitle" :visible.sync="dialogTableVisible">
+      <el-dialog :title="dialogTitle"
+                 :visible.sync="dialogTableVisible">
         <el-table :data="gridData">
-          <el-table-column prop="courseDate" label="时间" align='center' width="150"></el-table-column>
-          <el-table-column prop="classGroupName" label="课程名称" align='center' width="200"></el-table-column>
-          <el-table-column label="课程类型" align='center'>
-             <template slot-scope="scope">
+          <el-table-column prop="courseDate"
+                           label="时间"
+                           align='center'
+                           width="150"></el-table-column>
+          <el-table-column prop="classGroupName"
+                           label="课程名称"
+                           align='center'
+                           width="200"></el-table-column>
+          <el-table-column label="课程类型"
+                           align='center'>
+            <template slot-scope="scope">
               {{ scope.row.teachMode == 'ONLINE' ? '线上' : '线下' }}
             </template>
           </el-table-column>
-          <el-table-column prop="courseStatus" align='center' label="课程状态">
+          <el-table-column prop="courseStatus"
+                           align='center'
+                           label="课程状态">
             <template slot-scope="scope">
               {{ scope.row.courseStatus |coursesStatus }}
             </template>
@@ -124,9 +144,13 @@ export default {
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
       dialogTitle: '',
-      gridData: []
+      gridData: [],
+      userId: ''
     }
   },
+  created () {
+    this.userId = this.$route.query.userId || null;
+  },
   mounted () {
     this.getCourseList()
   },
@@ -146,10 +170,10 @@ export default {
         }
       })
     },
-    onCourse(row) {
-      findStudentVipGroups({ vipGroupId: row.vipGroupId }).then(res => {
+    onCourse (row) {
+      findStudentVipGroups({ vipGroupId: row.vipGroupId, studentId: this.userId }).then(res => {
         this.dialogTitle = row.vipGroupName
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.gridData = res.data.rows
           this.dialogTableVisible = true
         }

src/views/studentManager/components/teamAndcourse.vue

@@ -82,10 +82,12 @@
       </el-form-item>
       <el-form-item>
         <el-input placeholder="班级名称"
+                  @keyup.enter.native='search'
                   v-model="searchForm.classGroupName"></el-input>
       </el-form-item>
       <el-form-item>
         <el-input placeholder="老师姓名"
+                  @keyup.enter.native='search'
                   v-model="searchForm.teacherName"></el-input>
       </el-form-item>
       <el-form-item>

src/views/studentManager/studentList.vue

@@ -22,11 +22,12 @@
         </el-form-item>
         <el-form-item>
           <el-input placeholder="学生姓名"
+                    @keyup.enter.native='onSearch'
                     v-model="searchForm.studentName"></el-input>
         </el-form-item>
         <el-form-item>
           <el-input placeholder="家长联系电话"
-                    @keyup.enter.native='getList'
+                    @keyup.enter.native='onSearch'
                     v-model="searchForm.search"></el-input>
         </el-form-item>
         <el-form-item>

src/views/teacherManager/teacherDetail/components/teacherRecord.vue

@@ -26,6 +26,7 @@
       </el-form-item>
       <el-form-item>
         <el-input placeholder="课程名称"
+                  @keyup.enter.native='search'
                   v-model="searchForm.classGroupName"></el-input>
       </el-form-item>
       <el-form-item>

src/views/teacherManager/teacherList.vue

@@ -13,6 +13,7 @@
                v-model="searchForm">
         <el-form-item>
           <el-input v-model="searchForm.search"
+                    @keyup.enter.native='getList'
                     placeholder="老师姓名或电话"></el-input>
         </el-form-item>
         <el-form-item>

src/views/teamBuild/signupList.vue

@@ -167,6 +167,7 @@
           </el-table-column>
           <!-- v-if='status == "PAY"' -->
           <el-table-column label="学员状态"
+                           fixed='right'
                            prop="paymentStatus"
                            align='center'>
             <template slot-scope="scope">
@@ -176,6 +177,7 @@
             </template>
           </el-table-column>
           <el-table-column label="操作"
+                           fixed='right'
                            align='center'>
             <template slot-scope="scope">
               <div>
@@ -488,7 +490,6 @@ export default {
     },
     payStart () {
       this.paymentStatus = true;
-      this.getList();
     },
     getList () {
       let obj = {
@@ -531,6 +532,7 @@ export default {
                 }
               })
               this.status = 'PAY'
+              this.getList();
             }
           })
         } else {
@@ -831,6 +833,7 @@ export default {
       overflow: auto;
     }
     .right {
+      width: calc(100% - 340px);
       margin-left: 12px;
       flex-grow: 1;
     }

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

@@ -67,7 +67,7 @@
                               @change='changeTimer(item)'
                               v-model="item.startTime"
                               :picker-options="{
-                             start: '06:30',
+                             start: '04:30',
                              step: '00:05',
                              end: '23:30'
                                             }">
@@ -76,7 +76,7 @@
               <el-time-select placeholder="结束"
                               v-model="item.endTime"
                               :picker-options="{
-                            start: '06:30',
+                            start: '04:30',
                             step: '00:05',
                             end: '23:30',
                             minTime: item.startTime

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

@@ -149,7 +149,7 @@
                           value-format='HH:mm:ss'
                           v-model="maskForm.startTime"
                           :picker-options="{
-                            start: '06:30',
+                            start: '04:30',
                             step: '00:05',
                             end: '23:30'
                           }">
@@ -158,7 +158,7 @@
                           v-model="maskForm.endTime"
                           value-format='HH:mm:ss'
                           :picker-options="{
-                            start: '06:30',
+                            start: '04:30',
                             step: '00:05',
                             end: '23:30',
                             minTime: maskForm.startTime

src/views/teamBuild/teamSeting/index.vue

@@ -41,7 +41,6 @@
                arrow">
         </span>
         <span class='stepspan  stepspan2'
-              v-if='chargeTypeId==3'
               @click="activeIndex=3">
           <div class="step2 sptep"
                :class="activeIndex >= 3?'activestep':''">
@@ -86,7 +85,7 @@
                       @gotoNav='gotoNav' />
         </div>
       </div>
-      <div v-if='activeIndex==3 && chargeTypeId==3'>
+      <div v-if='activeIndex==3'>
         <improvement :teamid='id'
                      :isSetSalary='isSetSalary'
                      @gotoNav='gotoNav' />

src/views/teamDetail/components/classList.vue

@@ -51,11 +51,11 @@
                          prop="studyNum"
                          label="在读人数">
         </el-table-column>
-        <el-table-column align='center'
+        <!-- <el-table-column align='center'
                          prop="quitNum"
                          label="退团人数">
 
-        </el-table-column>
+        </el-table-column> -->
         <!-- <el-table-column align='center'
                          label="新增人数">
         </el-table-column> -->

src/views/teamDetail/components/courseList.vue

@@ -174,7 +174,7 @@
           <el-time-select placeholder="起始时间"
                           v-model="maskForm.startTime"
                           :picker-options="{
-                            start: '06:30',
+                            start: '04:30',
                             step: '00:05',
                             end: '23:30'
                             }">
@@ -185,7 +185,7 @@
           <el-time-select placeholder="结束时间"
                           v-model="maskForm.endTime"
                           :picker-options="{
-                            start: '06:30',
+                            start: '04:30',
                             step: '00:05',
                             end: '23:30',
                             minTime: maskForm.startTime

src/views/teamDetail/components/resetClass.vue

@@ -80,10 +80,10 @@
               <div>
                 <!-- v-if="scope.row.type !='MIX'" -->
                 <el-button type="text"
-                           @click="resetClass(scope.row)">修改</el-button>
+                           @click="resetClass(scope.row)">学员调整</el-button>
                 <!-- <el-button type="text"
-                           @click="classAdjustment(scope.row)">班级调整</el-button>
-                <el-button type="text"
+                           @click="classAdjustment(scope.row)">班级调整</el-button> -->
+                <!--<el-button type="text"
                            @click="recourse(scope.row)">重新排课</el-button> -->
                 <el-popover placement="top"
                             width="160"
@@ -107,7 +107,7 @@
         </el-table>
         <div class="floor">
           <div class="add"
-               @click="temporary">临时调整</div>
+               @click="temporary">新建临时班</div>
           <div class='add'
                @click="addNewClass('NORMAL')">新建单技班</div>
           <div class='add'
@@ -117,6 +117,7 @@
         </div>
       </div>
     </div>
+    <!-- 学员选择 -->
     <el-dialog title="学员选择"
                width="700px"
                :visible.sync="studentVisible"
@@ -346,7 +347,7 @@
             <el-time-select placeholder=""
                             v-model="item.startClassTime"
                             :picker-options="{
-                               start: '08:30',
+                               start: '04:30',
                                step: '00:05',
                                end: '23:55'
             }">
@@ -355,7 +356,7 @@
             <el-time-select placeholder=""
                             v-model="item.endClassTime"
                             :picker-options="{
-                              start: '08:30',
+                              start: '04:30',
                               step: '00:05',
                               end: '23:55',
                               minTime:item.startClassTime
@@ -454,7 +455,7 @@
       </div>
     </el-dialog>
     <!-- 班级调整 -->
-    <el-dialog title="班级调整"
+    <!-- <el-dialog title="班级调整"
                width="500px"
                :visible.sync="resetClassVisible"
                :modal-append-to-body="false">
@@ -504,13 +505,12 @@
       <div slot="footer"
            class="dialog-footer">
         <el-button @click="resetClassVisible = false">取 消</el-button>
-        <!-- 班级学员修改 -->
         <el-button type="primary"
                    @click="">确 定</el-button>
       </div>
-    </el-dialog>
+    </el-dialog> -->
     <!-- 重新排课 -->
-    <el-dialog title="重新排课"
+    <!-- <el-dialog title="重新排课"
                width="700px"
                :visible.sync="resetCourseVisible"
                :modal-append-to-body="false">
@@ -585,11 +585,10 @@
       <div slot="footer"
            class="dialog-footer">
         <el-button @click="resetCourseVisible = false">取 消</el-button>
-        <!-- 班级学员修改 -->
         <el-button type="primary"
                    @click="">确 定</el-button>
       </div>
-    </el-dialog>
+    </el-dialog> -->
   </div>
 </template>
 <script>
@@ -648,13 +647,6 @@ export default {
       }],
       teacherList: [], // 存储的老师列表
       courseTypeList: [
-        { value: 'SINGLE', label: '单技课' },
-        { value: 'MIX', label: '合奏课' },
-        { value: 'TRAINING_SINGLE', label: '集训单技课' },
-        { value: 'TRAINING_MIX', label: '集训合奏课' },
-        { value: 'HIGH', label: '基础技能课' },
-        { value: 'COMPREHENSIVE', label: '综合课' },
-        { value: 'CLASSROOM', label: '课堂课' },
       ],
       weekDateList: [
         { value: '1', label: '星期一' },
@@ -789,11 +781,61 @@ export default {
       this.isSearch = true;
       this.className = '';
       this.isTemporary = true;
-
+      this.setType('SNAP');
+      this.getNoClassStudent('SNAP')
+    },
+    setType (type) {
+      switch (type) {
+        case 'NORMAL': {
+          this.courseTypeList = [
+            { value: 'SINGLE', label: '单技课' },
+            { value: 'TRAINING_SINGLE', label: '集训单技课' },
+            { value: 'COMPREHENSIVE', label: '综合课' },
+            { value: 'CLASSROOM', label: '课堂课' },
+          ]
+          break;
+        }
+        case 'MIX': {
+          this.courseTypeList = [
+            { value: 'MIX', label: '合奏课' },
+            { value: 'TRAINING_MIX', label: '集训合奏课' },
+            { value: 'COMPREHENSIVE', label: '综合课' },
+            { value: 'CLASSROOM', label: '课堂课' },
+          ]
+          break;
+        }
+        case 'HIGH': {
+          this.courseTypeList = [
+            { value: 'SINGLE', label: '单技课' },
+            { value: 'TRAINING_SINGLE', label: '集训单技课' },
+            { value: 'HIGH', label: '基础技能课' },
+            { value: 'COMPREHENSIVE', label: '综合课' },
+            { value: 'CLASSROOM', label: '课堂课' },
+          ]
+          break;
+        }
+        case 'SNAP': {
+          this.courseTypeList = [
+            { value: 'SINGLE', label: '单技课' },
+            { value: 'MIX', label: '合奏课' },
+            { value: 'TRAINING_SINGLE', label: '集训单技课' },
+            { value: 'TRAINING_MIX', label: '集训合奏课' },
+            { value: 'HIGH', label: '基础技能课' },
+            { value: 'COMPREHENSIVE', label: '综合课' },
+            { value: 'CLASSROOM', label: '课堂课' },
+          ]
+        }
+      }
     },
-
     // 新增班级
     addNewClass (type) {
+      /**
+       *      { value: 'NORMAL', label: '单技班' },
+        { value: 'MIX', label: '合奏班' },
+        { value: 'HIGH', label: '基础技能班' },
+        { value: 'SNAP', label: '临时班' },
+       */
+      this.setType(type);
       this.activeType = type;
       this.activeClass = '';
       this.activeListStudent = [];
@@ -861,7 +903,8 @@ export default {
       this.studentVisible = true;
       this.activeClass = row.id
       this.isSearch = false;
-      console.log(row);
+      this.activeType = row.type;
+      // console.log(row);
       // 根据单机班id 查询单技班内的所有学生
       getClassAllStudent({ classGroupId: row.id }).then(res => {
         if (res.code == 200) {
@@ -876,16 +919,16 @@ export default {
     },
     // 班级调整
     classAdjustment (row) {
-      this.resetClassForm.assistant = [];
+      this.teacherForm.assistant = [];
       for (let i in row.classGroupTeacherMapperList) {
         if (row.classGroupTeacherMapperList[i].teacherRole == 'BISHOP') {
-          this.resetClassForm.coreTeacher = row.classGroupTeacherMapperList[i].userId;
+          this.teacherForm.coreTeacher = row.classGroupTeacherMapperList[i].userId;
         }
         if (row.classGroupTeacherMapperList[i].teacherRole == 'TEACHING') {
-          this.resetClassForm.assistant.push(row.classGroupTeacherMapperList[i].userId)
+          this.teacherForm.assistant.push(row.classGroupTeacherMapperList[i].userId)
         }
       }
-      this.resetClassVisible = true;
+      this.infoVisible = true;
     },
     getNoClassStudent (type) {
       // 获取乐团内所有未分班的学生
@@ -902,19 +945,39 @@ export default {
       //     }
       //   })
       // }
+      // res.data - activeListStudent
       getMusicGroupStuNoClassType({ musicGroupId: this.teamid, type }).then(res => {
         if (res.code == 200) {
-          this.studentList = res.data
+          // this.studentList = res.data.concat(this.activeListStudent).filter(item=>{
+          //   return res.data
+          // });
+          if (this.activeType == 'SNAP') {
+            let idarr1 = [];
+            let idarr2 = [];
+            let arr3 = res.data.concat(this.activeListStudent);
+            for (let i in res.data) {
+              idarr1.push(res.data[i].userId);
+            }
+            for (let j in this.activeListStudent) {
+              idarr2.push(this.activeListStudent[j].userId);
+            }
+            this.studentList = arr3.filter(item => {
+              return idarr1.indexOf(item.userId) === -1 || (idarr2.indexOf(item.userId) === -1)
+            })
+          } else {
+            this.studentList = res.data;
+          }
+
         }
       })
 
     },
     // 删除学生 调整
     removeStudent (item) {
-      // console.log(item.userId);
       // removeStudents({ classGroupId:}).then(res => {
       removeStudents({ classGroupId: this.activeClass, userId: item.userId }).then(res => {
         if (res.code == 200) {
+          this.$message.success('删除成功');
           item.isVisible = false;
           // 这里刷新 this.studentList this.activeListStudent 
           this.getList(this.activeMixClass);
@@ -923,16 +986,16 @@ export default {
               this.activeListStudent = res.data;
             }
           })
-          getNoClassStudentAll({ musicGroupId: this.teamid }).then(res => {
-            if (res.code == 200) {
-              this.$message.success('删除成功');
-              this.studentList = res.data.map(item => {
-                item.isVisible = false;
-                return item;
-              });
-
-            }
-          })
+          this.getNoClassStudent(this.activeType);
+          // getNoClassStudentAll({ musicGroupId: this.teamid }).then(res => {
+          //   if (res.code == 200) {
+          //     this.$message.success('删除成功');
+          //     this.studentList = res.data.map(item => {
+          //       item.isVisible = false;
+          //       return item;
+          //     });
+          //   }
+          // })
         }
       })
     },
@@ -942,9 +1005,15 @@ export default {
       let arr = this.chioseStudent.map(item => {
         return item.userId;
       });
+      if (arr.length <= 0) {
+        this.$message.error('至少添加一名学员')
+        return;
+      }
       addStudents({ classGroupId: this.activeClass, userIdsStr: arr.join(',') }).then(res => {
         if (res.code == 200) {
           this.studentVisible = false;
+          this.$message.success('添加成功')
+          this.getList()
         }
       })
     },

src/views/teamDetail/components/teamTeacherRecord.vue

@@ -32,6 +32,7 @@
       </el-form-item>
       <el-form-item>
         <el-input v-model="searchForm.teacher"
+                  @keyup.enter.native='search'
                   placeholder="请输入老师姓名"></el-input>
       </el-form-item>
       <el-form-item>

src/views/teamDetail/teamList.vue

@@ -19,6 +19,7 @@
                :model="topForm">
         <el-form-item prop='teamName'>
           <el-input v-model="topForm.teamName"
+                    @keyup.enter.native='search'
                     placeholder="请输入乐团名称"></el-input>
         </el-form-item>
         <el-form-item prop='orgin'>
@@ -149,30 +150,25 @@
             <template slot-scope="scope">
               <div>
                 <el-button type="text"
-                           v-permission="'/setImprovement'"
-                           v-if="scope.row.status == 'PREPARE'"
+                           v-if="scope.row.status == 'PREPARE' && permission('/setImprovement')"
                            @click="gotoImprovement(scope.row)">基础技能班</el-button>
                 <el-button type="text"
-                           v-if="scope.row.status == 'PREPARE'"
-                           v-permission="'/teamDetailedList'"
+                           v-if="scope.row.status == 'PREPARE' && permission('/teamDetailedList')"
                            @click="gotodetailList(scope.row)">发放清单</el-button>
 
                 <!-- 报名中&缴费中 查看 -->
                 <el-button type="text"
-                           v-permission="'/signupList'"
-                           v-if="scope.row.status == 'APPLY'|| scope.row.status == 'PAY'"
+                           v-if="(scope.row.status == 'APPLY'|| scope.row.status == 'PAY')  && permission('/signupList')"
                            @click="lookTeamDetail(scope.row)">查看</el-button>
 
                 <!-- 进行中 查看 -->
                 <el-button type="text"
-                           v-permission="'/teamDetails'"
-                           v-if="scope.row.status == 'PROGRESS'"
+                           v-if="scope.row.status == 'PROGRESS' && permission('/teamDetails')"
                            @click="lookTeamDetail(scope.row)">查看</el-button>
 
                 <!-- 暂停中 查看 -->
                 <el-button type="text"
-                           v-permission="'musicGroup/pauseMusicGroup/look'"
-                           v-if="scope.row.status == 'PAUSE'"
+                           v-if="scope.row.status == 'PAUSE' && permission('musicGroup/pauseMusicGroup/look')"
                            @click="lookTeamDetail(scope.row)">查看</el-button>
 
                 <!-- <el-button type="text"
@@ -180,39 +176,31 @@
                            @click="lookTeamDetail(scope.row)">编辑</el-button> -->
                 <!-- 筹备中 编辑 -->
                 <el-button type="text"
-                           v-permission="'teamDetail/teamSeting/update'"
-                           v-if="scope.row.status == 'PREPARE'"
+                           v-if="scope.row.status == 'PREPARE' && permission('teamDetail/teamSeting/update')"
                            @click="lookTeamDetail(scope.row)">编辑</el-button>
                 <!-- 审核中 编辑 -->
                 <el-button type="text"
-                           v-permission="'teamDetail/audit/update'"
-                           v-if="scope.row.status == 'AUDIT'"
-                           @click="lookTeamDetail(scope.row)">审核确认</el-button>
+                           v-if="scope.row.status == 'AUDIT' && permission('teamDetail/audit/update')"
+                           @click="lookTeamDetail(scope.row)">编辑</el-button>
                 <!-- 编辑中 编辑 -->
                 <el-button type="text"
-                           v-permission="'teamDetail/draft/update'"
-                           v-if="scope.row.status == 'DRAFT'"
+                           v-if="scope.row.status == 'DRAFT' && permission('teamDetail/draft/update')"
                            @click="lookTeamDetail(scope.row)">编辑</el-button>
                 <!-- 审核失败 编辑 -->
                 <el-button type="text"
-                           v-permission="'teamDetail/aduitFailed/update'"
-                           v-if="scope.row.status == 'AUDIT_FAILED'"
+                           v-if="scope.row.status == 'AUDIT_FAILED' && permission('teamDetail/aduitFailed/update')"
                            @click="lookTeamDetail(scope.row)">编辑</el-button>
 
-                <el-button v-if="scope.row.status == 'PREPARE'"
-                           v-permission="'musicGroup/action'"
+                <el-button v-if="scope.row.status == 'PREPARE' && permission('musicGroup/action')"
                            @click="startTeam(scope.row)"
                            type="text">确认成团</el-button>
                 <el-button type="text"
-                           v-permission="'musicGroup/cancelMusicGroup'"
-                           v-if="scope.row.status == 'AUDIT'"
+                           v-if="scope.row.status == 'AUDIT' && permission('musicGroup/cancelMusicGroup')"
                            @click="stopTeam(scope.row)">取消申请</el-button>
-                <el-button v-if="scope.row.status == 'PAUSE'"
-                           v-permission="'musicGroup/resumeMusicGroup'"
+                <el-button v-if="scope.row.status == 'PAUSE' && permission('musicGroup/resumeMusicGroup')"
                            @click="onTeamOpeation('start', scope.row)"
                            type="text">启动</el-button>
-                <el-button v-if="scope.row.status == 'PROGRESS'"
-                           v-permission="'musicGroup/pauseMusicGroup'"
+                <el-button v-if="scope.row.status == 'PROGRESS' && permission('musicGroup/pauseMusicGroup')"
                            @click="onTeamOpeation('pause', scope.row)"
                            type="text">暂停</el-button>
                 <el-button v-if="scope.row.status == 'PROGRESS'"
@@ -240,6 +228,7 @@ 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'
+import { permission } from '@/utils/directivePage'
 export default {
   name: "Main",
   data () {
@@ -295,6 +284,9 @@ export default {
     // })
   },
   methods: {
+    permission (str) {
+      return permission(str)
+    },
     reset () {
       this.rules.page = 1;
       this.$refs['topForm'].resetFields();

src/views/vipClass/vipDetail/components/vipStudentList.vue

@@ -49,6 +49,7 @@
                :inline="true">
         <el-form-item>
           <el-input placeholder="请输入学生姓名或手机号"
+                    @keyup.enter.native='search'
                     v-model='maskForm.search'></el-input>
         </el-form-item>
         <el-form-item>

src/views/vipClass/vipList.vue

@@ -45,7 +45,7 @@
         </el-form-item>
         <el-form-item>
           <el-input v-model="searchForm.search"
-                    @keyup.enter.native='getList'
+                    @keyup.enter.native='search'
                     placeholder="课程名称"></el-input>
         </el-form-item>
         <el-form-item>
@@ -90,8 +90,8 @@
                            label="课程单价">
             <template slot-scope="scope">
               <div>
-                <p>线上课单价:{{scope.row.onlineClassesUnitPrice}}</p>
-                <p>线下课单价:{{scope.row.offlineClassesUnitPrice}}</p>
+                <p>线上:{{scope.row.onlineClassesUnitPrice}}</p>
+                <p>线下:{{scope.row.offlineClassesUnitPrice}}</p>
               </div>
             </template>
           </el-table-column>

src/views/vipClass/vipReset.vue

@@ -11,18 +11,15 @@
       <el-table :data='tableList'
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}">
         <el-table-column label="课程名称"
-                         width="150"
                          align="center"
                          prop="name">
         </el-table-column>
         <el-table-column label="班级id"
-                         width="150"
                          align="center"
                          prop="classGroupId">
         </el-table-column>
         <el-table-column label="上课日期"
                          align="center"
-                         width="150"
                          prop="classDate">
           <template slot-scope="scope">
             <div>
@@ -32,7 +29,6 @@
         </el-table-column>
         <el-table-column label="课程状态"
                          align="center"
-                         width="150"
                          prop="status">
           <template slot-scope="scope">
             <div>
@@ -42,16 +38,13 @@
         </el-table-column>
         <el-table-column label="上课开始时间"
                          align="center"
-                         width="150"
                          prop="startClassTimeStr">
         </el-table-column>
         <el-table-column label="上课结束时间"
                          align="center"
-                         width="150"
                          prop="endClassTimeStr">
         </el-table-column>
         <el-table-column label="课程类型"
-                         width="150"
                          align="center">
           <template slot-scope="scope">
             <div>
@@ -61,15 +54,16 @@
         </el-table-column>
         <el-table-column label="教学点"
                          align="center"
-                         width="300"
                          prop="schoolName">
         </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
             <div>
               <el-button type="text"
+                         v-if="!scope.row.isSettlement"
                          @click="resetClass(scope.row)">调整</el-button>
               <el-button type="text"
+                         v-if="scope.row.status != 'OVER'"
                          @click="removeClass(scope.row)">删除</el-button>
             </div>
           </template>
@@ -104,7 +98,7 @@
           <el-time-select placeholder="起始时间"
                           v-model="maskForm.startTime"
                           :picker-options="{
-                            start: '06:30',
+                            start: '04:30',
                             step: '00:05',
                             end: '23:30'
                             }">
@@ -115,7 +109,7 @@
           <el-time-select placeholder="结束时间"
                           v-model="maskForm.endTime"
                           :picker-options="{
-                            start: '06:30',
+                            start: '04:30',
                             step: '00:05',
                             end: '23:30',
                             minTime: maskForm.startTime
@@ -164,7 +158,7 @@
             <div>
               <el-time-select v-model="scope.row.startClassTimeStr"
                               :picker-options="{
-                                start: '06:30',
+                                start: '04:30',
                                 step: '00:05',
                                 end: '23:30'
                               }"

vue.config.js

@@ -17,11 +17,11 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // http://47.99.212.176:8000 
 // 
 // let target = 'http://testadm.dayaedu.com/' //勇哥迁库
-let target = 'http://192.168.3.27:8000' // 箭河
+// let target = 'http://192.168.3.27:8000' // 箭河
 // let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:18000' //勇哥
 // let target = 'http://47.99.212.176:8000' // 测试服
-// let target = 'http://192.168.3.48:8080' // 乔
+let target = 'http://192.168.3.48:8080' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**