Bläddra i källkod

新后台临时中转页面

chaoo 3 år sedan
förälder
incheckning
ccc8d29b44

+ 1 - 0
src/main/resources/config/beta/caimei.properties

@@ -175,6 +175,7 @@ export.template=/mnt/newdatadrive/data/custom/manager-export-template
 # SPI-server(CKEditor5图片上传API,搜索更新索引)
 caimei.spi=https://spi-b.caimei365.com
 caimei.core=https://core-b.caimei365.com
+caimei.manager=https://manager-b.caimei365.com
 
 #阿里云oss存储
 aliyun.accessKeyId=LTAI4GBL3o4YkWnbKYgf2Xia

+ 12 - 4
src/main/resources/config/dev/caimei.properties

@@ -12,9 +12,12 @@
 #mysql database setting
 jdbc.type=mysql
 jdbc.driver=com.mysql.cj.jdbc.Driver
-jdbc.url=jdbc:mysql://192.168.2.100:3306/caimei?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+#jdbc.url=jdbc:mysql://192.168.2.100:3306/caimei?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+#jdbc.username=developer
+#jdbc.password=05bZ/OxTB:X+yd%1
+jdbc.url=jdbc:mysql://120.79.25.27:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
 jdbc.username=developer
-jdbc.password=05bZ/OxTB:X+yd%1
+jdbc.password=J5p3tgOVazNl4ydf
 
 #jdbc.url=jdbc:mysql://120.79.25.27:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
 #jdbc.username=developer
@@ -41,9 +44,13 @@ jdbc.testSql=SELECT 'x' FROM DUAL
 
 #redis settings
 redis.keyPrefix=caimei-manager
-redis.host=192.168.2.100
+#redis.host=192.168.2.100
+#redis.port=6379
+#redis.pass=123456
+redis.host=47.119.112.46
 redis.port=6379
-redis.pass=123456
+redis.pass=6#xsI%b4o@5c3RoE
+
 redis.timeout=100000
 #\u6700\u5927\u8FDE\u63A5\u6570
 redis.pool.maxActive=300
@@ -189,6 +196,7 @@ export.template=export
 # SPI-server(CKEditor5图片上传API,搜索更新索引)
 caimei.spi=http://localhost:8008
 caimei.core=https://localhost:18002
+caimei.manager=http://localhost:9527
 #阿里云oss存储
 aliyun.accessKeyId=LTAI4GBL3o4YkWnbKYgf2Xia
 aliyun.accessKeySecret=dBjAXqbYiEPP6Ukuk2ZsXQeET7FVkK

+ 2 - 1
src/main/resources/config/dev/dfs_client.conf

@@ -11,7 +11,8 @@ base_path=/home/yuqing/fastdfs
 
 # tracker_server can ocur more than once, and tracker_server format is
 #  "host:port", host can be hostname or ip address
-tracker_server=192.168.2.100:22122
+# tracker_server=192.168.2.100:22122
+tracker_server=172.31.165.28:22122
 
 #standard log level as syslog, case insensitive, value list:
 ### emerg for emergency

+ 1 - 0
src/main/resources/config/prod/caimei.properties

@@ -176,6 +176,7 @@ export.template=/mnt/newdatadrive/data/custom/manager-export-template
 # SPI-server(CKEditor5图片上传API,搜索更新索引)
 caimei.spi=https://spi.caimei365.com
 caimei.core=https://core.caimei365.com
+caimei.manager=https://manager.caimei365.com
 
 #阿里云oss存储
 aliyun.accessKeyId=LTAI4GBL3o4YkWnbKYgf2Xia

+ 104 - 85
src/main/webapp/WEB-INF/views/modules/permission/rebateManagePermissionList.jsp

@@ -1,95 +1,114 @@
+<%@ page import="com.thinkgem.jeesite.common.config.Global" %>
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<% request.setAttribute("caimeiManager", Global.getConfig("caimei.manager"));%>
 <html>
 <head>
-	<title>返佣管理权限表(返佣管理人员使用)管理</title>
+	<title>临时中转页面</title>
 	<meta name="decorator" content="default"/>
 	<style type="text/css">
-		.table th{text-align: center;}
-		.table td{text-align: center;}
+		p{text-align: center;font-size:16px;line-height:1.5;}
+		p a{font-size: 18px;}
 	</style>
-	<script type="text/javascript">
-		$(document).ready(function() {
-			
-		});
-		function page(n,s){
-			$("#pageNo").val(n);
-			$("#pageSize").val(s);
-			$("#searchForm").submit();
-        	return false;
-        }
-	</script>
 </head>
 <body>
-	<ul class="nav nav-tabs">
-        <%--1收款通知权限(财务人员使用),2收款确认权限,3收款审核权限 4、返佣管理权限'--%>
-		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=1">收款通知权限</a></li>
-		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=2">收款确认权限</a></li>
-		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=3">收款审核权限</a></li>
-		<li class="active"><a href="${ctx}/permission/receiptUserPermission/list?userType=4">返佣管理权限</a></li>
-		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=5">供应商退款管理权限</a></li>
-	</ul>
-	<form:form id="searchForm" modelAttribute="receiptUserPermission" action="${ctx}/permission/receiptUserPermission/" method="post" class="breadcrumb form-search">
-		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
-		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-		<input id="userType" name="userType" type="hidden" value="4"/>
-		<div class="ul-form">
-			 <label>返佣管理人:</label>
-				<form:input path="name" htmlEscape="false" maxlength="50" class="input-medium"/>
-			<label>手机号码:</label>
-			<form:input path="mobile" htmlEscape="false" maxlength="20" class="input-medium"/>
-			<label>微信openID:</label>
-			<form:input path="openid" htmlEscape="false" maxlength="32" class="input-medium"/>
-			&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
-			<shiro:hasPermission name="permission:receiptUserPermission:edit">
-				<a class="btn btn-primary" href="${ctx}/permission/receiptUserPermission/form?userType=4">添加</a></li>
-			</shiro:hasPermission>
-			<div class="clearfix"></div>
-		</div>
-	</form:form>
-	<sys:message content="${message}"/>
-	<table id="contentTable" class="table table-striped table-bordered table-condensed">
-		<thead>
-			<tr>
-				<th>返佣管理人</th>
-				<th>手机</th>
-				<th>微信openID</th>
-				<th>身份</th>
-				<shiro:hasPermission name="permission:receiptUserPermission:edit"><th>操作</th></shiro:hasPermission>
-			</tr>
-		</thead>
-		<tbody>
-		<c:forEach items="${page.list}" var="receiptUserPermission">
-			<tr>
-				<td><a href="${ctx}/permission/receiptUserPermission/form?id=${receiptUserPermission.id}">
-					${receiptUserPermission.name}
-				</a></td>
-                <td>${receiptUserPermission.mobile}</td>
-                <td>${receiptUserPermission.openid}</td>
-				<td>
-					<c:if test="${receiptUserPermission.userIdentity eq 1}">
-						协销人员
-					</c:if>
-					<c:if test="${receiptUserPermission.userIdentity eq 2}">
-						客服
-					</c:if>
-					<c:if test="${receiptUserPermission.userIdentity eq 3}">
-						财务
-					</c:if>
-					<c:if test="${receiptUserPermission.userIdentity eq 4}">
-						超级管理员
-					</c:if>
-				</td>
-				<shiro:hasPermission name="permission:receiptUserPermission:edit"><td>
-    				<a href="${ctx}/permission/receiptUserPermission/form?id=${receiptUserPermission.id}">编辑</a>
-    				<shiro:hasPermission name="permission:receiptUserPermission:delete">
-					<a href="${ctx}/permission/receiptUserPermission/delete?id=${receiptUserPermission.id}" onclick="return confirmx('确认要删除吗?', this.href)">删除</a>
-					</shiro:hasPermission>
-				</td></shiro:hasPermission>
-			</tr>
-		</c:forEach>
-		</tbody>
-	</table>
-	<div class="pagination">${page}</div>
+<p>收款人权限【已重构至新后台】</p>
+<p><a href="${caimeiManager}/#/finance/receipts/users" target="_blank">点击访问新后台:收款人权限</a></p>
+<p>(账号:本系统登录名,初始密码:caimei123,若登录后无权限访问,请联系系统管理员分配角色及添加权限)</p>
 </body>
