Quellcode durchsuchen

订餐-配送 > 订单管理页面,设置订餐提醒修改完成

黄勇成 vor 2 Jahren
Ursprung
Commit
2bbaea5451

+ 14 - 14
src/main/webapp/WEB-INF/pages/admin/orderDinner/orderManage.jsp

@@ -15,21 +15,21 @@
 <script type="text/javascript" src="<c:url value='/scripts/lib/layui/layui.js'/>"></script>
 <script type="text/javascript" src="<c:url value='/scripts/lib/template-native.js'/>"></script>
 <script type="text/javascript" src="${ctx }/scripts/common/enlarge.js"></script>
-<script type="text/javascript" src="${ctx }/scripts/admin/orderDinner/orderManage.js?2019-10-08"></script>
+<script type="text/javascript" src="${ctx }/scripts/admin/orderDinner/orderManage.js?2022-06-07"></script>
 <script type="text/javascript" src="${ctx }/scripts/admin/cjqt.js?2019-1-17"></script>
 
 </head>
 <body>
-	
+
 	<input type="hidden" value="${ctx}" id="contextPath" />
-	
+
 	<div class="bread-wp">
 		订餐管理  > 订单管理
 	</div>
 	<div class="right-content">
 		<div class="main-content-mode-wp clearfloat email-publish-wp ">
 		<form:form  id="conditionform"  class="clearfloat">
-			
+
 	            <c:if test="${fn:length(orgs) > 1}">
 	             <div class=" part-wp">
 		              <span class="search-tips">项目</span>
@@ -44,9 +44,9 @@
 	              </div>
 	            </c:if>
 	            <c:if test="${fn:length(orgs) == 1}">
-	              <input type="hidden" name="orgId" id="orgId" value="${orgs[0].id}" org__id="${orgs[0].id}" class="single-orgid default-select"> 
+	              <input type="hidden" name="orgId" id="orgId" value="${orgs[0].id}" org__id="${orgs[0].id}" class="single-orgid default-select">
 	            </c:if>
-            
+
 			<div class="part-wp">
 				<span class="search-tips">企业</span>
 				<input class="default-select" name="companyId" id="companyId"  autocomplete="off" placeholder="请输入企业名称"/>
@@ -69,18 +69,18 @@
 			<div class="part-wp">
 				<span class="search-tips">状态</span>
 				<select class="default-select status" >
-					<option value="">全部</option>				
+					<option value="">全部</option>
 					<option value="1">待送餐</option>
 					<option value="2">待评价</option>
 					<option value="3">已完成</option>
 					<option value="4">已取消</option>
 				</select>
 			</div>
-			
+
 			<div class="part-wp">
 				<span class="search-tips">评星</span>
 				<select class="default-select star" >
-					<option value="">全部</option>				
+					<option value="">全部</option>
 					<option value="1">1星</option>
 					<option value="2">2星</option>
 					<option value="3">3星</option>
@@ -96,7 +96,7 @@
             <div class="part-wp">
 				<span class="search-tips">类型</span>
 				<select class="default-select type" >
-					<option value="">全部</option>				
+					<option value="">全部</option>
 					<option value="1">普通订餐</option>
 					<option value="2">会议餐</option>
 					<option value="3">临时工作餐</option>
@@ -107,11 +107,11 @@
 			<!-- <button class="orderSummary-btn btn-white" type="button">今日订单汇总</button> -->
 		</form:form>
 		 <div class="main-operate-wp">
-			 <button class="orderSummary-btn btn-export-white" type="button">今日订单汇总</button> 
-			 <button class="btn-white warnOrder" type="button" style="width: 85px;">订餐提醒</button> 
+			 <button class="orderSummary-btn btn-export-white" type="button">今日订单汇总</button>
+			 <button class="btn-white warnOrder" type="button" style="width: 85px;">订餐提醒</button>
 		 </div>
 		  <div class="tables">
-        <table class="layui-hide" id="LAY_table_user" lay-filter="user"></table>  
+        <table class="layui-hide" id="LAY_table_user" lay-filter="user"></table>
 		</div>
 	</div>
 	</div>
@@ -119,4 +119,4 @@
     {{d.LAY_TABLE_INDEX+1}}
 	</script>
 </body>
-</html>
+</html>

+ 106 - 10
src/main/webapp/scripts/admin/orderDinner/orderManage.js

