1.用户组调整为角色

src/main/webapp/HP/PZ/HPPZ009.jsp

@@ -17,15 +17,15 @@
 		<EF:EFGrid blockId="result" autoDraw="override" checkMode="row">
 			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
 			<EF:EFColumn cname="企业编码" ename="companyCode" enable="false" width="120" align="center"/>
-			<EF:EFColumn cname="企业名称" ename="companyName" width="140" editType="textarea" required="true"/>
+			<EF:EFColumn cname="企业名称" ename="companyName" width="140" required="true"/>
 			<EF:EFComboColumn cname="是否启用" ename="validFlag" width="80" align="center" required="true">
 				<EF:EFCodeOption codeName="hpjx.hppz.validFlag"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn cname="备注" ename="remark" width="150" editType="textarea"/>
-			<EF:EFColumn cname="创建人名称" ename="createdName" enable="false" align="center"/>
+			<EF:EFColumn cname="创建人" ename="createdName" enable="false" align="center"/>
 			<EF:EFColumn cname="创建时间" ename="createdTime" enable="false" width="140" align="center"
 			             editType="datetime" parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"/>
-			<EF:EFColumn cname="修改人名称" ename="updatedName" enable="false" align="center"/>
+			<EF:EFColumn cname="修改人" ename="updatedName" enable="false" align="center"/>
 			<EF:EFColumn cname="修改时间" ename="updatedTime" enable="false" width="140" align="center"
 			             editType="datetime" parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"/>
 		</EF:EFGrid>

src/main/webapp/XS/XS30.jsp

@@ -16,7 +16,7 @@
                     <span class="my-text" id="my-text1">用户管理</span>
                 </button>
                 <button id="my-button-2" class="my-button" onclick="switchWindow(1)">
-                    <span class="my-text" id="my-text2">用户组管理</span>
+                    <span class="my-text" id="my-text2">角色管理</span>
                 </button>
             </div>
 

src/main/webapp/XS/XS3001.jsp

@@ -109,7 +109,7 @@
             <div class="col-md-12" style="padding-left: 0;padding-right: 0">
                 <EF:EFTab id="authInfo" showClose="false">
 
-                    <div title="所属用户组">
+                    <div title="所属角色">
                         <EF:EFInput blockId="inqu_status" row="0" ename="userIdForParentGroups" cname="登录账号"
                                     type="hidden"/>
                         <EF:EFGrid blockId="result1" queryMethod="queryUserParentGroups" autoDraw="no" autoBind="false">

src/main/webapp/XS/XS32.jsp

@@ -13,7 +13,7 @@
         <div class="my-head">
             <div id="my-front">
                 <button id="my-button-1" class="my-button" onclick="switchWindow(1)">
-                    <span class="my-text" id="my-text1">用户组授权</span>
+                    <span class="my-text" id="my-text1">角色授权</span>
                 </button>
                 <%--<button id="my-button-2" class="my-button" onclick="switchWindow(2)">
                     <span class="my-text" id="my-text2">资源授权</span>

src/main/webapp/XS/XS3201.jsp

@@ -28,13 +28,13 @@
     <div id="splitter" class="i-fit-height">
         <div id="left-pane" class="i-fit-height">
             <div class="col-md-12" style="padding-left: 0;padding-right: 8px">
-                <EF:EFRegion id="inqu" title="用户组信息" style="padding-left:0;padding-right:0" fitHeight="true">
+                <EF:EFRegion id="inqu" title="角色信息" style="padding-left:0;padding-right:0" fitHeight="true">
                     <%--        <EF:EFRegion id="inqu" title="用户组查询" type="query" efRegionShowClear="true" efRegionSave="true"--%>
                     <%--                     style="padding-left:0;padding-right:0">--%>
                     <div class="row" id="inquRegion">
-                        <EF:EFInput ename="inqu_status-0-groupEname" cname="用户组英文名" placeholder="请输入用户组英文名"
+                        <EF:EFInput ename="inqu_status-0-groupEname" cname="角色英文名" placeholder="请输入角色英文名"
                                     colWidth="6"/>
-                        <EF:EFInput ename="inqu_status-0-groupCname" cname="用户组中文名" placeholder="请输入用户组中文名"
+                        <EF:EFInput ename="inqu_status-0-groupCname" cname="角色中文名" placeholder="请输入角色中文名"
                                     colWidth="6"/>
                     </div>
                     <hr>
@@ -44,10 +44,10 @@
                         <EF:EFGrid blockId="result" autoDraw="no" serviceName="XS02" personal="true" checkMode="single">
                             <EF:EFColumn ename="groupId" cname="用户群组ID" readonly="false" hidden="true"
                                          primaryKey="true"/>
-                            <EF:EFColumn ename="groupEname" cname="用户组英文名" style="text-align:left;" readonly="true"
+                            <EF:EFColumn ename="groupEname" cname="角色英文名" style="text-align:left;" readonly="true"
                                          data-regex="/^[@_a-zA-Z0-9]{1,32}$/"
-                                         data-errorprompt="对不起,用户组英文名只能是32位英文字母或数字字符或下划线或@符"/>
-                            <EF:EFColumn ename="groupCname" cname="用户组中文名" style="text-align:left;" readonly="true"/>
+                                         data-errorprompt="对不起,角色英文名只能是32位英文字母或数字字符或下划线或@符"/>
+                            <EF:EFColumn ename="groupCname" cname="角色中文名" style="text-align:left;" readonly="true"/>
                             <EF:EFColumn ename="manageGroupEname" cname="管辖组英文名" style="text-align:left;"
                                          hidden="true"/>
                             <EF:EFColumn ename="manageGroupCname" cname="管辖组中文名" style="text-align:left;"
@@ -92,7 +92,7 @@
                     </EF:EFRegion>
                     <hr style="margin-top: 4px">
                     <div class="i-region-header" style="padding-left: 8px; display: flex;">
-                        <span>用户组成员</span>
+                        <span>角色成员</span>
                     </div>
                     <%--        <EF:EFRegion id="userTable" title="用户组成员" style="overflow-y:auto">--%>
                     <EF:EFGrid blockId="resultB" autoDraw="false" autoBind="false" serviceName="XS3002"