From 82383b1da519529190870f8f418ef2859b442342 Mon Sep 17 00:00:00 2001
From: yubao <yubaolee@163.com>
Date: Sat, 31 Mar 2018 11:18:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A9=B3=E5=9B=9E=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=EF=BC=9B=20=E4=BC=98=E5=8C=96=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E4=BA=BA=EF=BC=9B=20=E5=8F=91=E7=8E=B0?=
 =?UTF-8?q?=E4=BA=86layui=20select/radio/checkbox=E8=B5=8B=E5=80=BC?=
 =?UTF-8?q?=E7=9A=84=E8=9B=8B=E7=96=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenAuth.App/FlowSchemeApp.cs                 |  14 ++--------
 OpenAuth.Mvc/Views/FlowSchemes/Design.cshtml  |  16 +++---------
 .../Views/FlowSchemes/NodeInfo.cshtml         |   6 ++---
 OpenAuth.Mvc/Views/Home/Index.cshtml          |   2 +-
 OpenAuth.Mvc/userJs/flowSchemeDesign.js       |  11 ++++++--
 OpenAuth.Mvc/userJs/nodeInfo.js               |  24 ++++++++++++++++--
 建表&初始化数据.sql                           | Bin 275560 -> 278874 bytes
 7 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/OpenAuth.App/FlowSchemeApp.cs b/OpenAuth.App/FlowSchemeApp.cs
index ac2ce6df..fdb6b611 100644
--- a/OpenAuth.App/FlowSchemeApp.cs
+++ b/OpenAuth.App/FlowSchemeApp.cs
@@ -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
             });
         }
 
diff --git a/OpenAuth.Mvc/Views/FlowSchemes/Design.cshtml b/OpenAuth.Mvc/Views/FlowSchemes/Design.cshtml
index 172bbe20..0d93e0e0 100644
--- a/OpenAuth.Mvc/Views/FlowSchemes/Design.cshtml
+++ b/OpenAuth.Mvc/Views/FlowSchemes/Design.cshtml
@@ -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">
diff --git a/OpenAuth.Mvc/Views/FlowSchemes/NodeInfo.cshtml b/OpenAuth.Mvc/Views/FlowSchemes/NodeInfo.cshtml
index 0750ebd9..eb99c55d 100644
--- a/OpenAuth.Mvc/Views/FlowSchemes/NodeInfo.cshtml
+++ b/OpenAuth.Mvc/Views/FlowSchemes/NodeInfo.cshtml
@@ -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">
diff --git a/OpenAuth.Mvc/Views/Home/Index.cshtml b/OpenAuth.Mvc/Views/Home/Index.cshtml
index 4c3db780..6a9fbbc6 100644
--- a/OpenAuth.Mvc/Views/Home/Index.cshtml
+++ b/OpenAuth.Mvc/Views/Home/Index.cshtml
@@ -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>
diff --git a/OpenAuth.Mvc/userJs/flowSchemeDesign.js b/OpenAuth.Mvc/userJs/flowSchemeDesign.js
index 60f96bbf..0ddecb3e 100644
--- a/OpenAuth.Mvc/userJs/flowSchemeDesign.js
+++ b/OpenAuth.Mvc/userJs/flowSchemeDesign.js
@@ -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'
             });
     }
 
