From 85cbc92322ff7ce184b666d50c9c257431a87d31 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 25 Jan 2021 11:34:14 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/resources/templates/views/admin/hive/operate/label-list.html |   71 ++++++++---------------
 zq-erp/src/main/resources/templates/views/admin/hive/operate/label-form.html |   52 ++++++-----------
 zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java        |    1 
 3 files changed, 43 insertions(+), 81 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java
index f4a9622..5adc551 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java
@@ -71,6 +71,7 @@
         List<ShoppingGoodsCategory> byModel = shoppingGoodsCategoryService.findByModel(category);
         ShoppingGoodsCategory type = new ShoppingGoodsCategory();
         type.setName("全部");
+        type.setParentId(0L);
         list.add(type);
         list.addAll(byModel);
         return AjaxResult.buildSuccessInstance(list);
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/operate/label-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/operate/label-form.html
index 5d79d46..6347b95 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/operate/label-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/operate/label-form.html
@@ -20,45 +20,42 @@
 			<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>
+				<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">
+							nullmsg="店铺不能为空" id="shopSelect"
+							th:data-url="@{/admin/shopInfo/findShops}" data-value="id"
+							data-filed="shopName" name="shopId">
 					</select>
 
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-2 control-label">是否全选<span class="text-danger">*</span></label>
+				<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">全选
+						<input type="radio" name="type" id="optionsRadios1" value="1" checked>加
 					</label>
 
 					<label class="radio-inline">
-						<input type="radio" name="ssrIsAll" id="optionsRadios2" value="2" checked>不全选
+						<input type="radio" name="type" id="optionsRadios2" value="2">减
 					</label>
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-2 control-label">选择短信发送对象<span class="text-danger">*</span></label>
+				<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>
+					<input autocomplete="off" dataType="n" class="form-control" name="remainingCnt" ></input>
+					<div class="Validform_checktip"></div>
 				</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>&nbsp;&nbsp;&nbsp;&nbsp; <a
-					 class="btn btn-danger radius" href="javascript:;" onclick="MTools.closeForm()" ><i class="fa fa-close"></i> 关闭</a>
+			<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>&nbsp;&nbsp;&nbsp;&nbsp; <a
+						 class="btn btn-danger radius" href="javascript:;" onclick="MTools.closeForm()" ><i class="fa fa-close"></i> 关闭</a>
+				</div>
 			</div>
-		</div>
 	</form>
 	</div>
 </body>
@@ -71,28 +68,15 @@
 	var obj=/*[[${obj}]]*/     
 	/*]]>*/
 	
-	var invokeUrl=basePath+"/admin/smsSendRecord/addWithShop";
+	var invokeUrl=basePath+"/admin/smsShop/addSmsShop";
 	if(obj.id!=null){
-	   invokeUrl = basePath+"/admin/smsSendRecord/modify";
+	   invokeUrl = basePath+"/admin/smsShop/modifySmsShop";
 	}
 	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>
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/operate/label-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/operate/label-list.html
index 0ec644f..cbe171e 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/operate/label-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/operate/label-list.html
@@ -51,17 +51,16 @@
 	<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>
+			<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>
+					<th data-align="center" data-formatter="buidOperate" data-field="id">操作</th>
+					<th data-field="shopName" data-align="center">店铺名称</th>
+					<th data-field="remainingCnt" data-align="center">短信余量</th>
 				</tr>
 			</thead>
 		</table>
@@ -72,25 +71,15 @@
 	<script type="text/javascript">
 		 var myGrid;
 		$(function(){
-
 			var delUrl="";
-			delUrl=basePath+"/admin/smsSendRecord/del" ;
+			delUrl=basePath+"/admin/smsShop/del" ;
 			myGrid=MGrid.initGrid({
-				 url:basePath+"/admin/smsSendRecord/showListWithShop",
+				 url:basePath+"/admin/smsShop/showList",
 				 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;
@@ -104,6 +93,8 @@
 		}
 
 	 	function buidOperate(value, row, index){
+			console.log("----->",value)
+
 			var html = "";
 			html += '<div class="btn-group">'
 					+ '<button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown">'
@@ -111,14 +102,9 @@
 					+ '<ul class="dropdown-menu" role="menu">'
 					+ '<li><a href="javascript:void(0)" style="display:'
 					+ value
-					+ '"  onClick="openEdit(\''
+					+ '"  onClick="lookInfo(\''
 					+ value
-					+ '\')" title="编辑">编辑</a></li>'
-					+ '<li><a href="javascript:void(0)" style="display:'
-					+ value
-					+ '" onClick="myGrid.delItem(\''
-					+ value
-					+ '\')" title="删除">删除</a></li>' + '</ul>' + '</div>';
+					+ '\')" title="编辑">查看</a></li>'
 			html += '';
 			return html; 
 		} 
@@ -126,33 +112,24 @@
 		function openAdd() {
 			layer.open({
 				type : 2,
-				title : "发送短信",
+				title : "短信分配",
 				area : [ MUI.SIZE_L, '400px' ],
 				maxmin : true,
-				content : [ basePath+'/admin/smsSendRecord/editFormWithShop']
+				content : [ basePath+'/admin/smsShop/editForm']
 			}); 
 		}
-		
-		//打开编辑界面
-		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 "-";
-			}
-		}
+		 function lookInfo(value) {
+			 layer.open({
+				 type : 2,
+				 title : "查看",
+				 area : [ MUI.SIZE_L, '400px' ],
+				 maxmin : true,
+				 content : [ basePath+'/admin/redirect/hive-erp/sms/sysSmsShopRecord-list?ssId='+value]
+			 });
+		 }
+
+
 
 	</script>
 </body>

--
Gitblit v1.9.1