票务提成列表调整

src/components/FinancialModule/ImpressionTicketing/ImpressionTicketDetails.vue

@@ -84,14 +84,14 @@
         style="margin-top: 10px;">
         <tr>
           <th>类型</th>
-          <th>公司</th>
+          <!-- <th>公司</th> -->
           <th>部门</th>
           <th>岗位</th>
           <th>姓名</th>
           <th>订单号</th>
           <th>订单类型</th>
           <th width="100">团号</th>
-          <th width="100">出团公司</th>
+          <!-- <th width="100">出团公司</th> -->
           <th width="100">线路</th>
           <th width="50">人数</th>
           <th>团利润</th>
@@ -112,14 +112,17 @@
         </tr>
         <tr v-for="item in dataList">
           <td>{{item.EmpType==1?'销售':item.EmpType==2?'引流':'-'}}</td>
-          <td>{{item.BranchName}}</td>
-          <td>{{item.DeptName}}</td>
+          <td style="font-size: 12px;">{{item.BranchName}}
+            <p>{{item.DeptName}}</p>
+          </td>
+          <!-- <td></td> -->
           <td>{{item.PostName?item.PostName:'-'}}</td>
           <td>{{item.EmName}}</td>
           <td><span class="cursor-p" @click="clickUrl(item,1)">{{item.OrderId}}</span></td>
           <td>{{item.OrderTypeName}}</td>
-          <td>{{item.TCNUM?item.TCNUM:'-'}}</td>
-          <td>{{item.OutBranchName?item.OutBranchName:'-'}}</td>
+          <td style="font-size: 12px;">{{item.TCNUM?item.TCNUM:'-'}}
+            <p v-if="item.OutBranchName">{{item.OutBranchName?item.OutBranchName:'-'}}</p>
+          </td>
           <td>{{item.LineName?item.LineName:'-'}}</td>
           <td>{{item.PeopleNum?item.PeopleNum:'-'}}<template v-if="item.TCID>0">/{{item.TCGuestNum}}</template></td>
           <td><template v-if="item.TCID>0">{{item.TCProfit?item.TCProfit:'-'}}</template>

src/components/FinancialModule/ImpressionTicketing/ImpressionTicketUserDetails.vue

@@ -150,7 +150,13 @@
                             :value="item.Id"></el-option>
                     </el-select>
                 </li>
-                
+                <li>
+                    <em>提成方式</em>
+                    <el-select v-model="msg.Way" size="mini" @change="handleCurrentChange(1)" filterable>
+                        <el-option v-for="(item,index) in typeList" :key="item.index" :label="item.name"
+                            :value="item.id"></el-option>
+                    </el-select>
+                </li>
             </ul>
         </div>
         <div style="display: flex;align-items: center;height: 50px;justify-content: space-between;">
@@ -168,13 +174,14 @@
                 <th>岗位</th>
                 <th>员工姓名</th>
                 <th>当月利润</th>
+                <th>当月销售额</th>
                 <th>引流数量</th>
                 <th>成交订单</th>
                 <th>当月追加工资</th>
                 <th>依据类型</th>
                 <th>当期提成</th>
                 <th>未达标提成</th>
-                <th>提成比例</th>
+                <!-- <th>提成比例</th> -->
                 <th>年终</th>
                 <th>年终比例</th>
                 <th>期数</th>
@@ -182,12 +189,19 @@
             </tr>
             <tr v-for="item in dataList">
                 <td>{{item.EmpType==1?'销售':item.EmpType==2?'引流':'-'}}</td>
-                <td>{{item.BranchName}}</td>
+                <td style="font-size: 12px;">{{item.BranchName}}
+                    <!-- <p>{{item.DeptName}}</p> -->
+                </td>
                 <td>{{item.DeptName}}</td>
                 <td>{{item.PostName?item.PostName:'-'}}</td>
                 <td>{{item.EmName}}</td>
                 <td>
-                    <span @click="item.ProfitMoney>0?clickUrl(item,1):''" :class="item.ProfitMoney>0&&item.EmName!='微途'?'clickCp':''">{{item.ProfitMoney}}</span>
+                    <span @click="item.ProfitMoney>0?clickUrl(item,1):''" 
+                        :class="item.ProfitMoney>0&&item.EmName!='微途'?'clickCp':''">{{item.ProfitMoney}}</span>
+                </td>
+                <td>
+                    <span @click="item.SalesMoney>0?clickUrl(item,1):''" 
+                        :class="item.SalesMoney>0&&item.EmName!='微途'?'clickCp':''">{{item.SalesMoney?item.SalesMoney:'-'}}</span>
                 </td>
                 <td>
                     <span @click="item.LureNum>0?clickUrl(item,2):''" :class="item.LureNum>0&&item.EmName!='微途'?'clickCp':''">{{item.EmpType==2?item.LureNum:'-'}}</span>
@@ -201,7 +215,7 @@
                 </td>
                 <td>{{item.Commission}}</td>
                 <td>{{item.LimitCommission != 0?item.LimitCommission:'-'}}</td>
-                <td>{{item.CommissionRate}}%</td>
+                <!-- <td>{{item.CommissionRate}}%</td> -->
                 <td>{{item.EmName!='微途'?item.BonusMoney:'-'}}</td>
                 <td>{{item.EmName!='微途'?item.BonusRate+'%':'-'}}</td>
                 <td>{{item.Month}}</td>
@@ -216,7 +230,7 @@
                 </td>
             </tr>
             <tr v-if="dataList.length==0">
-                <td style="text-align:center" colspan="15">暂无数据</td>
+                <td style="text-align:center" colspan="16">暂无数据</td>
             </tr>
         </table>
         <!-- 分页 -->
@@ -252,6 +266,7 @@
                     EmpId: -1,
                     PeriodsId: -1,
                     EmpType: '-1',
+                    Way: '-1'
                 },
                 loading: false,
                 //数据源
@@ -266,6 +281,11 @@
                     {name:'引流',id:'2'},
                     {name:'销售',id:'1'}
                 ],
+                typeList:[
+                    {name:'不限',id:'-1'},
+                    {name:'销售额',id:'1'},
+                    {name:'利润比例',id:'2'}
+                ]
             }
         },
         mounted() {

src/components/myOrdersAllType/components/allList.vue

@@ -410,6 +410,10 @@
         },
         methods: {
           exportExcel() { //导出
+            if (!this.msg.StartTime || !this.msg.EndTime) {
+              this.$message.info('请选择开始时间、结束时间！')
+            return;
+          }
             let msg = JSON.parse(JSON.stringify(this.msg))
             let userInfo = this.getLocalStorage();
             msg.uid = userInfo.EmployeeId