Skip to content
GitLab
Commit 20ec1a01 authored by 季圣华's avatar 季圣华
Browse files

页面细节优化

parent b3a8282d
Hide whitespace changes
Inline Side-by-side
erp_web/js/pages/financial/financial_base.js
View file @ 20ec1a01
...@@ -245,9 +245,9 @@ ...@@ -245,9 +245,9 @@
}, },
{ field: 'organid',width:5, hidden:true}, { field: 'organid',width:5, hidden:true},
{ title: organNameTitle,field: 'organname',width:140,hidden:organNameHidden}, { 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: 'handspersonname',width:80},
{ title: '单据时间 ',field: 'billtime',width:140}, { title: '单据时间 ',field: 'billTimeStr',width:160},
{ title: '合计',field: 'totalprice',width:80}, { title: '合计',field: 'totalprice',width:80},
{ title: '备注',field: 'remark',width:100} { title: '备注',field: 'remark',width:100}
]], ]],
......
erp_web/pages/manage/functions.html
View file @ 20ec1a01
...@@ -95,20 +95,6 @@ ...@@ -95,20 +95,6 @@
<input id="icon" name="icon" class="easyui-textbox" data-options="buttonText:'参考'" style="width:230px;"/> <input id="icon" name="icon" class="easyui-textbox" data-options="buttonText:'参考'" style="width:230px;"/>
</td> </td>
</tr> </tr>
<tr>
<td>类型</td>
<td style="padding:5px">
<select name="Type" id="Type" class="easyui-combobox"
data-options="panelHeight:'auto'" style="width: 230px;">
<option value="电脑版">电脑版</option>
<option value="手机版">手机版</option>
</select>
</td>
</tr>
<tr>
<td>收缩</td>
<td style="padding:5px"><input name="State" id="State" type="checkbox" style="width: 230px;height: 20px"/></td>
</tr>
<tr> <tr>
<td>启用</td> <td>启用</td>
<td style="padding:5px"><input name="Enabled" id="Enabled" type="checkbox" style="width: 230px;height: 20px"/></td> <td style="padding:5px"><input name="Enabled" id="Enabled" type="checkbox" style="width: 230px;height: 20px"/></td>
...@@ -165,22 +151,16 @@ ...@@ -165,22 +151,16 @@
pageList: initPageNum, pageList: initPageNum,
columns: [[ columns: [[
{field: 'id', width: 35, align: "center", checkbox: true}, {field: 'id', width: 35, align: "center", checkbox: true},
{title: '编号 ', field: 'number', width: 60}, {title: '编号 ', field: 'number', width: 80},
{title: '名称', field: 'name', width: 80}, {title: '名称', field: 'name', width: 100},
{title: '上级编号', field: 'pnumber', width: 60}, {title: '上级编号', field: 'pnumber', width: 80},
{title: '链接', field: 'url', width: 200}, {title: '链接', field: 'url', width: 250},
{title: '排序', field: 'sort', width: 50}, {title: '排序', field: 'sort', width: 60},
{
title: '收缩', field: 'state', width: 50, formatter: function (value) {
return value ? "开" : "关";
}
},
{ {
title: '启用', field: 'enabled', width: 50, formatter: function (value) { title: '启用', field: 'enabled', width: 50, formatter: function (value) {
return value ? "开" : "关"; return value ? "开" : "关";
} }
}, },
{title: '类型', field: 'type', width: 50},
{title: '图标', field: 'icon', width: 110}, {title: '图标', field: 'icon', width: 110},
{ {
title: '操作', field: 'op', align: "center", width: 130, formatter: function (value, rec, index) { title: '操作', field: 'op', align: "center", width: 130, formatter: function (value, rec, index) {
...@@ -199,7 +179,7 @@ ...@@ -199,7 +179,7 @@
handler: function () { handler: function () {
addFunctions(); addFunctions();
} }
}, },'-',
{ {
id: 'deleteFunctions', id: 'deleteFunctions',
text: '删除', text: '删除',
......
erp_web/pages/manage/role.html
View file @ 20ec1a01
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
handler: function () { handler: function () {
addRole(); addRole();
} }
}, },'-',
{ {
id: 'deleteRole', id: 'deleteRole',
text: '删除', text: '删除',
......
erp_web/pages/manage/systemConfig.html
View file @ 20ec1a01
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
handler: function () { handler: function () {
addSystemConfig(); addSystemConfig();
} }
}, },'-',
{ {
id: 'deleteSystemConfig', id: 'deleteSystemConfig',
text: '删除', text: '删除',
......
erp_web/pages/materials/bill_detail.html
View file @ 20ec1a01
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<div id="bill" class="easyui-panel" style="padding:10px;height:550px;" title="单据明细" iconCls="icon-list" <div id="bill" class="easyui-panel" style="padding:10px;height:550px;" title="单据明细" iconCls="icon-list"
collapsible="true" closable="false"> collapsible="true" closable="false">
<!--零售出库--> <!--零售出库-->
<div class="retail_out" style="width:1100px;padding:10px 20px;top:50px" <div class="retail_out" style="width:1300px;padding:10px 20px;top:50px"
closed="true" modal="true" cache="false" collapsible="false" closable="true"> closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table> <table>
<tr> <tr>
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
</table> </table>
</div> </div>
<!--零售退货--> <!--零售退货-->
<div class="retail_back" style="width:1100px;padding:10px 20px;top:50px" <div class="retail_back" style="width:1300px;padding:10px 20px;top:50px"
closed="true" modal="true" cache="false" collapsible="false" closable="true"> closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table> <table>
<tr> <tr>
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
</table> </table>
</div> </div>
<!--采购入库--> <!--采购入库-->
<div class="purchase_in" style="width:1100px;padding:10px 20px;top:20px" <div class="purchase_in" style="width:1300px;padding:10px 20px;top:20px"
closed="true" modal="true" cache="false" collapsible="false" closable="true"> closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table> <table>
<tr> <tr>
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
<td colspan="9" style="width: 1130px;"> <td colspan="9" style="width: 1300px;">
<!-- 商品列表table --> <!-- 商品列表table -->
<table class="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table> <table class="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td> </td>
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
</table> </table>
</div> </div>
<!--采购退货--> <!--采购退货-->
<div class="purchase_back" style="width:1100px;padding:10px 20px;top:20px" <div class="purchase_back" style="width:1300px;padding:10px 20px;top:20px"
closed="true" modal="true" cache="false" collapsible="false" closable="true"> closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table> <table>
<tr> <tr>
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
<td colspan="9" style="width: 1130px;"> <td colspan="9" style="width: 1300px;">
<!-- 商品列表table --> <!-- 商品列表table -->
<table class="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table> <table class="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td> </td>
...@@ -307,7 +307,7 @@ ...@@ -307,7 +307,7 @@
</table> </table>
</div> </div>
<!--销售出库--> <!--销售出库-->
<div class="sale_out" style="width:1100px;padding:10px 20px;top:20px" <div class="sale_out" style="width:1300px;padding:10px 20px;top:20px"
closed="true" modal="true" cache="false" collapsible="false" closable="true"> closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table> <table>
<tr> <tr>
...@@ -330,7 +330,7 @@ ...@@ -330,7 +330,7 @@
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
<td colspan="9" style="width: 1130px;"> <td colspan="9" style="width: 1300px;">
<!-- 商品列表table --> <!-- 商品列表table -->
<table class="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table> <table class="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td> </td>
...@@ -383,7 +383,7 @@ ...@@ -383,7 +383,7 @@
</table> </table>
</div> </div>
<!--销售退货--> <!--销售退货-->
<div class="sale_back" style="width:1100px;padding:10px 20px;top:20px" <div class="sale_back" style="width:1300px;padding:10px 20px;top:20px"
closed="true" modal="true" cache="false" collapsible="false" closable="true"> closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table> <table>
<tr> <tr>
...@@ -404,7 +404,7 @@ ...@@ -404,7 +404,7 @@
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
<td colspan="9" style="width: 1130px;"> <td colspan="9" style="width: 1300px;">
<!-- 商品列表table --> <!-- 商品列表table -->
<table class="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table> <table class="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td> </td>
...@@ -457,7 +457,7 @@ ...@@ -457,7 +457,7 @@
</table> </table>
</div> </div>
<!--其它入库--> <!--其它入库-->
<div class="other_in" style="width:1100px;padding:10px 20px;top:70px" <div class="other_in" style="width:1300px;padding:10px 20px;top:70px"
closed="true" modal="true" cache="false" collapsible="false" closable="true"> closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table> <table>
<tr> <tr>
...@@ -478,7 +478,7 @@ ...@@ -478,7 +478,7 @@
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
<td colspan="9" style="width: 1130px;"> <td colspan="9" style="width: 1300px;">
<!-- 商品列表table --> <!-- 商品列表table -->
<table class="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table> <table class="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td> </td>
...@@ -492,7 +492,7 @@ ...@@ -492,7 +492,7 @@
</table> </table>
</div> </div>
<!--其它出库--> <!--其它出库-->
<div class="other_out" style="width:1100px;padding:10px 20px;top:70px" <div class="other_out" style="width:1300px;padding:10px 20px;top:70px"
closed="true" modal="true" cache="false" collapsible="false" closable="true"> closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table> <table>
<tr> <tr>
...@@ -513,7 +513,7 @@ ...@@ -513,7 +513,7 @@
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
<td colspan="9" style="width: 1130px;"> <td colspan="9" style="width: 1300px;">
<!-- 商品列表table --> <!-- 商品列表table -->
<table class="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table> <table class="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td> </td>
...@@ -527,7 +527,7 @@ ...@@ -527,7 +527,7 @@
</table> </table>
</div> </div>
<!--调拨出库--> <!--调拨出库-->
<div class="allocation_out" style="width:1100px;padding:10px 20px;top:70px" <div class="allocation_out" style="width:1300px;padding:10px 20px;top:70px"
closed="true" modal="true" cache="false" collapsible="false" closable="true"> closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table> <table>
<tr> <tr>
...@@ -546,7 +546,7 @@ ...@@ -546,7 +546,7 @@
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
<td colspan="9" style="width: 1130px;"> <td colspan="9" style="width: 1300px;">
<!-- 商品列表table --> <!-- 商品列表table -->
<table class="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table> <table class="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td> </td>
...@@ -560,7 +560,7 @@ ...@@ -560,7 +560,7 @@
</table> </table>
</div> </div>
<!--收入单--> <!--收入单-->
<div class="item_in" style="width:1100px;padding:10px 20px;top:20px" <div class="item_in" style="width:1300px;padding:10px 20px;top:20px"
closed="true" modal="true" cache="false" collapsible="false" closable="true"> closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table> <table>
<tr> <tr>
...@@ -583,7 +583,7 @@ ...@@ -583,7 +583,7 @@
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
<td colspan="9" style="width: 1130px;"> <td colspan="9" style="width: 1300px;">
<!-- 单据列表table --> <!-- 单据列表table -->
<table class="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table> <table class="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td> </td>
...@@ -607,7 +607,7 @@ ...@@ -607,7 +607,7 @@
</table> </table>
</div> </div>
<!--支出单--> <!--支出单-->
<div class="item_out" style="width:1100px;padding:10px 20px;top:20px" <div class="item_out" style="width:1300px;padding:10px 20px;top:20px"
closed="true" modal="true" cache="false" collapsible="false" closable="true"> closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table> <table>
<tr> <tr>
...@@ -628,7 +628,7 @@ ...@@ -628,7 +628,7 @@
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
<td colspan="9" style="width: 1130px;"> <td colspan="9" style="width: 1300px;">
<!-- 单据列表table --> <!-- 单据列表table -->
<table class="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table> <table class="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td> </td>
...@@ -652,7 +652,7 @@ ...@@ -652,7 +652,7 @@
</table> </table>
</div> </div>
<!--收款单--> <!--收款单-->
<div class="money_in" style="width:1100px;padding:10px 20px;top:20px" <div class="money_in" style="width:1300px;padding:10px 20px;top:20px"
closed="true" modal="true" cache="false" collapsible="false" closable="true"> closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table> <table>
<tr> <tr>
...@@ -675,7 +675,7 @@ ...@@ -675,7 +675,7 @@
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
<td colspan="9" style="width: 1130px;"> <td colspan="9" style="width: 1300px;">
<!-- 单据列表table --> <!-- 单据列表table -->
<table class="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table> <table class="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td> </td>
...@@ -695,7 +695,7 @@ ...@@ -695,7 +695,7 @@
</table> </table>
</div> </div>
<!--付款单--> <!--付款单-->
<div class="money_out" style="width:1100px;padding:10px 20px;top:20px" <div class="money_out" style="width:1300px;padding:10px 20px;top:20px"
closed="true" modal="true" cache="false" collapsible="false" closable="true"> closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table> <table>
<tr> <tr>
...@@ -718,7 +718,7 @@ ...@@ -718,7 +718,7 @@
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
<td colspan="9" style="width: 1130px;"> <td colspan="9" style="width: 1300px;">
<!-- 单据列表table --> <!-- 单据列表table -->
<table class="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table> <table class="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td> </td>
...@@ -738,7 +738,7 @@ ...@@ -738,7 +738,7 @@
</table> </table>
</div> </div>
<!--转账单--> <!--转账单-->
<div class="giro" style="width:1100px;padding:10px 20px;top:20px" <div class="giro" style="width:1300px;padding:10px 20px;top:20px"
closed="true" modal="true" cache="false" collapsible="false" closable="true"> closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table> <table>
<tr> <tr>
...@@ -759,7 +759,7 @@ ...@@ -759,7 +759,7 @@
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
<td colspan="9" style="width: 1130px;"> <td colspan="9" style="width: 1300px;">
<!-- 单据列表table --> <!-- 单据列表table -->
<table class="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table> <table class="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td> </td>
...@@ -783,7 +783,7 @@ ...@@ -783,7 +783,7 @@
</table> </table>
</div> </div>
<!--收预付款--> <!--收预付款-->
<div class="advance_in" style="width:1100px;padding:10px 20px;top:20px" <div class="advance_in" style="width:1300px;padding:10px 20px;top:20px"
closed="true" modal="true" cache="false" collapsible="false" closable="true"> closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table> <table>
<tr> <tr>
...@@ -806,7 +806,7 @@ ...@@ -806,7 +806,7 @@
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
<td colspan="9" style="width: 1130px;"> <td colspan="9" style="width: 1300px;">
<!-- 单据列表table --> <!-- 单据列表table -->
<table class="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table> <table class="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td> </td>
......
src/main/java/com/jsh/erp/datasource/entities/AccountHeadVo4ListEx.java
View file @ 20ec1a01
...@@ -35,6 +35,8 @@ public class AccountHeadVo4ListEx { ...@@ -35,6 +35,8 @@ public class AccountHeadVo4ListEx {
private String accountname; private String accountname;
private String billTimeStr;
public Long getId() { public Long getId() {
return id; return id;
} }
...@@ -154,4 +156,12 @@ public class AccountHeadVo4ListEx { ...@@ -154,4 +156,12 @@ public class AccountHeadVo4ListEx {
public void setAccountname(String accountname) { public void setAccountname(String accountname) {
this.accountname = accountname; this.accountname = accountname;
} }
public String getBillTimeStr() {
return billTimeStr;
}
public void setBillTimeStr(String billTimeStr) {
this.billTimeStr = billTimeStr;
}
} }
\ No newline at end of file
src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java
View file @ 20ec1a01
...@@ -27,6 +27,8 @@ import java.util.ArrayList; ...@@ -27,6 +27,8 @@ import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import static com.jsh.erp.utils.Tools.getCenternTime;
@Service @Service
public class AccountHeadService { public class AccountHeadService {
private Logger logger = LoggerFactory.getLogger(AccountHeadService.class); private Logger logger = LoggerFactory.getLogger(AccountHeadService.class);
...@@ -80,6 +82,7 @@ public class AccountHeadService { ...@@ -80,6 +82,7 @@ public class AccountHeadService {
if(ah.getTotalprice() != null) { if(ah.getTotalprice() != null) {
ah.setTotalprice(ah.getTotalprice().abs()); ah.setTotalprice(ah.getTotalprice().abs());
} }
ah.setBillTimeStr(getCenternTime(ah.getBilltime()));
resList.add(ah); resList.add(ah);
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment