gitee
/
guns
mirror of https://gitee.com/stylefeng/guns
1
0
Fork 0
Code Issues Releases Wiki Activity

【Position】HttpRequest 替换

pull/65/head
chenjinlong 2021-01-04 15:15:11 +08:00
parent 3a70322904
commit 8ce0dc8842
8 changed files with 72 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/main/webapp/assets/expand/module/ax/ajaxUtil.js
View File

@ -1,50 +0,0 @@
layui.define(['jquery'], function (exports) {
var $ = layui.$;
var ajaxUtil = {
post: function (url, params, suc, err, contentType, async) {
ajaxUtil.sendAjax(url, params, 'POST', suc, err, contentType, async);
},
post: function (url, params, suc, err) {
ajaxUtil.sendAjax(url, params, 'POST', suc, err, null, null);
},
get: function (url, params, suc, err, contentType, async) {
ajaxUtil.sendAjax(url, params, 'GET', suc, err, contentType, async);
},
get: function (url, suc, err, contentType, async) {
ajaxUtil.sendAjax(url, '', 'GET', suc, err, contentType, async);
},
get: function (url, suc, err) {
ajaxUtil.sendAjax(url, '', 'GET', suc, err, null, null);
},
sendAjax: function (url, params, method, suc, err, contentType, async) {
$.ajax({
url: url,
cache: false,
async: async == undefined ? false : async,
data: params == undefined ? '' : JSON.stringify(params),
type: method == undefined ? "POST" : method,
contentType: contentType == undefined ? 'application/json; charset=UTF-8' : contentType,
dataType: "json",
success: function (data) {
if (data.code = '00000') {
if (suc !== undefined && typeof suc == "function") {
suc(data);
}
} else {
if (err !== undefined && typeof err == "function") {
err(data);
}
}
},
error: function (data) {
if (err !== undefined && typeof err == "function") {
err(data);
}
}
});
}
}
exports("ajaxUtil", ajaxUtil);
});

21
src/main/webapp/assets/expand/module/func/func.js
View File

