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

src/components/FinancialModule/TradeCommission/TicketDetails.vue

@@ -202,8 +202,6 @@
       data() {
         return {
           dataObj:{},
-          objNew:{},
-          outerVisible:false,
           Month: moment().format("YYYY-MM"),
           msg: {
             pageIndex: 1,
@@ -478,13 +476,6 @@
           JSON.stringify(data);
           window.open(href);
       },
-        GenerateScale(item){
-          // if(!item.WageReId){
-          //     return
-          // }
-          this.objNew = item
-          this.outerVisible = true
-        },
         GetCommissionPeroidsList() { //期数下拉
             this.apipost(
                 "sellcommission_GetTYSaleCommissionPeriodsList",{},res => {

src/components/Hotel/reservation/OrderList.vue

@@ -509,6 +509,11 @@
             <span class="fz15 fbold">{{ scope.row.Refund ? scope.row.Refund : "-" }}</span>
           </template>
         </el-table-column>
+        <el-table-column v-if="item.SellCommission&&item.SellCommission>0" label="提成" style="background:#EAEAEA">
+          <template slot-scope="scope">
+            <commissionDialog :objNew="item"></commissionDialog>
+          </template>
+        </el-table-column>
         <!-- <el-table-column label="手配费应收" min-width="100">
           <template slot-scope="scope">
             <span class="fz15 fbold">{{
@@ -902,8 +907,9 @@
   import offset from '../../public/offset.vue';
   import more from '../../public/more.vue';
   import correlationOP from './correlationOP.vue';
+  import commissionDialog from "../../FinancialModule/TradeCommission/commissionDialog"
 export default {
-  components: { offset, more, correlationOP },
+  components: { offset, more, correlationOP,commissionDialog },
   props: ["OrderList","pagesTitle"],
   data() {
     return {

src/components/SalesModule/groupTourOrder.vue

@@ -1715,7 +1715,9 @@
               <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">
-                {{ $t("salesModule.Commission") }}：{{ item.commissionMoney }} {{item.commissionCurrency}}
+                <span style="float: left;">{{ $t("salesModule.Commission") }}：</span>
+                <commissionDialog :objNew="item"></commissionDialog>
+                <!-- {{ item.commissionMoney }} {{item.commissionCurrency}} -->
               </p>
               <p v-else-if="item.latestCommissionMoney" style="color: red">
                 {{ $t("salesModule.Commission") }}：{{
@@ -2425,6 +2427,7 @@
   import payURL1 from "../commonPage/payURL1.vue";
   import tripDownLoadCommon from "../commonPage/TripDownLoadCommon.vue";
   import updateSalesMan from "../commonPage/updateSalesMan.vue";
+  import commissionDialog from "../FinancialModule/TradeCommission/commissionDialog"
 
   export default {
     data() {
@@ -2741,6 +2744,7 @@
       payurlItem1: payURL1,
       tripDownLoadCommon: tripDownLoadCommon,
       updateSalesMan: updateSalesMan,
+      commissionDialog
     },
     filters: {
       priceFormat(value) {

src/components/SalesModule/groupTourOrderOne.vue

@@ -1482,7 +1482,10 @@
               <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">{{$t('salesModule.Commission')}}：{{item.commissionMoney}}
+              <p v-if='item.commissionMoney' style="color:red">
+                <span style="float: left;">{{$t('salesModule.Commission')}}：</span>
+                <commissionDialog :objNew="item"></commissionDialog>
+                <!-- {{item.commissionMoney}} -->
               </p>
               <p v-else-if="item.latestCommissionMoney" style="color:red">
                 {{$t('salesModule.Commission')}}：{{item.latestCommissionMoney}}</p>
@@ -1855,6 +1858,7 @@
   import payURL1 from '../commonPage/payURL1.vue'
   import tripDownLoadCommon from '../commonPage/TripDownLoadCommon.vue'
   import updateSalesMan from '../commonPage/updateSalesMan.vue'
+  import commissionDialog from "../FinancialModule/TradeCommission/commissionDialog"
 
   export default {
     data() {
@@ -2229,7 +2233,8 @@
       payurlItem: payURL,
       payurlItem1: payURL1,
       tripDownLoadCommon: tripDownLoadCommon,
-      updateSalesMan: updateSalesMan
+      updateSalesMan: updateSalesMan,
+      commissionDialog
     },
     filters: {
       priceFormat(value) {

src/components/SingleAirTicket/components/OrderList.vue

@@ -556,9 +556,10 @@
                 <template slot-scope="scope">
                   <template>
                     <p class="CreateByName-text" v-if="scope.row.DepartTime">出发：<span>{{scope.row.DepartTime}}</span></p>
-                    <p class="CreateByName-text" v-if="scope.row.OrderStatus == 5">完结：<span>{{scope.row.FinishTime}}</span></p>
-                    <p class="CreateByName-text" v-if="scope.row.OrderStatus == 6">完结：<span >{{scope.row.LossFinishTime}}</span></p>
-                    <p class="CreateByName-text Commission cp" v-if="scope.row.Commission" @click="commissionDetails(scope.row)">提成：<span>{{scope.row.Commission}}</span></p>
+                    <p class="CreateByName-text" v-else-if="scope.row.OrderStatus == 5">完结：<span>{{scope.row.FinishTime}}</span></p>
+                    <p class="CreateByName-text" v-else-if="scope.row.OrderStatus == 6">完结：<span >{{scope.row.LossFinishTime}}</span></p>
+                    <p class="CreateByName-text Commission cp" v-else-if="scope.row.Commission" @click="commissionDetails(scope.row)">提成：<span>{{scope.row.Commission}}</span></p>
+                    <template v-else>-</template>
                   </template>
                 </template>
               </el-table-column>
@@ -602,6 +603,11 @@
                     <span :class="{'cF1416C':scope.row.DueinMoney>0}">{{ scope.row.DueinMoney }}</span>
                   </template>
                 </el-table-column>
+                <el-table-column v-if="item.commissionMoney&&item.commissionMoney>0" label="提成" style="background:#EAEAEA">
+                  <template slot-scope="scope">
+                    <commissionDialog :objNew="scope.row"></commissionDialog>
+                  </template>
+                </el-table-column>
                 <el-table-column label="出票状态" style="background:#EAEAEA">
                   <template slot-scope="scope">
                     <span @click="scope.row.TicketStatusName!='无需机票'?modifyStatus(scope.row):''" 
@@ -865,8 +871,9 @@
     </template>
     <script>
       import offset from '../../public/offset.vue';
+      import commissionDialog from "../../FinancialModule/TradeCommission/commissionDialog"
     export default {
-      components: { offset },
+      components: { offset,commissionDialog },
       props: ["OrderList","pagesTitle"],
       data() {
         return {

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

@@ -576,6 +576,11 @@
                 <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">
+              <template slot-scope="scope">
+                <commissionDialog :objNew="item"></commissionDialog>
+              </template>
+            </el-table-column>
           </el-table>
           <div class="row justify-sb mt mb20">
             <div class="column px15 bgf5 radius5 flex-g pa relative">
@@ -836,8 +841,9 @@
     <script>
       import offset from '../../../public/offset.vue';
       import correlationOP from '../../../Hotel/reservation/correlationOP.vue';
+      import commissionDialog from "../../../FinancialModule/TradeCommission/commissionDialog"
     export default {
-      components: { offset,correlationOP },
+      components: { offset,correlationOP,commissionDialog },
       props: ["OrderList","pagesTitle"],
       data() {
         return {

src/components/scenicSpot/reservation/OrderList.vue

@@ -616,6 +616,11 @@
             <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">
+          <template slot-scope="scope">
+            <commissionDialog :objNew="item"></commissionDialog>
+          </template>
+        </el-table-column>
       </el-table>
       
       <div class="row justify-sb mt mb20">
@@ -987,9 +992,10 @@
 <script>
   import offset from '../../public/offset.vue';
   import correlationOP from '../../Hotel/reservation/correlationOP.vue';
+  import commissionDialog from "../../FinancialModule/TradeCommission/commissionDialog"
 export default {
   components: {
-    offset,correlationOP
+    offset,correlationOP,commissionDialog
     },
   props: ["OrderList", "pagesTitle"],
   data() {