mo 3 роки тому
батько
коміт
0946371725

+ 4 - 4
src/constant/index.js

@@ -287,10 +287,10 @@ export const conclusion = {
   2:'异常'
 }
 export const vipResetType = {
-1: '不限制',
-0: '线上不可调为线下',
-2: '线下不可调为线上',
-3: '线上线下不可互调'
+'1': '不限制',
+'0': '线上不可调为线下',
+'2': '线下不可调为线上',
+'3': '线上线下不可互调'
 }
 
 export const courseViewType = {

+ 5 - 1
src/utils/searchArray.js

@@ -217,7 +217,11 @@ export const stockType = [
 //   { value: 'CANCELED', text: '取消' },
 //   { value: 'CLOSE', text: '已关闭' },
 // ]
-export const vipResetTypeList = getValueForKey(vipResetType)
+export const vipResetTypeList = [{label:'不限制',value:'1'},
+{label:'线上不可调为线下',value:'0'},
+{label:'线下不可调为线上',value:'2'},
+{label:'线上线下不可互调',value:'3'}
+  ]
 export const musicGroupStatus = getValueForKey(musicGroupType)
 export const classTimeList = getValueForKey(classTime)
 export const courseViewTypeList = getValueForKey(courseViewType)

+ 1 - 1
src/views/businessManager/orderManager/salesList.vue

@@ -304,7 +304,7 @@
                 >修改成本</el-button
               >
               <el-popconfirm
-                title="退货后该销售金额将退还到学员账户余额"
+                title="退货后该销售金额将暂不进入账户余额"
                 @confirm="() => refund({ id: scope.row.id })"
                 v-if="scope.row.status === 0"
                 v-permission="'sellOrder/refund'"

+ 0 - 1
src/views/categroyManager/modals/payInfo.vue

@@ -499,7 +499,6 @@ export default {
     };
   },
   async mounted() {
-    console.log(this.vipResetTypeList)
     await this.$store.dispatch("setVipGroupCategory");
   },
   methods: {

+ 2 - 1
src/views/studentManager/memberList.vue

@@ -190,7 +190,7 @@
       </div>
     </div>
     <!-- 退团弹窗 -->
-    <el-dialog title="退团信息确认" width="640px" :visible.sync="quitVisible">
+    <el-dialog title="退团信息确认" width="660px" :visible.sync="quitVisible">
       <quiteTeam :quitForm="quitForm" :activeRow="activeRow" ref="quitForm" />
       <span slot="footer" class="dialog-footer question">
         <div>
@@ -202,6 +202,7 @@
               <p>退还乐器费用:报名缴费时缴纳的乐器费用(团购、租金)</p>
               <p>退还教辅费用:报名缴费时缴费的教辅费用</p>
               <p>退还乐保费用:报名缴费时缴费的乐保费用</p>
+              <p>退费金额暂不进入账户余额</p>
             </div>
             <el-button
               type="text"

+ 1 - 0
src/views/teamBuild/signupList.vue

@@ -1003,6 +1003,7 @@
               <p>退还乐器费用:报名缴费时缴纳的乐器费用(团购、租金)</p>
               <p>退还教辅费用:报名缴费时缴费的教辅费用</p>
               <p>退还乐保费用:报名缴费时缴费的乐保费用</p>
+              <p>退费金额暂不进入账户余额</p>
             </div>
             <el-button
               type="text"

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

@@ -779,6 +779,7 @@
               <p>退还乐器费用:报名缴费时缴纳的乐器费用(团购、租金)</p>
               <p>退还教辅费用:报名缴费时缴费的教辅费用</p>
               <p>退还乐保费用:报名缴费时缴费的乐保费用</p>
+              <p>退费金额暂不进入账户余额</p>
             </div>
             <el-button
               type="text"

+ 26 - 9
src/views/vipClass/vipDetail/components/vipStudentList.vue

@@ -563,17 +563,34 @@ export default {
               vipGroupId: this.id,
             }).then((res) => {
               if (res.code == 200) {
-                // scope.row.fee =
-                this.$prompt("请输入退课金额", "提示", {
+                // this.$prompt("请输入退课金额", "提示", {
+                //   confirmButtonText: "确定",
+                //   cancelButtonText: "取消",
+                //   inputValue: res.data.suplusCourseFee,
+                // })
+                //   .then(({ value }) => {
+                //     scope.row.fee = value;
+                //     this.leaveSchool(scope);
+                //   })
+                //   .catch((res) => {});
+              const h = this.$createElement;
+                this.$msgbox({
+                  title: "消息",
+                  closeOnClickModal:false,
+                  message: h("p", null, [
+                    h("p", null, "请输入退课金额 "),
+                    h("input", { class: "el-input__inner",'attrs':{'value':res.data.suplusCourseFee},'on':{input:function(event){
+                        scope.row.fee = event.target.value;
+                     this.$emit('input',event.target.value)
+                    }.bind(this)}}),
+                    h('p',{style: "color: red;marginTop:20px"},"退费金额暂不进入账户余额")
+                  ]),
+                  showCancelButton: true,
                   confirmButtonText: "确定",
                   cancelButtonText: "取消",
-                  inputValue: res.data.suplusCourseFee,
-                })
-                  .then(({ value }) => {
-                    scope.row.fee = value;
-                    this.leaveSchool(scope);
-                  })
-                  .catch((res) => {});
+                }).then((action) => {
+                  this.leaveSchool(scope);
+                });
               }
             });
           }

+ 1 - 0
src/views/withdrawal-application/index.vue

@@ -235,6 +235,7 @@
               <p>退还乐器费用:报名缴费时缴纳的乐器费用(团购、租金)</p>
               <p>退还教辅费用:报名缴费时缴费的教辅费用</p>
               <p>退还乐保费用:报名缴费时缴费的乐保费用</p>
+              <p>退费金额暂不进入账户余额</p>
             </div>
             <el-button
               type="text"

+ 1 - 0
src/views/workBenchManager/journal/model/musicGroup.vue

@@ -174,6 +174,7 @@
             <p>退还乐器费用:报名缴费时缴纳的乐器费用(团购、租金)</p>
             <p>退还教辅费用:报名缴费时缴费的教辅费用</p>
             <p>退还乐保费用:报名缴费时缴费的乐保费用</p>
+             <p>退费金额暂不进入账户余额</p>
           </div>
           <el-button
             type="text"

+ 1 - 0
src/views/workBenchManager/journal/musicGroup.vue

@@ -173,6 +173,7 @@
               <el-input type="textarea" :disabled="showMessage.status != 'PROCESSING'"
                         v-model.trim="quitForm.reason"></el-input>
             </el-form-item>
+
           </el-form>
         <el-row v-permission="'musicGroupQuit/quitMusicGroup'">
           <el-col :span="24"