1

src/components/FinancialModule/domestic/OPsalesCommission.vue

@@ -237,7 +237,15 @@
                     SelectState: true,
                     OrderSource: 8,
                     OrderID: 0,
-
+                }
+                if(this.msg.OutBranchId==1252){
+                    if(item.YNCommission>0){
+                        obj.RB_Branch_Id=1252;
+                        obj.StandCurrBranchId=1252;
+                        obj.CurrencyId=1;
+                        obj.Money = item.YNCommission;
+                        obj.Rate=item.YNRate;
+                    }
                 }
                 let query = {
                     blank: "y",

src/components/FinancialModule/domestic/OPsalesCommissionUser.vue

@@ -80,6 +80,7 @@
         <th>{{$t('op.StaffName')}}</th>
         <th>{{$t('admin.admin_personNumber')}}</th>
         <th>{{$t('salesModule.CommissionNum')}}</th>
+        <th>IDR{{$t('salesModule.CommissionNum')}}</th>
         <th>{{$t('tips.qishu')}}</th>
         <th>{{$t('system.table_operation')}}</th>
       </tr>
@@ -90,7 +91,7 @@
         <td>{{item.PeopleCount}}</td>
 
         <td>{{item.CommissionMoney}}</td>
-
+        <td>{{item.YNCommission}}</td>
         <td>{{item.Periods}}</td>
 
         <td>

src/components/FinancialModule/domestic/OPsalesCommissiondetails.vue

@@ -90,7 +90,7 @@
           </li> -->
       <div style="display: flex;align-items: center;height: 50px;justify-content: space-between;">
         <div style="display: flex;align-items: center;">
-          <span>{{$t('fnc.a_zongjine')}}：{{TotalMoney}}{{$t('hotel.hotel_yuan')}}</span>
+          <span>{{$t('fnc.a_zongjine')}}：{{TotalMoney}}{{$t('hotel.hotel_yuan')}}<span v-if="TotalYNMoney>0">（{{TotalYNMoney}} IDR）</span></span>
           <span style="margin-left: 15px;">{{$t('objFill.zongrenshu')}}：{{TotalNum}}{{$t('hotel.hotel_people')}}</span>
         </div>
         <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="exportExcel">
@@ -108,7 +108,7 @@
           <!-- <th>{{$t('hotel.order_Number')}}</th> -->
           <th>{{$t('admin.admin_personNumber')}}</th>
           <th>{{$t('salesModule.CommissionNum')}}</th>
-
+          <th>IDR{{$t('salesModule.CommissionNum')}}</th>
           <th>{{$t('tips.qishu')}}</th>
           <th width='400'>{{$t('pub.pubRemark')}}</th>
 
@@ -128,8 +128,8 @@
           </td>
           <td>{{item.TCProfit}}</td>
           <td>{{item.PeopleCount}}</td>
-          <td>{{item.CommissionMoney}}</td>
-
+          <td>{{(item.RMBCMoney>0? item.RMBCMoney : item.CommissionMoney)}}</td>
+          <td>{{(item.RMBCMoney>0? item.CommissionMoney:'')}}</td>
           <td>{{item.Periods}}</td>
           <td>{{item.Description}}</td>
 
@@ -185,6 +185,7 @@
           departMentList: [],
           TotalMoney: 0,
           TotalNum: 0,
+          TotalYNMoney: 0,
           disabled: true
 
         }
@@ -329,6 +330,7 @@
               this.loading = false;
               if (res.data.resultCode == 1) {
                 this.TotalMoney = res.data.data.TotalMoney ? res.data.data.TotalMoney : 0
+                this.TotalYNMoney = res.data.data.YNMoney ? res.data.data.YNMoney : 0
                 this.TotalNum = res.data.data.TotalNum ? res.data.data.TotalNum : 0
                 this.dataList = res.data.data.pmodel.pageData;
                 this.total = res.data.data.pmodel.count;