财务管理（发票管理（全)/报销管理(全)）

src/main/java/com/jeeplus/modules/workreimbursement/web/WorkReimbursementAllController.java

@@ -236,7 +236,7 @@ public class WorkReimbursementAllController extends BaseController {
 			workReimbursement.setOfficeId(office.getId());
 			workReimbursement.setOfficeName(office.getTopCompany());
 		}
-		if ("workReimbursementFormAdd".equals(view)&&"0".equals(tabId)){
+		if ("workReimbursementAllFormAdd".equals(view)&&"0".equals(tabId)){
 			if(UserUtils.getBasicInfo()!=null && StringUtils.isNotBlank(UserUtils.getBasicInfo().getId())) {
 				List<WorkReimbursementBack> backList = workReimbursementBackService.findLoanList(UserUtils.getBasicInfo().getId());
 				workReimbursement.setReimbursementBackList(backList);

src/main/webapp/webpage/modules/workreimbursement/workReimbursementAllList.jsp

@@ -235,25 +235,25 @@
                     ,"submitterDate":"<fmt:formatDate value="${workReimbursement.submitterDate}" pattern="yyyy-MM-dd"/>"
                     ,"money":"<fmt:formatNumber value="${workReimbursement.money}" pattern="#,#0.00"/>"
                     ,"status":"${workReimbursement.status}"
-<%--                    <shiro:hasPermission name="workreimbursement:workReimbursement:del">--%>
-<%--                    ,"candelete":--%>
-<%--                        <c:if test="${fns:getUser().id == workReimbursement.createBy.id && (workReimbursement.status == '1' or workReimbursement.status == '3' or workReimbursement.status == '4')}">"1"</c:if>--%>
-<%--                    <c:if test="${fns:getUser().id != workReimbursement.createBy.id || (workReimbursement.status != '1' and workReimbursement.status != '3' and workReimbursement.status != '4')}">"0"</c:if>--%>
-<%--                    </shiro:hasPermission>--%>
-<%--                    ,"cancancel":--%>
-<%--                        <c:if test="${workReimbursement.status == '2' && fns:getUser().id == workReimbursement.createBy.id}">"1"</c:if>--%>
-<%--                    <c:if test="${workReimbursement.status != '2' || fns:getUser().id != workReimbursement.createBy.id}">"0"</c:if>--%>
-<%--                    <shiro:hasPermission name="workreimbursement:workReimbursement:edit">--%>
-<%--                    ,"canedit1":--%>
-<%--                        <c:if test="${fns:getUser().id == workReimbursement.createBy.id && workReimbursement.status == '1' }">"1"</c:if>--%>
-<%--                    <c:if test="${fns:getUser().id != workReimbursement.createBy.id || workReimbursement.status != '1' }">"0"</c:if>--%>
-<%--                    ,"canedit2":--%>
-<%--                        <c:if test="${fns:getUser().id == workReimbursement.createBy.id && workReimbursement.status == '4' && fns:getUser().id == workReimbursement.createBy.id}">"1"</c:if>--%>
-<%--                    <c:if test="${fns:getUser().id != workReimbursement.createBy.id || workReimbursement.status != '4' || fns:getUser().id != workReimbursement.createBy.id}">"0"</c:if>--%>
-<%--                    ,"canedit3":--%>
-<%--                        <c:if test="${workReimbursement.status == '3' && fns:getUser().id == workReimbursement.createBy.id}">"1"</c:if>--%>
-<%--                    <c:if test="${workReimbursement.status != '3' || fns:getUser().id != workReimbursement.createBy.id}">"0"</c:if>--%>
-<%--                    </shiro:hasPermission>--%>
+                    <shiro:hasPermission name="workreimbursement:workReimbursementAll:del">
+                    ,"candelete":
+                        <c:if test="${fns:getUser().id == workReimbursement.createBy.id && (workReimbursement.status == '1' or workReimbursement.status == '3' or workReimbursement.status == '4')}">"1"</c:if>
+                    <c:if test="${fns:getUser().id != workReimbursement.createBy.id || (workReimbursement.status != '1' and workReimbursement.status != '3' and workReimbursement.status != '4')}">"0"</c:if>
+                    </shiro:hasPermission>
+                    ,"cancancel":
+                        <c:if test="${workReimbursement.status == '2' && fns:getUser().id == workReimbursement.createBy.id}">"1"</c:if>
+                    <c:if test="${workReimbursement.status != '2' || fns:getUser().id != workReimbursement.createBy.id}">"0"</c:if>
+                    <shiro:hasPermission name="workreimbursement:workReimbursementAll:edit">
+                    ,"canedit1":
+                        <c:if test="${fns:getUser().id == workReimbursement.createBy.id && workReimbursement.status == '1' }">"1"</c:if>
+                    <c:if test="${fns:getUser().id != workReimbursement.createBy.id || workReimbursement.status != '1' }">"0"</c:if>
+                    ,"canedit2":
+                        <c:if test="${fns:getUser().id == workReimbursement.createBy.id && workReimbursement.status == '4' && fns:getUser().id == workReimbursement.createBy.id}">"1"</c:if>
+                    <c:if test="${fns:getUser().id != workReimbursement.createBy.id || workReimbursement.status != '4' || fns:getUser().id != workReimbursement.createBy.id}">"0"</c:if>
+                    ,"canedit3":
+                        <c:if test="${workReimbursement.status == '3' && fns:getUser().id == workReimbursement.createBy.id}">"1"</c:if>
+                    <c:if test="${workReimbursement.status != '3' || fns:getUser().id != workReimbursement.createBy.id}">"0"</c:if>
+                    </shiro:hasPermission>
                 }
                 </c:forEach>
                 </c:if>