diff --git a/CCFlow/CCFlow/WF/Admin/AttrFlow/Imp.htm b/CCFlow/CCFlow/WF/Admin/AttrFlow/Imp.htm index 1ef094ae..44b2f790 100644 --- a/CCFlow/CCFlow/WF/Admin/AttrFlow/Imp.htm +++ b/CCFlow/CCFlow/WF/Admin/AttrFlow/Imp.htm @@ -184,15 +184,16 @@
  • - + +
  • - +
  • - - 请输入指定的流程编号: - + + +
  • diff --git a/CCFlow/CCFlow/WF/Admin/FoolFormDesigner/NewFrmGuide.htm b/CCFlow/CCFlow/WF/Admin/FoolFormDesigner/NewFrmGuide.htm index a3fd1310..5fa3309a 100644 --- a/CCFlow/CCFlow/WF/Admin/FoolFormDesigner/NewFrmGuide.htm +++ b/CCFlow/CCFlow/WF/Admin/FoolFormDesigner/NewFrmGuide.htm @@ -55,8 +55,9 @@
    - - + + +
    diff --git a/CCFlow/CCFlow/WF/WorkOpt/CC.htm b/CCFlow/CCFlow/WF/WorkOpt/CC.htm index abba25e5..ba0c3464 100644 --- a/CCFlow/CCFlow/WF/WorkOpt/CC.htm +++ b/CCFlow/CCFlow/WF/WorkOpt/CC.htm @@ -328,7 +328,7 @@ 帮助? diff --git a/CCFlow/CCFlow/WF/WorkOpt/Shift.htm b/CCFlow/CCFlow/WF/WorkOpt/Shift.htm index 98f416ed..d89ae074 100644 --- a/CCFlow/CCFlow/WF/WorkOpt/Shift.htm +++ b/CCFlow/CCFlow/WF/WorkOpt/Shift.htm @@ -212,9 +212,9 @@
    - diff --git a/CCFlow/Components/BP.WF/HttpHandler/WF_MyView.cs b/CCFlow/Components/BP.WF/HttpHandler/WF_MyView.cs index 807a39d8..b0bed75e 100644 --- a/CCFlow/Components/BP.WF/HttpHandler/WF_MyView.cs +++ b/CCFlow/Components/BP.WF/HttpHandler/WF_MyView.cs @@ -478,8 +478,12 @@ namespace BP.WF.HttpHandler } #endregion //加载自定义的button. - #region BKGY 发起人在流程运行时可以增加发起人,不止在当前节点 - if (gwf.WFState == WFState.Runing && gwf.Starter == WebUser.No) + #region BKGY 流程参与人在流程运行时可以操作知会,不止在当前节点 + string emps = gwf.Emps; + if (DataType.IsNullOrEmpty(emps) == false) + emps += "@"; + bool isWorker = gwf.Emps.Contains("@" + WebUser.No + "," + WebUser.Name); + if (gwf.WFState == WFState.Runing && isWorker == true) { //抄送 dr = dt.NewRow();