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

src/App.vue

@@ -322,4 +322,11 @@
   .cursor-p.active{
     color: #409EFF;
   }
+  .float-l{
+    float: left;
+  }
+  .width100-float-l{
+    width: 100%;
+    float: left;
+  }
 </style>

src/components/FinancialModule/FinancialDocuments.vue

@@ -591,6 +591,18 @@ input[type="number"] {
                   </el-select>
                 </span>
               </li>
+              <li v-if="msg.Conditon==1||msg.Conditon==3||msg.Conditon==2">
+                <span>
+                    <em>{{$t('fnc.zdriqi')}}</em>
+                    <el-date-picker class="h34"
+                        @change="timeAdd(1)"
+                        v-model="productionDate"
+                        type="daterange"
+                        value-format="yyyy-MM-dd"
+                        :range-separator="$t('restaurant.res_To')">
+                    </el-date-picker>
+                </span>
+            </li>
                 <template v-if="heightQueryBox">
                      <li>
                         <span>
@@ -730,7 +742,8 @@ input[type="number"] {
                             <el-input v-model="msg.sMoney" class="w64d5"></el-input>-<el-input v-model="msg.eMoney" class="w64d5"></el-input>
                         </span>
                     </li>
-                    <li v-if="msg.Conditon==1">
+                    <!-- 制单日期 -->
+                    <!-- <li v-if="msg.Conditon==1||msg.Conditon==3||msg.Conditon==2">
                         <span>
                             <em>{{$t('fnc.zdriqi')}}</em>
                             <el-date-picker class="h34"
@@ -741,7 +754,7 @@ input[type="number"] {
                                 :range-separator="$t('restaurant.res_To')">
                             </el-date-picker>
                         </span>
-                    </li>
+                    </li> -->
                     <li v-if="msg.Conditon==2">
                         <span>
                             <em>{{$t('fnc.spriqi')}}</em>
@@ -968,7 +981,8 @@ input[type="number"] {
                             <i v-if="active==2" class="iconfont icon-zhifupeizhiguanli"
                               @click="showjiaoyi(item.FrID)"></i>
                           </el-tooltip>
-                        <el-tooltip class="item" content="手续费设置" placement="top" v-if="active==2 && istransaction == true && item.Type==1">
+                        <el-tooltip class="item" content="手续费设置" placement="top"
+                        v-if="active==2 && item.Type==1 &&(istransaction == true || isJapanCommission == true)">
                           <i class="iconfont icon-zhifupeizhiguanli"
                             @click="showTranTax(item.FrID,'1')"></i>
                         </el-tooltip>
@@ -1499,6 +1513,7 @@ export default {
       F_Update_CurrencyRate: false,
       costmodeHL:false,
       trabeListHL:[],//修改费率下拉数据
+      isJapanCommission: false
     };
   },
   created() {
@@ -1517,6 +1532,9 @@ export default {
     if(ActionMenuCode.indexOf('F_Update_CurrencyRate')!=-1){
       this.F_Update_CurrencyRate=true;
     }
+    if(userinfo.RB_Branch_id == 1218&&ActionMenuCode.indexOf('isJapanCommission')!=-1){
+      this.isJapanCommission=true;
+    }
     if (this.$route.query.returnCode) {
       this.active = this.$route.query.returnCode;
       this.msg.Conditon = this.$route.query.returnCode;
@@ -1547,6 +1565,9 @@ export default {
     "my-GZ-Bill": myGZBill
   },
   mounted() {
+    let StartDate = this.getBeforeDate(186,new Date().Format("yyyy-MM-dd"))
+    let EndDate = this.getBeforeDate(-1,new Date().Format("yyyy-MM-dd"))
+    this.productionDate = [StartDate,EndDate]
     this.GetAuth();
     this.getCostTypeList();
     let userInfo = this.getLocalStorage();

src/components/FinancialModule/OpCommission/OpComPersonDetails.vue

@@ -212,7 +212,8 @@
             EmployeeId: -1,
             PeriodsId: -1,
             OrderType: -1,
-            Way: -1,
+            Way: '-1',
+            TCID: '',
             TCNUM: '',
             RB_Department_Id: -1,//部门ID
             EmBranchId: -1,//公司ID
@@ -267,7 +268,6 @@
           this.getDepartment()
           this.getCompany()
           this.GetOrderTypeEnumList()
-          this.GetCommissionPeroidsList()//期数
       },
       mounted() {
         let userInfo = this.getLocalStorage();
@@ -285,7 +285,6 @@
           }
         }
         this.msg.TCNUM = this.$route.query.TCNUM?this.$route.query.TCNUM:''
-        this.msg.PeriodsId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):-1
         this.msg.RB_Branch_Id = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1
         this.msg.EmBranchId = this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id)
         this.msg.EmployeeId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
@@ -482,9 +481,7 @@
                 "opcommission_GetNewOPCommissionPeroidsList",{},res => {
                 if (res.data.resultCode == 1) {
                     this.PeroidsList = res.data.data;
-                    if(!this.$route.query.PeriodId){
-                      this.msg.PeriodsId = this.PeroidsList[0].Id
-                    }
+                    this.msg.PeriodsId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):this.PeroidsList[0].ID
                     this.getList()
                 } else {
                     this.Error(res.data.message);

src/components/Hotel/reservation/OrderList.vue

@@ -510,7 +510,7 @@
             <span class="fz15 fbold">{{ scope.row.Refund ? scope.row.Refund : "-" }}</span>
           </template>
         </el-table-column>
-        
+
         <!-- <el-table-column label="手配费应收" min-width="100">
           <template slot-scope="scope">
             <span class="fz15 fbold">{{
@@ -535,14 +535,19 @@
             <span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column v-if="item.SellCommission&&item.SellCommission>0" label="提成" style="background:#EAEAEA">
+        <el-table-column v-if="(item.SellCommission&&item.SellCommission>0)||(item.OPCommission&&item.OPCommission>0)" label="提成" style="background:#EAEAEA">
           <template slot-scope="scope">
-            <commissionDialog :objNew="item"></commissionDialog>
+            <div class="width100-float-l" v-if="item.SellCommission&&item.SellCommission>0"><span class="float-l">销售：</span>
+              <commissionDialog :objNew="item" :OP="0"></commissionDialog>
+            </div>
+            <div class="width100-float-l" v-if="item.OPCommission&&item.OPCommission>0"><span class="float-l">OP：</span>
+              <commissionDialog :objNew="item" :OP="1"></commissionDialog>
+            </div>
           </template>
         </el-table-column>
       </el-table>
       <div class="row justify-sb mt mb20" v-if="item.OrderStatus!=3">
-        <div class="row pt20" style="margin-right: 10px;width: 300px;" 
+        <div class="row pt20" style="margin-right: 10px;width: 300px;"
         v-if="item.GuestFileList.length > 0||((item.CustomerPayType==1 || item.CustomerPayType==3)&&pagesTitle)">
           <!-- <i class="el-icon-warning cF57A98 fz15 mr"></i> -->
           <div class="column">
@@ -580,10 +585,10 @@
                 </div>
                 <div class="row fz12 see-rec mt">
                   <el-upload ref="my-upload" :http-request="uploadFileBtn" v-loading="loading"
-                  :multiple="true" 
+                  :multiple="true"
                   :show-file-list="false" action="">
                     <div :class="{'cursor-pointer seeLK c059FF6':!loading,
-                    'cursor-pointer see c04C8C8':loading}" 
+                    'cursor-pointer see c04C8C8':loading}"
                     @click="uploadOrderId=item.OrderId">上车旅客名单</div>
                   </el-upload>
                 </div>
@@ -594,7 +599,7 @@
           <div class="fz12">收款单据</div>
           <div class="row wrap orderNo fz12 py">
             <span
-            class="cursor-pointer radius5 mr px5" 
+            class="cursor-pointer radius5 mr px5"
             :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
             'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
               v-for="(x, i) in item.IncomeList"
@@ -622,7 +627,7 @@
           <div class="fz12">退款单据</div>
           <div class="row wrap orderNo fz12 py">
             <span
-            class="cursor-pointer radius5 mr px5" 
+            class="cursor-pointer radius5 mr px5"
             :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
             'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
               v-for="(x, i) in item.RefundList"
@@ -650,7 +655,7 @@
           <div class="fz12">成本单据</div>
           <div class="row wrap orderNo fz12 py">
             <span
-            class="cursor-pointer radius5 mr px5" 
+            class="cursor-pointer radius5 mr px5"
             :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
             'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
               v-for="(x, i) in item.CostList"
@@ -677,7 +682,7 @@
           <div class="fz12">手配费单据</div>
           <div class="row wrap orderNo fz12 py">
             <span
-            class="cursor-pointer radius5 mr px5" 
+            class="cursor-pointer radius5 mr px5"
             :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
             'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
               v-for="(x, i) in item.HandFittingFinanceList"
@@ -973,7 +978,7 @@ export default {
   },
   watch: {
     pagesTitle(val,oldval){
-      
+
     },
     OrderList:{
       handler(val, oldVal){
@@ -1006,7 +1011,7 @@ export default {
       setTimeout(()=>{
         this.cdState = true
       },100)
-      
+
     },
     editRemark(item){
       this.postMsg.OrderId = item.OrderId
@@ -1044,7 +1049,7 @@ export default {
             }
           })
         }
-        
+
       },
     uploadFileBtn(file){
       let ft = file.file.name.substring(file.file.name.lastIndexOf('.') + 1, file.file.name.length).toUpperCase();
@@ -1210,7 +1215,7 @@ export default {
                   this.Error(res.data.message);
               }
           }).catch(err=>{
-              this.Error(err.message) 
+              this.Error(err.message)
               this.loading0= false
           })
       }).catch(()=>{
@@ -1260,9 +1265,9 @@ export default {
             this.loading0 = false;
           }
       );
-      
+
     },
-    
+
     saveUpdate() {
       this.$confirm("是否确认设置收损?", "提示", {
         confirmButtonText: "确定",

src/components/SalesModule/groupTourOrderOne.vue

@@ -1467,9 +1467,16 @@
               <p style="min-width: 180px;">{{$t('hotel.hotel_StartTeam')}}：{{item.startDate}}</p>
               <p>{{$t('restaurant.res_oderTime')}}：{{item.createDate}}</p>
               <p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
-              <p v-if='item.commissionMoney' style="color:red">
-                <span style="float: left;">{{$t('salesModule.Commission')}}：</span>
-                <commissionDialog :objNew="item"></commissionDialog>
+              <p v-if='(item.commissionMoney&&item.commissionMoney>0)||(item.opcommission&&item.opcommission>0)' style="color:red">
+                <template v-if="item.commissionMoney&&item.commissionMoney>0">
+                  <span style="float: left;">销售{{$t('salesModule.Commission')}}：</span>
+                  <commissionDialog :objNew="item" :OP="0"></commissionDialog>
+                </template>
+                <template v-if="item.opcommission&&item.opcommission>0">
+                  <span style="float: left; margin-left: 10px;">OP提成：</span>
+                  <commissionDialog :objNew="item" :OP="1"></commissionDialog>
+                </template>
+
                 <!-- {{item.commissionMoney}} -->
               </p>
               <p v-else-if="item.latestCommissionMoney" style="color:red">
@@ -3409,7 +3416,7 @@
           }
         })
       },
