purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新单据的时间，显示到秒

Browse Source
This commit is contained in:
季圣华
2019-01-18 23:16:24 +08:00
parent 9550c031f9
commit a1e60e5eda
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erp_web/js/pages/materials/bill_detail.js
View File

@@ -216,7 +216,7 @@
$("#bill .AccountIdShow").text(accountIdShow);
}
$("#bill .OrganIdShow").text(data.organName);
$("#bill .OperTimeShow").text(data.opertime);
$("#bill .OperTimeShow").text(data.opertimeStr);
$("#bill .NumberShow").text(data.number);
$("#bill .RemarkShow").text(data.remark);
$("#bill .DiscountShow").text(data.discount);

4
erp_web/js/pages/materials/in_out.js
View File

@@ -563,7 +563,7 @@
formatter:function(value,rec) {
var str = '';
var rowInfo = rec.id + 'AaBb' + rec.projectid+ 'AaBb' + rec.number+ 'AaBb' + rec.operpersonname
+ 'AaBb' + rec.opertime+ 'AaBb' + rec.organid+ 'AaBb' + rec.handspersonid
+ 'AaBb' + rec.opertimeStr+ 'AaBb' + rec.organid+ 'AaBb' + rec.handspersonid
+ 'AaBb' + rec.accountid+ 'AaBb' + rec.changeamount+ 'AaBb' + rec.remark
+ 'AaBb' + rec.projectName+ 'AaBb' + rec.organName+ 'AaBb' + rec.handsPersonName
+ 'AaBb' + rec.accountName + 'AaBb' + rec.totalprice + 'AaBb' + rec.allocationprojectid
@@ -588,7 +588,7 @@
}
}
},
{ title: '单据日期 ',field: 'opertime',width:130},
{ title: '单据日期',field: 'opertimeStr',width:130},
{ title: '操作员',field: 'operpersonname',width:60},
{ title: '金额合计',field: 'totalprice',width:60},
{ title: '含税合计',field: 'totaltaxlastmoney',hidden:isShowLastMoneyColumn,width:60,formatter:function(value,rec){

10
src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java
View File

@@ -73,6 +73,8 @@ public class DepotHeadVo4List {
private String materialsList;
private String opertimeStr;
public Long getId() {
return id;
}
@@ -344,4 +346,12 @@ public class DepotHeadVo4List {
public void setMaterialsList(String materialsList) {
this.materialsList = materialsList;
}
public String getOpertimeStr() {
return opertimeStr;
}
public void setOpertimeStr(String opertimeStr) {
this.opertimeStr = opertimeStr;
}
}

4
src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
View File

@@ -25,6 +25,8 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import static com.jsh.erp.utils.Tools.getCenternTime;
@Service
public class DepotHeadService {
private Logger logger = LoggerFactory.getLogger(DepotHeadService.class);
@@ -60,6 +62,7 @@ public class DepotHeadService {
if(dh.getTotalprice() != null) {
dh.setTotalprice(dh.getTotalprice().abs());
}
dh.setOpertimeStr(getCenternTime(dh.getOpertime()));
dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId()));
resList.add(dh);
}
@@ -243,6 +246,7 @@ public class DepotHeadService {
if(dh.getTotalprice() != null) {
dh.setTotalprice(dh.getTotalprice().abs());
}
dh.setOpertimeStr(getCenternTime(dh.getOpertime()));
dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId()));
resList.add(dh);
}