Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-07-09 8287f743a1ac2fd5330f6dd7ca08255df193ae03

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

@@ -115,11 +115,6 @@
                </button>
                    <button matrix:fn="mdhyzl-gjjl"  onclick="openFollow()" type="button" class="btn btn-info btn-sm"><i class="fa fa-edit" ></i> 跟进记录</button>
                    <button matrix:fn="mdhyzl-khda"  onclick="openArchieves()" type="button" class="btn btn-info btn-sm"><i class="fa fa-edit" ></i> 客户档案</button>
                    <button matrix:btn="mdhyzl-projTaocan"  onclick="openProj()" type="button" class="btn btn-info btn-sm"><i class="fa fa-cube"></i> 项目管理</button>
                    <button matrix:btn="mdhyzl-projTaocan"  onclick="openTc()" type="button" class="btn btn-info btn-sm"><i class="fa fa-cubes"></i> 套餐管理</button>
                    <button matrix:btn="mdhyzl-projTaocan"  onclick="openMoneyCard()" type="button" class="btn btn-info btn-sm"><i class="fa fa-credit-card"></i> 充值卡管理</button>
                    <button matrix:fn="mdhyzl-xfdd"   onclick="openOrder()" type="button" class="btn btn-info btn-sm"><i class="fa fa-history"></i> 消费订单</button>
                    <button matrix:fn="mdhyzl-fwd"   onclick="openServiceOrder()" type="button" class="btn btn-info btn-sm"><i class="fa fa-history"></i> 服务单</button>
                    <button matrix:btn="mdhyzl-excelOut"  onclick="exportExcel()" type="button" class="btn btn-info btn-sm"><i class="fa fa-download" ></i> 导出</button>
            </div>

@@ -138,6 +133,7 @@
                <th data-field="arrivalWay">到店途径</th>
                <th data-field="staffName">健康顾问</th>
                <th data-field="shopName">所属门店</th>
                <th data-field="phone" data-formatter="buildOperation">操作</th>
            </tr>
            </thead>
        </table>
@@ -156,7 +152,6 @@
        var delUrl="";
        delUrl=basePath+"/hiveErp/vipInfo/del";


        myGrid=
            MGrid.initGrid({
                url : basePath+"/hiveErp/vipInfo/showVipInfoList",
@@ -165,16 +160,7 @@
            });
    });

        function openOrder(){
            var vipName=myGrid.getSelectItemId("vipName");
            layer.full(layer.open({
                type : 2,
                title : "消费记录",
                area : [ MUI.SIZE_L, '450px' ],
                maxmin : true,
                content : [ basePath+'/admin/redirect/hive/operate/sysOrder-list?vipName=' + vipName ]
            }));
        }

    /**
     * 构建会员名称
     */
@@ -185,16 +171,7 @@
            return value;
        }
    }
    function openServiceOrder(){
        var vipName=myGrid.getSelectItemId("vipName");
        layer.full(layer.open({
            type : 2,
            title : "服务单",
            area : [ MUI.SIZE_L, '450px' ],
            maxmin : true,
            content : [ basePath+'/admin/redirect/hive/store/projService-list?vipName=' + vipName ]
        }));
    }


        function openArchieves(){
            var id=myGrid.getSelectItemId();
@@ -219,66 +196,8 @@
            content : [ basePath+'/admin/serviceRecord/toServicefollowListForZd?id=' + id ]
        });
    }
    function createDateDictionary() {
        $(".dds").each(
            function() {
                var type = $(this).attr("cc");
                var _this = $(this);
                //取服务器请求数据
                $.AjaxProxy({
                    p : {
                        type : type
                    }
                })
                    .invoke(
                        basePath+"/admin/dds/showDataDictionary",
                        function(loj) {
                            var html = '';
                            console.log(loj.getRowCount());
                            for (var i = 0; i < loj
                                .getRowCount(); i++) {
                                html += '<option value="'
                                    + loj
                                        .getString(i,
                                            "id")
                                    + '">'
                                    + loj.getString(i,
                                        "name")
                                    + "</option>";
                            }
                            _this.html(html);
                        });

            });
    }
        function openTc() {
            var id=myGrid.getSelectItemId();
            layer.open({
                type: 2,
                title: "会员套餐管理",
                area: MUI.SIZE_M,
                content : [ basePath+'/admin/redirect/hive-erp/vip/viptc-list?vipId=' + id]
            });
        }

        function openProj() {
            var id=myGrid.getSelectItemId();
            layer.open({
                type: 2,
                title: "会员项目管理",
                area: MUI.SIZE_M,
                content : [ basePath+'/admin/redirect/hive-erp/vip/projUse-list?vipId=' + id]
            });
        }
        function openMoneyCard() {
            var id=myGrid.getSelectItemId();
            layer.open({
                type: 2,
                title: "会员充值卡管理",
                area: MUI.SIZE_M,
                content : [ basePath+'/admin/redirect/hive-erp/vip/moneyCardUse-list?vipId=' + id]
            });
        }



@@ -310,6 +229,21 @@
        });
    }

    function buildOperation(value, row, index) {
        var html = "";
        html += '<a class="text-info" href="javascript:void(0)" onClick="openVipDetail(\''+row.phone+'\')">查看详情</a>&nbsp;&nbsp;'
        return html;
    }
    function openVipDetail(value) {
        debugger
        layer.full(layer.open({
            type : 2,
            title : "会员详情",
            area : [ MUI.SIZE_L, '450px' ],
            maxmin : true,
            content : [ basePath+'/admin/redirect/hive/beautySalon/vip?vipPhone=' + value ]
        }));
    }

</script>