Browse Source

1225 17:48

111
mo 5 years ago
parent
commit
539a816784
26 changed files with 307 additions and 143 deletions
  1. 3 0
      src/views/buildVip/index.vue
  2. 4 1
      src/views/businessManager/shopManager/shopOperation.vue
  3. 8 3
      src/views/categroyManager/insideSetting/branchActiveOperation.vue
  4. 2 0
      src/views/categroyManager/insideSetting/chargeProfitManager.vue
  5. 6 0
      src/views/categroyManager/insideSetting/gradientSet.vue
  6. 1 0
      src/views/categroyManager/specialSetup/charges.vue
  7. 1 0
      src/views/categroyManager/specialSetup/chargesList.vue
  8. 2 0
      src/views/categroyManager/vipActiveList.vue
  9. 6 0
      src/views/categroyManager/vipNewActive.vue
  10. 101 64
      src/views/journal/musicGroup.vue
  11. 97 52
      src/views/journal/studentComplain.vue
  12. 1 0
      src/views/resetTeaming/components/resetSound.vue
  13. 1 0
      src/views/sporadicManager/sporadicList.vue
  14. 14 4
      src/views/teacherManager/teacherDetail/components/settlement.vue
  15. 6 0
      src/views/teacherManager/teacherOperation/components/salarySet.vue
  16. 2 0
      src/views/teamBuild/components/teamBaseInfo.vue
  17. 1 0
      src/views/teamBuild/components/teamResetSound.vue
  18. 16 1
      src/views/teamBuild/components/teamSoundMoney.vue
  19. 8 5
      src/views/teamBuild/signupList.vue
  20. 1 0
      src/views/teamBuild/teamSeting/components/coursePlan.vue
  21. 1 0
      src/views/teamBuild/teamSeting/components/improvementClass.vue
  22. 1 0
      src/views/teamDetail/components/resetClass.vue
  23. 19 11
      src/views/teamDetail/components/studentList.vue
  24. 2 0
      src/views/vipClass/vipDetail/components/vipBaseInfo.vue
  25. 2 2
      src/views/vipClass/vipList.vue
  26. 1 0
      src/views/vipClass/vipReset.vue

+ 3 - 0
src/views/buildVip/index.vue

@@ -82,6 +82,7 @@
           </el-form-item>
           </el-form-item>
           <el-form-item label="每班人数">
           <el-form-item label="每班人数">
             <el-input type="number"
             <el-input type="number"
+                      @mousewheel.native.prevent
                       v-model="leftForm.classNum"
                       v-model="leftForm.classNum"
                       disabled />
                       disabled />
           </el-form-item>
           </el-form-item>
@@ -141,11 +142,13 @@
           <el-form-item v-if="hasOnline"
           <el-form-item v-if="hasOnline"
                         label="线上课数">
                         label="线上课数">
             <el-input v-model="centerForm.onlineCourseNum"
             <el-input v-model="centerForm.onlineCourseNum"
+                      @mousewheel.native.prevent
                       type='number' />
                       type='number' />
           </el-form-item>
           </el-form-item>
           <el-form-item v-if="hasOffline"
           <el-form-item v-if="hasOffline"
                         label="线下课数">
                         label="线下课数">
             <el-input v-model="centerForm.offlineCourseNum"
             <el-input v-model="centerForm.offlineCourseNum"
+                      @mousewheel.native.prevent
                       type='number' />
                       type='number' />
           </el-form-item>
           </el-form-item>
           <el-form-item label="待排课数">
           <el-form-item label="待排课数">

+ 4 - 1
src/views/businessManager/shopManager/shopOperation.vue

@@ -52,16 +52,19 @@
         <el-form-item label="商品价格"
         <el-form-item label="商品价格"
                       prop="marketPrice">
                       prop="marketPrice">
           <el-input type="number"
           <el-input type="number"
+                    @mousewheel.native.prevent
                     v-model="form.marketPrice"></el-input>
                     v-model="form.marketPrice"></el-input>
         </el-form-item>
         </el-form-item>
         <el-form-item label="商品团购价"
         <el-form-item label="商品团购价"
                       prop="groupPurchasePrice">
                       prop="groupPurchasePrice">
           <el-input type="number"
           <el-input type="number"
+                    @mousewheel.native.prevent
                     v-model="form.groupPurchasePrice"></el-input>
                     v-model="form.groupPurchasePrice"></el-input>
         </el-form-item>
         </el-form-item>
         <el-form-item label="商品采购价"
         <el-form-item label="商品采购价"
                       prop="discountPrice">
                       prop="discountPrice">
           <el-input type="number"
           <el-input type="number"
+                    @mousewheel.native.prevent
                     v-model="form.discountPrice"></el-input>
                     v-model="form.discountPrice"></el-input>
         </el-form-item>
         </el-form-item>
         <el-form-item label="商品图片"
         <el-form-item label="商品图片"
