diff --git a/docs/jsh_erp(第一次建库请使用这个).sql b/docs/jsh_erp(第一次建库请使用这个).sql
index c3c72e2a..b56bdc92 100644
--- a/docs/jsh_erp(第一次建库请使用这个).sql
+++ b/docs/jsh_erp(第一次建库请使用这个).sql
@@ -668,82 +668,73 @@ CREATE TABLE `jsh_functions` (
   `Enabled` bit(1) DEFAULT NULL COMMENT '启用',
   `Type` varchar(50) DEFAULT NULL COMMENT '类型',
   `PushBtn` varchar(50) DEFAULT NULL COMMENT '功能按钮',
+  `icon` varchar(50) DEFAULT NULL COMMENT '图标',
   `delete_Flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
   PRIMARY KEY (`Id`)
-) ENGINE=InnoDB AUTO_INCREMENT=247 DEFAULT CHARSET=utf8 COMMENT='功能模块表';
+) ENGINE=InnoDB AUTO_INCREMENT=252 DEFAULT CHARSET=utf8 COMMENT='功能模块表';
 
 -- ----------------------------
 -- Records of jsh_functions
 -- ----------------------------
-INSERT INTO `jsh_functions` VALUES ('1', '00', '系统管理', '0', '', '
', '0010', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('2', '01', '基础数据', '0', '', '
', '0020', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('11', '0001', '系统管理', '00', '', '\0', '0110', '
', '电脑版', null, '0');
-INSERT INTO `jsh_functions` VALUES ('12', '000101', '应用管理', '0001', '../manage/app.html', '\0', '0132', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('13', '000102', '角色管理', '0001', '../manage/role.html', '\0', '0130', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('14', '000103', '用户管理', '0001', '../manage/user.html', '\0', '0140', '
', '电脑版', null, '0');
-INSERT INTO `jsh_functions` VALUES ('15', '000104', '日志管理', '0001', '../manage/log.html', '\0', '0160', '
', '电脑版', null, '0');
-INSERT INTO `jsh_functions` VALUES ('16', '000105', '功能管理', '0001', '../manage/functions.html', '\0', '0135', '
', '电脑版', null, '0');
-INSERT INTO `jsh_functions` VALUES ('21', '0101', '商品管理', '01', '', '\0', '0220', '
', '电脑版', null, '0');
-INSERT INTO `jsh_functions` VALUES ('22', '010101', '商品类别', '0101', '../materials/materialcategory.html', '\0', '0230', '
', '电脑版', null, '0');
-INSERT INTO `jsh_functions` VALUES ('23', '010102', '商品信息', '0101', '../materials/material.html', '\0', '0240', '
', '电脑版', null, '0');
-INSERT INTO `jsh_functions` VALUES ('24', '0102', '基本资料', '01', '', '\0', '0250', '
', '电脑版', null, '0');
-INSERT INTO `jsh_functions` VALUES ('25', '01020101', '供应商信息', '0102', '../manage/vendor.html', '\0', '0260', '
', '电脑版', '1,2', '0');
-INSERT INTO `jsh_functions` VALUES ('26', '010202', '仓库信息', '0102', '../manage/depot.html', '\0', '0270', '
', '电脑版', null, '0');
-INSERT INTO `jsh_functions` VALUES ('31', '010206', '经手人管理', '0102', '../materials/person.html', '\0', '0284', '
', '电脑版', null, '0');
-INSERT INTO `jsh_functions` VALUES ('32', '0502', '采购管理', '05', '', '\0', '0330', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('33', '050201', '采购入库', '0502', '../materials/purchase_in_list.html', '\0', '0340', '
', '电脑版', '3,4,5', '0');
-INSERT INTO `jsh_functions` VALUES ('38', '0603', '销售管理', '06', '', '\0', '0390', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('40', '080107', '调拨出库', '0801', '../materials/allocation_out_list.html', '\0', '0807', '
', '电脑版', '3,4,5', '0');
-INSERT INTO `jsh_functions` VALUES ('41', '060303', '销售出库', '0603', '../materials/sale_out_list.html', '\0', '0394', '
', '电脑版', '3,4,5', '0');
-INSERT INTO `jsh_functions` VALUES ('44', '0704', '财务管理', '07', '', '\0', '0450', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('59', '030101', '库存状况', '0301', '../reports/in_out_stock_report.html', '\0', '0600', '
', '电脑版', null, '0');
-INSERT INTO `jsh_functions` VALUES ('194', '010204', '收支项目', '0102', '../manage/inOutItem.html', '\0', '0282', '
', '电脑版', null, '0');
-INSERT INTO `jsh_functions` VALUES ('195', '010205', '结算账户', '0102', '../manage/account.html', '\0', '0283', '
', '电脑版', null, '0');
-INSERT INTO `jsh_functions` VALUES ('196', '03', '报表查询', '0', '', '
', '0025', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('197', '070402', '收入单', '0704', '../financial/item_in.html', '\0', '0465', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('198', '0301', '报表查询', '03', '', '\0', '0570', '
', '电脑版', null, '0');
-INSERT INTO `jsh_functions` VALUES ('199', '050204', '采购退货', '0502', '../materials/purchase_back_list.html', '\0', '0345', '
', '电脑版', '3,4,5', '0');
-INSERT INTO `jsh_functions` VALUES ('200', '060305', '销售退货', '0603', '../materials/sale_back_list.html', '\0', '0396', '
', '电脑版', '3,4,5', '0');
-INSERT INTO `jsh_functions` VALUES ('201', '080103', '其它入库', '0801', '../materials/other_in_list.html', '\0', '0803', '
', '电脑版', '3,4,5', '0');
-INSERT INTO `jsh_functions` VALUES ('202', '080105', '其它出库', '0801', '../materials/other_out_list.html', '\0', '0805', '
', '电脑版', '3,4,5', '0');
-INSERT INTO `jsh_functions` VALUES ('203', '070403', '支出单', '0704', '../financial/item_out.html', '\0', '0470', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('204', '070404', '收款单', '0704', '../financial/money_in.html', '\0', '0475', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('205', '070405', '付款单', '0704', '../financial/money_out.html', '\0', '0480', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('206', '070406', '转账单', '0704', '../financial/giro.html', '\0', '0490', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('207', '030102', '结算账户', '0301', '../reports/account_report.html', '\0', '0610', '
', '电脑版', null, '0');
-INSERT INTO `jsh_functions` VALUES ('208', '030103', '进货统计', '0301', '../reports/buy_in_report.html', '\0', '0620', '
', '电脑版', null, '0');
-INSERT INTO `jsh_functions` VALUES ('209', '030104', '销售统计', '0301', '../reports/sale_out_report.html', '\0', '0630', '
', '电脑版', null, '0');
-INSERT INTO `jsh_functions` VALUES ('210', '040102', '零售出库', '0401', '../materials/retail_out_list.html', '\0', '0405', '
', '电脑版', '3,4,5', '0');
-INSERT INTO `jsh_functions` VALUES ('211', '040104', '零售退货', '0401', '../materials/retail_back_list.html', '\0', '0407', '
', '电脑版', '3,4,5', '0');
-INSERT INTO `jsh_functions` VALUES ('212', '070407', '收预付款', '0704', '../financial/advance_in.html', '\0', '0495', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('217', '01020102', '客户信息', '0102', '../manage/customer.html', '\0', '0262', '
', '电脑版', '1,2', '0');
-INSERT INTO `jsh_functions` VALUES ('218', '01020103', '会员信息', '0102', '../manage/member.html', '\0', '0263', '
', '电脑版', '1,2', '0');
-INSERT INTO `jsh_functions` VALUES ('219', '000107', '资产管理', '0001', '../asset/asset.html', '\0', '0170', '\0', '电脑版', null, '0');
-INSERT INTO `jsh_functions` VALUES ('220', '010103', '计量单位', '0101', '../manage/unit.html', '\0', '0245', '
', '电脑版', null, '0');
-INSERT INTO `jsh_functions` VALUES ('221', '04', '零售管理', '0', '', '
', '0028', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('222', '05', '采购管理', '0', '', '
', '0030', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('223', '06', '销售管理', '0', '', '
', '0035', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('224', '07', '财务管理', '0', '', '
', '0040', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('225', '0401', '零售管理', '04', '', '\0', '0401', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('226', '030106', '入库明细', '0301', '../reports/in_detail.html', '\0', '0640', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('227', '030107', '出库明细', '0301', '../reports/out_detail.html', '\0', '0645', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('228', '030108', '入库汇总', '0301', '../reports/in_material_count.html', '\0', '0650', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('229', '030109', '出库汇总', '0301', '../reports/out_material_count.html', '\0', '0655', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('232', '080109', '组装单', '0801', '../materials/assemble_list.html', '\0', '0809', '
', '电脑版', '3,4,5', '0');
-INSERT INTO `jsh_functions` VALUES ('233', '080111', '拆卸单', '0801', '../materials/disassemble_list.html', '\0', '0811', '
', '电脑版', '3,4,5', '0');
-INSERT INTO `jsh_functions` VALUES ('234', '000105', '系统配置', '0001', '../manage/systemConfig.html', '\0', '0165', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('235', '030110', '客户对账', '0301', '../reports/customer_account.html', '\0', '0660', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('236', '000106', '商品属性', '0001', '../materials/materialProperty.html', '\0', '0168', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('237', '030111', '供应商对账', '0301', '../reports/vendor_account.html', '\0', '0665', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('238', '08', '仓库管理', '0', '', '
', '0038', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('239', '0801', '仓库管理', '08', '', '\0', '0801', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('240', '010104', '序列号', '0101', '../manage/serialNumber.html', '\0', '0246', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('241', '050202', '采购订单', '0502', '../materials/purchase_orders_list.html', '\0', '0335', '
', '电脑版', '3', '0');
-INSERT INTO `jsh_functions` VALUES ('242', '060301', '销售订单', '0603', '../materials/sale_orders_list.html', '\0', '0392', '
', '电脑版', '3', '0');
-INSERT INTO `jsh_functions` VALUES ('243', '000108', '机构管理', '0001', '../manage/organization.html', '
', '0139', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('244', '030112', '库存预警', '0301', '../reports/stock_warning_report.html', '\0', '0670', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('245', '02', '个人信息', '0', '', '
', '0005', '
', '电脑版', '', '0');
-INSERT INTO `jsh_functions` VALUES ('246', '09', '新手引导', '0', '', '
', '0115', '
', '电脑版', '', '0');
+INSERT INTO `jsh_functions` VALUES ('1', '0001', '系统管理', '0', '', '
', '0910', '
', '电脑版', '', 'icon-settings', '0');
+INSERT INTO `jsh_functions` VALUES ('12', '000101', '应用管理', '0001', '/pages/manage/app.html', '\0', '0132', '
', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('13', '000102', '角色管理', '0001', '/pages/manage/role.html', '\0', '0130', '
', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('14', '000103', '用户管理', '0001', '/pages/manage/user.html', '\0', '0140', '
', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('15', '000104', '日志管理', '0001', '/pages/manage/log.html', '\0', '0160', '
', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('16', '000105', '功能管理', '0001', '/pages/manage/functions.html', '\0', '0135', '
', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('21', '0101', '商品管理', '0', '', '\0', '0620', '
', '电脑版', null, 'icon-social-dropbox', '0');
+INSERT INTO `jsh_functions` VALUES ('22', '010101', '商品类别', '0101', '/pages/materials/materialcategory.html', '\0', '0230', '
', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('23', '010102', '商品信息', '0101', '/pages/materials/material.html', '\0', '0240', '
', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('24', '0102', '基本资料', '0', '', '\0', '0750', '
', '电脑版', null, 'icon-grid', '0');
+INSERT INTO `jsh_functions` VALUES ('25', '01020101', '供应商信息', '0102', '/pages/manage/vendor.html', '\0', '0260', '
', '电脑版', '1,2', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('26', '010202', '仓库信息', '0102', '/pages/manage/depot.html', '\0', '0270', '
', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('31', '010206', '经手人管理', '0102', '/pages/materials/person.html', '\0', '0284', '
', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('32', '0502', '采购管理', '0', '', '\0', '0330', '
', '电脑版', '', 'icon-loop', '0');
+INSERT INTO `jsh_functions` VALUES ('33', '050201', '采购入库', '0502', '/pages/materials/purchase_in_list.html', '\0', '0340', '
', '电脑版', '3,4,5', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('38', '0603', '销售管理', '0', '', '\0', '0390', '
', '电脑版', '', 'icon-briefcase', '0');
+INSERT INTO `jsh_functions` VALUES ('40', '080107', '调拨出库', '0801', '/pages/materials/allocation_out_list.html', '\0', '0807', '
', '电脑版', '3,4,5', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('41', '060303', '销售出库', '0603', '/pages/materials/sale_out_list.html', '\0', '0394', '
', '电脑版', '3,4,5', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('44', '0704', '财务管理', '0', '', '\0', '0450', '
', '电脑版', '', 'icon-map', '0');
+INSERT INTO `jsh_functions` VALUES ('59', '030101', '库存状况', '0301', '/pages/reports/in_out_stock_report.html', '\0', '0600', '
', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('194', '010204', '收支项目', '0102', '/pages/manage/inOutItem.html', '\0', '0282', '
', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('195', '010205', '结算账户', '0102', '/pages/manage/account.html', '\0', '0283', '
', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('197', '070402', '收入单', '0704', '/pages/financial/item_in.html', '\0', '0465', '
', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('198', '0301', '报表查询', '0', '', '\0', '0570', '
', '电脑版', null, 'icon-pie-chart', '0');
+INSERT INTO `jsh_functions` VALUES ('199', '050204', '采购退货', '0502', '/pages/materials/purchase_back_list.html', '\0', '0345', '
', '电脑版', '3,4,5', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('200', '060305', '销售退货', '0603', '/pages/materials/sale_back_list.html', '\0', '0396', '
', '电脑版', '3,4,5', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('201', '080103', '其它入库', '0801', '/pages/materials/other_in_list.html', '\0', '0803', '
', '电脑版', '3,4,5', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('202', '080105', '其它出库', '0801', '/pages/materials/other_out_list.html', '\0', '0805', '
', '电脑版', '3,4,5', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('203', '070403', '支出单', '0704', '/pages/financial/item_out.html', '\0', '0470', '
', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('204', '070404', '收款单', '0704', '/pages/financial/money_in.html', '\0', '0475', '
', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('205', '070405', '付款单', '0704', '/pages/financial/money_out.html', '\0', '0480', '
', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('206', '070406', '转账单', '0704', '/pages/financial/giro.html', '\0', '0490', '
', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('207', '030102', '结算账户', '0301', '/pages/reports/account_report.html', '\0', '0610', '
', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('208', '030103', '进货统计', '0301', '/pages/reports/buy_in_report.html', '\0', '0620', '
', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('209', '030104', '销售统计', '0301', '/pages/reports/sale_out_report.html', '\0', '0630', '
', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('210', '040102', '零售出库', '0401', '/pages/materials/retail_out_list.html', '\0', '0405', '
', '电脑版', '3,4,5', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('211', '040104', '零售退货', '0401', '/pages/materials/retail_back_list.html', '\0', '0407', '
', '电脑版', '3,4,5', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('212', '070407', '收预付款', '0704', '/pages/financial/advance_in.html', '\0', '0495', '
', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('217', '01020102', '客户信息', '0102', '/pages/manage/customer.html', '\0', '0262', '
', '电脑版', '1,2', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('218', '01020103', '会员信息', '0102', '/pages/manage/member.html', '\0', '0263', '
', '电脑版', '1,2', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('219', '000107', '资产管理', '0001', '/pages/asset/asset.html', '\0', '0170', '\0', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('220', '010103', '计量单位', '0101', '/pages/manage/unit.html', '\0', '0245', '
', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('225', '0401', '零售管理', '0', '', '\0', '0101', '
', '电脑版', '', 'icon-present', '0');
+INSERT INTO `jsh_functions` VALUES ('226', '030106', '入库明细', '0301', '/pages/reports/in_detail.html', '\0', '0640', '
', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('227', '030107', '出库明细', '0301', '/pages/reports/out_detail.html', '\0', '0645', '
', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('228', '030108', '入库汇总', '0301', '/pages/reports/in_material_count.html', '\0', '0650', '
', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('229', '030109', '出库汇总', '0301', '/pages/reports/out_material_count.html', '\0', '0655', '
', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('232', '080109', '组装单', '0801', '/pages/materials/assemble_list.html', '\0', '0809', '
', '电脑版', '3,4,5', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('233', '080111', '拆卸单', '0801', '/pages/materials/disassemble_list.html', '\0', '0811', '
', '电脑版', '3,4,5', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('234', '000105', '系统配置', '0001', '/pages/manage/systemConfig.html', '\0', '0165', '
', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('235', '030110', '客户对账', '0301', '/pages/reports/customer_account.html', '\0', '0660', '
', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('236', '000106', '商品属性', '0001', '/pages/materials/materialProperty.html', '\0', '0168', '
', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('237', '030111', '供应商对账', '0301', '/pages/reports/vendor_account.html', '\0', '0665', '
', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('239', '0801', '仓库管理', '0', '', '\0', '0420', '
', '电脑版', '', 'icon-layers', '0');
+INSERT INTO `jsh_functions` VALUES ('240', '010104', '序列号', '0101', '/pages/manage/serialNumber.html', '\0', '0246', '
', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('241', '050202', '采购订单', '0502', '/pages/materials/purchase_orders_list.html', '\0', '0335', '
', '电脑版', '3', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('242', '060301', '销售订单', '0603', '/pages/materials/sale_orders_list.html', '\0', '0392', '
', '电脑版', '3', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('243', '000108', '机构管理', '0001', '/pages/manage/organization.html', '
', '0139', '
', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_functions` VALUES ('244', '030112', '库存预警', '0301', '/pages/reports/stock_warning_report.html', '\0', '0670', '
', '电脑版', '', 'icon-notebook', '0');
 
 -- ----------------------------
 -- Table structure for jsh_inoutitem
@@ -1910,3 +1901,24 @@ INSERT INTO `jsh_tenant` VALUES ('18', '126', '123123', '2', '200', null);
 INSERT INTO `jsh_tenant` VALUES ('19', '127', '2345123', '2', '200', null);
 INSERT INTO `jsh_tenant` VALUES ('20', '128', 'q12341243', '2', '200', null);
 INSERT INTO `jsh_tenant` VALUES ('21', '130', 'jsh666', '2', '200', null);
+
+-- ----------------------------
+-- Table structure for jsh_msg
+-- ----------------------------
+DROP TABLE IF EXISTS `jsh_msg`;
+CREATE TABLE `jsh_msg` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `msg_title` varchar(100) DEFAULT NULL COMMENT '消息标题',
+  `msg_content` varchar(500) DEFAULT NULL COMMENT '消息内容',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `type` varchar(20) DEFAULT NULL COMMENT '消息类型',
+  `status` varchar(1) DEFAULT NULL COMMENT '状态，1未读 2已读',
+  `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
+  `delete_Flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='消息表';
+
+-- ----------------------------
+-- Records of jsh_msg
+-- ----------------------------
+INSERT INTO `jsh_msg` VALUES ('2', '标题1', '内容1', '2019-09-10 00:11:39', '类型1', '1', '63', '0');
\ No newline at end of file
diff --git a/docs/华夏ERP数据库设计汇总.xlsx b/docs/华夏ERP数据库设计汇总.xlsx
index 2fdc8ba4..fa716f7d 100644
Binary files a/docs/华夏ERP数据库设计汇总.xlsx and b/docs/华夏ERP数据库设计汇总.xlsx differ
diff --git a/erp_web/pages/user/password.html b/erp_web/pages/user/password.html
index 4817e27d..b1d2a62e 100644
--- a/erp_web/pages/user/password.html
+++ b/erp_web/pages/user/password.html
@@ -14,8 +14,8 @@
     <script type="text/javascript" src="/js/common/common.js"></script>
 </head>
 <body>
-<div id="userDlg" class="easyui-panel" title="修改密码" style="height:370px;background-color:#EAF2FD; "
-     iconCls="icon-unlock" collapsible="true" closable="false">
+<div id="userDlg" class="easyui-panel" data-options="fit:true" title="修改密码" style="background-color:#EAF2FD; "
+     iconCls="icon-unlock">
     <form id="passwordFM" method="post" novalidate>
         <div class="fitem" style="padding:10px">
             <label id="passwordLabel">原始密码&nbsp;&nbsp;</label>
diff --git a/erp_web/pages/user/userHelp.html b/erp_web/pages/user/userHelp.html
index 3306b536..902bc701 100644
--- a/erp_web/pages/user/userHelp.html
+++ b/erp_web/pages/user/userHelp.html
@@ -13,9 +13,10 @@
     <script type="text/javascript" src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
     <script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
     <script type="text/javascript" src="/js/common/common.js"></script>
+    <script src="/js/common/jsherp.js"></script>
 </head>
 <body>
-<div id="tt" class="easyui-tabs" style="width:997px;height:466px;">
+<div id="tt" class="easyui-tabs" data-options="fit:true">
     <div class="init" title="初始资料" style="padding:20px;">
         <p class="title">初始资料录入</p>
         <p  class="content">及时准确的录入商品、客户、供应商、仓库信息与结算账户信息，能够有效的保障经营数据的完善以及后期账务的核算。</p>
@@ -23,31 +24,46 @@
         <div class="list">
             <div class="row">
                 <ul>
-                    <li class="module goods">商品信息</li>
+                    <li class="treeview">
+                        <a href="javascript:" data-href="/pages/materials/material.html"
+                           class="addTabPage" title="商品信息">商品信息</a>
+                    </li>
                     <li class="remark">管理商品信息及商品分类。</li>
                 </ul>
             </div>
             <div class="row">
                 <ul>
-                    <li class="module customer">客户信息</li>
+                    <li class="treeview">
+                        <a href="javascript:" data-href="/pages/manage/customer.html"
+                           class="addTabPage" title="客户信息">客户信息</a>
+                    </li>
                     <li class="remark">维护您的客户信息及欠款，新增的客户需要分配给用户才能使用。</li>
                 </ul>
             </div>
             <div class="row">
                 <ul>
-                    <li class="module vendor">供应商信息</li>
+                    <li class="treeview">
+                        <a href="javascript:" data-href="/pages/manage/vendor.html"
+                           class="addTabPage" title="供应商信息">供应商信息</a>
+                    </li>
                     <li class="remark">维护您的供应商信息及欠款。</li>
                 </ul>
             </div>
             <div class="row">
                 <ul>
-                    <li class="module depot">仓库信息</li>
+                    <li class="treeview">
+                        <a href="javascript:" data-href="/pages/manage/depot.html"
+                           class="addTabPage" title="仓库信息">仓库信息</a>
+                    </li>
                     <li class="remark">可以设置仓库负责人、设为默认仓库，新增的仓库需要分配给用户才能使用。</li>
                 </ul>
             </div>
             <div class="row">
                 <ul>
-                    <li class="module account">结算账户</li>
+                    <li class="treeview">
+                        <a href="javascript:" data-href="/pages/manage/account.html"
+                           class="addTabPage" title="结算账户">结算账户</a>
+                    </li>
                     <li class="remark">管理账户信息及初始余额。</li>
                 </ul>
             </div>
@@ -60,31 +76,46 @@
         <div class="list">
             <div class="row">
                 <ul>
-                    <li class="module purchase_orders">采购订单</li>
+                    <li class="treeview">
+                        <a href="javascript:" data-href="/pages/materials/purchase_orders_list.html"
+                           class="addTabPage" title="采购订单">采购订单</a>
+                    </li>
                     <li class="remark">采购订单不涉及入库仓库和付款金额，采购订单可以转采购入库单，但需要先对采购订单进行审核。</li>
                 </ul>
             </div>
             <div class="row">
                 <ul>
-                    <li class="module purchase_in">采购入库</li>
+                    <li class="treeview">
+                        <a href="javascript:" data-href="/pages/materials/purchase_in_list.html"
+                           class="addTabPage" title="采购入库">采购入库</a>
+                    </li>
                     <li class="remark">采购入库单可以由采购订单转过来，也可以单独创建。采购入库单据中的仓库列表只显示当前用户有权限的仓库。采购入库单可以使用多账户付款。</li>
                 </ul>
             </div>
             <div class="row">
                 <ul>
-                    <li class="module purchase_back">采购退货</li>
+                    <li class="treeview">
+                        <a href="javascript:" data-href="/pages/materials/purchase_back_list.html"
+                           class="addTabPage" title="采购退货">采购退货</a>
+                    </li>
                     <li class="remark">用于采购入库单据的退货。</li>
                 </ul>
             </div>
             <div class="row">
                 <ul>
-                    <li class="module buy_in">进货统计</li>
+                    <li class="treeview">
+                        <a href="javascript:" data-href="/pages/reports/buy_in_report.html"
+                           class="addTabPage" title="进货统计">进货统计</a>
+                    </li>
                     <li class="remark">以采购入库为统计依据，让我们可以清楚地知道，我们一共进了多少货，多少钱的货。</li>
                 </ul>
             </div>
             <div class="row">
                 <ul>
-                    <li class="module in_detail">入库明细</li>
+                    <li class="treeview">
+                        <a href="javascript:" data-href="/pages/reports/in_detail.html"
+                           class="addTabPage" title="入库明细">入库明细</a>
+                    </li>
                     <li class="remark">入库信息列表，可以查看单条信息。</li>
                 </ul>
             </div>
@@ -97,31 +128,46 @@
         <div class="list">
             <div class="row">
                 <ul>
-                    <li class="module sale_orders">销售订单</li>
+                    <li class="treeview">
+                        <a href="javascript:" data-href="/pages/materials/sale_orders_list.html"
+                           class="addTabPage" title="销售订单">销售订单</a>
+                    </li>
                     <li class="remark">销售订单不涉及出库仓库和收款金额，销售订单可以转销售出库单，但需要先对销售订单进行审核。</li>
                 </ul>
             </div>
             <div class="row">
                 <ul>
-                    <li class="module sale_out">销售出库</li>
+                    <li class="treeview">
+                        <a href="javascript:" data-href="/pages/materials/sale_out_list.html"
+                           class="addTabPage" title="销售出库">销售出库</a>
+                    </li>
                     <li class="remark">销售出库单可以由销售订单转过来，也可以单独创建。销售出库单据中的仓库列表只显示当前用户有权限的仓库。销售出库单可以使用多账户收款。</li>
                 </ul>
             </div>
             <div class="row">
                 <ul>
-                    <li class="module sale_back">销售退货</li>
+                    <li class="treeview">
+                        <a href="javascript:" data-href="/pages/materials/sale_back_list.html"
+                           class="addTabPage" title="销售退货">销售退货</a>
+                    </li>
                     <li class="remark">用于销售出库单据的退货。</li>
                 </ul>
             </div>
             <div class="row">
                 <ul>
-                    <li class="module sale_out_report">销售统计</li>
+                    <li class="treeview">
+                        <a href="javascript:" data-href="/pages/reports/sale_out_report.html"
+                           class="addTabPage" title="销售统计">销售统计</a>
+                    </li>
                     <li class="remark">以销售出库为统计依据，让我们可以清楚地知道，我们一共卖了多少货，多少钱的货。</li>
                 </ul>
             </div>
             <div class="row">
                 <ul>
-                    <li class="module out_detail">出库明细</li>
+                    <li class="treeview">
+                        <a href="javascript:" data-href="/pages/reports/out_detail.html"
+                           class="addTabPage" title="出库明细">出库明细</a>
+                    </li>
                     <li class="remark">出库信息列表，可以查看单条信息。</li>
                 </ul>
             </div>
@@ -134,31 +180,46 @@
         <div class="list">
             <div class="row">
                 <ul>
-                    <li class="module other_in">其它入库</li>
+                    <li class="treeview">
+                        <a href="javascript:" data-href="/pages/materials/other_in_list.html"
+                           class="addTabPage" title="其它入库">其它入库</a>
+                    </li>
                     <li class="remark">用于库存初始化、盘点库存等。</li>
                 </ul>
             </div>
             <div class="row">
                 <ul>
-                    <li class="module other_out">其它出库</li>
+                    <li class="treeview">
+                        <a href="javascript:" data-href="/pages/materials/other_out_list.html"
+                           class="addTabPage" title="其它出库">其它出库</a>
+                    </li>
                     <li class="remark">用于盘点库存、给商品报废等。</li>
                 </ul>
             </div>
             <div class="row">
                 <ul>
-                    <li class="module allocation_out">调拨出库</li>
+                    <li class="treeview">
+                        <a href="javascript:" data-href="/pages/materials/allocation_out_list.html"
+                           class="addTabPage" title="调拨出库">调拨出库</a>
+                    </li>
                     <li class="remark">用于两个仓库之间的商品调拨，调拨单会影响库存。</li>
                 </ul>
             </div>
             <div class="row">
                 <ul>
-                    <li class="module assemble">组装单</li>
+                    <li class="treeview">
+                        <a href="javascript:" data-href="/pages/materials/assemble_list.html"
+                           class="addTabPage" title="组装单">组装单</a>
+                    </li>
                     <li class="remark">用于将多种商品合并成一个商品，被合并的商品库存减少，合并后的商品库存增加。</li>
                 </ul>
             </div>
             <div class="row">
                 <ul>
-                    <li class="module disassemble">拆卸单</li>
+                    <li class="treeview">
+                        <a href="javascript:" data-href="/pages/materials/disassemble_list.html"
+                           class="addTabPage" title="拆卸单">拆卸单</a>
+                    </li>
                     <li class="remark">用于将一个商品拆分成多种商品，被拆分的商品库存增加，拆分后的商品库存减少。</li>
                 </ul>
             </div>
@@ -171,178 +232,51 @@
         <div class="list">
             <div class="row">
                 <ul>
-                    <li class="module item_in">收入单</li>
+                    <li class="treeview">
+                        <a href="javascript:" data-href="/pages/financial/item_in.html"
+                           class="addTabPage" title="收入单">收入单</a>
+                    </li>
                     <li class="remark">收入单主要处理一些销售收入以外的收入如维修服务收入、利息收入、调账收入等。</li>
                 </ul>
             </div>
             <div class="row">
                 <ul>
-                    <li class="module item_out">支出单</li>
+                    <li class="treeview">
+                        <a href="javascript:" data-href="/pages/financial/item_out.html"
+                           class="addTabPage" title="支出单">支出单</a>
+                    </li>
                     <li class="remark">支出单主要处理一些进货支出以外的支出如水电支出、房租支出等。</li>
                 </ul>
             </div>
             <div class="row">
                 <ul>
-                    <li class="module money_in">收款单</li>
+                    <li class="treeview">
+                        <a href="javascript:" data-href="/pages/financial/money_in.html"
+                           class="addTabPage" title="收款单">收款单</a>
+                    </li>
                     <li class="remark">收款单所收金额只对付款单位的应收应付产生影响，可以在回款统计中进行查看。收款单的优惠金额会对利润产生影响，但不影响付款单位的应收应付。优惠金额计入收入类的收款优惠中。</li>
                 </ul>
             </div>
             <div class="row">
                 <ul>
-                    <li class="module money_out">付款单</li>
+                    <li class="treeview">
+                        <a href="javascript:" data-href="/pages/financial/money_out.html"
+                           class="addTabPage" title="付款单">付款单</a>
+                    </li>
                     <li class="remark">付款单的要素和录入原则与“收款单”相同。付款单中优惠金额计入支出类中的付款优惠中，为负值 （因优惠意味着实际少付款）。</li>
                 </ul>
             </div>
             <div class="row">
                 <ul>
-                    <li class="module giro">转账单</li>
+                    <li class="treeview">
+                        <a href="javascript:" data-href="/pages/financial/giro.html"
+                           class="addTabPage" title="转账单">转账单</a>
+                    </li>
                     <li class="remark">转账：本系统的转账是指从一个银行存款账户转入到另一个银行存款账户。</li>
                 </ul>
             </div>
         </div>
     </div>
 </div>
-
-<script type="text/javascript">
-    var parentDom = $(window.parent.document);
-    function showModule(appName, funName) {
-        parentDom.find("#desk .desktop-container span:contains(" + appName + ")").click();
-        setTimeout(function () {
-            var  parentIframe = parentDom.find("iframe");
-            var funDom = parentIframe.contents().find("#tt li a:contains(" + funName + ")");
-            funDom.click();
-        },2000);
-    }
-    //初始资料
-    $("#tt .goods").off("click").on("click", function () {
-        var appName = "基础数据";
-        var funName = "商品信息";
-        showModule(appName, funName);
-    });
-    $("#tt .customer").off("click").on("click", function () {
-        var appName = "基础数据";
-        var funName = "客户信息";
-        showModule(appName, funName);
-    });
-    $("#tt .vendor").off("click").on("click", function () {
-        var appName = "基础数据";
-        var funName = "供应商信息";
-        showModule(appName, funName);
-    });
-    $("#tt .depot").off("click").on("click", function () {
-        var appName = "基础数据";
-        var funName = "仓库信息";
-        showModule(appName, funName);
-    });
-    $("#tt .account").off("click").on("click", function () {
-        var appName = "基础数据";
-        var funName = "结算账户";
-        showModule(appName, funName);
-    });
-    //采购
-    $("#tt .purchase_orders").off("click").on("click", function () {
-        var appName = "采购管理";
-        var funName = "采购订单";
-        showModule(appName, funName);
-    });
-    $("#tt .purchase_in").off("click").on("click", function () {
-        var appName = "采购管理";
-        var funName = "采购入库";
-        showModule(appName, funName);
-    });
-    $("#tt .purchase_back").off("click").on("click", function () {
-        var appName = "采购管理";
-        var funName = "采购退货";
-        showModule(appName, funName);
-    });
-    $("#tt .buy_in").off("click").on("click", function () {
-        var appName = "报表查询";
-        var funName = "进货统计";
-        showModule(appName, funName);
-    });
-    $("#tt .in_detail").off("click").on("click", function () {
-        var appName = "报表查询";
-        var funName = "入库明细";
-        showModule(appName, funName);
-    });
-    //销售
-    $("#tt .sale_orders").off("click").on("click", function () {
-        var appName = "销售管理";
-        var funName = "销售订单";
-        showModule(appName, funName);
-    });
-    $("#tt .sale_out").off("click").on("click", function () {
-        var appName = "销售管理";
-        var funName = "销售出库";
-        showModule(appName, funName);
-    });
-    $("#tt .sale_back").off("click").on("click", function () {
-        var appName = "销售管理";
-        var funName = "销售退货";
-        showModule(appName, funName);
-    });
-    $("#tt .sale_out_report").off("click").on("click", function () {
-        var appName = "报表查询";
-        var funName = "销售统计";
-        showModule(appName, funName);
-    });
-    $("#tt .out_detail").off("click").on("click", function () {
-        var appName = "报表查询";
-        var funName = "出库明细";
-        showModule(appName, funName);
-    });
-    //库存
-    $("#tt .other_in").off("click").on("click", function () {
-        var appName = "仓库管理";
-        var funName = "其它入库";
-        showModule(appName, funName);
-    });
-    $("#tt .other_out").off("click").on("click", function () {
-        var appName = "仓库管理";
-        var funName = "其它出库";
-        showModule(appName, funName);
-    });
-    $("#tt .allocation_out").off("click").on("click", function () {
-        var appName = "仓库管理";
-        var funName = "调拨出库";
-        showModule(appName, funName);
-    });
-    $("#tt .assemble").off("click").on("click", function () {
-        var appName = "仓库管理";
-        var funName = "组装单";
-        showModule(appName, funName);
-    });
-    $("#tt .disassemble").off("click").on("click", function () {
-        var appName = "仓库管理";
-        var funName = "拆卸单";
-        showModule(appName, funName);
-    });
-    //财务
-    $("#tt .item_in").off("click").on("click", function () {
-        var appName = "财务管理";
-        var funName = "收入单";
-        showModule(appName, funName);
-    });
-    $("#tt .item_out").off("click").on("click", function () {
-        var appName = "财务管理";
-        var funName = "支出单";
-        showModule(appName, funName);
-    });
-    $("#tt .money_in").off("click").on("click", function () {
-        var appName = "财务管理";
-        var funName = "收款单";
-        showModule(appName, funName);
-    });
-    $("#tt .money_out").off("click").on("click", function () {
-        var appName = "财务管理";
-        var funName = "付款单";
-        showModule(appName, funName);
-    });
-    $("#tt .giro").off("click").on("click", function () {
-        var appName = "财务管理";
-        var funName = "转账单";
-        showModule(appName, funName);
-    });
-</script>
 </body>
 </html>
\ No newline at end of file