diff --git a/OpenAuth.Mvc/userJs/nodeInfo.js b/OpenAuth.Mvc/userJs/nodeInfo.js
index fe9ef4b2..77bc204a 100644
--- a/OpenAuth.Mvc/userJs/nodeInfo.js
+++ b/OpenAuth.Mvc/userJs/nodeInfo.js
@@ -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
@@ -119,7 +139,7 @@ layui.config({
     //提供给上父页面调用
     getVal = function () {
         var result = {
-             NodeDesignateData: {  //节点指定操作人
+            NodeDesignateData: {  //节点指定操作人
                 users: users,
                 role: [],
                 org: []
diff --git a/建表&初始化数据.sql b/建表&初始化数据.sql
index 7c38585cc6993835b3741923c94385c90ebf996f..3152de953130430eaa32d29b7dba56b12b746314 100644
GIT binary patch
delta 3531
zcmeHJT})GF82-*jhqW31qEMhKIA9?l{W+Yr{3NS@1Y;V6xh1*;3lyAFtbmUA6POyE
znQ_opJ?=+Vf+icfPIl(%7BkU{Wm&w?U5#xaEZK$b!oYU1U2S{cb4F=d%au1vmM^F0
zJKy)b@B4i3U%!VB)4xBKk@VM}+vGe^_snR?*=#$rGBZ9_R*jDXe=SUc1%39^tWHS0
zJ35;RMn0bqFay&(M@iS+)5V7<3;HWb@wd?UBl-RfZcxTj?k1)%11-CaaHzQz9_OaR
zncbPnkLedzB~&>B{?pYEESL<GuTi!e^Lb)qV6;{V76jrmcObnP#k@Y099Mz5Et{s1
z{a0mOPbJ2{Y^4zf+-sn$CNofJfM05Jltb1R<DXa63L~~u<(~c5m6ZBj`O4STpRE9q
z=UW85GT_$5ca_F}_!VJ|a;W*66<iSTWWuiWRxpVkFmE=&Z0)nKv!(&&y^<1aF{~g7
zy)PI*THm?|2Y<&FFemF}Q>%~+a}7F}t+T<LP8Vp^!$@6FnSAN__|ekH&i}xlR({@o
zGl5BEs(mQM-NmXfu^r6GB-Y6)Fx9)54Sy?`$hvXOjx#TQTk)#`_e7kDDA9=$4%~6d
zX|D^p5S%c;xxK~=Q5BI8WMeLbSmE~G(wJ2d#U=P~;<aoiswrnhY=G@!etcJ>LJJfQ
zWWnakQbfjrdK^g738R+}=Ms_SQdYESQ{|jj$|7=vv=ddhv+qDQX^FK(8Vd*PQFt4o
ziQB0E5`5ApL27>v9GqO6){FeQn2)uiz9Lo*3;u$&#I}gJ*%ln_Y#VE1jjWY{xqr8Q
ze9!8h$LB9zgm?NktXu3N7R1}}6h-VPj&gV~m<6H9WcZ^$GuwtcvD}b5JTp)g!%g$%
zsQ(do4iL9gRlaZ17{yOq<Y&_OwXqiDRnMALrcpd^9`HnzFF82lYHnne0;sveeK2~p
z3dv#!;MIdYaj?rZXryB`P;!XO^)C$?Hde!82xB!kkef~AU<YY%Lz0snl?#EdlXsry
zdN?__Rv8=gtV*LawcyDc(eEfA|8#^GE9T*EQv%1oYx1!UOiv32wi9O(<~AlP4wstw
zq~D1%7lyqPQIz?1{Gy!iMwAyNsz?I}#|~#~#PdX(vdas<3B}6&6D7ih5w5Gp)2bAR
zMg?l58tPK*&`D@UwtcEa@-OXE%@GGX+D8=H$%WZ7QrfbFg3sT`TfLZZrBE0uj5@Xp
zL*F2KM}$h43vEy==k5y1*jwfdC3xwUAm1_y`WiY?2M#KC7Y?oPskptk)}hj(wjkmG
zL|pBr8pU;N4YFY1xnKr;BoCG{>FRrxk=3P4dhmW8^p2Dy@E6=a;Zd$%x+XM9Xrfa+
zy$elMp?NA1GEYQ&NR1-Wq0$v`=0gmv+VJT>1jP}(3Ht}LWB5fgiET<+?%m#-2Xk*f
zx6Ff$vil}Rb2vE0ha}|SqjrP8-D>2z|8a@Nj2uVN>_i6I3@;7H4x5ddKMs`f;wZ&}
zH!}~ut++?orZrB&k)!P>wS@Wo&88M_4}OFFbQUGKLCf?{C-(f8n`lA&Ci;Ji#Na>S
z7AZJk{3Guw`sc(uEsXbML4K$tD$(s&QuVMkv^8a^m2F~;@*OiT#lm#TX1clMeEjmY
zMyf^Xg<UA3^)m}r168SrYg!ATzietOw5HXm6L+Z3QvG1Bl&!mjW^4pxmu}Y$Y!f!C
zdf7X~i@`i>Xrel<!VL%Fsh+eRN%f)GAqP=^7IBYmCf)d!&^{@%tCoDo&Ka)D=k3C&
zz8yliZwGIw8+t-|qpFj-jW(7lc5%hJ9LJee-g=fhqK@uFo^G~L-tXtd;bEC4$G`qN
z<b?@dBTwJp>GGBvJXOvg=caJxyZlIkJ75G~qCtzs_=y#uZ5P5kHH=E96M({KzkLO6
zZF2AnZXsJz*z^HEnLrKEs+W7e<VJ#)gln(zU5TJm*AY5)M?0)JTo&Se381GC8lJkI
H6h8hp4=UQ6

delta 2104
zcmds2ZA@EL7(Vw<)>7MYK?W^mrPk_V7)@_mN+H`)#BFvlr7-trEQW53Wk&ijzW!iF
zwh6?KS^DBm$jD?_Viq!t%W+<#xDYjw_%Vq;mXw)g7$ulE!~A375AnUNL+CAu{_%&o
z$+_pgAJ6-o_dNHUh0`U=%c6Gm4<pf&gUr~dsT#GPgXFNG$V*(Lfp|zQB#O6QThIt<
z>*#_B%IS*Ak%k#+<_67Inmn#SqsVU+%}}+A4;sJAslpS*t2$NWeTa_OVPe}9%vPIt
zxYDi$yASPS4nDChrKYgR+P|bG=nJ;O%`yW|KGv{BRpB-ypVUEz*b3rP_EcEU1Jz4v
zq}%N7$GA|ZbTOCqqC1@ny6FB9=6@0SXASQcs_La75YX{>qeiQCvE;N+#`}U_s0pN5
z_y=0b1I?XzAlaQIs^=FEK9eu+`JbqP-#zp}KHuy(<|W%F3{8G=lz2&m93gI0Lk*Eg
z2dN`|oOy8`L2C_uMes}Ux^Py95gp_hKAo8BCO+13PN-nENvelrS0w~4?||}22mIa@
zuaGjRJBXe1kQj;MyMfdb51fhy;rq8rVJ3DMo{j1u5G%8|5xI_Rj74<fg|67H5(#Hg
zhJ_zl)S_lTiuG=-MYN3>5^+IOycTqqOF`egT!3EIHYx-Q?MmSKY3$bxR#@rw!$89H
z&|VTGt>gfCj@Y3&@i=^&=n#t!Tbjdd#*pPr!|La64259#NvE=nS`RkIPF?~bUIFJ%
znk$sn<r4Cfde{^9ASFYg7YTcLQFoP~)Y2Xxdq`8J&Lf)FTQ0T1WKT$GOsdzMSwSjh
zUR$}+OD}f84OM-|6>m1^FH9JXS&APtNy4Ang>7!>J@I!{SnaW_fw_=pwvCv#W>p$o
zhjs}|c);54EU3q|CAz90+FwpX$NAa*kQOFi-U8w)dPct%9AF#KbMe%ik++Xs75Gxh
zR-*iSB0n@0rqK@EC=ZH65mE%l8l>+-{G%Cp9m{NJ4NA|2g35{y4<qE@M-~yx^x=2}
zE!(lDHWI>j3vNz`>?8Z}-MG&F+pGJ+5bn2TWf+=%@qZw_M}_}fR}%ajv%+h=&VQ;e
z&$@&MO8j>^Q%af@tqJvT?|S56DYMtv(UqOUy-%xQ@Qe;srzv=v_}Qh?bUPayry_HW
z(@K>KMd`=WT@QPQM2Mac`B{1A)nQ+!Ap1ILXcs%57FyZP3sfhY-li|)9PG+n$Yy2w
z1mHEsc7H-m%=8Ym%9<;5Kz#{iL*@A?I=6|_DX&b^JDWKnJcblU9BlqQ8ejwOQoB5J
zjSg)V&H{57hJ1Xocs*~JjMQ)CNtb6oq&M@}8QPu9_6@Zvu(n~x4Jtcs6!^~k37r5l
AwEzGB