更新改动

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-30 11:13:11
+ * @LastEditTime: 2022-07-01 10:24:23
 -->
 
 
@@ -31,7 +31,7 @@
       </el-row>
       <el-row :gutter="10"></el-row>
       <el-row :gutter="10">
-        <el-col :span="8">所属校区：{{detail.shortName || ''}}</el-col>
+        <el-col :span="8">上课校区：{{detail.shortName || ''}}</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>
@@ -61,7 +61,7 @@
 
       <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.shortName || ''}}</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>

pages/courseJoin.vue

@@ -11,22 +11,39 @@
 
       <template slot="custom-view-field" slot-scope="scope">
           <div class="curstom-btn" v-if="scope.idx === 7">
-            <el-button @click="agreeJoin(scope.row)" v-if="scope.row.bmStatus == 0" type="primary" size="small" plain>确认报名</el-button>
-            <!-- <t-select class="btn-select" v-model="scope.row.taskStatus" :ds="[{name:'同意取消',value:1},{name:'不同意取消',value:2}]" required></t-select> -->
-            <el-dropdown v-if="scope.row.bmStatus == 2">
-              <el-button type="warning" size="small" plain>是否同意</el-button>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item @click.native="agreeCannel(scope.row,1)">同意取消</el-dropdown-item>
-                <el-dropdown-item @click.native="agreeCannel(scope.row,2)">不同意取消</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-            <el-button @click="openDetail(scope.row)" type="success" size="small" plain>详情</el-button>
+
+            <!-- 权限按钮配置 buttonId  1确认报名 2同意取消 3不用意取消 -->
+            <el-button v-for="(btn,idx) in buttonsList" :key="idx" size="small" plain
+              v-show="(btn.buttonId == 1 && scope.row.bmStatus == 0)  
+              || (btn.buttonId == 4 && (scope.row.bmStatus == 0 || scope.row.bmStatus == 1))  
+              || (scope.row.bmStatus == 2 && (btn.buttonId == 2 || btn.buttonId == 3))" 
+              @click="buttonOption(btn.buttonId,scope.row)" :type="btn.buttonStyle || 'primary'">{{btn.buttonName}}</el-button>
+            
+            <el-button @click="openDetail(btn.buttonId,scope.row)" type="success" size="small" plain>详情</el-button>
+           
           </div>
       </template>
     </t-table>
 
     <!-- 详情 -->
     <order-detail ref="detail" type="2"></order-detail>
+
+    <!-- 修改价格 -->
+    <el-dialog title="报名价格修改" :visible.sync="priceShow" width="400px"
+      :before-close="closePrice" :close-on-click-modal="false">
+      <div class="user-infos">
+        姓名：{{activeUser.name}}
+      </div>
+      <div class="user-infos">
+       课程名称：{{activeUser.courseName}}
+      </div>
+      <div class="flex-c">
+        <el-input v-model="activeUser.price" placeholder="请输入修改价格" onkeyup="this.value=this.value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g,'$1')"
+                onafterpaste="this.value=this.value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g,'$1')" style="width:222px"></el-input>
+         <el-button class="emit-price" type="primary" @click="changePrice">确 定</el-button>
+      </div>
+
+    </el-dialog>
   </div>
 </template>
 
