no message

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 (this.Profit/data.EndValue)*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{
@@ -110,6 +113,9 @@
     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;
@@ -186,10 +192,11 @@
   }
   .ladder-list{
     flex: 1;
-    min-width: 450px;
+    min-width: 460px;
     /* max-width: 450px; */
     display: flex;
     flex-direction: column;
+    justify-content: space-between;
     margin-right: 40px;
     margin-bottom: 10px;
   }
@@ -303,7 +310,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">公司所有国内出发线路(单团.散拚)
@@ -318,11 +325,11 @@
                     </div>
                   </div>
                 </template>
-                <div class="commissionProject" 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">
@@ -345,7 +352,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>
@@ -360,8 +368,6 @@
                       </div>
                     </div>
                   </div>
-                </template>
-
                 </div>
                 <div class="commissionProject" style="display: flex;flex-wrap: wrap;">
                   <div>
@@ -393,8 +399,9 @@
                   </div>
                   </div>
                 </div>
-                <div class="commissionProject" style="display: flex;flex-wrap: wrap;border: 0;" v-if="isVisa||!isBranchCompany">
-                  <div v-if="!index">
+                <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">