Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/school/student/student-shiting.vue

@@ -112,7 +112,7 @@
   } from "../../../api/school/index";
   import reserveclassForm from "./reserveclass-form";
   import reserveclasskaikeform from "./reserveclasskaikeform";
-  import audition from "../../../pages/h5page/audition";
+  import audition from "../../../pages/h5page/components/audition";
 
   export default {
     meta: {

src/pages/course/classHourReward.vue

@@ -420,7 +420,7 @@
             ></el-table-column>
             <el-table-column prop="SchoolName" label="校区"> </el-table-column>
             <el-table-column prop="TeacherName" label="老师"> </el-table-column>
-            <el-table-column prop="Money" label="应发提成金额">
+            <el-table-column prop="Money" label="应发课时费">
             </el-table-column>
             <el-table-column prop="IsGiveOut" label="是否已发放">
               <template slot-scope="scope">

src/pages/course/course.vue

@@ -648,9 +648,9 @@
           CourseId: item.CourseId,
           Status: status
         };
-        var message = "是否要删除该课程？";
+        var message = "是否要删除【"+item.CourseName+"】课程？";
         if (status == 0) {
-          message = "是否要恢复该课程？";
+          message = "是否要恢复【"+item.CourseName+"】课程？";
         }
         this.$q
           .dialog({

src/pages/course/rewardDetailed.vue

@@ -18,7 +18,7 @@
       </div>
     </div>
     <div class="page-content">
-      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
+      <q-table style="max-height: 65vh;overflow: auto;" :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
                separator="none" :data="data.List" :columns="columns" row-key="name">
         <template v-slot:top="props">
           <div class="col-2 q-table__title">教师课时费明细</div>

src/pages/financial/financalDocument/addFinancialDocuments.vue

@@ -555,13 +555,13 @@
                 </el-select>
               </td>
               <td height="26px">
-                <el-input v-model="da.Number" @keyup.native="checkInteger(da,'Number')" :disabled="daIn === 0 && XSTC"
+                <el-input v-model="da.Number" @keyup.native="checkInteger(da,'Number')" :disabled="(daIn === 0 && XSTC)||(orderObj.PeopleCostType&&orderObj.PeopleCostType==486)"
                   type="text" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" @input="chages($event)" class="w80 _border_b_1">
                 </el-input>
               </td>
               <td height="26px">
                 <el-input v-model="da.UnitPrice" type="text"
-                  :disabled="((msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 56 || msg.TemplateId == 53) && !ZhuiJiaTK) || (daIn === 0 && XSTC)"
+                  :disabled="((msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 56 || msg.TemplateId == 53) && !ZhuiJiaTK) || (daIn === 0 && XSTC)||(orderObj.PeopleCostType&&orderObj.PeopleCostType==486)"
                   @keyup.native="checkPrice(da,'UnitPrice',true)" @blur="addList(2,daIn+1)"
                   @change="Calculation(2,daIn+1)"  @input="chages($event)" class="w80 h34 _border_b_1"></el-input>
               </td>
@@ -1413,6 +1413,23 @@
           this.msg.detailList[i - 1] = list;
         } else {
           this.msg.detailList.push(list);
+
+          // 人头奖励类型
+          if(this.orderObj.PeopleCostType&&this.orderObj.PeopleCostType==486) {
+            let num = (1 * this.orderObj.PeopleMoney) * list.Rate;
+              num = Math.round(num * 100) / 100;
+            this.msg.detailList.push({
+              ...list,
+              UnitPrice: this.orderObj.PeopleMoney,
+              UnitPriceTo: this.$commonUtils.addCommas(Math.round(this.orderObj.PeopleMoney * 100) / 100),
+              yTotalPrice: this.orderObj.PeopleMoney,
+              yTotalPriceTo: this.$commonUtils.addCommas(Math.round(this.orderObj.PeopleMoney * 100) /
+            100),
+              bTotalPrice: num,
+              bTotalPriceTo: this.$commonUtils.addCommas(num),
+              CostTypeId: this.orderObj.PeopleCostType
+            })
+          };
         }
         let allPrice = 0
         this.msg.detailList.forEach(x => {

src/pages/financial/market/achievementPeriodsList.vue

@@ -293,7 +293,9 @@
               OtherType:50,//业绩提成
               ReFinanceId:Id,
               ReFinanceId2:this.msg.SchoolId,
-              EduCommissionEmp:EmpIds
+              EduCommissionEmp:EmpIds,
+              PeopleCostType: this.totalPeople>0?486:0,
+              PeopleMoney: this.totalPeople,
             }
             let query = {
               blank: "y",
@@ -403,4 +405,3 @@
     @import url('~assets/css/table.sass')
 
   </style>
-  
\ No newline at end of file

src/pages/h5page/TrialClass.vue

@@ -22,7 +22,7 @@
     queryClassRoomList,
     GetTrialLessonList
   } from "../../api/school/index";
-  import audition from "./audition";
+  import audition from "./components/audition";
   export default {
     components: {
       audition

src/pages/h5page/audition.vue → src/pages/h5page/components/audition.vue

@@ -79,12 +79,12 @@
     SetVisitorReserveFeedback,
     SetVisitorReserveClass,
     GetVisitorReserveById,
-  } from "../../api/scheduling/schedu";
+  } from "../../../api/scheduling/schedu";
   import {
     getTeacherDropDownList,
     queryClassRoomList,
     GetTrialLessonList
-  } from "../../api/school/index";
+  } from "../../../api/school/index";
   import statusPrompt from "./statusPrompt";
   export default {
     props: ['VisitorReserveClassMsg','type'],

src/pages/h5page/statusPrompt.vue → src/pages/h5page/components/statusPrompt.vue

@@ -3,7 +3,7 @@
         <div class="popup-box">
             <div class="popup-title">
                 <div style="margin-top: 230px;">
-                    <img style="width:80px;height:80px;" src="../../assets/images/da_gou.png" />
+                    <img style="width:80px;height:80px;" src="../../../assets/images/da_gou.png" />
                 </div>
                 <div style="font-size: 18px;margin-top: 15px;">{{isSuccessTitle}}</div>
             </div>

src/pages/sale/courseList.vue

@@ -365,12 +365,12 @@
             align: "left",
             field: row => row.CateName
           },
-          {
-            name: "OriginalPrice",
-            label: "原价",
-            align: "left",
-            field: row => row.OriginalPrice.toFixed(2)
-          },
+          // {
+          //   name: "OriginalPrice",
+          //   label: "原价",
+          //   align: "left",
+          //   field: row => row.OriginalPrice.toFixed(2)
+          // },
           {
             name: "SellPrice",
             label: "售价",