-       
+
       cancelSubmit() {
         this.isShowLayer = false
         this.$refs['addMsg'].resetFields()

src/components/SalesVisa/components/visaOrderList.vue

@@ -528,12 +528,12 @@
             <span class="mr">{{ item.createName }}</span>
             <el-image class="mr" v-if="item.createPhoto"
                 style="width: 20px; height: 20px;border-radius: 50%;"
-                :src="item.createPhoto" 
+                :src="item.createPhoto"
                 :preview-src-list="[item.createPhoto]">
               </el-image>
             </template>
           </div>
-          
+
           <span>下单时间：</span>
           <span>{{ item.createTime }}</span>
         </div>
@@ -610,10 +610,17 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column v-if="item.commissionMoney&&item.commissionMoney>0" label="提成" style="background:#EAEAEA">
+          <el-table-column label="提成" style="background:#EAEAEA"
+          v-if="(item.commissionMoney&&item.commissionMoney>0)||(item.opCommission&&item.opCommission>0)">
             <template slot-scope="scope">
-              <span class="cF1416C" style="float: left;">￥</span>
-              <commissionDialog :objNew="scope.row"></commissionDialog>
+              <div class="width100-float-l" v-if="item.commissionMoney&&item.commissionMoney>0">
+                <span class="float-l">销售：<span class="cF1416C">￥</span></span>
+                <commissionDialog :objNew="scope.row" :OP="0"></commissionDialog>
+              </div>
+              <div class="width100-float-l" v-if="item.opCommission&&item.opCommission>0">
+                <span class="float-l">OP：<span class="cF1416C">￥</span></span>
+                <commissionDialog :objNew="scope.row" :OP="1"></commissionDialog>
+              </div>
             </template>
           </el-table-column>
           <template slot="append" >
@@ -634,7 +641,7 @@
                   </el-tooltip>
                 </div>
               </div>
-                  
+
               <div class="row justify-sb">
                 <div class="row-c justify-sb px15 bgf5 radius5 flex-g pa relative" style="min-width: 200px;max-width: 400px;">
                   <div class="row-c">
@@ -734,13 +741,13 @@
                 </div>
               </div>
         </div>
-            
-            
+
+
           </template>
         </el-table>
       </div>
-      
-      
+
+
     </div>
     <div class="_mc_edit _scrollbar" :class="addShow==true?'edHeight':''">
       <p class="_tit">{{$t('salesModule.UpOrder')}}
@@ -891,7 +898,7 @@ export default {
       userInfo: {},
         qjGroupId: -1,
         F_InvoiceManagement: false,
-        F_Finance_Create: false,       	
+        F_Finance_Create: false,
         msg: {
           pageIndex: 1,
           pageSize: 12,
@@ -981,7 +988,7 @@ export default {
       setTimeout(()=>{
         this.cdState = true
       },100)
-      
+
     },
     PerferPrice() {
         this.apipost('dmc_get_visa_SetVisaOrderPrice', this.EditMsg, res => {
@@ -1237,7 +1244,7 @@ export default {
             this.addMsg.EnterCountryFlight = x[0].EnterCountryFlight
             this.addMsg.LeaveCountryFlight = x[0].LeaveCountryFlight
             this.addMsg.VisaPlanId = x[0].VisaPlanId
-            //this.addMsg.DepartDate=x[0].DepartDate	
+            //this.addMsg.DepartDate=x[0].DepartDate
             this.addMsg.ClientType = x[0].ClientType.toString()
           }
 
@@ -1324,7 +1331,7 @@ export default {
         SourceID: row.visaId,
         TCIDList: TCIDARR,
         ReFinanceId2: num,
-        MatchFrId:0 
+        MatchFrId:0
       }
       let query = {};
       query = {

src/components/SingleAirTicket/components/OrderList.vue

@@ -132,7 +132,7 @@
     .cff9800 {
       color: #ff9800;
     }
-    
+
     .cF1416C {
       color: #f1416c;
     }
@@ -449,17 +449,17 @@
     }
     /deep/.el-table tr:last-child td{
       border-bottom: 1px solid #EBEEF5;
-    
+
     }
     /deep/.el-table tr td{
       border-bottom: 1px solid #EBEEF5;
-    
+
     }
     .cp{
       cursor: pointer;
     }
     </style>
-    
+
     <template>
       <div>
         <div
@@ -492,7 +492,7 @@
                 (items.Id==3?'three':
                 (items.Id==4?'four':
                 (items.Id==5?'five':'')))),{'line-through':items.show}]"
-                
+
                 v-for="(items,i) in item.MultipleChoiceList">{{items.Name}}</span> -->
               </div>
               <div class="c9e fz12">
@@ -603,14 +603,21 @@
                     <span :class="{'cF1416C':scope.row.DueinMoney>0}">{{ scope.row.DueinMoney }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column v-if="item.SellCommission&&item.SellCommission>0" label="提成" style="background:#EAEAEA">
+                <el-table-column v-if="(item.SellCommission&&item.SellCommission>0)||(item.OPCommission&&item.OPCommission>0)" label="提成" style="background:#EAEAEA">
                   <template slot-scope="scope">
-                    <commissionDialog :objNew="scope.row"></commissionDialog>
+                    <div class="width100-float-l" v-if="item.SellCommission&&item.SellCommission>0">
+                      <span class="float-l">销售：</span>
+                      <commissionDialog :objNew="scope.row" :OP="0"></commissionDialog>
+                    </div>
+                    <div class="width100-float-l" v-if="item.OPCommission&&item.OPCommission>0">
+                      <span class="float-l">OP：</span>
+                      <commissionDialog :objNew="scope.row" :OP="1"></commissionDialog>
+                    </div>
                   </template>
                 </el-table-column>
                 <el-table-column label="出票状态" style="background:#EAEAEA">
                   <template slot-scope="scope">
-                    <span @click="scope.row.TicketStatusName!='无需机票'?modifyStatus(scope.row):''" 
+                    <span @click="scope.row.TicketStatusName!='无需机票'?modifyStatus(scope.row):''"
                     class="cp tatusText"
                     :class="item.TicketStatus==1?'grey':
                     (scope.row.TicketStatus==2?'success':
@@ -619,21 +626,21 @@
                     (scope.row.TicketStatus==5?'Black':''))))">
                       {{item.TicketStatusName}}
                   </span>
-                  <!-- <i v-if="scope.row.TicketStatus!=1&&scope.row.TicketVoucherList!=[]&&scope.row.CancelVoucherList!=[]&&scope.row.TicketStatusName!='无需机票'" 
-                  class="c3FC4FF cursor-pointer el-icon-document-checked" 
+                  <!-- <i v-if="scope.row.TicketStatus!=1&&scope.row.TicketVoucherList!=[]&&scope.row.CancelVoucherList!=[]&&scope.row.TicketStatusName!='无需机票'"
+                  class="c3FC4FF cursor-pointer el-icon-document-checked"
                   @click="viewCredentials(scope.row)"></i> -->
                   </template>
                 </el-table-column>
                 <el-table-column label="签证状态" style="background:#EAEAEA">
                   <template slot-scope="scope">
-                    <span @click="scope.row.VisaStatus=='1'?AmendVisa(scope.row):''" 
+                    <span @click="scope.row.VisaStatus=='1'?AmendVisa(scope.row):''"
                     class="tatusText"
                     :class="scope.row.VisaStatus==1?'grey'+' cursor-pointer':
                     (scope.row.VisaStatus==2?'success':
                     (scope.row.VisaStatus==0?'Black':''))">
                       {{scope.row.VisaStatus==1?'未出签':(scope.row.VisaStatus==2?'已出签':'无需签证')}}
                     </span>
-                    <i v-if="scope.row.VisaStatus==2" class="c3FC4FF cursor-pointer el-icon-document-checked" 
+                    <i v-if="scope.row.VisaStatus==2" class="c3FC4FF cursor-pointer el-icon-document-checked"
                       @click="CheckOutDetails(scope.row)"></i>
                   </template>
                 </el-table-column>
@@ -643,7 +650,7 @@
                   style="background:#EAEAEA"
                 >
                   <template slot-scope="scope">
-                    <input type="button" class="normalBtn" value="查看" 
+                    <input type="button" class="normalBtn" value="查看"
                     @click="goDetails(scope.row)" />
                   </template>
                 </el-table-column> !-->
@@ -686,7 +693,7 @@
               <div class="fz12">收款单据</div>
               <div class="row wrap orderNo fz12 py">
                 <span
-                class="cursor-pointer radius5 mr px5" 
+                class="cursor-pointer radius5 mr px5"
                 :class="{'bgD9F3FF':x.Status==0,'bgFAEAED':x.Status==1,'bjFFF3E0':x.Status==2,
                 'c3FC4FF':x.Status==0,'cF1416C':x.Status==1,'cff9800':x.Status==2}"
                   v-for="(x, i) in item.IncomeFinance"
@@ -714,7 +721,7 @@
               <div class="fz12">退款单据</div>
               <div class="row wrap orderNo fz12 py">
                 <span
-                class="cursor-pointer radius5 mr px5" 
+                class="cursor-pointer radius5 mr px5"
                 :class="{'bgD9F3FF':x.Status==0,'bgFAEAED':x.Status==1,'bjFFF3E0':x.Status==2,
                 'c3FC4FF':x.Status==0,'cF1416C':x.Status==1,'cff9800':x.Status==2}"
                   v-for="(x, i) in item.BackFinance"
@@ -742,7 +749,7 @@
               <div class="fz12">成本单据</div>
               <div class="row wrap orderNo fz12 py">
                 <span
-                class="cursor-pointer radius5 mr px5" 
+                class="cursor-pointer radius5 mr px5"
                 :class="{'bgD9F3FF':x.Status==0,'bgFAEAED':x.Status==1,'bjFFF3E0':x.Status==2,
                 'c3FC4FF':x.Status==0,'cF1416C':x.Status==1,'cff9800':x.Status==2}"
                   v-for="(x, i) in item.PayFinance"
