diff --git a/erp_web/pages/manage/account.html b/erp_web/pages/manage/account.html
index e36a1607..669b88e4 100644
--- a/erp_web/pages/manage/account.html
+++ b/erp_web/pages/manage/account.html
@@ -123,6 +123,17 @@
             pageList: initPageNum,
             columns: [[
                 {field: 'id', width: 35, align: "center", checkbox: true},
+                {
+                    title: '操作', field: 'op', align: "center", width: 60,
+                    formatter: function (value, rec, index) {
+                        var str = '';
+                        str += '<img title="编辑" src="/js/easyui/themes/icons/pencil.png" style="cursor: pointer;" onclick="editAccount(\'' + index + '\');"/>&nbsp;&nbsp;&nbsp;';
+                        if(isShowOpFun()){
+                            str += '<img title="删除" src="/js/easyui/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteAccount(\'' + rec.id + '\');"/>';
+                        }
+                        return str;
+                    }
+                },
                 {title: '名称', field: 'name', width: 100},
                 {title: '编号', field: 'serialNo', width: 150, align: "center"},
                 {title: '期初金额', field: 'initialAmount', width: 100, align: "center"},
@@ -140,14 +151,10 @@
                 },
                 {title: '备注', field: 'remark', width: 100},
                 {
-                    title: '操作', field: 'op', align: "center", width: 210,
+                    title: '账户流水', field: 'show', align: "center", width: 100,
                     formatter: function (value, rec, index) {
                         var str = '';
-                        str += '<img src="/js/easyui/themes/icons/list.png" style="cursor: pointer;" onclick="showAccountInOutList(\'' + index + '\');"/>&nbsp;<a onclick="showAccountInOutList(\'' + index + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">流水</a>&nbsp;&nbsp;';
-                        str += '<img src="/js/easyui/themes/icons/pencil.png" style="cursor: pointer;" onclick="editAccount(\'' + index + '\');"/>&nbsp;<a onclick="editAccount(\'' + index + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
-                        if(isShowOpFun()){
-                            str += '<img src="/js/easyui/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteAccount(\'' + rec.id + '\');"/>&nbsp;<a onclick="deleteAccount(\'' + rec.id + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
-                        }
+                        str += '<img src="/js/easyui/themes/icons/list.png" style="cursor: pointer;" onclick="showAccountInOutList(\'' + index + '\');"/>&nbsp;<a onclick="showAccountInOutList(\'' + index + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">流水</a>';
                         return str;
                     }
                 }
diff --git a/erp_web/pages/manage/functions.html b/erp_web/pages/manage/functions.html
index d3e1f847..389f1029 100644
--- a/erp_web/pages/manage/functions.html
+++ b/erp_web/pages/manage/functions.html
@@ -151,6 +151,17 @@
             pageList: initPageNum,
             columns: [[
                 {field: 'id', width: 35, align: "center", checkbox: true},
+                {
+                    title: '操作', field: 'op', align: "center", width: 80,
+                    formatter: function (value, rec, index) {
+                        var str = '';
+                        str += '<img title="编辑" src="/js/easyui/themes/icons/pencil.png" style="cursor: pointer;" onclick="editFunctions(\'' + index + '\');"/>&nbsp;&nbsp;&nbsp;';
+                        if(isShowOpFun()) {
+                            str += '<img title="删除" src="/js/easyui/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteFunctions(' + rec.id + ');"/>';
+                        }
+                        return str;
+                    }
+                },
                 {title: '编号 ', field: 'number', width: 80},
                 {title: '名称', field: 'name', width: 100},
                 {title: '上级编号', field: 'parentNumber', width: 80},
@@ -161,18 +172,7 @@
                         return value ? "开" : "关";
                     }
                 },
-                {title: '图标', field: 'icon', width: 110},
-                {
-                    title: '操作', field: 'op', align: "center", width: 130,
-                    formatter: function (value, rec, index) {
-                        var str = '';
-                        str += '<img src="/js/easyui/themes/icons/pencil.png" style="cursor: pointer;" onclick="editFunctions(\'' + index + '\');"/>&nbsp;<a onclick="editFunctions(\'' + index + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
-                        if(isShowOpFun()) {
-                            str += '<img src="/js/easyui/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteFunctions(' + rec.id + ');"/>&nbsp;<a onclick="deleteFunctions(' + rec.id + ');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
-                        }
-                        return str;
-                    }
-                }
+                {title: '图标', field: 'icon', width: 110}
             ]],
             toolbar: [
                 {
diff --git a/erp_web/pages/manage/inOutItem.html b/erp_web/pages/manage/inOutItem.html
index 5fb5a90f..06c4a4d5 100644
--- a/erp_web/pages/manage/inOutItem.html
+++ b/erp_web/pages/manage/inOutItem.html
@@ -122,20 +122,20 @@
             pageList: initPageNum,
             columns: [[
                 {field: 'id', width: 35, align: "center", checkbox: true},
-                {title: '名称', field: 'name', width: 200},
-                {title: '类型', field: 'type', width: 100, align: "center"},
-                {title: '描述', field: 'remark', width: 200},
                 {
-                    title: '操作', field: 'op', align: "center", width: 130,
+                    title: '操作', field: 'op', align: "center", width: 60,
                     formatter: function (value, rec, index) {
                         var str = '';
-                        str += '<img src="/js/easyui/themes/icons/pencil.png" style="cursor: pointer;" onclick="editInOutItem(\'' + index + '\');"/>&nbsp;<a onclick="editInOutItem(\'' + index + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
+                        str += '<img title="编辑" src="/js/easyui/themes/icons/pencil.png" style="cursor: pointer;" onclick="editInOutItem(\'' + index + '\');"/>&nbsp;&nbsp;&nbsp;';
                         if(isShowOpFun()) {
-                            str += '<img src="/js/easyui/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteInOutItem(\'' + rec.id + '\');"/>&nbsp;<a onclick="deleteInOutItem(\'' + rec.id + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
+                            str += '<img src="/js/easyui/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteInOutItem(\'' + rec.id + '\');"/>';
                         }
                         return str;
                     }
-                }
+                },
+                {title: '名称', field: 'name', width: 200},
+                {title: '类型', field: 'type', width: 100},
+                {title: '描述', field: 'remark', width: 200}
             ]],
             toolbar: [
                 {
diff --git a/erp_web/pages/manage/person.html b/erp_web/pages/manage/person.html
index 1259064f..3bf9ed2d 100644
--- a/erp_web/pages/manage/person.html
+++ b/erp_web/pages/manage/person.html
@@ -120,18 +120,18 @@
             pageList: initPageNum,
             columns: [[
                 {field: 'id', width: 35, align: "center", checkbox: true},
-                {title: '姓名', field: 'name', width: 180},
-                {title: '类型', field: 'type', width: 180},
                 {
-                    title: '操作', field: 'op', align: "center", width: 130, formatter: function (value, rec, index) {
+                    title: '操作', field: 'op', align: "center", width: 60, formatter: function (value, rec, index) {
                         var str = '';
-                        str += '<img src="/js/easyui/themes/icons/pencil.png" style="cursor: pointer;" onclick="editPerson(\'' + index + '\');"/>&nbsp;<a onclick="editPerson(\'' + index + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
+                        str += '<img title="编辑" src="/js/easyui/themes/icons/pencil.png" style="cursor: pointer;" onclick="editPerson(\'' + index + '\');"/>&nbsp;&nbsp;&nbsp;';
                         if(isShowOpFun()) {
-                            str += '<img src="/js/easyui/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deletePerson(' + rec.id + ');"/>&nbsp;<a onclick="deletePerson(' + rec.id + ');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
+                            str += '<img title="删除" src="/js/easyui/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deletePerson(' + rec.id + ');"/>';
                         }
                         return str;
                     }
-                }
+                },
+                {title: '姓名', field: 'name', width: 180},
+                {title: '类型', field: 'type', width: 180}
             ]],
             toolbar: [
                 {
diff --git a/erp_web/pages/reports/account_report.html b/erp_web/pages/reports/account_report.html
index 9a38426a..27978fd5 100644
--- a/erp_web/pages/reports/account_report.html
+++ b/erp_web/pages/reports/account_report.html
@@ -93,7 +93,7 @@
                 {title: '本月发生额', field: 'thisMonthAmount', width: 100, align: "center"},
                 {title: '当前余额', field: 'currentAmount', width: 100, align: "center"},
                 {
-                    title: '操作', field: 'op', width: 100, align: "center", formatter: function (value, rec) {
+                    title: '账户流水', field: 'op', width: 100, align: "center", formatter: function (value, rec) {
                         var str = '';
                         var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.serialNo + 'AaBb' + rec.initialAmount + 'AaBb' + rec.currentAmount;
                         str += '<img src="/js/easyui/themes/icons/list.png" style="cursor: pointer;" onclick="showAccountInOutList(\'' + rowInfo + '\');"/>&nbsp;<a onclick="showAccountInOutList(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">流水</a>&nbsp;&nbsp;';