-</html>
+</html>
+<%--<%@ page contentType="text/html;charset=UTF-8" %>--%>
+<%--<%@ include file="/WEB-INF/views/include/taglib.jsp"%>--%>
+<%--<html>--%>
+<%--<head>--%>
+<%--	<title>返佣管理权限表(返佣管理人员使用)管理</title>--%>
+<%--	<meta name="decorator" content="default"/>--%>
+<%--	<style type="text/css">--%>
+<%--		.table th{text-align: center;}--%>
+<%--		.table td{text-align: center;}--%>
+<%--	</style>--%>
+<%--	<script type="text/javascript">--%>
+<%--		$(document).ready(function() {--%>
+<%--			--%>
+<%--		});--%>
+<%--		function page(n,s){--%>
+<%--			$("#pageNo").val(n);--%>
+<%--			$("#pageSize").val(s);--%>
+<%--			$("#searchForm").submit();--%>
+<%--        	return false;--%>
+<%--        }--%>
+<%--	</script>--%>
+<%--</head>--%>
+<%--<body>--%>
+<%--	<ul class="nav nav-tabs">--%>
+<%--        &lt;%&ndash;1收款通知权限(财务人员使用),2收款确认权限,3收款审核权限 4、返佣管理权限'&ndash;%&gt;--%>
+<%--		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=1">收款通知权限</a></li>--%>
+<%--		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=2">收款确认权限</a></li>--%>
+<%--		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=3">收款审核权限</a></li>--%>
+<%--		<li class="active"><a href="${ctx}/permission/receiptUserPermission/list?userType=4">返佣管理权限</a></li>--%>
+<%--		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=5">供应商退款管理权限</a></li>--%>
+<%--	</ul>--%>
+<%--	<form:form id="searchForm" modelAttribute="receiptUserPermission" action="${ctx}/permission/receiptUserPermission/" method="post" class="breadcrumb form-search">--%>
+<%--		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>--%>
+<%--		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>--%>
+<%--		<input id="userType" name="userType" type="hidden" value="4"/>--%>
+<%--		<div class="ul-form">--%>
+<%--			 <label>返佣管理人:</label>--%>
+<%--				<form:input path="name" htmlEscape="false" maxlength="50" class="input-medium"/>--%>
+<%--			<label>手机号码:</label>--%>
+<%--			<form:input path="mobile" htmlEscape="false" maxlength="20" class="input-medium"/>--%>
+<%--			<label>微信openID:</label>--%>
+<%--			<form:input path="openid" htmlEscape="false" maxlength="32" class="input-medium"/>--%>
+<%--			&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>--%>
+<%--			<shiro:hasPermission name="permission:receiptUserPermission:edit">--%>
+<%--				<a class="btn btn-primary" href="${ctx}/permission/receiptUserPermission/form?userType=4">添加</a></li>--%>
+<%--			</shiro:hasPermission>--%>
+<%--			<div class="clearfix"></div>--%>
+<%--		</div>--%>
+<%--	</form:form>--%>
+<%--	<sys:message content="${message}"/>--%>
+<%--	<table id="contentTable" class="table table-striped table-bordered table-condensed">--%>
+<%--		<thead>--%>
+<%--			<tr>--%>
+<%--				<th>返佣管理人</th>--%>
+<%--				<th>手机</th>--%>
+<%--				<th>微信openID</th>--%>
+<%--				<th>身份</th>--%>
+<%--				<shiro:hasPermission name="permission:receiptUserPermission:edit"><th>操作</th></shiro:hasPermission>--%>
+<%--			</tr>--%>
+<%--		</thead>--%>
+<%--		<tbody>--%>
+<%--		<c:forEach items="${page.list}" var="receiptUserPermission">--%>
+<%--			<tr>--%>
+<%--				<td><a href="${ctx}/permission/receiptUserPermission/form?id=${receiptUserPermission.id}">--%>
+<%--					${receiptUserPermission.name}--%>
+<%--				</a></td>--%>
+<%--                <td>${receiptUserPermission.mobile}</td>--%>
+<%--                <td>${receiptUserPermission.openid}</td>--%>
+<%--				<td>--%>
+<%--					<c:if test="${receiptUserPermission.userIdentity eq 1}">--%>
+<%--						协销人员--%>
+<%--					</c:if>--%>
+<%--					<c:if test="${receiptUserPermission.userIdentity eq 2}">--%>
+<%--						客服--%>
+<%--					</c:if>--%>
+<%--					<c:if test="${receiptUserPermission.userIdentity eq 3}">--%>
+<%--						财务--%>
+<%--					</c:if>--%>
+<%--					<c:if test="${receiptUserPermission.userIdentity eq 4}">--%>
+<%--						超级管理员--%>
+<%--					</c:if>--%>
+<%--				</td>--%>
+<%--				<shiro:hasPermission name="permission:receiptUserPermission:edit"><td>--%>
+<%--    				<a href="${ctx}/permission/receiptUserPermission/form?id=${receiptUserPermission.id}">编辑</a>--%>
+<%--    				<shiro:hasPermission name="permission:receiptUserPermission:delete">--%>
+<%--					<a href="${ctx}/permission/receiptUserPermission/delete?id=${receiptUserPermission.id}" onclick="return confirmx('确认要删除吗?', this.href)">删除</a>--%>
+<%--					</shiro:hasPermission>--%>
+<%--				</td></shiro:hasPermission>--%>
+<%--			</tr>--%>
+<%--		</c:forEach>--%>
+<%--		</tbody>--%>
+<%--	</table>--%>
+<%--	<div class="pagination">${page}</div>--%>
+<%--</body>--%>
+<%--</html>--%>