@@ -795,7 +802,7 @@
             </div>
           </div>
         </div>
-    
+
         <el-dialog
           custom-class="w400"
           title="设置收损金额"
@@ -988,7 +995,7 @@
         },
         OrderList:{
           handler(val, oldVal){
-    
+
           }
         }
       },
@@ -1077,7 +1084,7 @@
                 },
                 err => {
                     this.loading3 = false
-                    this.Error(err.message) 
+                    this.Error(err.message)
                 });
         },
         uploadFileBtn(file){
@@ -1319,9 +1326,9 @@
                 this.loading0 = false;
               }
           );
-          
+
         },
-        
+
         saveUpdate() {
           let text = '是否确认设置收损?'
           this.$confirm(text, "提示", {
@@ -1438,6 +1445,5 @@
       }
     };
     </script>
-    
+
     <style></style>
-    
\ No newline at end of file

src/components/busManagement/BookAcar/components/orderList.vue

@@ -384,7 +384,7 @@
   border-bottom: 1px solid #ebeef5;
 }
 </style>
-    
+
     <template>
   <div>
     <div
@@ -663,12 +663,17 @@
           </template>
         </el-table-column>
         <el-table-column
-          v-if="item.SellCommission && item.SellCommission > 0"
+          v-if="(item.SellCommission&&item.SellCommission>0)||(item.OPCommission&&item.OPCommission>0)"
           label="提成"
           style="background: #eaeaea"
         >
           <template slot-scope="scope">
