diff --git a/erp_web/js/easyui/themes/icons/filelist.jpg b/erp_web/js/easyui/themes/icons/filelist.jpg index 08ce7b43..16a5af5b 100644 Binary files a/erp_web/js/easyui/themes/icons/filelist.jpg and b/erp_web/js/easyui/themes/icons/filelist.jpg differ diff --git a/erp_web/js/pages/materials/in_out.js b/erp_web/js/pages/materials/in_out.js index 57b884af..a62dd10b 100644 --- a/erp_web/js/pages/materials/in_out.js +++ b/erp_web/js/pages/materials/in_out.js @@ -464,8 +464,8 @@ }, { title: '单据日期',field: 'opertimeStr',width:145}, { title: '操作员',field: 'operpersonname',width:60}, - { title: '金额合计',field: 'totalprice',width:60}, - { title: '含税合计',field: 'totaltaxlastmoney',hidden:isShowLastMoneyColumn,width:60,formatter:function(value,rec){ + { title: '金额合计',field: 'totalprice',width:70}, + { title: '含税合计',field: 'totaltaxlastmoney',hidden:isShowLastMoneyColumn,width:70,formatter:function(value,rec){ return (rec.discountmoney + rec.discountlastmoney).toFixed(2); } }, diff --git a/erp_web/pages/materials/sale_out_list.html b/erp_web/pages/materials/sale_out_list.html index 27f3f4e3..4fc6d165 100644 --- a/erp_web/pages/materials/sale_out_list.html +++ b/erp_web/pages/materials/sale_out_list.html @@ -137,7 +137,9 @@