Merge branch 'developer' into alpha

Helius

2022-03-14 b5960ac13f8d67c0baf8f23ffb2e24de1494cbf7

 zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-list.html

@@ -121,7 +121,7 @@
                    <button matrix:fn="orderClub"  onclick="openOrder()" type="button" class="btn btn-info btn-sm"><i class="fa fa-history"></i> 消费订单</button>
                    <button matrix:fn="serviceClub"  onclick="openServiceOrder()" type="button" class="btn btn-info btn-sm"><i class="fa fa-history"></i> 服务单</button>
                    <button matrix:btn="vipInfo-add"  onclick="openAdd()" type="button" class="btn btn-info btn-sm"><i class="fa fa-plus" ></i>  新增</button>
                    <button matrix:btn="vipInfo-excelOut"  onclick="exportExcel()" type="button" class="btn btn-info btn-sm"><i class="fa fa-download" ></i> 导出</button>
                    <button matrix:btn="vipInfo-exportExcel"  onclick="exportExcel()" type="button" class="btn btn-info btn-sm"><i class="fa fa-download" ></i> 导出</button>
                    <button matrix:btn="vipInfo-allot"  onclick="updateVipInfos()" type="button" class="btn btn-info btn-sm"><i class="" ></i>批量设置健康顾问</button>
                    <button onclick="skinCheck()" type="button" class="btn btn-info btn-sm"><i class="" ></i>皮肤检测管理</button>
                    <button onclick="importVipInfo()" type="button" class="btn btn-info btn-sm"><i class="" ></i>导入会员</button>
@@ -142,6 +142,7 @@
                <th data-field="vipState">会员活跃度</th>
                <th data-field="arrivalWay">到店途径</th>
                <th data-field="staffName">健康顾问</th>
                <th data-field="validFlag" data-formatter="miniQuery">小程序查询权限</th>
                <th data-field="staffName" data-formatter="buildOperation">操作</th>
            </tr>
            </thead>
@@ -174,7 +175,14 @@
    btns[0]="";
    function buildOperation(value, row, index) {
        var html = "";
        var desc;
        if (row.validFlag == 1) {
            desc = "关闭小程序查询权益";
        } else {
            desc = "开启小程序查询权益";
        }
        html += '<a class="text-info" href="javascript:void(0)" onClick="openVipDetail(\''+row.phone+'\')">查看详情</a>&nbsp;&nbsp;'
        + btns[0].replace("VALUE", row.id).replace("FLAG", row.validFlag).replace("DESC", desc);
        return html;
    }

@@ -224,6 +232,14 @@
            }else{
                return value;
            }
    }

    function miniQuery(value, row, index) {
        if(row.validFlag==1){
            return "已开启"
        }else{
            return "已关闭";
        }
    }


@@ -402,22 +418,27 @@
    }

    //导出
        function exportExcel() {
            var name = $("#search-text").attr("name");
            var value = $("#search-text").val();
            var vipType = $("#vipType").val();
            var arrivalWay = $("#arrivalWay").val();
            var vipState = $("#vipState").val();
            var staffId = $("#staffId").val();
            window.location.href = basePath+"/admin/vipInfo/exportExcel?vipType="
                + encodeURI(encodeURI(vipType)) + "&arrivalWay="
                + encodeURI(encodeURI(arrivalWay)) + "&"+name+"="
                + encodeURI(encodeURI(value)) + "&vipState="
                + encodeURI(encodeURI(vipState)) 
                + "&staffId=" + staffId;
    function exportExcel() {
        var param=MForm.toUrlParam("#serchform");
        window.location.href=basePath+"/admin/vipInfo/exportExcel?"+param;
    }

    function vipInfoValid(id, validFlag) {
        var desc;
        if (validFlag == 1) {
            desc = "确认要关闭小程序查询权益？";
        } else {
            desc = "确认要开启小程序查询权益？";
        }
        MTools.handleItem(
            basePath + '/admin/vipInfo/validFlagChange?id=' + id, desc, function () {
                myGrid.serchData();
            });
    }

</script>

<script matrix:btn="vipInfo-miniQuery">
    btns[0]='<a class="text-info" href="javascript:void(0)" onClick="vipInfoValid(\'VALUE\', \'FLAG\')" >DESC</a>&nbsp;&nbsp;'
</script>
</body>
</html>