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

src/components/FinancialModule/ReportForm/fxOrderProfitLossList.vue

@@ -149,7 +149,7 @@
         <!-- <el-table-column label="已付成本" prop="PaidCostMoney" ></el-table-column> -->
         <el-table-column label="总返佣" prop="FXCommission" >
            <template slot-scope="scope">
-             <span v-if="scope.row.OrderNo=='小计'" >{{scope.row.FXCommission}}</span>
+             <span v-if="scope.row.OrderNo=='小计' || scope.row.OrderStatus==7 " >{{scope.row.FXCommission}}</span>
              <span v-else @click="showFXCommission(scope.row)" style=" color: #409EFF;cursor:pointer">{{scope.row.FXCommission}}</span>
           </template>
         </el-table-column>