routine update

This commit is contained in:
yubaolee 2016-10-27 15:14:32 +08:00
parent 53f7fe403b
commit be47dc50ea
6 changed files with 38 additions and 17 deletions

View File

@ -181,17 +181,16 @@ function detail() {
if (selected == null) {
return;
}
BJUI.dialog({
id: 'detailDlg',
url: '/CommonApplies/Detail?id=' + selected.Id,
title: '进度详情',
width: 900,
height: 600,
mask:true
layer.open({
type: 2,
skin: 'layui-layer-rim', //加上边框
area: ['800px', '600px'], //宽高
content: '/CommonApplies/Detail?id=' + selected.Id,
end:function() {
list.reload();
}
});
$(document).on('bjui.beforeCloseDialog',function(e) {
list.reload();
});
}
function add() {

View File

@ -73,12 +73,23 @@ function edit() {
if (selected == null) {
return;
}
window.location = '/designer/index?schemeName=' + selected.Code;
layer.open({
type: 2,
skin: 'layui-layer-rim', //加上边框
area: ['800px', '600px'], //宽高
content: '/designer/index?schemeName=' + selected.Code
});
}
function add() {
window.location = '/designer/index?schemeName=';
layer.open({
type: 2,
skin: 'layui-layer-rim', //加上边框
area: ['800px', '600px'], //宽高
content: '/designer/index?schemeName='
});
}

File diff suppressed because one or more lines are too long

View File

@ -274,6 +274,7 @@
<Content Include="Content\ace\js\src\elements.typeahead.js" />
<Content Include="Content\ace\js\src\elements.wizard.js" />
<Content Include="Content\ace\js\src\elements.wysiwyg.js" />
<Content Include="Content\jquery-ui.min.css" />
<Content Include="Content\layui\css\layui.css" />
<Content Include="Content\layui\css\mobile.css" />
<Content Include="Content\layui\css\modules\code.css" />

View File

@ -4,14 +4,17 @@
@using OptimaJet.Workflow.Core.Model
@model OpenAuth.App.ViewModel.CommonApplyVM
<script src="/Scripts/jquery.js"></script>
<script src="/Scripts/jquery-ui.js"></script>
<link href="/Content/themes/base/jquery-ui.min.css" rel="stylesheet" />
<link href="/Content/style.css" rel="stylesheet" />
<link href="/Content/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" />
<script src="/Scripts/workflowdesigner.min.js"></script>
<script src="/Scripts/designerconstants.js"></script>
<script src="/Scripts/ace.js"></script>
<script src="/Scripts/json5.js"></script>
<script src="/BllScripts/queryString.js"></script>
<div class="row">
<div class="col-md-12">
@ -32,11 +35,11 @@
{
if (cmd.Classifier == TransitionClassifier.Reverse)
{
<button type="button" class="btn btn-danger btn-cmd" value="@cmd.Key">@cmd.Value</button>
<button class="btn btn-sm btn-danger" value="@cmd.Key">@cmd.Value</button>
}
else
{
<button type="button" class="btn btn-primary btn-cmd" value="@cmd.Key">@cmd.Value</button>
<button class="btn btn-sm btn-success" value="@cmd.Key">@cmd.Value</button>
}
}
</div>

View File

@ -5,7 +5,7 @@
<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" />
<link href="/Content/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" />
<script src="/Scripts/workflowdesigner.min.js"></script>