From aaffaeae2f2b141663117c6c19e18f08f202e8f2 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@USER-20180117QL>
Date: 星期四, 20 十二月 2018 08:48:03 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ex-battinfo.jsp | 13 +++++++++----
gx_tieta/WebRoot/iframe/batt-info-edit.html | 6 +++---
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/gx_tieta/WebRoot/ex-battinfo.jsp b/gx_tieta/WebRoot/ex-battinfo.jsp
index b2d738d..9e4ca55 100644
--- a/gx_tieta/WebRoot/ex-battinfo.jsp
+++ b/gx_tieta/WebRoot/ex-battinfo.jsp
@@ -43,8 +43,8 @@
<div class="layui-page-content" style="position: relative;">
<div class="tbl-filter" lay-filter="tblFilter" style="position: absolute;z-index: 891;top: 8px; left: 15px">
<div class="layui-form layui-form-pane" lay-filter="tblFilter">
- <button class="layui-btn layui-btn-sm layui-btn-normal" id="exBattGroups">鎵归噺瀹℃壒</button>
- <button class="layui-btn layui-btn-sm layui-btn-danger" id="reBattGroups">鎵归噺鎷掔粷</button>
+ <button class="layui-btn layui-btn-sm layui-btn-green" id="exBattGroups">鎵归噺瀹℃壒</button>
+ <button class="layui-btn layui-btn-sm layui-bg-blue" id="acceptBattGroups">鎵归噺楠屾敹</button>
<!-- <button class="layui-btn layui-btn-sm layui-btn-normal" id="reTbl">鍒锋柊琛ㄦ牸</button> -->
</div>
</div>
@@ -72,7 +72,7 @@
</div>
<script type="text/html" id="battGrouptools">
<a class="layui-btn layui-btn-xs" lay-event="adopt">閫氳繃</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="refuse">鎷掔粷</a>
+ <a class="layui-btn layui-btn-xs layui-bg-blue" lay-event="accept">楠屾敹</a>
</script>
<script type="text/html" id="applyEn">
{{# if(d.apply_en){ }}
@@ -308,7 +308,12 @@
// 鏋勯�犳煡璇㈡潯浠�
function createSearchParam() {
- var temp = Page.getPage();
+ var temp = {
+ apply_en: 0
+ ,binf: {
+ page: Page.getPage()
+ }
+ };
return temp;
}
diff --git a/gx_tieta/WebRoot/iframe/batt-info-edit.html b/gx_tieta/WebRoot/iframe/batt-info-edit.html
index 1d44c02..ccbce2d 100644
--- a/gx_tieta/WebRoot/iframe/batt-info-edit.html
+++ b/gx_tieta/WebRoot/iframe/batt-info-edit.html
@@ -313,7 +313,7 @@
<div class="layui-block">
<label class="layui-form-label">璁惧绱㈠紩<span class="red">*</span></label>
<div class="layui-input-block">
- <select name="group{{item.GroupIndexInFBSDevice}}.index">
+ <select name="group{{index}}.index">
{{# layui.each([0,1,2,3], function(k) { }}
{{# if(item.GroupIndexInFBSDevice == k) { }}
<option value="{{ k }}" selected>{{ k }}</option>
@@ -329,7 +329,7 @@
<div class="layui-block">
<label class="layui-form-label">鐢垫睜缁処D</label>
<div class="layui-input-block">
- <input type="text" name="group{{item.GroupIndexInFBSDevice}}.id" lay-verify="required" disabled="" autocomplete="off" class="layui-input layui-bg-gray battid" value="{{item.BattGroupId}}">
+ <input type="text" name="group{{index}}.id" lay-verify="required" disabled="" autocomplete="off" class="layui-input layui-bg-gray battid" value="{{item.BattGroupId}}">
</div>
</div>
</div>
@@ -337,7 +337,7 @@
<div class="layui-block">
<label class="layui-form-label">鐢垫睜缁勫悕绉�</label>
<div class="layui-input-block">
- <input type="text" name="group{{item.GroupIndexInFBSDevice}}.name" lay-verify="required" autocomplete="off" class="layui-input" value="{{item.BattGroupName}}">
+ <input type="text" name="group{{index}}.name" lay-verify="required" autocomplete="off" class="layui-input" value="{{item.BattGroupName}}">
</div>
</div>
</div>
--
Gitblit v1.9.1