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>
@@ -46,7 +46,7 @@
         </template>
       </q-table>
       <div style="font-size: 20px;font-weight: 400;">教师课时费汇总</div>
-      <div v-for="(x,y) in data.Statistics" :key='y'> 
+      <div v-for="(x,y) in data.Statistics" :key='y'>
         <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
           style="margin-top: 10px" separator="none" :data="x.TeacherList" :columns="columnsZ" row-key="name">
           <template v-slot:top="props">
@@ -72,7 +72,7 @@
           </template>
         </q-table>
       </div>
-      
+
     </div>
   </div>
 </template>
@@ -118,7 +118,7 @@
             field: 'ClassName',
             align: 'left'
           },
-       
+
 
           {
             name: 'Type',
@@ -233,7 +233,7 @@
           let idsArr=[]
           arr.map(e=>{
             let _arr=e.split('-')
-            idsArr.push(_arr[1])  
+            idsArr.push(_arr[1])
           })
           this.msg.TeacherIds = idsArr.toString();
         }

src/pages/financial/financalDocument/addFinancialDocuments.vue

@@ -17,7 +17,7 @@
 
   }
 
-  .page_addFD input::-ms-input-placeholder{ /*Internet Explorer*/ 
+  .page_addFD input::-ms-input-placeholder{ /*Internet Explorer*/
 
   color: #999999;
 
@@ -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>
@@ -738,8 +738,8 @@
                 发票金额:
                 <el-input  v-model='msg.InvoiceMoney' type="number" placeholder="发票金额" class="w135 _border_b_1" style="margin-left:10px" @input="$forceUpdate()"></el-input>
               </p>
-              
-             
+
+
           </div>
           <div style="justify-content: flex-start;align-items: flex-start;">
               <p>发票备注:</p>
@@ -754,9 +754,9 @@
                 </el-input>
 
           </div>
-          
+
         </div>
-        
+
         <div class="_remark">
           <p>{{$t('system.label_info')}}</p>
           <textarea v-model="Description">
@@ -813,7 +813,7 @@
             </div>
             <!-- <button class="normalBtn" v-if="GetDetail.Status==0||GetDetail.Status==3||msg.FrID==0"
               @click="AddFinancial(1)">{{$t('fnc.zancun')}}</button> -->
-            <q-btn color="primary" size="11px" :label="$t('fnc.zancun')" @click="AddFinancial(1)" style="marginRight:10px" v-if="iscopy==1 && (GetDetail.Status==0||GetDetail.Status==3||msg.FrID==0)"/> 
+            <q-btn color="primary" size="11px" :label="$t('fnc.zancun')" @click="AddFinancial(1)" style="marginRight:10px" v-if="iscopy==1 && (GetDetail.Status==0||GetDetail.Status==3||msg.FrID==0)"/>
             <!-- <button class="normalBtn" @click="AddFinancial()">{{$t('fnc.tijiao')}}</button> -->
             <q-btn color="primary" size="11px" v-if="iscopy==1" :label="$t('fnc.tijiao')" @click="AddFinancial()" style="marginRight:10px"/>
             <q-btn color="primary" size="11px" v-if="iscopy==2" label="复制" @click="AddFinancial()" style="marginRight:10px"/>
@@ -864,9 +864,9 @@
         <q-card-actions align="right">
           <q-btn color="primary" label="我知道了" @click="costmode = false" />
         </q-card-actions>
-       
+
       </q-card>
-      
+
     </q-dialog>
   </div>
 </template>
@@ -1325,7 +1325,7 @@
         this.msg.GuestId=this.$route.query.GuestId;
         if(this.iscopy == 2){//如果是复制赋值为0
           this.msg.FrID = 0;
-          if(this.msg.vorcherInos.length>0){//如果是复制的话 收据ID 为0 
+          if(this.msg.vorcherInos.length>0){//如果是复制的话 收据ID 为0
             this.msg.vorcherInos.forEach(x=>{
               x.ID = 0
             })
@@ -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 => {
@@ -1873,7 +1890,7 @@
         })
       },
       get_GetInvoiceTypeEnumList(){
-        
+
         this.apipost('Financial_get_GetInvoiceTypeEnumList', {}, res => {
               if (res.data.resultCode == 1) {
                this.getInvoiceList=res.data.data
@@ -1884,7 +1901,7 @@
               }
             }, err => {})
       },
-      
+
       getCompany() { //公司
         getSchoolDropdown({}).then(res => {
           let data = res.Data;
@@ -1894,14 +1911,14 @@
             }
           })
           let Status=false;
-          
+
           if(this.$route.query.companyID!=='-1' && this.$route.query.companyID!==undefined){
             Status=true;
             data.forEach(x=>{
               x.disabled = true;
             })
           }
-          
+
           if (this.orderObj && this.orderObj.companyIDList && this.orderObj.companyIDList.length>0) {
             Status=true;
             this.orderObj.companyIDList.forEach(x=>{
@@ -2148,7 +2165,7 @@
       if (this.$route.query.Conditon) {
         this.returnCode = this.$route.query.Conditon;
       }
-      
+
 
 
       // this.admin_get_DepartmentGetList();

src/pages/financial/market/achievementPeriodsList.vue

@@ -33,9 +33,9 @@
  .salesCommission .el-table td,.el-table th{
     padding: 5px 0;
   }
-  
 
-  
+
+
   </style>
   <template>
     <div class="page-body salesCommission">
@@ -61,7 +61,7 @@
                   <q-btn :loading="loading1" color="primary" size="11px" label="生成提成" @click="scCommission" style="margin-left:10px"/>
                 </div>
               </div>
-            
+
             </div>
           </div>
       <template >
@@ -80,7 +80,7 @@
                 <div style="display: flex;flex-wrap: wrap;" v-if='scope.row.SchooldCommission>=0'>
                   {{scope.row.SchooldCommission>=0?scope.row.SchooldCommission:'-'}}
                 </div>
-              </template>  
+              </template>
             </el-table-column>
             <el-table-column prop="FrIdList" label="财务单据" >
               <template slot-scope="scope">
@@ -88,8 +88,8 @@
                   <span v-for="(x,y) in scope.row.FrIdList" @click="gocaiwuxiangq(x)" style="cursor: pointer;text-decoration: underline;margin-right: 5px; color: #409EFF;">{{x}}</span>
                 </div>
                 <div v-else>无</div>
-                
-              </template>  
+
+              </template>
             </el-table-column>
             <el-table-column prop="CreateByName" label="创建人" > </el-table-column>
             <el-table-column prop="CreateTime" label="创建时间" > </el-table-column>
@@ -97,7 +97,7 @@
                 <template slot-scope="scope">
                   <div class="_icon_btn">
                     <el-tooltip class="item" effect="dark" content="查看" placement="top">
-                      <i class="iconfont icon-sousuo" 
+                      <i class="iconfont icon-sousuo"
                           @click="goUrl(scope.row.Id)"></i>
                     </el-tooltip>
                     <el-tooltip class="item" effect="dark" content="制单" placement="top" v-if='iscMaker==true'>
@@ -107,14 +107,14 @@
                   </div>
                 </template>
             </el-table-column>
-           
+
         </el-table>
         <div style="margin-top: 10px;text-align: center;">
           <el-pagination background @current-change="handleCurrentChanges" layout="total,prev, pager, next, jumper" :current-page.sync="msg.PageIndex"
             :page-size="msg.PageSize" :total='total'>
           </el-pagination>
         </div>
-        
+
       </template>
       <el-dialog title="设置发放用户" width="700px"
         :visible.sync="costmode" center >
@@ -128,13 +128,13 @@
           <el-table-column  prop="StudentCount" label="客人数量" > </el-table-column>
           <el-table-column  prop="CurrentPeriodMoney" label="应发提成金额" > </el-table-column>
           <el-table-column  prop="PeopleNumMoney" label="应发人头奖励" > </el-table-column>
-          <el-table-column  prop="IsGiveOut" label="是否已发放" > 
+          <el-table-column  prop="IsGiveOut" label="是否已发放" >
             <template slot-scope="scope">
               <span v-if='scope.row.IsGiveOut==1'>已发放</span>
               <span v-if='scope.row.IsGiveOut==2'>未发放</span>
             </template>
           </el-table-column>
-          
+
         </el-table>
         <div style="margin-top: 10px;">总提成金额：{{totalAmount}}</div>
         <div style="margin-top: 10px;">总人头奖励：{{totalPeople}}</div>
@@ -143,7 +143,7 @@
           <el-button class="normalBtn" type="primary" @click="preservetransaction()">确定</el-button>
         </div>
       </el-dialog>
-      
+
     </div>
   </template>
   <script>
@@ -279,11 +279,11 @@
               this.$message.error('校区提成总金额为0')
             }
           }
-          
+
         },
         goaddFinancial(Money,Id,EmpIds){
           let School_Id = 0;
-          
+
           let obj = {
               CostType: 316,
               Money: Money,
@@ -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",
@@ -393,14 +395,13 @@
             })
           });
         }
-     
-      
+
+
       },
     }
-  
+
   </script>
   <style lang="sass">
     @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: "售价",