From 73d18e706a4d6c787b0a670d2089f9160b88fdb5 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Thu, 21 Jan 2021 15:15:54 +0800 Subject: [PATCH] modify --- zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-sumary.html | 19 ++-- zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml | 2 zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-item.html | 2 zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-sumary.html | 19 ++-- zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projuse-sumary.html | 17 ++-- zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projuse-sumary.html | 17 ++-- zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml | 2 zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-item.html | 2 zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projuse-item.html | 17 ++-- zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-summary.html | 34 ++++---- zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-summary.html | 35 ++++---- zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-item.html | 17 ++-- zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projuse-item.html | 17 ++-- zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-item.html | 17 ++-- 14 files changed, 110 insertions(+), 107 deletions(-) diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml index a6fd1d8..f6f6e44 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml @@ -457,7 +457,7 @@ </if> <if test="cateId != null and cateId != '' "> - and c.PROJ_TYPE_ID=#{cateId} + and c.cate_id=#{cateId} </if> diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml index 18c9fa7..d3edbfd 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml @@ -742,7 +742,7 @@ and a.proj_name like concat('%',#{projName},'%') </if> <if test="cateId != null and cateId != '' "> - and b.PROJ_TYPE_ID=#{cateId} + and b.cate_id=#{cateId} </if> </where> diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-item.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-item.html index 00ee7bc..70e9301 100644 --- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-item.html +++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-item.html @@ -27,7 +27,7 @@ </div> <div class="form-group mr-20"> - <label >产品名称</label> + <label>储值卡名称</label> <input autocomplete="off" name="projName" type="text" class="form-control" > </div> diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-summary.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-summary.html index 56073ea..2dfa73f 100644 --- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-summary.html +++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-summary.html @@ -25,30 +25,27 @@ <button onclick="myGrid.resetForm()" type="button" class="btn btn-default btn-sm"><i class="fa fa-refresh " ></i> 重置</button> </div> </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="parentId">商品分类</label>--> +<!-- <select class="form-control select2" size="1" name="cateId" id="parentId">--> +<!-- <option value="" selected="selected">--选择分类--</option>--> +<!-- </select>--> +<!-- </div>--> - <div class="form-group mr-20"> - <label for="parentId">商品分类</label> - <select class="form-control select2" size="1" name="cateId" id="parentId"> - <option value="" selected="selected">--选择分类--</option> - </select> - </div> +<!-- <div class="form-group mr-20">--> +<!-- <label>会员</label>--> +<!-- <input autocomplete="off" placeholder="姓名/编号/电话" name="vipQueryKey" type="text" class="form-control" >--> +<!-- </div>--> - <div class="form-group mr-20"> - <label>会员</label> - <input autocomplete="off" placeholder="姓名/编号/电话" name="vipQueryKey" type="text" class="form-control" > - </div> - - - <div class="form-group mr-20"> - <label>到期时间</label><!-- 入库时间的查询增加一个查询的其实时间两个字段 --> - <input autocomplete="off" id="select_begin" name="beginTime" type="text" class="form-control datetimepicker">- - <input autocomplete="off" name="endTime" type="text" class="form-control datetimepicker" id="select_end"> - </div> +<!-- <div class="form-group mr-20">--> +<!-- <label>到期时间</label><!– 入库时间的查询增加一个查询的其实时间两个字段 –>--> +<!-- <input autocomplete="off" id="select_begin" name="beginTime" type="text" class="form-control datetimepicker">- --> +<!-- <input autocomplete="off" name="endTime" type="text" class="form-control datetimepicker" id="select_end">--> +<!-- </div>--> </form> <div id="option-bar" > <button matrix:btn="bedListZb-exportExcel" onclick="exportExcel()" type="button" class="btn btn-default btn-sm"><i class="fa fa-download" ></i> 导出</button> diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-item.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-item.html index e34d45c..02cf774 100644 --- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-item.html +++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-item.html @@ -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> @@ -131,12 +131,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", }); }); } 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", }); }); } diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projuse-item.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projuse-item.html index e54f7ea..23a55cd 100644 --- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projuse-item.html +++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projuse-item.html @@ -27,14 +27,14 @@ </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> @@ -117,12 +117,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", }); }); } diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projuse-sumary.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projuse-sumary.html index afd83fd..018f767 100644 --- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projuse-sumary.html +++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projuse-sumary.html @@ -25,13 +25,13 @@ </div> </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> </form> @@ -86,12 +86,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", }); }); } diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-item.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-item.html index 73307ce..852a46c 100644 --- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-item.html +++ b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-item.html @@ -27,7 +27,7 @@ </div> <div class="form-group mr-20"> - <label >产品名称</label> + <label>储值卡名称</label> <input autocomplete="off" name="projName" type="text" class="form-control" > </div> diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-summary.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-summary.html index a5952d6..ca5daba 100644 --- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-summary.html +++ b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-summary.html @@ -25,30 +25,28 @@ <button onclick="myGrid.resetForm()" type="button" class="btn btn-default btn-sm"><i class="fa fa-refresh " ></i> 重置</button> </div> </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="parentId">商品分类</label>--> +<!-- <select class="form-control select2" size="1" name="cateId" id="parentId">--> +<!-- <option value="" selected="selected">--选择分类--</option>--> +<!-- </select>--> +<!-- </div>--> - <div class="form-group mr-20"> - <label for="parentId">商品分类</label> - <select class="form-control select2" size="1" name="cateId" id="parentId"> - <option value="" selected="selected">--选择分类--</option> - </select> - </div> - - <div class="form-group mr-20"> - <label>会员</label> - <input autocomplete="off" placeholder="姓名/编号/电话" name="vipQueryKey" type="text" class="form-control" > - </div> +<!-- <div class="form-group mr-20">--> +<!-- <label>会员</label>--> +<!-- <input autocomplete="off" placeholder="姓名/编号/电话" name="vipQueryKey" type="text" class="form-control" >--> +<!-- </div>--> - <div class="form-group mr-20"> - <label>到期时间</label><!-- 入库时间的查询增加一个查询的其实时间两个字段 --> - <input autocomplete="off" id="select_begin" name="beginTime" type="text" class="form-control datetimepicker">- - <input autocomplete="off" name="endTime" type="text" class="form-control datetimepicker" id="select_end"> - </div> +<!-- <div class="form-group mr-20">--> +<!-- <label>到期时间</label><!– 入库时间的查询增加一个查询的其实时间两个字段 –>--> +<!-- <input autocomplete="off" id="select_begin" name="beginTime" type="text" class="form-control datetimepicker">- --> +<!-- <input autocomplete="off" name="endTime" type="text" class="form-control datetimepicker" id="select_end">--> +<!-- </div>--> </form> <div id="option-bar" > <button matrix:btn="bedList-exportExcel" onclick="exportExcel()" type="button" class="btn btn-default btn-sm"><i class="fa fa-download" ></i> 导出</button> diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-item.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-item.html index 68abe4f..af8c3ce 100644 --- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-item.html +++ b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-item.html @@ -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> @@ -123,12 +123,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", }); }); } diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-sumary.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-sumary.html index 685c269..9913565 100644 --- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-sumary.html +++ b/zq-erp/src/main/resources/templates/views/admin/hive/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> @@ -104,12 +104,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", }); }); } diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projuse-item.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projuse-item.html index afb532f..0ba9414 100644 --- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projuse-item.html +++ b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projuse-item.html @@ -27,14 +27,14 @@ </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> @@ -117,12 +117,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", }); }); } diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projuse-sumary.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projuse-sumary.html index 2ab1687..8e3fe77 100644 --- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projuse-sumary.html +++ b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projuse-sumary.html @@ -25,13 +25,13 @@ </div> </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> </form> @@ -86,12 +86,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