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

src/components/sale/sale.vue

@@ -601,7 +601,6 @@
 </template>
 <script>
   import leftNav from '../public/leftNav.vue'
-  import rightHead from '../public/rightHead.vue'
   import moment from 'moment'
   export default {
     data() {
@@ -660,7 +659,6 @@
     },
     components: {
       leftNav,
-      rightHead
     },
 
     watch: {

src/components/temp/components/progressComm.vue

@@ -119,8 +119,10 @@
     methods: {
       // 设置进度
       setItemProgress(data) {
-        if(this.Profit>0&&this.Profit>=data.StartValue&&this.Profit<=data.EndValue){
+        if(this.type==2&&this.Profit>0&&this.Profit>=data.StartValue&&this.Profit<=data.EndValue){
           return data.EndValue<999999?(this.Profit/data.EndValue)*100:(this.Profit/data.StartValue)*100
+        }else if(this.type==1&&this.Profit>0&&this.Profit>=data.StartValue&&this.Profit<=data.EndValue){
+          return data.EndValue<999?(this.Profit/data.EndValue)*100:(this.Profit/data.StartValue)*100
         }else{
           return 0
         }

src/components/temp/operation.vue

@@ -91,6 +91,9 @@
     color: red;
   }
   .CommissionInfor{
+    white-space: nowrap;
+    display: flex;
+    flex-wrap: wrap;
     padding: 0 0 10px 0;
   }
   .CommissionInfor span{
@@ -106,6 +109,13 @@
   .CommissionLadder:last-child{
     margin-right: 0;
   }
+  .commissionProject{
+    padding: 0 0 10px 0;
+    border-bottom: 1px dashed #BDBDBD;
+  }
+  .border-bottom{
+    border-bottom: 1px dashed #BDBDBD;
+  }
   .commissionProject>div{
     margin-right: 40px;
     margin-top: 10px;
@@ -153,9 +163,10 @@
     font-size: 14px;
   }
   .headerTitle{
-    margin-bottom: 40px;
+    margin-bottom: 10px;
     display: flex;
     flex-wrap: wrap;
+    align-items: center;
   }
   .headerTitle p{
     font-weight: bold;
@@ -181,13 +192,16 @@
   }
   .ladder-list{
     flex: 1;
-    min-width: 450px;
-    /* max-width: 450px; */
+    min-width: 460px;
     display: flex;
     flex-direction: column;
+    justify-content: space-between;
     margin-right: 40px;
     margin-bottom: 10px;
   }
+  .ladder-list:nth-child(3n){
+    margin-right: 0;
+  }
   .ladder-list:last-child{
     margin-right: 0;
   }
@@ -273,7 +287,7 @@
                         @click="clickActive(item)"></input>
                       </template>
                     </div>
-                    <div style="display: flex;align-items: center; justify-content: space-between;padding: 20px 20px 0 20px;">
+                    <div style="display: flex;flex-direction: column; padding: 20px 20px 0 20px;">
                       <div class="headerTitle">
                         <!-- <p><span>总团队数：</span> <span>{{groupNum}}</span></p> -->
                         <p><span>总订单数：</span> <span>{{OrderNum}}</span></p>
@@ -281,6 +295,7 @@
                         <p><span>总预期奖金：</span><span>{{CommissionJJ}}</span></p>
                         <p><span>总预期提成：</span><span>{{CommissionTC}}</span></p>
                     </div>
+                    <p style="color: red;font-size: 14px;text-align: right;">注:操作提成需已结团后方可发放提成，以下预期提成均为已结团统计</p>
                   </div>
                   </div>
                 </el-col>
@@ -297,7 +312,7 @@
                   </div>
                 </div>
                 <template v-if="isVisa">
-                  <div class="commissionProject" style="display: flex;flex-wrap: wrap;padding: 0 0 10px 0;">
+                  <div class="commissionProject" style="display: flex;flex-wrap: wrap;padding: 0 0 15px 0;">
                     <div>
                       <div style="padding: 0 0 5px 0;">
                       <span class="ProjectTitle">公司所有国内出发线路(单团.散拚)
@@ -312,11 +327,11 @@
                     </div>
                   </div>
                 </template>
-                <template v-if="isVisa">
-                <p style="font-size: 16px;font-weight: bold;color: black;">小包团{{!isBranchCompany?'、落地团':''}}以及单项提成</p>
-                <template v-for="(s,indexs) in item.BranchList">
-                  <div class="ladder-form">
+                <div class="border-bottom" v-if="isVisa">
+                <p style="font-size: 16px;font-weight: bold;color: black;padding: 10px 0 0 0;">小包团{{!isBranchCompany?'、落地团':''}}以及单项提成</p>
+                  <div class="ladder-form" style="margin-top: 3px;">
                     <div class="ladder-form-box">
+                      <template v-for="(s,indexs) in item.BranchList">
                       <div class="ladder-list">
                         <div class="ladder-title">{{s.BranchName}}</div>
                         <div class="CommissionInfor">
@@ -339,7 +354,8 @@
                         <progressComm :type="2" :CommissionRateList="s.GradeRuleList"
                         :Profit="s.Profit"></progressComm>
                       </div>
-                      <div class="ladder-list" v-if="(isVisa||!isBranchCompany)&&item.BranchList.length-1==indexs">
+                      </template>
+                      <div class="ladder-list">
                         <div class="ladder-title">额外奖励 (不含落地团)</div>
                         <div class="CommissionInfor">
                           <span>
@@ -354,9 +370,7 @@
                       </div>
                     </div>
                   </div>
-                </template>
-
-                </template>
+                </div>
                 <div class="commissionProject" style="display: flex;flex-wrap: wrap;">
                   <div>
                   <div style="display: flex;">
@@ -386,8 +400,10 @@
                     </div>
                   </div>
                   </div>
-                  <template v-if="isVisa||!isBranchCompany">
-                  <div v-if="!index">
+                </div>
+                <div class="commissionProject" style="display: flex;flex-wrap: wrap;border: 0;"
+                v-if="(isVisa||!isBranchCompany)&&!index">
+                  <div>
                     <div style="display: flex;">
                       <div>
                         <div class="commissionProjectZL">
@@ -415,9 +431,7 @@
                       </div>
                     </div>
                   </div>
-                  </template>
                 </div>
-
               </div>
             </div>
             </template>
@@ -534,7 +548,6 @@
 
 <script>
     import leftNav from '../public/leftNav.vue'
-    import rightHead from '../public/rightHead.vue'
     import progressComm from './components/progressComm'
     import OrderList from './components/OrderList'
     import detailsButtom from './components/details'
@@ -607,7 +620,6 @@
 		},
 		components:{
 			leftNav,
-      rightHead,
       progressComm,
       OrderList,
       detailsButtom
@@ -688,7 +700,7 @@
           }else{
             this.Error(res.data.message)
           }
-          this.loading = false;
+
         })
       },
       GetGNSaleExpectCommission(){
@@ -717,8 +729,11 @@
               let arr2 =[this.GNCommission,this.yuqiticheng]
               this.CommissionJJ = this.CalculatePrice(arr1,0)
               this.CommissionTC = this.CalculatePrice(arr2,2)
+              this.loading = false;
+            }else{
+              this.loading = false;
             }
-          })
+          },err => {this.loading = false} )
       },
       // 未结团数据
       GetOrderPageList(){
@@ -736,9 +751,8 @@
             }else {
               this.Error(res.data.message);
             }
-            this.loading = false
           },
-          err => {this.loading = false}
+          err => {}
         )
 
       },