+ 103 - 84
src/main/webapp/WEB-INF/views/modules/permission/receiptConfirmPermissionList.jsp

@@ -1,94 +1,113 @@
+<%@ page import="com.thinkgem.jeesite.common.config.Global" %>
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<% request.setAttribute("caimeiManager", Global.getConfig("caimei.manager"));%>
 <html>
 <head>
-	<title>收款确认权限管理</title>
+	<title>临时中转页面</title>
 	<meta name="decorator" content="default"/>
 	<style type="text/css">
-		.table th{text-align: center;}
-		.table td{text-align: center;}
+		p{text-align: center;font-size:16px;line-height:1.5;}
+		p a{font-size: 18px;}
 	</style>
-	<script type="text/javascript">
-		$(document).ready(function() {
-			
-		});
-		function page(n,s){
-			$("#pageNo").val(n);
-			$("#pageSize").val(s);
-			$("#searchForm").submit();
-        	return false;
-        }
-	</script>
 </head>
 <body>
-	<ul class="nav nav-tabs">
-		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=1">收款通知权限</a></li>
-		<li class="active"><a href="${ctx}/permission/receiptUserPermission/list?userType=2">收款确认权限</a></li>
-		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=3">收款审核权限</a></li>
-		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=4">返佣管理权限</a></li>
-		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=5">供应商退款管理权限</a></li>
-	</ul>
-	<form:form id="searchForm" modelAttribute="receiptUserPermission" action="${ctx}/permission/receiptUserPermission/" method="post" class="breadcrumb form-search">
-		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
-		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-		<input id="userType" name="userType" type="hidden" value="2"/>
-		<div class="ul-form">
-			<label>收款确认人:</label>
-				<form:input path="name" htmlEscape="false" maxlength="50" class="input-medium"/>
-			<label>手机号码:</label>
-				<form:input path="mobile" htmlEscape="false" maxlength="20" class="input-medium"/>
-			<label>微信openID:</label>
-				<form:input path="openid" htmlEscape="false" maxlength="32" class="input-medium"/>
-			&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
-			<shiro:hasPermission name="permission:receiptUserPermission:edit">
-				<a class="btn btn-primary" href="${ctx}/permission/receiptUserPermission/form?userType=2">添加</a></li>
-			</shiro:hasPermission>
-			<div class="clearfix"></div>
-		</div>
-	</form:form>
-	<sys:message content="${message}"/>
-	<table id="contentTable" class="table table-striped table-bordered table-condensed">
-		<thead>
-			<tr>
-				<th>收款确认人</th>
-				<th>手机</th>
-				<th>微信openID</th>
-				<th>身份</th>
-				<shiro:hasPermission name="permission:receiptUserPermission:edit"><th>操作</th></shiro:hasPermission>
-			</tr>
-		</thead>
-		<tbody>
-		<c:forEach items="${page.list}" var="receiptUserPermission">
-			<tr>
-				<td><a href="${ctx}/permission/receiptUserPermission/form?id=${receiptUserPermission.id}">
-					${receiptUserPermission.name}
-				</a></td>
-				<td>${receiptUserPermission.mobile}</td>
-				<td>${receiptUserPermission.openid}</td>
-				<td>
-					<c:if test="${receiptUserPermission.userIdentity eq 1}">
-						协销人员
-					</c:if>
-					<c:if test="${receiptUserPermission.userIdentity eq 2}">
-						客服
-					</c:if>
-					<c:if test="${receiptUserPermission.userIdentity eq 3}">
-						财务
-					</c:if>
-					<c:if test="${receiptUserPermission.userIdentity eq 4}">
-						超级管理员
-					</c:if>
-				</td>
-				<shiro:hasPermission name="permission:receiptUserPermission:edit"><td>
-    				<a href="${ctx}/permission/receiptUserPermission/form?id=${receiptUserPermission.id}">编辑</a>
-    				<shiro:hasPermission name="permission:receiptUserPermission:delete">
-					<a href="${ctx}/permission/receiptUserPermission/delete?id=${receiptUserPermission.id}" onclick="return confirmx('确认要删除吗?', this.href)">删除</a>
-					</shiro:hasPermission>
-				</td></shiro:hasPermission>
-			</tr>
-		</c:forEach>
-		</tbody>
-	</table>
-	<div class="pagination">${page}</div>
+	<p>收款人权限【已重构至新后台】</p>
+	<p><a href="${caimeiManager}/#/finance/receipts/users" target="_blank">点击访问新后台:收款人权限</a></p>
+	<p>(账号:本系统登录名,初始密码:caimei123,若登录后无权限访问,请联系系统管理员分配角色及添加权限)</p>
 </body>
