Forráskód Böngészése

修改了开票日期的显示不对的问题

[user3] 3 éve
szülő
commit
5e4c480b08

+ 2 - 2
src/main/webapp/webpage/modules/workinvoice/workInvoiceAllList.jsp

@@ -665,7 +665,7 @@
 						return "<span title='"+ d.invoiceType +"'>" + d.invoiceType + "</span>";
 					}}
 
-				,{field:'createDate',align:'center', sort:true,title: '开票日期',  width:80}
+				,{field:'invoiceDate',align:'center', sort:true,title: '开票日期',  width:80}
 				,{field:'receiptMoneyDate',align:'center', sort:true,title: '收款日期',  width:80}
 				,{field:'receiptMoney',align:'center', title: '是否收款',  width:80}
 				,{field:'cancellation',align:'center', title: '是否作废',  width:80}
@@ -775,7 +775,7 @@
 					,"widNumber":"${workInvoice.widNumber}"
 					,"widTotalMoney":"${workInvoice.widTotalMoney}"
                     ,"money":"<fmt:formatNumber value="${workInvoice.money}" pattern="##0.00"/>"
-                    ,"createDate":"<fmt:formatDate value="${workInvoice.createDate}" pattern="yyyy-MM-dd"/>"
+                    ,"invoiceDate":"<fmt:formatDate value="${workInvoice.invoiceDate}" pattern="yyyy-MM-dd"/>"
                     ,"receiptMoneyDate":"<fmt:formatDate value="${workInvoice.receiptMoneyDate}" pattern="yyyy-MM-dd"/>"
                     <c:if test="${workInvoice.invoiceState == '1' && fns:getUser().id == workInvoice.createBy.id}"><shiro:hasPermission name="workinvoice:workInvoice:edit">,"canedit1":"1"</shiro:hasPermission></c:if><%--暂存-修改--%>
                     <c:if test="${workInvoice.invoiceState == '4' && fns:getUser().id == workInvoice.createBy.id}">,"canedit2":"1"</c:if><%--驳回--修改--%>

+ 2 - 2
src/main/webapp/webpage/modules/workinvoice/workInvoiceAllTwoList.jsp

@@ -741,7 +741,7 @@
 						return "<span title='"+ d.invoiceType +"'>" + d.invoiceType + "</span>";
 					}}
 
-				,{field:'createDate',align:'center', sort:true,title: '开票日期',  width:80}
+				,{field:'invoiceDate',align:'center', sort:true,title: '开票日期',  width:80}
 				,{field:'receiptMoneyDate',align:'center', sort:true,title: '收款日期',  width:80}
 				,{field:'receiptMoney',align:'center', title: '是否收款',  width:80}
 				,{field:'cancellation',align:'center', title: '是否作废',  width:80}
@@ -854,7 +854,7 @@
 					,"workAccountList":"${workInvoice.workAccountList}"
 					,"workAccountListStr":${fns:toJson(workInvoice.workAccountList)}
 					,"money":"<fmt:formatNumber value="${workInvoice.money}" pattern="##0.00"/>"
-                    ,"createDate":"<fmt:formatDate value="${workInvoice.createDate}" pattern="yyyy-MM-dd"/>"
+                    ,"invoiceDate":"<fmt:formatDate value="${workInvoice.invoiceDate}" pattern="yyyy-MM-dd"/>"
                     ,"receiptMoneyDate":"<fmt:formatDate value="${workInvoice.receiptMoneyDate}" pattern="yyyy-MM-dd"/>"
                     <c:if test="${workInvoice.invoiceState == 1 && fns:getUser().id == workInvoice.createBy.id}"><shiro:hasPermission name="workinvoice:workInvoice:edit">,"canedit1":"1"</shiro:hasPermission></c:if><%--暂存-修改--%>
                     <c:if test="${workInvoice.invoiceState == '4' && fns:getUser().id == workInvoice.createBy.id}">,"canedit2":"1"</c:if><%--驳回--修改--%>

+ 2 - 2
src/main/webapp/webpage/modules/workinvoice/workInvoiceTwoList.jsp

@@ -768,7 +768,7 @@
                 <%--,{field:'areaName',align:'center', title: '项目所在地', minWidth:80,templet:function(d){--%>
                 <%--        return "<span title='"+ d.areaName +"'>" + d.areaName + "</span>";--%>
                 <%--    }}--%>
-				,{field:'createDate',align:'center', sort:true,title: '开票日期',  width:80}
+				,{field:'invoiceDate',align:'center', sort:true,title: '开票日期',  width:80}
 				,{field:'receiptMoneyDate',align:'center', sort:true,title: '收款日期',  width:80}
 				,{field:'receiptMoney',align:'center', title: '是否收款',  width:80}
 				,{field:'cancellation',align:'center', title: '是否作废',  width:80}
@@ -879,7 +879,7 @@
 					,"workAccountList":"${workInvoice.workAccountList}"
 					,"workAccountListStr":${fns:toJson(workInvoice.workAccountList)}
                     ,"money":"<fmt:formatNumber value="${workInvoice.money}" pattern="##0.00"/>"
-                    ,"createDate":"<fmt:formatDate value="${workInvoice.createDate}" pattern="yyyy-MM-dd"/>"
+                    ,"invoiceDate":"<fmt:formatDate value="${workInvoice.invoiceDate}" pattern="yyyy-MM-dd"/>"
                     ,"receiptMoneyDate":"<fmt:formatDate value="${workInvoice.receiptMoneyDate}" pattern="yyyy-MM-dd"/>"
                     <c:if test="${workInvoice.invoiceState == 1 && fns:getUser().id == workInvoice.createBy.id}"><shiro:hasPermission name="workinvoice:workInvoice:edit">,"canedit1":"1"</shiro:hasPermission></c:if><%--暂存-修改--%>
                     <c:if test="${workInvoice.invoiceState == '4' && fns:getUser().id == workInvoice.createBy.id}">,"canedit2":"1"</c:if><%--驳回--修改--%>