wanglm 4 năm trước cách đây
mục cha
commit
a75181c8d5

+ 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);
 	/**
 	 * 总实际金额
 	 */

+ 6 - 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);

+ 3 - 0
src/main/resources/com/minpay/db/table/own/mapper/OrderManageMapper.xml

@@ -142,6 +142,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>

+ 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>