-</html>
+</html>
+<%--<%@ page contentType="text/html;charset=UTF-8" %>--%>
+<%--<%@ include file="/WEB-INF/views/include/taglib.jsp"%>--%>
+<%--<html>--%>
+<%--<head>--%>
+<%--	<title>收款确认权限管理</title>--%>
+<%--	<meta name="decorator" content="default"/>--%>
+<%--	<style type="text/css">--%>
+<%--		.table th{text-align: center;}--%>
+<%--		.table td{text-align: center;}--%>
+<%--	</style>--%>
+<%--	<script type="text/javascript">--%>
+<%--		$(document).ready(function() {--%>
+<%--			--%>
+<%--		});--%>
+<%--		function page(n,s){--%>
+<%--			$("#pageNo").val(n);--%>
+<%--			$("#pageSize").val(s);--%>
+<%--			$("#searchForm").submit();--%>
+<%--        	return false;--%>
+<%--        }--%>
+<%--	</script>--%>
+<%--</head>--%>
+<%--<body>--%>
+<%--	<ul class="nav nav-tabs">--%>
+<%--		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=1">收款通知权限</a></li>--%>
+<%--		<li class="active"><a href="${ctx}/permission/receiptUserPermission/list?userType=2">收款确认权限</a></li>--%>
+<%--		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=3">收款审核权限</a></li>--%>
+<%--		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=4">返佣管理权限</a></li>--%>
+<%--		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=5">供应商退款管理权限</a></li>--%>
+<%--	</ul>--%>
+<%--	<form:form id="searchForm" modelAttribute="receiptUserPermission" action="${ctx}/permission/receiptUserPermission/" method="post" class="breadcrumb form-search">--%>
+<%--		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>--%>
+<%--		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>--%>
+<%--		<input id="userType" name="userType" type="hidden" value="2"/>--%>
+<%--		<div class="ul-form">--%>
+<%--			<label>收款确认人:</label>--%>
+<%--				<form:input path="name" htmlEscape="false" maxlength="50" class="input-medium"/>--%>
+<%--			<label>手机号码:</label>--%>
+<%--				<form:input path="mobile" htmlEscape="false" maxlength="20" class="input-medium"/>--%>
+<%--			<label>微信openID:</label>--%>
+<%--				<form:input path="openid" htmlEscape="false" maxlength="32" class="input-medium"/>--%>
+<%--			&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>--%>
+<%--			<shiro:hasPermission name="permission:receiptUserPermission:edit">--%>
+<%--				<a class="btn btn-primary" href="${ctx}/permission/receiptUserPermission/form?userType=2">添加</a></li>--%>
+<%--			</shiro:hasPermission>--%>
+<%--			<div class="clearfix"></div>--%>
+<%--		</div>--%>
+<%--	</form:form>--%>
+<%--	<sys:message content="${message}"/>--%>
+<%--	<table id="contentTable" class="table table-striped table-bordered table-condensed">--%>
+<%--		<thead>--%>
+<%--			<tr>--%>
+<%--				<th>收款确认人</th>--%>
+<%--				<th>手机</th>--%>
+<%--				<th>微信openID</th>--%>
+<%--				<th>身份</th>--%>
+<%--				<shiro:hasPermission name="permission:receiptUserPermission:edit"><th>操作</th></shiro:hasPermission>--%>
+<%--			</tr>--%>
+<%--		</thead>--%>
+<%--		<tbody>--%>
+<%--		<c:forEach items="${page.list}" var="receiptUserPermission">--%>
+<%--			<tr>--%>
+<%--				<td><a href="${ctx}/permission/receiptUserPermission/form?id=${receiptUserPermission.id}">--%>
+<%--					${receiptUserPermission.name}--%>
+<%--				</a></td>--%>
+<%--				<td>${receiptUserPermission.mobile}</td>--%>
+<%--				<td>${receiptUserPermission.openid}</td>--%>
+<%--				<td>--%>
+<%--					<c:if test="${receiptUserPermission.userIdentity eq 1}">--%>
+<%--						协销人员--%>
+<%--					</c:if>--%>
+<%--					<c:if test="${receiptUserPermission.userIdentity eq 2}">--%>
+<%--						客服--%>
+<%--					</c:if>--%>
+<%--					<c:if test="${receiptUserPermission.userIdentity eq 3}">--%>
+<%--						财务--%>
+<%--					</c:if>--%>
+<%--					<c:if test="${receiptUserPermission.userIdentity eq 4}">--%>
+<%--						超级管理员--%>
+<%--					</c:if>--%>
+<%--				</td>--%>
+<%--				<shiro:hasPermission name="permission:receiptUserPermission:edit"><td>--%>
+<%--    				<a href="${ctx}/permission/receiptUserPermission/form?id=${receiptUserPermission.id}">编辑</a>--%>
+<%--    				<shiro:hasPermission name="permission:receiptUserPermission:delete">--%>
+<%--					<a href="${ctx}/permission/receiptUserPermission/delete?id=${receiptUserPermission.id}" onclick="return confirmx('确认要删除吗?', this.href)">删除</a>--%>
+<%--					</shiro:hasPermission>--%>
+<%--				</td></shiro:hasPermission>--%>
+<%--			</tr>--%>
+<%--		</c:forEach>--%>
+<%--		</tbody>--%>
+<%--	</table>--%>
+<%--	<div class="pagination">${page}</div>--%>
+<%--</body>--%>
+<%--</html>--%>

+ 106 - 87
src/main/webapp/WEB-INF/views/modules/permission/receiptNoticePermissionList.jsp

@@ -1,94 +1,113 @@
+<%@ page import="com.thinkgem.jeesite.common.config.Global" %>
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<% request.setAttribute("caimeiManager", Global.getConfig("caimei.manager"));%>
 <html>
 <head>
-	<title>收款通知权限管理</title>
-	<meta name="decorator" content="default"/>
-	<style type="text/css">
-		.table th{text-align: center;}
-		.table td{text-align: center;}
-	</style>
-	<script type="text/javascript">
-		$(document).ready(function() {
-			
-		});
-		function page(n,s){
-			$("#pageNo").val(n);
-			$("#pageSize").val(s);
-			$("#searchForm").submit();
-        	return false;
-        }
-	</script>
+    <title>临时中转页面</title>
+    <meta name="decorator" content="default"/>
+    <style type="text/css">
+        p{text-align: center;font-size:16px;line-height:1.5;}
+        p a{font-size: 18px;}
+    </style>
 </head>
 <body>
-	<ul class="nav nav-tabs">
-		<li class="active"><a href="${ctx}/permission/receiptUserPermission/list?userType=1">收款通知权限</a></li>
-		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=2">收款确认权限</a></li>
-		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=3">收款审核权限</a></li>
-		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=4">返佣管理权限</a></li>
-		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=5">供应商退款管理权限</a></li>
-	</ul>
-	<form:form id="searchForm" modelAttribute="receiptUserPermission" action="${ctx}/permission/receiptUserPermission/" method="post" class="breadcrumb form-search">
-		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
-		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-		<input id="userType" name="userType" type="hidden" value="1"/>
-		<div class="ul-form">
-			 <label>收款通知人:</label>
-				<form:input path="name" htmlEscape="false" maxlength="20" class="input-medium"/>
-			<label>手机号码:</label>
-				<form:input path="mobile" htmlEscape="false" maxlength="20" class="input-medium"/>
-			<label>微信openID:</label>
-				<form:input path="openid" htmlEscape="false" maxlength="32" class="input-medium"/>
-			&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
-			<shiro:hasPermission name="permission:receiptUserPermission:edit">
-				<a class="btn btn-primary" href="${ctx}/permission/receiptUserPermission/form?userType=1">添加</a></li>
-			</shiro:hasPermission>
-			<div class="clearfix"></div>
-		</div>
-	</form:form>
-	<sys:message content="${message}"/>
-	<table id="contentTable" class="table table-striped table-bordered table-condensed">
-		<thead>
-			<tr>
-				<th>收款通知人</th>
-				<th>手机</th>
-				<th>微信openID</th>
-				<th>身份</th>
-				<shiro:hasPermission name="permission:receiptUserPermission:edit"><th>操作</th></shiro:hasPermission>
-			</tr>
-		</thead>
-		<tbody>
-		<c:forEach items="${page.list}" var="receiptUserPermission">
-			<tr>
-				<td><a href="${ctx}/permission/receiptUserPermission/form?id=${receiptUserPermission.id}">
-					${receiptUserPermission.name}
-				</a></td>
-				<td>${receiptUserPermission.mobile}</td>
-				<td>${receiptUserPermission.openid}</td>
-				<td>
-					<c:if test="${receiptUserPermission.userIdentity eq 1}">
-						协销人员
-					</c:if>
-					<c:if test="${receiptUserPermission.userIdentity eq 2}">
-						客服
-					</c:if>
-					<c:if test="${receiptUserPermission.userIdentity eq 3}">
-						财务
-					</c:if>
-					<c:if test="${receiptUserPermission.userIdentity eq 4}">
-						超级管理员
-					</c:if>
-				</td>
-				<shiro:hasPermission name="permission:receiptUserPermission:edit"><td>
-    				<a href="${ctx}/permission/receiptUserPermission/form?id=${receiptUserPermission.id}">编辑</a>
-    				<shiro:hasPermission name="permission:receiptUserPermission:delete">
-					<a href="${ctx}/permission/receiptUserPermission/delete?id=${receiptUserPermission.id}" onclick="return confirmx('确认要删除吗?', this.href)">删除</a>
-					</shiro:hasPermission>
-				</td></shiro:hasPermission>
-			</tr>
-		</c:forEach>
-		</tbody>
-	</table>
-	<div class="pagination">${page}</div>
+<p>收款人权限【已重构至新后台】</p>
+<p><a href="${caimeiManager}/#/finance/receipts/users" target="_blank">点击访问新后台:收款人权限</a></p>
+<p>(账号:本系统登录名,初始密码:caimei123,若登录后无权限访问,请联系系统管理员分配角色及添加权限)</p>
 </body>
