Merge branch '11/24SAAS' of http://git.dayaedu.com/yonge/dy-admin-manager into 11/24SAAS

src/constant/index.js

@@ -376,3 +376,10 @@ export const cloudGroupActive = {
   4: '半年',
   5: '年度'
 }
+
+// 扣费状态
+export const chargingStatus = {
+  0: '冻结',
+  1: '扣费',
+  2: '取消冻结'
+}

src/utils/searchArray.js

@@ -266,6 +266,7 @@ export const array2object = (array, [lk, vk] = ['value', 'label']) => {
   return object
 }
 
+
 // export {
 //   courseType,
 //   attendance,

src/utils/vueFilter.js

@@ -788,3 +788,7 @@ Vue.filter('cloudGroupActive', value => {
   }
   return template[value]
 })
+
+Vue.filter('chargingStatus', value => {
+  return constant.chargingStatus[value]
+})

src/views/platformManager/productManger/operationModel.vue

@@ -55,7 +55,6 @@
           <div slot-scope="{ node, data }">
             {{ node.label }}
             <el-tag v-if="data.type == 1"
-                    
                     effect="dark">按钮</el-tag>
           </div>
         </el-tree>
@@ -145,8 +144,17 @@ export default {
       let silderList = await getSilder({ hid: 0 })
       let tempData = []
       if (silderList.code == 200) {
-        this.silderList = silderList.data
-        tempData = this.setTableData(silderList.data)
+        const silderData = silderList.data || []
+        let silderItem = []
+        silderData.forEach(item => { // 去掉公用权限
+          if(item.permission != "publicAuthority") {
+            silderItem.push(item)
+          }
+        })
+
+        this.silderList = silderItem
+
+        tempData = this.setTableData(silderItem)
         this.data = tempData
       }
       if (this.pageType == 'update') {

src/views/tenantSetting/api.js

@@ -10,4 +10,11 @@ export const cloudTeacherOrderQueryActive = (data) => request2({
   url: '/api-web/cloudTeacherOrder/queryActive',
   method: 'post',
   data,
+})
+
+// 扣费记录
+export const tenantCloudCourseRecord = (data) => request2({
+  url: '/api-web/tenantCloudCourseRecord/queryPage',
+  method: 'post',
+  data,
 })

src/views/tenantSetting/chargingRecord.vue

@@ -13,18 +13,18 @@
       :saveKey="'tenantTradeManager'"
       :model.sync="searchForm"
     >
-      <el-form-item prop="transNo">
+      <el-form-item prop="search">
         <el-input
           placeholder="课程名/编号"
           clearable
           type="text"
-          v-model.trim="searchForm.transNo"
+          v-model.trim="searchForm.search"
         ></el-input>
       </el-form-item>
-      <el-form-item prop="orgin">
+      <el-form-item prop="organId">
         <el-select
           class="multiple"
-          v-model.trim="searchForm.orgin"
+          v-model.trim="searchForm.organId"
           filterable
           multiple
           collapse-tags
@@ -41,65 +41,54 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item prop="orderType">
+      <el-form-item prop="type">
         <el-select
-          v-model.trim="searchForm.orderType"
+          v-model.trim="searchForm.type"
           clearable
           filterable
-          @clear="onClear('orderType')"
+          @clear="onClear('type')"
           placeholder="课程类型"
         >
           <el-option
-            v-for="(item, index) in tenantStatus"
-            :key="index"
-            :label="item.label"
-            :value="item.value"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item prop="orderType">
-        <el-select
-          v-model.trim="searchForm.orderType"
-          clearable
-          filterable
-          @clear="onClear('orderType')"
-          placeholder="老师"
-        >
-          <el-option
-            v-for="(item, index) in tenantStatus"
+            v-for="(item, index) in courseType"
             :key="index"
             :label="item.label"
             :value="item.value"
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item prop="teacherId">
+          <remote-search
+            :commit="'setTeachers'"
+            v-model="searchForm.teacherId"
+          />
+        </el-form-item>
 
-      <el-form-item prop="orderType">
+      <el-form-item prop="status">
         <el-select
-          v-model.trim="searchForm.orderType"
+          v-model.trim="searchForm.status"
           clearable
           filterable
-          @clear="onClear('orderType')"
+          @clear="onClear('status')"
           placeholder="课程状态"
         >
           <el-option
-            v-for="(item, index) in tenantStatus"
+            v-for="(item, index) in courseStatus"
             :key="index"
             :label="item.label"
             :value="item.value"
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="orderState">
+      <el-form-item prop="deductState">
         <el-select
-          v-model.trim="searchForm.orderState"
+          v-model.trim="searchForm.deductState"
           clearable
           filterable
-          @clear="onClear('orderState')"
+          @clear="onClear('deductState')"
           placeholder="扣费状态"
         >
-          <el-option label="待支付" :value="0"></el-option>
-          <el-option label="已支付" :value="1"></el-option>
+          <el-option v-for="(item, key) of chargingStatus" :key="key" :label="item" :value="key"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item prop="createTimer">
@@ -129,41 +118,42 @@
         :data="tableList"
         :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
       >
-        <el-table-column align="center" label="课程编号" prop="transNo">
-        </el-table-column>
-        <el-table-column align="center" label="所属分部" prop="orderNo">
-        </el-table-column>
-        <el-table-column align="center" label="课程类型" prop="createdTime">
+        <el-table-column align="center" label="课程编号" prop="courseId">
         </el-table-column>
-        <el-table-column align="center" label="姓名" prop="tenantId">
+        <el-table-column align="center" label="所属分部" prop="organName">
         </el-table-column>
-        <el-table-column align="center" label="老师" prop="tenantName">
-        </el-table-column>
-        <el-table-column align="center" label="课程人数">
+        <el-table-column align="center" label="课程类型" prop="type">
           <template slot-scope="scope">
-            {{ scope.row.orderType | tenantStatus }}
+            {{ scope.row.type | courseTypeFormat }}
           </template>
         </el-table-column>
+        <!-- <el-table-column align="center" label="姓名" prop="tenantId">
+        </el-table-column> -->
+        <el-table-column align="center" label="老师" prop="teacherId">
+        </el-table-column>
+        <el-table-column align="center" label="课程人数" prop="studentNum">
+        </el-table-column>
         <el-table-column align="center" label="课程时间">
           <template slot-scope="scope">
-            {{ scope.row.expectAmount | moneyFormat }}
+            {{ scope.row.classDate }}
+            {{ scope.row.startClassTime }}~{{ scope.row.endClassTime }}
           </template>
         </el-table-column>
         <!-- <el-table-column align="center" label="网络教室剩余时长" prop="productName">
         </el-table-column> -->
         <el-table-column align="center" label="课程状态">
           <template slot-scope="scope">
-            {{ scope.row.actualAmount | moneyFormat }}
+            {{ scope.row.actualAmount | coursesStatus }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="扣费状态">
           <template slot-scope="scope">
-            {{ scope.row.orderState | tenantOrderStatus }}
+            {{ scope.row.deductState | chargingStatus }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="冻结金额（元）">
           <template slot-scope="scope">
-            {{ scope.row.orderState | tenantOrderStatus }}
+            {{ scope.row.amount | moneyFormat }}
           </template>
         </el-table-column>
       </el-table>
@@ -186,16 +176,18 @@
 <script>
 import pagination from "@/components/Pagination/index";
 import { tenantInfoQueryPage } from "../organManager/api";
-import { tenantOrderRecordQueryPage } from "./api";
-import { tenantStatus, dealStatus } from "@/utils/searchArray";
+import { tenantCloudCourseRecord } from "./api";
+import { courseType, courseStatus } from "@/utils/searchArray";
+import { chargingStatus } from '@/constant'
 import OrderInfo from './model/orderInfo'
 import { getTimes } from "@/utils";
 const initSearch = {
-  transNo: null,
-  orderNo: null,
-  tenantId: [],
-  orderType: null,
-  orderState: null,
+  type: null,
+  organId: null,
+  type: null,
+  teacherId: null,
+  status: null,
+  deductState: null,
   createTimer: [],
 };
 export default {
@@ -204,8 +196,9 @@ export default {
     const baseTenantId = sessionStorage.getItem('baseTenantId')
     return {
       baseTenantId,
-      tenantStatus,
-      dealStatus,
+      courseType,
+      courseStatus,
+      chargingStatus,
       tableList: [],
       orderVisible: false,
       pageInfo: {
@@ -232,10 +225,9 @@ export default {
     },
     async getList() {
       try {
-        let { createTimer, tenantId, ...reset } = this.searchForm;
-        const res = await tenantOrderRecordQueryPage({
+        let { createTimer, ...reset } = this.searchForm;
+        const res = await tenantCloudCourseRecord({
           ...reset,
-          tenantId: tenantId.join(','),
           ...getTimes(createTimer, ["startDate", "endDate"], "YYYY-MM-DD"),
           page: this.pageInfo.page,
           rows: this.pageInfo.limit,

src/views/tenantSetting/tenantInfo.vue

@@ -9,7 +9,7 @@
       <!-- 机构基本信息 -->
         <organInfo ref="organInfo" :data="info" type="update" tenantInfo="SETTING" />
 
-        <div style="display: flex;width: 100%;">
+        <div style="display: flex;width: 100%;" v-if="$helpers.permission('tenantInfo/update/info')">
           <i class="icon_admin_home"></i>
           <el-button type="primary"  @click="onNext">确认</el-button>
         </div>

vue.config.js

@@ -19,13 +19,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.227:8000' // 何国威
 // let target = 'http://192.168.3.250:8000' //邹璇
 // let target = 'http://192.168.3.112:8000' //勇哥
-
-// let target = 'http://192.168.3.139:8000' // 箭河
-// let target = 'http://192.168.3.124:8000' //邹璇
-// let target = 'http://192.168.3.119:8000' //勇哥
 let target = 'http://dev.dayaedu.com' // 开发环境
 // let target = 'https://test.dayaedu.com' //测试环境
-// let target = 'http://192.168.3.134:8000' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**