routine update

This commit is contained in:
yubao
2018-03-15 07:19:48 +08:00
parent 0c2cb7911d
commit 19f778acfa
2 changed files with 27 additions and 16 deletions

View File

@@ -74,6 +74,8 @@
height: 500, height: 500,
widht: 700, widht: 700,
OpenNode: function (object) { OpenNode: function (object) {
FlowDesignObject = object;
if (object.$nodeData[object.$focus].type == 'startround') { if (object.$nodeData[object.$focus].type == 'startround') {
return false; return false;
} }
@@ -90,6 +92,7 @@
var iframeWin = window[layero.find('iframe')[0]['name']]; //得到iframe页的窗口对象执行iframe页的方法iframeWin.method(); var iframeWin = window[layero.find('iframe')[0]['name']]; //得到iframe页的窗口对象执行iframe页的方法iframeWin.method();
var nodedata = iframeWin.getVal(); var nodedata = iframeWin.getVal();
flowDesignPanel.SetNodeEx(object.$focus, nodedata); flowDesignPanel.SetNodeEx(object.$focus, nodedata);
layer.close(index);
}, },
cancel: function (index) { cancel: function (index) {
layer.close(index); layer.close(index);

View File

@@ -4,13 +4,28 @@ layui.config({
var //layer = (parent == undefined || parent.layer === undefined )? layui.layer : parent.layer, var //layer = (parent == undefined || parent.layer === undefined )? layui.layer : parent.layer,
layer = layui.layer, layer = layui.layer,
$ = layui.jquery; $ = layui.jquery;
var users = []; //节点的执行人
var users = []; var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
//从flowschemes.js进入的节点信息
var _FlowDesignObject = parent.FlowDesignObject;
var node = _FlowDesignObject.$nodeData[_FlowDesignObject.$focus];
node.id = _FlowDesignObject.$focus;
var vm = new Vue({
el: "#formEdit"
});
//初始化节点设置信息
if (node.setInfo != null) {
vm.$set('$data', node.setInfo);
users = node.setInfo.NodeDesignateData.users;
}
//菜单列表 //菜单列表
var menucon = {}; //table的参数如搜索key点击tree的id var menucon = {}; //table的参数如搜索key点击tree的id
//菜单树状列表等lay table没问题了可以换成table //副树状结构等lay table没问题了可以换成table
var menutree = function () { var subtree = function () {
var url = '/UserManager/Load'; var url = '/UserManager/Load';
var menuTree; var menuTree;
var setting = { var setting = {
@@ -82,7 +97,7 @@ layui.config({
}, },
callback: { callback: {
onClick: function (event, treeId, treeNode) { onClick: function (event, treeId, treeNode) {
menutree.load({ orgId: treeNode.Id }); subtree.load({ orgId: treeNode.Id });
} }
} }
}; };
@@ -92,7 +107,7 @@ layui.config({
var newNode = { Name: "全部", Id: null, ParentId: "" }; var newNode = { Name: "全部", Id: null, ParentId: "" };
json.push(newNode); json.push(newNode);
zTreeObj.addNodes(null, json); zTreeObj.addNodes(null, json);
menutree.load({ orgId: '' }); subtree.load({ orgId: '' });
zTreeObj.expandAll(true); zTreeObj.expandAll(true);
}); });
}; };
@@ -102,15 +117,6 @@ layui.config({
} }
}(); }();
var vm = new Vue({
el: "#formEdit"
});
var _FlowDesignObject = parent.FlowDesignObject;
node = _FlowDesignObject.$nodeData[_FlowDesignObject.$focus];
node.id = _FlowDesignObject.$focus;
vm.set($data.node.setInfo);
//提供给上父页面调用 //提供给上父页面调用
getVal = function () { getVal = function () {
var result = { var result = {
@@ -126,4 +132,6 @@ layui.config({
return result; return result;
} }
//让层自适应iframe
parent.layer.iframeAuto(index);
}) })