03/06 13:05

11

dist/static/css/chunk-f7673256.4fefc7ed.css → dist/static/css/chunk-65b5d379.755e0b55.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}.wrap[data-v-a0e6a1bc]{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}.wrap div[data-v-a0e6a1bc]{margin-right:20px}
+.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}.wrap[data-v-4e87c444]{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}.wrap div[data-v-4e87c444]{margin-right:20px}

src/api/studentManager.js

@@ -212,3 +212,12 @@ export function updateStudent (data) {
     data: qs.stringify(data)
   })
 }
+
+// 账户余额充值
+export function transferCourseBalanceToBalance (data) {
+  return request({
+    url: api + `/userCashAccount/transferCourseBalanceToBalance`,
+    method: 'post',
+    data: qs.stringify(data)
+  })
+}

src/views/accompanyManager/accompanys.vue

@@ -180,11 +180,11 @@
         label-width="80px;"
         :inline="true"
       >
-        <el-form-item label="课程班名称">
+        <el-form-item label="课程班名称" v-if="isMultiple">
           <el-input v-model.trim="teacherForm.name" disabled></el-input>
         </el-form-item>
-        <el-form-item label="课程组声部">
-          <el-select v-model.trim="teacherForm.subject" @change="changeSound" filterable clearable>
+        <el-form-item label="课程组声部" v-if="isMultiple">
+          <el-select v-model.trim="teacherForm.subjectId" @change="changeSound" filterable clearable>
             <el-option
               v-for="(item,index) in subjectList"
               :key="index"
@@ -203,7 +203,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item>
+        <el-form-item v-if="isMultiple">
           <p style="color:#FF5353">*更改课程组老师，将更换全部未开始课程的老师</p>
         </el-form-item>
       </el-form>
@@ -364,12 +364,12 @@ export default {
       },
       teacherRules: {
         teacher: [{ required: true, message: "请选择老师", trigger: "blur" }],
-        subject: [{ required: true, message: "请选择声部", trigger: "blur" }]
+        subjectId: [{ required: true, message: "请选择声部", trigger: "blur" }]
       },
       teacherForm: {
         teacher: null,
         name: null,
-        subject: null
+        subjectId: null
       },
       courseOption: null,
       coursesExpireDate: null,
@@ -526,7 +526,8 @@ export default {
       this.isMultiple = true;
       this.teacherForm.teacher = this.courseData[0].userId;
       this.teacherForm.name = this.courseData[0].name;
-      this.teacherForm.subject = this.courseData[0].subjectId;
+      this.teacherForm.subjectId = this.courseData[0].subjectId;
+
       this.teacherVisible = true;
     },
     // 提交课程组修改

src/views/studentManager/components/studentOrder.vue

@@ -4,7 +4,7 @@
       <div class="left">
         <div class="headItem">
           <p>账户余额:<span>{{ dataInfo.balance }}</span></p>
-          <el-button type="text">充值</el-button>
+          <el-button type="text" @click="rechargeVisible=true">充值</el-button>
         </div>
         <div class="headItem">
           <p v-if="amountStatus">课程余额:<span>{{ dataInfo.courseBalance }}</span></p>
@@ -125,11 +125,36 @@
                   :page-sizes="pageInfo.page_size"
                   @pagination="getList" />
     </div>
+    <!-- 充值弹窗 -->
+     <el-dialog
+      title="课程余额转账户余额"
+      width="400px"
+      :visible.sync="rechargeVisible"
+    >
+      <el-form
+        :model="rechargeForm"
+        ref="rechargeForm"
+        label-position="right"
+        label-width="80px;"
+        :inline="true"
+      >
+        <el-form-item label="课程余额" >
+          ¥{{ dataInfo.courseBalance}}
+        </el-form-item>
+        <el-form-item label="本次充值" prop="money">
+          <el-input type="number"  @mousewheel.native.prevent v-model.trim="rechargeForm.money"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="rechargeVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitRecharge">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
-import { studentPaymentOrderList, getUserCashAccountBaseInfo, updateCourseBalance } from '@/api/studentManager'
+import { studentPaymentOrderList, getUserCashAccountBaseInfo, updateCourseBalance,transferCourseBalanceToBalance } from '@/api/studentManager'
 import { orderStatus } from '@/utils/searchArray'
 import store from '@/store'
 export default {
@@ -137,6 +162,7 @@ export default {
   components: { pagination },
   data () {
     return {
+      rechargeVisible:false,
       organId: null,
       orderDate: null,
       searchForm: {
@@ -157,6 +183,9 @@ export default {
       tableList: [],
       dataInfo: {},
       amountStatus: true, // 账户余额状态
+      rechargeForm:{
+        money:null
+      }
     }
   },
   mounted () {
@@ -253,6 +282,24 @@ export default {
         remark: null
       }
     },
+    submitRecharge(){
+      let money = parseFloat(this.dataInfo.courseBalance-this.rechargeForm.money).toFixed(2);
+      if(money<0){
+        this.$message.error('余额不足')
+        return
+      }
+      if(!this.rechargeForm.money){
+         this.$message.error('请输入金额')
+        return
+      }
+      transferCourseBalanceToBalance({userId:this.searchForm.studentId,money:this.rechargeForm.money}).then(res=>{
+        if(res.code == 200){
+          this.$message.success('充值成功')
+          this.rechargeVisible = false;
+          this.__init();
+        }
+      })
+    }
   }
 }
 </script>