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

src/components/FinancialModule/OPRules.vue

@@ -435,9 +435,11 @@
       },
 
       linkageDepartment(val) {
+        let userInfo = this.getLocalStorage()
+        let ParentCompanyId=userInfo.ParentCompanyId;
         this.departmentMsg.RB_Branch_Id = this.form.BranchId;
         this.form.DepartmentId = -1;
-        if (this.departmentMsg.RB_Branch_Id == 0) {
+        if (this.departmentMsg.RB_Branch_Id == ParentCompanyId) {
           this.stateShow = false;
           this.form.EmployeeIdList = [];
           this.form.FZLEmployeeIdList = [];

src/components/FinancialModule/addFinancialDocuments2.vue

@@ -1134,7 +1134,10 @@
             this.msg = JSON.parse(JSON.stringify(data));
             this.msg.ClientType = this.msg.ClientType==0?'':this.msg.ClientType;
             this.msg.ClientID = this.msg.ClientID==0?'':this.msg.ClientID;
-            this.msg.RB_Branch_Id = this.msg.RB_Branch_Id==0?this.getLocalStorage().RB_Branch_id:this.msg.RB_Branch_Id;
+            let userInfo = this.getLocalStorage()
+            let ParentCompanyId=userInfo.ParentCompanyId;
+
+            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/FinancialModule/addFinancialGZDocuments.vue

@@ -1203,7 +1203,10 @@ export default {
                     data.IsLeader = 1;
                     this.msg = JSON.parse(JSON.stringify(data));
                     this.msg.ClientType = this.msg.ClientType==0?'':this.msg.ClientType;
-                    this.msg.RB_Branch_Id = this.msg.RB_Branch_Id==0?this.getLocalStorage().RB_Branch_id:this.msg.RB_Branch_Id;
+                    let userInfo = this.getLocalStorage()
+                    let ParentCompanyId=userInfo.ParentCompanyId;
+
+                    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/FinancialModule/addReceivablesDocuments.vue

@@ -1359,7 +1359,10 @@ export default {
                     this.msg.BankList.push(obj)
                     this.msg.detailList=[];
 
-                    this.msg.RB_Branch_Id = this.msg.RB_Branch_Id==0?this.getLocalStorage().RB_Branch_id:this.msg.RB_Branch_Id;
+                    let userInfo = this.getLocalStorage()
+                    let ParentCompanyId=userInfo.ParentCompanyId;
+
+                    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/FinancialModule/addReceivablesDocuments2.vue

@@ -1247,7 +1247,10 @@
             this.msg.BankList.push(obj)
             this.msg.detailList=[];
 
-            this.msg.RB_Branch_Id = this.msg.RB_Branch_Id==0?this.getLocalStorage().RB_Branch_id:this.msg.RB_Branch_Id;
+            let userInfo = this.getLocalStorage()
+            let ParentCompanyId=userInfo.ParentCompanyId;
+
+            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/SalesModule/groupTourOrder.vue

@@ -1805,12 +1805,12 @@
                         <span v-else>{{$t('salesModule.LossReceipt')}}</span>
                       </div>
                       <!-- item.confirmFileList.length>0 && ((item.receivableMoney - item.invoiceApplyTotal) > 0) -->
-                      <div v-if='(item.confirmFileList.length>0||item.contractNum.length>0) && ((item.receivableMoney - item.invoiceApplyTotal) > 0)'
+                      <div v-if='(item.confirmFileList.length>0||item.contractNum.length>0) && ((item.receivableMoney - item.invoiceApplyTotal) > 0) && F_InvoiceManagement'
                         @click='goUrlAdd("invoicesManagerAdd", item.orderId, item.tcid, item.customerId, 1)'>{{$t('salesModule.ApplyInvoice')}}</div>
                       <div
                         @click='Discount(item.tcid),SOMsg.OrderId = item.orderId,SOMsg.OrderUnitPrice  = item.unit_Price'>
                         {{$t('pub.ApplyYH')}}</div>
-                      <div
+                      <div v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create"
                         @click='ShenQingPhoto(item)'>
                         {{$t('salesModule.ApplyPhoto')}}</div>
                       <div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3') && item.isCanClear==0"
@@ -1828,8 +1828,8 @@
                   </el-popover>
                 </el-tooltip>
               </el-button-group>
-              <payurlItem v-if="item.commissionSharePeople !== userId&&item.airConfirm!=2" :item="item" :showID="showID" :photoF="item.photoNum>0"
-                v-show="item.orderState!='4'&&item.orderState!='3'" v-on:childByValue="childByValue"></payurlItem>
+              <payurlItem v-if="item.commissionSharePeople !== userId && item.airConfirm!=2" :item="item" :showID="showID" :photoF="item.photoNum>0"
+                v-show="item.orderState!='4'&&item.orderState!='3' && (qjGroupId==userInfo.RB_Group_id || F_Finance_Create)" v-on:childByValue="childByValue"></payurlItem>
             </td>
           </tr>
           <tr style="height:20px">
@@ -1857,7 +1857,7 @@
                     </span>
 
               </div>
-              <div v-if="item.contractNum.length==0&&item.confirmFileList.length==0">
+              <div v-if="item.contractNum.length==0&&item.confirmFileList.length==0&&qjGroupId==userInfo.RB_Group_id">
                 <span class="GO_Contract" @click="goContract(item,{})">{{$t('salesModule.GetContract')}}</span>
               </div>
               <div v-else>
@@ -2362,7 +2362,11 @@
         SQguestList: [],
         SQcheckdAll: true,
         SQPhotoNum: '',
-        SQOrderId: ''
+        SQOrderId: '',
+        F_InvoiceManagement:false,//发票权限
+        qjGroupId:-1,
+        F_Finance_Create:false,//制单权限
+        userInfo:{},
       }
     },
     components: {
@@ -2390,6 +2394,22 @@
       }
     },
     methods: {
+      GetSupperOrderEditAuth() {
+            var actionCode = this.$AuthCode.F_InvoiceManagement;
+            var actionCodeNew = this.$AuthCode.F_Finance_Create;
+            // 发票
+            this.CheckUserAuth(actionCode, res => {
+            if (res.data.resultCode == 1 && res.data.data == 1) {
+                this.F_InvoiceManagement = true;
+            }
+            });
+            // 制单权限
+            this.CheckUserAuth(actionCodeNew, res => {
+            if (res.data.resultCode == 1 && res.data.data == 1) {
+                this.F_Finance_Create = true;
+            }
+            });
+        },
       SpecialAppPost(){
         if (this.SpecialAppMsg.ApplyReason === '') {
           return this.$message.error('请填写申请说明')
@@ -4258,8 +4278,10 @@
       },
     },
     mounted() {
+      this.qjGroupId=this.QjGroupId();
       this.GetEditOrderCreateByAuth();
       let userInfo=this.getLocalStorage();
+      this.userInfo=this.getLocalStorage();
       let userMenuCode = ',' + userInfo.ActionMenuCode + ',';
       this.TransferMission = userMenuCode.indexOf(',Sale_TurnGroup,') != -1 ? true : false;
       this.userId = this.getLocalStorage().EmployeeId
@@ -4279,6 +4301,7 @@
       this.getDdztList()
       this.getJyfs()
       this.getFylx()
+      this.GetSupperOrderEditAuth();
     },
 
 

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1924,7 +1924,7 @@
                         <div v-if="item.orderState==2"
                           @click='Discount(item.tcid),SOMsg.OrderId = item.orderId,SOMsg.OrderUnitPrice  = item.unit_Price'>
                           申请优惠</div>
-                        <div @click='ShenQingPhoto(item)'>
+                        <div v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" @click='ShenQingPhoto(item)'>
                           申请照片</div>
                         <div
                           v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')&& item.isCanClear==0"
@@ -1944,7 +1944,7 @@
                   </el-tooltip>
                 </el-button-group>
                 <payurlItem v-if='item.isOwn==1&&item.airConfirm!=2' :item="item" :showID="showID"
-                  :photoF="item.photoNum>0" v-show="item.orderState!='4'&&item.orderState!='3'"
+                  :photoF="item.photoNum>0" v-show="item.orderState!='4'&&item.orderState!='3' && (qjGroupId==userInfo.RB_Group_id || F_Finance_Create)"
                   v-on:childByValue="childByValue"></payurlItem>
               </td>
             </tr>
@@ -2567,6 +2567,9 @@
   export default {
     data() {
       return {
+        userInfo:{},
+        qjGroupId:-1,
+        F_Finance_Create:false,//制单权限
         IsSupperOrderEdit:false,//获取总经理副总经理超级修改权限
         IsLookOrder:false,//出纳查看订单权限
         //修改业务员权限，1-有
@@ -5027,11 +5030,17 @@
       // 获取总经理副总经理超级修改权限
       GetSupperOrderEditAuth() {
       var actionCode = this.$AuthCode.SupperOrderEdit;
+      var actionCodeNew = this.$AuthCode.F_Finance_Create;
         this.CheckUserAuth(actionCode, res => {
           if (res.data.resultCode == 1 && res.data.data == 1) {
             this.IsSupperOrderEdit = true;
           }
         });
+        this.CheckUserAuth(actionCodeNew, res => {
+          if (res.data.resultCode == 1 && res.data.data == 1) {
+            this.F_Finance_Create = true;
+          }
+        });
       },
       // 出纳查看订单权限
       GetLookOrderAuth() {
@@ -5044,10 +5053,12 @@
       },
     },
     mounted() {
+      this.qjGroupId=this.QjGroupId();
       this.GetLookOrderAuth();
       this.GetSupperOrderEditAuth();
       this.GetEditOrderCreateByAuth();
       let userInfo = this.getLocalStorage();
+      this.userInfo = this.getLocalStorage();
       let userMenuCode = ',' + userInfo.ActionMenuCode + ',';
       this.TransferMission = userMenuCode.indexOf(',Sale_TurnGroup,') != -1 ? true : false;
       this.userId = this.getLocalStorage().EmployeeId;

src/components/SalesModule/planeTourOrder.vue

@@ -1306,7 +1306,7 @@
 								</el-popover>
 							</el-tooltip>
 						</el-button-group>
-						<payurlItem v-if="item.commissionSharePeople !== userId" :item="item" :showID="showID" v-show="item.orderState!='4'&&item.orderState!='3'&&!(item.tradeWay=='1'&&item.platformOrder=='')" v-on:childByValue="childByValue"></payurlItem>
+						<payurlItem v-if="item.commissionSharePeople !== userId" :item="item" :showID="showID" v-show="item.orderState!='4'&&item.orderState!='3'&&!(item.tradeWay=='1'&&item.platformOrder=='') && (qjGroupId==userInfo.RB_Group_id || F_Finance_Create)" v-on:childByValue="childByValue"></payurlItem>
 					</td>
 				</tr>
 				<tr>
@@ -1401,6 +1401,9 @@ import payURL1 from "../commonPage/payURL1.vue";
 export default {
   data() {
     return {
+      userInfo:{},
+      qjGroupId:-1,
+      F_Finance_Create:false,//制单
       pickerOptions0: {
         disabledDate: time => {
           let starTime = new Date(this.starTime);
@@ -1608,7 +1611,7 @@ export default {
           OldTCNUM: '',
           TCNUM: ''
         }
-      }
+      },
     };
   },
   components: {
@@ -1630,6 +1633,15 @@ export default {
     }
   },
   methods: {
+     GetSupperOrderEditAuth() {
+            var actionCodeNew = this.$AuthCode.F_Finance_Create;
+            // 制单权限
+            this.CheckUserAuth(actionCodeNew, res => {
+            if (res.data.resultCode == 1 && res.data.data == 1) {
+                this.F_Finance_Create = true;
+            }
+            });
+        },
     // 订单转团
     transfer: function (item) {
       this.transferData.info.OrderId = item.orderId
@@ -2585,11 +2597,15 @@ export default {
     }
   },
   mounted() {
+    this.qjGroupId=this.QjGroupId();
+    this.userInfo=this.getLocalStorage();
     this.userId = this.getLocalStorage().EmployeeId;
+    
     if (this.$route.query.id) {
       this.msg.tempOrderId = this.$route.query.id;
     }
     this.msg.QStartDate=new Date().Format('yyyy-MM-dd');
+    this.GetSupperOrderEditAuth();
     this.getEmployee();
     this.getList();
     this.getLineList();
@@ -2600,6 +2616,7 @@ export default {
     this.getDdztList();
     this.getJyfs();
     this.getFylx();
+
   }
 };
 </script>

src/components/SalesVisa/VisaProductEditOrder.vue

@@ -171,7 +171,7 @@
 			               <el-button v-show='item.visaManagementId>0' type="primary"  style='background:#00a1f1; border-color:#00a1f1' @click='goUrlT(item)'  icon="iconfont icon-bumen"></el-button>
 			             </el-tooltip>
 									 <el-tooltip effect="dark" :content="$t('salesModule.ApplyInvoice')" placement="top-start">
-			               <el-button type="primary"  style='background:#607D8B; border-color:#607D8B' @click='goUrlAdd("invoicesManagerAdd", item.id, item.visaId, item.CustomerId, 2)' icon="iconfont icon-rizhi1"></el-button>
+			               <el-button v-if="F_InvoiceManagement" type="primary"  style='background:#607D8B; border-color:#607D8B' @click='goUrlAdd("invoicesManagerAdd", item.id, item.visaId, item.CustomerId, 2)' icon="iconfont icon-rizhi1"></el-button>
 			             </el-tooltip>
 						  <el-tooltip v-if="item.income<=0&&(item.visaOrderStatus==1||item.visaOrderStatus==3)"  class="item" effect="dark" :content="$t('pub.cancelBtn')" placement="top-start">
 			              <el-button type="primary" style='background:#E95252; border-color:#E95252;' icon="iconfont icon-xingzhuangkaobei" @click='cancelOrder(item)'></el-button>
@@ -377,6 +377,7 @@
 export default {
     data(){
         return{
+			F_InvoiceManagement:false,
 			// pickerOptions: {
 			// 	disabledDate: (time) => {
 			// 		let endTime=new Date(this.SendStartDate)
@@ -439,6 +440,14 @@ export default {
             currentPage: 1,
         }
     },methods:{
+		GetSupperOrderEditAuth() {
+            var actionCode = this.$AuthCode.F_InvoiceManagement;
+            this.CheckUserAuth(actionCode, res => {
+            if (res.data.resultCode == 1 && res.data.data == 1) {
+                this.F_InvoiceManagement = true;
+            }
+            });
+        },
 		goUrlFinance(name, path, id, tcmun) {
       this.$router.push({ name: path, query: { id: id, tcmun: tcmun, blank: 'y', tab: name} });
 	},
@@ -688,7 +697,8 @@ export default {
     },mounted(){
         this.getList()
         this.getChinaAirportList()
-        this.getJapanAirportList()             
+		this.getJapanAirportList()    
+		this.GetSupperOrderEditAuth();         
     }
 }
 </script>

src/components/administrative/CommissionManagement.vue

@@ -18,7 +18,7 @@
     <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
       <tr>
         <th>期数</th>
-        <th v-if="userInfo.RB_Branch_id==0 || userInfo.RB_Branch_id==49">提成总金额</th>
+        <th v-if="userInfo.RB_Branch_id==0 || userInfo.RB_Branch_id==49 || userInfo.RB_Branch_id==userInfo.ParentCompanyId">提成总金额</th>
         <th>{{$t('admin.admin_czPerson')}}</th>
         <th>所属公司提成</th>
         <th>财务单据</th>
@@ -27,7 +27,7 @@
       </tr>
       <tr v-for="(item,index) in dataList" :key="index">
         <td>{{item.periods}}</td>
-        <td v-if="userInfo.RB_Branch_id==0 || userInfo.RB_Branch_id==49">{{item.sumPrice.toFixed(2)}}</td>
+        <td v-if="userInfo.RB_Branch_id==0 || userInfo.RB_Branch_id==49 || userInfo.RB_Branch_id==userInfo.ParentCompanyId">{{item.sumPrice.toFixed(2)}}</td>
         <td>{{item.createByStr}}</td>
         <td>{{item.branchMoney.toFixed(2)}}</td>
         <td>
@@ -164,7 +164,7 @@
           IsUploadPic: 1,
           orderObj: JSON.stringify(obj)
         }
-        if (this.userInfo.RB_Branch_id == 0) {
+        if (this.userInfo.RB_Branch_id == 0 || this.userInfo.RB_Branch_id ==this.userInfo.ParentCompanyId) {
           query.id = 28
           query.Name = "总部销售提成单"
         } else {

src/plug/index.js

@@ -12,6 +12,10 @@ export default {
   install(Vue, options) {
     Vue.prototype.MsgBus = MsgBus;
     Vue.prototype.md5 = md5;
+    Vue.prototype.QjGroupId = function (msg) {
+      let GroupId=2;
+      return GroupId;
+    },
     Vue.prototype.orderBy = function (source, orders, type) {
         if (
           source instanceof Array &&