优化驳回流程;

优化节点执行人;
发现了layui select/radio/checkbox赋值的蛋疼问题
This commit is contained in:
yubao
2018-03-31 11:18:57 +08:00
parent fbe107789a
commit 82383b1da5
7 changed files with 41 additions and 32 deletions

View File

@@ -1,24 +1,13 @@
using System;
using System.Linq;
using OpenAuth.App.Request;
using OpenAuth.App.Response;
using OpenAuth.Repository.Domain;
namespace OpenAuth.App
{
/// <summary>
/// 流程设计服务
/// <para>李玉宝新增于2017-01-16 16:18:35</para>
/// </summary>
public class FlowSchemeApp :BaseApp<FlowScheme>
{
public void UpdateState(string keyValue, int state)
{
throw new NotImplementedException();
}
public void Add(FlowScheme flowScheme)
{
Repository.Add(flowScheme);
@@ -31,7 +20,8 @@ namespace OpenAuth.App
SchemeContent = flowScheme.SchemeContent,
SchemeName = flowScheme.SchemeName,
ModifyDate = DateTime.Now,
FrmId = flowScheme.FrmId
FrmId = flowScheme.FrmId,
Disabled = flowScheme.Disabled
});
}

View File

@@ -34,26 +34,18 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">模板权限类型0所有人,1指定成员</label>
<div class="layui-input-block">
<input type="radio" name="AuthorizeType" value="1" title="value1" checked>
<input type="radio" name="AuthorizeType" value="0" title="value2">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">排序码</label>
<div class="layui-input-block">
<input type="radio" name="SortCode" value="1" title="value1" checked>
<input type="radio" name="SortCode" value="0" title="value2">
<input type="text" name="SortCode" v-model="SortCode" required lay-verify="required" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">有效</label>
<label class="layui-form-label">禁用</label>
<div class="layui-input-block">
<input type="radio" name="Disabled" value="1" title="value1" checked>
<input type="radio" name="Disabled" value="0" title="value2">
<input type="checkbox" value="1" v-model="Disabled" name="Disabled"
lay-skin="switch" lay-text="是|否">
</div>
</div>
<div class="layui-form-item">

View File

@@ -31,7 +31,7 @@
<div class="layui-form-item">
<label class="layui-form-label">驳回类型</label>
<div class="layui-input-block">
<select name="NodeRejectType" v-model="NodeRejectType" required lay-verify="required">
<select id="NodeRejectType" name="NodeRejectType" v-model="NodeRejectType" required lay-verify="required">
<option value="0">上一步</option>
<option value="1">第一步</option>
<option value="2">指定步骤</option>
@@ -51,8 +51,8 @@
<div class="layui-tab-item">
<div class="layui-row">
<div class="layui-input-block">
<input type="radio" name="NodeDesignate" v-model="NodeDesignate" value="SPECIAL_USER" title="指定用户" checked>
<input type="radio" name="NodeDesignate" v-model="NodeDesignate" value="ALL_USER" title="所有用户">
<input type="radio" name="NodeDesignate" v-model="NodeDesignate" lay-filter="NodeDesignate" value="SPECIAL_USER" title="指定用户" checked>
<input type="radio" name="NodeDesignate" v-model="NodeDesignate" lay-filter="NodeDesignate" value="ALL_USER" title="所有用户">
</div>
</div>
<div class="layui-row">

View File

@@ -79,7 +79,7 @@ tpwidget("init", {
<dd><a href="javascript:;" data-url="page/user/userInfo.html"><i class="iconfont icon-zhanghu" data-icon="icon-zhanghu"></i><cite>个人资料</cite></a></dd>
<dd><a href="javascript:;" data-url="page/user/changePwd.html"><i class="iconfont icon-shezhi1" data-icon="icon-shezhi1"></i><cite>修改密码</cite></a></dd>
<dd><a href="javascript:;" class="changeSkin"><i class="iconfont icon-huanfu"></i><cite>更换皮肤</cite></a></dd>
<dd><a href="page/login/login.html" class="signOut"><i class="iconfont icon-loginout"></i><cite>退出</cite></a></dd>
<dd><a href="/Login/Logout" class="signOut"><i class="iconfont icon-loginout"></i><cite>退出</cite></a></dd>
</dl>
</li>
</ul>

View File

@@ -1,4 +1,5 @@
layui.config({
/// <reference path="flowInstanceOp.js" />
layui.config({
base: "/js/"
}).use(['form', 'vue', 'ztree', 'layer', 'utils', 'element', 'jquery', 'table', 'droptree', 'openauth', 'flow/gooflow', 'flowlayout'], function () {
var form = layui.form, element = layui.element,
@@ -104,7 +105,7 @@
maxmin: true, //开启最大化最小化按钮
title: '节点设置【' + object.name + '】',
content: '/flowschemes/nodeInfo',
btn: ['保存', '关闭'],
btn: ['确定', '取消'],
yes: function (index, layero) {
var body = layer.getChildFrame('body', index);
var iframeWin = window[layero.find('iframe')[0]['name']]; //得到iframe页的窗口对象执行iframe页的方法iframeWin.method();
@@ -130,6 +131,10 @@
var obj = data.Result;
url = "/FlowSchemes/Update";
vm.$set('$data', obj);
$('input:checkbox[name="Disabled"][value="' + obj.Disabled + '"]').prop('checked', true);
form.render();
flowDesignPanel.loadData(JSON.parse(obj.SchemeContent));
frmTree.setCheck(obj.FrmId);
});
@@ -137,6 +142,8 @@
vm.$set('$data',
{
Id: ''
, SchemeCode: new Date().getTime()
, SortCode:'1'
});
}

View File

@@ -4,6 +4,7 @@ layui.config({
var //layer = (parent == undefined || parent.layer === undefined )? layui.layer : parent.layer,
layer = layui.layer,
$ = layui.jquery;
var form = layui.form;
var users = []; //节点的执行人
var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
@@ -12,15 +13,34 @@ layui.config({
console.log(JSON.stringify(node));
var vm = new Vue({
el: "#formEdit"
el: "#formEdit",
data: {
NodeName: node.name
,NodeCode: node.name //默认的code
}
});
//初始化节点设置信息
if (node.setInfo != null) {
vm.$set('$data', node.setInfo);
users = node.setInfo.NodeDesignateData.users;
//layui与vue不兼容要重新赋值select radio(lll¬ω¬)
$("#NodeRejectType").val(node.setInfo.NodeRejectType);
$(":radio[name='NodeDesignate'][value='" + node.setInfo.NodeDesignate + "']").prop("checked", "checked");
form.render();
}
form.on('select',
function (data) {
vm.NodeRejectType = data.value;
});
form.on('radio(NodeDesignate)',
function (data) {
vm.NodeDesignate = data.value;
});
//菜单列表
var menucon = {}; //table的参数如搜索key点击tree的id
//副树状结构等lay table没问题了可以换成table

Binary file not shown.