-</html>
+</html>
+<%--<%@ page contentType="text/html;charset=UTF-8" %>--%>
+<%--<%@ include file="/WEB-INF/views/include/taglib.jsp"%>--%>
+<%--<html>--%>
+<%--<head>--%>
+<%--	<title>收款通知权限管理</title>--%>
+<%--	<meta name="decorator" content="default"/>--%>
+<%--	<style type="text/css">--%>
+<%--		.table th{text-align: center;}--%>
+<%--		.table td{text-align: center;}--%>
+<%--	</style>--%>
+<%--	<script type="text/javascript">--%>
+<%--		$(document).ready(function() {--%>
+<%--			--%>
+<%--		});--%>
+<%--		function page(n,s){--%>
+<%--			$("#pageNo").val(n);--%>
+<%--			$("#pageSize").val(s);--%>
+<%--			$("#searchForm").submit();--%>
+<%--        	return false;--%>
+<%--        }--%>
+<%--	</script>--%>
+<%--</head>--%>
+<%--<body>--%>
+<%--	<ul class="nav nav-tabs">--%>
+<%--		<li class="active"><a href="${ctx}/permission/receiptUserPermission/list?userType=1">收款通知权限</a></li>--%>
+<%--		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=2">收款确认权限</a></li>--%>
+<%--		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=3">收款审核权限</a></li>--%>
+<%--		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=4">返佣管理权限</a></li>--%>
+<%--		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=5">供应商退款管理权限</a></li>--%>
+<%--	</ul>--%>
+<%--	<form:form id="searchForm" modelAttribute="receiptUserPermission" action="${ctx}/permission/receiptUserPermission/" method="post" class="breadcrumb form-search">--%>
+<%--		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>--%>
+<%--		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>--%>
+<%--		<input id="userType" name="userType" type="hidden" value="1"/>--%>
+<%--		<div class="ul-form">--%>
+<%--			 <label>收款通知人:</label>--%>
+<%--				<form:input path="name" htmlEscape="false" maxlength="20" class="input-medium"/>--%>
+<%--			<label>手机号码:</label>--%>
+<%--				<form:input path="mobile" htmlEscape="false" maxlength="20" class="input-medium"/>--%>
+<%--			<label>微信openID:</label>--%>
+<%--				<form:input path="openid" htmlEscape="false" maxlength="32" class="input-medium"/>--%>
+<%--			&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>--%>
+<%--			<shiro:hasPermission name="permission:receiptUserPermission:edit">--%>
+<%--				<a class="btn btn-primary" href="${ctx}/permission/receiptUserPermission/form?userType=1">添加</a></li>--%>
+<%--			</shiro:hasPermission>--%>
+<%--			<div class="clearfix"></div>--%>
+<%--		</div>--%>
+<%--	</form:form>--%>
+<%--	<sys:message content="${message}"/>--%>
+<%--	<table id="contentTable" class="table table-striped table-bordered table-condensed">--%>
+<%--		<thead>--%>
+<%--			<tr>--%>
+<%--				<th>收款通知人</th>--%>
+<%--				<th>手机</th>--%>
+<%--				<th>微信openID</th>--%>
+<%--				<th>身份</th>--%>
+<%--				<shiro:hasPermission name="permission:receiptUserPermission:edit"><th>操作</th></shiro:hasPermission>--%>
+<%--			</tr>--%>
+<%--		</thead>--%>
+<%--		<tbody>--%>
+<%--		<c:forEach items="${page.list}" var="receiptUserPermission">--%>
+<%--			<tr>--%>
+<%--				<td><a href="${ctx}/permission/receiptUserPermission/form?id=${receiptUserPermission.id}">--%>
+<%--					${receiptUserPermission.name}--%>
+<%--				</a></td>--%>
+<%--				<td>${receiptUserPermission.mobile}</td>--%>
+<%--				<td>${receiptUserPermission.openid}</td>--%>
+<%--				<td>--%>
+<%--					<c:if test="${receiptUserPermission.userIdentity eq 1}">--%>
+<%--						协销人员--%>
+<%--					</c:if>--%>
+<%--					<c:if test="${receiptUserPermission.userIdentity eq 2}">--%>
+<%--						客服--%>
+<%--					</c:if>--%>
+<%--					<c:if test="${receiptUserPermission.userIdentity eq 3}">--%>
+<%--						财务--%>
+<%--					</c:if>--%>
+<%--					<c:if test="${receiptUserPermission.userIdentity eq 4}">--%>
+<%--						超级管理员--%>
+<%--					</c:if>--%>
+<%--				</td>--%>
+<%--				<shiro:hasPermission name="permission:receiptUserPermission:edit"><td>--%>
+<%--    				<a href="${ctx}/permission/receiptUserPermission/form?id=${receiptUserPermission.id}">编辑</a>--%>
+<%--    				<shiro:hasPermission name="permission:receiptUserPermission:delete">--%>
+<%--					<a href="${ctx}/permission/receiptUserPermission/delete?id=${receiptUserPermission.id}" onclick="return confirmx('确认要删除吗?', this.href)">删除</a>--%>
+<%--					</shiro:hasPermission>--%>
+<%--				</td></shiro:hasPermission>--%>
+<%--			</tr>--%>
+<%--		</c:forEach>--%>
+<%--		</tbody>--%>
+<%--	</table>--%>
+<%--	<div class="pagination">${page}</div>--%>
+<%--</body>--%>
+<%--</html>--%>

+ 103 - 84
src/main/webapp/WEB-INF/views/modules/permission/receiptReviewPermissionList.jsp

@@ -1,94 +1,113 @@
+<%@ page import="com.thinkgem.jeesite.common.config.Global" %>
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<% request.setAttribute("caimeiManager", Global.getConfig("caimei.manager"));%>
 <html>
 <head>
