机器设备修改

src/main/java/com/minpay/mt/machine/action/MachineManageAction.java

@@ -1519,7 +1519,7 @@ public class MachineManageAction implements IMINAction {
         String channel = user.getChannel();
         // 查询条件
         Map<String, String> map = new HashMap<String, String>();
-        map.put("branchId", branchId);
+        map.put("branchId", user.getBranchId());
         List<Map<String, Object>> list = Service.lookup(IMINDataBaseService.class)
                 .getMybatisMapper(MachineManageMapper.class)
                 .queryFunction(map);

src/main/webapp/admin/machineManage/machineManage.html

@@ -11,11 +11,10 @@
 		<div class="tiaojian-part1" id = "conditions">
 			<div class="fl f12-gray4-op mt4">所选条件：</div>
 		</div>
-		<div class="tiaojian-part2 fr  demoTable">
+		<div class="tiaojian-part2 fr  demoTable" >
 			<button class="layui-btn order-bnt1"  data-type="reload" >搜索</button>
 			<button class="layui-btn  order-bnt2" data-type="reset">重置</button>
-			<button class="layui-btn order-bnt2" id = "addMachine">新增机器</button>
-			<button class="layui-btn order-bnt2" id = "deleteMachine">解绑机台号</button>
+			<span id="anniu"></span>
 			<a href="#" id="toggle" class="top">收起</a>
 		</div>
 	</div>
@@ -110,7 +109,23 @@
 			}
 		});
 	})
+	layui.use('form', function(){
+		$.request({
+			action : '../../MachineManageAction/queryFunction',
+			data : { branchId: ""},
+			success : function(data) {
 
+				if (data.data.length>0){
+					for (var i =0;i<data.data.length;i++){
+						if (data.data[i].name =='新增按钮'){
+							$('#anniu').html(data.data[i].html);
+						}
+					}
+				}
+				form.render();
+			}
+		});
+	});
 	var table;
 	layui.use('table', function(){
 		table = layui.table;