mirror of
https://gitee.com/dotnetchina/OpenAuth.Net.git
synced 2025-07-18 22:35:58 +08:00
fix css bugs
This commit is contained in:
parent
d5d476bae4
commit
96e8eec1e7
@ -161,12 +161,21 @@ function detail() {
|
|||||||
if (selected == null) {
|
if (selected == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$(this).dialog({
|
BJUI.dialog({
|
||||||
id: 'detailDlg',
|
id: 'detailDlg',
|
||||||
url: '/GoodsApplies/Detail?id=' + selected.Id,
|
url: '/GoodsApplies/Detail?id=' + selected.Id,
|
||||||
title: '进度详情',
|
title: '进度详情',
|
||||||
width: 800,
|
width: 800,
|
||||||
height:600
|
height: 600,
|
||||||
|
mask:true
|
||||||
|
});
|
||||||
|
$(document)
|
||||||
|
.on('bjui.beforeCloseDialog',
|
||||||
|
function(e) {
|
||||||
|
var $dialog = $(e.target);
|
||||||
|
if ($dialog.id == "detailDlg") {
|
||||||
|
list.reload();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -39,9 +39,8 @@ $(function () {
|
|||||||
$(".btn-cmd")
|
$(".btn-cmd")
|
||||||
.on("click", function () { //执行命令
|
.on("click", function () { //执行命令
|
||||||
$.post("/GoodsApplies/ExeCmd?id=" +$("#processId").val() +"&cmd=" +$(this).val() ,
|
$.post("/GoodsApplies/ExeCmd?id=" +$("#processId").val() +"&cmd=" +$(this).val() ,
|
||||||
{ name: "John", time: "2pm" },
|
|
||||||
function (data) {
|
function (data) {
|
||||||
console.log("Data Loaded: " + data);
|
BJUI.dialog('refresh', 'detailDlg');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -65,6 +65,9 @@ namespace OpenAuth.Mvc.Controllers
|
|||||||
return View();
|
return View();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 删除申请
|
||||||
|
/// </summary>
|
||||||
public string Delete(Guid id)
|
public string Delete(Guid id)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@ -81,6 +84,9 @@ namespace OpenAuth.Mvc.Controllers
|
|||||||
return JsonHelper.Instance.Serialize(BjuiResponse);
|
return JsonHelper.Instance.Serialize(BjuiResponse);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 执行命令
|
||||||
|
/// </summary>
|
||||||
[HttpPost]
|
[HttpPost]
|
||||||
public string ExeCmd(Guid id, string cmd)
|
public string ExeCmd(Guid id, string cmd)
|
||||||
{
|
{
|
||||||
@ -125,7 +131,10 @@ namespace OpenAuth.Mvc.Controllers
|
|||||||
foreach (var workflowCommand in commands) //去除相同的
|
foreach (var workflowCommand in commands) //去除相同的
|
||||||
{
|
{
|
||||||
if (result.Count(c => c.Key == workflowCommand.CommandName) == 0)
|
if (result.Count(c => c.Key == workflowCommand.CommandName) == 0)
|
||||||
result.Add(new CommandModel() { Key = workflowCommand.CommandName, Value = workflowCommand.LocalizedName, Classifier = workflowCommand.Classifier });
|
result.Add(new CommandModel {
|
||||||
|
Key = workflowCommand.CommandName,
|
||||||
|
Value = workflowCommand.LocalizedName,
|
||||||
|
Classifier = workflowCommand.Classifier });
|
||||||
}
|
}
|
||||||
return result.ToArray();
|
return result.ToArray();
|
||||||
}
|
}
|
||||||
|
@ -3,9 +3,7 @@
|
|||||||
}
|
}
|
||||||
@model OpenAuth.App.ViewModel.GoodsApplyVM
|
@model OpenAuth.App.ViewModel.GoodsApplyVM
|
||||||
|
|
||||||
<script src="/Scripts/jquery.js"></script>
|
|
||||||
<script src="/Scripts/jquery-ui.js"></script>
|
<script src="/Scripts/jquery-ui.js"></script>
|
||||||
<link href="/Content/style.css" rel="stylesheet" />
|
|
||||||
<link href="/Content/themes/base/jquery-ui.min.css" rel="stylesheet" />
|
<link href="/Content/themes/base/jquery-ui.min.css" rel="stylesheet" />
|
||||||
<script src="/Scripts/kinetic-v5.1.0.min.js"></script>
|
<script src="/Scripts/kinetic-v5.1.0.min.js"></script>
|
||||||
<link href="/Content/workflowdesigner.css" rel="stylesheet" type="text/css" />
|
<link href="/Content/workflowdesigner.css" rel="stylesheet" type="text/css" />
|
||||||
@ -13,7 +11,6 @@
|
|||||||
<script src="/Scripts/ace.js"></script>
|
<script src="/Scripts/ace.js"></script>
|
||||||
<script src="/Scripts/json5.js"></script>
|
<script src="/Scripts/json5.js"></script>
|
||||||
|
|
||||||
|
|
||||||
<div class="bjui-pageContent">
|
<div class="bjui-pageContent">
|
||||||
<input value="@Model.Id" id="processId" class="hidden"/>
|
<input value="@Model.Id" id="processId" class="hidden"/>
|
||||||
<span class="h1">@Model.Name</span>
|
<span class="h1">@Model.Name</span>
|
||||||
|
Loading…
Reference in New Issue
Block a user