| zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java | ●●●●● patch | view | raw | blame | history | |
| zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java | ●●●●● patch | view | raw | blame | history | |
| zq-erp/src/main/resources/config/application.properties | ●●●●● patch | view | raw | blame | history | |
| zq-erp/src/main/resources/templates/views/admin/hive/operate/label-form.html | ●●●●● patch | view | raw | blame | history | |
| zq-erp/src/main/resources/templates/views/admin/hive/operate/label-list.html | ●●●●● patch | view | raw | blame | history |
zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java
@@ -67,7 +67,13 @@ SysShopInfo zbShop = shopInfoDao.selectZbShop(user.getCompanyId()); ShoppingGoodsCategory category = new ShoppingGoodsCategory(); category.setShopId(zbShop.getId()); return AjaxResult.buildSuccessInstance(shoppingGoodsCategoryService.findByModel(category)); List<ShoppingGoodsCategory> list = new ArrayList<>(); List<ShoppingGoodsCategory> byModel = shoppingGoodsCategoryService.findByModel(category); ShoppingGoodsCategory type = new ShoppingGoodsCategory(); type.setName("全部"); list.add(type); list.addAll(byModel); return AjaxResult.buildSuccessInstance(list); } @ApiOperation(value = "获取商品列表", notes = "获取商品列表") zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java
@@ -522,7 +522,7 @@ ShoppingGoodsDetailVo goodsDetailVo = new ShoppingGoodsDetailVo(); goodsDetailVo.setImg(shoppingGoods.getImg()); goodsDetailVo.setGoodsName(shoppingGoods.getName()); goodsDetailVo.setGoodsNo(shoppingGoods.getGoodsNo()); goodsDetailVo.setGoodsNo(shoppingGoods.getCode()); goodsDetailVo.setGoodsType(shoppingGoods.getGoodType()); goodsDetailVo.setDesc(shoppingGoods.getDescription()); goodsDetailVo.setMaxSaleCnt(shoppingGoods.getCarMaxSaleCount()); zq-erp/src/main/resources/config/application.properties
@@ -8,6 +8,9 @@ spring.datasource.password=123456 spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 #spring.datasource.username=chuhuan #spring.datasource.password=chuhuan #spring.datasource.url=jdbc:mysql://175.6.132.141:3306/hive_v2_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource zq-erp/src/main/resources/templates/views/admin/hive/operate/label-form.html
New file @@ -0,0 +1,99 @@ <!DOCTYPE HTML> <html xmlns:th="http://www.thymeleaf.org"> <head> <meta charset="utf-8"> <META HTTP-EQUIV="Pragma" CONTENT="no-cache"> <meta name="renderer" content="webkit|ie-comp|ie-stand"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" /> <meta http-equiv="Cache-Control" content="no-siteapp" /> <!-- 本框架基本脚本和样式 --> <script type="text/javascript" th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script> <script type="text/javascript" th:src="@{/js/systools/MBase.js}"></script> </head> <body> <div class="ibox-content"> <form class="form-horizontal" id="dataform" onsubmit="javascript:return false;"> <input autocomplete="off" type="hidden" name="id" th:value="${obj?.id}"> <div class="form-group"> <label class="col-sm-2 control-label">选择短信模板<span class="text-danger">*</span></label> <div class="col-sm-4"> <select class="form-control autoFull select2" dataType="*" nullmsg="短信模板不能为空" th:data-url="@{/admin/sysSmsTemplate/findAllSmsTemplate}" data-value="id" data-filed="stName" th:data-def="${obj.stId}" name="stId"> </select> </div> </div> <div class="form-group"> <label class="col-sm-2 control-label">是否全选<span class="text-danger">*</span></label> <div class="col-sm-4"> <label class="radio-inline"> <input type="radio" name="ssrIsAll" id="optionsRadios1" value="1">全选 </label> <label class="radio-inline"> <input type="radio" name="ssrIsAll" id="optionsRadios2" value="2" checked>不全选 </label> </div> </div> <div class="form-group"> <label class="col-sm-2 control-label">选择短信发送对象<span class="text-danger">*</span></label> <div class="col-sm-4"> <select class="form-control autoFull select2" id="selectObject" dataType="*" multiple="multiple" nullmsg="短信发送对象不能为空" th:data-url="@{/admin/vipInfo/findAllVipInfoWithShop}" data-value="id" data-filed="vipName" th:data-def="${obj.ssrObject}" name="ssrObject"> </select> </div> </div> <div class="form-group "> <div class="col-sm-12 text-center"> <a href="javascript:;" onclick="myForm.submit()" class="btn btn-success radius"><i class="fa fa-check"></i> 保存</a> <a class="btn btn-danger radius" href="javascript:;" onclick="MTools.closeForm()" ><i class="fa fa-close"></i> 关闭</a> </div> </div> </form> </div> </body> <script type="text/javascript" th:src="@{/js/systools/MJsBase.js}"></script> <script th:inline="javascript"> MTools.autoFullSelect(); $(".select2").select2(); /*<![CDATA[*/ var obj=/*[[${obj}]]*/ /*]]>*/ var invokeUrl=basePath+"/admin/smsSendRecord/addWithShop"; if(obj.id!=null){ invokeUrl = basePath+"/admin/smsSendRecord/modify"; } var myForm=MForm.initForm({ invokeUrl:invokeUrl, afterSubmit:function(){ parent.myGrid.serchData(); parent.remainingCnt(); }, }); $(document).ready(function () { $('input[type=radio][name=ssrIsAll]').change(function() { if (this.value == 1) { $("#selectObject").attr("disabled", true); } if (this.value == 2) { $("#selectObject").attr("disabled", false); } }); }); </script> </body> </html> zq-erp/src/main/resources/templates/views/admin/hive/operate/label-list.html
New file @@ -0,0 +1,159 @@ <!DOCTYPE HTML> <html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml"> <head> <meta charset="utf-8"> <META HTTP-EQUIV="Pragma" CONTENT="no-cache"> <meta name="renderer" content="webkit|ie-comp|ie-stand"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" /> <meta http-equiv="Cache-Control" content="no-siteapp" /> <!-- 本框架基本脚本和样式 --> <script type="text/javascript" th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script> <script type="text/javascript" th:src="@{/js/systools/MBase.js}"></script> </head> <body class="container-fluid"> <div class="pd-10"> <!-- 搜索框部分start --> <div class="row form-head"> <form class="form-inline" id="serchform"> <!-- <div class="input-group">--> <!-- <div class="btn-group search-list " data-for="search-text">--> <!-- <button type="button"--> <!-- class="btn btn-default dropdown-toggle searchlist"--> <!-- data-toggle="dropdown">--> <!-- 用户姓名 <span class="caret "></span>--> <!-- </button>--> <!-- <ul class="dropdown-menu" role="menu">--> <!-- <li data-field="suName"><a>用户姓名</a></li>--> <!-- <li data-field="suAccount"><a>账号 </a></li>--> <!-- </ul>--> <!-- </div>--> <!-- <div class="form-group mr-20 ml-20">--> <!-- <input id="search-text" name="suName" placeholder="输入查询关键词"--> <!-- type="text" class="form-control">--> <!-- </div>--> <!-- <div class="form-group">--> <!-- <button onclick="myGrid.serchData(1)" type="button"--> <!-- class="btn btn-info">--> <!-- <i class="fa fa-search "></i> 搜索--> <!-- </button>--> <!-- <button type="reset" class="btn btn-info ">--> <!-- <i class="fa fa-refresh "></i> 重置--> <!-- </button>--> <!-- </div>--> <!-- </div>--> </form> </div> <div class="row mt-10" > <div id="option-bar"> <!-- 功能按钮部分 --> <button matrix:btn="shopInfo-add" onclick="openAdd()" type="button" class="btn btn-info btn-sm"><i class="fa fa-add" ></i> 发送消息</button> </div> <table id="mgrid"> <thead> <tr> <th data-checkbox="true"></th> <th data-formatter="MGrid.indexfn" data-align="center" data-width="30px" >序号</th> <th data-field="stName" data-align="center">模板名称</th> <th data-field="ssrIsAll" data-align="center" data-formatter="formatterIsAll">是否所有客户</th> <th data-field="ssrCnt" data-align="center">发送人数</th> <th data-field="createTime" data-formatter="MGrid.getTime" data-align="center">发送时间</th> </tr> </thead> </table> </div> </div> <script type="text/javascript" th:src="@{/js/systools/MJsBase.js}"></script> <script type="text/javascript"> var myGrid; $(function(){ var delUrl=""; delUrl=basePath+"/admin/smsSendRecord/del" ; myGrid=MGrid.initGrid({ url:basePath+"/admin/smsSendRecord/showListWithShop", delUrl:delUrl, }); remainingCnt(); }); function remainingCnt() { $.AjaxProxy().invoke( basePath+"/admin/smsShop/getShopRemainingCnt", function(loj) { $("#remainingCnt").text(loj[0].result.mapInfo.remainingCnt); } ) } function del() { var i = $("#mgrid").bootstrapTable('getSelections').length; if (i > 1) { layer.msg("仅可选择一条记录", { icon: 5 }); return false; } myGrid.delItems(); } function buidOperate(value, row, index){ var html = ""; html += '<div class="btn-group">' + '<button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown">' + '操作 <span class="caret"></span>' + '</button>' + '<ul class="dropdown-menu" role="menu">' + '<li><a href="javascript:void(0)" style="display:' + value + '" onClick="openEdit(\'' + value + '\')" title="编辑">编辑</a></li>' + '<li><a href="javascript:void(0)" style="display:' + value + '" onClick="myGrid.delItem(\'' + value + '\')" title="删除">删除</a></li>' + '</ul>' + '</div>'; html += ''; return html; } //打开添加界面 function openAdd() { layer.open({ type : 2, title : "发送短信", area : [ MUI.SIZE_L, '400px' ], maxmin : true, content : [ basePath+'/admin/smsSendRecord/editFormWithShop'] }); } //打开编辑界面 function openEdit(id) { layer.open({ type : 2, title : "发送短信", area : [ MUI.SIZE_L, '400px' ], maxmin : true, content : [ basePath+'/admin/smsSendRecord/editForm?id=' + id] }); } function formatterIsAll(value) { if (value == 1) { return "是"; } else if (value == 2) { return "否"; } else { return "-"; } } </script> </body> </html>
