Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

lu

6 天以前 200b60701072ff421156d7fd3c4fecf1a3b5bdb3

 DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.cs

@@ -12,7 +12,7 @@
    {
        private readonly string _webServiceName = "MesJjgzErrorJs/";
        private string daaGuid = "";
        public SelectSTAFF()
        public SelectSTAFF( string orgId )
        {
            InitializeComponent();
            this.gridView1.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); };
@@ -24,7 +24,7 @@
            this.colChkInt.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
            this.colChkInt.VisibleIndex = 0;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
            getPageList(1);
            getPageList(1, orgId);
            btnIn.Click += (s, e) =>
            {
                gridView1.PostEditor();
@@ -35,7 +35,7 @@
                    foreach (DataRow dr in dt.Rows)
                    {
                        string checkBox = dr["chkInt"].ToString();
                        string _guid = dr["id"].ToString();
                        string _guid = dr["guid"].ToString();
                        if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
                        {
                            list.Add(_guid);
@@ -58,7 +58,7 @@
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        private void getPageList(int curPage, string orgId)
        {
            var _obj = new
            {
@@ -66,7 +66,7 @@
                everyPageSize = 999999,
                sortName = "",
                keyWhere = "",
                daaGuid = daaGuid
                orgId = orgId
            };
            var json = JsonConvert.SerializeObject(_obj);
            try