@@ -39,6 +56,10 @@ export default {
   components:{orderDetail},
   data(){
     return{
+      price:'',   //价格
+      activeUser:{},
+      priceShow:false,
+
       params:{
         regionCode:'',schName:''
       },
@@ -46,7 +67,7 @@ export default {
         title: "正价课报名",
         search: [
            {
-            label: '所属校区:',field: 'schId', type: 'select',autoSelect:true,required:true,
+            label: '上课校区:',field: 'schId', type: 'select',autoSelect:true,required:true,
             ds: {service:'base',func:'getUserAllSchList',params:{all:true}}
           },{
             label: '报名状态:', field: 'bmStatus', type: 'select',autoSelect:true,required:true,
@@ -72,7 +93,7 @@ export default {
             },
             {title: "联系方式",field: "bmPhone",width:'120px',},
             {title: "课程名称",field: "name"},
-            {title: "所属校区",field: "shortName",width:'140px',},
+            {title: "上课校区",field: "shortName",width:'140px',},
             //报名状态（0：待确认报名，1：已确认报名，2：待取消报名，3：已取消报名）
             {
               title: "报名状态",width:'100px',
@@ -81,21 +102,50 @@ export default {
             },
             {
               title: "价格",width:'80px',
-              type: 'customField',
-              fieldFunction: row => (row.cost / 100),
+              field: 'cost'
             },
-            {title: "操作",type: "customViewField",width:'220px'}
+            {title: "操作",type: "customViewField",width:'295px'}
           ],
         },
       },
+
+      buttonsList:[],   //功能权限配置
     }
   },
+  mounted(){
+    this.$service.base.getUserButtonList().then(res =>{
+      this.buttonsList = res || []
+    })
+  },
   methods:{
     openDetail(data){
       this.$refs['detail'].queryDetail({
         bmId:data.id,courseId:data.courseId
       })
     },
+    buttonOption(id,data){
+
+      switch (id){
+        case 1: //确认报名
+          this.agreeJoin(data)
+          break
+        case 2: //同意取消
+          this.agreeCannel(1,data)
+          break
+        case 3: //不同意取消
+          this.agreeCannel(2,data)
+          break
+        case 4: //修改价格
+          this.activeUser = {
+            name:data.bmStuName,
+            courseName:data.name,
+            price:data.cost,
+            bmId:data.id
+          }
+          this.priceShow = true
+          break
+      }
+    },
     //确认报名
     agreeJoin(data){
       let that = this
@@ -115,9 +165,28 @@ export default {
         })
       });
     },
+    changePrice(){
+      if(!this.activeUser.price.length){
+        this.$message.error('请输入修改价格')
+        return
+      }
+      let param = {
+        bmId:this.activeUser.bmId,
+        cost:(this.activeUser.price * 100)
+      }
+      this.$service.course.changeBmCost(param).then(res =>{
+        this.priceShow = false
+        this.activeUser = {}
+        this.$notifySuccess();
+        this.upDateList()
+      })
+    },
     upDateList(){
       this.$refs['table'].reload()
     },
