From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:30:50 +0800
Subject: [PATCH] 未审批可更改
---
gx_tieta/WebRoot/iframe/set-match-group.html | 104 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 89 insertions(+), 15 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/set-match-group.html b/gx_tieta/WebRoot/iframe/set-match-group.html
index e61b55b..df00a89 100644
--- a/gx_tieta/WebRoot/iframe/set-match-group.html
+++ b/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>
@@ -71,9 +78,7 @@
<script type="text/javascript" src="../js/jquery-1.8.3.js"></script>
<script type="text/javascript" src="../jqueryui/jquery-ui.min.js"></script>
<script type="text/javascript" src="../src/layui.js"></script>
- <script type="text/javascript" src="../src/layui.js"></script>
<script type="text/javascript" src="../pages/js/mylayui.js"></script>
- <script type="text/javascript" src="../js/base.js"></script>
<script type="text/javascript">
layui.use(['layer', 'table', 'form', 'laytpl', 'element'],function() {
var layer = layui.layer // 鑾峰彇layer妯″潡
@@ -154,6 +159,7 @@
var obj = {};
obj.StationName1 = '';
obj.StationName2 = '';
+ obj.StationName5 = '';
obj.StationName3 = '';
obj.BattGroupName = '';
obj.BattGroupId = data.BattGroupId;
@@ -162,6 +168,7 @@
// 鏋勯�犵敓鎴愯〃鏍兼暟鎹殑鏂规硶
function formaterTblData(data) {
+ //console.log(data);
var rs = []; // 缁撴灉闆�
// 閬嶅巻鏌ヨ鐨勭粨鏋滄牴鎹煡璇㈢粨鏋滅敓鎴愭寚瀹氱殑鏍煎紡
@@ -177,8 +184,11 @@
// 涓嶆樉绀哄唴瀹�
obj.num = _data.MonNum; // 鍗曚綋缂栧彿涓嶅姞#
obj.battgroupid = _data.BattGroupId; // 鐢垫睜缁刬d
- obj.stationid = _data.StationId; // 鏈烘埧id
- rs.push(obj);
+ obj.stationid = _data.StationId; // 鏈烘埧id
+ // 鍒ゆ柇褰撳墠浣嶇疆鐨勫崟浣撴槸鍚︿负绌虹櫧()
+ if(_data.num || _data.num == undefined) {
+ rs.push(obj);
+ }
}
return rs; // 杩斿洖缁撴灉闆�
@@ -251,7 +261,7 @@
obj.old_battproducer = oData.brandname; // 鍗曚綋鐨勫搧鐗�
obj.old_stationid = oData.stationid; // 鏈烘埧id
obj.old_battgroupid = oData.battgroupid; // 鐢垫睜缁刬d
- obj.old_monnum = oData.num; // 鍗曚綋缂栧彿
+ obj.old_monum = oData.num; // 鍗曚綋缂栧彿
// 琚厤缁勫崟浣撶殑淇℃伅
obj.new_stationname = nData.stationname; // 鏈烘埧鍚嶇О
@@ -259,7 +269,7 @@
obj.new_battproducer = nData.brandname; // 鍗曚綋鐨勫搧鐗�
obj.new_stationid = nData.stationid; // 鏈烘埧id
obj.new_battgroupid = nData.battgroupid; // 鐢垫睜缁刬d
- obj.new_monnum = nData.num; // 鍗曚綋缂栧彿
+ obj.new_monum = nData.num; // 鍗曚綋缂栧彿
// 鍏叡淇℃伅
obj.rebuild_time = nowTime;
@@ -270,6 +280,7 @@
}
// 鏌ヨ鐪佷笅鎷夋
+ var filterLoad = layer.load();
searchProvince();
// 鏌ヨ鐪�
function searchProvince() {
@@ -310,11 +321,11 @@
// 鍒囨崲鐪�-甯�
form.on('select(province)', function(data) {
// 鏌ヨ甯�
- searchCity();
+ searchCity(true);
});
// 鏌ヨ甯�
- function searchCity() {
+ function searchCity(isLoad) {
// 鏋勯�犳煡璇㈡潯浠�
var tmp = {
StationName1: $("#province").val()
@@ -347,25 +358,82 @@
createLayuiSelect(ele, list);
form.render('select', 'cityFilter');
+ // 鏌ヨ鍖�/鍘�
+ searchCounty();
+ }
+ });
+ }
+
+ // 鏌ヨ鍖�/鍘�
+ 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();
+ searchHome(true);
});
// 鏌ヨ鏈烘埧
- function searchHome() {
+ function searchHome(isLoad) {
// 鏋勯�犳煡璇㈡潯浠�
var tmp = {
StationName1:$("#province").val(),
- StationName2:$("#city").val()
+ StationName2:$("#city").val(),
+ StationName5:$("#county").val()
};
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
// 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
$.ajax({
type: 'post',
@@ -410,18 +478,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',
@@ -456,6 +529,7 @@
list.push(getLayuiSelect('鏆傛棤鏈烘埧', '', {}, undefined));
}
+ layer.close(filterLoad);
// 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
createLayuiSelect(ele, list);
form.render('select', 'groupFilter');
--
Gitblit v1.9.1