modify

Helius

2021-01-21 73d18e706a4d6c787b0a670d2089f9160b88fdb5

modify

 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>



 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>


 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>


 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">&#45;&#45;选择分类&#45;&#45;</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>&lt;!&ndash;    入库时间的查询增加一个查询的其实时间两个字段 &ndash;&gt;-->
<!--                <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>

 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",
            });
        });
    }

 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",
            });
        });
    }

 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",
            });
        });
    }

 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",
            });
        });
    }

 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>


 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">&#45;&#45;选择分类&#45;&#45;</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>&lt;!&ndash;    入库时间的查询增加一个查询的其实时间两个字段 &ndash;&gt;-->
<!--                <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>

 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",
            });
        });
    }

 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",
            });
        });
    }

 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",
            });
        });
    }

 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",
            });
        });
    }