diff --git a/erp_web/pages/manage/app.html b/erp_web/pages/manage/app.html
index 591755e7..f254e044 100644
--- a/erp_web/pages/manage/app.html
+++ b/erp_web/pages/manage/app.html
@@ -369,13 +369,18 @@
if (checkAppName()) {
return;
}
+ var infoObj = $("#appFM").serializeObject();
+ infoObj.ReSize = $("#ReSize").is(':checked');
+ infoObj.OpenMax = $("#OpenMax").is(':checked');
+ infoObj.Flash = $("#Flash").is(':checked');
+ infoObj.Enabled = $("#Enabled").is(':checked');
$.ajax({
url: url,
type: "post",
dataType: "json",
fileElementId: 'Icon',
data: ({
- info: JSON.stringify($("#appFM").serializeObject())
+ info: JSON.stringify(infoObj)
}),
success: function(res) {
if(res && res.code === 200) {
@@ -420,7 +425,7 @@
appID = appInfo[0];
//焦点在名称输入框==定焦在输入文字后面
$("#name").val("").focus().val(appInfo[1]);
- url = '/depot/update?id=' + appInfo[0];
+ url = '/app/update?id=' + appInfo[0];
}
//检查名称是否存在 ++ 重名无法提示问题需要跟进
diff --git a/erp_web/pages/manage/functions.html b/erp_web/pages/manage/functions.html
index 70ce2252..619db4e0 100644
--- a/erp_web/pages/manage/functions.html
+++ b/erp_web/pages/manage/functions.html
@@ -252,12 +252,14 @@
//绑定事件
function bindEvent() {
+ var url = '/js/pages/manage/pushBtn.json';
$('#PushBtn').combobox({
- url: '/js/pages/manage/pushBtn.json',
+ url: url,
valueField: 'id',
textField: 'text',
panelHeight: 120,
- multiple: true
+ multiple: true,
+ method: 'get'
});
}
@@ -353,12 +355,17 @@
if (checkFunctionsName()) {
return;
}
+ var infoObj = $("#functionsFM").serializeObject();
+ infoObj.State = $("#State").is(':checked');
+ infoObj.Enabled = $("#Enabled").is(':checked');
+ var PushBtn = JSON.stringify($("#PushBtn").combobox('getValues'));
+ infoObj.PushBtn = PushBtn.replace(/\"/g, "").replace(/\[|]/g,"");
$.ajax({
url: url,
type: "post",
dataType: "json",
data: ({
- info: JSON.stringify($("#functionsFM").serializeObject())
+ info: JSON.stringify(infoObj)
}),
success: function(res) {
if(res && res.code === 200) {