Merge branch 'ol_12_30' into online

README.md

@@ -1,7 +1,89 @@
-### dy-admin-manager
+# vue-admin-template
 
-#### 项目简介
+English | [简体中文](./README-zh.md)
 
-本项目为管理后台系统。
+> A minimal vue admin template with Element UI & axios & iconfont & permission control & lint
 
-主要使用 [Vue 2.X](https://cn.vuejs.org/v2/guide/)、[Element UI](https://element.eleme.io/#/zh-CN/component/installation)，进行封装
+**Live demo:** http://panjiachen.github.io/vue-admin-template
+
+
+**The current version is `v4.0+` build on `vue-cli`. If you want to use the old version , you can switch branch to [tag/3.11.0](https://github.com/PanJiaChen/vue-admin-template/tree/tag/3.11.0), it does not rely on `vue-cli`**
+
+## Build Setup
+
+
+```bash
+# clone the project
+git clone https://github.com/PanJiaChen/vue-admin-template.git
+
+# enter the project directory
+cd vue-admin-template
+
+# install dependency
+npm install
+
+# develop
+npm run dev
+```
+
+This will automatically open http://localhost:9528
+
+## Build
+
+```bash
+# build for test environment
+npm run build:stage
+
+# build for production environment
+npm run build:prod
+```
+
+## Advanced
+
+```bash
+# preview the release environment effect
+npm run preview
+
+# preview the release environment effect + static resource analysis
+npm run preview -- --report
+
+# code format check
+npm run lint
+
+# code format check and auto fix
+npm run lint -- --fix
+```
+
+Refer to [Documentation](https://panjiachen.github.io/vue-element-admin-site/guide/essentials/deploy.html) for more information
+
+## Demo
+
+![demo](https://github.com/PanJiaChen/PanJiaChen.github.io/blob/master/images/demo.gif)
+
+## Extra
+
+If you want router permission && generate menu by user roles , you can use this branch [permission-control](https://github.com/PanJiaChen/vue-admin-template/tree/permission-control)
+
+For `typescript` version, you can use [vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template) (Credits: [@Armour](https://github.com/Armour))
+
+## Related Project
+
+[vue-element-admin](https://github.com/PanJiaChen/vue-element-admin)
+
+[electron-vue-admin](https://github.com/PanJiaChen/electron-vue-admin)
+
+[vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template)
+
+## 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.
+
+Copyright (c) 2017-present PanJiaChen

src/constant/index.js

@@ -190,8 +190,3 @@ export const mergeType = {
   合并课: '合并课',
   被合并课: '被合并课',
 }
-
-export const belongDaya = {
-  0: '奖金',
-  1: '工资'
-}

src/views/operateManager/serverIndexList.vue

@@ -160,14 +160,6 @@
           <el-table-column align="center"
                            prop="educationalTeacherName"
                            label="乐团主管"></el-table-column>
-          <el-table-column align="center"
-                           prop="courseIds"
-                           width="100"
-                           label="服务课程">
-                           <template slot-scope="scope">
-                              <copy-text>{{scope.row.courseIds || '课外训练'}}</copy-text>
-                            </template>
-          </el-table-column>
           <!-- <el-table-column align="center" label="当前有VIP课" width="100" >
             <template slot-scope="scope">
               <div>{{scope.row.existVipCourse?'是':'否'}}</div>
@@ -245,14 +237,6 @@
             </template>
           </el-table-column>
           <el-table-column align="center"
-                           width="120"
-                           label="服务周期">
-            <template slot-scope="scope">
-              <div>{{dayjs(scope.row.monday).format('YYYY-MM-DD')}}</div>
-              <div>{{dayjs(scope.row.sunday).format('YYYY-MM-DD')}}</div>
-            </template>
-          </el-table-column>
-          <el-table-column align="center"
                            label="操作">
             <!--  -->
             <template slot-scope="scope">
@@ -278,7 +262,6 @@ import axios from "axios";
 import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
 import load from "@/utils/loading";
-import dayjs from 'dayjs'
 import { getEmployeeOrgan, getTeacher } from "@/api/buildTeam";
 import { findStudentExtracurricularExercisesSituations } from "@/api/afterSchool";
 // findStudentExtracurricularExercisesSituations
@@ -346,7 +329,6 @@ export default {
     this.init();
   },
   methods: {
-    dayjs,
     init () {
       if (this.$route.query.teacherId) {
         this.searchForm.teacherId = this.$route.query.teacherId * 1;

src/views/workBenchManager/journal/musicGroup.vue

@@ -130,6 +130,11 @@
         </el-row>
 
         <el-row>
+          <el-col :span="4">用户备注： </el-col>
+          <el-col :span="20"> {{ showMessage.userComment }}</el-col>
+        </el-row>
+
+        <el-row>
           <el-col :span="24">
             <el-input :disabled="showMessage.status != 'PROCESSING'"
                       type="textarea"
@@ -258,7 +263,7 @@ export default {
             this.showMessage.type = memo.type
             this.remark = res.data.studentApplyRefunds.remark
             this.actualAmount = res.data.studentApplyRefunds.actualAmount
-            // 
+            //
           } else {
             this.$message.error(res.msg)
           }
@@ -481,4 +486,4 @@ export default {
     color: #ccc;
   }
 }
-</style>
+</style>