Преглед изворни кода

Merge branch 'tmp_class_fee' into ol_12_30

wolyshaw пре 4 година
родитељ
комит
813dc4874a

+ 4 - 86
README.md

@@ -1,89 +1,7 @@
-# vue-admin-template
+### dy-admin-manager
 
-English | [简体中文](./README-zh.md)
+#### 项目简介
 
-> A minimal vue admin template with Element UI & axios & iconfont & permission control & lint
+本项目为管理后台系统。
 
-**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
+主要使用 [Vue 2.X](https://cn.vuejs.org/v2/guide/)、[Element UI](https://element.eleme.io/#/zh-CN/component/installation),进行封装

+ 5 - 0
src/constant/index.js

@@ -190,3 +190,8 @@ export const mergeType = {
   合并课: '合并课',
   被合并课: '被合并课',
 }
+
+export const belongDaya = {
+  0: '其它课酬',
+  1: '基本课酬'
+}

+ 18 - 0
src/views/operateManager/serverIndexList.vue

@@ -160,6 +160,14 @@
           <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>
@@ -237,6 +245,14 @@
             </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">
@@ -262,6 +278,7 @@ 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
@@ -329,6 +346,7 @@ export default {
     this.init();
   },
   methods: {
+    dayjs,
     init () {
       if (this.$route.query.teacherId) {
         this.searchForm.teacherId = this.$route.query.teacherId * 1;

+ 31 - 0
src/views/workBenchManager/classFeesIsOk.vue

@@ -68,6 +68,20 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item prop="belongDaya">
+          <el-select
+            v-model.trim="searchForm.belongDaya"
+            clearable
+            placeholder="请选择课酬类型"
+          >
+            <el-option
+              v-for="(item, index) in belongDayaOption"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <remoteSearch :commit='"setTeachers"'  v-model='searchForm.teacherId' />
           <!-- <el-select
@@ -235,6 +249,15 @@
             <template slot-scope="scope">{{(scope.row.actualReceipts ? scope.row.actualReceipts : 0) + '元'}}</template>
           </el-table-column> -->
           <!-- expectSalary -->
+          <el-table-column
+            align="center"
+            prop="belongDaya"
+            label="课酬类型"
+          >
+          <template slot-scope="scope">{{
+              belongDaya[scope.row.belongDaya]
+            }}</template>
+          </el-table-column>
           <el-table-column align="center" prop="actualSalary" label="应发课酬">
             <template slot-scope="scope"
               >{{ scope.row.actualSalary | moneyFormat }}元</template
@@ -362,6 +385,8 @@ import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
 import remoteSearch from '@/components/remote-search/index'
 import load from "@/utils/loading";
+import { belongDaya } from '@/constant'
+import { objectToOptions } from '@/utils'
 import {
   findIsSettlementCourseSalarys,
   openSalaryConfirm,
@@ -373,6 +398,7 @@ export default {
   components: { pagination, remoteSearch },
   data() {
     return {
+      belongDaya,
       searchForm: {
         search: null,
         organIdList: null,
@@ -382,6 +408,7 @@ export default {
         signOutStatus: null,
         month: null,
         confirmStatus: null,
+        belongDaya: null,
       },
       dialogVisible: false,
       visibleForm: {
@@ -465,6 +492,7 @@ export default {
         signOutStatus: this.searchForm.signOutStatus || null,
         month: this.searchForm.month || null,
         confirmStatus: this.searchForm.confirmStatus || null,
+        belongDaya: this.searchForm.belongDaya || null,
         page: this.rules.page,
         rows: this.rules.limit,
       };
@@ -617,6 +645,9 @@ export default {
       // 扣款
       return this.visibleForm.reduceSalary;
     },
+    belongDayaOption() {
+      return objectToOptions(belongDaya)
+    }
   },
   watch: {
     getActualsalary(val) {