-	<title>收款审核权限表(审核人员使用)管理</title>
+	<title>临时中转页面</title>
 	<meta name="decorator" content="default"/>
 	<style type="text/css">
-		.table th{text-align: center;}
-		.table td{text-align: center;}
+		p{text-align: center;font-size:16px;line-height:1.5;}
+		p a{font-size: 18px;}
 	</style>
-	<script type="text/javascript">
-		$(document).ready(function() {
-			
-		});
-		function page(n,s){
-			$("#pageNo").val(n);
-			$("#pageSize").val(s);
-			$("#searchForm").submit();
-        	return false;
-        }
-	</script>
 </head>
 <body>
-	<ul class="nav nav-tabs">
-		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=1">收款通知权限</a></li>
-		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=2">收款确认权限</a></li>
-		<li class="active"><a href="${ctx}/permission/receiptUserPermission/list?userType=3">收款审核权限</a></li>
-		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=4">返佣管理权限</a></li>
-		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=5">供应商退款管理权限</a></li>
-	</ul>
-	<form:form id="searchForm" modelAttribute="receiptUserPermission" action="${ctx}/permission/receiptUserPermission/" method="post" class="breadcrumb form-search">
-		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
-		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-		<input id="userType" name="userType" type="hidden" value="3"/>
-		<div class="ul-form">
-			 <label>收款审核人:</label>
-				<form:input path="name" htmlEscape="false" maxlength="50" class="input-medium"/>
-			<label>手机号码:</label>
-			<form:input path="mobile" htmlEscape="false" maxlength="20" class="input-medium"/>
-			<label>微信openID:</label>
-			<form:input path="openid" htmlEscape="false" maxlength="32" class="input-medium"/>
-			&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
-			<shiro:hasPermission name="permission:receiptUserPermission:edit">
-				<a class="btn btn-primary" href="${ctx}/permission/receiptUserPermission/form?userType=3">添加</a></li>
-			</shiro:hasPermission>
-			<div class="clearfix"></div>
-		</div>
-	</form:form>
-	<sys:message content="${message}"/>
-	<table id="contentTable" class="table table-striped table-bordered table-condensed">
-		<thead>
-			<tr>
-				<th>收款审核人</th>
-				<th>手机</th>
-				<th>微信openID</th>
-				<th>身份</th>
-				<shiro:hasPermission name="permission:receiptUserPermission:edit"><th>操作</th></shiro:hasPermission>
-			</tr>
-		</thead>
-		<tbody>
-		<c:forEach items="${page.list}" var="receiptUserPermission">
-			<tr>
-				<td><a href="${ctx}/permission/receiptUserPermission/form?id=${receiptUserPermission.id}">
-					${receiptUserPermission.name}
-				</a></td>
-				<td>${receiptUserPermission.mobile}</td>
-				<td>${receiptUserPermission.openid}</td>
-				<td>
-					<c:if test="${receiptUserPermission.userIdentity eq 1}">
-						协销人员
-					</c:if>
-					<c:if test="${receiptUserPermission.userIdentity eq 2}">
-						客服
-					</c:if>
-					<c:if test="${receiptUserPermission.userIdentity eq 3}">
-						财务
-					</c:if>
-					<c:if test="${receiptUserPermission.userIdentity eq 4}">
-						超级管理员
-					</c:if>
-				</td>
-				<shiro:hasPermission name="permission:receiptUserPermission:edit"><td>
-    				<a href="${ctx}/permission/receiptUserPermission/form?id=${receiptUserPermission.id}">编辑</a>
-    				<shiro:hasPermission name="permission:receiptUserPermission:delete">
-					<a href="${ctx}/permission/receiptUserPermission/delete?id=${receiptUserPermission.id}" onclick="return confirmx('确认要删除吗?', this.href)">删除</a>
-					</shiro:hasPermission>
-				</td></shiro:hasPermission>
-			</tr>
-		</c:forEach>
-		</tbody>
-	</table>
-	<div class="pagination">${page}</div>
+<p>收款人权限【已重构至新后台】</p>
+<p><a href="${caimeiManager}/#/finance/receipts/users" target="_blank">点击访问新后台:收款人权限</a></p>
+<p>(账号:本系统登录名,初始密码:caimei123,若登录后无权限访问,请联系系统管理员分配角色及添加权限)</p>
 </body>
