2 Revize abef75d52c ... b0b25f48bf

Autor SHA1 Zpráva Datum
  黄勇成 b0b25f48bf Merge remote-tracking branch 'origin/master' into master před 2 roky
  黄勇成 e6aad8a85f 订餐-配送,数据统计功能手机号吗,字段错误修复 před 2 roky

+ 12 - 12
src/main/webapp/WEB-INF/pages/admin/orderDinner/dataStatistics.jsp

@@ -15,28 +15,28 @@
 <link href="<c:url value='/scripts/lib/layui/layui.css'/>" rel="stylesheet" type="text/css" />
 <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/admin/orderDinner/dataStatistics.js?2018-12-28"></script>
+<script type="text/javascript" src="${ctx }/scripts/admin/orderDinner/dataStatistics.js?2022-05-23"></script>
 <script type="text/javascript" src="${ctx }/scripts/admin/cjqt.js"></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>
 		              <input class="default-select" name="orgId" id="orgId" org__id="${orgs[0].id}" autocomplete="off" value="${orgs[0].name}"/>
 		              <span class="select_wrap _hide"></span>
 <!-- 		              <select class="default-select" name="orgId" id="orgId" >
-		   
+
 		                <c:forEach items="${orgs }"  var="org">
 		                  <option value="${org.id }" >${org.name }</option>
 		                </c:forEach>
@@ -44,12 +44,12 @@
 	              	</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"> 
+	              <input type="hidden" name="orgId" id="orgId" value="${orgs[0].id}" org__id="${orgs[0].id}" class="single-orgid">
 	            </c:if>
-           
+
 			<div class="part-wp">
 				<span class="search-tips">统计类型</span>
-				<select class="default-select type" >		
+				<select class="default-select type" >
 					<option value="1">订餐统计</option>
 					<option value="2">评价统计</option>
 					<option value="3">部门统计</option>
@@ -58,7 +58,7 @@
 			</div>
 			<div class="part-wp">
 				<span class="search-tips">统计周期</span>
-				<select class="default-select dateType" >		
+				<select class="default-select dateType" >
 					<option value="1">年</option>
 					<option value="2">季度</option>
 					<option value="3">月</option>
@@ -66,18 +66,18 @@
 			</div>
 			<div class="part-wp">
 				<span class="search-tips">统计时间</span>
-				<select class="default-select year-and-time" >		
+				<select class="default-select year-and-time" >
 					<option value="2018">选择时间</option>
 				</select>
 			</div>
 			<button class="search-btn btn-red" type="button">统计</button>
 			<button class="set-btn btn-white" type="button">导出Excel</button>
 		</form:form>
-	 	 <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>
 	<script type="text/html" id="indexTpl">
     {{d.LAY_TABLE_INDEX+1}}
 	</script>
 </body>
-</html>
+</html>

+ 6 - 6
src/main/webapp/scripts/admin/orderDinner/dataStatistics.js

@@ -108,7 +108,7 @@ $(function () {
 		},
 		/**
 		 * 获取时间段的年份、季度、月,并渲染
-		 * @param type 
+		 * @param type
 		 * @param callback
 		 */
 		getTimeList: function (type, callback) {
@@ -125,7 +125,7 @@ $(function () {
 			} else if (type == 2) {
 				var start = new Date(startTime);
 				var end = new Date();
-				//				
+				//
 				while (start <= end) {
 					var quarter = _this.getQuarterStartMonth(start.getMonth()).quarter;
 					var month = _this.getQuarterStartMonth(start.getMonth()).quarterStartMonth;
@@ -161,14 +161,14 @@ $(function () {
 				console.log(timeArr);
 				$(".year-and-time").html(template.render(tpl.otherTpl)({ list: timeArr }))
 			};
-			//			  
+			//
 
 		},
 
 		/**
 		 * 获得本季度的月份和月份
 		 * @param nowMonth 当前月
-		 * 
+		 *
 		 */
 		getQuarterStartMonth: function (nowMonth) {
 			var quarterStartMonth = 0;
@@ -528,7 +528,7 @@ $(function () {
 
 						templet: '#indexTpl'
 					}, {
-						field: 'loginName',
+						field: 'mobile',
 						title: '手机号码'
 
 					}, {
@@ -650,4 +650,4 @@ $(function () {
 		}
 	};
 	mealManage.init();
-})
+})