-            <commissionDialog :objNew="item"></commissionDialog>
+            <div class="width100-float-l" v-if="item.SellCommission&&item.SellCommission>0"><span class="float-l">销售：</span>
+              <commissionDialog :objNew="item" :OP="0"></commissionDialog>
+            </div>
+            <div class="width100-float-l" v-if="item.OPCommission&&item.OPCommission>0"><span class="float-l">OP：</span>
+              <commissionDialog :objNew="item" :OP="1"></commissionDialog>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -1610,6 +1615,5 @@ export default {
   },
 };
 </script>
-    
+
     <style></style>
-    
\ No newline at end of file

src/components/scenicSpot/reservation/OrderList.vue

@@ -614,7 +614,7 @@
         </el-table-column>
         <el-table-column label="待收" min-width="100">
           <template slot-scope="scope">
-            <span class="fz15 fbold" 
+            <span class="fz15 fbold"
             :class="{'cF1416C':item.DaiShou>0}">
             {{item.DaiShou}}
           </span>
@@ -625,13 +625,18 @@
             <span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column v-if="item.SellCommission&&item.SellCommission>0" label="提成" style="background:#EAEAEA">
+        <el-table-column v-if="(item.SellCommission&&item.SellCommission>0)||(item.OPCommission&&item.OPCommission>0)" label="提成" style="background:#EAEAEA">
           <template slot-scope="scope">