-</html>
+</html>
+<%--<%@ page contentType="text/html;charset=UTF-8" %>--%>
+<%--<%@ include file="/WEB-INF/views/include/taglib.jsp"%>--%>
+<%--<html>--%>
+<%--<head>--%>
+<%--	<title>收款审核权限表(审核人员使用)管理</title>--%>
+<%--	<meta name="decorator" content="default"/>--%>
+<%--	<style type="text/css">--%>
+<%--		.table th{text-align: center;}--%>
+<%--		.table td{text-align: center;}--%>
+<%--	</style>--%>
+<%--	<script type="text/javascript">--%>
+<%--		$(document).ready(function() {--%>
+<%--			--%>
+<%--		});--%>
+<%--		function page(n,s){--%>
+<%--			$("#pageNo").val(n);--%>
+<%--			$("#pageSize").val(s);--%>
+<%--			$("#searchForm").submit();--%>
+<%--        	return false;--%>
+<%--        }--%>
+<%--	</script>--%>
+<%--</head>--%>
+<%--<body>--%>
+<%--	<ul class="nav nav-tabs">--%>
+<%--		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=1">收款通知权限</a></li>--%>
+<%--		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=2">收款确认权限</a></li>--%>
+<%--		<li class="active"><a href="${ctx}/permission/receiptUserPermission/list?userType=3">收款审核权限</a></li>--%>
+<%--		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=4">返佣管理权限</a></li>--%>
+<%--		<li><a href="${ctx}/permission/receiptUserPermission/list?userType=5">供应商退款管理权限</a></li>--%>
+<%--	</ul>--%>
+<%--	<form:form id="searchForm" modelAttribute="receiptUserPermission" action="${ctx}/permission/receiptUserPermission/" method="post" class="breadcrumb form-search">--%>
+<%--		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>--%>
+<%--		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>--%>
+<%--		<input id="userType" name="userType" type="hidden" value="3"/>--%>
+<%--		<div class="ul-form">--%>
+<%--			 <label>收款审核人:</label>--%>
+<%--				<form:input path="name" htmlEscape="false" maxlength="50" class="input-medium"/>--%>
+<%--			<label>手机号码:</label>--%>
+<%--			<form:input path="mobile" htmlEscape="false" maxlength="20" class="input-medium"/>--%>
+<%--			<label>微信openID:</label>--%>
+<%--			<form:input path="openid" htmlEscape="false" maxlength="32" class="input-medium"/>--%>
+<%--			&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>--%>
+<%--			<shiro:hasPermission name="permission:receiptUserPermission:edit">--%>
+<%--				<a class="btn btn-primary" href="${ctx}/permission/receiptUserPermission/form?userType=3">添加</a></li>--%>
+<%--			</shiro:hasPermission>--%>
+<%--			<div class="clearfix"></div>--%>
+<%--		</div>--%>
+<%--	</form:form>--%>
+<%--	<sys:message content="${message}"/>--%>
+<%--	<table id="contentTable" class="table table-striped table-bordered table-condensed">--%>
+<%--		<thead>--%>
+<%--			<tr>--%>
+<%--				<th>收款审核人</th>--%>
+<%--				<th>手机</th>--%>
+<%--				<th>微信openID</th>--%>
+<%--				<th>身份</th>--%>
+<%--				<shiro:hasPermission name="permission:receiptUserPermission:edit"><th>操作</th></shiro:hasPermission>--%>
+<%--			</tr>--%>
+<%--		</thead>--%>
+<%--		<tbody>--%>
+<%--		<c:forEach items="${page.list}" var="receiptUserPermission">--%>
+<%--			<tr>--%>
+<%--				<td><a href="${ctx}/permission/receiptUserPermission/form?id=${receiptUserPermission.id}">--%>
+<%--					${receiptUserPermission.name}--%>
+<%--				</a></td>--%>
+<%--				<td>${receiptUserPermission.mobile}</td>--%>
+<%--				<td>${receiptUserPermission.openid}</td>--%>
+<%--				<td>--%>
+<%--					<c:if test="${receiptUserPermission.userIdentity eq 1}">--%>
+<%--						协销人员--%>
+<%--					</c:if>--%>
+<%--					<c:if test="${receiptUserPermission.userIdentity eq 2}">--%>
+<%--						客服--%>
+<%--					</c:if>--%>
+<%--					<c:if test="${receiptUserPermission.userIdentity eq 3}">--%>
+<%--						财务--%>
+<%--					</c:if>--%>
+<%--					<c:if test="${receiptUserPermission.userIdentity eq 4}">--%>
+<%--						超级管理员--%>
+<%--					</c:if>--%>
+<%--				</td>--%>
+<%--				<shiro:hasPermission name="permission:receiptUserPermission:edit"><td>--%>
+<%--    				<a href="${ctx}/permission/receiptUserPermission/form?id=${receiptUserPermission.id}">编辑</a>--%>
+<%--    				<shiro:hasPermission name="permission:receiptUserPermission:delete">--%>
+<%--					<a href="${ctx}/permission/receiptUserPermission/delete?id=${receiptUserPermission.id}" onclick="return confirmx('确认要删除吗?', this.href)">删除</a>--%>
+<%--					</shiro:hasPermission>--%>
+<%--				</td></shiro:hasPermission>--%>
+<%--			</tr>--%>
+<%--		</c:forEach>--%>
+<%--		</tbody>--%>
+<%--	</table>--%>
+<%--	<div class="pagination">${page}</div>--%>
+<%--</body>--%>
+<%--</html>--%>

+ 104 - 85
src/main/webapp/WEB-INF/views/modules/permission/shopRefundPermissionList.jsp

@@ -1,95 +1,114 @@
+<%@ page import="com.thinkgem.jeesite.common.config.Global" %>
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<% request.setAttribute("caimeiManager", Global.getConfig("caimei.manager"));%>
 <html>
 <head>
-    <title>供应商退款权限管理</title>
+    <title>临时中转页面</title>
     <meta name="decorator" content="default"/>
     <style type="text/css">
-        .table th{text-align: center;}
-        .table td{text-align: center;}
+        p{text-align: center;font-size:16px;line-height:1.5;}
+        p a{font-size: 18px;}
     </style>
-    <script type="text/javascript">
-        $(document).ready(function() {
-
-        });
-        function page(n,s){
-            $("#pageNo").val(n);
-            $("#pageSize").val(s);
-            $("#searchForm").submit();
-            return false;
-        }
-    </script>
 </head>
 <body>
-<ul class="nav nav-tabs">
-    <%--1收款通知权限(财务人员使用),2收款确认权限,3收款审核权限 4、返佣管理权限'--%>
-    <li><a href="${ctx}/permission/receiptUserPermission/list?userType=1">收款通知权限</a></li>
-    <li><a href="${ctx}/permission/receiptUserPermission/list?userType=2">收款确认权限</a></li>
-    <li><a href="${ctx}/permission/receiptUserPermission/list?userType=3">收款审核权限</a></li>
-    <li><a href="${ctx}/permission/receiptUserPermission/list?userType=4">返佣管理权限</a></li>
-    <li class="active"><a href="${ctx}/permission/receiptUserPermission/list?userType=5">供应商退款管理权限</a></li>
-</ul>
-<form:form id="searchForm" modelAttribute="receiptUserPermission" action="${ctx}/permission/receiptUserPermission/" method="post" class="breadcrumb form-search">
-    <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
-    <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-    <input id="userType" name="userType" type="hidden" value="5"/>
-    <div class="ul-form">
-        <label>退款确认人:</label>
-        <form:input path="name" htmlEscape="false" maxlength="50" class="input-medium"/>
-        <label>手机号码:</label>
-        <form:input path="mobile" htmlEscape="false" maxlength="20" class="input-medium"/>
-        <label>微信openID:</label>
-        <form:input path="openid" htmlEscape="false" maxlength="32" class="input-medium"/>
-        &nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
-        <shiro:hasPermission name="permission:receiptUserPermission:edit">
-            <a class="btn btn-primary" href="${ctx}/permission/receiptUserPermission/form?userType=5">添加</a></li>
-        </shiro:hasPermission>
-        <div class="clearfix"></div>
-    </div>
-</form:form>
-<sys:message content="${message}"/>
-<table id="contentTable" class="table table-striped table-bordered table-condensed">
-    <thead>
-    <tr>
-        <th>退款确认人</th>
-        <th>手机</th>
-        <th>微信openID</th>
-        <th>身份</th>
-        <shiro:hasPermission name="permission:receiptUserPermission:edit"><th>操作</th></shiro:hasPermission>
-    </tr>
-    </thead>
-    <tbody>
-    <c:forEach items="${page.list}" var="receiptUserPermission">
-        <tr>
-            <td><a href="${ctx}/permission/receiptUserPermission/form?id=${receiptUserPermission.id}">
-                    ${receiptUserPermission.name}
-            </a></td>
-            <td>${receiptUserPermission.mobile}</td>
-            <td>${receiptUserPermission.openid}</td>
-            <td>
-                <c:if test="${receiptUserPermission.userIdentity eq 1}">
-                    协销人员
-                </c:if>
-                <c:if test="${receiptUserPermission.userIdentity eq 2}">
-                    客服
-                </c:if>
-                <c:if test="${receiptUserPermission.userIdentity eq 3}">
-                    财务
-                </c:if>
-                <c:if test="${receiptUserPermission.userIdentity eq 4}">
-                    超级管理员
-                </c:if>
-            </td>
-            <shiro:hasPermission name="permission:receiptUserPermission:edit"><td>
-                <a href="${ctx}/permission/receiptUserPermission/form?id=${receiptUserPermission.id}">编辑</a>
-                <shiro:hasPermission name="permission:receiptUserPermission:delete">
-                    <a href="${ctx}/permission/receiptUserPermission/delete?id=${receiptUserPermission.id}" onclick="return confirmx('确认要删除吗?', this.href)">删除</a>
-                </shiro:hasPermission>
-            </td></shiro:hasPermission>
-        </tr>
-    </c:forEach>
-    </tbody>
-</table>
-<div class="pagination">${page}</div>
+<p>收款人权限【已重构至新后台】</p>
+<p><a href="${caimeiManager}/#/finance/receipts/users" target="_blank">点击访问新后台:收款人权限</a></p>
+<p>(账号:本系统登录名,初始密码:caimei123,若登录后无权限访问,请联系系统管理员分配角色及添加权限)</p>
 </body>
