fix:经销商权限配置页面功能;报表客户融资明细表优化，增加集团类别字段，
This commit is contained in:
maliang
parent
7b1bae694e
commit
69666f4201
51
WebContent/AppConfig/OrgUserManage/DealerUserList.jsp
Normal file
51
WebContent/AppConfig/OrgUserManage/DealerUserList.jsp
Normal file
@ -0,0 +1,51 @@
|
||||
<%@ page contentType="text/html; charset=GBK"%><%@
|
||||
include file="/Frame/resources/include/include_begin_list.jspf"%><%
|
||||
/*经销商管理人员角色权限*/
|
||||
//通过显示模版产生模型对象doTemp
|
||||
String userId = CurPage.getUserId();
|
||||
ASObjectModel doTemp = new ASObjectModel("DealerUserList");
|
||||
String sCurPOrg=CurUser.getRelativeOrgID();
|
||||
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
|
||||
dwTemp.Style="1"; //设置DW风格 1:Grid 2:Freeform
|
||||
dwTemp.ReadOnly = "0"; //设置是否只读 1:只读 0:可写
|
||||
dwTemp.setPageSize(20);
|
||||
dwTemp.genHTMLObjectWindow("");
|
||||
String sButtons[][] = {
|
||||
{(CurUser.hasRole("099")||CurUser.hasRole("299")?"true":"false"),"","Button","新增用户","新增用户","newRecord()","","","","btn_icon_add"},
|
||||
{"true","","Button","删除用户","删除用户","deleteUser(0)","","","","btn_icon_invalid"}
|
||||
};
|
||||
%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
|
||||
<script type="text/javascript">
|
||||
function newRecord(){
|
||||
var userid="<%=CurUser.getUserID()%>";
|
||||
var selName="SelectDealerUserList";
|
||||
var param="userid,"+userid;
|
||||
AsDialog.OpenSelector(selName,param,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
|
||||
if(!sReturn||sReturn=="_CANCEL_"){
|
||||
return;
|
||||
}
|
||||
sReturn = sReturn.split("@");
|
||||
//alert(sReturn);
|
||||
var sReturnInfo = RunJavaMethodSqlca("com.amarsoft.app.awe.config.orguser.action.DealerUserListAction","addUser","loginid="+sReturn[1]);
|
||||
if(sReturnInfo == "SUCCESS"){
|
||||
alert("添加用户成功！");
|
||||
reloadSelf();
|
||||
}
|
||||
},"请选择合同");
|
||||
}
|
||||
<%/*~[Describe=从当前机构中删除该人员;]~*/%>
|
||||
function deleteUser(){
|
||||
var loginid = getItemValue(0,getRow(),"LOGINID");
|
||||
//alert(loginid);
|
||||
if(typeof(loginid) == "undefined" || loginid.length == 0){
|
||||
alert(getMessageText('AWEW1001'));//请选择一条信息！
|
||||
}else if(confirm("您真的想删除该用户吗？")){
|
||||
var sReturn = RunJavaMethodSqlca("com.amarsoft.app.awe.config.orguser.action.DealerUserListAction","deleteUser","loginid="+loginid);
|
||||
if(sReturn == "SUCCESS"){
|
||||
alert("删除用户成功！");
|
||||
reloadSelf();
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<%@ include file="/Frame/resources/include/include_end.jspf"%>
|
||||
@ -944,7 +944,20 @@
|
||||
<property name="table" value="RIGHT_INFO"/>
|
||||
</managerProperties>
|
||||
</manager>
|
||||
</class>
|
||||
</class>
|
||||
<class name="USER_AUTHORITY_CHECK" label="经销商管理人员角色权限表" keyAttributes="ROLEID">
|
||||
<attributes>
|
||||
<attribute name="ID" label="编号" type="INT" length="32"/>
|
||||
<attribute name="LOGINID" label="用户登录名" type="STRING" length="32"/>
|
||||
</attributes>
|
||||
<manager>
|
||||
<managerProperties>
|
||||
<property name="createKey" value="false"/>
|
||||
<!-- awe_row_info -->
|
||||
<property name="table" value="USER_AUTHORITY_CHECK"/>
|
||||
</managerProperties>
|
||||
</manager>
|
||||
</class>
|
||||
<class name="ROLE_INFO" label="角色表" keyAttributes="ROLEID">
|
||||
<attributes>
|
||||
<attribute name="ROLEID" label="角色编号" type="STRING" length="32"/>
|
||||
|
||||
@ -0,0 +1,54 @@
|
||||
package com.amarsoft.app.awe.config.orguser.action;
|
||||
|
||||
import com.amarsoft.awe.security.SecurityAudit;
|
||||
import com.amarsoft.awe.util.SqlObject;
|
||||
import com.amarsoft.awe.util.Transaction;
|
||||
import com.amarsoft.context.ASUser;
|
||||
|
||||
public class DealerUserListAction {
|
||||
|
||||
private String id;
|
||||
private String loginid;
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getLoginid() {
|
||||
return loginid;
|
||||
}
|
||||
|
||||
public void setLoginid(String loginid) {
|
||||
this.loginid = loginid;
|
||||
}
|
||||
|
||||
/**
|
||||
* 执行保存/删除/更新等操作,并记录用户角色变更信息
|
||||
* @param Sqlca
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
public String addUser(Transaction Sqlca) throws Exception{
|
||||
String insertSql="insert into user_authority_check(loginid) values ('"+loginid+"')";
|
||||
Sqlca.executeSQL(new SqlObject(insertSql));
|
||||
Sqlca.commit();
|
||||
return "SUCCESS";
|
||||
}
|
||||
|
||||
/**
|
||||
* 执行保存/删除/更新等操作,并记录用户角色变更信息
|
||||
* @param Sqlca
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
public String deleteUser(Transaction Sqlca) throws Exception{
|
||||
String deleteSql="delete from user_authority_check where loginid='"+loginid+"'";
|
||||
Sqlca.executeSQL(new SqlObject(deleteSql));
|
||||
Sqlca.commit();
|
||||
return "SUCCESS";
|
||||
}
|
||||
}
|
||||
23
src_jbo/jbo/sys/USER_AUTHORITY_CHECK.java
Normal file
23
src_jbo/jbo/sys/USER_AUTHORITY_CHECK.java
Normal file
@ -0,0 +1,23 @@
|
||||
package jbo.sys;
|
||||
|
||||
/**
|
||||
* 经销商管理人员角色权限表 - JBO命名常量类<br><br>
|
||||
* Note: This file is generated by ADE tools, <em>dont</em> modify it.<br>
|
||||
|
||||
*/
|
||||
public interface USER_AUTHORITY_CHECK {
|
||||
/**
|
||||
* 经销商管理人员角色权限表<br><br>
|
||||
* 代表本类映射的BizObjectClass
|
||||
*/
|
||||
public static final String CLASS_NAME = "jbo.sys.USER_AUTHORITY_CHECK";
|
||||
/**
|
||||
* ID编号 STRING(32)<br>
|
||||
*/
|
||||
public static final String ID = "ID";
|
||||
/**
|
||||
* 用户登录名 STRING(80)<br>
|
||||
*/
|
||||
public static final String LOGINID = "LOGINID";
|
||||
|
||||
}
|
||||
13
src_sql/投产SQL/v20201022/maliang20201112_已上线.sql
Normal file
13
src_sql/投产SQL/v20201022/maliang20201112_已上线.sql
Normal file
@ -0,0 +1,13 @@
|
||||
ALTER TABLE `apzl`.`user_authority_check`
|
||||
MODIFY COLUMN `id` int(11) NOT NULL AUTO_INCREMENT FIRST;
|
||||
|
||||
|
||||
INSERT INTO `apzl`.`awe_do_catalog`(`dono`, `doname`, `dodescribe`, `dotype`, `doclass`, `isinuse`, `colcount`, `modeid`, `jboclass`, `jbofrom`, `jbowhere`, `jbogroup`, `jboorder`, `businessprocess`, `exportflag`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `remark`, `isvalidate`, `parent`) VALUES ('DealerUserList', '经销商管理人员角色权限', NULL, '30090', NULL, '1', '2', 'default', 'jbo.sys.USER_AUTHORITY_CHECK', 'O left join jbo.awe.USER_INFO ui on ui.LOGINID=O.LOGINID ', '', NULL, ' O.id asc', NULL, NULL, 'SYS_Designer', '2018/05/28 15:23:01', 'SYS_Designer', '2018/05/31 09:42:29', NULL, '1', NULL);
|
||||
|
||||
INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('DealerUserList', '0010', '0010', '1', 'O', 'ID', 'ID', 'String', '', '数据编号', '', '1', 'Text', '1', '1', '', '', '', '32', '1', '1', '1', '1', '0', 0, NULL, '', '', 'SYS_Designer', '2018/06/07 14:58:12', 'administrator', '2020/11/05 15:33:03', NULL, '', '1', '', '', '', NULL);
|
||||
INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('DealerUserList', '0020', '0020', '1', 'O', 'LOGINID', 'LOGINID', 'String', '', '登录账号', '', '1', 'Text', '1', '1', '', '', '', '32', '1', '1', '0', '1', '1', 0, NULL, '', '', 'SYS_Designer', '2018/06/07 14:58:12', 'administrator', '2020/11/05 15:33:03', NULL, '', '1', '', '', '', NULL);
|
||||
INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('DealerUserList', '0030', '0030', '1', 'UI', 'USERNAME', 'UserName', 'String', NULL, '用户姓名', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '32', '1', '1', '0', '1', '1', 0, NULL, NULL, NULL, 'SYS_Designer', '2014/06/03 11:29:52', 'administrator', '2020/11/05 15:33:03', '0', NULL, '1', NULL, NULL, NULL, 'Like,Equals');
|
||||
INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('DealerUserList', '0040', '0040', '1', 'UI', 'BELONGORG', 'BelongOrg', 'String', NULL, '所属机构', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '32', '0', '0', '0', '1', NULL, 0, NULL, NULL, NULL, 'SYS_Designer', '2014/06/03 11:29:52', 'administrator', '2020/11/05 15:33:03', NULL, NULL, '1', NULL, NULL, NULL, NULL);
|
||||
INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('DealerUserList', '0050', '0050', '1', NULL, 'NameManager.getOrgName(BELONGORG)', 'BelongOrgName', 'String', NULL, '所属机构', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '80', '1', '1', '0', '1', '0', 0, NULL, NULL, 'BelongOrg', 'SYS_Designer', '2014/06/03 11:29:52', 'administrator', '2020/11/05 15:33:03', '0', NULL, '0', NULL, NULL, NULL, NULL);
|
||||
|
||||
INSERT INTO `apzl`.`select_catalog`(`selname`, `seltype`, `seldescribe`, `seltablename`, `selprimarykey`, `selbrowsemode`, `selargs`, `selhidefield`, `selcode`, `selfieldname`, `selfielddisp`, `selreturnvalue`, `selfilterfield`, `isinuse`, `mutilorsingle`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`) VALUES ('SelectDealerUserList', 'Sql', '经销商管理人员列表', 'USER_INFO', 'userid', 'Grid', 'String orgid', '', 'select O.userid,O.loginid,O.username,OI.orgname from USER_INFO O,ORG_INFO OI where OI.relativeorgid=\'8006\' and O.BELONGORG=OI.ORGID and O.loginid not in ( select loginid from user_authority_check )', '用户编号,登录账号,用户姓名,所属机构', 'userid@style={width:220px;}@orgname@style={width:220px;}', 'userid@loginid@username@orgname', 'userid,loginid,username', '1', 'Single', '', 'plan_money@Number@afact_money@Number@allfact_money@Number@fee_adjust@Number@overmoney@Number', 'plan_money@2@afact_money@2@allfact_money@2@fee_adjust@2@overmoney@2', '', '', 'SYS_Designer', '', '2019/05/16 11:52:07', 'SYS_Designer', '2019/05/16 11:52:07', '');
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user