Home Explore Help
Register Sign In
wenhongquan
/
cas
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

`fix`

wenhongquan 2 years ago
parent
70e336f6a0
commit
6c36dad56f
43 changed files with 234 additions and 312 deletions
Split View Show Diff Stats
  1. BIN
      src/cas_v0.2.0.1/build/cas-0.2.0.1.war
  2. 2 2
      src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/classes/META-INF/resources/WEB-INF/oss/cas/cas_personnel.jsp
  3. 3 1
      src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/classes/META-INF/resources/WEB-INF/oss/cas/member.jsp
  4. 0 225
      src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/classes/META-INF/resources/WEB-INF/oss/cas/member_list.jsp
  5. 1 1
      src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/classes/META-INF/resources/WEB-INF/oss/cas/user_apply.jsp
  6. 30 2
      src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/classes/META-INF/resources/js/cas/ljc_0.2.js
  7. 28 12
      src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/classes/META-INF/resources/js/cas/oss/cas_personnel.js
  8. 4 4
      src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/classes/bak/config-lsp.properties
  9. BIN
      src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/classes/com/loygra/cas/controller/oss/CasOssController.class
  10. BIN
      src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/classes/com/loygra/cas/controller/oss/CasOssViewController.class
  11. 4 4
      src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/classes/config-lsp.properties
  12. 2 2
      src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/classes/log4j.properties
  13. BIN
      src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/classes/tpl/xls/member_list.xls
  14. BIN
      src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/lib/loygra-lls-papaya-0.2.0.jar
  15. BIN
      src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/lib/loygra-lsp-0.6.5.jar
  16. 2 2
      src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/oss/cas/cas_personnel.jsp
  17. 3 1
      src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/oss/cas/member.jsp
  18. 3 1
      src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/oss/cas/member_list.jsp
  19. 1 1
      src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/oss/cas/user_apply.jsp
  20. 30 2
      src/cas_v0.2.0.1/build/cas-0.2.0.1/js/cas/ljc_0.2.js
  21. 28 12
      src/cas_v0.2.0.1/build/cas-0.2.0.1/js/cas/oss/cas_personnel.js
  22. 2 2
      src/cas_v0.2.0.1/build/classes/META-INF/resources/WEB-INF/oss/cas/cas_personnel.jsp
  23. 3 1
      src/cas_v0.2.0.1/build/classes/META-INF/resources/WEB-INF/oss/cas/member.jsp
  24. 3 1
      src/cas_v0.2.0.1/build/classes/META-INF/resources/WEB-INF/oss/cas/member_list.jsp
  25. 1 1
      src/cas_v0.2.0.1/build/classes/META-INF/resources/WEB-INF/oss/cas/user_apply.jsp
  26. 30 2
      src/cas_v0.2.0.1/build/classes/META-INF/resources/js/cas/ljc_0.2.js
  27. 28 12
      src/cas_v0.2.0.1/build/classes/META-INF/resources/js/cas/oss/cas_personnel.js
  28. 4 4
      src/cas_v0.2.0.1/build/classes/bak/config-lsp.properties
  29. BIN
      src/cas_v0.2.0.1/build/classes/com/loygra/cas/controller/oss/CasOssController.class
  30. BIN
      src/cas_v0.2.0.1/build/classes/com/loygra/cas/controller/oss/CasOssViewController.class
  31. 4 4
      src/cas_v0.2.0.1/build/classes/config-lsp.properties
  32. 2 2
      src/cas_v0.2.0.1/build/classes/log4j.properties
  33. 1 1
      src/cas_v0.2.0.1/build/maven-archiver/pom.properties
  34. 9 3
      src/cas_v0.2.0.1/src/main/java/com/loygra/cas/controller/oss/CasOssController.java
  35. 1 1
      src/cas_v0.2.0.1/src/main/java/com/loygra/cas/controller/oss/CasOssViewController.java
  36. 1 1
      src/cas_v0.2.0.1/src/main/resources/log4j.properties
  37. 1 1
      src/cas_v0.2.0.1/src/main/webapp/WEB-INF/oss/cas/user_apply.jsp
  38. 0 1
      src/lls-papaya_v0.2.0/.classpath
  39. 1 1
      src/lls-papaya_v0.2.0/src/main/resources/config-lsp.properties
  40. 1 1
      src/lsp/src/build/classes/bak/config-lsp.properties
  41. 1 1
      src/lsp/src/build/classes/config-lsp.properties
  42. BIN
      src/lsp/src/build/loygra-lsp-0.6.5-sources.jar
  43. BIN
      src/lsp/src/build/loygra-lsp-0.6.5.jar

BIN
src/cas_v0.2.0.1/build/cas-0.2.0.1.war
View File


+ 2 - 2
src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/classes/META-INF/resources/WEB-INF/oss/cas/cas_personnel.jsp
View File 

@@ -152,7 +152,7 @@
 
 						<div class="line" style="height: inherit">
 
 							<div class="left">荣誉图片：</div>
 
 							<div class="right webuploader honor_files">
 
-								<lg:upload  isList="true" buttonName="选择图片" domId="upload_honor_files" limitNum="5" limitSize="2097152" maxHeight="100" maxWidth="80"  type="<%=Code.UPLOAD_TAG_FILE_TYPE.IMG %>" layout="<%=Code.UPLOAD_TAG_LAYOUT.ABOVE %>"/>
 
+								<lg:upload  isList="true" buttonName="选择图片" domId="upload_honor_files" limitNum="500" limitSize="2097152" maxHeight="100" maxWidth="80"  type="<%=Code.UPLOAD_TAG_FILE_TYPE.IMG %>" layout="<%=Code.UPLOAD_TAG_LAYOUT.ABOVE %>"/>
 
 								<span style="color:red;line-height: 43px">最多5张，单张大小2M以内</span>
 
 							</div>
 
 							<input type-value="1125,1126" value="1123,1124" type="hidden" id="cas_user_honor_files" type-name="cas_user.honor_files">
 
@@ -307,7 +307,7 @@
 
 						<div class="line" style="height: inherit">
 
 							<div class="left">荣誉图片：</div>
 
 							<div class="right webuploader honor_files">
 
-								<lg:upload  isList="true" buttonName="选择图片" domId="upload_honor_files" limitNum="5" limitSize="2097152" maxHeight="100" maxWidth="80"  type="<%=Code.UPLOAD_TAG_FILE_TYPE.IMG %>" layout="<%=Code.UPLOAD_TAG_LAYOUT.ABOVE %>"/>
 
+								<lg:upload  isList="true" buttonName="选择图片" domId="upload_honor_files" limitNum="500" limitSize="2097152" maxHeight="100" maxWidth="80"  type="<%=Code.UPLOAD_TAG_FILE_TYPE.IMG %>" layout="<%=Code.UPLOAD_TAG_LAYOUT.ABOVE %>"/>
 
 								<span style="color:red;line-height: 43px">最多5张，单张大小2M以内</span>
 
 							</div>
 
 							<input type-value="1123,1124" value="1123,1124" type="hidden" id="cas_user_honor_files" type-name="cas_user.honor_files">

+ 3 - 1
src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/classes/META-INF/resources/WEB-INF/oss/cas/member.jsp
View File 

@@ -16,7 +16,8 @@
 
     <%@ include  file="/WEB-INF/oss/lsp/common/resource_layout_style.jsp"%>
 
     <%@ include  file="/WEB-INF/oss/cas/common/common.jsp"%>
 
     <link type="text/css" href="<%=basePath%>/css/cas/oss/public.css?<%=version%>" rel="stylesheet" />
 
-    <script type="text/javascript" src="<%=basePath%>/js/cas/oss/public.js?<%=version%>"></script> 
+    <script type="text/javascript" src="<%=basePath%>/js/cas/oss/public.js?<%=version%>"></script>
 
+	<script type="text/javascript" src="<%=basePath%>/js/cas/ljc_0.2.js?<%=new Date().getTime()%>"></script>
 
 	<link type="text/css" href="<%=basePath%>/css/cas/oss/member.css?<%=version%>" rel="stylesheet" />
 
 	<script type="text/javascript" src="<%=basePath%>/js/cas/oss/member.js?<%=(new Date().getTime())%>"></script>
 
 	<script type="text/javascript">
 
@@ -187,6 +188,7 @@
 
 				{'name':'序号','type':'seq','width':'40px'}, 
 				{'name':'申请人','type':'value','value':'name','width':'100px'},
 
 				{'name':'类型','type':'category','value':'cas_user_type','width':'100px'},
 
+				{'name':'会员类型','type':'aid','value':'aid','width':'100px'},
 
 				{'name':'申请学会','type':'value','value':'branch_name','width':'100px'},
 
 				{'name':'单位名称','type':'value','value':'unit','default_value':'-','width':'100px'},
 
 				{'name':'申请原因','type':'value','value':'apply_cause','default_value':'-','width':'100px'},

+ 0 - 225
src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/classes/META-INF/resources/WEB-INF/oss/cas/member_list.jsp
View File 

@@ -1,225 +0,0 @@
 
-<%-- <%@page import="com.loygra.bo.BaseUserBO"%> --%>
 
-<%@page import="com.loygra.common.Code"%>
 
-<%@page import="com.loygra.cas.common.Codes"%>
 
-<%@ page language="java" contentType="text/html; charset=UTF-8"
 
-	pageEncoding="UTF-8"%>
 
-<%@ page import="com.loygra.util.Util.Comm" %>
 
-<%@ page import="java.util.Date" %>
 
-<%@taglib prefix="c" uri="/WEB-INF/c.tld" %>
 
-<%@taglib prefix="lg" uri="/WEB-INF/lg.tld" %>
 
-<!DOCTYPE html>
 
-<html>
 
-<head>
 
-	<%@ include  file="/WEB-INF/oss/lsp/common/variable.jsp"%>
 
-    <%@ include  file="/WEB-INF/oss/lsp/common/resource_lib.jsp"%>
 
-    <%@ include  file="/WEB-INF/oss/lsp/common/variable_js.jsp"%>
 
-    <%@ include  file="/WEB-INF/oss/lsp/common/resource_layout_style.jsp"%>
 
-    <%@ include  file="/WEB-INF/oss/cas/common/common.jsp"%>
 
-    <link type="text/css" href="<%=basePath%>/css/cas/oss/public.css?<%=version%>" rel="stylesheet" />
 
-    <script type="text/javascript" src="<%=basePath%>/js/cas/oss/public.js?<%=version%>"></script> 
-	<link type="text/css" href="<%=basePath%>/css/cas/oss/member_list.css?<%=version%>" rel="stylesheet" />
 
-	<script type="text/javascript" src="<%=basePath%>/js/cas/oss/member_list.js?<%=new Date().getTime()%>"></script>
 
-	<script type="text/javascript">
 
