提交当前本机整理版本

插件库/Lskj.PubUserTomodule/AuditPermissionControls/FrmWork.Designer.cs

@@ -401,4 +401,25 @@ namespace Lskj.PubUserTomodule.AuditPermissionControls
         private DevExpress.XtraEditors.SimpleButton btnAdd;
         private DevExpress.XtraEditors.SimpleButton btnSave;
         private DevExpress.XtraEditors.PanelControl panelControl3;
-        private System.Windows.Forms.Panel panel
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Panel plzsht;
+        private System.Windows.Forms.Panel plxllzsz;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Panel plxlsz;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Panel pllzbzsz;
+        private System.Windows.Forms.Panel PlAdd;
+        private DevExpress.XtraEditors.PanelControl panelControl5;
+        public DevExpress.XtraEditors.PanelControl panelControl1;
+        private StepPage4 stepPage41;
+        private StepPage3 stepPage31;
+        private StepPage2 stepPage21;
+        private StepPage1 stepPage11;
+        private DevExpress.XtraEditors.SimpleButton but_delete;
+        private DevExpress.XtraEditors.SimpleButton but_increase;
+        private DevExpress.XtraEditors.SimpleButton btnInsert;
+    }
+}

插件库/Lskj.PubUserTomodule/AuditPermissionControls/FrmWork.cs

@@ -631,4 +631,51 @@ namespace Lskj.PubUserTomodule.AuditPermissionControls
             if (this.stepPage41.Sp4XtraTabControl.SelectedTabPage.Name == "xtraTabPage1")//进行tabpage位置判断  
             {
                 this.but_increase.Enabled = false;
-                this.but_delete.Enabled = false
+                this.but_delete.Enabled = false;
+            }
+            if (this.stepPage41.Sp4XtraTabControl.SelectedTabPage.Name == "xtraTabPage2")
+            {
+                this.but_increase.Enabled = true;
+                this.but_delete.Enabled = true;
+            }
+
+        }
+
+        private void onBut_increase(object sender, EventArgs e)
+        {
+            this.stepPage41.onBut_increase();
+        }
+
+        private void onBut_delete(object sender, EventArgs e)
+        {
+            this.stepPage41.onBut_delete();
+        }
+
+
+
+        #endregion
+
+       
+    }
+
+
+    public enum StepEnum
+    {
+        /// <summary>
+        /// 流转步骤界面
+        /// </summary>
+        StepPage1,
+        /// <summary>
+        /// 小类设置界面
+        /// </summary>
+        StepPage2,
+        /// <summary>
+        /// 小类流转步骤界面设置
+        /// </summary>
+        StepPage3,
+        /// <summary>
+        /// 终审回退权限设置
+        /// </summary>
+        StepPage4
+    }
+}

插件库/Lskj.PubUserTomodule/AuditPermissionControls/StepPage1.cs

@@ -1217,4 +1217,38 @@ namespace Lskj.PubUserTomodule.AuditPermissionControls
                                         .DefaultIfEmpty()  // 避免空集合时抛出异常
                                         .Max();
 
-                    Code = (int)(maxStepCode + (selectedStepCode - max
+                    Code = (int)(maxStepCode + (selectedStepCode - maxStepCode) / 2);
+                }
+                BillflowModel model = new BillflowModel
+                {
+                    stepCode = Convert.ToInt32(Code),
+                    typeCode = mMenuCode,
+                    stepGroup = stepGroup,
+                    stepName = stepName,
+                    stepApplyText = "审核(&Y)",
+                    stepApplyContent = "同意",
+                    stepBackText = "反退(&N)",
+                    stepBackContent = "不同意"
+                };
+
+                try
+                {
+                    // 保存
+                    if (WorkFlowBillImpl.SaveBillFlow(model))
+                    {
+                        // 重排列表
+                        InitializeStepFlow();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    throw;
+                    //MessageUtil.Show("保存失败!" + ex.Message);
+                }
+            }
+
+        }
+
+
+    }
+}

插件库/Lskj.PubUserTomodule/AuditPermissionControls/StepPage2.Designer.cs

@@ -487,4 +487,21 @@ namespace Lskj.PubUserTomodule.AuditPermissionControls
         private DevExpress.XtraTab.XtraTabControl xtraTabControl2;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
         public DevExpress.XtraGrid.GridControl gridControl1;
