bug修改

src/main/java/com/minpay/shouhuo/invCardManageAction.java

@@ -1,279 +1,279 @@
-package com.minpay.shouhuo;
-
-import com.minpay.common.bean.User;
-import com.minpay.common.format.IFormatService;
-import com.minpay.common.service.ILogService;
-import com.minpay.db.table.mapper.VmOrderInfMapper;
-import com.minpay.db.table.model.VmOrderInf;
-import com.minpay.db.table.own.mapper.OrderManageMapper;
-import com.startup.minpay.frame.business.IMINAction;
-import com.startup.minpay.frame.business.res.MINActionResult;
-import com.startup.minpay.frame.constant.IMINBusinessConstant;
-import com.startup.minpay.frame.data.format.MINCopyFormat;
-import com.startup.minpay.frame.jdbc.MINRowBounds;
-import com.startup.minpay.frame.service.base.IMINDataBaseService;
-import com.startup.minpay.frame.service.base.Service;
-import com.startup.minpay.frame.session.MINSession;
-import com.startup.minpay.frame.target.MINAction;
-import com.startup.minpay.frame.target.MINComponent;
-import com.startup.minpay.frame.target.MINParam;
-
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 财务管理
- * 
- * @author wlm
- */
-@MINComponent
-public class invCardManageAction implements IMINAction {
-
-	/**查询订单详情**/
-	public final static String SELECT_ORDER_DETAIL = "selectOrderDetail";
-
-	/**取货、作废**/
-	public final static String UPDATE_ORDER_STT = "updateOrderStt";
-
-	/**查询取货记录**/
-	public final static String SELECT_PICKUP_RECORD = "selectPickupRecord";
-
-	/**  收入统计 **/
-	public final static String SELECT_INCOME_STATISTICS = "selectIncomeStatistics";
-
-	/**  收入统计 **/
-	public final static String SELECT_ALL_INCOME = "selectAllIncome";
-
-	/**  销售数据 **/
-	public final static String SELECT_SALES_DATA = "selectSalesData";
-	/**  销售数据2 **/
-	public final static String SELECT_ALL_SALE = "selectAllSale";
-
-	/**
-	 * 总销售数量
-	 * @param session
-	 * @return
-	 * @throws Exception
-	 */
-	@MINAction(value = SELECT_ALL_SALE)
-	public MINActionResult selectAllSale (
-			MINSession session) throws Exception {
-		MINActionResult res = new MINActionResult();
-		User user = session.getUser();
-		//总实际金额
-		String allSale = Service.lookup(IMINDataBaseService.class)
-				.getMybatisMapper(OrderManageMapper.class).selectAllSale();
-		//总商品成本
-		String allCost = Service.lookup(IMINDataBaseService.class)
-				.getMybatisMapper(OrderManageMapper.class).selectAllCost();
-		BigDecimal num1 = new BigDecimal(allSale);
-		BigDecimal num2 = new BigDecimal(allCost);
-		BigDecimal  allProfit = num1.subtract(num2);
-		//返回数据
-		res.set("allSale", allSale);
-		res.set("allCost", allCost);
-		res.set("allProfit", allProfit);
-
-		return res;
-	}
-	/**
-	 * 销售数据
-	 * @param page
-	 * @param limit
-	 * @param session
-	 * @return
-	 * @throws Exception
-	 */
-	@MINAction(value = SELECT_SALES_DATA)
-	public MINActionResult selectSalesData (
-			@MINParam(key = "page", defaultValue = "1") int page,
-			@MINParam(key = "limit", defaultValue = "7") int limit,
-			MINSession session) throws Exception {
-		MINActionResult res = new MINActionResult();
-		User user = session.getUser();
-		MINRowBounds rows = new MINRowBounds(page, limit);
-		List<Map<String, String>> detailList = Service.lookup(IMINDataBaseService.class)
-				.getMybatisMapper(OrderManageMapper.class).selectProductInfo(rows);
-
-
-		//返回数据
-		res.set(IMINBusinessConstant.F_PAGING_LAY, detailList);
-		res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getCount());
-		return res;
-	}
-
-	/**
-	 * 总收入统计
-	 * @param session
-	 * @return
-	 * @throws Exception
-	 */
-	@MINAction(value = SELECT_ALL_INCOME)
-	public MINActionResult selectAllIncome (
-			MINSession session) throws Exception {
-		MINActionResult res = new MINActionResult();
-		User user = session.getUser();
-		//查询订单数
-		String orderNum = Service.lookup(IMINDataBaseService.class)
-				.getMybatisMapper(OrderManageMapper.class).selectCountOrderNum();
-		//查询累计收入
-		String countIncome = Service.lookup(IMINDataBaseService.class)
-				.getMybatisMapper(OrderManageMapper.class).selectCountIncome();
-		//查询总机台数
-		String countDevice = Service.lookup(IMINDataBaseService.class)
-				.getMybatisMapper(OrderManageMapper.class).selectCountDevice();
-		//返回数据
-		res.set("orderNum", orderNum);
-		res.set("countIncome", countIncome);
-		res.set("countDevice", countDevice);
-		return res;
-	}
-
-	/**
-	 * 收入统计
-	 * @param page
-	 * @param limit
-	 * @param session
-	 * @return
-	 * @throws Exception
-	 */
-	@MINAction(value = SELECT_INCOME_STATISTICS)
-	public MINActionResult selectIncomeStatistics (
-			@MINParam(key = "page", defaultValue = "1") int page,
-			@MINParam(key = "limit", defaultValue = "7") int limit,
-			MINSession session) throws Exception {
-		MINActionResult res = new MINActionResult();
-		User user = session.getUser();
-		MINRowBounds rows = new MINRowBounds(page, limit);
-		List<Map<String, String>> detailList = Service.lookup(IMINDataBaseService.class)
-				.getMybatisMapper(OrderManageMapper.class).selectIncomeDetail(rows);
-
-		detailList = Service.lookup(IFormatService.class).formatDate(detailList, "newTime");
-		detailList = Service.lookup(IFormatService.class).formatCurrency(detailList, "sellWxSum", "sellZfSum", "" +
-				"sellMfSum", "allSell");
-		//返回数据
-		res.set(IMINBusinessConstant.F_PAGING_LAY, detailList);
-		res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getCount());
-		return res;
-	}
-
-	/**
-	 * 取货记录
-	 * @param machineNo
-	 * @param orderNo
-	 * @param pickUpDates
-	 * @param page
-	 * @param limit
-	 * @param session
-	 * @return
-	 * @throws Exception
-	 */
-	@MINAction(value = SELECT_PICKUP_RECORD)
-	public MINActionResult selectPickupRecord (
-			@MINParam(key = "machineNo") String machineNo,
-			@MINParam(key = "orderNo") String orderNo,
-			@MINParam(key = "pickUpDates") String pickUpDates,
-			@MINParam(key = "page", defaultValue = "1") int page,
-			@MINParam(key = "limit", defaultValue = "3") int limit,
-			MINSession session) throws Exception {
-		MINActionResult res = new MINActionResult();
-		User user = session.getUser();
-		Map<String, String> m = new HashMap<String, String>();
-		m.put("machineNo", machineNo);
-		m.put("orderNo", orderNo);
-		m.put("pickUpDates", pickUpDates);
-		MINRowBounds rows = new MINRowBounds(page, limit);
-		List<Map<String, String>> detailList = Service.lookup(IMINDataBaseService.class)
-				.getMybatisMapper(OrderManageMapper.class).selectPickupRecord(m,rows);
-		detailList = new MINCopyFormat("{stt:'sttDesc'}").format(detailList);
-		detailList = Service.lookup(IFormatService.class).formatEnum(detailList,"{sttDesc:'PICKUP_STT'}");
-		//返回数据
-		res.set(IMINBusinessConstant.F_PAGING_LAY, detailList);
-		res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getCount());
-		return res;
-	}
-
-	/**
-	 * 查询订单详情
-	 * @param machineNo
-	 * @param pickUpCode
-	 * @param creatdDtes
-	 * @param pickUpDates
-	 * @param pickUpState
-	 * @param page
-	 * @param limit
-	 * @param session
-	 * @return
-	 * @throws Exception
-	 */
-	@MINAction(value = SELECT_ORDER_DETAIL)
-	public MINActionResult selectOrderDetail (
-			@MINParam(key = "machineNo") String machineNo,
-			@MINParam(key = "pickUpCode") String pickUpCode,
-			@MINParam(key = "creatdDtes") String creatdDtes,
-			@MINParam(key = "pickUpDates") String pickUpDates,
-			@MINParam(key = "pickUpState") String pickUpState,
-			@MINParam(key = "page", defaultValue = "1") int page,
-			@MINParam(key = "limit", defaultValue = "3") int limit,
-			MINSession session) throws Exception {
-		MINActionResult res = new MINActionResult();
-		User user = session.getUser();
-		Map<String, String> m = new HashMap<String, String>();
-		m.put("machineNo", machineNo);
-		m.put("pickUpCode", pickUpCode);
-		m.put("creatdDtes", creatdDtes);
-		m.put("pickUpDates", pickUpDates);
-		m.put("pickUpState", pickUpState);
-		MINRowBounds rows = new MINRowBounds(page, limit);
-		List<Map<String, String>> detailList = Service.lookup(IMINDataBaseService.class)
-				.getMybatisMapper(OrderManageMapper.class).selectOrderDetail(m,rows);
-		// 格式化数据
-		detailList = Service.lookup(IFormatService.class).formatDateTime(detailList, "pickUpTime");
-		detailList = Service.lookup(IFormatService.class).formatDateTime(detailList, "createTime");
-		detailList = new MINCopyFormat("{stt:'sttDesc'}").format(detailList);
-		detailList = Service.lookup(IFormatService.class).formatEnum(detailList,"{sttDesc:'PICKUP_STT'}");
-		//返回数据
-		res.set(IMINBusinessConstant.F_PAGING_LAY, detailList);
-		res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getMaxRows());
-		return res;
-	}
-
-
-
-	/**
-	 *卡卷管理、取货、作废
-	 * @param orderNo
-	 * @param temp	操作0：作废，1：取货
-	 * @param session
-	 * @return
-	 * @throws Exception
-	 */
-	@MINAction(value = UPDATE_ORDER_STT)
-	public MINActionResult updateOrderStt(
-			@MINParam ( key = "orderNo")String orderNo,
-			@MINParam ( key = "temp")String temp,
-			MINSession session) throws Exception{
-		MINActionResult res = new MINActionResult();
-		User user = session.getUser();
-		String info = "";
-		//更新订单状态
-		VmOrderInf vd = new VmOrderInf();
-		vd.setId(orderNo);
-		if ("0".equals(temp)) {
-			vd.setPickupStt("02");
-			info = "废止";
-		}else if("1".equals(temp)) {
-			vd.setPickupStt("01");
-			info = "发货";
-		}
-		Service.lookup(IMINDataBaseService.class)
-				.updateByPrimaryKeySelective(VmOrderInfMapper.class, vd);
-		//日志
-		String logInfo = user.getName()+"-更新订单状态:" +info+ ",订单号"+orderNo;
-		Service.lookup(ILogService.class).logging(session, logInfo);
-		return res;
-	}
-
-}
+//package com.minpay.shouhuo;
+//
+//import com.minpay.common.bean.User;
+//import com.minpay.common.format.IFormatService;
+//import com.minpay.common.service.ILogService;
+//import com.minpay.db.table.mapper.VmOrderInfMapper;
+//import com.minpay.db.table.model.VmOrderInf;
+//import com.minpay.db.table.own.mapper.OrderManageMapper;
+//import com.startup.minpay.frame.business.IMINAction;
+//import com.startup.minpay.frame.business.res.MINActionResult;
+//import com.startup.minpay.frame.constant.IMINBusinessConstant;
+//import com.startup.minpay.frame.data.format.MINCopyFormat;
+//import com.startup.minpay.frame.jdbc.MINRowBounds;
+//import com.startup.minpay.frame.service.base.IMINDataBaseService;
+//import com.startup.minpay.frame.service.base.Service;
+//import com.startup.minpay.frame.session.MINSession;
+//import com.startup.minpay.frame.target.MINAction;
+//import com.startup.minpay.frame.target.MINComponent;
+//import com.startup.minpay.frame.target.MINParam;
+//
+//import java.math.BigDecimal;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+// * 财务管理
+// *
+// * @author wlm
+// */
+//@MINComponent
+//public class invCardManageAction implements IMINAction {
+//
+//	/**查询订单详情**/
+//	public final static String SELECT_ORDER_DETAIL = "selectOrderDetail";
+//
+//	/**取货、作废**/
+//	public final static String UPDATE_ORDER_STT = "updateOrderStt";
+//
+//	/**查询取货记录**/
+//	public final static String SELECT_PICKUP_RECORD = "selectPickupRecord";
+//
+//	/**  收入统计 **/
+//	public final static String SELECT_INCOME_STATISTICS = "selectIncomeStatistics";
+//
+//	/**  收入统计 **/
+//	public final static String SELECT_ALL_INCOME = "selectAllIncome";
+//
+//	/**  销售数据 **/
+//	public final static String SELECT_SALES_DATA = "selectSalesData";
+//	/**  销售数据2 **/
+//	public final static String SELECT_ALL_SALE = "selectAllSale";
+//
+//	/**
+//	 * 总销售数量
+//	 * @param session
+//	 * @return
+//	 * @throws Exception
+//	 */
+//	@MINAction(value = SELECT_ALL_SALE)
+//	public MINActionResult selectAllSale (
+//			MINSession session) throws Exception {
+//		MINActionResult res = new MINActionResult();
+//		User user = session.getUser();
+//		//总实际金额
+//		String allSale = Service.lookup(IMINDataBaseService.class)
+//				.getMybatisMapper(OrderManageMapper.class).selectAllSale();
+//		//总商品成本
+//		String allCost = Service.lookup(IMINDataBaseService.class)
+//				.getMybatisMapper(OrderManageMapper.class).selectAllCost();
+//		BigDecimal num1 = new BigDecimal(allSale);
+//		BigDecimal num2 = new BigDecimal(allCost);
+//		BigDecimal  allProfit = num1.subtract(num2);
+//		//返回数据
+//		res.set("allSale", allSale);
+//		res.set("allCost", allCost);
+//		res.set("allProfit", allProfit);
+//
+//		return res;
+//	}
+//	/**
+//	 * 销售数据
+//	 * @param page
+//	 * @param limit
+//	 * @param session
+//	 * @return
+//	 * @throws Exception
+//	 */
+//	@MINAction(value = SELECT_SALES_DATA)
+//	public MINActionResult selectSalesData (
+//			@MINParam(key = "page", defaultValue = "1") int page,
+//			@MINParam(key = "limit", defaultValue = "7") int limit,
+//			MINSession session) throws Exception {
+//		MINActionResult res = new MINActionResult();
+//		User user = session.getUser();
+//		MINRowBounds rows = new MINRowBounds(page, limit);
+//		List<Map<String, String>> detailList = Service.lookup(IMINDataBaseService.class)
+//				.getMybatisMapper(OrderManageMapper.class).selectProductInfo(rows);
+//
+//
+//		//返回数据
+//		res.set(IMINBusinessConstant.F_PAGING_LAY, detailList);
+//		res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getCount());
+//		return res;
+//	}
+//
+//	/**
+//	 * 总收入统计
+//	 * @param session
+//	 * @return
+//	 * @throws Exception
+//	 */
+//	@MINAction(value = SELECT_ALL_INCOME)
+//	public MINActionResult selectAllIncome (
+//			MINSession session) throws Exception {
+//		MINActionResult res = new MINActionResult();
+//		User user = session.getUser();
+//		//查询订单数
+//		String orderNum = Service.lookup(IMINDataBaseService.class)
+//				.getMybatisMapper(OrderManageMapper.class).selectCountOrderNum();
+//		//查询累计收入
+//		String countIncome = Service.lookup(IMINDataBaseService.class)
+//				.getMybatisMapper(OrderManageMapper.class).selectCountIncome();
+//		//查询总机台数
+//		String countDevice = Service.lookup(IMINDataBaseService.class)
+//				.getMybatisMapper(OrderManageMapper.class).selectCountDevice();
+//		//返回数据
+//		res.set("orderNum", orderNum);
+//		res.set("countIncome", countIncome);
+//		res.set("countDevice", countDevice);
+//		return res;
+//	}
+//
+//	/**
+//	 * 收入统计
+//	 * @param page
+//	 * @param limit
+//	 * @param session
+//	 * @return
+//	 * @throws Exception
+//	 */
+//	@MINAction(value = SELECT_INCOME_STATISTICS)
+//	public MINActionResult selectIncomeStatistics (
+//			@MINParam(key = "page", defaultValue = "1") int page,
+//			@MINParam(key = "limit", defaultValue = "7") int limit,
+//			MINSession session) throws Exception {
+//		MINActionResult res = new MINActionResult();
+//		User user = session.getUser();
+//		MINRowBounds rows = new MINRowBounds(page, limit);
+//		List<Map<String, String>> detailList = Service.lookup(IMINDataBaseService.class)
+//				.getMybatisMapper(OrderManageMapper.class).selectIncomeDetail(rows);
+//
+//		detailList = Service.lookup(IFormatService.class).formatDate(detailList, "newTime");
+//		detailList = Service.lookup(IFormatService.class).formatCurrency(detailList, "sellWxSum", "sellZfSum", "" +
+//				"sellMfSum", "allSell");
+//		//返回数据
+//		res.set(IMINBusinessConstant.F_PAGING_LAY, detailList);
+//		res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getCount());
+//		return res;
+//	}
+//
+//	/**
+//	 * 取货记录
+//	 * @param machineNo
+//	 * @param orderNo
+//	 * @param pickUpDates
+//	 * @param page
+//	 * @param limit
+//	 * @param session
+//	 * @return
+//	 * @throws Exception
+//	 */
+//	@MINAction(value = SELECT_PICKUP_RECORD)
+//	public MINActionResult selectPickupRecord (
+//			@MINParam(key = "machineNo") String machineNo,
+//			@MINParam(key = "orderNo") String orderNo,
+//			@MINParam(key = "pickUpDates") String pickUpDates,
+//			@MINParam(key = "page", defaultValue = "1") int page,
+//			@MINParam(key = "limit", defaultValue = "3") int limit,
+//			MINSession session) throws Exception {
+//		MINActionResult res = new MINActionResult();
+//		User user = session.getUser();
+//		Map<String, String> m = new HashMap<String, String>();
+//		m.put("machineNo", machineNo);
+//		m.put("orderNo", orderNo);
+//		m.put("pickUpDates", pickUpDates);
+//		MINRowBounds rows = new MINRowBounds(page, limit);
+//		List<Map<String, String>> detailList = Service.lookup(IMINDataBaseService.class)
+//				.getMybatisMapper(OrderManageMapper.class).selectPickupRecord(m,rows);
+//		detailList = new MINCopyFormat("{stt:'sttDesc'}").format(detailList);
+//		detailList = Service.lookup(IFormatService.class).formatEnum(detailList,"{sttDesc:'PICKUP_STT'}");
+//		//返回数据
+//		res.set(IMINBusinessConstant.F_PAGING_LAY, detailList);
+//		res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getCount());
+//		return res;
+//	}
+//
+//	/**
+//	 * 查询订单详情
+//	 * @param machineNo
+//	 * @param pickUpCode
+//	 * @param creatdDtes
+//	 * @param pickUpDates
+//	 * @param pickUpState
+//	 * @param page
+//	 * @param limit
+//	 * @param session
+//	 * @return
+//	 * @throws Exception
+//	 */
+//	@MINAction(value = SELECT_ORDER_DETAIL)
+//	public MINActionResult selectOrderDetail (
+//			@MINParam(key = "machineNo") String machineNo,
+//			@MINParam(key = "pickUpCode") String pickUpCode,
+//			@MINParam(key = "creatdDtes") String creatdDtes,
+//			@MINParam(key = "pickUpDates") String pickUpDates,
+//			@MINParam(key = "pickUpState") String pickUpState,
+//			@MINParam(key = "page", defaultValue = "1") int page,
+//			@MINParam(key = "limit", defaultValue = "3") int limit,
+//			MINSession session) throws Exception {
+//		MINActionResult res = new MINActionResult();
+//		User user = session.getUser();
+//		Map<String, String> m = new HashMap<String, String>();
+//		m.put("machineNo", machineNo);
+//		m.put("pickUpCode", pickUpCode);
+//		m.put("creatdDtes", creatdDtes);
+//		m.put("pickUpDates", pickUpDates);
+//		m.put("pickUpState", pickUpState);
+//		MINRowBounds rows = new MINRowBounds(page, limit);
+//		List<Map<String, String>> detailList = Service.lookup(IMINDataBaseService.class)
+//				.getMybatisMapper(OrderManageMapper.class).selectOrderDetail(m,rows);
+//		// 格式化数据
+//		detailList = Service.lookup(IFormatService.class).formatDateTime(detailList, "pickUpTime");
+//		detailList = Service.lookup(IFormatService.class).formatDateTime(detailList, "createTime");
+//		detailList = new MINCopyFormat("{stt:'sttDesc'}").format(detailList);
+//		detailList = Service.lookup(IFormatService.class).formatEnum(detailList,"{sttDesc:'PICKUP_STT'}");
+//		//返回数据
+//		res.set(IMINBusinessConstant.F_PAGING_LAY, detailList);
+//		res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getMaxRows());
+//		return res;
+//	}
+//
+//
+//
+//	/**
+//	 *卡卷管理、取货、作废
+//	 * @param orderNo
+//	 * @param temp	操作0：作废，1：取货
+//	 * @param session
+//	 * @return
+//	 * @throws Exception
+//	 */
+//	@MINAction(value = UPDATE_ORDER_STT)
+//	public MINActionResult updateOrderStt(
+//			@MINParam ( key = "orderNo")String orderNo,
+//			@MINParam ( key = "temp")String temp,
+//			MINSession session) throws Exception{
+//		MINActionResult res = new MINActionResult();
+//		User user = session.getUser();
+//		String info = "";
+//		//更新订单状态
+//		VmOrderInf vd = new VmOrderInf();
+//		vd.setId(orderNo);
+//		if ("0".equals(temp)) {
+//			vd.setPickupStt("02");
+//			info = "废止";
+//		}else if("1".equals(temp)) {
+//			vd.setPickupStt("01");
+//			info = "发货";
+//		}
+//		Service.lookup(IMINDataBaseService.class)
+//				.updateByPrimaryKeySelective(VmOrderInfMapper.class, vd);
+//		//日志
+//		String logInfo = user.getName()+"-更新订单状态:" +info+ ",订单号"+orderNo;
+//		Service.lookup(ILogService.class).logging(session, logInfo);
+//		return res;
+//	}
+//
+//}