-		var user_type = "${user_type}";
 
-		var lsp_user_id = "${id}";
 
-		var branch_id = "${branch_id}";
 
-	</script>
 
-</head>
 
-<body>
 
-
 
-<!--总会 会员管理 -->
 
-<%@ include file="/WEB-INF/oss/lsp/common/frame/top_file.jsp"%>
 
-<div class="contains" style="padding-bottom:0;min-width: 1150px;">
 
-	<div class="tab-card">
 
-		<ul>
 
-			<li class="active active_li" tag="202502">待审核</li>
 
-			<li class="active active_li" tag="202504">未通过</li>
 
-			<li class="active active_li" tag="202503">已通过</li>
 
-		</ul>
 
-	</div>
 
-	<div class="tab-content active_202502" tag="202502">
 
-		<!-- 待审核 -->
 
-		<div class=" manage_member_top">
 
-			<div type-option="search_table" config-option="'submit':'#searchbtns1','table':'#init-table1'">
 
-				<div class="float_right">
 
-					<div class="float_left">
 
-						<span>选择学会：</span>
 
-						<select type-name="branch_id" class="brunch_id lg-fession-select-style seach_select" id="branch_id"></select>
 
-					</div>
 
-					<div class="float_left">
 
-						<span>类型：</span>
 
-						<span><lg:dropbox category="<%=Codes.CAS_USER_TYPE.CAS_USER_TYPE %>" typeName="cas_user_type" domClass="lg-fession-select-style seach_select" domId=""/></span>
 
-						<input type-name="delete_flag" value="0" type="hidden" class="lg-fession-input">
 
-						<c:if test="${user_type==202 }">
 
-							<input type-name="cas_user_approval_status_manage" id="cas_user_approval_status_manage" value="<%=Codes.CAS_USER_APPROVAL_STATUS.CAS_USER_APPROVAL_STATUS_WAIT%>" type="hidden" class="lg-fession-input">
 
-						</c:if>
 
-						<c:if test="${user_type!=202 }">
 
-							<input type-name="cas_user_approval_status" id="cas_user_approval_status" value="<%=Codes.CAS_USER_APPROVAL_STATUS.CAS_USER_APPROVAL_STATUS_WAIT%>" type="hidden" class="lg-fession-input">
 
-						</c:if>
 
-						<!-- <input type-name="branch_id" id="branch_id" type="hidden" class="lg-fession-input"> -->
 
-					</div>
 
-					<div class="float_left">
 
-						<span>申请人：</span>
 
-						<span><input type="text" type-name="name" class="lg-fession-input" id="cas_user_name"></span>
 
-					</div>
 
-					<div class="float_left"><button id="searchbtns1" class="lg-fashion-button-normal search_button">检索</button></div>
 
-					<div class="float_left"><button class="lg-fashion-button-normal" onclick="export_menber_excel()">导出</button></div>
 
-				</div>
 
-			</div>
 
-		</div>
 
-		<div id="init-table1" type-option="table" config-option="'url':'/oss/cas/users','pager':'more',
 
-		<c:if test="${user_type==202 }">
 
-			'param':{'delete_flag':'0','cas_user_approval_status_manage':202502},
 
-		</c:if>	
-		<c:if test="${user_type!=202 }">
 
-			'param':{'delete_flag':'0','branch_id':'${branch_id}','cas_user_approval_status':202502},
 
-		</c:if>	
-			'columns':[
 
-				{'name':'序号','type':'seq','width':'40px'}, 
-				{'name':'申请人','type':'value','value':'name','width':'100px'},
 
-				{'name':'类型','type':'category','value':'cas_user_type','width':'100px'},
 
-				{'name':'申请学会','type':'value','value':'branch_name','width':'100px'},
 
-				{'name':'单位名称','type':'value','value':'unit','default_value':'-','width':'100px'},
 
-				{'name':'申请原因','type':'value','value':'apply_cause','default_value':'-','width':'100px'},
 
-				{'name':'申请时间','type':'time','timeformat':'yyyy-MM-dd hh:mm:ss','value':'apply_time','width':'100px'},
 
-				{'name':'操作','type':'self','value_callback':'branch_set1','width':'140px'}	  
-				]" >  
-		</div>
 
-	</div>
 
-	<div class="tab-content active_202504" style="display: none;" tag="202504">
 
-		<!-- 未通过 -->
 
-		<div class=" manage_member_top">
 
-			<div type-option="search_table" config-option="'submit':'#searchbtns2','table':'#init-table2'">
 
-				<div class="float_right">
 
-					<div class="float_left">
 
-						<span>选择学会：</span>
 
-						<select type-name="branch_id" class="brunch_id lg-fession-select-style seach_select" id="branch_id"></select>
 
-					</div>
 
-					<div class="float_left">
 
-						<span>类型：</span>
 
-						<span><lg:dropbox category="<%=Codes.CAS_USER_TYPE.CAS_USER_TYPE %>" typeName="cas_user_type" domClass="lg-fession-select-style seach_select" domId=""/></span>
 
-						<input type-name="delete_flag" value="0" type="hidden" class="lg-fession-input">
 
-						<c:if test="${user_type==202 }">
 
-							<input type-name="cas_user_approval_status_manage" id="cas_user_approval_status_manage" value="<%=Codes.CAS_USER_APPROVAL_STATUS.CAS_USER_APPROVAL_STATUS_NO%>" type="hidden" class="lg-fession-input">
 
-						</c:if>
 
-						<c:if test="${user_type!=202 }">
 
-							<input type-name="cas_user_approval_status" id="cas_user_approval_status" value="<%=Codes.CAS_USER_APPROVAL_STATUS.CAS_USER_APPROVAL_STATUS_NO%>" type="hidden" class="lg-fession-input">
 
-						</c:if>
 
-						<!-- <input type-name="branch_id" id="branch_id" type="hidden" class="lg-fession-input"> -->
 
-					</div>
 
-					<div class="float_left">
 
-						<span>申请人：</span>
 
-						<span><input type="text" type-name="name" class="lg-fession-input" id="cas_user_name"></span>
 
-					</div>
 
-					<div class="float_left"><button id="searchbtns2" class="lg-fashion-button-normal search_button">检索</button></div>
 
-					<div class="float_left"><button class="lg-fashion-button-normal" onclick="export_menber_excel()">导出</button></div>
 
-				</div>
 
-			</div>
 
-		</div>
 
-		<div id="init-table2" type-option="table" config-option="'url':'/oss/cas/users','pager':'more',
 
-		<c:if test="${user_type==202 }">
 
-			'param':{'delete_flag':'0','cas_user_approval_status_manage':202504},
 
-		</c:if>	
-		<c:if test="${user_type!=202 }">
 
-			'param':{'delete_flag':'0','branch_id':'${branch_id}','cas_user_approval_status':202504},
 
-		</c:if>	
-			'columns':[
 
-				{'name':'序号','type':'seq','width':'40px'}, 
-				{'name':'申请人','type':'value','value':'name','width':'100px'},
 
-				{'name':'类型','type':'category','value':'cas_user_type','width':'100px'},
 
-				{'name':'申请学会','type':'value','value':'branch_name','width':'100px'},
 
-				{'name':'单位名称','type':'value','value':'unit','default_value':'-','width':'100px'},
 
-				{'name':'申请原因','type':'value','value':'apply_cause','default_value':'-','width':'100px'},
 
-				{'name':'申请时间','type':'time','timeformat':'yyyy-MM-dd hh:mm:ss','value':'apply_time','width':'100px'},
 
-				{'name':'审核建议','type':'value','value':'advice_manage','default_value':'-','width':'100px'},
 
-				{'name':'审核时间','type':'time','timeformat':'yyyy-MM-dd hh:mm:ss','value':'approval_time_manage','width':'100px'},
 
-				{'name':'操作','type':'self','value_callback':'branch_set2','width':'140px'}	  
-				]" >  
-		</div>
 
-	</div>
 
-	<div class="tab-content active_202503" style="display: none;" tag="202503">
 
-		<!-- 已通过 -->
 
-		<div class=" manage_member_top">
 
-			<div type-option="search_table" config-option="'submit':'#searchbtns3','table':'#init-table3'">
 
-				<div class="float_right">
 
-					<div class="float_left">
 
-						<span>选择学会：</span>
 
-						<select type-name="branch_id" class="brunch_id lg-fession-select-style seach_select" id="branch_id"></select>
 
-					</div>
 
-					<div class="float_left">
 
-						<span>类型：</span>
 
-						<span><lg:dropbox category="<%=Codes.CAS_USER_TYPE.CAS_USER_TYPE %>" typeName="cas_user_type" domClass="lg-fession-select-style seach_select" domId="cas_user_type"/></span>
 
-						<input type-name="delete_flag" value="0" type="hidden" class="lg-fession-input">
 
-						<c:if test="${user_type==202 }">
 
-							<input type-name="cas_user_approval_status_manage" id="cas_user_approval_status_manage" value="<%=Codes.CAS_USER_APPROVAL_STATUS.CAS_USER_APPROVAL_STATUS_YES%>" type="hidden" class="lg-fession-input">
 
-						</c:if>
 
-						<c:if test="${user_type!=202 }">
 
-							<input type-name="cas_user_approval_status" id="cas_user_approval_status" value="<%=Codes.CAS_USER_APPROVAL_STATUS.CAS_USER_APPROVAL_STATUS_YES%>" type="hidden" class="lg-fession-input">
 
-						</c:if>
 
-						<!-- <input type-name="branch_id" id="branch_id" type="hidden" class="lg-fession-input"> -->
 
-					</div>
 
-					<div class="float_left">
 
-						<span>年龄：</span>
 
-						<span><input type="number" style="max-width: 50px" type-name="age_min" class="lg-fession-input" id="cas_user_agemin"></span>
 
-						<span>-</span>
 
-						<span><input type="number" style="max-width: 50px" type-name="age_max" class="lg-fession-input" id="cas_user_agemax"></span>
 
-					</div>
 
-					<div class="float_left">
 
-						<span>学历：</span>
 
-						<span><lg:dropbox category="<%=Code.EDUCATION_LEVEL.EDUCATION_LEVEL %>" typeName="education" domClass="lg-fession-select-style seach_select" domId="education"/></span>
 
-						<%--						<input type-name="delete_flag" value="0" type="hidden" class="lg-fession-input">--%>
 
-						<%--						<input type-name="education" id="education" value="${education}" type="hidden" class="lg-fession-input">--%>
 
-
 
-					</div>
 
-					<div class="float_left">
 
-						<span>性别：</span>
 
-						<span><lg:dropbox category="<%=Codes.SEX.SEX %>" typeName="sex" domClass="lg-fession-select-style seach_select" domId="sex"/></span>
 
-						<%--						<input type-name="delete_flag" value="0" type="hidden" class="lg-fession-input">--%>
 
