From 4d4805096b898a6e99f31794facb81794bd1fcf7 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 25 Jan 2021 09:39:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hive2.0' into hive2.0
---
zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-sumary.html | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-sumary.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-sumary.html
index 3262674..ca2c7ac 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-sumary.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-sumary.html
@@ -26,7 +26,7 @@
</div>
</div>
<div class="form-group mr-20">
- <label >订单状态</label>
+ <label>订单状态</label>
<select class="form-control " name="state" >
<option value=''>--请选择订单状态--</option>
<option value='待预约'>待预约</option>
@@ -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>
@@ -112,12 +112,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",
});
});
}
--
Gitblit v1.9.1