发票管理调整

src/main/java/com/jeeplus/modules/workinvoice/entity/WorkInvoiceExport.java

@@ -295,7 +295,6 @@ public class WorkInvoiceExport extends ActEntity<WorkInvoiceExport> {
 		this.projectName = projectName;
 	}
 
-	@ExcelField(title="开票金额", align=2, sort=7)
 	public Double getMoney() {
 		return money;
 	}
@@ -304,6 +303,7 @@ public class WorkInvoiceExport extends ActEntity<WorkInvoiceExport> {
 		this.money = money;
 	}
 
+	@ExcelField(title="开票金额", align=2, sort=7)
 	public String getMoneyStr() {
 		return moneyStr;
 	}

src/main/java/com/jeeplus/modules/workinvoice/service/WorkInvoiceService.java

@@ -363,7 +363,7 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 					if(projectNameList.contains("非项目发票")){
 						continue;
 					}
-					projectNameList.add("非项目发票："+projectRelation.getDetails());
+					projectNameList.add("其它："+projectRelation.getDetails());
 
 				}
 

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceAllTwoController.java

@@ -683,6 +683,7 @@ public class WorkInvoiceAllTwoController extends BaseController {
 				List<String> projectNameList = Lists.newArrayList();
 				List<String> reportNumber = Lists.newArrayList();
 				List<String> widNumber = Lists.newArrayList();
+				invoice.setMoneyStr(invoice.getMoney().toString());
 				boolean f = false;
 				for (WorkInvoiceProjectRelation info : projectRelation) {
 					if (StringUtils.isNotBlank(info.getReportDataNum())) {
@@ -1383,6 +1384,7 @@ public class WorkInvoiceAllTwoController extends BaseController {
 			}
 		}
 		model.addAttribute("workInvoice", workInvoice);
+		model.addAttribute("view", workInvoice.getHome());
 		return "modules/workinvoice/workInvoiceModifyInfo";
 	}
 
@@ -1394,6 +1396,9 @@ public class WorkInvoiceAllTwoController extends BaseController {
 	@RequestMapping(value = "updateWorkInvoiceInfo")
 	public String updateWorkInvoiceInfo(WorkInvoice workInvoice) {
 		workInvoiceService.updateDetils(workInvoice);
+		if (StringUtils.isNotBlank(workInvoice.getHome()) && workInvoice.getHome().equals("oldInfo")){
+			return "redirect:"+Global.getAdminPath()+"/workinvoiceAll/workInvoiceAll/?repage";
+		}
 		return "redirect:"+Global.getAdminPath()+"/workinvoiceAllTwo/workinvoiceAllTwo/?repage";
 	}
 

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceTwoController.java

@@ -687,6 +687,7 @@ public class WorkInvoiceTwoController extends BaseController {
 				List<String> projectNameList = Lists.newArrayList();
 				List<String> reportNumber = Lists.newArrayList();
 				List<String> widNumber = Lists.newArrayList();
+				invoice.setMoneyStr(invoice.getMoney().toString());
 				boolean f = false;
 				for (WorkInvoiceProjectRelation info : projectRelation) {
 					if (StringUtils.isNotBlank(info.getReportDataNum())) {

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllList.jsp

@@ -718,7 +718,10 @@
                         {
                             xml += "<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogre('变更发票管理', '${ctx}/workinvoiceAll/workInvoiceAll/alterForm?id="+ d.id +"','95%','95%')\" class=\"op-btn op-btn-revert\" ><i class=\"fa fa-edit\"></i> 变更</a>";
                         }*/
-
+						if(d.modifyDetails != undefined && d.modifyDetails =="1" && d.financeFlag =="1")
+						{
+							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreModify('修改发票明细', '${ctx}/workinvoiceAllTwo/workinvoiceAllTwo/modifyDetails?id=" + d.id + " &home=oldInfo ','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" >修改明细</a>";
+						}
 						if(d.adminModify != undefined && d.adminModify =="1")
 						{
 							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreModify('管理员修改发票', '${ctx}/workinvoiceAll/workInvoiceAll/form?id=" + d.id + "&tabId=3','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" >管理员修改</a>";
@@ -828,6 +831,14 @@
 					<shiro:hasPermission name="ruralProject:ruralProjectView:workInvoiceAllView">
 					,"showView":1
 					</shiro:hasPermission>
+
+					<shiro:hasPermission name="workinvoice:workInvoice:modifyDetails">
+					,"modifyDetails":
+							<c:choose>
+							<c:when test="${workInvoice.invoiceState == 5}">"1"</c:when>
+					<c:otherwise>"0"</c:otherwise>
+					</c:choose>
+					</shiro:hasPermission>
                 }
                 </c:forEach>
                 </c:if>

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllTwoList.jsp

@@ -785,7 +785,7 @@
                             xml += "<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogre('变更发票管理', '${ctx}/workinvoiceAllTwo/workinvoiceAllTwo/alterForm?id="+ d.id +"','95%','95%')\" class=\"op-btn op-btn-revert\" ><i class=\"fa fa-edit\"></i> 变更</a>";
                         }*/
 
-						if(d.modifyDetails != undefined && d.modifyDetails =="1")
+						if(d.modifyDetails != undefined && d.modifyDetails =="1"  && d.financeFlag =="1")
 						{
 							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreModify('修改发票明细', '${ctx}/workinvoiceAllTwo/workinvoiceAllTwo/modifyDetails?id=" + d.id + " ','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" >修改明细</a>";
 						}