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

src/assets/utils/AuthCode.js

@@ -31,5 +31,6 @@ var AuthCode = {
     S_Travel_AirLoss:'S_Travel_AirLoss', //设为损失
     S_CheckAllOrder:'s_CheckAllOrder', //查看所有订单
     F_EditDeleteGuest:"F_EditDeleteGuest",//修改删除旅客和名单权限
+    LookPlatformAccountPwd:"LookPlatformAccountPwd",//查看平台账户密码权限
 };
 export default AuthCode;
\ No newline at end of file

src/components/FinancialModule/PlatformAccount.vue

@@ -9,7 +9,7 @@
     components: { PlatformAccount },
     data() {
       return {
-        pagesTitle:'平台账户',
+        pagesTitle:'',
       };
     },
     methods: {

src/components/FinancialModule/PlatformAccount/index.vue

@@ -59,7 +59,7 @@
             @click="resetPageIndex(),getList()"
           >-->
           <input type="button" class="normalBtn" :value="$t('pub.addBtn')"
-            @click="addShow=true,text=$t('pub.addBtn'),ed=false">
+            @click="addShow=true,text=$t('pub.addBtn'),ed=false,isLookPlatformAccountPwd=true">
           <input type="button" class="normalBtn" @click="downMuban()" :value="$t('visa.v_daochu')">
         </li>
       </ul>
@@ -261,7 +261,7 @@
               <el-input v-model="addMsg.PlatformNo" maxlength="20"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4" :gutter="35">
+            <el-col :span="4" :gutter="35" v-if="isLookPlatformAccountPwd">
               <el-form-item label="平台密码：" prop="PlatFormPwd">
                 <el-input v-model="addMsg.PlatFormPwd" class></el-input>
               </el-form-item>
@@ -271,6 +271,7 @@
                 <el-input v-model="addMsg.PlatFormUrl" class></el-input>
               </el-form-item>
             </el-col>
+
           <el-col :span="4" :gutter="35">
             <el-form-item label="保证金单号：" prop="FinanceNo">
               <el-input v-model="addMsg.FinanceNo" maxlength="50"></el-input>
@@ -588,6 +589,7 @@
     props:['pagesTitle'],
     data() {
       return {
+        isLookPlatformAccountPwd: false,//账户密码权限
         isExamine: false,
         columns: [],
         remoteLoading: false,
@@ -1321,6 +1323,14 @@
               this.addMsg.SettlementType = this.addMsg.SettlementType.toString()
               this.addMsg.BindBankID = this.addMsg.BindBankID == -1 ? null : this.addMsg.BindBankID
               this.remoteQueryBankMethod(this.addMsg.BindBankName)
+
+              let userInfo = this.getLocalStorage();
+              let ActionMenuCode = userInfo.ActionMenuCode;
+              if(userInfo.EmployeeId==this.addMsg.CreateBy||ActionMenuCode.indexOf('isManageFinance') != -1){
+                this.isLookPlatformAccountPwd = true
+              }else{
+                this.isLookPlatformAccountPwd = false
+              }
             } else {
               this.tips(res.data.message, "error");
             }
@@ -1660,6 +1670,7 @@
       this.getLineList()
       this.msg.pageSize = this.calcPageSize(40);
       let userInfo = this.getLocalStorage();
+
       this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
       var branchId = userInfo.RB_Branch_id;
       this.addMsg.BranchIdS = branchId;