1

src/components/course/courseprice-form.vue

@@ -108,7 +108,7 @@
           </tr>
           <tr>
             <td style="width:70px;">
-              一般同行
+              同行返佣
             </td>
             <td>
               <q-input filled stack-label dense v-model="priceObj.courseObj.B2BRebateRatio" ref="B2BRebateRatio"
@@ -143,7 +143,7 @@
           </tr>
           <tr>
             <td>
-              校代
+              校代返佣
             </td>
             <td>
               <q-input filled stack-label dense v-model="priceObj.courseObj.SchoolRebateRatio" ref="SchoolRebateRatio"
@@ -178,7 +178,7 @@
           </tr>
           <tr>
             <td>
-              转介
+              学员转介返佣
             </td>
             <td>
               <q-input filled stack-label dense v-model="priceObj.courseObj.TransIntroductceRatio"
@@ -215,7 +215,7 @@
           </tr>
           <tr>
             <td>
-              内推
+              内推返佣
             </td>
             <td>
               <q-input filled stack-label dense v-model="priceObj.courseObj.InnerRecommendRatio"
@@ -250,6 +250,43 @@
               </div>
             </td>
           </tr>
+          <tr>
+            <td>
+              直客返佣
+            </td>
+            <td>
+              <q-input filled stack-label dense v-model="priceObj.courseObj.B2CRbRatio"
+                ref="B2CRbRatio"
+                @keyup.native="checkPrice(priceObj.courseObj, 'B2CRbRatio'),getShouBAO(11)" suffix="%" />
+            </td>
+            <td style="text-align:center">
+              {{getShouBAO(11)}}
+            </td>
+            <td style="width:200px;"> 
+              <div class="row wrap">
+                <q-select class="col-7" filled dense v-model="priceObj.courseObj.B2CRbRatioType" :options="CourseRebateList"
+                   emit-value map-options option-value="Id" option-label="Name" label="返佣设置" />
+                <q-input class="col-6" v-if="priceObj.courseObj.B2CRbRatioType==3" filled stack-label dense 
+                v-model="priceObj.courseObj.B2CRbRatioValue" @keyup.native="checkPrice(priceObj.courseObj, 'B2CRbRatioValue')" style="width:75px;margin-left:5px;" />
+              </div>
+            </td>
+            <td>
+              <q-input filled stack-label dense v-model="priceObj.courseObj.B2CRNRatio"
+                ref="B2CRNRatio"
+                @keyup.native="checkPrice(priceObj.courseObj, 'B2CRNRatio'),getShouBAO(12)" suffix="%" />
+            </td>
+            <td style="text-align:center">
+              {{getShouBAO(12)}}
+            </td>
+            <td style="width:200px;"> 
+              <div class="row wrap">
+                <q-select class="col-7" filled dense v-model="priceObj.courseObj.B2CRNRatioType" :options="CourseRebateList"
+                   emit-value map-options option-value="Id" option-label="Name" label="返佣设置" />
+                <q-input class="col-5" v-if="priceObj.courseObj.B2CRNRatioType==3" filled stack-label dense 
+                  v-model="priceObj.courseObj.B2CRNRatioValue" @keyup.native="checkPrice(priceObj.courseObj, 'B2CRNRatioValue')" style="width:75px;margin-left:5px;" />
+              </div>
+            </td>
+          </tr>
         </table>
 
       </q-card-section>
@@ -316,7 +353,13 @@
             InnerRecommendRatioValue: '',
             InnerRecommendReNewRatio: 0, //內推续费返佣比例
             InnerRecommendReNewRatioType: 1,
-            InnerRecommendReNewRatioValue: ''
+            InnerRecommendReNewRatioValue: '',
+            B2CRbRatio:0,//直客首次报名返佣比例
+            B2CRbRatioType:1,//直客首次报名返佣类型
+            B2CRbRatioValue:"",// 直客首次报名返佣类型值
+            B2CRNRatio:0,//直客续费返佣比例
+            B2CRNRatioType:1,//直客续费返佣类型
+            B2CRNRatioValue:"",//直客续费返佣类型值
           },
           priceList: [] //价格列表
         },
@@ -410,7 +453,12 @@
             this.priceObj.courseObj.InnerRecommendReNewRatio = res.Data.InnerRecommendReNewRatio;
             this.priceObj.courseObj.InnerRecommendReNewRatioType = res.Data.InnerRecommendReNewRatioType;
             this.priceObj.courseObj.InnerRecommendReNewRatioValue = res.Data.InnerRecommendReNewRatioValue;
-
+            this.priceObj.courseObj.B2CRbRatio = res.Data.B2CRbRatio;
+            this.priceObj.courseObj.B2CRbRatioType = res.Data.B2CRbRatioType;
+            this.priceObj.courseObj.B2CRbRatioValue = res.Data.B2CRbRatioValue;
+            this.priceObj.courseObj.B2CRNRatio = res.Data.B2CRNRatio;
+            this.priceObj.courseObj.B2CRNRatioType = res.Data.B2CRNRatioType;
+            this.priceObj.courseObj.B2CRNRatioValue = res.Data.B2CRNRatioValue;
           });
           queryCoursePreferentialList({
             CourseId: this.saveObj.CourseId
@@ -558,6 +606,20 @@
             return Count;
           }
         }
+        if (type == 11) {
+          if (this.priceObj.courseObj.B2CRbRatio) {
+            let num = currentPrice * Number(this.priceObj.courseObj.B2CRbRatio) / 100;
+            Count = num.toFixed(2);
+            return Count;
+          }
+        }
+        if (type == 12) {
+          if (this.priceObj.courseObj.B2CRNRatio) {
+            let num = currentPrice * Number(this.priceObj.courseObj.B2CRNRatio) / 100;
+            Count = num.toFixed(2);
+            return Count;
+          }
+        }
       }
     }
   };

src/components/sale/orderlist.vue

@@ -170,9 +170,9 @@
                   item.TargetOrderId
                 }}
               </div>
-              <div>创建人:{{ item.CreateByName }}</div>
-              <div>课程顾问:{{ item.ConsultantName||'无' }}</div>
-              <div>市场专员:{{ item.EnterName ||'无' }}</div>
+              <div>{{ item.CreateByName }}</div>
+              <div>课程顾问：{{ item.ConsultantName||'无' }}</div>
+              <div>市场专员：{{ item.EnterName ||'无' }}</div>
               
               <div style="margin-top: 10px">{{ item.CreateTime }}</div>
               <template v-if="AuthorityObj.isShowName">

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

@@ -417,7 +417,6 @@
        
       }
     },
-   
     watch:{
       stuData(){
         this.init();