ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改提交格式

This commit is contained in:
dy 2021-04-08 14:15:24 +08:00
parent 5db8c58295
commit 022e1fa39e
2 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
View File

@ -1754,4 +1754,42 @@ modal_status = {
SUCCESS: "success", SUCCESS: "success",
FAIL: "error", FAIL: "error",
WARNING: "warning" WARNING: "warning"
}; };
/**
* --- 表单数据接收格式化 ---
* @param1 form_id* 表单id
* @param2 boolean false 是否返回json数据，默认为false
* @param3 callback 回调函数，参数是返回的obj||json, 处理完数据调用自定义方法
* @return obj||json
*/
var customSerialize = function(form, json, callback) {
var arr = $('#' + form).serializeArray();
var tmp = {};
var res2 = {};
//处理array
$.each(arr, function(k, v) {
tmp[v.name] = v.value;
});
$.each(tmp, function(k, v) {
res2[k] = v;
});
$.each(res2, function(k, v) {
var path = k.split('-');
var k2 = path.pop();
var next_node = res2;
$.each(path, function(k2, node) {
if (!next_node[node]) next_node[node] = {};
next_node = next_node[node];
});
next_node[k2] = v;
});
if (arguments[1] && arguments[1] == true) {
var json = JSON.stringify(res2);
// if (callback) callback(json);
return json;
} else {
// if (callback) callback(res2);
return res2;
}
}

12
sino-activity/src/main/resources/templates/activity/info/add.html
View File

@ -233,7 +233,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">活动名称：</label> <label class="col-sm-4 control-label is-required">活动名称：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="DRAWNAME" placeholder="活动名称" class="form-control" type="text" maxlength="30"> <input name="drawInfo-DRAWNAME" placeholder="活动名称" class="form-control" type="text" maxlength="30">
</div> </div>
</div> </div>
</div> </div>
@ -241,7 +241,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">状态：</label> <label class="col-sm-4 control-label is-required">状态：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="STATUS" class="form-control" th:with="type=${@dict.getType('start_stop')}"> <select name="drawInfo-STATUS" class="form-control" th:with="type=${@dict.getType('start_stop')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" ></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" ></option>
</select> </select>
</div> </div>
@ -253,7 +253,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">消耗对象：</label> <label class="col-sm-4 control-label is-required">消耗对象：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="EXPENO" class="form-control" th:with="type=${@dict.getType('expeType')}"> <select name="drawInfo-EXPENO" class="form-control" th:with="type=${@dict.getType('expeType')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" ></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" ></option>
</select> </select>
</div> </div>
@ -263,7 +263,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">消耗价值：</label> <label class="col-sm-4 control-label is-required">消耗价值：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="EXPENOVALUE" placeholder="消耗价值" class="form-control" type="text" maxlength="30"> <input name="drawInfo-EXPENOVALUE" placeholder="消耗价值" class="form-control" type="text" maxlength="30">
</div> </div>
</div> </div>
</div> </div>
@ -274,7 +274,7 @@
<label class="col-sm-4 control-label is-required">开始时间：</label> <label class="col-sm-4 control-label is-required">开始时间：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group date"> <div class="input-group date">
<input name="STARTTIME" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" type="text"> <input name="drawInfo-STARTTIME" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div> </div>
</div> </div>
@ -981,7 +981,7 @@
.addClass('btn btn-info') .addClass('btn btn-info')
.on('click', function () { .on('click', function () {
//添加保存逻辑 //添加保存逻辑
var data = $("#form-info-add").serialize(); var data = customSerialize("form-info-add",false);
alert(data); alert(data);
}); });
var btnCancel = $('<a id="btn-cancel"></a>').text('取消') var btnCancel = $('<a id="btn-cancel"></a>').text('取消')