+    closePrice(){
+      this.priceShow = false
+    },
     exportOrder(){
       let param = {
         ...this.$refs["table"].searchForm,
@@ -165,6 +234,17 @@ export default {
     }
   }
   /deep/ .curstom-btn button{
+    margin-left: 0px !important;
     margin-right: 10px !important;
   }
+  .emit-price{
+    margin-left: 20px;
+  }
+  .user-infos{
+    margin-bottom: 10px;
+    font-size: 16px;
+    .course-name{
+      margin-left: 15px;
+    }
+  }
 </style>
\ No newline at end of file

pages/courseManage.vue

@@ -3,7 +3,7 @@
  * @eMail: 932055106@qq.com
  * @Date: 2022-06-02 14:08:46
  * @LastEditors: tangjiale
- * @LastEditTime: 2022-06-30 11:30:45
+ * @LastEditTime: 2022-07-01 10:23:55
 -->
 <template>
   <div class="page-bg">
@@ -42,7 +42,7 @@ export default {
         title: "课程管理",
         search: [
            {
-            label: '所属校区:',field: 'orderStatus', type: 'select',autoSelect:true,required:true,
+            label: '上课校区:',field: 'orderStatus', type: 'select',autoSelect:true,required:true,
             ds: {service:'base',func:'getUserAllSchList',params:{all:true}}
           },{
             label: '课程属性:', field: 'courseStep', type: 'select',autoSelect:true,required:true,
@@ -67,7 +67,7 @@ export default {
           selectable: false,customRow:true,
           columns: [
             {title: "课程名称",field: "name"},
-            {title: "所属校区",field: "schNames"},
+            {title: "上课校区",field: "schNames"},
             {
               title: "课程属性",type: 'customField',width:'80px',
               fieldFunction: row => courseStep[row.courseStep],

pages/experienceOrder.vue

@@ -41,7 +41,7 @@ export default {
         title: "体验课订单",
         search: [
            {
-            label: '所属校区:',field: 'schId', type: 'select',autoSelect:true,required:true,
+            label: '上课校区:',field: 'schId', type: 'select',autoSelect:true,required:true,
             ds: {service:'base',func:'getUserAllSchList',params:{all:true}}
           },{
             label: '订单状态:', field: 'orderStatus', type: 'select',autoSelect:true,required:true,
@@ -68,7 +68,7 @@ export default {
             {title: "年龄",field: "age",width:'60px',},
             {title: "手机号码",field: "bmPhone",width:'120px',},
             {title: "课程名称",field: "name"},
-            {title: "所属校区",field: "shortName"},
+            {title: "上课校区",field: "shortName"},
             {
               title: "价格",width:'80px',
               type: 'customField',

pages/salesManage.vue

@@ -3,7 +3,7 @@
  * @eMail: 932055106@qq.com
  * @Date: 2022-06-16 16:01:31
  * @LastEditors: tangjiale
- * @LastEditTime: 2022-06-30 15:25:36
+ * @LastEditTime: 2022-07-01 10:24:15
 -->
 
 <template>
@@ -44,7 +44,7 @@ export default {
          title:'消课记录',
          search:[
           {
-            label: '所属校区:',field: 'schId', type: 'select',autoSelect:true,required:true,
+            label: '上课校区:',field: 'schId', type: 'select',autoSelect:true,required:true,
             ds: {service:'base',func:'getUserAllSchList',params:{all:true}}
           },{
             label: '课程类型:', field: 'type', type: 'select',autoSelect:true,required:true,

pages/studentManage.vue

@@ -3,7 +3,7 @@
  * @eMail: 932055106@qq.com
  * @Date: 2022-06-02 14:08:46
  * @LastEditors: tangjiale
- * @LastEditTime: 2022-07-01 08:42:46
+ * @LastEditTime: 2022-07-01 10:24:18
 -->
 <template>
   <div class="page-bg">
@@ -44,7 +44,7 @@ export default {
         title: "学生管理",
         search: [
            {
-            label: '所属校区:',field: 'schId', type: 'select',autoSelect:true,required:true,
+            label: '上课校区:',field: 'schId', type: 'select',autoSelect:true,required:true,
             ds: {service:'base',func:'getUserAllSchList',params:{all:true}}
           },
           {placeholder: "请输入姓名",field: "name",type: "text",label: ""},

services/base.js

@@ -3,7 +3,7 @@
  * @eMail: 932055106@qq.com
  * @Date: 2022-02-11 10:04:50
  * @LastEditors: tangjiale
- * @LastEditTime: 2022-06-10 17:19:11
+ * @LastEditTime: 2022-07-01 14:31:47
  */
 export default class BaseService extends Service {
 
@@ -124,5 +124,15 @@ export default class BaseService extends Service {
     })
   }
   
+  //获取用户按钮权限
+  getUserButtonList(){
+    return this.get({
+      url:'/user/getUserButtonList',
+      data: {
+        pageId:1
+      }
+    })
+  }
+
 
 }

services/course.js

@@ -3,7 +3,7 @@
  * @eMail: 932055106@qq.com
  * @Date: 2022-02-11 09:23:35
  * @LastEditors: tangjiale
- * @LastEditTime: 2022-06-30 11:13:23
+ * @LastEditTime: 2022-07-01 15:59:56
  */
 export default class CourseService extends Service {
 
@@ -63,6 +63,13 @@ export default class CourseService extends Service {
     return this.get({
       url: '/course/bmList',
       data: param
+    }).then(res => {
+      if(res && res.list && res.list.length){
+        res.list.forEach(v => {
+          v.cost = Number(v.cost) / 100
+        })
+      }
+      return res
     })
   }
   //体验课订单列表
@@ -156,5 +163,12 @@ export default class CourseService extends Service {
     })
   }
   
+  //正价课改价
+  changeBmCost(param){
+    return this.get({
+      url: '/course/changeBmCost',
+      data: param
+    })
+  }
   
 }