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

src/assets/utils/AuthCode.js

@@ -11,6 +11,12 @@ var AuthCode = {
     SupperOrderEdit:"SupperOrderEdit",//获取总经理副总经理超级修改权限
     LookOrder:"LookOrder",//出纳查看订单权限
     LookAllTeam:"LookAllTeam",//查看所有团控
-    V_PersonalCenter:"V_PersonalCenter",//个人中心导航查看权限
+    V_PersonalCenter:"V_PersonalCenter",//个人中心导航查看权限,
+    F_InvoiceManagement:'F_InvoiceManagement', //发票
+    F_Finance_Create:'F_Finance_Create',//制单权限
+    F_ContractManagement:'F_ContractManagement',//合同
+    F_PayMoney_CapitalPool:'F_PayMoney_CapitalPool',//账户类型
+    S_Travel_Share:'S_Travel_Share',//广告分享
+
 };
 export default AuthCode;
\ No newline at end of file

src/components/FinancialModule/BasicDocuments.vue

@@ -1495,7 +1495,7 @@ export default {
             CostTypeState:false,
             LeadState:false,
             huijiShow:false,
-            CapitalPool:false,
+            F_PayMoney_CapitalPool:false,
         }
     },
     components:{
@@ -2525,7 +2525,7 @@ export default {
             var actionCode = this.$AuthCode.F_PayMoney_CapitalPool;
             this.CheckUserAuth(actionCode, res => {
             if (res.data.resultCode == 1 && res.data.data == 1) {
-                this.CapitalPool = true;
+                this.F_PayMoney_CapitalPool = true;
             }
             });
         },
@@ -2533,7 +2533,7 @@ export default {
             this.apipost('AccountType_post_GetList',this.queryAccMsg,res=>{
                 if(res.data.resultCode==1){
                     let data=res.data.data;
-                    if(this.CapitalPool || this.RB_Post_Id==5 || this.userId==1648 || this.userId==1918 || this.userId==2113 || this.userId==2424){
+                    if(this.F_PayMoney_CapitalPool || this.RB_Post_Id==5 || this.userId==1648 || this.userId==1918 || this.userId==2113 || this.userId==2424){
                         this.AccList = res.data.data;
                     }else{
                         data.forEach(item=>{

src/components/SalesModule/productQuery.vue

@@ -866,7 +866,7 @@
                       <img style="float: left; width: 108px; height: 108px;margin: 10px 21px 3px;" :src="item.wxImage===''?'':'data:image/png;base64,'+item.wxImage" />
                       <p style="text-align: center; font-size: 12px; color: #666;">{{$t('salesModule.XCX')}}</p>
                     </div>
-                    <el-button slot="reference" type="primary" style='background:#B552E9; border-color:#B552E9;border-radius:0;border-top-left-radius: 4px;border-bottom-left-radius: 4px;'
+                    <el-button v-if="qjGroupId==userInfo.RB_Group_id || S_Travel_Share" slot="reference" type="primary" style='background:#B552E9; border-color:#B552E9;border-radius:0;border-top-left-radius: 4px;border-bottom-left-radius: 4px;'
                       icon="iconfont icon-fenxiang" @click="getWxCode(index)"></el-button>
                   </el-popover>
                 </el-tooltip>
@@ -876,12 +876,12 @@
                       <img style="float: left; width: 108px; height: 108px;margin: 10px 21px 3px;" :src="'data:image/png;base64,'+item.AppImage" />
                       <p style="text-align: center; font-size: 12px; color: #666;">{{$t('salesModule.Helper')}}</p>
                     </div>
-                    <el-button slot="reference" type="primary" style='background:#E6A014; border-color:#E6A014;border-radius: 0;'
+                    <el-button v-if="qjGroupId==userInfo.RB_Group_id || S_Travel_Share" slot="reference" type="primary" style='background:#E6A014; border-color:#E6A014;border-radius: 0;'
                       icon="iconfont icon-erweima"></el-button>
                   </el-popover>
                 </el-tooltip>
                 <el-tooltip class="item" effect="dark" :content="'广告数量'+item.AdvertCount" placement="top-start">
-                  <el-button type="primary" style='background:#E95252; border-color:#E95252' v-if="!TCIDList" icon="iconfont icon-guanggao"
+                  <el-button type="primary" style='background:#E95252; border-color:#E95252' v-if="!TCIDList && (qjGroupId==userInfo.RB_Group_id || S_Travel_Share)" icon="iconfont icon-guanggao"
                     @click="goUrlX(item)"></el-button>
                 </el-tooltip>
               </el-button-group>
@@ -1144,6 +1144,9 @@
         },
         PlatformAccountList1:[],
         PlatformAccountList2:[],
+        qjGroupId:-1,
+        S_Travel_Share:false,//分享权限
+        userInfo:{},
 
       }
     },
@@ -1190,6 +1193,16 @@
       }
     },
     methods: {
+      GetSupperOrderEditAuth() {
+            var actionCode = this.$AuthCode.S_Travel_Share;
+            this.CheckUserAuth(actionCode, res => {
+            if (res.data.resultCode == 1 && res.data.data == 1) {
+                this.F_InvoiceManagement = true;
+            }
+            });
+         
+
+        },
       setDanren(e){
         e === this.addMsg.OneSex ? this.addMsg.OneSex = 0 : this.addMsg.OneSex = e
       },
@@ -2372,6 +2385,9 @@
     },
     mounted() {
       let userInfo = this.getLocalStorage();
+      this.userInfo = this.getLocalStorage();
+      this.GetSupperOrderEditAuth();
+      this.qjGroupId=this.QjGroupId();
       this.CurrentUserInfo = userInfo;
       this.userId = userInfo.EmployeeId
       this.msg.BranchId = userInfo.RB_Branch_id.toString()