wangxichen 3 일 전
부모
커밋
d2602f123f

+ 2 - 2
src/main/resources/views/modules/mes/mesProductStorageRecordTrayDetail.html

@@ -53,7 +53,7 @@
 						<div class="form-group">
 							<label class="control-label col-sm-3">${text('入库时间')}:</label>
 							<div class="col-sm-8">
-								<p class="form-control-static">${trayInfo.createDate}</p>
+								<p class="form-control-static">${trayInfo.createDate,dateFormat='yyyy-MM-dd HH:mm:ss'}</p>
 							</div>
 						</div>
 					</div>
@@ -83,7 +83,7 @@
 								<tr>
 									<td style="text-align:center;">${i + 1}</td>
 									<td style="text-align:center;">${products[i].sn}</td>
-									<td style="text-align:center;">${products[i].createDate}</td>
+									<td style="text-align:center;">${products[i].createDate,dateFormat='yyyy-MM-dd HH:mm:ss'}</td>
 								</tr>
 								<% } %>
 							</tbody>

+ 1 - 1
src/main/resources/views/modules/mes/mesProductStorageRecordTrayList.html

@@ -56,7 +56,7 @@ $('#dataGrid').dataGrid({
 		{header:'${text("产品型号")}', name:'productModel', width:150, align:"center"},
 		{header:'${text("工件数量")}', name:'count', width:100, align:"center"},
 		{header:'${text("入库人")}', name:'createBy', width:150, align:"center"},
-		{header:'${text("入库时间")}', name:'createDate', width:180, align:"center"},
+		{header:'${text("入库时间")}', name:'createDate', width:180, align:"center", formatter: function(val){return val ? val.replace('T',' ') : '';}},
 		{header:'${text("操作")}', name:'actions', width:100, formatter: function(val, obj, row, act){
 			var actions = [];
 			actions.push('<a href="${ctx}/mes/mesProductStorageRecord/trayDetail?batchSn='+encodeURIComponent(row.batchSn)+'" class="btnList" title="${text("详情")}"><i class="fa fa-eye"></i></a>&nbsp;');