@ -4,33 +4,14 @@
* @author fengshuonan
* @Date 2019/7/29 21:20
*/
layui.define(['jquery', 'layer', 'admin', 'table', 'ax', 'form'], function (exports) {
layui.define(['jquery', 'layer', 'admin', 'table'], function (exports) {
var $ = layui.$;
var layer = layui.layer;
var admin = layui.admin;
var table = layui.table;
var $ax = layui.ax;
var form = layui.form;
var func = {
/**
* 拼接下拉字典
*/
initDictSelect: function (url, selectId, optValue, optName) {
$("#" + selectId).html('<option value="">请选择</option>');
var ajax = new $ax(Feng.ctxPath + url, function (data) {
for (var i = 0; i < data.data.length; i++) {
var optionValue = data.data[i][optValue];
var optionName = data.data[i][optName];
$("#" + selectId).append('<option value="' + optionValue + '">' + optionName + '</option>');
}
form.render();
}, function (data) {
});
ajax.start();
},
/**
* 获取内部高度，返回数值
*/

35
src/main/webapp/assets/modular/system/position/position.js
View File

@ -1,9 +1,9 @@
layui.use(['table', 'admin', 'ax', 'form', 'func', 'ajaxUtil', 'dropdown','util'], function () {
layui.use(['table', 'admin', 'form', 'func', 'HttpRequest', 'dropdown', 'util'], function () {
var $ = layui.$;
var table = layui.table;
var form = layui.form;
var func = layui.func;
var ajaxUtil = layui.ajaxUtil;
var HttpRequest = layui.HttpRequest;
var dropdown = layui.dropdown;
var util = layui.util;
@ -20,13 +20,16 @@ layui.use(['table', 'admin', 'ax', 'form', 'func', 'ajaxUtil', 'dropdown','util'
{field: 'positionName', sort: true, title: '职位名称'},
{field: 'positionCode', sort: true, title: '职位编码'},
{field: 'positionRemark', sort: true, title: '备注'},
{field: 'createTime', sort: true, title: '创建时间',templet: function (d) {
return util.toDateString(d.createTime);
}},
{field: 'updateTime', sort: true, title: '更新时间',templet: function (d) {
console.log(d.updateTime);
return d.updateTime==null?'': util.toDateString(d.updateTime);
}},
{
field: 'createTime', sort: true, title: '创建时间', templet: function (d) {
return util.toDateString(d.createTime);
}
},
{
field: 'updateTime', sort: true, title: '更新时间', templet: function (d) {
return d.updateTime == null ? '' : util.toDateString(d.updateTime);
}
},
{field: 'statusFlag', sort: true, templet: '#statusTpl', title: '状态'},
{align: 'center', toolbar: '#tableBar', title: '操作'}
]];
@ -76,24 +79,28 @@ layui.use(['table', 'admin', 'ax', 'form', 'func', 'ajaxUtil', 'dropdown','util'
// 点击删除
Position.delete = function (data) {
var operation = function () {
ajaxUtil.post(Feng.ctxPath + "/hrPosition/delete", {"positionId":data.positionId},function (data) {
var httpRequest = new HttpRequest(Feng.ctxPath + "/hrPosition/delete", 'post', function (data) {
Feng.success("删除成功!");
table.reload(Position.tableId);
},function (data) {
Feng.error("删除失败!" + data.responseJSON.message + "!");
}, function (data) {
Feng.error("删除失败!" + data.message + "!");
});
httpRequest.set(data);
httpRequest.start(true);
};
Feng.confirm("是否删除?", operation);
};
// 修改职位状态
Position.updateStatus = function (positionId, checked) {
ajaxUtil.post(Feng.ctxPath + "/hrPosition/updateStatus", {"positionId":positionId,"statusFlag":checked},function (data) {
var httpRequest = new HttpRequest(Feng.ctxPath + "/hrPosition/updateStatus", 'post', function (data) {
Feng.success("修改成功!");
},function (data) {
}, function (data) {
Feng.error("修改失败!" + data.responseJSON.message);
table.reload(Position.tableId);
});
httpRequest.set({"positionId": positionId, "statusFlag": checked});
httpRequest.start(true);
};
// 渲染表格

32
src/main/webapp/assets/modular/system/position/position_add.js
View File

@ -1,37 +1,19 @@
/**
* 添加或者修改页面
*/
var PositionInfoDlg = {
data: {
name: "",
code: "",
sort: "",
status: "",
remark: "",
createTime: "",
updateUser: "",
updateTime: "",
createUser: ""
}
};
layui.use(['form', 'admin', 'ax', 'ajaxUtil'], function () {
var $ = layui.jquery;
var $ax = layui.ax;
layui.use(['form', 'admin', 'HttpRequest'], function () {
var form = layui.form;
var admin = layui.admin;
var ajaxUtil = layui.ajaxUtil;
var HttpRequest = layui.HttpRequest;
//表单提交事件
form.on('submit(btnSubmit)', function (data) {
ajaxUtil.post(Feng.ctxPath + "/hrPosition/add", data.field, function (res) {
var request = new HttpRequest(Feng.ctxPath + "/hrPosition/add", 'post', function (data) {
admin.closeThisDialog();
Feng.success("添加成功！");
admin.putTempData('formOk', true);
}, function (res) {
}, function (data) {
admin.closeThisDialog();
Feng.error("添加失败！" + res.responseJSON.message);
Feng.error("添加失败！" + data.message);
});
request.set(data.field);
request.start(true);
});
});

42
src/main/webapp/assets/modular/system/position/position_edit.js
View File

@ -1,44 +1,26 @@
/**
* 详情对话框
*/
var PositionInfoDlg = {
data: {
name: "",
code: "",
sort: "",
status: "",
remark: "",
createTime: "",
updateUser: "",
updateTime: "",
createUser: ""
}
};
layui.use(['form', 'admin', 'ajaxUtil'], function () {
var $ = layui.jquery;
var $ax = layui.ax;
layui.use(['form', 'admin', 'HttpRequest'], function () {
var form = layui.form;
var admin = layui.admin;
var ajaxUtil = layui.ajaxUtil;
var HttpRequest = layui.HttpRequest;
//获取详情信息，填充表单
ajaxUtil.get("/hrPosition/detail?positionId=" + Feng.getUrlParam("positionId"), function (res) {
form.val('positionForm', res.data);
}, function (res) {
admin.closeThisDialog();
Feng.error("编辑异常！" + res.responseJSON.message);
});
//获取用户详情
var request = new HttpRequest(Feng.ctxPath + "/hrPosition/detail?positionId=" + Feng.getUrlParam("positionId"), 'get');
var result = request.start();
form.val('positionForm', result.data);
//表单提交事件
form.on('submit(btnSubmit)', function (data) {
ajaxUtil.post(Feng.ctxPath + "/hrPosition/edit", data.field, function (res) {
var request = new HttpRequest(Feng.ctxPath + "/hrPosition/edit", 'post', function (data) {
Feng.success("修改成功!");
admin.putTempData('formOk', true);
admin.closeThisDialog();
}, function (res) {
}, function (data) {
admin.closeThisDialog();
Feng.error("修改失败!" + res.responseJSON.message);
Feng.error("修改失败!" + data.message);
});
request.set(data.field);
request.start(true);
});
});

55
src/main/webapp/pages/modular/system/position/position.html
View File

@ -14,23 +14,23 @@
<div class="layui-inline">
<input id="positionName" class="layui-input" type="text" placeholder="职位名称"/>
</div>
<!-- <div class="layui-inline">-->
<!-- <input id="positionCode" class="layui-input" type="text" placeholder="职位编码"/>-->
<!-- </div>-->
<!-- <div class="layui-inline">-->
<!-- <input id="positionCode" class="layui-input" type="text" placeholder="职位编码"/>-->
<!-- </div>-->
<div class="layui-inline">
<button id="btnSearch" class="layui-btn icon-btn"><i class="layui-icon">&#xe615;</i>搜索</button>
<button id="btnAdd" class="layui-btn icon-btn"><i class="layui-icon">&#xe654;</i>添加</button>
<button id="btnExp" class="layui-btn icon-btn"><i class="layui-icon">&#xe67d;</i>导出</button>
<!-- 下拉按钮 -->
<div class="dropdown-menu dropdown-hover">
<button class="layui-btn icon-btn" type="button">
&nbsp;更多 <i class="layui-icon layui-icon-drop"></i></button>
<ul class="dropdown-menu-nav">
<li><a><i class="layui-icon layui-icon-edit"></i>test1</a></li>
<li><a><i class="layui-icon layui-icon-delete"></i>test2</a></li>
<li><a><i class="layui-icon layui-icon-password"></i>test3</a></li>
</ul>
</div>
<!-- <div class="dropdown-menu dropdown-hover">-->
<!-- <button class="layui-btn icon-btn" type="button">-->
<!-- &nbsp;更多 <i class="layui-icon layui-icon-drop"></i></button>-->
<!-- <ul class="dropdown-menu-nav">-->
<!-- <li><a><i class="layui-icon layui-icon-edit"></i>test1</a></li>-->
<!-- <li><a><i class="layui-icon layui-icon-delete"></i>test2</a></li>-->
<!-- <li><a><i class="layui-icon layui-icon-password"></i>test3</a></li>-->
<!-- </ul>-->
<!-- </div>-->
</div>
</div>
</div>
@ -44,24 +44,23 @@
<script type="text/html" id="tableBar">
<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
<a class="layui-btn layui-btn-xs" data-dropdown="#userTbDrop{{d.LAY_INDEX}}" no-shade="true">
更多<i class="layui-icon layui-icon-drop" style="font-size: 12px;margin-right: 0;"></i></a>
<!-- 下拉菜单 -->
<ul class="dropdown-menu-nav dropdown-bottom-right layui-hide" id="userTbDrop{{d.LAY_INDEX}}">
<div class="dropdown-anchor"></div>
<li><a lay-event="lock"><i class="layui-icon layui-icon-password"></i>锁定用户</a></li>
<li><a lay-event="reset"><i class="layui-icon layui-icon-key"></i>重置密码</a></li>
<li class="have-more show-left">
<a><i class="layui-icon layui-icon-upload-drag"></i>上传资料&nbsp;&nbsp;</a>
<ul class="dropdown-menu-nav-child">
<li><a><i class="layui-icon layui-icon-camera"></i>上传头像</a></li>
<li><a><i class="layui-icon layui-icon-picture-fine"></i>上传照片</a></li>
</ul>
</li>
</ul>
<!-- <a class="layui-btn layui-btn-xs" data-dropdown="#userTbDrop{{d.LAY_INDEX}}" no-shade="true">更多<i class="layui-icon layui-icon-drop" style="font-size: 12px;margin-right: 0;"></i></a>-->
<!-- &lt;!&ndash; 下拉菜单 &ndash;&gt;-->
<!-- <ul class="dropdown-menu-nav dropdown-bottom-right layui-hide" id="userTbDrop{{d.LAY_INDEX}}">-->
<!-- <div class="dropdown-anchor"></div>-->
<!-- <li><a lay-event="lock"><i class="layui-icon layui-icon-password"></i>锁定用户</a></li>-->
<!-- <li><a lay-event="reset"><i class="layui-icon layui-icon-key"></i>重置密码</a></li>-->
<!-- <li class="have-more show-left">-->
<!-- <a><i class="layui-icon layui-icon-upload-drag"></i>上传资料&nbsp;&nbsp;</a>-->
<!-- <ul class="dropdown-menu-nav-child">-->
<!-- <li><a><i class="layui-icon layui-icon-camera"></i>上传头像</a></li>-->
<!-- <li><a><i class="layui-icon layui-icon-picture-fine"></i>上传照片</a></li>-->
<!-- </ul>-->
<!-- </li>-->
<!-- </ul>-->
</script>
<script type="text/html" id="statusTpl">
<input type="checkbox" lay-filter="status" value="{{d.positionId}}" lay-skin="switch" lay-text="正常|锁定" {{d.statusFlag=='1'?'checked':''}} />
<input type="checkbox" lay-filter="status" value="{{d.positionId}}" lay-skin="switch" lay-text="正常|锁定" {{d.statusFlag=='1'?'checked':''}}/>
</script>
@}

4
src/main/webapp/pages/modular/system/position/position_add.html
View File

@ -27,9 +27,9 @@
</div>
</div>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">备注<span style="color: red;">*</span></label>
<label class="layui-form-label">备注</label>
<div class="layui-input-block">
<textarea id="positionRemark" name="positionRemark" placeholder="请输入备注" class="layui-textarea" lay-verify="required" required></textarea>
<textarea id="positionRemark" name="positionRemark" placeholder="请输入备注" class="layui-textarea"></textarea>
</div>
</div>
</div>

4
src/main/webapp/pages/modular/system/position/position_edit.html
View File

@ -27,9 +27,9 @@
</div>
</div>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">备注<span style="color: red;">*</span></label>
<label class="layui-form-label">备注</label>
<div class="layui-input-block">
<textarea id="positionRemark" name="positionRemark" placeholder="请输入备注" class="layui-textarea" lay-verify="required" required></textarea>
<textarea id="positionRemark" name="positionRemark" placeholder="请输入备注" class="layui-textarea"></textarea>
</div>
</div>
</div>