no message

src/components/myOrdersAllType/components/allList.vue

@@ -220,6 +220,18 @@
                       </el-date-picker>
                         </td>
                       </tr>
+                      <tr>
+                        <td style="padding: 5px 0">
+                          <span style="width: 100px;display: inline-block;">提成类型</span>
+                          <el-select v-model='msg.CommissionType' style="width: 210px;">
+                            <el-option v-for='item in CommissionTypeList'
+                                :label='item.Name'
+                                :value='item.Id'
+                                :key='item.Id'>
+                            </el-option>
+                        </el-select>
+                        </td>
+                      </tr>
                       <tr>
                         <td colspan="4">
                           <input type="button" class="normalBtn" :value="$t('pub.searchBtn')"
@@ -303,6 +315,11 @@
         components: { OrderList },
         data() {
           return {
+            CommissionTypeList:[
+              {Name: '不限',Id:'-1'},
+              {Name: '出境提成',Id:'1'},
+              {Name: '国内提成',Id:'2'},
+            ],
             showWarningSearch: false,
             TotalMsg: null,
             MultipleChoiceList: [ //多选项目
@@ -355,6 +372,7 @@
             OrderType: "0",//订单类型
             IsSelectCRM: 0,//1来源crm
             IsMyOrder: 1,//1我的订单
+            CommissionType: '-1',//提成类型 1出境 2国内
             },
             total: 0,
             currentPage: 1,
@@ -613,6 +631,7 @@
             this.msg.Q_IsCollect=this.$route.query.Q_IsCollect
             this.msg.DepartSTime=this.$route.query.DepartSTime
             this.msg.DepartETime=this.$route.query.DepartETime
+            this.msg.CommissionType = this.$route.query.CommissionType
             this.msg.StartTime = ''
             this.msg.EndTime = ''
             this.DatelistBM = []

src/components/sale/ExpectedCommission.vue

@@ -162,9 +162,6 @@
             <div class="CommissionLadder Line" style="margin: 0 10px 0 0;">
               <div class="title">
                 <span>日本小包团、落地团以及单项提成</span>
-                <div>
-                  <detailsButtom :type="2" :obj="commissionMsg"/>
-                </div>
               </div>
               <p>当月个人毛利润</p>
               <div class="CommissionInfor">
@@ -191,9 +188,6 @@
             <div class="CommissionLadder Line" style="margin: 0 0 0 0;">
               <div class="title">
                 <span>欧洲小包团、落地团以及单项提成</span>
-                <div>
-                  <detailsButtom :type="3" :obj="commissionMsg"/>
-                </div>
               </div>
               <p>当月个人毛利润</p>
               <div class="CommissionInfor">
@@ -253,7 +247,7 @@
               <div style="display: flex;justify-content: space-between;">
                <span>年终奖(不含门票、包车、国内游)</span>
                <div>
-                <detailsButtom :type="4" :obj="commissionMsg"/>
+                <detailsButtom :type="3" :obj="commissionMsg"/>
                 </div>
               </div>
               <p style="padding: 0 0 10px 0;text-align: left;"><span style="font-size: 13px;color: red;">注:年终奖励从每年3月起始</span></p>
@@ -272,7 +266,7 @@
           <div style="display: flex;justify-content: space-between;">
             <span style="font-weight: bold;font-size: 16px;">国内提成</span>
             <div>
-              <detailsButtom :type="5" :obj="commissionMsg"/>
+              <detailsButtom :type="2" :obj="commissionMsg"/>
             </div>
           </div>
           <p style="padding: 0 0 10px 0;text-align: left;"><span style="font-size: 13px;color: red;">注:国内提成需结团后方可发放提成，以实际结团为准，此处只提供参考</span></p>

src/components/sale/components/details.vue

@@ -2,7 +2,7 @@
 
 </style>
 <template>
-    <el-tooltip class="item" effect="dark" content="预期提成详情" placement="top">
+    <el-tooltip class="item" effect="dark" :content="type==1?'出境提成详情':type==3?'提成明细':type==2?'国内提成详情':''" placement="top">
       <!-- <img src="../../../assets/img/xiaosouYQ.png" @click="goDetails"
       style="width: 12px;height: auto; cursor: pointer;color: #33B3FF;"></img> -->
       <i class="el-icon-document" style="font-size: 18px;color: red;cursor: pointer;" @click="goDetails"></i>
@@ -44,6 +44,7 @@
               Q_IsCollect: "2",
               DepartSTime: this.obj.DepartSTime,
               DepartETime: this.obj.DepartETime,
+              CommissionType: String(this.type),
               blank: 'y'
             }
           });