1

src/assets/common/lang/EN/fill.js

@@ -1019,7 +1019,7 @@ export const obj = {
     t1: 'Car/usage time/days',
     t2: 'Car Details',
     t3: 'Total amount',
-    t4: 'Collection amount',
+    t4: 'Amount to be received',
     t5: 'Paid in',
     t6: 'Refund',
     t7: 'Platform amount in transit',

src/assets/common/lang/Japan/fill.js

@@ -1018,7 +1018,7 @@ export const obj = {
     t1: '車/使用時間/日数',
     t2: '車の詳細',
     t3: '総金額',
-    t4: '代納金',
+    t4: '未収金額',
     t5: '実収します',
     t6: '払い戻し',
     t7: 'プラットフォームの金額',

src/assets/common/lang/zhCN/fill.js

@@ -1018,7 +1018,7 @@ export const obj = {
       t1: '车/使用时间/天数',
       t2: '用车详情',
       t3: '总金额',
-      t4: '代收金额',
+      t4: '待收金额',
       t5: '实收',
       t6: '退款',
       t7: '平台在途金额',

src/components/FinancialModule/TradeCommission/YNTicketCommission.vue

@@ -32,10 +32,10 @@
     <div class="flexOne domesticCommission">
         <div>
             <ul class="opUl">
-                <li style="display: none;">
+                <li>
                     <em>{{$t('scen.sc_cp')}}</em>
                     <el-select filterable  v-model='msg.OutBranchId'
-                    @change='handleCurrentChange(1)' :disabled="disabled">
+                    @change='handleCurrentChange(1)'>
                     <el-option :label="$t('pub.unlimitedSel')" :value="-1" :key="-1"></el-option>
                     <el-option
                     v-for="item in companyList"
@@ -60,6 +60,7 @@
             <tr>
                 <th>{{$t('tips.qishu')}}</th>
                 <th>{{$t('objFill.zongticeng')}}</th>
+                <th>{{$t('objFill.v101.FinancialModule.gongsitc')}}</th>
                 <th style="width: 30%;">{{$t('objFill.v101.FinancialModule.caiwtcdj')}}</th>
                 <th>{{$t('objFill.v101.FinancialModule.chaozuoxx')}}</th>
                 <th>{{$t('system.table_operation')}}</th>
@@ -67,6 +68,7 @@
             <tr v-for="item in dataList">
                 <td>{{item.Periods}}</td>
                 <td>{{item.SumPrice}}</td>
+                <td>{{item.BranchCommission}}</td>
                 <td>
                     <template v-if="item.FinanceIdList.length>0">
                         <span  v-for="(x,y) in item.FinanceIdList">
@@ -162,6 +164,9 @@
                 this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
                     if(res.data.resultCode==1){
                         this.companyList=res.data.data;
+                        if(this.companyList){
+                            this.companyList = this.companyList.filter(company => company.Id === 1252 || company.Id === 1257);
+                        }
                     }else{}
                 },err=>{})
             },
@@ -257,6 +262,9 @@
             },
             // 点击制单
             YijianZD(item,type) {
+                // let branchId = this.msg.OutBranchId;
+                // if(branchId<=0){branchId=1252;}
+                let branchId=1252;
                 let Money
                 if(type==1){
                   if(item.BranchWage>0){
@@ -266,7 +274,10 @@
                     return;
                   }
                 }else{
-                  if(item.SumPrice!=0){
+                    if(item.BranchCommission!=0 && this.msg.OutBranchId>0){
+                        Money=item.BranchCommission  
+                    }
+                  else if(item.SumPrice!=0){
                       Money=item.SumPrice
                     }else{
                       this.Error(this.$t('objFill.v101.FinancialModule.gongstcwnbnzd'))
@@ -282,8 +293,8 @@
                         OtherType: 88,
                         ReFinanceId:item.Id,
                         isRB_Branch_Id: true,
-                        RB_Branch_Id: 1252,
-                        StandCurrBranchId:1252
+                        RB_Branch_Id: branchId,
+                        StandCurrBranchId:branchId
                     }
                     let query = {
                         blank: "y",

src/components/FinancialModule/TradeCommission/YNTicketDetails.vue

@@ -43,7 +43,19 @@
                   :value="item.Id"></el-option>
           </el-select>
       </li>
-      
+      <li>
+        <em>{{$t('system.query_company')}}</em>
+        <el-select filterable  v-model='msg.RB_Branch_Id'
+        @change='handleCurrentChange(1)'>
+        <el-option :label="$t('pub.unlimitedSel')" :value="-1" :key="-1"></el-option>
+        <el-option
+        v-for="item in companyList"
+        :label='item.BName'
+        :value='item.Id'
+        :key='item.Id'
+        ></el-option>
+        </el-select>
+    </li>
       <li>
         <em>{{$t('salesModule.Personnel')}}</em>
         <el-select v-model="msg.UserId" size="mini"
@@ -189,12 +201,19 @@
           OrderTypeList:[],
           S_CheckBranchOrder:false,
           S_CheckAllOrder:false,
-          disabled:true
+          disabled:true,
+          companyList: [],
+          getCompanyMsg:{
+            RB_Group_Id:'0',
+            Status:'0',
+          },
         }
       },
       created(){
           let userInfo = this.getLocalStorage();
+          this.getCompanyMsg.RB_Group_Id=userInfo.RB_Group_id;    //集团ID
           this.GetCommissionPeroidsList()//期数
+          this.getCompany()
           this.getEmployee() //人员          
       },
       mounted() {
@@ -215,11 +234,12 @@
         this.msg.TCNUM = this.$route.query.TCNUM?this.$route.query.TCNUM:''
         this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):-1
         this.msg.OrderId = this.$route.query.OrderId?this.$route.query.OrderId:''
+        this.msg.RB_Branch_Id = this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id)
         this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId),
         this.msg.OrderType = this.$route.query.OrderType?this.$route.query.OrderType:-1
         if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1
             ||ActionMenuCode.indexOf('S_CheckAllOrder')!=-1
-            ||ActionMenuCode.indexOf('F_Query_AllIncomPay')!=-1) {//是否有看所有人的权限
+            ||ActionMenuCode.indexOf('F_Query_AllIncomPay')!=-1 || userInfo.EmployeeId==3160) {//是否有看所有人的权限
                 this.disabled = false;
                 this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):-1
         }else{
@@ -418,6 +438,13 @@
                 }
             );
         },
+        getCompany(){
+                this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
+                    if(res.data.resultCode==1){
+                        this.companyList=res.data.data;
+                    }else{}
+                },err=>{})
+            },
         getEmployee() { //所有人员下拉
           let employeeMsg = {
             RB_Group_id: "0",

src/components/FinancialModule/TradeCommission/YNTicketUserDetails.vue

@@ -237,7 +237,7 @@
             
             if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1
             ||ActionMenuCode.indexOf('S_CheckAllOrder')!=-1
-            ||ActionMenuCode.indexOf('F_Query_AllIncomPay')!=-1) {//是否有看所有人的权限
+            ||ActionMenuCode.indexOf('F_Query_AllIncomPay')!=-1|| userInfo.EmployeeId==3160) {//是否有看所有人的权限
                 this.disabled = false;
                 this.msg.UserId = this.$route.query.UserId?this.$route.query.UserId:-1