src/main/webapp/admin/categoryManage/categoryManage.html

@@ -15,23 +15,19 @@
 			<button class="layui-btn order-bnt1"  data-type="reload" >搜索</button>
 			<button class="layui-btn  order-bnt2" data-type="reset">重置</button>
 			<button class="layui-btn order-bnt2" id = "addBtn">添加</button>
-
 			<a href="#" id="toggle" class="top">收起</a>
 		</div>
 	</div>
 	<form class="layui-form"  action="javascript:void(0)"  id = "formRole">
 		<div class="order-select back-border" id="content">
 			<div class="layui-inline">
-				<label class="layui-form-label">类目名称:</label>
-				<div class="layui-input-block">
-					<input type="text" name="categoryName"  id ="categoryName" lay-verify="categoryName"  autocomplete="off" placeholder="请输入类目名称" class="layui-input">
-				</div>
+				<label class="f12-gray4">类目名称:</label>
+				<input type="text" name="categoryName"  id ="categoryName" lay-verify="categoryName"  autocomplete="off" placeholder="请输入类目名称" class="search-select">
 			</div>
+
 			<div class="layui-inline">
-				<div class="layui-inline">
-					<label class="layui-form-label">状态:</label>
-					<div class="layui-input-block" id="state">
-					</div>
+				<label class="f12-gray4">状态:</label>
+				<div class="" id="state" name="state" style="display:inline-block">
 				</div>
 			</div>
 		</div>