-</html>
+</html>
+<%--<%@ page contentType="text/html;charset=UTF-8" %>--%>
+<%--<%@ include file="/WEB-INF/views/include/taglib.jsp"%>--%>
+<%--<html>--%>
+<%--<head>--%>
+<%--    <title>供应商退款权限管理</title>--%>
+<%--    <meta name="decorator" content="default"/>--%>
+<%--    <style type="text/css">--%>
+<%--        .table th{text-align: center;}--%>
+<%--        .table td{text-align: center;}--%>
+<%--    </style>--%>
+<%--    <script type="text/javascript">--%>
+<%--        $(document).ready(function() {--%>
+
+<%--        });--%>
+<%--        function page(n,s){--%>
+<%--            $("#pageNo").val(n);--%>
+<%--            $("#pageSize").val(s);--%>
+<%--            $("#searchForm").submit();--%>
+<%--            return false;--%>
+<%--        }--%>
+<%--    </script>--%>
+<%--</head>--%>
+<%--<body>--%>
+<%--<ul class="nav nav-tabs">--%>
+<%--    &lt;%&ndash;1收款通知权限(财务人员使用),2收款确认权限,3收款审核权限 4、返佣管理权限'&ndash;%&gt;--%>
+<%--    <li><a href="${ctx}/permission/receiptUserPermission/list?userType=1">收款通知权限</a></li>--%>
+<%--    <li><a href="${ctx}/permission/receiptUserPermission/list?userType=2">收款确认权限</a></li>--%>
+<%--    <li><a href="${ctx}/permission/receiptUserPermission/list?userType=3">收款审核权限</a></li>--%>
+<%--    <li><a href="${ctx}/permission/receiptUserPermission/list?userType=4">返佣管理权限</a></li>--%>
+<%--    <li class="active"><a href="${ctx}/permission/receiptUserPermission/list?userType=5">供应商退款管理权限</a></li>--%>
+<%--</ul>--%>
+<%--<form:form id="searchForm" modelAttribute="receiptUserPermission" action="${ctx}/permission/receiptUserPermission/" method="post" class="breadcrumb form-search">--%>
+<%--    <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>--%>
+<%--    <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>--%>
+<%--    <input id="userType" name="userType" type="hidden" value="5"/>--%>
+<%--    <div class="ul-form">--%>
+<%--        <label>退款确认人:</label>--%>
+<%--        <form:input path="name" htmlEscape="false" maxlength="50" class="input-medium"/>--%>
+<%--        <label>手机号码:</label>--%>
+<%--        <form:input path="mobile" htmlEscape="false" maxlength="20" class="input-medium"/>--%>
+<%--        <label>微信openID:</label>--%>
+<%--        <form:input path="openid" htmlEscape="false" maxlength="32" class="input-medium"/>--%>
+<%--        &nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>--%>
+<%--        <shiro:hasPermission name="permission:receiptUserPermission:edit">--%>
+<%--            <a class="btn btn-primary" href="${ctx}/permission/receiptUserPermission/form?userType=5">添加</a></li>--%>
+<%--        </shiro:hasPermission>--%>
+<%--        <div class="clearfix"></div>--%>
+<%--    </div>--%>
+<%--</form:form>--%>
+<%--<sys:message content="${message}"/>--%>
+<%--<table id="contentTable" class="table table-striped table-bordered table-condensed">--%>
+<%--    <thead>--%>
+<%--    <tr>--%>
+<%--        <th>退款确认人</th>--%>
+<%--        <th>手机</th>--%>
+<%--        <th>微信openID</th>--%>
+<%--        <th>身份</th>--%>
+<%--        <shiro:hasPermission name="permission:receiptUserPermission:edit"><th>操作</th></shiro:hasPermission>--%>
+<%--    </tr>--%>
+<%--    </thead>--%>
+<%--    <tbody>--%>
+<%--    <c:forEach items="${page.list}" var="receiptUserPermission">--%>
+<%--        <tr>--%>
+<%--            <td><a href="${ctx}/permission/receiptUserPermission/form?id=${receiptUserPermission.id}">--%>
+<%--                    ${receiptUserPermission.name}--%>
+<%--            </a></td>--%>
+<%--            <td>${receiptUserPermission.mobile}</td>--%>
+<%--            <td>${receiptUserPermission.openid}</td>--%>
+<%--            <td>--%>
+<%--                <c:if test="${receiptUserPermission.userIdentity eq 1}">--%>
+<%--                    协销人员--%>
+<%--                </c:if>--%>
+<%--                <c:if test="${receiptUserPermission.userIdentity eq 2}">--%>
+<%--                    客服--%>
+<%--                </c:if>--%>
+<%--                <c:if test="${receiptUserPermission.userIdentity eq 3}">--%>
+<%--                    财务--%>
+<%--                </c:if>--%>
+<%--                <c:if test="${receiptUserPermission.userIdentity eq 4}">--%>
+<%--                    超级管理员--%>
+<%--                </c:if>--%>
+<%--            </td>--%>
+<%--            <shiro:hasPermission name="permission:receiptUserPermission:edit"><td>--%>
+<%--                <a href="${ctx}/permission/receiptUserPermission/form?id=${receiptUserPermission.id}">编辑</a>--%>
+<%--                <shiro:hasPermission name="permission:receiptUserPermission:delete">--%>
+<%--                    <a href="${ctx}/permission/receiptUserPermission/delete?id=${receiptUserPermission.id}" onclick="return confirmx('确认要删除吗?', this.href)">删除</a>--%>
+<%--                </shiro:hasPermission>--%>
+<%--            </td></shiro:hasPermission>--%>
+<%--        </tr>--%>
+<%--    </c:forEach>--%>
+<%--    </tbody>--%>
+<%--</table>--%>
+<%--<div class="pagination">${page}</div>--%>
+<%--</body>--%>
+<%--</html>--%>