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

src/components/FinancialModule/TradeCommission/commissionDialog.vue

@@ -20,14 +20,15 @@
         <span class="cF1416C" 
         :class="{'cursor-pointer':(objNew.createTime&&objNew.createTime>=new Date('2023-04-01').Format('yyyy-MM-dd'))
         ||(objNew.createDate&&objNew.createDate>=new Date('2023-04-01').Format('yyyy-MM-dd'))
-        ||(objNew.CreateTime&&objNew.CreateTime>=new Date('2023-04-01').Format('yyyy-MM-dd'))
-        ||(objNew.CreateTime&&objNew.CreateTime>=new Date('2023/04/01').Format('yyyy/MM/dd'))
-        &&objNew.commissionMoney>0}" 
+        ||(objNew.CreateTime&&new Date(objNew.CreateTime).Format('yyyy-MM-dd')>=new Date('2023-04-01').Format('yyyy-MM-dd'))}" 
         @click="(objNew.createTime&&objNew.createTime>=new Date('2023-04-01').Format('yyyy-MM-dd'))
         ||(objNew.createDate&&objNew.createDate>=new Date('2023-04-01').Format('yyyy-MM-dd'))
-        ||(objNew.CreateTime&&objNew.CreateTime>=new Date('2023-04-01').Format('yyyy-MM-dd'))
-        ||(objNew.CreateTime&&objNew.CreateTime>=new Date('2023/04/01').Format('yyyy/MM/dd'))?DetailsOfRoyalty():''">
-            ￥<span class="fz15 fbold">{{ objNew.commissionMoney?moneyFormat(objNew.commissionMoney):objNew.SellCommission }} {{objNew.commissionCurrency?objNew.commissionCurrency:''}}</span>
+        ||(objNew.CreateTime&&new Date(objNew.CreateTime).Format('yyyy-MM-dd')>=new Date('2023-04-01').Format('yyyy-MM-dd'))?DetailsOfRoyalty():''">
+            <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>
     <div class="flexOne domesticCommissionUser">
@@ -150,7 +151,6 @@
         },
         methods: {
             goUrl(){
-              console.log(this.objNew,'----')
                 this.outerVisible = false
                 this.$router.push({
                     path: 'TradeTicketUserDetails',

src/components/Hotel/reservation/OrderList.vue

@@ -509,11 +509,7 @@
             <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">{{
@@ -533,6 +529,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" v-if="item.OrderStatus!=3">
         <div class="row pt20" style="margin-right: 10px;width: 300px;" 

src/components/SalesVisa/components/visaOrderList.vue

@@ -612,10 +612,8 @@
           </el-table-column>
           <el-table-column v-if="item.commissionMoney&&item.commissionMoney>0" label="提成" style="background:#EAEAEA">
             <template slot-scope="scope">
+              <span class="cF1416C" style="float: left;">￥</span>
               <commissionDialog :objNew="scope.row"></commissionDialog>
-              <!-- <span class="cursor-pointer" :class="{'cF1416C':scope.row.commissionMoney>0}" @click="DetailsOfRoyalty(item)">
-                ￥<span class="fz15 fbold">{{ moneyFormat(scope.row.commissionMoney) }}</span>
-              </span> -->
             </template>
           </el-table-column>
           <template slot="append" >