@@ -182,7 +178,7 @@
 	function reloadRole() {
 		//角色名称
 		var categoryName = $("#categoryName").val();
-		var state = $('#formName').find("select[name='state']").val();
+		var state = $('#formRole').find("select[name='state']").val();
 
 		//执行重载
 		table.reload('tableTest', {

src/main/webapp/admin/categoryManage/editCategory.html

@@ -66,16 +66,6 @@
         $("#remarks").val(params.remarks);
     	layui.use('form', function(){
     		var form = layui.form;
-    		layui.each(resData, function(index, item){
-    			if(index=="categoryImg"){
-    				categoryImg = item;
-					if(!isEmpty(item)){
-						$('#categoryImg').append('<img width="100px" onclick="isDelete(this,1)" style="margin:10px;" height="100px" src="'+item+'" class="layui-upload-img">')		
-					}
-				}else{
-					$("#"+index+"").val(item);
-				}
-			});
             //自定义验证规则
             form.verify({
             	categoryName : function(valueb) {
@@ -86,13 +76,6 @@
             });
             //监听提交
             form.on('submit(submitBtn)', function(data) {
-            	/* if(isEmpty(categoryImg)){
-            		layer.alert("请选择上传类目图片！", {
-						icon: 5,
-						title: "提示"
-					});
-            	} else{ */
-            	data.field.categoryImg = categoryImg;
               	$.request({
 					action : '../../CategoryManageAction/modifyCategory',
 					data :  data.field ,

src/main/webapp/admin/productManage/productAdd.html

@@ -157,9 +157,10 @@
     					 data : data.field,
     					success : function(data) {
     						 layer.alert('操作成功!',  function(){
-    			                 parent.layer.close(parent.layer.index);  
-    							 window.parent.queryReload(); 
-    						}); 	
+								 window.location.reload();
+								 // parent. layer.close(layer.index);
+								 deleteTabPage('501001-01');
+							 });
     					},
     					error : function(data) {
     						 layer.alert(data.msg, {

src/main/webapp/admin/productManage/productManage.html

@@ -200,20 +200,20 @@
 							},
 							success : function(resData) {
 								if (resData.MINStatus == 0) {
-									queryReload(); 
+									reloadRole();
 									layer.alert('操作成功！', {icon: 1});
 								} else {
 									layer.alert(resData.MINErrorMessage, {
 				  						icon: 5,
 				  						title: "提示"
-				  					}); 
+				  					});
 								}
 							},
 							error : function(data2){
 								layer.alert(data2.MINErrorMessage, {
 			  						icon: 5,
 			  						title: "提示"
-			  					}); 
+			  					});
 							}
 				      	});
 					});
@@ -228,20 +228,20 @@
 							},
 							success : function(resData) {
 								if (resData.MINStatus == 0) {
-									queryReload(); 
+									reloadRole();
 									layer.alert('操作成功！', {icon: 1});
 								} else {
 									layer.alert(resData.MINErrorMessage, {
 				  						icon: 5,
 				  						title: "提示"
-				  					}); 
+				  					});
 								}
 							},
 							error : function(data2){
 								layer.alert(data2.MINErrorMessage, {
 			  						icon: 5,
 			  						title: "提示"
-			  					}); 
+			  					});
 							}
 				      	});
 					});