-        private Dev
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView3;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage4;
+        public DevExpress.XtraGrid.GridControl gridControl;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private DevExpress.XtraEditors.PanelControl panelControl6;
+        private Control.LabelTextEdit labelTextEdit1;
+        private Control.LabelComboxEdit labelComboxEdit1;
+        private DevExpress.XtraEditors.PanelControl panelControl3;
+        private System.Windows.Forms.Panel PlStep2Container;
+        private DevExpress.XtraEditors.PanelControl panelControl2;
+        private Control.LabelCheckEdit labdisable;
+    }
+}

插件库/Lskj.PubUserTomodule/AuditPermissionControls/StepPage2.cs

@@ -588,4 +588,36 @@ namespace Lskj.PubUserTomodule.AuditPermissionControls
                 {
                     foreach (DataRow item in e.GridViewSelectRows)
                     {
-                        userNames += "{&" + item["roleName"] + 
+                        userNames += "{&" + item["roleName"] + "&},";
+                    }
+                    //userNames = PowerImpl.getAllPersonnel(userNames);
+                    //if (userNames.Equals(",")) userNames = "";
+                }
+
+
+                //List<System.String> namesList = new List<System.String>((this.txtEdit.EditValue + "").Split(','));
+                //foreach (string item in userNames.Split(','))
+                //{
+                //    if (!namesList.Exists(t => t.Equals(item)))
+                //    {
+                //        this.txtEdit.EditValue += item + ",";
+                //    }
+
+                //}
+
+
+                this.txtEdit.EditValue += userNames;
+            }
+            catch (Exception ex)
+            {
+                string Message = ErrorMessage.PromptErrorMessage(ex);
+                MessageUtil.Show(Message, ex.Message);
+                LogHelper.Instance.WriteError(ex);
+                //MessageUtil.Show(ResourceKeys.OperFault);
+            }
+        }
+        #endregion
+
+
+    }
+}

插件库/Lskj.PubUserTomodule/AuditPermissionControls/StepPage3.cs

@@ -1366,4 +1366,32 @@ namespace Lskj.PubUserTomodule.AuditPermissionControls
                                 InitializeStepTypeFlow();
                             }
                             else
-                
+                            {
+                                MessageUtil.Show("删除失败");
+                            }
+
+                        }
+                        else
+                        {
+                            BillflowTypeStepModel model = deletePanel.Tag as BillflowTypeStepModel;
+                            if (WorkFlowBillImpl.DeleteSchemeSteps(model))
+                            {
+                                MessageUtil.Show("删除成功!");
+                                InitializeStepTypeFlow();
+                            }
+                            else
+                            {
+                                MessageUtil.Show("删除失败");
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                string Message = ErrorMessage.PromptErrorMessage(ex);
+                MessageUtil.Show(Message, ex.Message);
+            }
+        }
+    }
+}

插件库/Lskj.PubUserTomodule/AuditPermissionControls/StepPage4.cs

@@ -612,4 +612,40 @@ namespace Lskj.PubUserTomodule.AuditPermissionControls
                 this.memoEdit2.Text = dataTable.Rows[0]["OverBackOper"] + "";
                 string key = dataTable.Rows[0]["OverBackKey"] + "";
                 OverBackKey = key;
-                this.ConditionsControlEx.gridControl.DataSource = isBasis ? WorkFlowBaseImpl.getFallbackCondition(key) : WorkFlowBillImpl.getFallbackCondition(
+                this.ConditionsControlEx.gridControl.DataSource = isBasis ? WorkFlowBaseImpl.getFallbackCondition(key) : WorkFlowBillImpl.getFallbackCondition(key);
+
+            }
+
+        }
+
+
+        /// <summary>
+        /// 生成终审sql
+        /// </summary>
+        public void GenerateFinalSqlStatement()
+        {
+            bool result = WorkFlowBaseImpl.CreateSQL();
+            //DataTable table = isBasis ? WorkFlowBaseImpl.GetBaseFlowData(mMenuCode) : WorkFlowBillImpl.GetBillFlowData(mMenuCode);
+            if (result)
+            {
+                //单据，单表用的同一个存储过程
+                string sql = "";
+                //string stepcode = table.Rows[0]["stepcode"] + "";
+                int resultNew = WorkFlowBaseImpl.GenerateFinalSqlStatement(mMenuCode, "0", out sql);
+                if (resultNew == 1)
+                {
+                    this.memoEdit1.Text = sql;
+                    this.UpdateFinalReturnSettings();
+                }
+
+
+            }
+            else
+            {
+                MessageUtil.Show("p_systemCreateendFlowSQL存储过程错!");
+            }
+
+        }
+
+    }
+}