diff --git a/src/main/java/com/jsh/action/basic/SupplierAction.java b/src/main/java/com/jsh/action/basic/SupplierAction.java index 98ff3c5b..8bbccfb7 100644 --- a/src/main/java/com/jsh/action/basic/SupplierAction.java +++ b/src/main/java/com/jsh/action/basic/SupplierAction.java @@ -28,7 +28,7 @@ public class SupplierAction extends BaseAction { private SupplierIService supplierService; private SupplierModel model = new SupplierModel(); - + private final static Integer ISYSTEM = 1; /** * 增加供应商 * @return @@ -456,6 +456,7 @@ public class SupplierAction extends BaseAction condition.put("phonenum_s_like", model.getPhonenum()); condition.put("email_s_like", model.getEmail()); condition.put("description_s_like", model.getDescription()); + condition.put("isystem_n_eq", ISYSTEM); condition.put("id_s_order", "desc"); return condition; } diff --git a/src/main/webapp/pages/manage/vendor.jsp b/src/main/webapp/pages/manage/vendor.jsp index 019756b5..ef8604d4 100644 --- a/src/main/webapp/pages/manage/vendor.jsp +++ b/src/main/webapp/pages/manage/vendor.jsp @@ -168,6 +168,9 @@ //初始化表格数据 function initTableData() { + //改变宽度和高度 + $("#searchPanel").panel({width:webW-2}); + $("#tablePanel").panel({width:webW-2}); $('#tableData').datagrid({ //title:'单位列表', //iconCls:'icon-save',