lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2026-04-08 01:51:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

check bugs

Browse Source
This commit is contained in:
yubaolee
2018-03-26 14:11:07 +08:00
parent 304e465b6b
commit e00de72ffc
13 changed files with 134 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenAuth.Mvc/Controllers/FlowInstancesController.cs
View File

@@ -5,6 +5,7 @@ using Infrastructure;
using Newtonsoft.Json.Linq;
using OpenAuth.App;
using OpenAuth.App.Request;
using OpenAuth.App.Response;
using OpenAuth.Mvc.Models;
using OpenAuth.Repository.Domain;
@@ -51,7 +52,12 @@ namespace OpenAuth.Mvc.Controllers
{
try
{
var result = new Response<FlowInstance> { Result = App.Get(id) };
var flowinstance = App.Get(id);
var result = new Response<FlowVerificationResp>
{
Result = flowinstance.MapTo<FlowVerificationResp>()
};
return JsonHelper.Instance.Serialize(result);
}
catch (Exception ex)

3
OpenAuth.Mvc/Views/FlowInstances/Index.cshtml
View File

@@ -15,9 +15,8 @@
<tr>
<th lay-data="{checkbox:true, fixed: true}"></th>
<th lay-data="{field:'Id', width:150}">主键Id</th>
<th lay-data="{field:'InstanceSchemeId', width:150}">流程实例模板Id</th>
<th lay-data="{field:'CustomName', width:150}">实例名称</th>
<th lay-data="{field:'Code', width:150}">实例编号</th>
<th lay-data="{field:'CustomName', width:150}">自定义名称</th>
<th lay-data="{field:'ActivityId', width:150}">当前节点ID</th>
<th lay-data="{field:'ActivityType', width:150}">当前节点类型（0会签节点）</th>
<th lay-data="{field:'ActivityName', width:150}">当前节点名称</th>

10
OpenAuth.Mvc/Views/FlowInstances/Verification.cshtml
View File

@@ -26,20 +26,20 @@
</div>
</div>
<input type="hidden" id="FlowInstanceId" name="FlowInstanceId" v-model="FlowInstanceId" />
<input type="hidden" id="FlowInstanceId" name="FlowInstanceId" />
<div class="layui-form-item">
<label class="layui-form-label">审核结果</label>
<div class="layui-input-block">
<input type="radio" name="VerificationFinally" v-model="VerificationFinally" value="1" title="同意" checked>
<input type="radio" name="VerificationFinally" v-model="VerificationFinally" value="2" title="不同意">
<input type="radio" name="VerificationFinally" v-model="VerificationFinally" value="3" title="驳回">
<input type="radio" name="VerificationFinally" value="1" title="同意" checked>
<input type="radio" name="VerificationFinally" value="2" title="不同意">
<input type="radio" name="VerificationFinally" value="3" title="驳回">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">审核意见</label>
<div class="layui-input-block">
<input type="text" name="VerificationOpinion" v-model="VerificationOpinion"
<input type="text" name="VerificationOpinion"
placeholder="" autocomplete="off" class="layui-input">
</div>
</div>

3
OpenAuth.Mvc/js/flow/GooFlow.js
View File

@@ -1601,7 +1601,8 @@ GooFlow.prototype={
},
//载入一组数据
loadData:function(data){
loadData: function (data) {
this.clearData(); //载入之前先清空数据 yubaolee
var t=this.$editable;
this.$editable=false;
if(data.title) this.setTitle(data.title);

7
OpenAuth.Mvc/userJs/flowInstanceEdit.js
View File

@@ -79,8 +79,11 @@
callback: {
onClick: function (event, treeId, treeNode) {
//预览表单
$.get("/forms/previewdata?id=" + treeNode.FrmId, function (data) {
$("#frmPreview").html(data);
//取表单的结构数据
$.getJSON("/forms/get?id=" + treeNode.FrmId, function (data) {
if (data.Code != 500) {
$("#frmPreview").html(data.Result.Html);
}
});
//预览流程

14
OpenAuth.Mvc/userJs/flowInstanceOp.js
View File

@@ -8,11 +8,7 @@
var openauth = layui.openauth;
var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
var vm = new Vue({
el: "#formEdit"
});
var id = $.getUrlParam("id"); //ID
var id = $.getUrlParam("id"); //ID
$("#FlowInstanceId").val(id);
//标签切换
@@ -32,13 +28,7 @@
function (data) {
var obj = data.Result;
flowDesignPanel.loadData(JSON.parse(obj.SchemeContent));
//取表单的结构数据
$.getJSON("/forms/get?id=" + obj.FrmId, function (data) {
if (data.Code != 500) {
$("#frmPreview").html(data.Result.Html);
}
});
$("#frmPreview").html(data.Result.FrmDataHtml);
});
//提交数据

8
OpenAuth.Mvc/userJs/flowInstances.js
View File

@@ -78,6 +78,10 @@
var iframeWin = window[layero.find('iframe')[0]['name']]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
iframeWin.submit();
},
btn2: function (index) {
layer.close(index);
mainList();
},
cancel: function (index) {
layer.close(index);
mainList();
@@ -147,6 +151,10 @@
var iframeWin = window[layero.find('iframe')[0]['name']]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
iframeWin.submit();
},
btn2: function (index) {
layer.close(index);
mainList();
},
cancel: function (index) {
layer.close(index);
mainList();

4
OpenAuth.Mvc/userJs/flowSchemeDesign.js
View File

@@ -76,8 +76,8 @@
var node = zTreeObj.getNodeByParam("Id", id, null);
zTreeObj.checkNode(node, true, false);
$.get("/forms/previewdata?id=" + id, function (data) {
$("#frmPreview").html(data);
$.getJSON("/forms/get?id=" + id, function (data) {
$("#frmPreview").html(data.Result.Html);
});
}

6
OpenAuth.Mvc/userJs/flowSchemes.js
View File

@@ -80,7 +80,11 @@
var iframeWin = window[layero.find('iframe')[0]['name']]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
iframeWin.submit();
},
no: function (index) {
btn2: function (index) {
layer.close(index);
mainList();
},
cancel: function (index) {
layer.close(index);
mainList();
}