@@ -256,20 +256,20 @@
 							},
 							success : function(resData) {
 								if (resData.MINStatus == 0) {
-									queryReload(); 
+									reloadRole();
 									layer.alert('操作成功！', {icon: 1});
 								} else {
 									layer.alert(resData.MINErrorMessage, {
 				  						icon: 5,
 				  						title: "提示"
-				  					}); 
+				  					});
 								}
 							},
 							error : function(data2){
 								layer.alert(data2.MINErrorMessage, {
 			  						icon: 5,
 			  						title: "提示"
-			  					}); 
+			  					});
 							}
 				      	});
 					});
@@ -284,7 +284,7 @@
 							},
 							success : function(resData) {
 								if (resData.MINStatus == 0) {
-									queryReload(); 
+									reloadRole();
 									layer.alert('操作成功！', {icon: 1});
 								} else {
 									layer.alert(resData.MINErrorMessage, {

src/main/webapp/admin/productManage/productUpdate.html

@@ -38,31 +38,6 @@
 			    	<div class="layui-upload-list" id="licence" lay-allowclose="true"></div>	    
 		 		</blockquote>
 			</div>
-		   <!-- <div class="layui-upload">
-			    <label class="layui-form-label">商品主图：</label>
-			  	<button type="button" class="layui-btn" id="test4">图片上传</button> 
-			  		<blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
-			    	预览图：
-			    	<div class="layui-upload-list" id="masterMap" lay-allowclose="true"></div>	    
-		 		</blockquote>
-			</div>
-		   
-			<div class="layui-upload">
-				<label class="layui-form-label">商品描述：</label>
-			  	<button type="button" class="layui-btn" id="test3">图片上传</button> 
-			  		<blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
-			    	预览图：
-			    	<div class="layui-upload-list" id="describeUrl" lay-allowclose="true"></div>	    
-		 		</blockquote>
-		   </div>
-			<div class="layui-upload">
-			     <label class="layui-form-label">商品图片列表：</label>
-			  	<button type="button" class="layui-btn" id="test">图片上传</button> 
-			  		<blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
-			    	预览图：
-			    	<div class="layui-upload-list" id="imgList" lay-allowclose="true"></div>	    
-		 		</blockquote>
-			</div> -->
         	<div class="layui-form-item box-button">
             	<div class="layui-input-block">
                 	<button class="layui-btn" lay-submit="" lay-filter="demo1">提交</button>