修复Bug

pages/components/order-detail.vue

@@ -3,7 +3,7 @@
  * @eMail: 932055106@qq.com
  * @Date: 2022-06-17 08:47:27
  * @LastEditors: tangjiale
- * @LastEditTime: 2022-06-17 14:36:01
+ * @LastEditTime: 2022-06-20 09:28:33
 -->
 
 
@@ -11,6 +11,7 @@
   <!-- 班课报名详情 -->
   <el-dialog :title="type==1?'订单详情':type==2?'订单详情':'销课详细记录'" class="model-bg" :visible.sync="show"
     :close-on-click-modal="false" width="1200px">
+    <template v-if="detail && detail.bmStuName">
 
       <!-- 销课记录详情 -->
     <template v-if="type == 3">
@@ -31,8 +32,8 @@
       <el-row :gutter="10"></el-row>
       <el-row :gutter="10">
         <el-col :span="8">所属校区：{{detail.shortName || ''}}</el-col>
-        <el-col :span="8">教练：{{detail.coach}}</el-col>
-        <el-col :span="8">班主任：{{detail.manger}}</el-col>
+        <el-col :span="8">教练：{{(detail.pxEmployeeList && detail.pxEmployeeList.length && detail.pxEmployeeList.filter(v => v.empPosition == 'coach')).map(e => e.empName).join(',')}}</el-col>
+        <el-col :span="8">班主任：{{(detail.pxEmployeeList && detail.pxEmployeeList.length && detail.pxEmployeeList.filter(v => v.empPosition == 'manger')).map(e => e.empName).join(',')}}</el-col>
       </el-row>
       <el-row :gutter="10">
         <el-col :span="8">学生姓名：{{detail.bmStuName}} <div class="ware-tab">预警</div></el-col>
@@ -61,8 +62,8 @@
       <el-row :gutter="10">
         <el-col :span="6">课程名称：{{detail.name || ''}}</el-col>
         <el-col :span="6">所属校区：{{detail.shortName || ''}}</el-col>
-        <el-col :span="6">教练：{{detail.coach || ''}}</el-col>
-        <el-col :span="6">班主任：{{detail.manger || ''}}</el-col>
+       <el-col :span="6">教练：{{(detail.pxEmployeeList && detail.pxEmployeeList.length && detail.pxEmployeeList.filter(v => v.empPosition == 'coach')).map(e => e.empName).join(',')}}</el-col>
+        <el-col :span="6">班主任：{{(detail.pxEmployeeList && detail.pxEmployeeList.length && detail.pxEmployeeList.filter(v => v.empPosition == 'manger')).map(e => e.empName).join(',')}}</el-col>
       </el-row>
 
       <el-row :gutter="10">
@@ -73,6 +74,8 @@
       </el-row>
     </template>
 
+    </template>
+
   </el-dialog>
 </template>
 

pages/salesManage.vue

@@ -3,7 +3,7 @@
  * @eMail: 932055106@qq.com
  * @Date: 2022-06-16 16:01:31
  * @LastEditors: tangjiale
- * @LastEditTime: 2022-06-17 14:21:07
+ * @LastEditTime: 2022-06-20 09:20:04
 -->
 
 <template>
@@ -61,29 +61,31 @@ export default {
            height:(screen.height - (482 * this.$px2rem)),
            columns:[
              {
-              title: "学生姓名",type:'customViewField'
+              title: "学生姓名",type:'customViewField',width:'120px',
             },{
               title: "性别",width:'100px',
               type: 'customField',
               fieldFunction: row => row.gender == 1 ? '男' : '女',
             },{
-              title: "手机号",field: "bmPhone"
+              title: "手机号",field: "bmPhone",width:'130px',
             },{
               title: "课程名称",field: "name"
             },{
-              title: "课程类型", type: 'customField',width:'140px',
+              title: "课程类型", type: 'customField',width:'100px',
               fieldFunction: row => (row.type == 1 ?'正式课' : '体验课'),
             },{
-              title: "价格", type: 'customField',width:'140px',
+              title: "价格", type: 'customField',width:'120px',
               fieldFunction: row => (row.cost  / 100),
             },{
-              title: "教练",field: "coach"
+              title: "教练",type: 'customField',
+              fieldFunction: row => (row.pxEmployeeList.filter(v => v.empPosition == 'coach')).map(e => e.empName).join(','),
             },{
-              title: "班主任",field: "manger"
+              title: "班主任",type: 'customField',
+              fieldFunction: row => (row.pxEmployeeList.filter(v => v.empPosition == 'manger')).map(e => e.empName).join(','),
             },{
-              title: "总课时",field: "totalKs"
+              title: "总课时",field: "totalKs",width:'100px',
             },{
-              title: "剩余课时",field: "syKs"
+              title: "剩余课时",field: "syKs",width:'100px',
             },{
               title:'操作',width: "130px",
               fixed:'right',type: "buttons",

pages/studentManage.vue

@@ -3,18 +3,15 @@
  * @eMail: 932055106@qq.com
  * @Date: 2022-06-02 14:08:46
  * @LastEditors: tangjiale
- * @LastEditTime: 2022-06-17 14:08:08
+ * @LastEditTime: 2022-06-20 08:47:48
 -->
 <template>
   <div class="page-bg">
-    
-    <!-- autoLoad -->
-    <!-- autoLoad -->
     <t-table autoLoad ref="table" :options="options" :params="params"
         @row-btn-click="onRowButtonClick">
 
         <!-- 操作栏 -->
-        <template slot="form--search" v-if="!([1,2].includes(myUserInfo.roleId))">
+        <template slot="form-order-search" v-if="!([1,2].includes(myUserInfo.roleId))">
           <div class="search-bottom">
             <el-button type="primary" size="mini" plain @click="handleOption('add')"><i class="el-icon-plus"></i> 新增学生</el-button>
             <el-button type="primary" size="mini" plain @click="handleOption('import')"><i class="el-icon-upload2"></i> 导入学生</el-button>