11

11

README-zh.md

@@ -2,11 +2,7 @@
 
 > 这是一个极简的 vue admin 管理后台。它只包含了 Element UI & axios & iconfont & permission control & lint，这些搭建后台必要的东西。
 
-[线上地址](http://panjiachen.github.io/vue-admin-template)
-
-[国内访问](https://panjiachen.gitee.io/vue-admin-template)
-
-目前版本为 `v4.0+` 基于 `vue-cli` 进行构建，若你想使用旧版本，可以切换分支到[tag/3.11.0](https://github.com/PanJiaChen/vue-admin-template/tree/tag/3.11.0)，它不依赖 `vue-cli`。
+。
 
 ## 公用方法调用
 1. 导出文档或下载模板
@@ -52,7 +48,6 @@ npm install --registry=https://registry.npm.taobao.org
 npm run dev
 ```
 
-浏览器访问 [http://localhost:9528](http://localhost:9528)
 
 ## 发布
 
@@ -73,29 +68,9 @@ npm run preview
 # 预览发布环境效果 + 静态资源分析
 npm run preview -- --report
 
-# 代码格式检查
-npm run lint
-
-# 代码格式检查并自动修复
-npm run lint -- --fix
 ```
 
-更多信息请参考 [使用文档](https://panjiachen.github.io/vue-element-admin-site/zh/)
-
-## Demo
-
-![demo](https://github.com/PanJiaChen/PanJiaChen.github.io/blob/master/images/demo.gif)
+## 注意事项
 
-## Browsers support
-
-Modern browsers and Internet Explorer 10+.
-
-| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari |
-| --------- | --------- | --------- | --------- |
-| IE10, IE11, Edge| last 2 versions| last 2 versions| last 2 versions
-
-## License
-
-[MIT](https://github.com/PanJiaChen/vue-admin-template/blob/master/LICENSE) license.
+```bash
 
-Copyright (c) 2017-present PanJiaChen

src/views/teamBuild/components/teamSoundMoney.vue

@@ -1873,16 +1873,17 @@ export default {
       let coursePrice = Number(mgs)
       let csi = this.checkfor;
       let newStudent = this.newStudentfor
+      const sbaseInfo = newStudent.baseInfo
+      if (sbaseInfo.ischeck && sbaseInfo.isStatus) {
+        const value = Number(parseFloat(sbaseInfo.nowValue ? sbaseInfo.nowValue : 0))
+        marketPrice += value;
+        amount += Number(parseFloat(sbaseInfo.value ? sbaseInfo.value : 0))
+      }
       // 加上判断是否有课程信息
       if (mgs) {
         // console.log(csi)
         // amount += parseFloat(mgs);s
-        const sbaseInfo = newStudent.baseInfo
-        if (sbaseInfo.ischeck && sbaseInfo.isStatus) {
-          const value = Number(parseFloat(sbaseInfo.nowValue ? sbaseInfo.nowValue : 0))
-          marketPrice += value;
-          amount += Number(parseFloat(sbaseInfo.value ? sbaseInfo.value : 0))
-        }
+
 
         const allInfo = csi.allInfo
         if (allInfo.ischeck) {

src/views/teamDetail/components/studentList.vue

@@ -208,7 +208,7 @@
         </el-table-column>
         <el-table-column align="center"
                          fixed="right"
-                         width="250px;"
+                         width="300px;"
                          label="操作">
           <template slot-scope="scope">
             <div>
@@ -220,6 +220,9 @@
               <el-button type="text"
                          v-if="permission('musicGroupQuit/directQuitMusicGroup')&&scope.row.studentStatus != 'QUIT'"
                          @click="quieTeamMask(scope.row)">退团</el-button>
+              <el-button type="text"
+                         v-if="permission('musicGroupQuit/directQuitMusicGroup1')&&scope.row.studentStatus != 'QUIT'"
+                         @click="quieTeam(scope.row)">退团不退费</el-button>
 
               <el-button type="text"
                          v-if="permission('visit/add')"
@@ -845,7 +848,8 @@ export default {
         feedback: [{ required: true, message: "请输入家长反馈" }],
         visitTime: [{ required: true, message: "请输入回访时间" }],
         visitType: [{ required: true, message: "请选择回访类型" }]
-      }
+      },
+      pickerOptions: null
     };
   },
   components: {
@@ -1278,6 +1282,39 @@ export default {
       this.activeRow = row;
       this.quitVisible = true;
     },
+    quieTeam (row) {
+      console.log(row)
+      this.$confirm("确定退团?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          // 发请求 退团
+          StudentQuit({
+            musicGroupId: this.teamid,
+            userId: row.userId,
+            reason: '',
+            isRefundCourseFee: false,
+            isRefundInstrumentFee: false,
+            isRefundTeachingAssistantsFee: false
+          }).then(res => {
+            this.quitForm = {
+              // 退团信息确认
+              isRefundCourseFee: null,
+              isRefundInstrumentFee: null,
+              isRefundTeachingAssistantsFee: null,
+              reason: ""
+            };
+            if (res.code == 200) {
+              this.$message.success("退团成功");
+              this.getList();
+              this.quitVisible = false;
+            }
+          });
+        })
+        .catch(() => { });
+    },
     checkPhone (val) {
       var regu = /^1[3456789]\d{9}$/;
       var re = new RegExp(regu);
@@ -1383,7 +1420,7 @@ export default {
           return time.getTime() >= new Date().getTime(); //开始时间不选时，结束时间最大值小于等于当天
         }
       };
-    },
+    }
   },
   watch: {
     quitVisible (val) {