-            <commissionDialog :objNew="item"></commissionDialog>
+            <div class="width100-float-l" v-if="item.SellCommission&&item.SellCommission>0"><span class="float-l">销售：</span>
+              <commissionDialog :objNew="item" :OP="0"></commissionDialog>
+            </div>
+            <div class="width100-float-l" v-if="item.OPCommission&&item.OPCommission>0"><span class="float-l">OP：</span>
+              <commissionDialog :objNew="item" :OP="1"></commissionDialog>
+            </div>
           </template>
         </el-table-column>
       </el-table>
-      
+
       <div class="row justify-sb mt mb20">
         <div class="column px15 bjFFF3E0 radius5 flex-g pa relative" style="max-width: 300px;min-width: 150px;">
           <div class="fz12 row justify-sb" v-if="item.MailingState != 4">
@@ -679,13 +684,13 @@
                         <span class="cff9800">{{item.UseDate}}</span> 前
                       </div>
                       <div class="row fz12 see-rec mt">
-                        <el-upload ref="my-upload" 
-                        :http-request="uploadFileBtn" 
+                        <el-upload ref="my-upload"
+                        :http-request="uploadFileBtn"
                         v-loading="loadingDZP"
-                          :multiple="true" 
+                          :multiple="true"
                           :show-file-list="false" action="">
                             <div :class="{'cursor-pointer seeLK c059FF6':!loadingDZP,
