From 6c70d7ef1c446c184402b04b1b34f77e6203b9f3 Mon Sep 17 00:00:00 2001
From: sunliang <593170460@qq.com>
Date: Fri, 8 Mar 2024 14:17:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=84=E9=80=81=E5=9C=A8?=
 =?UTF-8?q?=E4=BB=BB=E4=BD=95=E8=8A=82=E7=82=B9=E9=83=BD=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E6=8A=84=E9=80=81=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=8A=84=E9=80=81=E5=90=8E=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=EF=BC=8C=E9=9A=90=E8=97=8F=E5=87=A0=E4=B8=AA=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=8F=8A=E6=B5=81=E7=A8=8B=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CCFlow/CCFlow/WF/Admin/AttrFlow/Imp.htm               | 11 ++++++-----
 .../CCFlow/WF/Admin/FoolFormDesigner/NewFrmGuide.htm  |  5 +++--
 CCFlow/CCFlow/WF/WorkOpt/CC.htm                       |  2 +-
 CCFlow/CCFlow/WF/WorkOpt/Shift.htm                    |  4 ++--
 CCFlow/Components/BP.WF/HttpHandler/WF_MyView.cs      |  8 ++++++--
 5 files changed, 18 insertions(+), 12 deletions(-)

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 @@
                                 <input id="Import_0" type="radio" name="RB_ImpType" value="0" checked="true" /><label for="Import_0">作为新流程导入(由ccbpm自动生成新的流程编号).</label>
                             </li>
                             <li>
-                                <input id="Import_1" type="radio" name="RB_ImpType" value="1" /><label for="Import_1">作为新流程导入(使用流程模版里面的流程编号，如果该编号已经存在系统则会提示错误).</label>
+                                <!--20240308去掉BKGY-->
+                                <!--<input id="Import_1" type="radio" name="RB_ImpType" value="1" /><label for="Import_1">作为新流程导入(使用流程模版里面的流程编号，如果该编号已经存在系统则会提示错误).</label>-->
                             </li>
                             <li>
-                                <input id="Import_2" type="radio" name="RB_ImpType" value="2" /><label for="Import_2">作为新流程导入(使用流程模版里面的流程编号，如果该编号已经存在系统则会覆盖此流程).</label>
+                                <!--<input id="Import_2" type="radio" name="RB_ImpType" value="2" /><label for="Import_2">作为新流程导入(使用流程模版里面的流程编号，如果该编号已经存在系统则会覆盖此流程).</label>-->
                             </li>
                             <li>
-                                <input id="Import_3" type="radio" name="RB_ImpType" value="3" /><label for="Import_3">按指定流程编号导入.</label>
-                                请输入指定的流程编号:
-                                <input type="text" id="TB_SpecFlowNo" />
+                               <!-- <input id="Import_3" type="radio" name="RB_ImpType" value="3" /><label for="Import_3">按指定流程编号导入.</label>-->
+                                <!--请输入指定的流程编号:-->
+                                <!--<input type="text" id="TB_SpecFlowNo" />-->
                             </li>
                         </ul>
 
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 @@
     <div style=" padding:10px; padding-left:30px;">
 
         <button onclick="javascript:CreateFrm()"><img src="../../Img/New.gif" style="width:20px;">创建表单</button>
-        <button onclick="javascript:ImpFrmFromFtp()"><img src="../../Img/ftp.png" style="width:20px;">从ftp服务器导入模板</button>
-        <button onclick="javascript:ImpFrmFromLocal()"><img src="../../Img/dot.png" style="width:20px;">从本机导入模板</button>
+        <!--20240308注释BKGY-->
+        <!--<button onclick="javascript:ImpFrmFromFtp()"><img src="../../Img/ftp.png" style="width:20px;">从ftp服务器导入模板</button>-->
+        <!--<button onclick="javascript:ImpFrmFromLocal()"><img src="../../Img/dot.png" style="width:20px;">从本机导入模板</button>-->
 
         <!--<input style="margin-left:10px;" onclick="ImpFrmFromLocal()" type="button" value="从本机导入模板" />-->
     </div>
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 @@
             </button>
 
             <button onclick="closeWin();" id="Btn_Close">
-                <img src="../Img/Btn/Close.png" /> 关闭
+                <img src="../Img/Btn/Close.png" /> 知会并关闭
             </button>
 
             <a href="javascript:Help()">帮助?</a>
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 @@
             <textarea name="Message" id="Message" rows="4" style="vertical-align: top; width: 100%; height: 20vh;" placeholder="请输入" class="layui-textarea"></textarea>
         </div>
         <div class="btn--cg-orientation">
-            <button type="button" onclick="Close();" class="layui-btn layui-btn-primary">
+            <!--<button type="button" onclick="Close();" class="layui-btn layui-btn-primary">
                 <img src="../Img/Btn/Close.png" />关闭
-            </button>
+            </button>-->
             <button type="button" onclick="Save();" class="layui-btn layui-btn-normal">
                 确定移交
             </button>
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();