Merge remote-tracking branch 'origin/master'

src/main/java/com/minpay/huicai/personmanage/action/DepartmentManageAction.java

@@ -177,6 +177,11 @@ public class DepartmentManageAction implements IMINAction {
 			}else{
 				m.put("flag", "1");
 			}
+			if("88888888".equals(bId)) {
+				m.put("powerFlag", "0");
+			}else{
+				m.put("powerFlag", "1");
+			}
 		}
 		ls = new MINCopyFormat("{stt:'sttdesc',level:'leveldesc',branchType:'branchTypedesc'}").format(ls);
 		ls = Service.lookup(IFormatService.class).formatEnum(ls, "{sttdesc:'IM_BRANCH_STATE',leveldesc:'IM_BRANCH_LEVEL',branchTypedesc:'BRANCH_TYPE'}");

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

@@ -1129,7 +1129,10 @@ public class MachineManageAction implements IMINAction {
         pro.setModifyUser(user.getId());
         pro.setModifyTime(nowTime);
         pro.setAddress(address);
-        pro.setEquType(equType);
+
+        if(!CommonUtil.isEmpty(equType)){
+            pro.setEquType(equType);
+        }
         pro.setWcAccount(wcAccount);
         pro.setZfbAccount(zfbAccount);
         pro.setCharge(charge);
@@ -1653,6 +1656,8 @@ public class MachineManageAction implements IMINAction {
         MINActionResult res = new MINActionResult();
         // 查询当前角色编号
         User u = session.getUser();
+        branchId = u.getBranchId();
+
         MINRowBounds rows = new MINRowBounds(page, limit);
         VmHlAccountExample vmHlAccountExample = new VmHlAccountExample();
         VmHlAccountExample.Criteria createCriteria = vmHlAccountExample.createCriteria();
@@ -1665,7 +1670,7 @@ public class MachineManageAction implements IMINAction {
         if(!StringUtils.isNullOrEmpty(type)){
             createCriteria.andTypeEqualTo(type);
         }
-        if(!StringUtils.isNullOrEmpty(branchId)){
+        if(!branchId.equals(Constant.DEFAULT_INSTITUTIONS)){
             createCriteria.andUsridEqualTo(branchId);
         }
         List<VmHlAccount> businessNumList = Service.lookup(IMINDataBaseService.class)

src/main/webapp/admin/departmentManage/departmentManage.html

@@ -55,7 +55,9 @@
 		<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="enable">解冻</a>
 		{{#  }; }}
 		<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+		{{#  if(d.powerFlag == '0'){ }}
 		<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="power">权限</a>
+		{{#  }; }}
    </script>
 	<script>
      	var table;

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

@@ -24,8 +24,8 @@
                 <div class="layui-inline">
                     <label class="layui-form-label">*机台号:</label>
                     <div class="layui-input-inline">
-                        <input type="tel" name="machineNo" id = "machineNo" lay-verify="equCode"  placeholder="请输入机台号"autocomplete="off" class="layui-input">
-                         <input type="hidden" name="id" id = "id" lay-verify="id"  placeholder="请输入设备码"autocomplete="off" class="layui-input">
+                        <input type="tel" name="imeiAddr" id = "imeiAddr" lay-verify="equCode"  placeholder="请输入机台号"autocomplete="off" class="layui-input">
+                         <input type="hidden" name="id" id = "id" lay-verify="imeiAddr"  placeholder="请输入设备码"autocomplete="off" class="layui-input">
                     </div>
                 </div>
                  <div class="layui-inline">
@@ -82,9 +82,9 @@
                 action : '../../MachineManageAction/queryFunction',
                 data : { branchId: rowData.branchid},
                 success : function(data) {
-                    debugger;
-                    if (data.data.length>0){
-                        for (var i =0;i<data.data.length;i++){
+                    var length = data.data.length;
+                    if (length>0){
+                        for (var i =0;i<length;i++){
                             if (data.data[i].name =='机器类型'){
                                 $('#jiqileixing').html(data.data[i].html);
                                 var channelCheckbox = $("form").find("input[name='equType']");
@@ -104,8 +104,8 @@
                                 var versionCheckbox = $("form").find("input[name='versionType']");
                                 if ( rowData.versionType != null){
                                     var version = rowData.versionType.split(',')
-                                    for(var i = 0;i<version.length;i++){
-                                        var j = version[i];
+                                    for(var k = 0;k<version.length;k++){
+                                        var j = version[k];
                                         if (j == "00"){
                                             $(versionCheckbox[00]).attr("checked", true);
                                         }else if (j == "01"){
@@ -179,10 +179,9 @@
                 }
             });
 	   	    layui.each(rowData, function(index, item){
-                if(index=="payment"){
-                    initSelect('payment', "PAYMENT_AMT", "payment", item, true);
-                }
+
                 $("#"+index+"").val(item);
+
                 form.render();
 	   	    })
 	    		//监听取消
@@ -310,7 +309,7 @@
                 title: '选择收款商户号',
                 shadeClose: true,
                 shade: 0.8,
-                area: ['95%', '95%'],
+                area: ['90%', '90%'],
                 content: 'chooseBusinessNum.html?branchId='+branchId
             });
         }