-                            'cursor-pointer see c04C8C8':loadingDZP}" 
+                            'cursor-pointer see c04C8C8':loadingDZP}"
                             @click="uploadOrderId=item.OrderId">上传电子券</div>
                           </el-upload>
                       </div>
@@ -701,7 +706,7 @@
         <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
           <div class="fz12">收款单据</div>
           <div class="row wrap orderNo fz12 py">
-            <span class="cursor-pointer radius5 mr mb px5" 
+            <span class="cursor-pointer radius5 mr mb px5"
             :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
             'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.IncomeList"
               @click="openDetails(x)">{{ x.FrID }}</span>
@@ -717,7 +722,7 @@
         <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
           <div class="fz12">退款单据</div>
           <div class="row wrap orderNo fz12 py">
-            <span class="cursor-pointer radius5 mr mb px5" 
+            <span class="cursor-pointer radius5 mr mb px5"
             :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
             'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.RefundList"
               @click="openDetails(x)">{{ x.FrID }}</span>
@@ -733,7 +738,7 @@
         <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
           <div class="fz12">成本单据</div>
           <div class="row wrap orderNo fz12 py">
-            <span class="cursor-pointer radius5 mr mb px5" 
+            <span class="cursor-pointer radius5 mr mb px5"
             :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
             'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.CostList"
               @click="openDetails(x)">{{ x.FrID }}</span>
@@ -752,7 +757,7 @@
                 @click="isOffset(item, index, 3)"></i>
             </el-tooltip>
           </div>
-          
+
         </div>
         <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="min-width: 230px;">
           <div class="row-c justify-sb pb5" :class="{'borderD':item.MailingMoney>0||item.DiscountsMoney>0}">
@@ -1166,7 +1171,7 @@ export default {
       setTimeout(()=>{
         this.cdState = true
       },100)
-      
+
     },
     editRemark(item){
       this.postMsg.OrderId = item.OrderId
@@ -1319,7 +1324,7 @@ export default {
       this.BillMakingMsg.ReFinanceId = row.OrderId;
       this.BillMakingMsg.ReFinanceId2 = num;
       this.BillMakingMsg.OtherType = 66;
-      
+
         let text = "";
         let query = {};
         if (num == 1) {
@@ -1329,7 +1334,7 @@ export default {
         } else if (num == 3) {
           text = "成本";
         }
-      
+
         query = {
           blank: "y",
           tab: `新增${text}单据`,