fix css bugs

This commit is contained in:
yubaolee 2016-09-06 10:55:55 +08:00
parent d5d476bae4
commit 96e8eec1e7
4 changed files with 22 additions and 8 deletions

View File

@ -161,13 +161,22 @@ function detail() {
if (selected == null) {
return;
}
$(this).dialog({
BJUI.dialog({
id: 'detailDlg',
url: '/GoodsApplies/Detail?id=' + selected.Id,
title: '进度详情',
width: 800,
height:600
height: 600,
mask:true
});
$(document)
.on('bjui.beforeCloseDialog',
function(e) {
var $dialog = $(e.target);
if ($dialog.id == "detailDlg") {
list.reload();
}
});
}
function add() {

View File

@ -39,9 +39,8 @@ $(function () {
$(".btn-cmd")
.on("click", function () { //执行命令
$.post("/GoodsApplies/ExeCmd?id=" +$("#processId").val() +"&cmd=" +$(this).val() ,
{ name: "John", time: "2pm" },
function (data) {
console.log("Data Loaded: " + data);
BJUI.dialog('refresh', 'detailDlg');
});
});
});

View File

@ -65,6 +65,9 @@ namespace OpenAuth.Mvc.Controllers
return View();
}
/// <summary>
/// 删除申请
/// </summary>
public string Delete(Guid id)
{
try
@ -81,6 +84,9 @@ namespace OpenAuth.Mvc.Controllers
return JsonHelper.Instance.Serialize(BjuiResponse);
}
/// <summary>
/// 执行命令
/// </summary>
[HttpPost]
public string ExeCmd(Guid id, string cmd)
{
@ -125,7 +131,10 @@ namespace OpenAuth.Mvc.Controllers
foreach (var workflowCommand in commands) //去除相同的
{
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();
}

View File

@ -3,9 +3,7 @@
}
@model OpenAuth.App.ViewModel.GoodsApplyVM
<script src="/Scripts/jquery.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" />
<script src="/Scripts/kinetic-v5.1.0.min.js"></script>
<link href="/Content/workflowdesigner.css" rel="stylesheet" type="text/css" />
@ -13,7 +11,6 @@
<script src="/Scripts/ace.js"></script>
<script src="/Scripts/json5.js"></script>
<div class="bjui-pageContent">
<input value="@Model.Id" id="processId" class="hidden"/>
<span class="h1">@Model.Name</span>