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

src/components/FinancialModule/OpCommission/OPCommissionDetail.vue

@@ -201,7 +201,7 @@
               <th>总提成</th>
               <th>出团公司提成</th>
               <th>期数</th>
-              <th>描述</th>
+              <th width="25%">描述</th>
               <th>操作</th>
           </tr>
           <tr v-for="item in dataList">

src/components/FinancialModule/OpCommission/OPcommissionPeriods.vue

@@ -63,7 +63,7 @@
               <th>所属公司追加工资</th>
               <th>总提成</th>
               <th>公司提成</th>
-              <th>财务提成单据</th>
+              <th width="45%">财务提成单据</th>
               <th>追加工资单据</th>
               <th>操作信息</th>
               <th>操作</th>

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -1947,8 +1947,11 @@
             let userInfo = this.getLocalStorage()
             let ParentCompanyId = userInfo.ParentCompanyId;
 
+            if(!this.$route.query.edit){
             this.msg.RB_Branch_Id = this.msg.RB_Branch_Id == 0 || this.msg.RB_Branch_Id == ParentCompanyId ? this
               .getLocalStorage().RB_Branch_id : this.msg.RB_Branch_Id;
+            }
+
             if (this.orderObj && this.orderObj.companyIDList && this.orderObj.companyIDList.length > 0) {
               this.msg.RB_Branch_Id = this.orderObj.companyIDList[0];
             } else if (this.$route.query.companyID) {

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1139,9 +1139,11 @@
                       <el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||FenFangBiaoXiaZai">
                         <div @click='exportExcel_singleRoom(item)'>{{$t('op.FFBDowmLoad')}} </div>
                       </el-dropdown-item>
+                      <!-- HK 2023-12-05注释
                       <el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||LookOPCommission">
                         <div @click='goOPCommissionInfo(item.TCID,item)'>查看OP提成 </div>
                       </el-dropdown-item>
+                      -->
                       <el-dropdown-item v-if="item.IsSetOut==0">
                         <div @click='setIsSetOutOffer(item,1)'>取消发团 </div>
                       </el-dropdown-item>

src/components/myOrdersAllType/components/OrderList.vue

@@ -1115,6 +1115,9 @@ export default {
       } else {
         name = "groupTourOrderByTuan";
       }
+      if(this.userInfo.EmployeeId==1){
+        name = "RegistrationList";     
+      }
       this.$router.push({
         name: name,
         query: {