-						<%--						<input type-name="sex" id="sex" value="${sex}" type="hidden" class="lg-fession-input">--%>
 
-						<%--						<span><input type="text" type-name="sex" class="lg-fession-input" id="cas_user_sex"></span>--%>
 
-					</div>
 
-					<div class="float_left">
 
-						<span>申请人：</span>
 
-						<span><input type="text" type-name="name" class="lg-fession-input" id="cas_user_name"></span>
 
-					</div>
 
-					<div class="float_left"><button id="searchbtns3" class="lg-fashion-button-normal search_button">检索</button></div>
 
-					<div class="float_left"><button class="lg-fashion-button-normal" onclick="export_menber_excel()">导出</button></div>
 
-				</div>
 
-			</div>
 
-		</div>
 
-		<div id="init-table3" type-option="table" config-option="'url':'/oss/cas/users','pager':'more',
 
-		<c:if test="${user_type==202 }">
 
-			'param':{'delete_flag':'0','cas_user_approval_status_manage':202503},
 
-		</c:if>	
-		<c:if test="${user_type!=202 }">
 
-			'param':{'delete_flag':'0','branch_id':'${branch_id}','cas_user_approval_status':202503},
 
-		</c:if>	
-			'columns':[
 
-				{'name':'序号','type':'seq','width':'40px'}, 
-				{'name':'申请人','type':'value','value':'name','width':'100px'},
 
-				{'name':'类型','type':'category','value':'cas_user_type','width':'100px'},
 
-				{'name':'申请学会','type':'value','value':'branch_name','width':'100px'},
 
-				{'name':'单位名称','type':'value','value':'unit','default_value':'-','width':'100px'},
 
-				{'name':'申请原因','type':'value','value':'apply_cause','default_value':'-','width':'100px'},
 
-				{'name':'申请时间','type':'time','timeformat':'yyyy-MM-dd hh:mm:ss','value':'apply_time','width':'100px'},
 
-				{'name':'审核时间','type':'time','timeformat':'yyyy-MM-dd hh:mm:ss','value':'approval_time_manage','width':'100px'},
 
-				{'name':'操作','type':'self','value_callback':'branch_set3','width':'140px'}	  
-				]" > 
-		</div>
 
-	</div>
 
-</div>
 
-
 
-<!-- 弹框 -->
 
-<div id="audit" style="display: none;">
 
-	<div style="width: 320px;float:left;margin-top: 40px;margin-left: 40px;"  type-option="validate" config-option="'tigger':'focusout','style':'wave,next','switch_flag':false,'submit':'#btn','success':'succ_submmit'">
 
-		<span>审核意见：</span>
 
-		<input id="opinion" class="lg-fession-input" />
 
-	</div>
 
-	<div style="width: 100%;height:40px;float:left;margin-top: 45px;padding-left:100px;padding-top:5px;background: #f1f1f1;border-top: 1px solid #dadada;">
 
-		<button class="lg-fashion-button-normal" id="btn_opinion" onclick="submit_opinion()" style="width: 78px;">确认</button>
 
-		<button class="lg-fashion-button-cancel cancel_button" onclick="close_contact()" style="width: 78px;margin-left: 10px;">取消</button>
 
-	</div>
 
-</div>
 
-<%@ include file="/WEB-INF/oss/lsp/common/frame/bottom_file.jsp"%>
 
-</body>
 
-</html>

+ 1 - 1
src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/classes/META-INF/resources/WEB-INF/oss/cas/user_apply.jsp
View File 

@@ -115,7 +115,7 @@
 
 					</c:if>
 
 				</c:if>
 
 				<p class="title">申请个人基本信息</p>
 
-				<c:if test="${cas_user.cas_user_approval_status != 202501 && cas_user.cas_user_approval_status != 202504  && cas_user.lsp_user_id == user.id}">
 
+				<c:if test="${cas_user.cas_user_approval_status == 202503 && cas_user.cas_user_type == 202301 && cas_user.cas_user_approval_status_manage==202503  && cas_user.lsp_user_id == user.id}">
 
 				<button class="lg-fashion-button-normal float_right margin_right perfect_info" style="position: absolute;right: 10px;top:10px" onclick="downloadc()">查看证书</button>
 
 				</c:if>
 
 					<table class="lg-fession-tab personnel">

+ 30 - 2
src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/classes/META-INF/resources/js/cas/ljc_0.2.js
View File 

@@ -555,6 +555,20 @@ jQuery.fn.tableAdaptor = function (){
 
 	}
 
 	
 	var getTypeValue = function getTypeValueFunc(val,type,i,name,timeformat,obj){
 
+
 
+		if(type == 'aid'){
 
+
 
+			if(aobj.data("obj_loygra")[val]==1){
 
+				return "'学生会员'" ;
 
+			}
 
+			if(aobj.data("obj_loygra")[val]==2){
 
+				return "'普通会员'" ;
 
+			}
 
+			if(aobj.data("obj_loygra")[val]==3){
 
+				return "'高级会员'" ;
 
+			}
 
+			return "'未设置'" ;
 
+		}else
 
 		if(type == 'fix'){
 
 			return "'"+val+"'";
 
 		}else if(type == 'category'){
 
@@ -948,6 +962,9 @@ function detail_get_restall(selector,_config){
 
 		}
 
 	})
 
 }
 
+window.upsuccess = function (file, data){
 
+   return true;
 
+}
 
 
 
 //------------------------------------------------------------------------------------------
 
