Merge branch 'develop' of http://114.115.138.98:8900/isc-v3.1/isc-web-vue into develop

src/page/Funds/Fxtfcm/views/index.vue

 <template>
   <div class="eContainer">
-        <c-content>
-    <el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" size="small" :validate-on-rule-change="false">
+        <c-page title="结售汇平盘确认">
+    <el-form
+        :model="model"
+        :rules="rules"
+        ref="modelForm"
+        label-width="150px"
+        label-position="right"
+        size="small"
+        :validate-on-rule-change="false"
+    >
        <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
                    <!--fxtfcm PD000001 Confirmation -->
            <el-tab-pane label="概要" name="cnfp">
                 <m-cnfp :model="model" :codes="codes"/>
            </el-tab-pane>
+
+
             <!--fxtfcm PD000023 MT300 -->
            <el-tab-pane label="MT300" name="mt300">
                 <m-mt300 :model="model" :codes="codes"/>
@@ -25,7 +35,7 @@
         @handleSureWarning="handleSureWarning"
         ref="commonBtn"
       ></c-function-btn>
-         </c-content>
+         </c-page>
   </div>
 </template>
 <script>

src/page/Funds/Fxtlop/views/index.vue

 <template>
   <div class="eContainer">
-  <c-page title="结售汇平盘确认">
+  <c-page title="结售汇平盘登记">
     <el-form
       :model="model"
       :rules="rules"
@@ -12,7 +12,7 @@
     >
       <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
         <!--fxtlop PD000001 Registration -->
-        <el-tab-pane label="Registration" name="regp">
+        <el-tab-pane label="概要" name="regp">
           <m-regp :model="model" :codes="codes" />
         </el-tab-pane>
         <!--PD000027 -->

src/utils/vuefunc.js

@@ -102,7 +102,8 @@ export function isPubJinB(){
 	let role=JSON.parse(window.sessionStorage.curRole)
 	let roleId=role.id+"";
 	let parentRoleId=role.parentRoleId+"";
-	if (roleId==="10265" || parentRoleId==="10265" ){
+	console.log("aaaaaa",window.sessionStorage.curRole,"bbbbbbb",role,"ccccccccccc",roleId,"ddddddddd",parentRoleId);
+	if (roleId==="10265" || roleId==="1502" || roleId==="10231" || parentRoleId==="10265" ){
 		return true;
 	}
 	return false;