@@ -162,7 +165,7 @@ export default {
   },
   },
   created () {
   created () {
     let query = this.$route.query
     let query = this.$route.query
-    if(query.paramInfo) {
+    if (query.paramInfo) {
       let paramInfo = JSON.parse(query.paramInfo)
       let paramInfo = JSON.parse(query.paramInfo)
       this.pageType = paramInfo.type
       this.pageType = paramInfo.type
       this.id = paramInfo.id
       this.id = paramInfo.id

+ 8 - 3
src/views/categroyManager/insideSetting/branchActiveOperation.vue

@@ -33,18 +33,23 @@
                v-for="(domain, index) in result.domains"
                v-for="(domain, index) in result.domains"
                :key="domain.key">
                :key="domain.key">
             <el-form-item :label="'梯度' + (index + 1)">
             <el-form-item :label="'梯度' + (index + 1)">
-              <el-input type="number" v-number
+              <el-input type="number"
+                        v-number
                         :disabled="domain.disabled"
                         :disabled="domain.disabled"
+                        @mousewheel.native.prevent
                         v-model="domain.min"></el-input>
                         v-model="domain.min"></el-input>
             </el-form-item>
             </el-form-item>
             <el-form-item>
             <el-form-item>
-              <el-input type="number" v-number
+              <el-input type="number"
+                        @mousewheel.native.prevent
+                        v-number
                         :disabled="domain.disabled"
                         :disabled="domain.disabled"
                         v-model="domain.max"></el-input>
                         v-model="domain.max"></el-input>
             </el-form-item>
             </el-form-item>
             <el-form-item>
             <el-form-item>
               <el-input style="width: auto;"
               <el-input style="width: auto;"
                         type="number"
                         type="number"
+                        @mousewheel.native.prevent
                         :disabled="domain.disabled"
                         :disabled="domain.disabled"
                         v-model="domain.money"></el-input>
                         v-model="domain.money"></el-input>
               <el-button v-if="index != 0 && !domain.disabled"
               <el-button v-if="index != 0 && !domain.disabled"
@@ -229,7 +234,7 @@ export default {
         if (valid && !result.errorText) {
         if (valid && !result.errorText) {
           // 如果奖励金额为空时,默认为0
           // 如果奖励金额为空时,默认为0
           result.domains.forEach(item => {
           result.domains.forEach(item => {
-            if(!item.money) {
+            if (!item.money) {
               item.money = 0
               item.money = 0
             }
             }
           })
           })

+ 2 - 0
src/views/categroyManager/insideSetting/chargeProfitManager.vue

@@ -94,6 +94,7 @@
                         prop="comScale"
                         prop="comScale"
                         :label-width="formLabelWidth">
                         :label-width="formLabelWidth">
             <el-input type="number"
             <el-input type="number"
+                      @mousewheel.native.prevent
                       min="0"
                       min="0"
                       max="10"
                       max="10"
                       v-model="form.comScale"></el-input>
                       v-model="form.comScale"></el-input>
@@ -102,6 +103,7 @@
                         prop="perScale"
                         prop="perScale"
                         :label-width="formLabelWidth">
                         :label-width="formLabelWidth">
             <el-input type="number"
             <el-input type="number"
+                      @mousewheel.native.prevent
                       min="0"
                       min="0"
                       max="10"
                       max="10"
                       v-model="form.perScale"></el-input>
                       v-model="form.perScale"></el-input>

+ 6 - 0
src/views/categroyManager/insideSetting/gradientSet.vue

@@ -18,11 +18,13 @@
                    :key="domain.key">
                    :key="domain.key">
                 <el-form-item :label="'梯度' + (index + 1)">
                 <el-form-item :label="'梯度' + (index + 1)">
                   <el-input type="number"
                   <el-input type="number"
+                            @mousewheel.native.prevent
                             :disabled="domain.disabled"
                             :disabled="domain.disabled"
                             v-model="domain.min"></el-input>
                             v-model="domain.min"></el-input>
                 </el-form-item>
                 </el-form-item>
                 <el-form-item>
                 <el-form-item>
                   <el-input type="number"
                   <el-input type="number"
+                            @mousewheel.native.prevent
                             :disabled="domain.disabled"
                             :disabled="domain.disabled"
                             v-model="domain.max"></el-input>
                             v-model="domain.max"></el-input>
                   <el-button v-if="index != 0 && !domain.disabled"
                   <el-button v-if="index != 0 && !domain.disabled"
@@ -54,11 +56,13 @@
                    :key="domain.key">
                    :key="domain.key">
                 <el-form-item :label="'梯度' + (index + 1)">
                 <el-form-item :label="'梯度' + (index + 1)">
                   <el-input type="number"
                   <el-input type="number"
+                            @mousewheel.native.prevent
                             :disabled="domain.disabled"
                             :disabled="domain.disabled"
                             v-model="domain.min"></el-input>
                             v-model="domain.min"></el-input>
                 </el-form-item>
                 </el-form-item>
                 <el-form-item>
                 <el-form-item>
                   <el-input type="number"
                   <el-input type="number"
+                            @mousewheel.native.prevent
                             :disabled="domain.disabled"
                             :disabled="domain.disabled"
                             v-model="domain.max"></el-input>
                             v-model="domain.max"></el-input>
                   <el-button v-if="index != 0 && !domain.disabled"
                   <el-button v-if="index != 0 && !domain.disabled"
@@ -90,11 +94,13 @@
                    :key="domain.key">
                    :key="domain.key">
                 <el-form-item :label="'梯度' + (index + 1)">
                 <el-form-item :label="'梯度' + (index + 1)">
                   <el-input type="number"
                   <el-input type="number"
+                            @mousewheel.native.prevent
                             :disabled="domain.disabled"
                             :disabled="domain.disabled"
                             v-model="domain.min"></el-input>
                             v-model="domain.min"></el-input>
                 </el-form-item>
                 </el-form-item>
                 <el-form-item>
                 <el-form-item>
                   <el-input type="number"
                   <el-input type="number"
+                            @mousewheel.native.prevent
                             :disabled="domain.disabled"
                             :disabled="domain.disabled"
                             v-model="domain.max"></el-input>
                             v-model="domain.max"></el-input>
                   <el-button v-if="index != 0 && !domain.disabled"
                   <el-button v-if="index != 0 && !domain.disabled"

+ 1 - 0
src/views/categroyManager/specialSetup/charges.vue

@@ -39,6 +39,7 @@
                         prop="price"
                         prop="price"
                         :label-width="formLabelWidth">
                         :label-width="formLabelWidth">
             <el-input type="number"
             <el-input type="number"
+                      @mousewheel.native.prevent
                       v-model="form.price"
                       v-model="form.price"
                       autocomplete="off"></el-input>
                       autocomplete="off"></el-input>
           </el-form-item>
           </el-form-item>

+ 1 - 0
src/views/categroyManager/specialSetup/chargesList.vue

@@ -70,6 +70,7 @@
                         prop="courseFee"
                         prop="courseFee"
                         :label-width="formLabelWidth">
                         :label-width="formLabelWidth">
             <el-input type="number"
             <el-input type="number"
+                      @mousewheel.native.prevent
                       v-model="form.courseFee"
                       v-model="form.courseFee"
                       autocomplete="off"></el-input>
                       autocomplete="off"></el-input>
           </el-form-item>
           </el-form-item>

+ 2 - 0
src/views/categroyManager/vipActiveList.vue

@@ -222,6 +222,7 @@
               <el-input placeholder="请输入"
               <el-input placeholder="请输入"
                         style="width:100px"
                         style="width:100px"
                         type="number"
                         type="number"
+                        @mousewheel.native.prevent
                         v-if='onlineSalary!= "TEACHER_DEFAULT"'
                         v-if='onlineSalary!= "TEACHER_DEFAULT"'
                         v-model="onlineprice"></el-input>
                         v-model="onlineprice"></el-input>
             </div>
             </div>
@@ -242,6 +243,7 @@
                         style="width:100px"
                         style="width:100px"
                         v-if='unonlineSalary!= "TEACHER_DEFAULT"'
                         v-if='unonlineSalary!= "TEACHER_DEFAULT"'
                         type="number"
                         type="number"
+                        @mousewheel.native.prevent
                         v-model="unonlineprice"></el-input>
                         v-model="unonlineprice"></el-input>
             </div>
             </div>
             <div class="chioseWrap">
             <div class="chioseWrap">

+ 6 - 0
src/views/categroyManager/vipNewActive.vue

@@ -92,6 +92,7 @@
                       v-if='onlineSalary== "RATIO_DISCOUNT"'
                       v-if='onlineSalary== "RATIO_DISCOUNT"'
                       style="width:200px;"
                       style="width:200px;"
                       type="number"
                       type="number"
+                      @mousewheel.native.prevent
                       v-model="onlineprice">
                       v-model="onlineprice">
               <template slot="append">%</template>
               <template slot="append">%</template>
             </el-input>
             </el-input>
@@ -99,6 +100,7 @@
                       v-if='onlineSalary == "FIXED_SALARY"'
                       v-if='onlineSalary == "FIXED_SALARY"'
                       style="width:200px;"
                       style="width:200px;"
                       type="number"
                       type="number"
+                      @mousewheel.native.prevent
                       v-model="onlineprice">
                       v-model="onlineprice">
               <template slot="append">元</template>
               <template slot="append">元</template>
             </el-input>
             </el-input>
@@ -120,6 +122,7 @@
                       v-if='unonlineSalary== "RATIO_DISCOUNT"'
                       v-if='unonlineSalary== "RATIO_DISCOUNT"'
                       style="width:200px;"
                       style="width:200px;"
                       type="number"
                       type="number"
+                      @mousewheel.native.prevent
                       v-model="unonlineprice">
                       v-model="unonlineprice">
               <template slot="append">%</template>
               <template slot="append">%</template>
             </el-input>
             </el-input>
@@ -127,6 +130,7 @@
                       style="width:200px;"
                       style="width:200px;"
                       v-if='unonlineSalary== "FIXED_SALARY"'
                       v-if='unonlineSalary== "FIXED_SALARY"'
                       type="number"
                       type="number"
+                      @mousewheel.native.prevent
                       v-model="unonlineprice">
                       v-model="unonlineprice">
               <template slot="append">元</template>
               <template slot="append">元</template>
             </el-input>
             </el-input>
@@ -168,12 +172,14 @@
                       v-if="activeType=='GIVE_CLASS'"
                       v-if="activeType=='GIVE_CLASS'"
                       v-model="attribute1"
                       v-model="attribute1"
                       type="number"
                       type="number"
+                      @mousewheel.native.prevent
                       style='margin-right:10px;width:200px!important'>
                       style='margin-right:10px;width:200px!important'>
               <template slot="append">节</template>
               <template slot="append">节</template>
             </el-input> <span v-if="activeType=='GIVE_CLASS'">赠</span>
             </el-input> <span v-if="activeType=='GIVE_CLASS'">赠</span>
             <el-input v-if="activeType=='GIVE_CLASS'"
             <el-input v-if="activeType=='GIVE_CLASS'"
                       placeholder="请输入赠送课时数"
                       placeholder="请输入赠送课时数"
                       type="number"
                       type="number"
+                      @mousewheel.native.prevent
                       v-model="attribute2"
                       v-model="attribute2"
                       style='margin:0 10px;width:200px!important'>
                       style='margin:0 10px;width:200px!important'>
               <template slot="append">节</template>
               <template slot="append">节</template>

+ 101 - 64
src/views/journal/musicGroup.vue

@@ -1,42 +1,59 @@
 <template>
 <template>
   <div class='infoWrap'>
   <div class='infoWrap'>
     <div class="left">
     <div class="left">
-      <div class="unread" @click="onLookMessage('all')">全部</div>
-      <div class="unread" @click="onLookMessage('0')"> <img :src="img.boxicon"
+      <div class="unread"
+           @click="onLookMessage('all')">全部</div>
+      <div class="unread"
+           @click="onLookMessage('0')"> <img :src="img.boxicon"
              alt=""> 未读消息
              alt=""> 未读消息
-        <div class="count" v-if="noReadMessage >= 1">{{ noReadMessage }}</div>
+        <div class="count"
+             v-if="noReadMessage >= 1">{{ noReadMessage }}</div>
       </div>
       </div>
-      <div class="read" @click="onLookMessage('1')">
+      <div class="read"
+           @click="onLookMessage('1')">
         <img :src="img.bookicon"
         <img :src="img.bookicon"
              alt="">
              alt="">
         已读消息</div>
         已读消息</div>
     </div>
     </div>
     <div class="middle">
     <div class="middle">
-      <div class="msgItem" :class="[isCheckMessage == item.id ? 'active' : '']" @click="onClickRead(item)" v-for="(item, index) in dataList" :key="index">
+      <div class="msgItem"
+           :class="[isCheckMessage == item.id ? 'active' : '']"
+           @click="onClickRead(item)"
+           v-for="(item, index) in dataList"
+           :key="index">
         <!-- <h6 class="type"></h6> -->
         <!-- <h6 class="type"></h6> -->
         <h4 class="name">
         <h4 class="name">
           {{ item.memo.type == 'VIPGROUP' ? '学员退课' : '学生退团' }}
           {{ item.memo.type == 'VIPGROUP' ? '学员退课' : '学生退团' }}
           <span class='time'>{{ item.createOn }}</span>
           <span class='time'>{{ item.createOn }}</span>
-          <div class="dot" v-if="item.readStatus == 0"></div>
+          <div class="dot"
+               v-if="item.readStatus == 0"></div>
         </h4>
         </h4>
         <p class='msg'>{{ item.content }}</p>
         <p class='msg'>{{ item.content }}</p>
       </div>
       </div>
       <el-pagination style="text-align: right"
       <el-pagination style="text-align: right"
-        small v-if="dataList.length > 0"
-        @current-change="onChange"
-        :hide-on-single-page="pageInfo.isSinglePage"
-        layout="prev, pager, next"
-        :total="pageInfo.total">
+                     small
+                     v-if="dataList.length > 0"
+                     @current-change="onChange"
+                     :hide-on-single-page="pageInfo.isSinglePage"
+                     layout="prev, pager, next"
+                     :total="pageInfo.total">
       </el-pagination>
       </el-pagination>
     </div>
     </div>
-    <div class="right" v-if="showRight">
-      <div v-if="showMessage.type == 'VIPGROUP'" kay="group">
+    <div class="right"
+         v-if="showRight">
+      <div v-if="showMessage.type == 'VIPGROUP'"
+           kay="group">
         <el-row>
         <el-row>
           <el-col :span="24">
           <el-col :span="24">
             <h3 class="title">学员退课
             <h3 class="title">学员退课
-                <el-tag v-if="showMessage.studentApplyRefunds.status == 'DONE'" type="success" effect="plain">已处理</el-tag>
-                <el-tag v-if="showMessage.studentApplyRefunds.status == 'REJECT'" type="danger" effect="plain">已拒绝</el-tag>
-              <span class="time">时间: {{ showMessage.studentApplyRefunds.createTime }}</span></h3>
+              <el-tag v-if="showMessage.studentApplyRefunds.status == 'DONE'"
+                      type="success"
+                      effect="plain">已处理</el-tag>
+              <el-tag v-if="showMessage.studentApplyRefunds.status == 'REJECT'"
+                      type="danger"
+                      effect="plain">已拒绝</el-tag>
+              <span class="time">时间: {{ showMessage.studentApplyRefunds.createTime }}</span>
+            </h3>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
 
 
@@ -57,35 +74,48 @@
         <el-row>
         <el-row>
           <el-col :span="24">
           <el-col :span="24">
             <el-input :disabled="showMessage.studentApplyRefunds.status != 'ING'"
             <el-input :disabled="showMessage.studentApplyRefunds.status != 'ING'"
-              type="textarea" :rows="8" placeholder="请输入内容"
-              v-model="remark"> </el-input>
+                      type="textarea"
+                      :rows="8"
+                      placeholder="请输入内容"
+                      v-model="remark"> </el-input>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
         <el-row>
         <el-row>
           <el-col :span="4"> 实退金额: </el-col>
           <el-col :span="4"> 实退金额: </el-col>
-          <el-col :span="20"> 
+          <el-col :span="20">
             <el-input :disabled="showMessage.studentApplyRefunds.status != 'ING'"
             <el-input :disabled="showMessage.studentApplyRefunds.status != 'ING'"
-              type="number" placeholder="请输入内容"
-              v-model="actualAmount">
-                <template slot="append">元</template>
-              </el-input>
+                      type="number"
+                      placeholder="请输入内容"
+                      @mousewheel.native.prevent
+                      v-model="actualAmount">
+              <template slot="append">元</template>
+            </el-input>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
         <el-row v-permission="'musicGroupQuit/quitMusicGroup'">
         <el-row v-permission="'musicGroupQuit/quitMusicGroup'">
-          <el-col :span="24" v-if="showMessage.studentApplyRefunds.status == 'ING'">
-            <el-button type="primary" @click="onSubmit(showMessage.studentApplyRefunds.id, showMessage.type, 'DONE')">确认</el-button>
-            <el-button type="danger" @click="onSubmit(showMessage.studentApplyRefunds.id, showMessage.type, 'REJECT')">拒绝</el-button>
+          <el-col :span="24"
+                  v-if="showMessage.studentApplyRefunds.status == 'ING'">
+            <el-button type="primary"
+                       @click="onSubmit(showMessage.studentApplyRefunds.id, showMessage.type, 'DONE')">确认</el-button>
+            <el-button type="danger"
+                       @click="onSubmit(showMessage.studentApplyRefunds.id, showMessage.type, 'REJECT')">拒绝</el-button>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
       </div>
       </div>
 
 
-      <div v-else kay="group">
+      <div v-else
+           kay="group">
         <el-row>
         <el-row>
           <el-col :span="24">
           <el-col :span="24">
             <h3 class="title">乐团名称
             <h3 class="title">乐团名称
-                <el-tag v-if="showMessage.status == 'APPROVED'" type="success" effect="plain">已处理</el-tag>
-                <el-tag v-if="showMessage.status == 'DENIED'" type="danger" effect="plain">已拒绝</el-tag>
-              <span class="time">时间: {{ showMessage.createTime }}</span></h3>
+              <el-tag v-if="showMessage.status == 'APPROVED'"
+                      type="success"
+                      effect="plain">已处理</el-tag>
+              <el-tag v-if="showMessage.status == 'DENIED'"
+                      type="danger"
+                      effect="plain">已拒绝</el-tag>
+              <span class="time">时间: {{ showMessage.createTime }}</span>
+            </h3>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
 
 
@@ -102,14 +132,19 @@
         <el-row>
         <el-row>
           <el-col :span="24">
           <el-col :span="24">
             <el-input :disabled="showMessage.status != 'PROCESSING'"
             <el-input :disabled="showMessage.status != 'PROCESSING'"
-              type="textarea" :rows="8" placeholder="请输入内容"
-              v-model="remark"> </el-input>
+                      type="textarea"
+                      :rows="8"
+                      placeholder="请输入内容"
+                      v-model="remark"> </el-input>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
         <el-row v-permission="'vipGroupManage/applyRefundAudit'">
         <el-row v-permission="'vipGroupManage/applyRefundAudit'">
-          <el-col :span="24" v-if="showMessage.status == 'PROCESSING'">
-            <el-button type="primary" @click="onSubmitGroup(showMessage, 'APPROVED')">确认</el-button>
-            <el-button type="danger" @click="onSubmitGroup(showMessage, 'DENIED')">拒绝</el-button>
+          <el-col :span="24"
+                  v-if="showMessage.status == 'PROCESSING'">
+            <el-button type="primary"
+                       @click="onSubmitGroup(showMessage, 'APPROVED')">确认</el-button>
+            <el-button type="danger"
+                       @click="onSubmitGroup(showMessage, 'DENIED')">拒绝</el-button>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
 
 
@@ -122,8 +157,8 @@
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
-import { queryCountOfUnread, sysMessageList, setRead, 
-  queryApplyRefundDetail, applyRefundAudit, musicGroupQuit, quitMusicGroup } from '@/api/journal'
+import {  queryCountOfUnread, sysMessageList, setRead,
+  queryApplyRefundDetail, applyRefundAudit, musicGroupQuit, quitMusicGroup} from '@/api/journal'
 export default {
 export default {
   data () {
   data () {
     return {
     return {
@@ -151,29 +186,29 @@ export default {
       showMessage: {}
       showMessage: {}
     }
     }
   },
   },
-  mounted() {
+  mounted () {
     this.__init()
     this.__init()
     this.sysMessageList()
     this.sysMessageList()
   },
   },
   methods: {
   methods: {
-    __init() {
+    __init () {
       // 未读消息
       // 未读消息
       queryCountOfUnread().then(res => {
       queryCountOfUnread().then(res => {
-        if(res.code == 200) {
-          if(res.data && res.data.MUSICGROUP) {
+        if (res.code == 200) {
+          if (res.data && res.data.MUSICGROUP) {
             this.noReadMessage = res.data.MUSICGROUP
             this.noReadMessage = res.data.MUSICGROUP
           }
           }
         }
         }
       })
       })
     },
     },
-    sysMessageList() { // 列表
+    sysMessageList () { // 列表
       sysMessageList({
       sysMessageList({
         group: 'MUSICGROUP',
         group: 'MUSICGROUP',
         rows: this.pageInfo.limit,
         rows: this.pageInfo.limit,
         page: this.pageInfo.page,
         page: this.pageInfo.page,
         readStatus: this.pageInfo.readStatus
         readStatus: this.pageInfo.readStatus
       }).then(res => {
       }).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           res.data.rows.forEach(item => {
           res.data.rows.forEach(item => {
             item.memo = JSON.parse(item.memo)
             item.memo = JSON.parse(item.memo)
           })
           })
@@ -182,8 +217,8 @@ export default {
         }
         }
       })
       })
     },
     },
-    onLookMessage(type) { // 查看对应的数据
-      if(type == "all") {
+    onLookMessage (type) { // 查看对应的数据
+      if (type == "all") {
         this.pageInfo.readStatus = null
         this.pageInfo.readStatus = null
       } else {
       } else {
         this.pageInfo.readStatus = type
         this.pageInfo.readStatus = type
@@ -194,18 +229,18 @@ export default {
       this.isCheckMessage = null
       this.isCheckMessage = null
       this.sysMessageList()
       this.sysMessageList()
     },
     },
-    onChange(page) { // 分页
+    onChange (page) { // 分页
       this.pageInfo.page = page
       this.pageInfo.page = page
       this.sysMessageList()
       this.sysMessageList()
     },
     },
-    onClickRead(item) {
+    onClickRead (item) {
       this.isCheckMessage = item.id
       this.isCheckMessage = item.id
-      if(item.readStatus == 1) {
+      if (item.readStatus == 1) {
         this.getItemInfo(item.memo)
         this.getItemInfo(item.memo)
       } else {
       } else {
         setRead({ id: item.id }).then(res => {
         setRead({ id: item.id }).then(res => {
           let result = res.data
           let result = res.data
-          if(res.code == 200) {
+          if (res.code == 200) {
             item.readStatus = 1
             item.readStatus = 1
             this.getItemInfo(item.memo)
             this.getItemInfo(item.memo)
             this.noReadMessage--
             this.noReadMessage--
@@ -213,10 +248,10 @@ export default {
         })
         })
       }
       }
     },
     },
-    getItemInfo(memo) {
-      if(memo.type == 'VIPGROUP') {
+    getItemInfo (memo) {
+      if (memo.type == 'VIPGROUP') {
         queryApplyRefundDetail({ id: memo.Id }).then(res => {
         queryApplyRefundDetail({ id: memo.Id }).then(res => {
-          if(res.code == 200) {
+          if (res.code == 200) {
             this.showRight = true
             this.showRight = true
             this.showMessage = res.data
             this.showMessage = res.data
             this.showMessage.type = memo.type
             this.showMessage.type = memo.type
@@ -227,9 +262,9 @@ export default {
             this.$message.error(res.msg)
             this.$message.error(res.msg)
           }
           }
         })
         })
-      } else if(memo.type == 'MUSICGROUP') {
+      } else if (memo.type == 'MUSICGROUP') {
         musicGroupQuit({ id: memo.Id }).then(res => {
         musicGroupQuit({ id: memo.Id }).then(res => {
-          if(res.code == 200) {
+          if (res.code == 200) {
             this.showRight = true
             this.showRight = true
             this.showMessage = res.data
             this.showMessage = res.data
             this.showMessage.type = memo.type
             this.showMessage.type = memo.type
@@ -240,8 +275,8 @@ export default {
         })
         })
       }
       }
     },
     },
-    onSubmitGroup(params, status) {
-      if(!this.remark || this.remark == '') {
+    onSubmitGroup (params, status) {
+      if (!this.remark || this.remark == '') {
         this.$message.error('请输入退团理由')
         this.$message.error('请输入退团理由')
         return
         return
       }
       }
@@ -252,19 +287,19 @@ export default {
         reason: this.remark
         reason: this.remark
       }).then(res => {
       }).then(res => {
         this.$message.success('处理成功')
         this.$message.success('处理成功')
-      
+
         this.getItemInfo({
         this.getItemInfo({
           Id: params.id,
           Id: params.id,
           type: params.type
           type: params.type
         })
         })
       })
       })
     },
     },
-    onSubmit(id, str, type) {
-      if(!this.remark || this.remark == '') {
+    onSubmit (id, str, type) {
+      if (!this.remark || this.remark == '') {
         this.$message.error('请输入退课理由')
         this.$message.error('请输入退课理由')
         return
         return
       }
       }
-      if(!this.actualAmount && typeof this.actualAmount == 'string') {
+      if (!this.actualAmount && typeof this.actualAmount == 'string') {
         this.$message.error('退课金额输入有误')
         this.$message.error('退课金额输入有误')
         return
         return
       }
       }
@@ -274,9 +309,9 @@ export default {
         status: type,
         status: type,
         amount: this.actualAmount
         amount: this.actualAmount
       }).then(res => {
       }).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.$message.success('处理成功')
           this.$message.success('处理成功')
-        
+
           this.getItemInfo({
           this.getItemInfo({
             Id: id,
             Id: id,
             type: str
             type: str
@@ -310,7 +345,9 @@ export default {
         top: 6px;
         top: 6px;
       }
       }
     }
     }
-    .unread, .read, .recovery {
+    .unread,
+    .read,
+    .recovery {
       cursor: pointer;
       cursor: pointer;
     }
     }
     .unread {
     .unread {
@@ -402,7 +439,7 @@ export default {
     }
     }
   }
   }
   .right {
   .right {
-     border: 1px solid #e4e8eb;
+    border: 1px solid #e4e8eb;
     margin-left: 25px;
     margin-left: 25px;
     position: relative;
     position: relative;
     overflow: auto;
     overflow: auto;

+ 97 - 52
src/views/journal/studentComplain.vue

@@ -1,39 +1,55 @@
 <template>
 <template>
   <div class='infoWrap'>
   <div class='infoWrap'>
     <div class="left">
     <div class="left">
-      <div class="unread" @click="onLookMessage('all')">全部</div>
-      <div class="unread" @click="onLookMessage('0')"> <img :src="img.boxicon"
+      <div class="unread"
+           @click="onLookMessage('all')">全部</div>
+      <div class="unread"
+           @click="onLookMessage('0')"> <img :src="img.boxicon"
              alt=""> 未读消息
              alt=""> 未读消息
-        <div class="count" v-if="noReadMessage >= 1">{{ noReadMessage }}</div>
+        <div class="count"
+             v-if="noReadMessage >= 1">{{ noReadMessage }}</div>
       </div>
       </div>
-      <div class="read" @click="onLookMessage('1')">
+      <div class="read"
+           @click="onLookMessage('1')">
         <img :src="img.bookicon"
         <img :src="img.bookicon"
              alt="">
              alt="">
         已读消息</div>
         已读消息</div>
     </div>
     </div>
     <div class="middle">
     <div class="middle">
-      <div class="msgItem" :class="[isCheckMessage == item.id ? 'active' : '']" @click="onClickRead(item)" v-for="(item, index) in dataList" :key="index">
+      <div class="msgItem"
+           :class="[isCheckMessage == item.id ? 'active' : '']"
+           @click="onClickRead(item)"
+           v-for="(item, index) in dataList"
+           :key="index">
         <!-- <h6 class="type"></h6> -->
         <!-- <h6 class="type"></h6> -->
         <h4 class="name">学生申诉<span class='time'>{{ item.createOn }}</span>
         <h4 class="name">学生申诉<span class='time'>{{ item.createOn }}</span>
-          <div class="dot" v-if="item.readStatus == 0"></div>
+          <div class="dot"
+               v-if="item.readStatus == 0"></div>
         </h4>
         </h4>
         <p class='msg'>{{ item.content }}</p>
         <p class='msg'>{{ item.content }}</p>
       </div>
       </div>
       <el-pagination style="text-align: right"
       <el-pagination style="text-align: right"
-        small v-if="dataList.length > 0"
-        @current-change="onChange"
-        :hide-on-single-page="pageInfo.isSinglePage"
-        layout="prev, pager, next"
-        :total="pageInfo.total">
+                     small
+                     v-if="dataList.length > 0"
+                     @current-change="onChange"
+                     :hide-on-single-page="pageInfo.isSinglePage"
+                     layout="prev, pager, next"
+                     :total="pageInfo.total">
       </el-pagination>
       </el-pagination>
     </div>
     </div>
-    <div class="right" v-if="showRight">
+    <div class="right"
+         v-if="showRight">
       <el-row>
       <el-row>
         <el-col :span="24">
         <el-col :span="24">
           <h3 class="title">学员投诉
           <h3 class="title">学员投诉
-              <el-tag v-if="showMessage.complaints.status == 'PASS'" type="success" effect="plain">已处理</el-tag>
-              <el-tag v-if="showMessage.complaints.status == 'REJECT'" type="danger" effect="plain">已拒绝</el-tag>
-             <span class="time">发起投诉时间: {{ showMessage.courseSchedule.createTime }}</span></h3>
+            <el-tag v-if="showMessage.complaints.status == 'PASS'"
+                    type="success"
+                    effect="plain">已处理</el-tag>
+            <el-tag v-if="showMessage.complaints.status == 'REJECT'"
+                    type="danger"
+                    effect="plain">已拒绝</el-tag>
+            <span class="time">发起投诉时间: {{ showMessage.courseSchedule.createTime }}</span>
+          </h3>
         </el-col>
         </el-col>
       </el-row>
       </el-row>
 
 
@@ -43,7 +59,7 @@
       </el-row>
       </el-row>
 
 
       <el-row>
       <el-row>
-        <el-col :span="4">  课程名称: </el-col>
+        <el-col :span="4"> 课程名称: </el-col>
         <el-col :span="20"> {{ showMessage.courseSchedule.name }} </el-col>
         <el-col :span="20"> {{ showMessage.courseSchedule.name }} </el-col>
       </el-row>
       </el-row>
 
 
@@ -68,31 +84,58 @@
         <el-col :span="4">
         <el-col :span="4">
           责任比:
           责任比:
         </el-col>
         </el-col>
-        <el-col :span="20" v-if="showMessage.complaints.status == 'ING'">
+        <el-col :span="20"
+                v-if="showMessage.complaints.status == 'ING'">
           <div style="padding-bottom: 8px;">
           <div style="padding-bottom: 8px;">
             <span style="padding-right: 8px;">老师</span>
             <span style="padding-right: 8px;">老师</span>
-            <el-input type="number" min="0" max="10" v-model="teacherRate" placeholder="请输入内容"></el-input>
+            <el-input type="number"
+                      @mousewheel.native.prevent
+                      min="0"
+                      max="10"
+                      v-model="teacherRate"
+                      placeholder="请输入内容"></el-input>
           </div>
           </div>
           <div>
           <div>
             <span style="padding-right: 8px;">学生</span>
             <span style="padding-right: 8px;">学生</span>
-            <el-input type="number" min="0" max="10" v-model="studentRate" placeholder="请输入内容"></el-input>
+            <el-input type="number"
+                      @mousewheel.native.prevent
+                      min="0"
+                      max="10"
+                      v-model="studentRate"
+                      placeholder="请输入内容"></el-input>
           </div>
           </div>
         </el-col>
         </el-col>
-        <el-col :span="20" v-else>
+        <el-col :span="20"
+                v-else>
           <div style="padding-bottom: 8px;">
           <div style="padding-bottom: 8px;">
             <span style="padding-right: 8px;">老师</span>
             <span style="padding-right: 8px;">老师</span>
-            <el-input disabled type="number" min="0" max="10" v-model="teacherRate" placeholder="请输入内容"></el-input>
+            <el-input disabled
+                      type="number"
+                      @mousewheel.native.prevent
+                      min="0"
+                      max="10"
+                      v-model="teacherRate"
+                      placeholder="请输入内容"></el-input>
           </div>
           </div>
           <div>
           <div>
             <span style="padding-right: 8px;">学生</span>
             <span style="padding-right: 8px;">学生</span>
-            <el-input disabled type="number" min="0" max="10" v-model="studentRate" placeholder="请输入内容"></el-input>
+            <el-input disabled
+                      type="number"
+                      @mousewheel.native.prevent
+                      min="0"
+                      max="10"
+                      v-model="studentRate"
+                      placeholder="请输入内容"></el-input>
           </div>
           </div>
         </el-col>
         </el-col>
       </el-row>
       </el-row>
-      <el-row v-permission="'courseSchedule/courseScheduleCommplaintAudit'" v-if="showMessage.complaints.status == 'ING'">
+      <el-row v-permission="'courseSchedule/courseScheduleCommplaintAudit'"
+              v-if="showMessage.complaints.status == 'ING'">
         <el-col :span="24">
         <el-col :span="24">
-          <el-button type="primary" @click="onSubmit(showMessage.complaints.id, 'submit')">确认</el-button>
-          <el-button type="danger" @click="onSubmit(showMessage.complaints.id, 'reject')">拒绝</el-button>
+          <el-button type="primary"
+                     @click="onSubmit(showMessage.complaints.id, 'submit')">确认</el-button>
+          <el-button type="danger"
+                     @click="onSubmit(showMessage.complaints.id, 'reject')">拒绝</el-button>
         </el-col>
         </el-col>
       </el-row>
       </el-row>
     </div>
     </div>
@@ -127,49 +170,49 @@ export default {
       studentRate: null
       studentRate: null
     }
     }
   },
   },
-  mounted() {
+  mounted () {
     this.__init()
     this.__init()
     this.sysMessageList()
     this.sysMessageList()
   },
   },
   methods: {
   methods: {
-    __init() {
+    __init () {
       // 未读消息
       // 未读消息
       queryCountOfUnread().then(res => {
       queryCountOfUnread().then(res => {
-        if(res.code == 200) {
-          if(res.data && res.data.STUDENT) {
+        if (res.code == 200) {
+          if (res.data && res.data.STUDENT) {
             this.noReadMessage = res.data.STUDENT
             this.noReadMessage = res.data.STUDENT
           }
           }
         }
         }
       })
       })
     },
     },
-    sysMessageList() { // 列表
+    sysMessageList () { // 列表
       sysMessageList({
       sysMessageList({
         group: 'STUDENT',
         group: 'STUDENT',
         rows: this.pageInfo.limit,
         rows: this.pageInfo.limit,
         page: this.pageInfo.page,
         page: this.pageInfo.page,
         readStatus: this.pageInfo.readStatus
         readStatus: this.pageInfo.readStatus
       }).then(res => {
       }).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.dataList = res.data.rows
           this.dataList = res.data.rows
           this.pageInfo.total = res.data.total
           this.pageInfo.total = res.data.total
         }
         }
       })
       })
     },
     },
-    getCourseDetail(id) {
+    getCourseDetail (id) {
       queryCourseScheduleComplaintsDetail({ courseScheduleComplaintsId: id }).then(res => {
       queryCourseScheduleComplaintsDetail({ courseScheduleComplaintsId: id }).then(res => {
         let result = res.data
         let result = res.data
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.showRight = true
           this.showRight = true
           this.showMessage = result
           this.showMessage = result
-          if(result.complaints.status != 'ING') {
+          if (result.complaints.status != 'ING') {
             this.teacherRate = result.complaints.teacherLiabilityRatio
             this.teacherRate = result.complaints.teacherLiabilityRatio
             this.studentRate = result.complaints.studentLiabilityRatio
             this.studentRate = result.complaints.studentLiabilityRatio
           }
           }
         }
         }
       })
       })
     },
     },
-    onLookMessage(type) { // 查看对应的数据
-      if(type == "all") {
+    onLookMessage (type) { // 查看对应的数据
+      if (type == "all") {
         this.pageInfo.readStatus = null
         this.pageInfo.readStatus = null
       } else {
       } else {
         this.pageInfo.readStatus = type
         this.pageInfo.readStatus = type
@@ -180,19 +223,19 @@ export default {
       this.isCheckMessage = null
       this.isCheckMessage = null
       this.sysMessageList()
       this.sysMessageList()
     },
     },
-    onChange(page) { // 分页
+    onChange (page) { // 分页
       this.pageInfo.page = page
       this.pageInfo.page = page
       this.sysMessageList()
       this.sysMessageList()
     },
     },
-    onClickRead(item) {
+    onClickRead (item) {
       this.isCheckMessage = item.id
       this.isCheckMessage = item.id
       let memo = JSON.parse(item.memo)
       let memo = JSON.parse(item.memo)
-      if(item.readStatus == 1) {
+      if (item.readStatus == 1) {
         this.getCourseDetail(memo.courseScheduleComplaintsId)
         this.getCourseDetail(memo.courseScheduleComplaintsId)
       } else {
       } else {
         setRead({ id: item.id }).then(res => {
         setRead({ id: item.id }).then(res => {
           let result = res.data
           let result = res.data
-          if(res.code == 200) {
+          if (res.code == 200) {
             item.readStatus = 1
             item.readStatus = 1
             this.getCourseDetail(memo.courseScheduleComplaintsId)
             this.getCourseDetail(memo.courseScheduleComplaintsId)
 
 
@@ -201,36 +244,36 @@ export default {
         })
         })
       }
       }
     },
     },
-    onSubmit(id, type) {
+    onSubmit (id, type) {
       let params = {
       let params = {
         id: id
         id: id
       }
       }
       let teacherRate = this.teacherRate
       let teacherRate = this.teacherRate
       let studentRate = this.studentRate
       let studentRate = this.studentRate
-      if(type == 'submit') {
-        if(teacherRate < 0 || teacherRate > 10 || typeof teacherRate == 'string') {
+      if (type == 'submit') {
+        if (teacherRate < 0 || teacherRate > 10 || typeof teacherRate == 'string') {
           this.$message.error('老师责任比输入有误')
           this.$message.error('老师责任比输入有误')
           return
           return
         }
         }
-        if(studentRate < 0 || studentRate > 10 || typeof studentRate == 'string') {
+        if (studentRate < 0 || studentRate > 10 || typeof studentRate == 'string') {
           this.$message.error('学生责任比输入有误')
           this.$message.error('学生责任比输入有误')
           return
           return
         }
         }
-        if(studentRate + teacherRate != 10) {
+        if (studentRate + teacherRate != 10) {
           this.$message.error('责任比之和为必须为10')
           this.$message.error('责任比之和为必须为10')
           return
           return
         }
         }
         params.status = 'PASS'
         params.status = 'PASS'
         params.studentLiabilityRatio = studentRate
         params.studentLiabilityRatio = studentRate
         params.teacherLiabilityRatio = teacherRate
         params.teacherLiabilityRatio = teacherRate
-      } else if(type == 'reject') {
+      } else if (type == 'reject') {
         params.status = 'REJECT'
         params.status = 'REJECT'
         params.studentLiabilityRatio = 0
         params.studentLiabilityRatio = 0
         params.teacherLiabilityRatio = 0
         params.teacherLiabilityRatio = 0
       }
       }
 
 
       courseScheduleCommplaintAudit(params).then(res => {
       courseScheduleCommplaintAudit(params).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.$message.success('处理成功')
           this.$message.success('处理成功')
           this.getCourseDetail(id)
           this.getCourseDetail(id)
         } else {
         } else {
@@ -240,13 +283,13 @@ export default {
     }
     }
   },
   },
   watch: {
   watch: {
-    teacherRate(newvalue, oldvalue) {
-      if(newvalue) {
+    teacherRate (newvalue, oldvalue) {
+      if (newvalue) {
         this.studentRate = 10 - newvalue
         this.studentRate = 10 - newvalue
       }
       }
     },
     },
-    studentRate(newvalue, oldvalue) {
-      if(newvalue) {
+    studentRate (newvalue, oldvalue) {
+      if (newvalue) {
         this.teacherRate = 10 - newvalue
         this.teacherRate = 10 - newvalue
       }
       }
     }
     }
@@ -274,7 +317,9 @@ export default {
         top: 6px;
         top: 6px;
       }
       }
     }
     }
-    .unread, .read, .recovery {
+    .unread,
+    .read,
+    .recovery {
       cursor: pointer;
       cursor: pointer;
     }
     }
     .unread {
     .unread {

+ 1 - 0
src/views/resetTeaming/components/resetSound.vue

@@ -135,6 +135,7 @@
                     </el-form-item>
                     </el-form-item>
                     <el-form-item label="教辅打包价">
                     <el-form-item label="教辅打包价">
                       <el-input type='number'
                       <el-input type='number'
+                                @mousewheel.native.prevent
                                 v-model="item.price"></el-input>
                                 v-model="item.price"></el-input>
                     </el-form-item>
                     </el-form-item>
                     <el-form-item>
                     <el-form-item>

+ 1 - 0
src/views/sporadicManager/sporadicList.vue

@@ -128,6 +128,7 @@
                       prop='money'>
                       prop='money'>
           <el-input v-model="maskForm.money"
           <el-input v-model="maskForm.money"
                     type="number"
                     type="number"
+                    @mousewheel.native.prevent
                     :disabled='!isNew'></el-input>
                     :disabled='!isNew'></el-input>
         </el-form-item>
         </el-form-item>
         <el-form-item label="分部"
         <el-form-item label="分部"

+ 14 - 4
src/views/teacherManager/teacherDetail/components/settlement.vue

@@ -126,17 +126,26 @@
       <el-form :model="form"
       <el-form :model="form"
                :rules="rules"
                :rules="rules"
                ref="ruleForm">
                ref="ruleForm">
-        <el-form-item label="预计发放" :label-width="formLabelWidth">
-          <el-input v-model="form.expectSalary" disabled type="number" ></el-input>
+        <el-form-item label="预计发放"
+                      :label-width="formLabelWidth">
+          <el-input v-model="form.expectSalary"
+                    disabled
+                    @mousewheel.native.prevent
+                    type="number"></el-input>
         </el-form-item>
         </el-form-item>
-        <el-form-item label="补贴" :label-width="formLabelWidth">
-          <el-input v-model="form.subsidys" disabled type="number" ></el-input>
+        <el-form-item label="补贴"
+                      :label-width="formLabelWidth">
+          <el-input v-model="form.subsidys"
+                    disabled
+                    @mousewheel.native.prevent
+                    type="number"></el-input>
         </el-form-item>
         </el-form-item>
         <el-form-item label="课酬调整为"
         <el-form-item label="课酬调整为"
                       prop="salary"
                       prop="salary"
                       :label-width="formLabelWidth">
                       :label-width="formLabelWidth">
           <el-input v-model="form.salary"
           <el-input v-model="form.salary"
                     type="number"
                     type="number"
+                    @mousewheel.native.prevent
                     autocomplete="off"></el-input>
                     autocomplete="off"></el-input>
         </el-form-item>
         </el-form-item>
         <el-form-item label="课时补贴调整为"
         <el-form-item label="课时补贴调整为"
@@ -144,6 +153,7 @@
                       :label-width="formLabelWidth">
                       :label-width="formLabelWidth">
           <el-input v-model="form.subsidy"
           <el-input v-model="form.subsidy"
                     type="number"
                     type="number"
+                    @mousewheel.native.prevent
                     autocomplete="off"></el-input>
                     autocomplete="off"></el-input>
         </el-form-item>
         </el-form-item>
         <el-form-item label="调整范围"
         <el-form-item label="调整范围"

+ 6 - 0
src/views/teacherManager/teacherOperation/components/salarySet.vue

@@ -13,6 +13,7 @@
           <el-table-column label="默认课酬-主教">
           <el-table-column label="默认课酬-主教">
             <template slot-scope="scope">
             <template slot-scope="scope">
               <el-input type="number"
               <el-input type="number"
+                        @mousewheel.native.prevent
                         v-model="scope.row.mainTeacher30MinSalary"
                         v-model="scope.row.mainTeacher30MinSalary"
                         placeholder="请输入课酬">
                         placeholder="请输入课酬">
                 <template slot="append"
                 <template slot="append"
@@ -27,6 +28,7 @@
           <el-table-column label="默认课酬-助教">
           <el-table-column label="默认课酬-助教">
             <template slot-scope="scope">
             <template slot-scope="scope">
               <el-input type="number"
               <el-input type="number"
+                        @mousewheel.native.prevent
                         v-model="scope.row.assistantTeacher30MinSalary"
                         v-model="scope.row.assistantTeacher30MinSalary"
                         placeholder="请输入课酬">
                         placeholder="请输入课酬">
                 <template slot="append"
                 <template slot="append"
@@ -41,6 +43,7 @@
           <el-table-column label="3.0课酬-主教">
           <el-table-column label="3.0课酬-主教">
             <template slot-scope="scope">
             <template slot-scope="scope">
               <el-input type="number"
               <el-input type="number"
+                        @mousewheel.native.prevent
                         :disabled="scope.row.courseScheduleType == 'CLASSROOM'"
                         :disabled="scope.row.courseScheduleType == 'CLASSROOM'"
                         v-model="scope.row.mainTeacher90MinSalary"
                         v-model="scope.row.mainTeacher90MinSalary"
                         placeholder="请输入课酬">
                         placeholder="请输入课酬">
@@ -57,6 +60,7 @@
           <el-table-column label="3.0课酬-助教">
           <el-table-column label="3.0课酬-助教">
             <template slot-scope="scope">
             <template slot-scope="scope">
               <el-input type="number"
               <el-input type="number"
+                        @mousewheel.native.prevent
                         :disabled="scope.row.courseScheduleType == 'CLASSROOM'"
                         :disabled="scope.row.courseScheduleType == 'CLASSROOM'"
                         v-model="scope.row.assistantTeacher90MinSalary"
                         v-model="scope.row.assistantTeacher90MinSalary"
                         placeholder="请输入课酬">
                         placeholder="请输入课酬">
@@ -81,6 +85,7 @@
           <el-table-column label="线上课">
           <el-table-column label="线上课">
             <template slot-scope="scope">
             <template slot-scope="scope">
               <el-input type="number"
               <el-input type="number"
+                        @mousewheel.native.prevent
                         v-model="scope.row.onlineClassesSalary"
                         v-model="scope.row.onlineClassesSalary"
                         placeholder="请输入内容">
                         placeholder="请输入内容">
                 <template slot="append">元/45分钟</template>
                 <template slot="append">元/45分钟</template>
@@ -90,6 +95,7 @@
           <el-table-column label="线下课">
           <el-table-column label="线下课">
             <template slot-scope="scope">
             <template slot-scope="scope">
               <el-input type="number"
               <el-input type="number"
+                        @mousewheel.native.prevent
                         v-model="scope.row.offlineClassesSalary"
                         v-model="scope.row.offlineClassesSalary"
                         placeholder="请输入内容">
                         placeholder="请输入内容">
                 <template slot="append">元/45分钟</template>
                 <template slot="append">元/45分钟</template>

+ 2 - 0
src/views/teamBuild/components/teamBaseInfo.vue

@@ -215,6 +215,7 @@
                        v-model="checkList.baseInfo.ischeck"></el-checkbox>
                        v-model="checkList.baseInfo.ischeck"></el-checkbox>
           <div class="inputWrap">
           <div class="inputWrap">
             单价: <input type="number"
             单价: <input type="number"
+                   @mousewheel.native.prevent
                    placeholder="请输入"
                    placeholder="请输入"
                    v-model="checkList.baseInfo.value">
                    v-model="checkList.baseInfo.value">
           </div>
           </div>
@@ -224,6 +225,7 @@
                        v-model="checkList.holidayInfo.ischeck"></el-checkbox>
                        v-model="checkList.holidayInfo.ischeck"></el-checkbox>
           <div class="inputWrap">
           <div class="inputWrap">
             单价: <input type="number"
             单价: <input type="number"
+                   @mousewheel.native.prevent
                    placeholder="请输入"
                    placeholder="请输入"
                    v-model="checkList.holidayInfo.value">
                    v-model="checkList.holidayInfo.value">
           </div>
           </div>

+ 1 - 0
src/views/teamBuild/components/teamResetSound.vue

@@ -19,6 +19,7 @@
           <template slot-scope="scope">
           <template slot-scope="scope">
             <div>
             <div>
               <el-input type="number"
               <el-input type="number"
+                        @mousewheel.native.prevent
                         v-model="scope.row.yuji"></el-input>
                         v-model="scope.row.yuji"></el-input>
             </div>
             </div>
           </template>
           </template>

+ 16 - 1
src/views/teamBuild/components/teamSoundMoney.vue

@@ -28,6 +28,7 @@
                     width="100">
                     width="100">
             <div>
             <div>
               <el-input v-if='scope.row.type == 1'
               <el-input v-if='scope.row.type == 1'
+                        @mousewheel.native.prevent
                         type='number'
                         type='number'
                         style="width:80px"
                         style="width:80px"
                         size='mini'
                         size='mini'
@@ -44,6 +45,7 @@
           <template slot-scope="scope">
           <template slot-scope="scope">
             <div>
             <div>
               <el-input v-if='scope.row.type == 1'
               <el-input v-if='scope.row.type == 1'
+                        @mousewheel.native.prevent
                         type='number'
                         type='number'
                         style="width:80px"
                         style="width:80px"
                         size='mini'
                         size='mini'
@@ -119,7 +121,6 @@
                              value="LEASE"></el-option>
                              value="LEASE"></el-option>
                   <el-option label="免费"
                   <el-option label="免费"
                              value="FREE"></el-option>
                              value="FREE"></el-option>
-
                 </el-select>
                 </el-select>
                 <el-input placeholder="请输入费用"
                 <el-input placeholder="请输入费用"
                           v-if='scope.row.fangshi == "LEASE"'
                           v-if='scope.row.fangshi == "LEASE"'
@@ -171,6 +172,7 @@
                       </el-form-item>
                       </el-form-item>
                       <el-form-item label="教辅打包价">
                       <el-form-item label="教辅打包价">
                         <el-input type='number'
                         <el-input type='number'
+                                  @mousewheel.native.prevent
                                   v-model="item.price"></el-input>
                                   v-model="item.price"></el-input>
                       </el-form-item>
                       </el-form-item>
                       <el-form-item>
                       <el-form-item>
@@ -297,6 +299,7 @@ export default {
       checkfor: {},
       checkfor: {},
       teamStatus: '',
       teamStatus: '',
       teamid: '',
       teamid: '',
+      isNullFangshi: true
     }
     }
   },
   },
   methods: {
   methods: {
@@ -404,6 +407,7 @@ export default {
       this.$emit('chiosetab', 0);
       this.$emit('chiosetab', 0);
     },
     },
     submitInfo (type) {
     submitInfo (type) {
+      this.isNullFangshi = true
       // return;
       // return;
       let status;
       let status;
       if (type == 1) {
       if (type == 1) {
@@ -500,6 +504,9 @@ export default {
             }
             }
           })
           })
           let depositFee;
           let depositFee;
+          if (!active.fangshi) {
+            this.isNullFangshi = false
+          }
           if (active.fangshi == 'LEASE') {
           if (active.fangshi == 'LEASE') {
             depositFee = active.fangshiprice;
             depositFee = active.fangshiprice;
           } else {
           } else {
@@ -572,6 +579,10 @@ export default {
           })
           })
           // 添加声部
           // 添加声部
           let depositFee;
           let depositFee;
+          // 如果没有提供方式则报错
+          if (!active.fangshi) {
+            this.isNullFangshi = false
+          }
           if (active.fangshi == 'LEASE') {
           if (active.fangshi == 'LEASE') {
             depositFee = active.fangshiprice;
             depositFee = active.fangshiprice;
           } else {
           } else {
@@ -587,6 +598,10 @@ export default {
           }
           }
           obj.musicGroupSubjectPlans.push(item);
           obj.musicGroupSubjectPlans.push(item);
         })
         })
+        if (!this.isNullFangshi) {
+          this.$message.error('请填写乐器提供方式')
+          return
+        }
         this.$confirm(`确定提交?`, '提示', {
         this.$confirm(`确定提交?`, '提示', {
           confirmButtonText: '确定',
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           cancelButtonText: '取消',

+ 8 - 5
src/views/teamBuild/signupList.vue

@@ -32,7 +32,9 @@
                @click="onCreateQRCode">报名链接</div>
                @click="onCreateQRCode">报名链接</div>
           <div class='newBand'
           <div class='newBand'
                @click="onCreateQRCode2">缴费详情</div>
                @click="onCreateQRCode2">缴费详情</div>
-          <div class='newBand' v-if="rightList.length > 0" v-permission="'studentRegistration/queryStudentApplyDetailExport'"
+          <div class='newBand'
+               v-if="rightList.length > 0"
+               v-permission="'studentRegistration/queryStudentApplyDetailExport'"
                @click='onDownLoadExecl'>报表导出</div>
                @click='onDownLoadExecl'>报表导出</div>
         </div>
         </div>
       </div>
       </div>
@@ -649,9 +651,9 @@ export default {
       }
       }
       axios(options).then(res => {
       axios(options).then(res => {
         let blob = new Blob([res.data], {
         let blob = new Blob([res.data], {
-            // type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
-            type: 'application/vnd.ms-excel;charset=utf-8'
-            //word文档为application/msword,pdf文档为application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
+          // type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
+          type: 'application/vnd.ms-excel;charset=utf-8'
+          //word文档为application/msword,pdf文档为application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
         })
         })
         let objectUrl = URL.createObjectURL(blob)
         let objectUrl = URL.createObjectURL(blob)
         let link = document.createElement("a")
         let link = document.createElement("a")
@@ -705,7 +707,8 @@ export default {
           if (res.code == 200) {
           if (res.code == 200) {
             this.$message.success('停止成功')
             this.$message.success('停止成功')
             this.$router.push({
             this.$router.push({
-              path: '/business/teamDetail'
+              path: '/business/teamDetail',
+              query: { search: this.Fsearch, rules: this.Frules }
             })
             })
           }
           }
         })
         })

+ 1 - 0
src/views/teamBuild/teamSeting/components/coursePlan.vue

@@ -42,6 +42,7 @@
           <el-form-item label="排课次数"
           <el-form-item label="排课次数"
                         prop="num">
                         prop="num">
             <el-input type="number"
             <el-input type="number"
+                      @mousewheel.native.prevent
                       v-model="leftFrom.num"></el-input>
                       v-model="leftFrom.num"></el-input>
           </el-form-item>
           </el-form-item>
         </el-form>
         </el-form>

+ 1 - 0
src/views/teamBuild/teamSeting/components/improvementClass.vue

@@ -128,6 +128,7 @@
                       prop="studentNum">
                       prop="studentNum">
           <el-input v-model="maskForm.count"
           <el-input v-model="maskForm.count"
                     type="number"
                     type="number"
+                    @mousewheel.native.prevent
                     style='width:180px;'></el-input>
                     style='width:180px;'></el-input>
         </el-form-item>
         </el-form-item>
         <el-form-item label="星期几"
         <el-form-item label="星期几"

+ 1 - 0
src/views/teamDetail/components/resetClass.vue

@@ -352,6 +352,7 @@
         <el-form-item label="排课次数"
         <el-form-item label="排课次数"
                       prop="courseNum">
                       prop="courseNum">
           <el-input type='number'
           <el-input type='number'
+                    @mousewheel.native.prevent
                     v-model="teacherForm.courseNum"></el-input>
                     v-model="teacherForm.courseNum"></el-input>
         </el-form-item>
         </el-form-item>
         <el-form-item label="排课起始时间"
         <el-form-item label="排课起始时间"

+ 19 - 11
src/views/teamDetail/components/studentList.vue

@@ -62,7 +62,7 @@
         <el-select v-model="searchForm.isPay"
         <el-select v-model="searchForm.isPay"
                    clearable
                    clearable
                    filterable
                    filterable
-                   placeholder="是否缴费">
+                   placeholder="报名缴费">
           <el-option label="完成缴费"
           <el-option label="完成缴费"
                      value="PAID_COMPLETED"></el-option>
                      value="PAID_COMPLETED"></el-option>
           <el-option label="未缴费"
           <el-option label="未缴费"
@@ -169,7 +169,7 @@
           </template>
           </template>
         </el-table-column>
         </el-table-column>
         <el-table-column align='center'
         <el-table-column align='center'
-                         label="是否缴费">
+                         label="报名缴费">
           <template slot-scope="scope">
           <template slot-scope="scope">
             <div>
             <div>
               {{ scope.row.paymentStatus | studentPays}}
               {{ scope.row.paymentStatus | studentPays}}
@@ -375,9 +375,11 @@
         </el-form-item>
         </el-form-item>
 
 
         <el-divider>订单信息</el-divider>
         <el-divider>订单信息</el-divider>
-        <el-form-item label="课程"
+        <el-form-item label="课程费用"
                       prop="temporaryCourseFee">
                       prop="temporaryCourseFee">
-          <el-input v-model="maskForm.temporaryCourseFee"
+          <el-input type='number'
+                    @mousewheel.native.prevent
+                    v-model="maskForm.temporaryCourseFee"
                     placeholder="本次课程费用"></el-input>
                     placeholder="本次课程费用"></el-input>
         </el-form-item>
         </el-form-item>
 
 
@@ -629,12 +631,18 @@ export default {
   },
   },
   created () {
   created () {
   },
   },
+  /**  <el-option label="已开启缴费"
+                     value="1"></el-option>
+          <el-option label="未缴费"
+                     value="0"></el-option>
+          <el-option label="已缴费"
+                     value="2"></el-option> */
   filters: {
   filters: {
     studentPays (val) {
     studentPays (val) {
       let template = {
       let template = {
-        PAID_COMPLETED: "完成缴费",
-        NON_PAYMENT: "未缴费",
-        PROCESSING: "缴费中"
+        'PAID_COMPLETED': "完成缴费",
+        'NON_PAYMENT': "未缴费",
+        'PROCESSING': "缴费中"
       }
       }
       return template[val]
       return template[val]
     }
     }
@@ -780,10 +788,10 @@ export default {
         snapClass: [], --> */
         snapClass: [], --> */
 
 
           let maskForm = this.maskForm
           let maskForm = this.maskForm
-          if (!maskForm.signClass && !maskForm.mixClass) {
-            this.$message.error('必须加入一个单机班或合奏班')
-            return;
-          }
+          // if (!maskForm.signClass && !maskForm.mixClass) {
+          //   this.$message.error('必须加入一个单机班或合奏班')
+          //   return;
+          // }
           let snapClassIds;
           let snapClassIds;
 
 
           maskForm.snapClass ? snapClassIds = maskForm.snapClass.join(',') : snapClassIds = null
           maskForm.snapClass ? snapClassIds = maskForm.snapClass.join(',') : snapClassIds = null

+ 2 - 0
src/views/vipClass/vipDetail/components/vipBaseInfo.vue

@@ -61,11 +61,13 @@
         <el-form-item label="课程单价(线上)">
         <el-form-item label="课程单价(线上)">
           <el-input v-model="rightForm.onlineClass"
           <el-input v-model="rightForm.onlineClass"
                     type="number"
                     type="number"
+                    @mousewheel.native.prevent
                     :disabled='!isreset'></el-input>
                     :disabled='!isreset'></el-input>
         </el-form-item>
         </el-form-item>
         <el-form-item label="课程单价(线下)">
         <el-form-item label="课程单价(线下)">
           <el-input v-model="rightForm.offlineClass"
           <el-input v-model="rightForm.offlineClass"
                     type="number"
                     type="number"
+                    @mousewheel.native.prevent
                     :disabled='!isreset'></el-input>
                     :disabled='!isreset'></el-input>
         </el-form-item>
         </el-form-item>
         <el-form-item label="课程总价">
         <el-form-item label="课程总价">

+ 2 - 2
src/views/vipClass/vipList.vue

@@ -239,7 +239,7 @@ export default {
         total: 0, // 总条数
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
       },
-      statusList: [{ lable: '未开始', value: '0' }, { lable: '报名中', value: '1' }, { lable: '报名结束', value: '5' }, { lable: '进行中', value: '2' }, { lable: '已结束', value: '4' }, { lable: '取消', value: '3' }]
+      statusList: [{ lable: '未开始', value: '0' }, { lable: '报名中', value: '1' }, { lable: '报名结束', value: '5' }, { lable: '进行中', value: '2' }, { lable: '已结束', value: '4' }, { lable: '取消', value: '3' }, { lable: '暂停', value: '6' }]
     }
     }
   },
   },
   created () {
   created () {
@@ -338,7 +338,7 @@ export default {
       return result
       return result
     },
     },
     formatterStatus (val) {
     formatterStatus (val) {
-      let arr = ["未开始", "报名中", "进行中", '取消', '已结束', '报名结束']
+      let arr = ["未开始", "报名中", "进行中", '取消', '已结束', '报名结束', '暂停']
       return arr[val];
       return arr[val];
     }
     }
   }
   }

+ 1 - 0
src/views/vipClass/vipReset.vue

@@ -250,6 +250,7 @@
                       prop="addCount"
                       prop="addCount"
                       v-if='isaddCourse'>
                       v-if='isaddCourse'>
           <el-input type='number'
           <el-input type='number'
+                    @mousewheel.native.prevent
                     v-model="adjustmentForm.addCount"></el-input>
                     v-model="adjustmentForm.addCount"></el-input>
         </el-form-item>
         </el-form-item>
         <br>
         <br>