hdw
2018-11-02 89cc717e3ccd49d49539b25d7a8554126504b51f
电池配组记录区/县添加
2个文件已修改
216 ■■■■ 已修改文件
gx_tieta/WebRoot/iframe/set-match-group.html 104 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/set-match-group.jsp 112 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/iframe/set-match-group.html
@@ -36,7 +36,14 @@
                                <div class="layui-input-inline">
                                    <div class="layui-form" lay-filter="cityFilter">
                                        <select name="city" id="city" lay-filter="city">
                                            <option value="">请选择市/区</option>
                                            <option value="">请选择市</option>
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-input-inline">
                                    <div class="layui-form" lay-filter="countyFilter">
                                        <select name="county" id="county" lay-filter="county">
                                            <option value="">请选择区/县</option>
                                        </select>
                                    </div>
                                </div>
@@ -154,6 +161,7 @@
                var obj = {};
                obj.StationName1 = '';
                obj.StationName2 = '';
                obj.StationName5 = '';
                obj.StationName3 = '';
                obj.BattGroupName = '';
                obj.BattGroupId = data.BattGroupId;
@@ -162,7 +170,7 @@
            
            // 构造生成表格数据的方法
            function formaterTblData(data) {
                console.log(data);
                //console.log(data);
                var rs = [];    // 结果集
                
                // 遍历查询的结果根据查询结果生成指定的格式
@@ -274,6 +282,7 @@
            }
            
            // 查询省下拉框
            var filterLoad = layer.load();
            searchProvince();
            // 查询省
            function searchProvince() {
@@ -314,11 +323,11 @@
            // 切换省-市
            form.on('select(province)', function(data) {
                // 查询市
                searchCity();
                searchCity(true);
            });
            
            // 查询市
            function searchCity() {
            function searchCity(isLoad) {
                // 构造查询条件
                var tmp = {
                    StationName1: $("#province").val()
@@ -351,25 +360,82 @@
                        createLayuiSelect(ele, list);
                        form.render('select', 'cityFilter');
                        
                        // 查询机房
                        searchHome();
                        // 查询区/县
                        searchCounty();
                    }
                });
            }
            
            // 切换市-机房
            form.on('select(city)', function(data) {
                // 查询机房
                searchHome();
            });
            // 查询机房
            function searchHome() {
            // 查询区/县
            function searchCounty(isLoad) {
                // 构造查询条件
                var tmp = {
                    StationName1:$("#province").val(),
                    StationName2:$("#city").val()
                };
                // 是否添加等待
                if(isLoad) {
                    filterLoad = layer.load();
                }
                // 根据构造条件查询内容
                $.ajax({
                    type: 'post',
                    async: true,
                    url: 'BattInfAction!serchStationName5',
                    dataType: 'json',
                    data: "json = "+JSON.stringify(tmp),
                    success: function(result) {
                        var rs = JSON.parse(result.result);
                        var list = [];                // option结果集
                        var ele = $('#county');    // 目标select
                        if(rs.code == 1) {
                            var data = rs.data;
                            list.push(getLayuiSelect('请选择区/县', '', {}, undefined));
                            // 遍历查询结果
                            for(var i=0; i<data.length; i++) {
                                var _data = data[i];
                                var _tmp = getLayuiSelect(_data.StationName5, _data.StationName5, {}, _data);
                                list.push(_tmp);
                            }
                        }else {
                            list.push(getLayuiSelect('暂无区/县', '', {}, undefined));
                        }
                        // 根据对象数组生成下拉列表
                        createLayuiSelect(ele, list);
                        form.render('select', 'countyFilter');
                        // 查询机房
                        searchHome();
                    }
                });
            }
            // 切换市-区/县
            form.on('select(city)', function(data) {
                // 查询区/县
                searchCounty(true);
            });
            // 切换区/县-机房
            form.on('select(county)', function(data) {
                // 查询机房
                searchHome(true);
            });
            // 查询机房
            function searchHome(isLoad) {
                // 构造查询条件
                var tmp = {
                    StationName1:$("#province").val(),
                    StationName2:$("#city").val(),
                    StationName5:$("#county").val()
                };
                // 是否添加等待
                if(isLoad) {
                    filterLoad = layer.load();
                }
                // 根据构造条件查询内容
                $.ajax({
                    type: 'post',
@@ -414,18 +480,23 @@
            // 切换机房-电池组
            form.on('select(home)', function(data) {
                // 查询电池组
                searchGroup();
                searchGroup(true);
            });
            
            // 查询机房
            function searchGroup() {
            function searchGroup(isLoad) {
                // 构造查询条件
                var tmp = {
                    StationName1:$("#province").val(),
                    StationName2:$("#city").val(),
                    StationName5:$("#county").val(),
                    StationName: $("#home").val(),
                    StationId: $("#home").find('option:selected').attr('stationid')
                };
                // 是否添加等待
                if(isLoad) {
                    filterLoad = layer.load();
                }
                // 根据构造条件查询内容
                $.ajax({
                    type: 'post',
@@ -460,6 +531,7 @@
                            list.push(getLayuiSelect('暂无机房', '', {}, undefined));
                        }
                        
                        layer.close(filterLoad);
                        // 根据对象数组生成下拉列表
                        createLayuiSelect(ele, list);
                        form.render('select', 'groupFilter');
gx_tieta/WebRoot/set-match-group.jsp
@@ -60,7 +60,14 @@
                                <div class="layui-input-inline">
                                    <div class="layui-form" lay-filter="cityFilter">
                                        <select name="city" id="city" lay-filter="city">
                                            <option value="">请选择市/区</option>
                                            <option value="">请选择市</option>
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-input-inline">
                                    <div class="layui-form" lay-filter="countyFilter">
                                        <select name="county" id="county" lay-filter="county">
                                            <option value="">请选择区/县</option>
                                        </select>
                                    </div>
                                </div>
@@ -70,7 +77,6 @@
                                            <option value="">请选择机房</option>
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-input-inline">
                                    <div class="layui-form" lay-filter="groupFilter">
@@ -178,6 +184,7 @@
                var obj = {};
                obj.StationName1 = '';
                obj.StationName2 = '';
                obj.StationName5 = '';
                obj.StationName3 = '';
                obj.BattGroupName = '';
                obj.BattGroupId = data.BattGroupId;
@@ -235,6 +242,7 @@
            }
            
            // 查询省下拉框
            var filterLoad = layer.load();
            searchProvince();
            // 查询省
            function searchProvince() {
@@ -275,15 +283,19 @@
            // 切换省-市
            form.on('select(province)', function(data) {
                // 查询市
                searchCity();
                searchCity(true);
            });
            
            // 查询市
            function searchCity() {
            function searchCity(isLoad) {
                // 构造查询条件
                var tmp = {
                    StationName1: $("#province").val()
                };
                // 是否添加等待
                if(isLoad) {
                    filterLoad = layer.load();
                }
                // 根据构造条件查询内容
                $.ajax({
                    type: 'post',
@@ -297,7 +309,7 @@
                        var ele = $('#city');    // 目标select
                        if(rs.code == 1) {
                            var data = rs.data;
                            list.push(getLayuiSelect('请选择市/区', '', {}, undefined));
                            list.push(getLayuiSelect('请选择市', '', {}, undefined));
                            // 遍历查询结果
                            for(var i=0; i<data.length; i++) {
                                var _data = data[i];
@@ -305,32 +317,88 @@
                                list.push(_tmp);
                            }
                        }else {
                            list.push(getLayuiSelect('暂无市/区', '', {}, undefined));
                            list.push(getLayuiSelect('暂无市', '', {}, undefined));
                        }
                        
                        // 根据对象数组生成下拉列表
                        createLayuiSelect(ele, list);
                        form.render('select', 'cityFilter');
                        // 查询机房
                        searchHome();
                        // 查询区/县
                        searchCounty();
                    }
                });
            }
            
            // 切换市-机房
            form.on('select(city)', function(data) {
                // 查询机房
                searchHome();
            });
            // 查询机房
            function searchHome() {
            // 查询区/县
            function searchCounty(isLoad) {
                // 构造查询条件
                var tmp = {
                    StationName1:$("#province").val(),
                    StationName2:$("#city").val()
                };
                // 是否添加等待
                if(isLoad) {
                    filterLoad = layer.load();
                }
                // 根据构造条件查询内容
                $.ajax({
                    type: 'post',
                    async: true,
                    url: 'BattInfAction!serchStationName5',
                    dataType: 'json',
                    data: "json = "+JSON.stringify(tmp),
                    success: function(result) {
                        var rs = JSON.parse(result.result);
                        var list = [];                // option结果集
                        var ele = $('#county');    // 目标select
                        if(rs.code == 1) {
                            var data = rs.data;
                            list.push(getLayuiSelect('请选择区/县', '', {}, undefined));
                            // 遍历查询结果
                            for(var i=0; i<data.length; i++) {
                                var _data = data[i];
                                var _tmp = getLayuiSelect(_data.StationName5, _data.StationName5, {}, _data);
                                list.push(_tmp);
                            }
                        }else {
                            list.push(getLayuiSelect('暂无区/县', '', {}, undefined));
                        }
                        // 根据对象数组生成下拉列表
                        createLayuiSelect(ele, list);
                        form.render('select', 'countyFilter');
                        // 查询机房
                        searchHome();
                    }
                });
            }
            // 切换市-区/县
            form.on('select(city)', function(data) {
                // 查询区/县
                searchCounty(true);
            });
            // 切换区/县-机房
            form.on('select(county)', function(data) {
                // 查询机房
                searchHome(true);
            });
            // 查询机房
            function searchHome(isLoad) {
                // 构造查询条件
                var tmp = {
                    StationName1:$("#province").val(),
                    StationName2:$("#city").val(),
                    StationName5:$("#county").val()
                };
                // 是否添加等待
                if(isLoad) {
                    filterLoad = layer.load();
                }
                // 根据构造条件查询内容
                $.ajax({
                    type: 'post',
@@ -375,14 +443,19 @@
            });
            
            // 查询机房
            function searchGroup() {
            function searchGroup(isLoad) {
                // 构造查询条件
                var tmp = {
                    StationName1:$("#province").val(),
                    StationName2:$("#city").val(),
                    StationName5:$("#county").val(),
                    StationName: $("#home").val(),
                    StationId: $("#home").find('option:selected').attr('stationid')
                };
                // 是否添加等待
                if(isLoad) {
                    filterLoad = layer.load();
                }
                // 根据构造条件查询内容
                $.ajax({
                    type: 'post',
@@ -410,9 +483,10 @@
                                list.push(_tmp);
                            }
                        }else {
                            list.push(getLayuiSelect('暂无机房', '', {}, undefined));
                            list.push(getLayuiSelect('暂无电池组', '', {}, undefined));
                        }
                        
                        layer.close(filterLoad);
                        // 根据对象数组生成下拉列表
                        createLayuiSelect(ele, list);
                        form.render('select', 'groupFilter');