@@ -1026,10 +1043,11 @@ function UploadInit(imgUrl,ukey,func,id,domId,thumbnailWidth, thumbnailHeight,ac
 
     });
 
     // 当有文件添加进来的时候
 
     uploader.on('fileQueued', function(file) {
 
+		// debugger
 
     	$("#"+domId).css("width","0%");
 
     	$("#"+domId).attr("ids","");
 
     	$("#"+domId).css("display","inherit");
 
-    	uploader.options.formData={'uki':"ukey:" + getVal(ukey,"")};
 
+		uploader.options.formData={'uki':"ukey:" + getVal(ukey,"")};
 
     	uploader.makeThumb( file, function( error, src ) {
 
            $("#back_"+domId).css("background","url("+src+")");
 
            
@@ -1040,7 +1058,17 @@ function UploadInit(imgUrl,ukey,func,id,domId,thumbnailWidth, thumbnailHeight,ac
 
     	$("#all_"+domId).text(parseInt(percentage*100)+"%");
 
     	$("#"+domId).css("width",parseInt(100-percentage*100)+"%");
 
     });
 
-    uploader.on('uploadSuccess', func);
 
+    uploader.on('uploadSuccess', function (file, data) {
 
+		  if(domId=='upload_honor_files'){
 
+			  if(window.upsuccess(file,data)){
 
+				  func(file,data);
 
+			  }
 
+		  }else{
 
+			  func(file,data);
 
+		  }
 
+		}
 
+
 
+	);
 
     uploader.on('uploadError', function(file) {
 
     	console.log("文件上传出错");
 
     });

+ 28 - 12
src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/classes/META-INF/resources/js/cas/oss/cas_personnel.js
View File 

@@ -90,6 +90,16 @@ $(document).ready(function(){
 
 	$("#downloadExcel").click(function(){
 
 		window.location.href = localUrl + "/oss/down/xls?cas_user_type="+cas_user_type;
 
 	})
 
+
 
+	window.upsuccess = function (file,data){
 
+		if($(".back_list_upload_honor_files").size()>=5){
 
+			showTip("超出限制的图片数量！")
 
+			return false;
 
+		}else{
 
+			return true;
 
+		}
 
+
 
+	}
 
 })
 
 /**
 
  * 修改初始化表单
 
@@ -135,9 +145,9 @@ function init_form(user_id){
 
 				$("#cas_service_require").val(data.data.cas_user.cas_service_require);
 
 				//设置头像
 
 				if(gdv(data.data.cas_user.portrait_id)){
 
-					$("#back_upload_prove_file").css({"background": 'url(/cas/service/attach?param='+data.data.cas_user.portrait_id+'&target=brower)100% 100%'});
 
+					$("#back_upload_prove_file").css({"background": 'url(/service/attach?param='+data.data.cas_user.portrait_id+'&target=brower)100% 100%'});
 
 				}else{
 
-					$("#back_upload_prove_file").css({"background": 'url(/cas/img/cas/common/default.png)'});
 
+					$("#back_upload_prove_file").css({"background": 'url(/img/cas/common/default.png)'});
 
 				}
 
 
 				$(".prove_file  .upload_file_list").html(get_attach_img(data.data.cas_user.portrait_id));//上传图片页面渲染出来
 
@@ -161,7 +171,7 @@ function init_form(user_id){
 
 			}
 
 		})
 
 	}else{
 
-		$("#back_upload_prove_file").css({"background": 'url(/cas/img/cas/common/default.png)'});
 
+		$("#back_upload_prove_file").css({"background": 'url(/img/cas/common/default.png)'});
 
 	}
 
 	$("#back_upload_prove_file").css({"background-size": '100% 100%'});
 
 }
 
@@ -185,9 +195,9 @@ function get_attach_img(portrait_id){
 
 	var html="";
 
 	if (portrait_id!="" && portrait_id!=undefined && portrait_id!='undefined') {
 
 		html+="<div style='width:56px;border-radius: 3px;padding:3px;border: 1px solid #ccc;float:left;margin-top:0px;margin-right:5px;cursor: pointer;margin-bottom: 5px;'>\
 
-			    	<img class='min_img_"+portrait_id+"' id='image_upload_prove_file2'  src='/cas/service/attach?param="+portrait_id+"&amp;target=brower' style='display:none;width:100%;height: 100%;' />\
 
-			    	<img class='delete_img' src='/cas/img/cas/common/delete.png' style='width:10px;height: 10px;position: absolute;margin-left:35px;margin-top:3px;' />\
 
-			    	<div tag='"+portrait_id+"' class='back_list_upload_prove_file' id='back_list_upload_prove_file2' style='width:100%;height: 30px;background: url(/cas/service/attach?param="+portrait_id+"&amp;target=brower);background-size: 100% 100%;'>\
 
+			    	<img class='min_img_"+portrait_id+"' id='image_upload_prove_file2'  src='/service/attach?param="+portrait_id+"&amp;target=brower' style='display:none;width:100%;height: 100%;' />\
 
+			    	<img class='delete_img' src='/img/cas/common/delete.png' style='width:10px;height: 10px;position: absolute;margin-left:35px;margin-top:3px;' />\
 
+			    	<div tag='"+portrait_id+"' class='back_list_upload_prove_file' id='back_list_upload_prove_file2' style='width:100%;height: 30px;background: url(/service/attach?param="+portrait_id+"&amp;target=brower);background-size: 100% 100%;'>\
 
 			     		<span id='upload_prove_file' style='display: block;color:#fff;height: 30px;line-height: 30px;text-align: right;font-size: 12px;width:0%;float:right;background-color: rgba(221, 221, 221, 0.4);'></span>\
 
 			    	</div>\
 
 			   </div>";
 
@@ -203,9 +213,9 @@ function get_attach_imgs(honor_fileids){
 
 			if(honor_fileids.split(",")[key]==""||honor_fileids.split(",")[key]==undefined ||key=='remove' ) continue;
 
 			var keyid = honor_fileids.split(",")[key];
 
 			html+="<div style='width:56px;border-radius: 3px;padding:3px;border: 1px solid #ccc;float:left;margin-top:0px;margin-right:5px;cursor: pointer;margin-bottom: 5px;'>\
 
-			    	<img class='min_img_"+keyid+"' id='image_upload_honor_files2'  src='/cas/service/attach?param="+keyid+"&amp;target=brower' style='display:none;width:100%;height: 100%;' />\
 
-			    	<img class='delete_img' src='/cas/img/cas/common/delete.png' style='width:10px;height: 10px;position: absolute;margin-left:35px;margin-top:3px;' />\
 
-			    	<div tag='"+keyid+"' class='back_list_upload_honor_files' id='back_list_upload_honor_files2' style='width:100%;height: 30px;background: url(/cas/service/attach?param="+keyid+"&amp;target=brower);background-size: 100% 100%;'>\
 
+			    	<img class='min_img_"+keyid+"' id='image_upload_honor_files2'  src='/service/attach?param="+keyid+"&amp;target=brower' style='display:none;width:100%;height: 100%;' />\
 
+			    	<img class='delete_img' src='/img/cas/common/delete.png' style='width:10px;height: 10px;position: absolute;margin-left:35px;margin-top:3px;' />\
 
+			    	<div tag='"+keyid+"' class='back_list_upload_honor_files' id='back_list_upload_honor_files2' style='width:100%;height: 30px;background: url(/service/attach?param="+keyid+"&amp;target=brower);background-size: 100% 100%;'>\
 
 			     		<span id='upload_honor_files"+keyid+"' style='display: block;color:#fff;height: 30px;line-height: 30px;text-align: right;font-size: 12px;width:0%;float:right;background-color: rgba(221, 221, 221, 0.4);'></span>\
 
 			    	</div>\
 
 			   </div>";
 
@@ -253,7 +263,13 @@ function beforefunc(){
 
 	//证件照
 
 	$("#cas_user_portrait_id").val($("#upload_prove_file").attr("ids"));
 
 
-	$("#cas_user_honor_files").val($("#upload_honor_files").attr("ids"));
 
+	var ids = "";
 
+	$(".back_list_upload_honor_files").each(function (e){
 
+		ids+=$(this).attr("tag")+","
 
+	})
 
+
 
+	$("#cas_user_honor_files").val(ids);
 
+    debugger
 
 	return true ;
 
 }
 
 
@@ -306,9 +322,9 @@ function load_information(data){
 
 	$("#cas_service_require").val(data.data.cas_user.cas_service_require);
 
 	//设置头像
 
 	if(gdv(data.data.cas_user.portrait_id)){
 
-		$("#back_upload_prove_file").css({"background": 'url(/cas/service/attach?param='+data.data.cas_user.portrait_id+'&target=brower)100% 100%'});
 
+		$("#back_upload_prove_file").css({"background": 'url(/service/attach?param='+data.data.cas_user.portrait_id+'&target=brower)100% 100%'});
 
 	}else{
 
-		$("#back_upload_prove_file").css({"background": 'url(/cas/img/cas/common/default.png)'});
 
+		$("#back_upload_prove_file").css({"background": 'url(/img/cas/common/default.png)'});
 
 	}
 
 	$(".prove_file  .upload_file_list").html(get_attach_img(data.data.cas_user.portrait_id));//上传图片页面渲染出来

+ 4 - 4
src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/classes/bak/config-lsp.properties
View File 

@@ -13,16 +13,16 @@ project.status=debug
 
 
 #------------------------- 访问domain配置begin -------------------------
 
 #本服务domain
 
-local.domain=http://cas.jscts.org.cn
 
+local.domain=http://localhost:8080/cas
 
 #------------------------- 访问domain配置begin -------------------------
 
 
 #------------------------- file config begin-------------------------
 
 #文件的储存地址
 
-file.path=/file
 
+file.path=./file
 
 #文件访问方式：默认为应用处理debug,图片服务处理distributed
 
 file.response.type=debug
 
 #图片服务访问地址,需要配置404图片
 
-file.distributed.domain=http://cas.jscts.org.cn/res
 
+file.distributed.domain=http://localhost:8080/res
 
 #------------------------- file config end-------------------------
 
 
 #------------------------- jdbc config begin-------------------------
 
@@ -31,7 +31,7 @@ jdbc.db.alias=postgresql
 
 jdbc.driverClassName=org.postgresql.Driver
 
 jdbc.url=jdbc:postgresql://127.0.0.1:5432/cas
 
 jdbc.username=postgres
 
-jdbc.password=tw20gj150Me803
 
+jdbc.password=postgres
 
 
 #jdbc.db.alias=mysql
 
 #jdbc.driverClassName=com.mysql.jdbc.Driver

BIN
src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/classes/com/loygra/cas/controller/oss/CasOssController.class
View File


BIN
src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/classes/com/loygra/cas/controller/oss/CasOssViewController.class
View File


+ 4 - 4
src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/classes/config-lsp.properties
View File 

@@ -13,16 +13,16 @@ project.status=debug
 
 
 #------------------------- 访问domain配置begin -------------------------
 
 #本服务domain
 
-local.domain=http://cas.jscts.org.cn
 
+local.domain=http://localhost:8080/cas
 
 #------------------------- 访问domain配置begin -------------------------
 
 
 #------------------------- file config begin-------------------------
 
 #文件的储存地址
 
-file.path=/file
 
+file.path=./file
 
 #文件访问方式：默认为应用处理debug,图片服务处理distributed
 
 file.response.type=debug
 
 #图片服务访问地址,需要配置404图片
 
-file.distributed.domain=http://cas.jscts.org.cn/res
 
+file.distributed.domain=http://localhost:8080/res
 
 #------------------------- file config end-------------------------
 
 
 #------------------------- jdbc config begin-------------------------
 
@@ -31,7 +31,7 @@ jdbc.db.alias=postgresql
 
 jdbc.driverClassName=org.postgresql.Driver
 
 jdbc.url=jdbc:postgresql://127.0.0.1:5432/cas
 
 jdbc.username=postgres
 
-jdbc.password=tw20gj150Me803
 
+jdbc.password=postgres
 
 
 #jdbc.db.alias=mysql
 
 #jdbc.driverClassName=com.mysql.jdbc.Driver

+ 2 - 2
src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/classes/log4j.properties
View File 

@@ -33,14 +33,14 @@ log4j.appender.CONSOLE.layout.ConversionPattern=%d %p [%t] %C.%M(%F:%L) - %m%n
 
 #FileAppender
 
 log4j.appender.D=org.apache.log4j.DailyRollingFileAppender
 
 log4j.appender.D.Threshold=DEBUG
 
-log4j.appender.D.File=/deploy/logs/cas/debug.log
 
+log4j.appender.D.File=./deploy/logs/cas/debug.log
 
 log4j.appender.D.Append=true
 
 log4j.appender.D.layout=org.apache.log4j.PatternLayout
 
 log4j.appender.R.layout.ConversionPattern=%d %p [%t] %C.%M(%F:%L) - %m%n
 
 
 log4j.appender.E=org.apache.log4j.DailyRollingFileAppender
 
 log4j.appender.E.Threshold=ERROR
 
-log4j.appender.E.File=/deploy/logs/cas/error.log
 
+log4j.appender.E.File=./deploy/logs/cas/error.log
 
 log4j.appender.E.Append=true
 
 log4j.appender.E.layout=org.apache.log4j.PatternLayout
 
 log4j.appender.E.layout.ConversionPattern=%d %p [%t] %C.%M(%F:%L) - %m%n

BIN
src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/classes/tpl/xls/member_list.xls
View File


BIN
src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/lib/loygra-lls-papaya-0.2.0.jar
View File


BIN
src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/lib/loygra-lsp-0.6.5.jar
View File


+ 2 - 2
src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/oss/cas/cas_personnel.jsp
View File 

@@ -152,7 +152,7 @@
 
 						<div class="line" style="height: inherit">
 
 							<div class="left">荣誉图片：</div>
 
 							<div class="right webuploader honor_files">
 
-								<lg:upload  isList="true" buttonName="选择图片" domId="upload_honor_files" limitNum="5" limitSize="2097152" maxHeight="100" maxWidth="80"  type="<%=Code.UPLOAD_TAG_FILE_TYPE.IMG %>" layout="<%=Code.UPLOAD_TAG_LAYOUT.ABOVE %>"/>
 
+								<lg:upload  isList="true" buttonName="选择图片" domId="upload_honor_files" limitNum="500" limitSize="2097152" maxHeight="100" maxWidth="80"  type="<%=Code.UPLOAD_TAG_FILE_TYPE.IMG %>" layout="<%=Code.UPLOAD_TAG_LAYOUT.ABOVE %>"/>
 
 								<span style="color:red;line-height: 43px">最多5张，单张大小2M以内</span>
 
 							</div>
 
 							<input type-value="1125,1126" value="1123,1124" type="hidden" id="cas_user_honor_files" type-name="cas_user.honor_files">
 
@@ -307,7 +307,7 @@
 
 						<div class="line" style="height: inherit">
 
 							<div class="left">荣誉图片：</div>
 
 							<div class="right webuploader honor_files">
 
-								<lg:upload  isList="true" buttonName="选择图片" domId="upload_honor_files" limitNum="5" limitSize="2097152" maxHeight="100" maxWidth="80"  type="<%=Code.UPLOAD_TAG_FILE_TYPE.IMG %>" layout="<%=Code.UPLOAD_TAG_LAYOUT.ABOVE %>"/>
 
+								<lg:upload  isList="true" buttonName="选择图片" domId="upload_honor_files" limitNum="500" limitSize="2097152" maxHeight="100" maxWidth="80"  type="<%=Code.UPLOAD_TAG_FILE_TYPE.IMG %>" layout="<%=Code.UPLOAD_TAG_LAYOUT.ABOVE %>"/>
 
 								<span style="color:red;line-height: 43px">最多5张，单张大小2M以内</span>
 
 							</div>
 
 							<input type-value="1123,1124" value="1123,1124" type="hidden" id="cas_user_honor_files" type-name="cas_user.honor_files">

+ 3 - 1
src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/oss/cas/member.jsp
View File 

@@ -16,7 +16,8 @@
 
     <%@ include  file="/WEB-INF/oss/lsp/common/resource_layout_style.jsp"%>
 
     <%@ include  file="/WEB-INF/oss/cas/common/common.jsp"%>
 
     <link type="text/css" href="<%=basePath%>/css/cas/oss/public.css?<%=version%>" rel="stylesheet" />
 
-    <script type="text/javascript" src="<%=basePath%>/js/cas/oss/public.js?<%=version%>"></script> 
+    <script type="text/javascript" src="<%=basePath%>/js/cas/oss/public.js?<%=version%>"></script>
 
+	<script type="text/javascript" src="<%=basePath%>/js/cas/ljc_0.2.js?<%=new Date().getTime()%>"></script>
 
 	<link type="text/css" href="<%=basePath%>/css/cas/oss/member.css?<%=version%>" rel="stylesheet" />
 
 	<script type="text/javascript" src="<%=basePath%>/js/cas/oss/member.js?<%=(new Date().getTime())%>"></script>
 
 	<script type="text/javascript">
 
@@ -187,6 +188,7 @@
 
 				{'name':'序号','type':'seq','width':'40px'}, 
 				{'name':'申请人','type':'value','value':'name','width':'100px'},
 
 				{'name':'类型','type':'category','value':'cas_user_type','width':'100px'},
 
+				{'name':'会员类型','type':'aid','value':'aid','width':'100px'},
 
 				{'name':'申请学会','type':'value','value':'branch_name','width':'100px'},
 
 				{'name':'单位名称','type':'value','value':'unit','default_value':'-','width':'100px'},
 
 				{'name':'申请原因','type':'value','value':'apply_cause','default_value':'-','width':'100px'},

+ 3 - 1
src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/oss/cas/member_list.jsp
View File 

@@ -16,7 +16,8 @@
 
     <%@ include  file="/WEB-INF/oss/lsp/common/resource_layout_style.jsp"%>
 
     <%@ include  file="/WEB-INF/oss/cas/common/common.jsp"%>
 
     <link type="text/css" href="<%=basePath%>/css/cas/oss/public.css?<%=version%>" rel="stylesheet" />
 
-    <script type="text/javascript" src="<%=basePath%>/js/cas/oss/public.js?<%=version%>"></script> 
+	<script type="text/javascript" src="<%=basePath%>/js/cas/ljc_0.2.js?<%=new Date().getTime()%>"></script>
 
+	<script type="text/javascript" src="<%=basePath%>/js/cas/oss/public.js?<%=version%>"></script>
 
 	<link type="text/css" href="<%=basePath%>/css/cas/oss/member_list.css?<%=version%>" rel="stylesheet" />
 
 	<script type="text/javascript" src="<%=basePath%>/js/cas/oss/member_list.js?<%=new Date().getTime()%>"></script>
 
 	<script type="text/javascript">
 
@@ -198,6 +199,7 @@
 
 				{'name':'序号','type':'seq','width':'40px'}, 
 				{'name':'申请人','type':'value','value':'name','width':'100px'},
 
 				{'name':'类型','type':'category','value':'cas_user_type','width':'100px'},
 
+				{'name':'会员类型','type':'aid','value':'aid','width':'100px'},
 
 				{'name':'申请学会','type':'value','value':'branch_name','width':'100px'},
 
 				{'name':'单位名称','type':'value','value':'unit','default_value':'-','width':'100px'},
 
 				{'name':'申请原因','type':'value','value':'apply_cause','default_value':'-','width':'100px'},

+ 1 - 1
src/cas_v0.2.0.1/build/cas-0.2.0.1/WEB-INF/oss/cas/user_apply.jsp
View File 

@@ -115,7 +115,7 @@
 
 					</c:if>
 
 				</c:if>
 
 				<p class="title">申请个人基本信息</p>
 
-				<c:if test="${cas_user.cas_user_approval_status != 202501 && cas_user.cas_user_approval_status != 202504  && cas_user.lsp_user_id == user.id}">
 
+				<c:if test="${cas_user.cas_user_approval_status == 202503 && cas_user.cas_user_type == 202301 && cas_user.cas_user_approval_status_manage==202503  && cas_user.lsp_user_id == user.id}">
 
 				<button class="lg-fashion-button-normal float_right margin_right perfect_info" style="position: absolute;right: 10px;top:10px" onclick="downloadc()">查看证书</button>
 
 				</c:if>
 
 					<table class="lg-fession-tab personnel">

+ 30 - 2
src/cas_v0.2.0.1/build/cas-0.2.0.1/js/cas/ljc_0.2.js
View File 

@@ -555,6 +555,20 @@ jQuery.fn.tableAdaptor = function (){
 
 	}
 
 	
 	var getTypeValue = function getTypeValueFunc(val,type,i,name,timeformat,obj){
 
+
 
+		if(type == 'aid'){
 
+
 
+			if(aobj.data("obj_loygra")[val]==1){
 
+				return "'学生会员'" ;
 
+			}
 
+			if(aobj.data("obj_loygra")[val]==2){
 
+				return "'普通会员'" ;
 
+			}
 
+			if(aobj.data("obj_loygra")[val]==3){
 
+				return "'高级会员'" ;
 
+			}
 
+			return "'未设置'" ;
 
+		}else
 
 		if(type == 'fix'){
 
 			return "'"+val+"'";
 
 		}else if(type == 'category'){
 
@@ -948,6 +962,9 @@ function detail_get_restall(selector,_config){
 
 		}
 
 	})
 
 }
 
+window.upsuccess = function (file, data){
 
+   return true;
 
+}
 
 
 
 //------------------------------------------------------------------------------------------
 
@@ -1026,10 +1043,11 @@ function UploadInit(imgUrl,ukey,func,id,domId,thumbnailWidth, thumbnailHeight,ac
 
     });
 
     // 当有文件添加进来的时候
 
     uploader.on('fileQueued', function(file) {
 
+		// debugger
 
     	$("#"+domId).css("width","0%");
 
     	$("#"+domId).attr("ids","");
 
     	$("#"+domId).css("display","inherit");
 
-    	uploader.options.formData={'uki':"ukey:" + getVal(ukey,"")};
 
+		uploader.options.formData={'uki':"ukey:" + getVal(ukey,"")};
 
     	uploader.makeThumb( file, function( error, src ) {
 
            $("#back_"+domId).css("background","url("+src+")");
 
            
@@ -1040,7 +1058,17 @@ function UploadInit(imgUrl,ukey,func,id,domId,thumbnailWidth, thumbnailHeight,ac
 
     	$("#all_"+domId).text(parseInt(percentage*100)+"%");
 
     	$("#"+domId).css("width",parseInt(100-percentage*100)+"%");
 
     });
 
-    uploader.on('uploadSuccess', func);
 
+    uploader.on('uploadSuccess', function (file, data) {
 
+		  if(domId=='upload_honor_files'){
 
+			  if(window.upsuccess(file,data)){
 
+				  func(file,data);
 
+			  }
 
+		  }else{
 
+			  func(file,data);
 
+		  }
 
+		}
 
+
 
+	);
 
     uploader.on('uploadError', function(file) {
 
     	console.log("文件上传出错");
 
     });

+ 28 - 12
src/cas_v0.2.0.1/build/cas-0.2.0.1/js/cas/oss/cas_personnel.js
View File 

@@ -90,6 +90,16 @@ $(document).ready(function(){
 
 	$("#downloadExcel").click(function(){
 
 		window.location.href = localUrl + "/oss/down/xls?cas_user_type="+cas_user_type;
 
 	})
 
+
 
+	window.upsuccess = function (file,data){
 
+		if($(".back_list_upload_honor_files").size()>=5){
 
+			showTip("超出限制的图片数量！")
 
+			return false;
 
+		}else{
 
+			return true;
 
+		}
 
+
 
+	}
 
 })
 
 /**
 
  * 修改初始化表单
 
@@ -135,9 +145,9 @@ function init_form(user_id){
 
 				$("#cas_service_require").val(data.data.cas_user.cas_service_require);
 
 				//设置头像
 
 				if(gdv(data.data.cas_user.portrait_id)){
 
-					$("#back_upload_prove_file").css({"background": 'url(/cas/service/attach?param='+data.data.cas_user.portrait_id+'&target=brower)100% 100%'});
 
+					$("#back_upload_prove_file").css({"background": 'url(/service/attach?param='+data.data.cas_user.portrait_id+'&target=brower)100% 100%'});
 
 				}else{
 
-					$("#back_upload_prove_file").css({"background": 'url(/cas/img/cas/common/default.png)'});
 
+					$("#back_upload_prove_file").css({"background": 'url(/img/cas/common/default.png)'});
 
 				}
 
 
 				$(".prove_file  .upload_file_list").html(get_attach_img(data.data.cas_user.portrait_id));//上传图片页面渲染出来
 
@@ -161,7 +171,7 @@ function init_form(user_id){
 
 			}
 
 		})
 
 	}else{
 
-		$("#back_upload_prove_file").css({"background": 'url(/cas/img/cas/common/default.png)'});
 
+		$("#back_upload_prove_file").css({"background": 'url(/img/cas/common/default.png)'});
 
 	}
 
 	$("#back_upload_prove_file").css({"background-size": '100% 100%'});
 
 }
 
@@ -185,9 +195,9 @@ function get_attach_img(portrait_id){
 
 	var html="";
 
 	if (portrait_id!="" && portrait_id!=undefined && portrait_id!='undefined') {
 
 		html+="<div style='width:56px;border-radius: 3px;padding:3px;border: 1px solid #ccc;float:left;margin-top:0px;margin-right:5px;cursor: pointer;margin-bottom: 5px;'>\
 
-			    	<img class='min_img_"+portrait_id+"' id='image_upload_prove_file2'  src='/cas/service/attach?param="+portrait_id+"&amp;target=brower' style='display:none;width:100%;height: 100%;' />\
 
-			    	<img class='delete_img' src='/cas/img/cas/common/delete.png' style='width:10px;height: 10px;position: absolute;margin-left:35px;margin-top:3px;' />\
 
-			    	<div tag='"+portrait_id+"' class='back_list_upload_prove_file' id='back_list_upload_prove_file2' style='width:100%;height: 30px;background: url(/cas/service/attach?param="+portrait_id+"&amp;target=brower);background-size: 100% 100%;'>\
 
+			    	<img class='min_img_"+portrait_id+"' id='image_upload_prove_file2'  src='/service/attach?param="+portrait_id+"&amp;target=brower' style='display:none;width:100%;height: 100%;' />\
 
+			    	<img class='delete_img' src='/img/cas/common/delete.png' style='width:10px;height: 10px;position: absolute;margin-left:35px;margin-top:3px;' />\
 
+			    	<div tag='"+portrait_id+"' class='back_list_upload_prove_file' id='back_list_upload_prove_file2' style='width:100%;height: 30px;background: url(/service/attach?param="+portrait_id+"&amp;target=brower);background-size: 100% 100%;'>\
 
 			     		<span id='upload_prove_file' style='display: block;color:#fff;height: 30px;line-height: 30px;text-align: right;font-size: 12px;width:0%;float:right;background-color: rgba(221, 221, 221, 0.4);'></span>\
 
 			    	</div>\
 
 			   </div>";
 
@@ -203,9 +213,9 @@ function get_attach_imgs(honor_fileids){
 
 			if(honor_fileids.split(",")[key]==""||honor_fileids.split(",")[key]==undefined ||key=='remove' ) continue;
 
 			var keyid = honor_fileids.split(",")[key];
 
 			html+="<div style='width:56px;border-radius: 3px;padding:3px;border: 1px solid #ccc;float:left;margin-top:0px;margin-right:5px;cursor: pointer;margin-bottom: 5px;'>\
 
-			    	<img class='min_img_"+keyid+"' id='image_upload_honor_files2'  src='/cas/service/attach?param="+keyid+"&amp;target=brower' style='display:none;width:100%;height: 100%;' />\
 
-			    	<img class='delete_img' src='/cas/img/cas/common/delete.png' style='width:10px;height: 10px;position: absolute;margin-left:35px;margin-top:3px;' />\
 
-			    	<div tag='"+keyid+"' class='back_list_upload_honor_files' id='back_list_upload_honor_files2' style='width:100%;height: 30px;background: url(/cas/service/attach?param="+keyid+"&amp;target=brower);background-size: 100% 100%;'>\
 
+			    	<img class='min_img_"+keyid+"' id='image_upload_honor_files2'  src='/service/attach?param="+keyid+"&amp;target=brower' style='display:none;width:100%;height: 100%;' />\
 
+			    	<img class='delete_img' src='/img/cas/common/delete.png' style='width:10px;height: 10px;position: absolute;margin-left:35px;margin-top:3px;' />\
 
+			    	<div tag='"+keyid+"' class='back_list_upload_honor_files' id='back_list_upload_honor_files2' style='width:100%;height: 30px;background: url(/service/attach?param="+keyid+"&amp;target=brower);background-size: 100% 100%;'>\
 
 			     		<span id='upload_honor_files"+keyid+"' style='display: block;color:#fff;height: 30px;line-height: 30px;text-align: right;font-size: 12px;width:0%;float:right;background-color: rgba(221, 221, 221, 0.4);'></span>\
 
 			    	</div>\
 
 			   </div>";
 
@@ -253,7 +263,13 @@ function beforefunc(){
 
 	//证件照
 
 	$("#cas_user_portrait_id").val($("#upload_prove_file").attr("ids"));
 
 
-	$("#cas_user_honor_files").val($("#upload_honor_files").attr("ids"));
 
+	var ids = "";
 
+	$(".back_list_upload_honor_files").each(function (e){
 
+		ids+=$(this).attr("tag")+","
 
+	})
 
+
 
+	$("#cas_user_honor_files").val(ids);
 
+    debugger
 
 	return true ;
 
 }
 
 
@@ -306,9 +322,9 @@ function load_information(data){
 
 	$("#cas_service_require").val(data.data.cas_user.cas_service_require);
 
 	//设置头像
 
 	if(gdv(data.data.cas_user.portrait_id)){
 
-		$("#back_upload_prove_file").css({"background": 'url(/cas/service/attach?param='+data.data.cas_user.portrait_id+'&target=brower)100% 100%'});
 
+		$("#back_upload_prove_file").css({"background": 'url(/service/attach?param='+data.data.cas_user.portrait_id+'&target=brower)100% 100%'});
 
 	}else{
 
-		$("#back_upload_prove_file").css({"background": 'url(/cas/img/cas/common/default.png)'});
 
+		$("#back_upload_prove_file").css({"background": 'url(/img/cas/common/default.png)'});
 
 	}
 
 	$(".prove_file  .upload_file_list").html(get_attach_img(data.data.cas_user.portrait_id));//上传图片页面渲染出来

+ 2 - 2
src/cas_v0.2.0.1/build/classes/META-INF/resources/WEB-INF/oss/cas/cas_personnel.jsp
View File 

@@ -152,7 +152,7 @@
 
 						<div class="line" style="height: inherit">
 
 							<div class="left">荣誉图片：</div>
 
 							<div class="right webuploader honor_files">
 
-								<lg:upload  isList="true" buttonName="选择图片" domId="upload_honor_files" limitNum="5" limitSize="2097152" maxHeight="100" maxWidth="80"  type="<%=Code.UPLOAD_TAG_FILE_TYPE.IMG %>" layout="<%=Code.UPLOAD_TAG_LAYOUT.ABOVE %>"/>
 
+								<lg:upload  isList="true" buttonName="选择图片" domId="upload_honor_files" limitNum="500" limitSize="2097152" maxHeight="100" maxWidth="80"  type="<%=Code.UPLOAD_TAG_FILE_TYPE.IMG %>" layout="<%=Code.UPLOAD_TAG_LAYOUT.ABOVE %>"/>
 
 								<span style="color:red;line-height: 43px">最多5张，单张大小2M以内</span>
 
 							</div>
 
 							<input type-value="1125,1126" value="1123,1124" type="hidden" id="cas_user_honor_files" type-name="cas_user.honor_files">
 
@@ -307,7 +307,7 @@
 
 						<div class="line" style="height: inherit">
 
 							<div class="left">荣誉图片：</div>
 
 							<div class="right webuploader honor_files">
 
-								<lg:upload  isList="true" buttonName="选择图片" domId="upload_honor_files" limitNum="5" limitSize="2097152" maxHeight="100" maxWidth="80"  type="<%=Code.UPLOAD_TAG_FILE_TYPE.IMG %>" layout="<%=Code.UPLOAD_TAG_LAYOUT.ABOVE %>"/>
 
+								<lg:upload  isList="true" buttonName="选择图片" domId="upload_honor_files" limitNum="500" limitSize="2097152" maxHeight="100" maxWidth="80"  type="<%=Code.UPLOAD_TAG_FILE_TYPE.IMG %>" layout="<%=Code.UPLOAD_TAG_LAYOUT.ABOVE %>"/>
 
 								<span style="color:red;line-height: 43px">最多5张，单张大小2M以内</span>
 
 							</div>
 
 							<input type-value="1123,1124" value="1123,1124" type="hidden" id="cas_user_honor_files" type-name="cas_user.honor_files">

+ 3 - 1
src/cas_v0.2.0.1/build/classes/META-INF/resources/WEB-INF/oss/cas/member.jsp
View File 

@@ -16,7 +16,8 @@
 
     <%@ include  file="/WEB-INF/oss/lsp/common/resource_layout_style.jsp"%>
 
     <%@ include  file="/WEB-INF/oss/cas/common/common.jsp"%>
 
     <link type="text/css" href="<%=basePath%>/css/cas/oss/public.css?<%=version%>" rel="stylesheet" />
 
-    <script type="text/javascript" src="<%=basePath%>/js/cas/oss/public.js?<%=version%>"></script> 
+    <script type="text/javascript" src="<%=basePath%>/js/cas/oss/public.js?<%=version%>"></script>
 
+	<script type="text/javascript" src="<%=basePath%>/js/cas/ljc_0.2.js?<%=new Date().getTime()%>"></script>
 
 	<link type="text/css" href="<%=basePath%>/css/cas/oss/member.css?<%=version%>" rel="stylesheet" />
 
 	<script type="text/javascript" src="<%=basePath%>/js/cas/oss/member.js?<%=(new Date().getTime())%>"></script>
 
 	<script type="text/javascript">
 
@@ -187,6 +188,7 @@
 
 				{'name':'序号','type':'seq','width':'40px'}, 
 				{'name':'申请人','type':'value','value':'name','width':'100px'},
 
 				{'name':'类型','type':'category','value':'cas_user_type','width':'100px'},
 
+				{'name':'会员类型','type':'aid','value':'aid','width':'100px'},
 
 				{'name':'申请学会','type':'value','value':'branch_name','width':'100px'},
 
 				{'name':'单位名称','type':'value','value':'unit','default_value':'-','width':'100px'},
 
 				{'name':'申请原因','type':'value','value':'apply_cause','default_value':'-','width':'100px'},

+ 3 - 1
src/cas_v0.2.0.1/build/classes/META-INF/resources/WEB-INF/oss/cas/member_list.jsp
View File 

@@ -16,7 +16,8 @@
 
     <%@ include  file="/WEB-INF/oss/lsp/common/resource_layout_style.jsp"%>
 
     <%@ include  file="/WEB-INF/oss/cas/common/common.jsp"%>
 
     <link type="text/css" href="<%=basePath%>/css/cas/oss/public.css?<%=version%>" rel="stylesheet" />
 
-    <script type="text/javascript" src="<%=basePath%>/js/cas/oss/public.js?<%=version%>"></script> 
+	<script type="text/javascript" src="<%=basePath%>/js/cas/ljc_0.2.js?<%=new Date().getTime()%>"></script>
 
+	<script type="text/javascript" src="<%=basePath%>/js/cas/oss/public.js?<%=version%>"></script>
 
 	<link type="text/css" href="<%=basePath%>/css/cas/oss/member_list.css?<%=version%>" rel="stylesheet" />
 
 	<script type="text/javascript" src="<%=basePath%>/js/cas/oss/member_list.js?<%=new Date().getTime()%>"></script>
 
 	<script type="text/javascript">
 
@@ -198,6 +199,7 @@
 
 				{'name':'序号','type':'seq','width':'40px'}, 
 				{'name':'申请人','type':'value','value':'name','width':'100px'},
 
 				{'name':'类型','type':'category','value':'cas_user_type','width':'100px'},
 
+				{'name':'会员类型','type':'aid','value':'aid','width':'100px'},
 
 				{'name':'申请学会','type':'value','value':'branch_name','width':'100px'},
 
 				{'name':'单位名称','type':'value','value':'unit','default_value':'-','width':'100px'},
 
 				{'name':'申请原因','type':'value','value':'apply_cause','default_value':'-','width':'100px'},

+ 1 - 1
src/cas_v0.2.0.1/build/classes/META-INF/resources/WEB-INF/oss/cas/user_apply.jsp
View File 

@@ -115,7 +115,7 @@
 
 					</c:if>
 
 				</c:if>
 
 				<p class="title">申请个人基本信息</p>
 
-				<c:if test="${cas_user.cas_user_approval_status != 202501 && cas_user.cas_user_approval_status != 202504  && cas_user.lsp_user_id == user.id}">
 
+				<c:if test="${cas_user.cas_user_approval_status == 202503 && cas_user.cas_user_type == 202301 && cas_user.cas_user_approval_status_manage==202503  && cas_user.lsp_user_id == user.id}">
 
 				<button class="lg-fashion-button-normal float_right margin_right perfect_info" style="position: absolute;right: 10px;top:10px" onclick="downloadc()">查看证书</button>
 
 				</c:if>
 
 					<table class="lg-fession-tab personnel">

+ 30 - 2
src/cas_v0.2.0.1/build/classes/META-INF/resources/js/cas/ljc_0.2.js
View File 

@@ -555,6 +555,20 @@ jQuery.fn.tableAdaptor = function (){
 
 	}
 
 	
 	var getTypeValue = function getTypeValueFunc(val,type,i,name,timeformat,obj){
 
+
 
+		if(type == 'aid'){
 
+
 
+			if(aobj.data("obj_loygra")[val]==1){
 
+				return "'学生会员'" ;
 
+			}
 
+			if(aobj.data("obj_loygra")[val]==2){
 
+				return "'普通会员'" ;
 
+			}
 
+			if(aobj.data("obj_loygra")[val]==3){
 
+				return "'高级会员'" ;
 
+			}
 
+			return "'未设置'" ;
 
+		}else
 
 		if(type == 'fix'){
 
 			return "'"+val+"'";
 
 		}else if(type == 'category'){
 
@@ -948,6 +962,9 @@ function detail_get_restall(selector,_config){
 
 		}
 
 	})
 
 }
 
+window.upsuccess = function (file, data){
 
+   return true;
 
+}
 
 
 
 //------------------------------------------------------------------------------------------
 
@@ -1026,10 +1043,11 @@ function UploadInit(imgUrl,ukey,func,id,domId,thumbnailWidth, thumbnailHeight,ac
 
     });
 
     // 当有文件添加进来的时候
 
     uploader.on('fileQueued', function(file) {
 
+		// debugger
 
     	$("#"+domId).css("width","0%");
 
     	$("#"+domId).attr("ids","");
 
     	$("#"+domId).css("display","inherit");
 
-    	uploader.options.formData={'uki':"ukey:" + getVal(ukey,"")};
 
+		uploader.options.formData={'uki':"ukey:" + getVal(ukey,"")};
 
     	uploader.makeThumb( file, function( error, src ) {
 
            $("#back_"+domId).css("background","url("+src+")");
 
            
@@ -1040,7 +1058,17 @@ function UploadInit(imgUrl,ukey,func,id,domId,thumbnailWidth, thumbnailHeight,ac
 
     	$("#all_"+domId).text(parseInt(percentage*100)+"%");
 
     	$("#"+domId).css("width",parseInt(100-percentage*100)+"%");
 
     });
 
-    uploader.on('uploadSuccess', func);
 
+    uploader.on('uploadSuccess', function (file, data) {
 
+		  if(domId=='upload_honor_files'){
 
+			  if(window.upsuccess(file,data)){
 
+				  func(file,data);
 
+			  }
 
+		  }else{
 
+			  func(file,data);
 
+		  }
 
+		}
 
+
 
+	);
 
     uploader.on('uploadError', function(file) {
 
     	console.log("文件上传出错");
 
     });

+ 28 - 12
src/cas_v0.2.0.1/build/classes/META-INF/resources/js/cas/oss/cas_personnel.js
View File 

@@ -90,6 +90,16 @@ $(document).ready(function(){
 
 	$("#downloadExcel").click(function(){
 
 		window.location.href = localUrl + "/oss/down/xls?cas_user_type="+cas_user_type;
 
 	})
 
+
 
+	window.upsuccess = function (file,data){
 
+		if($(".back_list_upload_honor_files").size()>=5){
 
+			showTip("超出限制的图片数量！")
 
+			return false;
 
+		}else{
 
+			return true;
 
+		}
 
+
 
+	}
 
 })
 
 /**
 
  * 修改初始化表单
 
@@ -135,9 +145,9 @@ function init_form(user_id){
 
 				$("#cas_service_require").val(data.data.cas_user.cas_service_require);
 
 				//设置头像
 
 				if(gdv(data.data.cas_user.portrait_id)){
 
-					$("#back_upload_prove_file").css({"background": 'url(/cas/service/attach?param='+data.data.cas_user.portrait_id+'&target=brower)100% 100%'});
 
+					$("#back_upload_prove_file").css({"background": 'url(/service/attach?param='+data.data.cas_user.portrait_id+'&target=brower)100% 100%'});
 
 				}else{
 
-					$("#back_upload_prove_file").css({"background": 'url(/cas/img/cas/common/default.png)'});
 
+					$("#back_upload_prove_file").css({"background": 'url(/img/cas/common/default.png)'});
 
 				}
 
 
 				$(".prove_file  .upload_file_list").html(get_attach_img(data.data.cas_user.portrait_id));//上传图片页面渲染出来
 
@@ -161,7 +171,7 @@ function init_form(user_id){
 
 			}
 
 		})
 
 	}else{
 
-		$("#back_upload_prove_file").css({"background": 'url(/cas/img/cas/common/default.png)'});
 
+		$("#back_upload_prove_file").css({"background": 'url(/img/cas/common/default.png)'});
 
 	}
 
 	$("#back_upload_prove_file").css({"background-size": '100% 100%'});
 
 }
 
@@ -185,9 +195,9 @@ function get_attach_img(portrait_id){
 
 	var html="";
 
 	if (portrait_id!="" && portrait_id!=undefined && portrait_id!='undefined') {
 
 		html+="<div style='width:56px;border-radius: 3px;padding:3px;border: 1px solid #ccc;float:left;margin-top:0px;margin-right:5px;cursor: pointer;margin-bottom: 5px;'>\
 
-			    	<img class='min_img_"+portrait_id+"' id='image_upload_prove_file2'  src='/cas/service/attach?param="+portrait_id+"&amp;target=brower' style='display:none;width:100%;height: 100%;' />\
 
-			    	<img class='delete_img' src='/cas/img/cas/common/delete.png' style='width:10px;height: 10px;position: absolute;margin-left:35px;margin-top:3px;' />\
 
-			    	<div tag='"+portrait_id+"' class='back_list_upload_prove_file' id='back_list_upload_prove_file2' style='width:100%;height: 30px;background: url(/cas/service/attach?param="+portrait_id+"&amp;target=brower);background-size: 100% 100%;'>\
 
+			    	<img class='min_img_"+portrait_id+"' id='image_upload_prove_file2'  src='/service/attach?param="+portrait_id+"&amp;target=brower' style='display:none;width:100%;height: 100%;' />\
 
+			    	<img class='delete_img' src='/img/cas/common/delete.png' style='width:10px;height: 10px;position: absolute;margin-left:35px;margin-top:3px;' />\
 
+			    	<div tag='"+portrait_id+"' class='back_list_upload_prove_file' id='back_list_upload_prove_file2' style='width:100%;height: 30px;background: url(/service/attach?param="+portrait_id+"&amp;target=brower);background-size: 100% 100%;'>\
 
 			     		<span id='upload_prove_file' style='display: block;color:#fff;height: 30px;line-height: 30px;text-align: right;font-size: 12px;width:0%;float:right;background-color: rgba(221, 221, 221, 0.4);'></span>\
 
 			    	</div>\
 
 			   </div>";
 
@@ -203,9 +213,9 @@ function get_attach_imgs(honor_fileids){
 
 			if(honor_fileids.split(",")[key]==""||honor_fileids.split(",")[key]==undefined ||key=='remove' ) continue;
 
 			var keyid = honor_fileids.split(",")[key];
 
 			html+="<div style='width:56px;border-radius: 3px;padding:3px;border: 1px solid #ccc;float:left;margin-top:0px;margin-right:5px;cursor: pointer;margin-bottom: 5px;'>\
 
-			    	<img class='min_img_"+keyid+"' id='image_upload_honor_files2'  src='/cas/service/attach?param="+keyid+"&amp;target=brower' style='display:none;width:100%;height: 100%;' />\
 
-			    	<img class='delete_img' src='/cas/img/cas/common/delete.png' style='width:10px;height: 10px;position: absolute;margin-left:35px;margin-top:3px;' />\
 
-			    	<div tag='"+keyid+"' class='back_list_upload_honor_files' id='back_list_upload_honor_files2' style='width:100%;height: 30px;background: url(/cas/service/attach?param="+keyid+"&amp;target=brower);background-size: 100% 100%;'>\
 
+			    	<img class='min_img_"+keyid+"' id='image_upload_honor_files2'  src='/service/attach?param="+keyid+"&amp;target=brower' style='display:none;width:100%;height: 100%;' />\
 
+			    	<img class='delete_img' src='/img/cas/common/delete.png' style='width:10px;height: 10px;position: absolute;margin-left:35px;margin-top:3px;' />\
 
+			    	<div tag='"+keyid+"' class='back_list_upload_honor_files' id='back_list_upload_honor_files2' style='width:100%;height: 30px;background: url(/service/attach?param="+keyid+"&amp;target=brower);background-size: 100% 100%;'>\
 
 			     		<span id='upload_honor_files"+keyid+"' style='display: block;color:#fff;height: 30px;line-height: 30px;text-align: right;font-size: 12px;width:0%;float:right;background-color: rgba(221, 221, 221, 0.4);'></span>\
 
 			    	</div>\
 
 			   </div>";
 
@@ -253,7 +263,13 @@ function beforefunc(){
 
 	//证件照
 
 	$("#cas_user_portrait_id").val($("#upload_prove_file").attr("ids"));
 
 
-	$("#cas_user_honor_files").val($("#upload_honor_files").attr("ids"));
 
+	var ids = "";
 
+	$(".back_list_upload_honor_files").each(function (e){
 
+		ids+=$(this).attr("tag")+","
 
+	})
 
+
 
+	$("#cas_user_honor_files").val(ids);
 
+    debugger
 
 	return true ;
 
 }
 
 
@@ -306,9 +322,9 @@ function load_information(data){
 
 	$("#cas_service_require").val(data.data.cas_user.cas_service_require);
 
 	//设置头像
 
 	if(gdv(data.data.cas_user.portrait_id)){
 
-		$("#back_upload_prove_file").css({"background": 'url(/cas/service/attach?param='+data.data.cas_user.portrait_id+'&target=brower)100% 100%'});
 
+		$("#back_upload_prove_file").css({"background": 'url(/service/attach?param='+data.data.cas_user.portrait_id+'&target=brower)100% 100%'});
 
 	}else{
 
-		$("#back_upload_prove_file").css({"background": 'url(/cas/img/cas/common/default.png)'});
 
+		$("#back_upload_prove_file").css({"background": 'url(/img/cas/common/default.png)'});
 
 	}
 
 	$(".prove_file  .upload_file_list").html(get_attach_img(data.data.cas_user.portrait_id));//上传图片页面渲染出来

+ 4 - 4
src/cas_v0.2.0.1/build/classes/bak/config-lsp.properties
View File 

@@ -13,16 +13,16 @@ project.status=debug
 
 
 #------------------------- 访问domain配置begin -------------------------
 
 #本服务domain
 
-local.domain=http://cas.jscts.org.cn
 
+local.domain=http://localhost:8080/cas
 
 #------------------------- 访问domain配置begin -------------------------
 
 
 #------------------------- file config begin-------------------------
 
 #文件的储存地址
 
-file.path=/file
 
+file.path=./file
 
 #文件访问方式：默认为应用处理debug,图片服务处理distributed
 
 file.response.type=debug
 
 #图片服务访问地址,需要配置404图片
 
-file.distributed.domain=http://cas.jscts.org.cn/res
 
+file.distributed.domain=http://localhost:8080/res
 
 #------------------------- file config end-------------------------
 
 
 #------------------------- jdbc config begin-------------------------
 
@@ -31,7 +31,7 @@ jdbc.db.alias=postgresql
 
 jdbc.driverClassName=org.postgresql.Driver
 
 jdbc.url=jdbc:postgresql://127.0.0.1:5432/cas
 
 jdbc.username=postgres
 
-jdbc.password=tw20gj150Me803
 
+jdbc.password=postgres
 
 
 #jdbc.db.alias=mysql
 
 #jdbc.driverClassName=com.mysql.jdbc.Driver

BIN
src/cas_v0.2.0.1/build/classes/com/loygra/cas/controller/oss/CasOssController.class
View File


BIN
src/cas_v0.2.0.1/build/classes/com/loygra/cas/controller/oss/CasOssViewController.class
View File


+ 4 - 4
src/cas_v0.2.0.1/build/classes/config-lsp.properties
View File 

@@ -13,16 +13,16 @@ project.status=debug
 
 
 #------------------------- 访问domain配置begin -------------------------
 
 #本服务domain
 
-local.domain=http://cas.jscts.org.cn
 
+local.domain=http://localhost:8080/cas
 
 #------------------------- 访问domain配置begin -------------------------
 
 
 #------------------------- file config begin-------------------------
 
 #文件的储存地址
 
-file.path=/file
 
+file.path=./file
 
 #文件访问方式：默认为应用处理debug,图片服务处理distributed
 
 file.response.type=debug
 
 #图片服务访问地址,需要配置404图片
 
-file.distributed.domain=http://cas.jscts.org.cn/res
 
+file.distributed.domain=http://localhost:8080/res
 
 #------------------------- file config end-------------------------
 
 
 #------------------------- jdbc config begin-------------------------
 
@@ -31,7 +31,7 @@ jdbc.db.alias=postgresql
 
 jdbc.driverClassName=org.postgresql.Driver
 
 jdbc.url=jdbc:postgresql://127.0.0.1:5432/cas
 
 jdbc.username=postgres
 
-jdbc.password=tw20gj150Me803
 
+jdbc.password=postgres
 
 
 #jdbc.db.alias=mysql
 
 #jdbc.driverClassName=com.mysql.jdbc.Driver

+ 2 - 2
src/cas_v0.2.0.1/build/classes/log4j.properties
View File 

@@ -33,14 +33,14 @@ log4j.appender.CONSOLE.layout.ConversionPattern=%d %p [%t] %C.%M(%F:%L) - %m%n
 
 #FileAppender
 
 log4j.appender.D=org.apache.log4j.DailyRollingFileAppender
 
 log4j.appender.D.Threshold=DEBUG
 
-log4j.appender.D.File=/deploy/logs/cas/debug.log
 
+log4j.appender.D.File=./deploy/logs/cas/debug.log
 
 log4j.appender.D.Append=true
 
 log4j.appender.D.layout=org.apache.log4j.PatternLayout
 
 log4j.appender.R.layout.ConversionPattern=%d %p [%t] %C.%M(%F:%L) - %m%n
 
 
 log4j.appender.E=org.apache.log4j.DailyRollingFileAppender
 
 log4j.appender.E.Threshold=ERROR
 
-log4j.appender.E.File=/deploy/logs/cas/error.log
 
+log4j.appender.E.File=./deploy/logs/cas/error.log
 
 log4j.appender.E.Append=true
 
 log4j.appender.E.layout=org.apache.log4j.PatternLayout
 
 log4j.appender.E.layout.ConversionPattern=%d %p [%t] %C.%M(%F:%L) - %m%n

+ 1 - 1
src/cas_v0.2.0.1/build/maven-archiver/pom.properties
View File 

@@ -1,5 +1,5 @@
 
 #Generated by Maven
 
-#Thu Mar 30 15:41:03 CST 2023
 
+#Fri Mar 31 16:39:10 CST 2023
 
 version=0.2.0.1
 
 groupId=com.loygra
 
 artifactId=cas

+ 9 - 3
src/cas_v0.2.0.1/src/main/java/com/loygra/cas/controller/oss/CasOssController.java
View File 

@@ -316,13 +316,18 @@ public class CasOssController extends BaseController {
 
 							CasParam param1 = new CasParam();
 
 							param1.setUser_id(temp.getId());
 
 							Map<String, Object> resultMap1 = super.service.selectOne("CasUnitInfo.selectOne", param1);
 
+
 
 							CasUnitInfo unit = (CasUnitInfo) getData(resultMap1);
 
-							Map<String,String> map1 = unit.getData();
 
-							Map<String, Object> tt= temp.getOtherdata();
 
+							Map<String, Object> tt= new HashMap<>();
 
+							Map<String, String> map1 = new HashMap<>();
 
+							if(unit != null) {
 
+								tt = temp.getOtherdata();
 
+								map1 = unit.getData();
 
+							}
 
 							if(tt==null) tt=new HashMap<>();
 
 							tt.put("cas_unit",unit);
 
 							temp.setOtherdata(tt);
 
-							map1.put("company_birthday", Util.date.formatSimple(unit.getCompany_birthday()));
 
+							map1.put("company_birthday", unit==null?"":Util.date.formatSimple(unit.getCompany_birthday()));
 
 						}
 
 
 						temp.setId(i+1L);
 
@@ -337,6 +342,7 @@ public class CasOssController extends BaseController {
 
 				putStatusCode(resultMap, Code.RESPONSE_CODE.USER_NEED_LOGIN);
 
 			}
 
 		} catch (Exception e) {
 
+			e.printStackTrace();
 
 			super.exception(e, resultMap);
 
 		}
 
 	}

+ 1 - 1
src/cas_v0.2.0.1/src/main/java/com/loygra/cas/controller/oss/CasOssViewController.java
View File 

@@ -344,7 +344,7 @@ public class CasOssViewController extends BaseController {
 
 			}
 
 		}
 
 		if(pu.getCas_user().getAid()==null){
 
-			bh = "0000000";
 
+			bh = "暂未设置";
 
 		}else if(pu.getCas_user().getAid().equals(1L)){
 
            bh = "GX2"+bh1;
 
 		}else if(pu.getCas_user().getAid().equals(2L)){

+ 1 - 1
src/cas_v0.2.0.1/src/main/resources/log4j.properties
View File 

@@ -40,7 +40,7 @@ log4j.appender.R.layout.ConversionPattern=%d %p [%t] %C.%M(%F:%L) - %m%n
 
 
 log4j.appender.E=org.apache.log4j.DailyRollingFileAppender
 
 log4j.appender.E.Threshold=ERROR
 
-log4j.appender.E.File=/deploy/logs/cas/error.log
 
+log4j.appender.E.File=./deploy/logs/cas/error.log
 
 log4j.appender.E.Append=true
 
 log4j.appender.E.layout=org.apache.log4j.PatternLayout
 
 log4j.appender.E.layout.ConversionPattern=%d %p [%t] %C.%M(%F:%L) - %m%n

+ 1 - 1
src/cas_v0.2.0.1/src/main/webapp/WEB-INF/oss/cas/user_apply.jsp
View File 

@@ -115,7 +115,7 @@
 
 					</c:if>
 
 				</c:if>
 
 				<p class="title">申请个人基本信息</p>
 
-				<c:if test="${cas_user.cas_user_approval_status == 202503 && cas_user.cas_user_approval_status_manage==202503  && cas_user.lsp_user_id == user.id}">
 
+				<c:if test="${cas_user.cas_user_approval_status == 202503 && cas_user.cas_user_type == 202301 && cas_user.cas_user_approval_status_manage==202503  && cas_user.lsp_user_id == user.id}">
 
 				<button class="lg-fashion-button-normal float_right margin_right perfect_info" style="position: absolute;right: 10px;top:10px" onclick="downloadc()">查看证书</button>
 
 				</c:if>
 
 					<table class="lg-fession-tab personnel">

+ 0 - 1
src/lls-papaya_v0.2.0/.classpath
View File 

@@ -27,7 +27,6 @@
 
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 
 		<attributes>
 
 			<attribute name="maven.pomderived" value="true"/>
 
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 
 		</attributes>
 
 	</classpathentry>
 
 	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v8.5.11"/>

+ 1 - 1
src/lls-papaya_v0.2.0/src/main/resources/config-lsp.properties
View File 

@@ -31,7 +31,7 @@ file.distributed.domain=http://localhost:8080/res
 
 #数据库,支持postgresql,mysql,oracle
 
 jdbc.db.alias=postgresql
 
 jdbc.driverClassName=org.postgresql.Driver
 
-jdbc.url=jdbc:postgresql://192.168.199.185:5432/lls
 
+jdbc.url=jdbc:postgresql://127.0.0.1:5432/cas
 
 jdbc.username=postgres
 
 jdbc.password=postgres

+ 1 - 1
src/lsp/src/build/classes/bak/config-lsp.properties
View File 

@@ -31,7 +31,7 @@ jdbc.db.alias=postgresql
 
 jdbc.driverClassName=org.postgresql.Driver
 
 jdbc.url=jdbc:postgresql://127.0.0.1:5432/cas
 
 jdbc.username=postgres
 
-jdbc.password=tw20gj150Me803
 
+jdbc.password=postgres
 
 
 #jdbc.db.alias=sqlserver
 
 #jdbc.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver

+ 1 - 1
src/lsp/src/build/classes/config-lsp.properties
View File 

@@ -31,7 +31,7 @@ jdbc.db.alias=postgresql
 
 jdbc.driverClassName=org.postgresql.Driver
 
 jdbc.url=jdbc:postgresql://127.0.0.1:5432/cas
 
 jdbc.username=postgres
 
-jdbc.password=tw20gj150Me803
 
+jdbc.password=postgres
 
 
 #jdbc.db.alias=sqlserver
 
 #jdbc.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver

BIN
src/lsp/src/build/loygra-lsp-0.6.5-sources.jar
View File


BIN
src/lsp/src/build/loygra-lsp-0.6.5.jar
View File