@@ -186,6 +186,45 @@ $(function() {
             </div>\
         </div>\
     </div>',
+        remindTpl: '<div class="dialog-wp">\
+        <div class="mask"></div>\
+        <div class="dialog export-or-download-con" style="width: 340px;">\
+            <div class="title-wp">\
+                <span>订餐提醒</span>\
+                <span class="close-btn"></button>\
+            </div>\
+            <%if(!orgid){%>\
+                <div class="export-or-download-wp">\
+                    <div class="choose-item-wp">\
+                        <span class="tip" style="margin-left: 33px;">项 目:</span>\
+                        <input class="default-select w-orgid" id="orgId" org__id="" autocomplete="off"/>\
+                        <span class="select_wrap _hide" style="width: 200px"></span>\
+                    </div>\
+                </div>\
+            <%}%>\
+            <%if(orgid){%>\
+                <input type="hidden" class="default-select w-orgid" id="orgId" org__id="<%=orgid%>" autocomplete="off"/>\
+            <%}%>\
+            <div class="export-or-download-wp">\
+                <div class="choose-item-wp" style="width: 100%;">\
+                    <div style="padding: 0 38px;text-align: left;">\
+                        <span class="tip">订餐提醒:</span>\
+                        <div class="checkbox-wp">\
+                            <span class="checkbox-input">\
+                                <input type="checkbox" id="mealCheck" class="check-item"/>\
+                                <span class="checkbox-inner"></span>\
+                            </span>		\
+                            <label class="checkbox-con">开启</label>\
+                        </div>\
+                    </div>\
+                    <div style="padding-left: 110px;color: #999999;font-size: 15px;text-align: left;">开启后会给订餐人员推送消息</div>\
+                </div>\
+                <div class="export-or-download-btns">\
+                        <button class="sure-operate-btn btn-red-width90" type="button">确定</button> \
+                </div>\
+            </div>\
+        </div>\
+    </div>',
         deptTpl: '<option value="">请选择部门</option>\
 						<%for(var i=0;i<data.length;i++){%>\
 						<option value="<%=data[i].id%>"><%=data[i].itemname%></option>\
@@ -241,25 +280,29 @@ $(function() {
             // 订餐提醒
             $(".warnOrder").on("click",function() {
                 var orgid = $("#conditionform .single-orgid").attr("org__id")
-                $("body").append(template.render(tpl.warnTpl)({orgid:orgid}));
+                $("body").append(template.render(tpl.remindTpl)({orgid:orgid}));
                 if(orgid){
-                    _this.getOrgByMessage(orgid);
-                }               
+                    // _this.getOrgByMessage(orgid);
+                    _this.getPushSetByOrgIdHandler(orgid);
+                }
                 $(".close-btn").on("click", function() {
                     $(".dialog-wp").remove();
                 });
                 $(".sure-operate-btn").on("click", function() {
                     var orgId = $(".w-orgid").attr('org__id');
-                    var isSetMessage
+                    var isStatus
                     if (!orgId) {
                         layer.msg("请选择项目");
                         return false;
                     };
-                    $("#warn").attr('checked')?isSetMessage = 1:isSetMessage = 0;
-                    $("#warnM").attr('checked')?isSetWechatMessage = 1:isSetWechatMessage = 0;
-                    _this.isSetMessage(isSetMessage,isSetWechatMessage,orgId, function() {
+                    $("#mealCheck").attr('checked')?isStatus = 1:isStatus = 0;
+                    _this.isSetStatusHandler(isStatus, orgId, function () {
                         $(".dialog-wp").remove();
                     })
+
+                    // _this.isSetMessage(isSetMessage,isSetWechatMessage,orgId, function() {
+                    //     $(".dialog-wp").remove();
+                    // })
                 })
             })
             // 模糊搜索
@@ -346,7 +389,8 @@ $(function() {
             eve(option_3, { type: 1,
                 click_callback:function(){
                     var orgId = $('.w-orgid').attr('org__id')
-                    _this.getOrgByMessage(orgId);
+                    // _this.getOrgByMessage(orgId);
+                    _this.getPushSetByOrgIdHandler(orgId);
 				}
             })
         },
@@ -476,7 +520,7 @@ $(function() {
                         pageName: 'pageNo' //页码的参数名称,默认:page
                             ,
                         limitName: 'pageSize' ,//每页数据量的参数名,默认:limit
-                        	
+
                     },
                     done: function(res, curr, count) {
                         //如果是异步请求数据方式,res即为你接口返回的信息。
@@ -723,6 +767,34 @@ $(function() {
             });
         },
         /**
+         * 设置订餐推送开关
+         * @param isStatus // 当前开关状态
+         * @param orgId // 项目开关
+         * @param callback 返回数据
+         */
+        isSetStatusHandler: function(isStatus, orgId, callback) {
+            var _this = this;
+            $.ajax({
+                type: "post",
+                url: contextPath + "/admin/dinner/place/saveAndPushSet",
+                data: {
+                    orgId: orgId,
+                    status: isStatus,
+                },
+                success: function(data) {
+                    if (data.code == ERROK) {
+                        layer.msg('设置成功')
+                        callback()
+                    } else {
+                        layer.msg(data.msg)
+                    }
+                },
+                error: function(error) {
+                    layer.msg('error')
+                }
+            });
+        },
+        /**
          * 判断是否开启短信提醒功能
          * @param orgId   项目id
          */
@@ -747,6 +819,30 @@ $(function() {
                 }
             });
         },
+        /**
+         * 判断是否开启订餐提醒功能
+         * @param orgId   项目id
+         */
+        getPushSetByOrgIdHandler: function (orgId) {
+            var _this = this;
+            $.ajax({
+                type: "post",
+                url: contextPath + "/admin/dinner/place/getPushSetByOrgId",
+                data: {
+                    orgId: orgId
+                },
+                success: function(data) {
+                    if (data.code == ERROK) {
+                        data.data.status == 1?$("#mealCheck").attr('checked',"checked"):$("#mealCheck").attr('checked',false)
+                    } else {
+                        layer.msg(data.msg)
+                    }
+                },
+                error: function(error) {
+                    layer.msg('error')
+                }
+            });
+        }
     };
     api.init();
-})
+})