diff --git a/erp_web/js/pages/financial/financial_base.js b/erp_web/js/pages/financial/financial_base.js
index 49e971f0..f64a8afb 100644
--- a/erp_web/js/pages/financial/financial_base.js
+++ b/erp_web/js/pages/financial/financial_base.js
@@ -245,9 +245,9 @@
},
{ field: 'organid',width:5, hidden:true},
{ title: organNameTitle,field: 'organname',width:140,hidden:organNameHidden},
- { title: '单据编号',field: 'billno',width:140},
+ { title: '单据编号',field: 'billno',width:160},
{ title: '经手人',field: 'handspersonname',width:80},
- { title: '单据时间 ',field: 'billtime',width:140},
+ { title: '单据时间 ',field: 'billTimeStr',width:160},
{ title: '合计',field: 'totalprice',width:80},
{ title: '备注',field: 'remark',width:100}
]],
diff --git a/erp_web/pages/manage/functions.html b/erp_web/pages/manage/functions.html
index beec41d2..5726e71b 100644
--- a/erp_web/pages/manage/functions.html
+++ b/erp_web/pages/manage/functions.html
@@ -95,20 +95,6 @@
-
- | 类型 |
-
-
- |
-
-
- | 收缩 |
- |
-
| 启用 |
|
@@ -165,22 +151,16 @@
pageList: initPageNum,
columns: [[
{field: 'id', width: 35, align: "center", checkbox: true},
- {title: '编号 ', field: 'number', width: 60},
- {title: '名称', field: 'name', width: 80},
- {title: '上级编号', field: 'pnumber', width: 60},
- {title: '链接', field: 'url', width: 200},
- {title: '排序', field: 'sort', width: 50},
- {
- title: '收缩', field: 'state', width: 50, formatter: function (value) {
- return value ? "开" : "关";
- }
- },
+ {title: '编号 ', field: 'number', width: 80},
+ {title: '名称', field: 'name', width: 100},
+ {title: '上级编号', field: 'pnumber', width: 80},
+ {title: '链接', field: 'url', width: 250},
+ {title: '排序', field: 'sort', width: 60},
{
title: '启用', field: 'enabled', width: 50, formatter: function (value) {
return value ? "开" : "关";
}
},
- {title: '类型', field: 'type', width: 50},
{title: '图标', field: 'icon', width: 110},
{
title: '操作', field: 'op', align: "center", width: 130, formatter: function (value, rec, index) {
@@ -199,7 +179,7 @@
handler: function () {
addFunctions();
}
- },
+ },'-',
{
id: 'deleteFunctions',
text: '删除',
diff --git a/erp_web/pages/manage/role.html b/erp_web/pages/manage/role.html
index 82056468..56ef7300 100644
--- a/erp_web/pages/manage/role.html
+++ b/erp_web/pages/manage/role.html
@@ -121,7 +121,7 @@
handler: function () {
addRole();
}
- },
+ },'-',
{
id: 'deleteRole',
text: '删除',
diff --git a/erp_web/pages/manage/systemConfig.html b/erp_web/pages/manage/systemConfig.html
index d27f8bb3..68d97dcc 100644
--- a/erp_web/pages/manage/systemConfig.html
+++ b/erp_web/pages/manage/systemConfig.html
@@ -171,7 +171,7 @@
handler: function () {
addSystemConfig();
}
- },
+ },'-',
{
id: 'deleteSystemConfig',
text: '删除',
diff --git a/erp_web/pages/materials/bill_detail.html b/erp_web/pages/materials/bill_detail.html
index a35545b8..c3dc9a36 100644
--- a/erp_web/pages/materials/bill_detail.html
+++ b/erp_web/pages/materials/bill_detail.html
@@ -23,7 +23,7 @@
-
-
-
@@ -183,7 +183,7 @@
|
- |
+ |
|
@@ -234,7 +234,7 @@
-
@@ -255,7 +255,7 @@
|
- |
+ |
|
@@ -307,7 +307,7 @@
-
@@ -330,7 +330,7 @@
|
- |
+ |
|
@@ -383,7 +383,7 @@
-
@@ -404,7 +404,7 @@
|
- |
+ |
|
@@ -457,7 +457,7 @@
-
@@ -478,7 +478,7 @@
|
- |
+ |
|
@@ -492,7 +492,7 @@
-
@@ -513,7 +513,7 @@
|
- |
+ |
|
@@ -527,7 +527,7 @@
-
@@ -546,7 +546,7 @@
|
- |
+ |
|
@@ -560,7 +560,7 @@
-
@@ -583,7 +583,7 @@
|
- |
+ |
|
@@ -607,7 +607,7 @@
-
@@ -628,7 +628,7 @@
|
- |
+ |
|
@@ -652,7 +652,7 @@
-
@@ -675,7 +675,7 @@
|
- |
+ |
|
@@ -695,7 +695,7 @@
-
@@ -718,7 +718,7 @@
|
- |
+ |
|
@@ -738,7 +738,7 @@
-
@@ -759,7 +759,7 @@
|
- |
+ |
|
@@ -783,7 +783,7 @@
-
@@ -806,7 +806,7 @@
|
- |
+ |
|
diff --git a/src/main/java/com/jsh/erp/datasource/entities/AccountHeadVo4ListEx.java b/src/main/java/com/jsh/erp/datasource/entities/AccountHeadVo4ListEx.java
index d56a5ebf..eecfcc59 100644
--- a/src/main/java/com/jsh/erp/datasource/entities/AccountHeadVo4ListEx.java
+++ b/src/main/java/com/jsh/erp/datasource/entities/AccountHeadVo4ListEx.java
@@ -35,6 +35,8 @@ public class AccountHeadVo4ListEx {
private String accountname;
+ private String billTimeStr;
+
public Long getId() {
return id;
}
@@ -154,4 +156,12 @@ public class AccountHeadVo4ListEx {
public void setAccountname(String accountname) {
this.accountname = accountname;
}
+
+ public String getBillTimeStr() {
+ return billTimeStr;
+ }
+
+ public void setBillTimeStr(String billTimeStr) {
+ this.billTimeStr = billTimeStr;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java b/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java
index 3007861b..fec3574f 100644
--- a/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java
+++ b/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java
@@ -27,6 +27,8 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import static com.jsh.erp.utils.Tools.getCenternTime;
+
@Service
public class AccountHeadService {
private Logger logger = LoggerFactory.getLogger(AccountHeadService.class);
@@ -80,6 +82,7 @@ public class AccountHeadService {
if(ah.getTotalprice() != null) {
ah.setTotalprice(ah.getTotalprice().abs());
}
+ ah.setBillTimeStr(getCenternTime(ah.getBilltime()));
resList.add(ah);
}
}