diff --git a/OpenAuth.Mvc/BllScripts/flowInstance.js b/OpenAuth.Mvc/BllScripts/flowInstance.js index 44e43815..c20ceb0a 100644 --- a/OpenAuth.Mvc/BllScripts/flowInstance.js +++ b/OpenAuth.Mvc/BllScripts/flowInstance.js @@ -133,9 +133,6 @@ function MainGrid() { MainGrid.prototype = new Grid(); var list = new MainGrid(); -var vm = new Vue({ - el: "#editDlg" -}); //删除 diff --git a/OpenAuth.Mvc/Content/scripts/utils/learun-flowlayout.js b/OpenAuth.Mvc/Content/scripts/utils/learun-flowlayout.js index 998fa511..034247e0 100644 --- a/OpenAuth.Mvc/Content/scripts/utils/learun-flowlayout.js +++ b/OpenAuth.Mvc/Content/scripts/utils/learun-flowlayout.js @@ -233,10 +233,10 @@ $.fn.flowdesign = function (options) { } if (item.setInfo != undefined && item.setInfo.Taged != undefined) { - var _one = top.clientuserData[item.setInfo.UserId]; + // var _one = top.clientuserData[item.setInfo.UserId]; var _row = '
'; var tagname = { "-1": "不通过", "1": "通过", "0": "驳回" }; - _row += "

处理人:" + (_one == undefined ? item.setInfo.UserId : _one.RealName)+"

"; + _row += "

处理人:" + ( item.setInfo.UserId )+"

"; _row += "

结果:" + tagname[item.setInfo.Taged] + "

"; _row += "

处理时间:" + item.setInfo.TagedTime + "

"; _row += "

备注:" + item.setInfo.description + "

"; diff --git a/数据库设计关系图/OpenAuthDB.pdm b/数据库设计关系图/OpenAuthDB.pdm index c13cb75a..70ed6012 100644 --- a/数据库设计关系图/OpenAuthDB.pdm +++ b/数据库设计关系图/OpenAuthDB.pdm @@ -1,5 +1,5 @@ - + @@ -3967,7 +3967,7 @@ PhysOpts= [ModelOptions\Default Opts\FRMESOB<<WorkloadGroup>>] PhysOpts= -F:\测试学习\OpenAuth.Net\数据库设计关系图\OpenAuthDB.pdm +E:\测试学习\OpenAuth.Net\数据库设计关系图\OpenAuthDB.pdm 9401CEBA-B163-4ADB-AECF-03CE78C0FFF3 @@ -4609,7 +4609,7 @@ Shadow=0 1445621646 1486308596 -((-15716,-28159), (-4617,-13633)) +((-15603,-28159), (-4729,-13633)) ((-11287,-28159),(-11287,-20119),(-9046,-20119),(-9046,-13633)) 1 1 @@ -9033,11 +9033,11 @@ Drop=No DE36EC8C-B1A8-4CFB-BDAB-F4E08C313A9A -有效标志 +有效标志(0暂停,1正常运行,3草稿) EnabledMark 1484907080 Administrator -1484907080 +1486343456 Administrator 有效标志 int @@ -9120,11 +9120,11 @@ Drop=No 3BF01F73-EB94-4203-89D5-CE7846D81E4E -是否完成 +是否完成(0运行中,1运行结束,2被召回,3不同意,4表示被驳回) isFinish 1484907080 Administrator -1484907080 +1486343481 Administrator 是否完成 int