no message

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