瀏覽代碼

Merge remote-tracking branch 'origin/master'

xubh 5 年之前
父節點
當前提交
495529cf70

+ 1 - 1
src/main/java/com/minpay/db/table/own/mapper/OrderManageMapper.java

@@ -43,7 +43,7 @@ public interface OrderManageMapper extends IMINMybatisEntityMapper {
 	/**
 	 * 销售数据
 	 */
-	List<Map<String, String>> selectProductInfo(MINRowBounds row);
+	List<Map<String, String>> selectProductInfo(MINRowBounds row, Map<String, String> m);
 	/**
 	 * 总实际金额
 	 */

+ 14 - 1
src/main/java/com/minpay/shouhuo/invCardManageAction.java

@@ -90,13 +90,18 @@ public class invCardManageAction implements IMINAction {
 	public MINActionResult selectSalesData (
 			@MINParam(key = "page", defaultValue = "1") int page,
 			@MINParam(key = "limit", defaultValue = "7") int limit,
+			@MINParam(key = "proName") String proName,
 			MINSession session) throws Exception {
 		MINActionResult res = new MINActionResult();
 		User user = session.getUser();
+		Map<String, String> m = new HashMap<String, String>();
+		m.put("proName", proName);
+
 		MINRowBounds rows = new MINRowBounds(page, limit);
 		List<Map<String, String>> detailList = Service.lookup(IMINDataBaseService.class)
-				.getMybatisMapper(OrderManageMapper.class).selectProductInfo(rows);
+				.getMybatisMapper(OrderManageMapper.class).selectProductInfo(rows, m);
 
+		detailList = Service.lookup(IFormatService.class).formatCurrency(detailList, "amount", "proNums");
 
 		//返回数据
 		res.set(IMINBusinessConstant.F_PAGING_LAY, detailList);
@@ -175,6 +180,9 @@ public class invCardManageAction implements IMINAction {
 			@MINParam(key = "machineNo") String machineNo,
 			@MINParam(key = "orderNo") String orderNo,
 			@MINParam(key = "pickUpDates") String pickUpDates,
+			@MINParam(key = "equrelId") String equrelId,
+			@MINParam(key = "vciId") String vciId,
+			@MINParam(key = "pickupNo") String pickupNo,
 			@MINParam(key = "page", defaultValue = "1") int page,
 			@MINParam(key = "limit", defaultValue = "3") int limit,
 			MINSession session) throws Exception {
@@ -184,6 +192,9 @@ public class invCardManageAction implements IMINAction {
 		m.put("machineNo", machineNo);
 		m.put("orderNo", orderNo);
 		m.put("pickUpDates", pickUpDates);
+		m.put("equrelId", equrelId);
+		m.put("vciId", vciId);
+		m.put("pickupNo", pickupNo);
 		MINRowBounds rows = new MINRowBounds(page, limit);
 		List<Map<String, String>> detailList = Service.lookup(IMINDataBaseService.class)
 				.getMybatisMapper(OrderManageMapper.class).selectPickupRecord(m,rows);
@@ -212,6 +223,7 @@ public class invCardManageAction implements IMINAction {
 	public MINActionResult selectOrderDetail (
 			@MINParam(key = "machineNo") String machineNo,
 			@MINParam(key = "pickUpCode") String pickUpCode,
+			@MINParam(key = "equrelId") String equrelId,
 			@MINParam(key = "creatdDtes") String creatdDtes,
 			@MINParam(key = "pickUpDates") String pickUpDates,
 			@MINParam(key = "pickUpState") String pickUpState,
@@ -223,6 +235,7 @@ public class invCardManageAction implements IMINAction {
 		Map<String, String> m = new HashMap<String, String>();
 		m.put("machineNo", machineNo);
 		m.put("pickUpCode", pickUpCode);
+		m.put("equrelId", equrelId);
 		m.put("creatdDtes", creatdDtes);
 		m.put("pickUpDates", pickUpDates);
 		m.put("pickUpState", pickUpState);

+ 32 - 4
src/main/resources/com/minpay/db/table/own/mapper/OrderManageMapper.xml

@@ -14,7 +14,10 @@
 		d.VOI_CREATE_TIME 		"createTime",
 		d.VOI_PICKUP_NO 		"pickupNo",
 		d.VOI_PICKUP_TIME 		"pickUpTime",
-		d.VOI_PICKUP_STT 		"stt"
+		d.VOI_PICKUP_STT 		"stt",
+		r.VCI_SALL_PRICE 		"sallPrice",
+		r.VCI_GAME_PRICE 		"gamePrice",
+		r.VCI_COST_PRICE 		"costPrice"
 	    FROM vm_order_details o,vm_order_inf d, vm_pro_equ_rel r, vm_person_inf p
 		where o.VOD_PRO_EQU_REL_ID = r.VCI_ID
 		and d.VOI_PERSON_ID = p.VCI_ID
@@ -26,7 +29,10 @@
 			AND	 d.VOI_PICKUP_STT  = #{pickUpState,jdbcType=VARCHAR}
 		</if>
 		<if test="machineNo != null and machineNo != ''">
-			AND	 o.VOD_PRO_EQU_REL_ID  = #{machineNo,jdbcType=VARCHAR}
+			AND	 r.VCI_EQUIPMENT_ID  = #{machineNo,jdbcType=VARCHAR}
+		</if>
+		<if test="equrelId != null and equrelId != ''">
+			AND	 o.VOD_PRO_EQU_REL_ID  = #{equrelId,jdbcType=VARCHAR}
 		</if>
 		<if test="creatdDtes != null and creatdDtes != ''">
 			and substr(VOI_CREATE_TIME,1,8) between substr((#{creatdDtes, jdbcType=VARCHAR}),1,8)
@@ -46,16 +52,35 @@
 		oi.VOI_EQUIPMENT_ID 	"machineNo",
 		oi.VOI_ID 				"orderNo",
 		di.VDI_STATUS 			"stt",
-		oi.VOI_PICKUP_TIME 		"pickUpDates"
-		from vm_delivery_inf di, vm_order_details od, vm_order_inf oi
+		oi.VOI_PICKUP_TIME 		"pickUpDates",
+		od.VOD_PRO_NAME 		"productName",
+		od.VOD_PRO_EQU_REL_ID 	"equrelId",
+		oi.VOI_PICKUP_NO 		"pickupNo",
+		p.VCI_ID				"vciId",
+		p.VCI_NAME 				"userName",
+		r.VCI_SALL_PRICE 		"sallPrice",
+		r.VCI_GAME_PRICE 		"gamePrice",
+		r.VCI_COST_PRICE 		"costPrice"
+		from vm_delivery_inf di, vm_order_details od, vm_order_inf oi, vm_person_inf p, vm_pro_equ_rel r
 		where di.VDI_ORD_DET_ID = od.VOD_DETAILS_ID
 		and VOD_ORDER_ID = oi.VOI_ID
+		and oi.VOI_PERSON_ID = p.VCI_ID
+		and od.VOD_PRO_EQU_REL_ID = r.VCI_ID
 		<if test="machineNo != null and machineNo != ''">
 			AND	oi.VOI_EQUIPMENT_ID  = #{machineNo,jdbcType=VARCHAR}
 		</if>
 		<if test="orderNo != null and orderNo != ''">
 			AND	oi.VOI_ID  = #{orderNo,jdbcType=VARCHAR}
 		</if>
+		<if test="equrelId != null and equrelId != ''">
+			AND	od.VOD_PRO_EQU_REL_ID  = #{equrelId,jdbcType=VARCHAR}
+		</if>
+		<if test="vciId != null and vciId != ''">
+			AND	p.VCI_ID  = #{vciId,jdbcType=VARCHAR}
+		</if>
+		<if test="pickupNo != null and pickupNo != ''">
+			AND	oi.VOI_PICKUP_NO  = #{pickupNo,jdbcType=VARCHAR}
+		</if>
 		<if test="pickUpDates != null and pickUpDates != ''">
 			and substr(VOI_PICKUP_TIME,1,8) between substr((#{pickUpDates, jdbcType=VARCHAR}),1,8)
 			and substr((#{pickUpDates, jdbcType=VARCHAR}),12,19)
@@ -142,6 +167,9 @@
 		AND bb.VOD_ORDER_ID = dd.VOI_ID
 		AND bb.VOD_PRO_TYPE = '00'
 		AND dd.VOI_STATE IN ('80', '00')
+		<if test="proName != null and proName != ''">
+			AND	aa.PRT_NAME  like  concat('%' , #{proName,jdbcType=VARCHAR},'%')
+		</if>
 		GROUP BY aa.PRT_ID
 		ORDER BY aa.PRT_MODIFY_TIME DESC
 	</select>

+ 2 - 2
src/main/resources/com/minpay/db/table/own/mapper/ProductManageMapper.xml

@@ -80,8 +80,8 @@
      			AND c.VCI_CHANNEL = p.PRT_CHANNEL
      	WHERE p.PRT_CHANNEL =  #{channel,jdbcType=VARCHAR}
      	      AND  p.PRT_STATE = "0"
-		<if test="category != null and category != ''">
-			AND c.VCI_ID = #{category,jdbcType=VARCHAR}
+		<if test="categoryId != null and categoryId != ''">
+			AND c.VCI_ID = #{categoryId,jdbcType=VARCHAR}
 		</if>
 		<if test="name != null and name != ''">
 			AND p.PRT_NAME like CONCAT('%', #{name,jdbcType=VARCHAR}, '%')

+ 7 - 0
src/main/webapp/admin/invCardManage/invCardManage.html

@@ -27,6 +27,10 @@
                 <label class="f12-gray4">取货码:</label>
                 <input type="tel" name="pickUpCode" id ="pickUpCode" onchange = "changeSelectCon(1,this,'inp')" placeholder="请输入取货码" class="search-select">
             </div>
+            <div class="layui-inline">
+                <label class="f12-gray4">货道号 :</label>
+                <input type="tel" name="equrelId" id ="equrelId" onchange = "changeSelectCon(1,this,'inp')" placeholder="请输入货道号" class="search-select">
+            </div>
             <div class="d-dashed" style="margin: 10px 0;"></div>
             <div class="layui-inline">
                 <label class="f12-gray4">状态:</label>
@@ -106,6 +110,7 @@
 				{type:'numbers',title: '序号',width:'5%'}
 				,{field: 'orderNo', title: '订单号', width:'10%'}
 		      	,{field: 'productName', title: '商品信息', width:'12%'}
+		      	,{field: 'sallPrice', title: '商品价格', width:'12%'}
 		      	,{field: 'machineNo', title: '机台号', width:'12%'}
 		      	,{field: 'equrelId', title: '货道号', width:'15%'}
 		      	,{field: 'userName', title: '消费者信息',width:'15%'}
@@ -191,6 +196,7 @@
 	function reLoadFun() {
 		var machineNo = $('#machineNo').val();
     	var pickUpCode = $('#pickUpCode').val();
+    	var equrelId = $('#equrelId').val();
     	var pickUpState = $("select[name='pickUpState']").val();
     	var pickUpDates = $("#pickUpDates").val();
     	var creatdDtes = $("#creatdDtes").val();
@@ -202,6 +208,7 @@
 	        ,where: {
 	        	machineNo : machineNo,
 	        	pickUpCode : pickUpCode,
+                equrelId : equrelId,
 	        	pickUpState : pickUpState,
 	        	creatdDtes : creatdDtes,
 	        	pickUpDates : pickUpDates

+ 174 - 151
src/main/webapp/admin/pickupRecordManage/pickupRecord.html

@@ -27,170 +27,193 @@
                 <label class="f12-gray4">订单号:</label>
                 <input type="tel" name="orderNo" id ="orderNo" onchange = "changeSelectCon(1,this,'inp')" placeholder="请输入订单号" class="search-select">
             </div>
+            <div class="layui-inline">
+                <label class="f12-gray4">用户ID:</label>
+                <input type="tel" name="vciId" id ="vciId" onchange = "changeSelectCon(1,this,'inp')" placeholder="请输入用户ID" class="search-select">
+            </div>
             <div class="d-dashed" style="margin: 10px 0;"></div>
             <div class="layui-inline">
                 <label class="f12-gray4">取货时间:</label>
                 <input class="search-select" type="text" id="pickUpDates" placeholder="日期(区间)"   readonly />
             </div>
+            <div class="layui-inline">
+                <label class="f12-gray4">货道编号:</label>
+                <input type="tel" name="equrelId" id ="equrelId" onchange = "changeSelectCon(1,this,'inp')" placeholder="请输入货道编号" class="search-select">
+            </div>
+            <div class="layui-inline">
+                <label class="f12-gray4">取货码:</label>
+                <input type="tel" name="pickupNo" id ="pickupNo" onchange = "changeSelectCon(1,this,'inp')" placeholder="请输入取货码" class="search-select">
+            </div>
         </div>
     </form>
 
 </div>
 
 <div class="shadow-content" style="margin:1.5rem;">
-    <table id="recordManage" lay-filter="tableFilter"></table>
-</div>
-<script>
-	$("#toggle").click(function() {
-		$(this).html($("#content").is(":hidden") ? "收起" + "<i class='iconfont up iconSelect_drop-down'/></i>" : "展开" +
-			"<i class='iconfont up iconSelect_drop-down'/></i>");
-		$("#content").slideToggle();
-	});
-	layui.use(['table','laydate','form'], function(){
-		var laydate = layui.laydate;
-		//日期范围
-		laydate.render({
-		    elem: '#pickUpDates'
-		   ,range: true
-		   ,format:'yyyyMMdd'
-		   ,done: function(value, date, endDate){
-    		    changeSelectCon(3,"pickUpDates",'date',value)
-  			}
-		});
-		form = layui.form;
-		form.render();
-	})
+    <script>
+        $("#toggle").click(function() {
+            $(this).html($("#content").is(":hidden") ? "收起" + "<i class='iconfont up iconSelect_drop-down'/></i>" : "展开" +
+                "<i class='iconfont up iconSelect_drop-down'/></i>");
+            $("#content").slideToggle();
+        });
+        layui.use(['table','laydate','form'], function(){
+            var laydate = layui.laydate;
+            //日期范围
+            laydate.render({
+                elem: '#pickUpDates'
+                ,range: true
+                ,format:'yyyyMMdd'
+                ,done: function(value, date, endDate){
+                    changeSelectCon(3,"pickUpDates",'date',value)
+                }
+            });
+            form = layui.form;
+            form.render();
+        })
 
-	var table;
-	layui.use('table', function(){
-		table = layui.table;
-		table.render({
-			id : 'recordManage'
-		    ,elem: '#recordManage'
-		    ,limit:10
-		    ,url: 'invCardManageAction/selectPickupRecord' //数据接口
-		    ,method: 'post'
-		    ,where:{MINView:"JSON", token: 'sasasas'}
-		    ,page: true //开启分页
-		    ,cols: [[ //表头
-				{type:'numbers',title: '序号',width:'5%'}
-		      	,{field: 'machineNo', title: '机台号', width:'10%', sort: true}
-				,{field: 'orderNo', title: '订单号', width:'12%'}
-		      	,{field: 'sttdesc', title: '状态', width:'12%'}
-		      	,{field: 'pickUpTime', title: '取货时间', width:'15%'}
-		    ]]
-		    ,done: function(res, curr, count){
-		        //如果是异步请求数据方式,res即为你接口返回的信息。
-		        console.log(res);
-		        //得到当前页码
-		        console.log(curr);
-		        //得到数据总量
-		        console.log(count);
-		      }
-		    ,even: true //开启隔行背景
-		  });
+        var table;
+        layui.use('table', function(){
+            table = layui.table;
+            table.render({
+                id : 'recordManage'
+                ,elem: '#recordManage'
+                ,limit:10
+                ,url: 'invCardManageAction/selectPickupRecord' //数据接口
+                ,method: 'post'
+                ,where:{MINView:"JSON", token: 'sasasas'}
+                ,page: true //开启分页
+                ,cols: [[ //表头
+                    {type:'numbers',title: '序号',width:'5%'}
+                    ,{field: 'vciId', title: '用户ID', width:'12%'}
+                    ,{field: 'orderNo', title: '订单号', width:'12%'}
+                    ,{field: 'equrelId', title: '货道号', width:'15%'}
+                    ,{field: 'machineNo', title: '机台号', width:'10%', sort: true}
+                    ,{field: 'pickupNo', title: '取货码',width:'8%'}
+                    ,{field: 'productName', title: '商品信息', width:'12%'}
+                    ,{field: 'sallPrice', title: '商品价格', width:'12%'}
+                    ,{field: 'sttdesc', title: '状态', width:'12%'}
+                    ,{field: 'pickUpTime', title: '取货时间', width:'15%'}
+                ]]
+                ,done: function(res, curr, count){
+                    //如果是异步请求数据方式,res即为你接口返回的信息。
+                    console.log(res);
+                    //得到当前页码
+                    console.log(curr);
+                    //得到数据总量
+                    console.log(count);
+                }
+                ,even: true //开启隔行背景
+            });
 
-		var $ = layui.$, active = {
- 		    reload: function(){
- 		    	reLoadFun();
- 		    }
- 		    ,reset: function(){
- 		    	$('#formName')[0].reset()
- 		    }
-	 	};
-		$('.layui-btn').on('click', function(){
-		  	var type = $(this).data('type');
-		  	active[type] ? active[type].call(this) : '';
-		});
-	});
+            var $ = layui.$, active = {
+                reload: function(){
+                    reLoadFun();
+                }
+                ,reset: function(){
+                    $('#formName')[0].reset()
+                }
+            };
+            $('.layui-btn').on('click', function(){
+                var type = $(this).data('type');
+                active[type] ? active[type].call(this) : '';
+            });
+        });
 
-	function reLoadFun() {
-		var machineNo = $('#machineNo').val();
-		var orderNo = $('#orderNo').val();
-    	var pickUpDates = $("#pickUpDates").val();
-         //执行重载
-     	table.reload('recordManage', {
-	        page: {
-	          curr: 1 //重新从第 1 页开始
-	        }
-	        ,where: {
-	        	machineNo : machineNo,
-	        	orderNo : orderNo,
-	        	pickUpDates : pickUpDates
-	        }
-      	});
-	}
-	function changeSelectCon(index, t, type, dateValue){
-		if (type == "date") {
-			if (isEmpty(dateValue)) {
-				$("#search" + index).remove();
-			} else {
-				$("#search" + index).remove();
-				if (isEmpty($("#search" + index).attr("name"))) {
-					$("#conditions").append(getSelectConHtml(index, t, type,dateValue));
-				}
-			}
-		} else if (type == 'inp') {
-			if (isEmpty($(t).val())) {
-				$("#search" + index).remove();
-			} else {
-				$("#search" + index).remove();
-				if (isEmpty($("#search" + index).attr("name"))) {
-					$("#conditions").append(getSelectConHtml(index, t, type));
-				}
-			}
-		} else {
-			if (isEmpty($(t).val())) {
-				$("#search" + index).remove();
-			} else {
-				$("#search" + index).remove();
-				if (isEmpty($("#search" + index).attr("name"))) {
-					$(t).attr("id",dateValue);
-					$("#conditions").append(getSelectConHtml(index, t, type,dateValue));
-				}
-			}
-		}
-	}
-	var array = new Array('机台号','订单号','取货时间');
-	function getSelectConHtml(index, t, type,dateValue){
-		var name;
-		var value;
-		if(type == "inp"){
-			value = t.value.substr(0,5)+"..";
-		}
-		if (type == "date") {
-			value = dateValue;
-		}
-		if(type == "sel" && dateValue =="state"){
-			value = $("#state").find("option:selected").text();
-		}
-		if(type == "sel" && dateValue =="roleid"){
-			value = $("#roleid").find("option:selected").text();
-		}
-		if (type == "date") {
-			name = $("#"+t).attr("id");
-		} else {
-			name = $(t).attr("id");
-		}
-		var html = '<div class="fl xuanzhong-active" id = "search' + index + '" name = "' + name + '" onclick = "removeSearch(this)">' +
-						'<div class="fl">' + array[index] + '</div>' +
-						':<i class="iconfont">'+value+'</i>' +
-						'<svg class="icon" aria-hidden="true">' +
-						  '<use xlink:href="#iconicon_close1"></use>' +
-						'</svg>' +
-					'</div>';
-		return html;
-	}
-	function removeSearch(t) {
-		if ($(t).attr("name") == 'state') {
-			initSelect('state', "IM_USER_STATE", "state", ' ', true);
-			form.render();
-			$(t).remove();
-		} else {
-			$("#"+$(t).attr("name")).val('');
-			$(t).remove();
-		}
-	}
-</script>
+        function reLoadFun() {
+            var machineNo = $('#machineNo').val();
+            var orderNo = $('#orderNo').val();
+            var pickUpDates = $("#pickUpDates").val();
+            var equrelId = $('#equrelId').val();
+            var vciId = $('#vciId').val();
+            var pickupNo = $("#pickupNo").val();
+            //执行重载
+            table.reload('recordManage', {
+                page: {
+                    curr: 1 //重新从第 1 页开始
+                }
+                ,where: {
+                    machineNo : machineNo,
+                    orderNo : orderNo,
+                    pickUpDates : pickUpDates,
+                    equrelId : equrelId,
+                    vciId : vciId,
+                    pickupNo : pickupNo
+                }
+            });
+        }
+        function changeSelectCon(index, t, type, dateValue){
+            if (type == "date") {
+                if (isEmpty(dateValue)) {
+                    $("#search" + index).remove();
+                } else {
+                    $("#search" + index).remove();
+                    if (isEmpty($("#search" + index).attr("name"))) {
+                        $("#conditions").append(getSelectConHtml(index, t, type,dateValue));
+                    }
+                }
+            } else if (type == 'inp') {
+                if (isEmpty($(t).val())) {
+                    $("#search" + index).remove();
+                } else {
+                    $("#search" + index).remove();
+                    if (isEmpty($("#search" + index).attr("name"))) {
+                        $("#conditions").append(getSelectConHtml(index, t, type));
+                    }
+                }
+            } else {
+                if (isEmpty($(t).val())) {
+                    $("#search" + index).remove();
+                } else {
+                    $("#search" + index).remove();
+                    if (isEmpty($("#search" + index).attr("name"))) {
+                        $(t).attr("id",dateValue);
+                        $("#conditions").append(getSelectConHtml(index, t, type,dateValue));
+                    }
+                }
+            }
+        }
+        var array = new Array('机台号','订单号','取货时间');
+        function getSelectConHtml(index, t, type,dateValue){
+            var name;
+            var value;
+            if(type == "inp"){
+                value = t.value.substr(0,5)+"..";
+            }
+            if (type == "date") {
+                value = dateValue;
+            }
+            if(type == "sel" && dateValue =="state"){
+                value = $("#state").find("option:selected").text();
+            }
+            if(type == "sel" && dateValue =="roleid"){
+                value = $("#roleid").find("option:selected").text();
+            }
+            if (type == "date") {
+                name = $("#"+t).attr("id");
+            } else {
+                name = $(t).attr("id");
+            }
+            var html = '<div class="fl xuanzhong-active" id = "search' + index + '" name = "' + name + '" onclick = "removeSearch(this)">' +
+                '<div class="fl">' + array[index] + '</div>' +
+                ':<i class="iconfont">'+value+'</i>' +
+                '<svg class="icon" aria-hidden="true">' +
+                '<use xlink:href="#iconicon_close1"></use>' +
+                '</svg>' +
+                '</div>';
+            return html;
+        }
+        function removeSearch(t) {
+            if ($(t).attr("name") == 'state') {
+                initSelect('state', "IM_USER_STATE", "state", ' ', true);
+                form.render();
+                $(t).remove();
+            } else {
+                $("#"+$(t).attr("name")).val('');
+                $(t).remove();
+            }
+        }
+    </script>
+    <table id="recordManage" lay-filter="tableFilter"></table>
+</div>
 </body>
 </html>

+ 20 - 8
src/main/webapp/admin/productManage/productManage.html

@@ -31,14 +31,26 @@
 				<input  lay-verify="name"   class="search-select" type="tel" name="name"  id ="name" value="" placeholder="请输入商品名称" />
 			</div>
 
-			<div class="layui-inline">
-				<label class="f12-gray4">商品类别:</label>
-				<input  lay-verify="categoryId"   class="search-select" type="tel" name="categoryId"  id ="categoryId" value="" placeholder="请输入商品类别" />
-			</div>
+<!--			<div class="layui-inline">-->
+<!--				<label class="f12-gray4">商品类别:</label>-->
+<!--				<input  lay-verify="categoryId"   class="search-select" type="tel" name="categoryId"  id ="categoryId" value="" placeholder="请输入商品类别" />-->
+<!--			</div>-->
+
+<!--            <div class="layui-inline">-->
+<!--                <label class="f12-gray4">商品类别:</label>-->
+<!--                <div class=""  style="display:inline-block" id = 'categoryId'></div>-->
+
+<!--			</div>-->
 
 			<div class="layui-inline">
-				<label class="f12-gray4">商品状态:</label>
-				<div class=""  style="display:inline-block" id = 'state'></div>
+
+                <div  id = "categoryName" lay-verify=""></div>
+                <input type="tel" style= "display:none" name="categoryId" id = "categoryId" autocomplete="off" class="search-select"    maxlength=30>
+            </div>
+
+            <div class="layui-inline">
+                <label class="f12-gray4">商品状态:</label>
+                <div class=""  style="display:inline-block" id = 'state'></div>
 			</div>
 
 			<div class="layui-inline">
@@ -129,7 +141,7 @@
     					  html = html + 'value="';
     				      html = html + j.categoryId + '">';
     				      html = html + j.categoryName+ '</option>';
-    				}) 
+    				})
     				html = html + '</select>';
     				$("#categoryName").html(html);
     				form.render();
@@ -138,7 +150,7 @@
     		form.on('select(categoryName)', function(data){
 				$("#categoryId").val(data.value);
 
-    		})	
+    		})
     	})
     
      	var table;

+ 1 - 1
src/main/webapp/admin/productManage/productUpdate.html

@@ -412,7 +412,7 @@
     	//监听取消
    		function cancel() {
    			parent.layer.close(parent.layer.index);
-			// deleteTabPage('501001-01');
+			deleteTabPage('501001-01');
 		}
    		function choose(dat){
 	  		$("#categoryId").val(dat.split(',')[1]);

+ 152 - 24
src/main/webapp/admin/salesDataManage/salesData.html

@@ -7,39 +7,60 @@
 </head>
 <body class="content">
 <div class="order-body">
+    <div class="order-tiaojian back-gray">
+        <div class="tiaojian-part1" id = "conditions">
+            <div class="fl f12-gray4-op mt4">所选条件:</div>
+        </div>
+        <div class="tiaojian-part2 fr  demoTable">
+            <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 = "addUser">添加</button>
+            <a href="#" id="toggle" class="top">收起</a>
+        </div>
+    </div>
     <form class="layui-form"  action="javascript:void(0)"  id = "formName">
         <div class="order-select back-border" id="content">
+            <div class="layui-inline">
+                <label class="f12-gray4">商品名称:</label>
+                <input class="search-select" type="tel" name="proName" id ="proName"
+                       value="" onchange = "changeSelectCon(0,this,'inp')" placeholder="请输入商品名称" />
+            </div>
         </div>
     </form>
 </div>
 <div class="shadow-content" style="margin:1.5rem;">
     <table id="salesManage" lay-filter="tableFilter"></table>
 </div>
-<script type="text/html" id="barDemo">
-    <p class="layui-btn layui-btn-danger layui-btn-xs">笔数+{{# countNo }}</p>
-    <p class="layui-btn layui-btn-danger layui-btn-xs">金额+{{# amount }}</p>
-</script>
-<script type="text/html" id="barDemo2">
-    <p class="layui-btn layui-btn-danger layui-btn-xs">实际金额+{{# amount }}</p>
-    <p class="layui-btn layui-btn-danger layui-btn-xs">商品成本+{{# proCost }}</p>
-    <p class="layui-btn layui-btn-danger layui-btn-xs">预估利润+{{# amount-proCost }}</p>
+<script type="text/html" id="switch">
+    <div  style="width:90px;height:70px">
+        {{#
+        if(!isEmpty(d.mainUrl)&& d.mainUrl != "null"){ }}
+        <img  src="{{ d.mainUrl}}">
+        {{# } }}
+    </div>
 </script>
+<!--<script type="text/html" id="barDemo">-->
+<!--    <p class="layui-btn layui-btn-danger">笔数:{{# d.countNo }}</p>-->
+<!--    <p class="layui-btn layui-btn-danger">金额:{{# d.amount }}</p>-->
+<!--</script>-->
 <script>
+    $("#toggle").click(function() {
+        $(this).html($("#content").is(":hidden") ? "收起" + "<i class='iconfont up iconSelect_drop-down'/></i>" : "展开" +
+            "<i class='iconfont up iconSelect_drop-down'/></i>");
+        $("#content").slideToggle();
+    });
 	layui.use(['table','laydate','form'], function(){
 		var laydate = layui.laydate;
-		$.request({
-			action : '../../invCardManageAction/selectAllSale',
-			data : { },
-			success : function(data) {
-				var allSale = data.allSale;
-			    var allCost = data.allCost;
-			    var allProfit = data.allProfit;
-<!--				$("#allSale").html(allSale);-->
-<!--				$("#allCost").html(allCost);-->
-<!--				$("#allProfit").html(allProfit);-->
-				form.render();
-			}
-		});
+	// 	$.request({
+	// 		action : '../../invCardManageAction/selectAllSale',
+	// 		data : { },
+	// 		success : function(data) {
+	// 			var allSale = data.allSale;
+	// 		    var allCost = data.allCost;
+	// 		    var allProfit = data.allProfit;
+	// 			form.render();
+	// 		}
+	// 	});
 		form.render();
 	})
 
@@ -56,12 +77,11 @@
 		    ,page: true //开启分页
 		    ,cols: [[ //表头
 				{type:'numbers',title: '序号',width:'5%'}
-		      	,{field: 'mainUrl', title: '商品照片', width:"8%"}
+                ,{field: 'mainUrl', title: '商品照片' ,width:"15%",align:'center',templet:'#switch'}
 				,{field: 'proName', title: '商品名称', width:'12%'}
 		      	,{field: 'vciName', title: '类别', width:'12%'}
-		      	,{field: 'countNo', title: '总销售', width:'15%', toolbar: '#barDemo'}
+		      	,{field: 'amount', title: '总销售', width:'15%'}
 		      	,{field: 'proNums', title: '出货数量',width:'15%'}
-		      	,{field: 'proCost', title: '利润分析',width:'15%', toolbar: '#barDemo2'}
 		    ]]
 		    ,done: function(res, curr, count){
 		        //如果是异步请求数据方式,res即为你接口返回的信息。
@@ -73,7 +93,115 @@
 		    }
 		    ,even: true //开启隔行背景
 		});
+        var $ = layui.$, active = {
+            reload: function(){
+                reLoadFun();
+            }
+            ,reset: function(){
+                $('#formName')[0].reset();
+                $("#conditions").html('<div class="fl f12-gray4-op mt4">所选条件:</div>');
+            }
+        };
+        $('.layui-btn').on('click', function(){
+            var type = $(this).data('type');
+            active[type] ? active[type].call(this) : '';
+        });
 	});
+
+    function reLoadFun() {
+        var proName = $('#proName').val();
+        //执行重载
+        table.reload('salesManage', {
+            page: {
+                curr: 1 //重新从第 1 页开始
+            }
+            ,where: {
+                proName : proName
+            }
+        });
+    }
+
+    function changeSelectCon(index, t, type, dateValue){
+        if (type == 'inp') {
+            if (isEmpty($(t).val())) {
+                $("#search" + index).remove();
+            } else {
+                $("#search" + index).remove();
+                if (isEmpty($("#search" + index).attr("name"))) {
+                    $("#conditions").append(getSelectConHtml(index, t, type));
+                }
+            }
+        }
+    }
+    var array = new Array('商品名称');
+    function getSelectConHtml(index, t, type,dateValue){
+        var name;
+        var value;
+        if(type == "inp"){
+            value = t.value.substr(0,5)+"..";
+        }
+        if (type == "date") {
+            value = dateValue;
+        }
+        if(type == "sel" && dateValue =="state"){
+            value = $("#state").find("option:selected").text();
+        }
+        if(type == "sel" && dateValue =="roleid"){
+            value = $("#roleid").find("option:selected").text();
+        }
+        if (type == "date") {
+            name = $("#"+t).attr("id");
+        } else {
+            name = $(t).attr("id");
+        }
+        var html = '<div class="fl xuanzhong-active" id = "search' + index + '" name = "' + name + '" onclick = "removeSearch(this)">' +
+            '<div class="fl">' + array[index] + '</div>' +
+            ':<i class="iconfont">'+value+'</i>' +
+            '<svg class="icon" aria-hidden="true">' +
+            '<use xlink:href="#iconicon_close1"></use>' +
+            '</svg>' +
+            '</div>';
+        return html;
+    }
+    function removeSearch(t) {
+        if ($(t).attr("name") == 'state') {
+            initSelect('state', "IM_USER_STATE", "state", ' ', true);
+            form.render();
+            $(t).remove();
+        } if ($(t).attr("name") == 'roleid') {
+            $.request({
+                action : '../../RoleManageAction/roleQueryByBranchId',
+                data : { },
+                success : function(data) {
+                    var selectName ="roleid";
+                    var html = '<select name="';
+                    html = html + selectName;
+                    html = html + '" lay-filter="';
+                    html = html + selectName;
+                    html = html + '"';
+                    html = html + '><option value="">全部</option>';
+                    $.each(data.MINQueryResult, function(i, j) {
+                        html = html + '<option ';
+                        html = html + 'value="';
+                        html = html + j.id + '">';
+                        html = html + j.name+ '</option>';
+                    })
+                    html = html + '</select>';
+                    $("#seleRoleid").html(html);
+                    form.render();
+                }
+            });
+
+            form.on('select(roleid)', function(data){
+                changeSelectCon(4, data.elem, "sel","roleid");
+            });
+
+            $(t).remove();
+        } else {
+            $("#"+$(t).attr("name")).val('');
+            $(t).remove();
+        }
+    }
 </script>
 </body>
 </html>