打包

src/api/orderManager.js

@@ -0,0 +1,12 @@
+// 系统专项设置api文件
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 分页查询提现 
+export function studentWithdraw(data) {
+    return request({
+        url: '/web-server/studentWithdraw/queryPage',
+        method: 'get',
+        params: data
+    })
+}

src/api/specialSetting.js

@@ -83,6 +83,14 @@ export function chargeTypeUpSet(data) {
     })
 }
 
+// 删除收费类型
+export function chargeTypeDel(data) {
+    return request({
+        url: `/web-server/chargeType/del/${data}`,
+        method: 'post'
+    })
+}
+
 // 分页查询作业模板列表
 export function courseHomeworkTemplateList(data) {
     return request({

src/api/studentManager.js

@@ -65,7 +65,6 @@ export function studentWithdraw(data) {
     })
 }
 
-
 // 获取学员扣费记录列表
 export function queryStudentPayment(data) {
     return request({
@@ -75,3 +74,21 @@ export function queryStudentPayment(data) {
     })
 }
 
+// 获取学员订单列表
+export function studentPaymentOrderList(data) {
+    return request({
+        url: `/web-server/studentPaymentOrder/queryOrderPage`,
+        method: 'get',
+        params: data
+    })
+}
+
+// 获取用户默认账户基本信息
+export function getUserCashAccountBaseInfo(data) {
+    return request({
+        url: `/web-server/studentManage/getUserCashAccountBaseInfo`,
+        method: 'get',
+        params: data
+    })
+}
+

src/api/teacherManager.js

@@ -95,7 +95,7 @@ export function vipGroupSalaryList(data) {
 // 修改教师vip课酬
 export function vipGroupSalarySet(data) {
     return request({
-        url: '/web-server/teacherDefaultVipGroupSalary/set',
+        url: '/web-server/teacherDefaultVipGroupSalary/upSet',
         method: 'post',
         data: data
     })
@@ -122,8 +122,8 @@ export function teacherSalaryBatchUpset(data) {
 // 课酬调整
 export function updateTeacherCoursesSalary(data) {
     return request({
-        // url: '/web-server/courseSchedule/updateTeacherCoursesSalary',
-        url: '/api-student/course/updateTeacherCoursesSalary',
+        url: '/web-server/courseSchedule/updateTeacherCoursesSalary',
+        // url: '/api-student/course/updateTeacherCoursesSalary',
         method: 'post',
         data: qs.stringify(data)
     })

src/utils/searchArray.js

@@ -33,9 +33,29 @@ const teacherStatus = [
     { label: '锁定', value: 'NORMAL' }
 ]
 
+// 考勤状态
+const attendanceStatus = [
+    { value: "NORMAL", label: "正常" },
+    { value: "TRUANT", label: "旷课" },
+    { value: "LEAVE", label: "请假" },
+    { value: "QUIT_SCHOOL", label: "退学" },
+    { value: "DROP_OUT", label: "休学" }
+]
+
+// 交易状态
+const orderStatus = [
+    { value: "APPLY", label: "报名" },
+    { value: "RENEW", label: "续费" },
+    { value: "OTHER", label: "其他" },
+    { value: "SMALL_CLASS_TO_BUY", label: "小课购买" }
+]
+
+
 export {
     courseType,
     attendance,
     jobNature,
-    teacherStatus
+    teacherStatus,
+    attendanceStatus,
+    orderStatus
 }

src/utils/vueFilter.js

@@ -157,3 +157,14 @@ Vue.filter('workType', value => {
     }
     return template[value]
 })
+
+// 交易类型
+Vue.filter('orderType', value => {
+    let template = {
+        APPLY: "报名",
+        RENEW: "续费",
+        OTHER: "其他",
+        SMALL_CLASS_TO_BUY: "小课购买"
+    }
+    return template[value]
+})

src/views/businessManager/orderManager/income.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="m-container">
-    <h2>收入</h2>
+    <h2>订单管理</h2>
     <div class="m-core">
       <!-- 搜索类型 -->
       <el-form :inline="true"
@@ -58,10 +58,10 @@
                           label="交易状态">
           </el-table-column>
         </el-table>
-        <pagination :total="rules.total"
-                    :page.sync="rules.page"
-                    :limit.sync="rules.limit"
-                    :page-sizes="rules.page_size"
+        <pagination :total="pageInfo.total"
+                    :page.sync="pageInfo.page"
+                    :limit.sync="pageInfo.limit"
+                    :page-sizes="pageInfo.page_size"
                     @pagination="getList" />
       </div>
     </div>
@@ -69,6 +69,8 @@
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
+import { studentWithdraw } from '@/api/orderManager'
+import store from '@/store'
 export default {
   components: { pagination },
   name: 'income',
@@ -79,7 +81,7 @@ export default {
       },
       searchLsit: [],
       tableList: [],
-      rules: {
+      pageInfo: {
         // 分页规则
         limit: 10, // 限制显示条数
         page: 1, // 当前页
@@ -89,7 +91,9 @@ export default {
     }
   },
   methods: {
-    getList () { }
+    getList () { 
+      studentWithdraw()
+    }
   }
 }
 </script>

src/views/categroyManager/globalConfig.vue

@@ -52,13 +52,14 @@ export default {
   name: 'globalConfig',
   data () {
     return {
-      activeIndex: '0',
-      activeStatus: [true, false, false, false, false, false, false]
+      activeIndex: '3',
+      activeStatus: [false, false, false, true, false, false, false]
     }
   },
   methods: {
     handleClick (val) {
       this.activeIndex = val.name
+      this.activeStatus = [false, false, false, false, false, false, false]
       this.activeStatus[val.name] = true
     }
   }

src/views/categroyManager/insideSetting/branchManager.vue

@@ -234,7 +234,7 @@ export default {
           linkman: rows.linkman, // 来源
           job: rows.job,  // 费用
           mobileNo: rows.mobileNo ? Number(rows.mobileNo) : null, // 合作单位
-          ownershipType: row.ownershipType,
+          ownershipType: rows.ownershipType,
           organId: store.getters.organ
         }
       }

src/views/categroyManager/insideSetting/staffManager.vue

@@ -65,8 +65,8 @@
         </el-form-item>
         <el-form-item label="性别" prop="gender" :label-width="formLabelWidth">
           <el-select v-model="form.gender">
-            <el-option label="男" value="1"></el-option>
-            <el-option label="女" value="0"></el-option>
+            <el-option label="男" :value="1"></el-option>
+            <el-option label="女" :value="0"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="手机号" prop="phone" :label-width="formLabelWidth">

src/views/categroyManager/specialSetup/typesManager.vue

@@ -64,7 +64,7 @@
 <script>
 import pagination from '@/components/Pagination/index'
 import store from '@/store'
-import { chargeTypeList, subjectListTree, chargeTypeUpSet } from '@/api/specialSetting'
+import { chargeTypeList, subjectListTree, chargeTypeUpSet, chargeTypeDel } from '@/api/specialSetting'
 export default {
   components: { pagination },
   name: 'adminManager',
@@ -80,7 +80,7 @@ export default {
       typeStatus: false, // 添加教学点 
       formLabelWidth: '120px',
       form: {
-        name: null, // 作业模块名称
+        name: null, // 
         subjectIds: [],
         organId: store.getters.organ
       },
@@ -134,6 +134,11 @@ export default {
         this.$message.error(res.msg)
       }
     },
+    onTypesDel(row) {
+      chargeTypeDel(row.id).then(res => {
+        this.messageTips('删除', res)
+      })
+    },
     getList () { 
       chargeTypeList({
         rows: this.pageInfo.limit,
@@ -186,12 +191,14 @@ export default {
           let tempArray = []
           result.rows.forEach((item, index) => {
             let subject = []
-            item.subjects.forEach(s => {
-              subject.push({
-                value: s.id,
-                label: s.name
+            if(item.subjects) {
+              item.subjects.forEach(s => {
+                subject.push({
+                  value: s.id,
+                  label: s.name
+                })
               })
-            })
+            }
             
             tempArray[index] = {
               label: item.name,

src/views/studentManager/components/studentCashout.vue

@@ -1,11 +1,5 @@
 <template>
   <div>
-    <!-- <el-form :inline="true"
-             :model="searceList">
-      <el-form-item label="搜索字段XX">
-        <el-input></el-input>
-      </el-form-item>
-    </el-form> -->
     <div class="tableWrap">
       <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
         <el-table-column label=提现交易流水号 prop="withdrawNo">
@@ -14,9 +8,9 @@
         </el-table-column>
         <el-table-column label=提现金额 prop="amount">
         </el-table-column>
-        <el-table-column label=账户余额 prop="">
+        <el-table-column label=账户余额 prop="amount">
         </el-table-column>
-        <el-table-column label=账户号 prop="">
+        <el-table-column label=账户号 prop="bankCardNo">
         </el-table-column>
         <el-table-column label=提现状态 prop="status">
         </el-table-column>
@@ -62,7 +56,6 @@ export default {
         rows: this.pageInfo.limit,
         page: this.pageInfo.page
       }).then(res => {
-        console.log(res)
         if(res.code == 200) {
           this.tableList = res.data.rows
         }

src/views/studentManager/components/studentOrder.vue

@@ -3,39 +3,150 @@
     <div class="headWrap">
       <div class="left">
         <div class="headItem">
-          <p>账户余额:<span>12345</span></p>
+          <p>账户余额:<span>{{ dataInfo.balance }}</span></p>
         </div>
         <div class="headItem">
-          <p>银行卡:<span>12345</span></p>
+          <p>银行卡:<span>{{ dataInfo.cardNo }}</span></p>
         </div>
         <div class="headItem">
-          <p>支付宝:<span>12345</span></p>
+          <p>支付宝:<span>{{ dataInfo.zfb }}</span></p>
         </div>
         <div class="headItem">
-          <p>微信:<span>12345</span></p>
+          <p>微信:<span>{{ dataInfo.wxBalance }}</span></p>
         </div>
       </div>
     </div>
+    <!-- 搜索类型 -->
+    <el-form :inline="true"
+             class="searchForm"
+             v-model="searchForm">
+      <el-form-item>
+        <el-date-picker
+          v-model="orderDate"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          @change="searchCourseDate"
+          range-separator="至"
+          start-placeholder="订单开始日期"
+          end-placeholder="订单结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-select v-model="searchForm.paymentType" placeholder="交易类型">
+          <el-option v-for="(item, index) in orderStatus" :key="index" 
+            :label="item.label" :value="item.value"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-input type="text" v-model="searchForm.remark" placeholder="订单说明"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="getList" type="danger">搜索</el-button>
+        <el-button @click="onReSet" type="primary">重置</el-button>
+      </el-form-item>
+    </el-form>
     <div class="tableWrap">
-      <el-table :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column label="订单日期"
+      <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table-column label="订单日期" prop="createTime"
                          width="180px">
         </el-table-column>
         <el-table-column label="交易类型"
                          width="180px">
+          <template slot-scope="scope">
+            {{ scope.row.type | orderType }}
+          </template>
         </el-table-column>
-        <el-table-column label="订单说明"
-                         width="180px">
+        <el-table-column  width="180px" label="实际金额" prop="actualAmount">
         </el-table-column>
-        <el-table-column label="实际金额">
+        <el-table-column label="订单说明" prop="memo" >
         </el-table-column>
       </el-table>
+      <pagination :total="pageInfo.total"
+                :page.sync="pageInfo.page"
+                :limit.sync="pageInfo.limit"
+                :page-sizes="pageInfo.page_size"
+                @pagination="getList" />
     </div>
   </div>
 </template>
 <script>
+import pagination from '@/components/Pagination/index'
+import { studentPaymentOrderList, getUserCashAccountBaseInfo } from '@/api/studentManager'
+import { orderStatus } from '@/utils/searchArray'
+import store from '@/store'
 export default {
-
+  components: { pagination },
+  data () {
+    return {
+      organId: store.getters.organ,
+      orderDate: null,
+      searchForm: {
+        studentId: this.$route.query.userId,
+        orderStartDate: null,
+        orderEndDate: null,
+        paymentType: null,
+        remark: null
+      },
+      orderStatus: orderStatus,
+      pageInfo: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      },
+      tableList: [],
+      dataInfo: {}
+    }
+  },
+  mounted() {
+    this.getList()
+    this.__init()
+  },
+  methods: {
+    __init() {
+      getUserCashAccountBaseInfo({ userId: this.$route.query.userId }).then(res => {
+        if(res.code == 200) {
+          this.dataInfo = {
+            balance: res.data.balance,
+            wxBalance: 0,
+            cardNo: res.data.cardNo,
+            zfb: null
+          }
+        }
+      })
+    },
+    getList () {
+      let params = this.searchForm
+      params.rows = this.pageInfo.limit
+      params.page = this.pageInfo.page
+      studentPaymentOrderList(params).then(res => {
+        if(res.code == 200) {
+          this.tableList = res.data.rows
+          this.pageInfo.total = res.data.total
+        }
+      })
+    },
+    searchCourseDate(value) {
+      if(value) {
+        this.searchForm.orderStartDate = value[0]
+        this.searchForm.orderEndDate = value[1]
+      } else {
+        this.searchForm.orderStartDate = null
+        this.searchForm.orderEndDate = null
+      }
+    },
+    onReSet() { // 重置搜索
+      this.orderDate = null
+      this.searchForm = {
+        studentId: this.$route.query.userId,
+        orderStartDate: null,
+        orderEndDate: null,
+        paymentType: null,
+        remark: null
+      }
+    },
+  }
 }
 </script>
 <style lang="scss" scope>

src/views/studentManager/components/studentPayList.vue

@@ -5,21 +5,12 @@
              class="searchForm"
              v-model="searchForm">
       <el-form-item>
-        <el-select v-model="searchForm.classGroupType" placeholder="课程类型">
-          <el-option v-for="(item, index) in courseArray" :key="index" 
-            :label="item.label" :value="item.value"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
         <el-select v-model="searchForm.attendanceStatus" placeholder="考勤状态">
-          <el-option v-for="(item, index) in att" :key="index" 
+          <el-option v-for="(item, index) in attendanceStatus" :key="index" 
             :label="item.label" :value="item.value"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-input placeholder="班级名称" v-model="searchForm.classGroupName"></el-input>
-      </el-form-item>
-      <el-form-item>
         <el-button @click="getList" type="danger">搜索</el-button>
         <el-button @click="onReSet" type="primary">重置</el-button>
       </el-form-item>
@@ -47,18 +38,15 @@
         </el-table-column>
         <el-table-column align='center'
                          label="考勤状态">
-          <template>
-            
+          <template slot-scope="scope">
+            {{ scope.row.status | clockingIn }}
           </template>
         </el-table-column>
-        <el-table-column align='center'
-                         label="总计缴费">
-        </el-table-column>
-        <el-table-column align='center'
-                         label="本次扣费">
+        <el-table-column align='center' prop="actualPrice"
+                         label="预计扣费">
         </el-table-column>
-        <el-table-column align='center'
-                         label="课程余额">
+        <el-table-column align='center' prop="expectPrice"
+                         label="实际扣费">
         </el-table-column>
       </el-table>
       <pagination :total="pageInfo.total"
@@ -72,34 +60,18 @@
 <script>
 import pagination from '@/components/Pagination/index'
 import { queryStudentPayment } from '@/api/studentManager'
+import { attendanceStatus } from '@/utils/searchArray'
+import store from '@/store'
 export default {
   components: { pagination },
   data () {
     return {
+      organId: store.getters.organ,
       searchForm: {
         userId: this.$route.query.userId,
-        classGroupType: null,
         attendanceStatus: null,
-        classGroupName: null,
       },
-      courseArray: [
-        { label: '单技课', value: 'NORMAL' },
-        { label: '合奏课', value: 'MIX' },
-        { label: '小班课', value: 'HIGH' },
-        { label: 'VIP课', value: 'VIP' },
-        { label: '试听课', value: 'DEMO' }
-      ],
-      att: [
-        // { value: "NORMAL", label: "正常" },
-        // { value: "TRUANT", label: "旷课" },
-        // { value: "LEAVE", label: "请假" },
-        // { value: "QUIT_SCHOOL", label: "休学" },
-        // { value: "DROP_OUT", label: "退学" }
-        { value: "NORMAL", label: "正常" },
-        { value: "TRUANT", label: "旷课" },
-        { value: "LEAVE", label: "请假" },
-        { value: "DROP_OUT", label: "休学" },
-      ],
+      attendanceStatus: attendanceStatus,
       pageInfo: {
         // 分页规则
         limit: 10, // 限制显示条数
@@ -128,11 +100,8 @@ export default {
     onReSet() { // 重置搜索
       this.searchForm = {
         userId: this.$route.query.userId,
-        classGroupType: null,
-        attendanceStatus: null,
-        classGroupName: null
+        attendanceStatus: null
       }
-      this.getList()
     },
   }
 }

src/views/studentManager/index.vue

@@ -61,8 +61,8 @@ export default {
   name: 'studentDetail',
   data () {
     return {
-      activeIndex: '5',
-      acitveStatus: [false, false, false, false, true, false, false]
+      activeIndex: '6',
+      acitveStatus: [false, false, false, false, false, true, false]
     }
   },
   methods: {

src/views/teacherManager/teacherDetail/components/salarySet.vue

@@ -131,7 +131,7 @@ export default {
           vipGroupSalaryList({
             rows: 9999,
             page: 1,
-            teacherId: this.teacherId
+            search: this.teacherId
           }).then(res => {
             if(res.code == 200) {
               let rows = res.data.rows
@@ -213,7 +213,7 @@ export default {
           if(item.vipGroupCategoryId == c.vipGroupCategoryId) {
             item.checked = true
             result.push({
-              vipGroupCategoryName: c.vipGroupCategoryName,
+              vipGroupCategoryId: c.vipGroupCategoryId,
               offlineClassesSalary: c.offlineClassesSalary,
               onlineClassesSalary: c.onlineClassesSalary,
               vipGroupCategoryName: c.vipGroupCategoryName,
@@ -229,7 +229,7 @@ export default {
           }
         })
       } else {
-        result.vipData
+        result = vipData
       }
       this.vipTable = result
     },

src/views/teacherManager/teacherDetail/index.vue

@@ -60,8 +60,8 @@ export default {
   data () {
     return {
       teacherName: this.$route.query.teacherName,
-      activeName: "0",
-      activeStatus: [true, false, false, false, false, false, false, false]
+      activeName: "7",
+      activeStatus: [false, false, false, false, false, false, false, true]
     }
   },
   methods: {

vue.config.js

@@ -18,8 +18,8 @@ const name = defaultSettings.title || 'vue Admin Template' // page title
 // http://192.168.3.28:8000
 // let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:8000' //勇哥
-let target = 'http://47.99.212.176:8000' // 测试服
-// let target = 'http://192.168.3.48:8000' // 乔
+// let target = 'http://47.99.212.176:8000' // 测试服
+let target = 'http://192.168.3.48:8000' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**
@@ -46,11 +46,11 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       // http://47.99.212.176:8000
       // http://192.168.3.28:8000
-      '/api-auth': {
+      '/auth-server': {
         target: target,
         changeOrigin: true,
         pathRewrite: {
-          '^api-auth': ''
+          '^auth-server': ''
         }
       },
       '/web-server': {
@@ -60,6 +60,13 @@ module.exports = {
           '^web-server': ''
         }
       },
+      '/teacher-server': {
+        target: target,
+        changeOrigin: true,
+        pathRewrite: {
+          '^teacher-server': ''
+        }
+      },
       '/jiari': {
         target: 'http://tool.bitefu.net',
         changeOrigin: true,