~jiangyouyao/beauty-erp.git

			@@ -36,14 +36,14 @@
			</select>
			</div>
			<div class="form-group mr-20">
			<label >产品名称</label>
			<label >服务名称</label>
			<input autocomplete="off" name="projName" type="text" class="form-control" >
			</div>

			<div class="form-group mr-20">
			<label for="projTypeId">项目分类</label>
			<label for="projTypeId">商品分类</label>
			<select class="form-control select2" size="1" name ="cateId" id="projTypeId">
			<option value=''>--选择项目分类--</option>
			<option value=''>--选择分类--</option>
			</select>
			</div>

			@@ -77,15 +77,18 @@
			<thead>
			<tr>
			<th data-formatter="MGrid.indexfn" data-align="center" data-width="30px" >序号</th>
			<th data-field="consume_time" data-formatter="MGrid.getTime" data-sortable="true" >服务日期</th>
			<th data-field="SHOP_NAME" >门店</th>
			<th data-field="yy_time" data-formatter="MGrid.getTime" data-sortable="true" >预约时间</th>
			<th data-field="consume_time" data-formatter="MGrid.getTime" data-sortable="true" >划扣时间</th>
			<th data-field="SERVICE_NO" >服务单号</th>
			<th data-field="PROJ_NAME" >服务名称</th>
			<th data-field="TYPE_NAME" >分类</th>
			<th data-field="VIP_NAME" >客户名</th>
			<th data-field="COUNT" data-sortable="true" >次数</th>
			<th data-field="PRICE" data-sortable="true" >单价</th>
			<th data-field="su_name" >美疗师</th>
			<th data-field="SOURCE" >来源</th>
			<th data-field="COUNT" data-sortable="true" >次数</th>
			<th data-field="PRICE" data-sortable="true" >划扣单价</th>
			<th data-field="extract" data-sortable="true" >提成</th>
			<th data-field="su_name" >美疗师</th>
			<th data-field="SOURCE" >来源</th>
			</tr>
			</thead>
			</table>
			@@ -107,7 +110,9 @@
			//有删除权限
			var delUrl="";
			myGrid=MGrid.initGrid({
			url:basePath+"/admin/serviceStatistics/showList"
			url:basePath+"/admin/serviceStatistics/showList",
			sortName:"yy_time",
			sortOrder:"desc"
			});
			});

			@@ -123,12 +128,13 @@

			function initFunctionList() {
			$.AjaxProxy({
			a : false,
			c : false
			}).invoke(basePath+"/admin/projtype/all", function(loj) {
			a: false,
			c: false,
			p: {salePlatform: '线下'}
			}).invoke(basePath + "/admin/shoppinggoodscategory/all", function (loj) {
			$("#projTypeId").createSelectTree(loj.attr("result").rows, {
			append : true,
			value:"typeName"
			append: true,
			value: "name",
			});
			});
			}