印象票务提成新增销售额

src/components/FinancialModule/ImpressionTicketCommissionConfiguration.vue

@@ -26,6 +26,7 @@
           <tr>
             <th width="100" style="min-width: 100px;max-width: 100px;">方案名称</th>
             <th width="100%" class="left-text-indent">提成人员</th>
+            <th width="240" style="min-width: 240px;max-width: 240px;">公司所有国内出发线路(单团.散拚)</th>
             <th width="150" style="min-width: 150px;max-width: 150px;">创建时间</th>
             <th width="150" style="min-width: 150px;max-width: 150px;">操作</th>
           </tr>
@@ -47,6 +48,11 @@
                 <el-button slot="reference" style="border: none;" type="text">查看更多</el-button>
               </el-popover>
             </td>
+            <td>
+              <span>
+                {{item.SalesRate}}%
+              </span>
+            </td>
             <td style="padding: 0 10px;">
               <span>
                 {{item.UpdateTime}}
@@ -134,17 +140,24 @@
     </template>
     <el-dialog :title="titleName" :visible.sync="ruleVisible" width="750px" @close="resetForm('form')">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <div class="ImpressionTicketing-msgbox bottom0">
+        <div class="ImpressionTicketing-msgboxtop">
           <el-form-item label="规则名称" prop="Name">
             <el-input v-model="form.Name" clearable></el-input>
           </el-form-item>
           <el-form-item label="人员" prop="EmployeeId">
             <el-select class="multiple_input" filterable multiple v-model="form.EmployeeId"
-            @change="personnel">
+            @change="personnel" collapse-tags>
               <el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
                 :key="item.EmployeeId"></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="销售额" prop="SalesRate">
+            <div class="Impression-ratio-box">
+              <el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999" 
+            v-model="form.SalesRate"></el-input>
+              <span class="Impression-ratio-right">%</span>
+            </div>
+          </el-form-item>
         </div>
         <el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px">
           <p class="ImpressionTicketing-title">基本工资({{msg.EmpType==1?'自然季度平均利润业绩金额':'自然季度平均引流条数'}})</p>
@@ -351,6 +364,11 @@
             message: "请输入限制",
             trigger: "blur"
           }],
+          SalesRate: [{
+            required: true,
+            message: "请输入销售额",
+            trigger: "blur"
+          }],
         },
         EmpList:[//参与人
             {EmployeeId:''}
@@ -379,6 +397,7 @@
           Name:'',//规则名称
           EmpType:'',//类型 1销售 2引流
           EmployeeId:'',
+          SalesRate: null,
           EmpList:[//参与人
             {EmployeeId:''}
           ],
@@ -549,6 +568,7 @@
           Id:item.Id,
           Name:item.Name,//规则名称
           EmpType:item.EmpType,//类型 1销售 2引流
+          SalesRate:item.SalesRate,
           EmployeeId:item.EmpList.map(x=>x.EmployeeId),
           EmpList:list,
           WageRateList:item.WageRateList,
@@ -585,6 +605,7 @@
               Id:this.form.Id,
               Name:this.form.Name,//规则名称
               EmpType:this.form.EmpType,//类型 1销售 2引流
+              SalesRate:this.form.SalesRate,
               EmpList:this.form.EmpList,
               WageRateList:this.form.WageRateList,
               CommissionRateList:this.form.CommissionRateList,
@@ -721,6 +742,11 @@
     padding: 10px 20px 20px 20px;
     box-shadow: 0 1px 8px rgb(0 0 0 / 20%), 0 3px 4px rgb(0 0 0 / 14%), 0 3px 3px -2px rgb(0 0 0 / 12%);
   }
+  .ImpressionTicketing-msgboxtop{
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+  }
   .ImpressionTicketing-msgbox{
     display: flex;
     flex-direction: row;

src/components/Hotel/singleProduct/HotelOrder.vue

-<style>
-    
-
-  </style>
-
   <template>
     <div>
         <HotelOrderList :pagesTitle="pagesTitle"></HotelOrderList>

src/components/Hotel/singleProduct/HotelOrderOP.vue

-<style>
-    .HotelWorkList .has-gutter tr th,
-    .el-table th.is-leaf {
-      background-color: #EAEAEA !important;
-    }
-
-    .HotelWorkList .HW_hotelDialog {
-      width: 900px;
-    }
-
-    .HotelWorkList .Hw_tableOne {
-      width: 100%;
-      height: 40px;
-      background-color: #EAEAEA;
-    }
-
-    .HotelWorkList .Hw_tableOne th {
-      text-align: center;
-    }
-
-    .HotelWorkList .HotelWorkInput .el-input {
-      width: 223px;
-    }
-
-    .HotelWorkList .HworkInput .el-input {
-      width: 110px;
-    }
-
-  </style>
-
   <template>
     <div>
         <HotelOrderList :pagesTitle="pagesTitle"></HotelOrderList>

src/components/SingleAirTicket/components/OrderList.vue

@@ -510,7 +510,7 @@
               </div>
             </div>
             <div class="c9e fz12">
-              <span>客人信息：{{ item.GuestName }}/{{ item.MobilePhone }}</span>
+              <span>客人信息：{{ item.GuestName }}<template v-if="item.MobilePhone">/{{ item.MobilePhone }}</template> </span>
             </div>
             <div class="row c9e fz12">
               <span class="mr" v-if="item.LureEmpName">引流人：{{ item.CreateByName }}</span>