Merge branch 'dev1.1' into dev

zhaoxiaohao

2021-03-01 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/area.js

@@ -21,7 +21,7 @@
    var layer = layui.layer;
    var admin = layui.admin;
    var area = {
        //4个参数依次是 下拉控件的id，/区域级别（1.2.3）/上级id/选中id
        //4个参数依次是 下拉控件的id，/区域级别（1.2.3）/上级id/选中值 例如河北省
        areaData: function (domId, levelType, parentId, selectValue) {
            if (levelType == 1) {
                parentId = 100000;
@@ -33,6 +33,10 @@
                    clientsAll = data.data;
                    if (clientsAll.length > 0) {
                        area.areasClear(domId,levelType);
                        if(clientsAll[0].areaLeveltype==3)
                        {
                            admin.putTempData("t_area",clientsAll);
                        }
                        $.each(clientsAll, function (index, item) {
                            if (selectValue == item.areaName) { selected = "selected='selected'"; }
                            else {