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

src/components/FinancialModule/TradeCommission/TicketDetails.vue

@@ -94,12 +94,12 @@
             <li>
               <em>订单号</em>
               <el-input maxlength="50" v-model="msg.OrderId" class="permiss-input w200"
-                @keyup.native.enter="handleCurrentChange(1)" :placeholder="$t('pub.pleaseImport')"></el-input>
+                @change="handleCurrentChange(1)" :placeholder="$t('pub.pleaseImport')"></el-input>
             </li>
             <li>
               <em>团号</em>
               <el-input maxlength="50" v-model="msg.TCNUM" class="permiss-input w200"
-                @keyup.native.enter="handleCurrentChange(1)" :placeholder="$t('pub.pleaseImport')"></el-input>
+                @change="handleCurrentChange(1)" :placeholder="$t('pub.pleaseImport')"></el-input>
             </li>
             <li>
               <em>订单类型</em>
@@ -338,7 +338,8 @@
           let data = [{
           path: "",
           OrderId: row.OrderId,
-          Type: ''
+          Type: '',
+          PeriodId: this.msg.PeriodId
         }]
         let href
         let url = this.domainManager().crmRoutingUrl;
@@ -410,6 +411,7 @@
               name: name,
               query: {
                 OrderId: row.OrderId,
+                PeriodId: this.msg.PeriodId,
                 blank: "y",
               }
             });

src/components/FinancialModule/TradeCommission/commissionDialog.vue

@@ -27,7 +27,6 @@
             <span class="fz15 fbold">
               <!-- {{objNew.commissionCurrency?objNew.commissionCurrency:objNew.CurrencyName!='人民币'?objNew.CurrencyName:'￥'}} -->
               {{ objNew.commissionMoney?moneyFormat(objNew.commissionMoney):objNew.SellCommission }} 
-              {{objNew.commissionCurrency?objNew.commissionCurrency:''}}
               </span>
         </span>
     <el-dialog width="1000px" title="提成详情" :visible.sync="outerVisible" center>
@@ -141,6 +140,7 @@
             objNew: {
                 handler(val, oldVal) {
                     this.msg.OrderId = val.id?val.id:val.OrderId
+                    this.msg.PeriodId = this.$route.query.PeriodId?this.$route.query.PeriodId:-1
                 },
                 deep: true,
                 immediate: true

src/components/SalesModule/groupTourOrder.vue

@@ -1716,7 +1716,7 @@
               <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>
+                <commissionDialog :objNew="item"></commissionDialog>{{item.commissionCurrency}}
                 <!-- {{ item.commissionMoney }} {{item.commissionCurrency}} -->
               </p>
               <p v-else-if="item.latestCommissionMoney" style="color: red">