上传文件至 ''

DataManager.Designer.cs

@@ -598,7 +598,7 @@
             this.grdContactTask.RowTemplate.Height = 23;
             this.grdContactTask.Size = new System.Drawing.Size(913, 389);
             this.grdContactTask.TabIndex = 0;
-            this.grdContactTask.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdContactTask_CellClick);
+            this.grdContactTask.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdContactTask_CellClick);
             // 
             // tbpCollection
             // 

UICompany.Designer.cs

@@ -91,6 +91,11 @@
             this.label20 = new System.Windows.Forms.Label();
             this.label14 = new System.Windows.Forms.Label();
             this.ofdUploadFile = new System.Windows.Forms.OpenFileDialog();
+            this.tpgTask = new System.Windows.Forms.TabPage();
+            this.panel3 = new System.Windows.Forms.Panel();
+            this.btnAddtTask = new System.Windows.Forms.Button();
+            this.cmbTaskType = new System.Windows.Forms.ComboBox();
+            this.grdTaskList = new System.Windows.Forms.DataGridView();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
             this.splitContainer1.Panel2.SuspendLayout();
@@ -109,6 +114,9 @@
             this.groupBox4.SuspendLayout();
             this.flowLayoutPanel1.SuspendLayout();
             this.groupBox3.SuspendLayout();
+            this.tpgTask.SuspendLayout();
+            this.panel3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.grdTaskList)).BeginInit();
             this.SuspendLayout();
             // 
             // splitContainer1
@@ -195,6 +203,7 @@
             this.tabControl1.Controls.Add(this.tbpPeople);
             this.tabControl1.Controls.Add(this.tbpProducts);
             this.tabControl1.Controls.Add(this.tbpContracts);
+            this.tabControl1.Controls.Add(this.tpgTask);
             this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tabControl1.ItemSize = new System.Drawing.Size(60, 26);
             this.tabControl1.Location = new System.Drawing.Point(0, 0);
@@ -616,7 +625,7 @@
             this.grdFund.RowTemplate.Height = 23;
             this.grdFund.Size = new System.Drawing.Size(792, 299);
             this.grdFund.TabIndex = 1;
-            this.grdFund.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdFund_CellContentClick);
+            this.grdFund.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdFund_CellClick);
             // 
             // panel2
             // 
@@ -769,6 +778,64 @@
             this.label14.TabIndex = 0;
             this.label14.Text = "联络员";
             // 
+            // tpgTask
+            // 
+            this.tpgTask.Controls.Add(this.grdTaskList);
+            this.tpgTask.Controls.Add(this.panel3);
+            this.tpgTask.Location = new System.Drawing.Point(4, 30);
+            this.tpgTask.Name = "tpgTask";
+            this.tpgTask.Size = new System.Drawing.Size(792, 355);
+            this.tpgTask.TabIndex = 4;
+            this.tpgTask.Text = "任务";
+            this.tpgTask.UseVisualStyleBackColor = true;
+            // 
+            // panel3
+            // 
+            this.panel3.Controls.Add(this.cmbTaskType);
+            this.panel3.Controls.Add(this.btnAddtTask);
+            this.panel3.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panel3.Location = new System.Drawing.Point(0, 0);
+            this.panel3.Name = "panel3";
+            this.panel3.Size = new System.Drawing.Size(792, 51);
+            this.panel3.TabIndex = 0;
+            // 
+            // btnAddtTask
+            // 
+            this.btnAddtTask.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnAddtTask.BackColor = System.Drawing.Color.Transparent;
+            this.btnAddtTask.Location = new System.Drawing.Point(661, 11);
+            this.btnAddtTask.Name = "btnAddtTask";
+            this.btnAddtTask.Size = new System.Drawing.Size(121, 28);
+            this.btnAddtTask.TabIndex = 2;
+            this.btnAddtTask.Text = "添 加 任 务";
+            this.btnAddtTask.UseVisualStyleBackColor = false;
+            this.btnAddtTask.Click += new System.EventHandler(this.btnAddtTask_Click);
+            // 
+            // cmbTaskType
+            // 
+            this.cmbTaskType.FormattingEnabled = true;
+            this.cmbTaskType.Location = new System.Drawing.Point(19, 13);
+            this.cmbTaskType.Name = "cmbTaskType";
+            this.cmbTaskType.Size = new System.Drawing.Size(121, 25);
+            this.cmbTaskType.TabIndex = 3;
+            this.cmbTaskType.SelectedIndexChanged += new System.EventHandler(this.cmbTaskType_SelectedIndexChanged);
+            // 
+            // grdTaskList
+            // 
+            this.grdTaskList.AllowUserToAddRows = false;
+            this.grdTaskList.AllowUserToDeleteRows = false;
+            this.grdTaskList.AllowUserToOrderColumns = true;
+            this.grdTaskList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.grdTaskList.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.grdTaskList.Location = new System.Drawing.Point(0, 51);
+            this.grdTaskList.Name = "grdTaskList";
+            this.grdTaskList.ReadOnly = true;
+            this.grdTaskList.RowHeadersVisible = false;
+            this.grdTaskList.RowTemplate.Height = 23;
+            this.grdTaskList.Size = new System.Drawing.Size(792, 304);
+            this.grdTaskList.TabIndex = 1;
+            this.grdTaskList.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdTaskList_CellClick);
+            // 
             // UICompany
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -802,6 +869,9 @@
             this.flowLayoutPanel1.ResumeLayout(false);
             this.groupBox3.ResumeLayout(false);
             this.groupBox3.PerformLayout();
+            this.tpgTask.ResumeLayout(false);
+            this.panel3.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.grdTaskList)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -871,5 +941,10 @@
         private System.Windows.Forms.Button btnSaveContactor;
         private System.Windows.Forms.CheckedListBox clbContactor;
         private System.Windows.Forms.CheckedListBox clbCollector;
+        private System.Windows.Forms.TabPage tpgTask;
+        private System.Windows.Forms.Panel panel3;
+        private System.Windows.Forms.Button btnAddtTask;
+        private System.Windows.Forms.DataGridView grdTaskList;
+        private System.Windows.Forms.ComboBox cmbTaskType;
     }
 }

UICompany.cs

@@ -15,6 +15,7 @@ using System.Windows.Forms;
 using System.Text.Json;
 using System.IO;
 using System.Diagnostics;
+using System.Text.RegularExpressions;
 
 
 namespace DataManager
@@ -32,6 +33,7 @@ namespace DataManager
         private List<DataRowView> old_selected_collector = new List<DataRowView>();
         private string saveFilePath;
 
+        private DataTable taskList;
 
         public UICompany(string companyId, int userId)
         {
@@ -111,7 +113,7 @@ namespace DataManager
 
             #region Contracts Tab
 
-            sbyte jobType = Convert.ToSByte(UIConstants.JobType.Contact);
+            sbyte jobType = Convert.ToSByte(UIConstants.JobType.联络);
             DataTable dt_dm_user_1 = DataAccess.Get_dm_user(null, jobType);
             clbContactor.DataSource = dt_dm_user_1;
             clbContactor.DisplayMember = "username";
@@ -132,7 +134,7 @@ namespace DataManager
                 old_selected_contactor.Add(item);
             }
 
-            jobType = Convert.ToSByte(UIConstants.JobType.Collection);
+            jobType = Convert.ToSByte(UIConstants.JobType.采集);
             DataTable dt_dm_user_2 = DataAccess.Get_dm_user(null, jobType);
             clbCollector.DataSource = dt_dm_user_2;
             clbCollector.DisplayMember = "username";
@@ -157,6 +159,15 @@ namespace DataManager
 
             #endregion
 
+            #region Task Tab
+
+            cmbTaskType.Items.Add(UIConstants.JobType.联络.ToString());
+            cmbTaskType.Items.Add(UIConstants.JobType.采集.ToString());
+            cmbTaskType.SelectedIndex = 0;
+
+            LoadTaskList(UIConstants.JobType.联络);
+
+            #endregion
 
         }
 
@@ -264,7 +275,7 @@ namespace DataManager
             SetStatusStrip(fundList.Rows.Count);
         }
 
-        private void grdFund_CellContentClick(object sender, DataGridViewCellEventArgs e)
+        private void grdFund_CellClick(object sender, DataGridViewCellEventArgs e)
         {
 
             int rowIndex = e.RowIndex;
@@ -547,6 +558,164 @@ namespace DataManager
         }
 
         #endregion
+
+        #region Task List
+
+        private void LoadTaskList(UIConstants.JobType jobType)
+        {
+
+            if (jobType == UIConstants.JobType.联络)
+            {
+                taskList = DataAccess.Get_dm_contact_task(null, null, CompanyId, null, null, null, null, null, null, null);
+                grdTaskList.DataSource = taskList;
+
+                grdTaskList.Columns["task_id"].HeaderText = "ID";
+                grdTaskList.Columns["company_short_name"].HeaderText = "公司";
+                grdTaskList.Columns["task_date"].HeaderText = "日期";
+                grdTaskList.Columns["task_type_name"].HeaderText = "任务";
+                grdTaskList.Columns["isvalid_name"].HeaderText = "状态";
+                grdTaskList.Columns["priority_name"].HeaderText = "优先级";
+                grdTaskList.Columns["follow_up_date"].HeaderText = "跟进日";
+                grdTaskList.Columns["company_asset_size_name"].HeaderText = "规模";
+                grdTaskList.Columns["creator_name"].HeaderText = "创建";
+                grdTaskList.Columns["updater_name"].HeaderText = "更新";
+                grdTaskList.Columns["updatetime"].HeaderText = "更新时间";
+
+                grdTaskList.Columns["company_id"].Visible = false;
+                grdTaskList.Columns["task_type"].Visible = false;
+                grdTaskList.Columns["isvalid"].Visible = false;
+                grdTaskList.Columns["priority"].Visible = false;
+                grdTaskList.Columns["company_asset_size"].Visible = false;
+                grdTaskList.Columns["creatorid"].Visible = false;
+                grdTaskList.Columns["createtime"].Visible = false;
+                grdTaskList.Columns["updaterid"].Visible = false;
+
+                grdTaskList.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
+            }
+            else
+            {
+                taskList = DataAccess.Get_dm_collection_task(null, null, CompanyId, null, null, null, null, null, null);
+                grdTaskList.DataSource = taskList;
+
+                grdTaskList.Columns["task_id"].HeaderText = "ID";
+                grdTaskList.Columns["provider_name"].HeaderText = "来源";
+
+                grdTaskList.Columns["task_date"].HeaderText = "日期";
+                grdTaskList.Columns["task_type_name"].HeaderText = "任务";
+                grdTaskList.Columns["entity_name"].HeaderText = "主题";
+                grdTaskList.Columns["err_message"].HeaderText = "详情";
+                grdTaskList.Columns["isvalid_name"].HeaderText = "状态";
+                grdTaskList.Columns["creator_name"].HeaderText = "创建";
+                grdTaskList.Columns["updater_name"].HeaderText = "更新";
+                grdTaskList.Columns["updatetime"].HeaderText = "更新时间";
+
+                grdTaskList.Columns["provider_id"].Visible = false;
+                grdTaskList.Columns["task_type"].Visible = false;
+                grdTaskList.Columns["entity_id"].Visible = false;
+                grdTaskList.Columns["isvalid"].Visible = false;
+                grdTaskList.Columns["creatorid"].Visible = false;
+                grdTaskList.Columns["createtime"].Visible = false;
+                grdTaskList.Columns["updaterid"].Visible = false;
+
+                grdTaskList.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
+            }
+        }
+
+        private void btnAddtTask_Click(object sender, EventArgs e)
+        {
+            UIConstants.JobType jobType = (UIConstants.JobType)Enum.Parse(typeof(UIConstants.JobType), cmbTaskType.SelectedItem.ToString());
+
+            if (jobType == UIConstants.JobType.联络)
+            {
+                frmContactTask ctk = new frmContactTask(UserId, CompanyId, companyInfo.Rows[0]["company_short_name"].ToString());
+                ctk.ShowDialog();
+
+                // 刷新 grid 数据
+                if (ctk.DialogResult == DialogResult.OK)
+                {
+                    LoadTaskList(jobType);
+                }
+            }
+            else
+            {
+                UICollectionTask ctk = new UICollectionTask(UserId, CompanyId, companyInfo.Rows[0]["company_short_name"].ToString());
+                ctk.ShowDialog();
+
+                // 刷新 grid 数据
+                if (ctk.DialogResult == DialogResult.OK)
+                {
+                    LoadTaskList(jobType);
+                }
+            }
+        }
+
+        private void cmbTaskType_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (cmbTaskType.Focus())
+            {
+                UIConstants.JobType jobType = (UIConstants.JobType)Enum.Parse(typeof(UIConstants.JobType), cmbTaskType.SelectedItem.ToString());
+                LoadTaskList(jobType);
+            }
+        }
+
+        #endregion
+
+        private void grdTaskList_CellClick(object sender, DataGridViewCellEventArgs e)
+        {
+            int rowIndex = e.RowIndex;
+            int columnIndex = e.ColumnIndex;
+
+            if (columnIndex < 0 || rowIndex < 0) return;
+
+            DataRow row = taskList.Rows[rowIndex];
+
+            UIConstants.JobType jobType = (UIConstants.JobType)Enum.Parse(typeof(UIConstants.JobType), cmbTaskType.SelectedItem.ToString());
+
+            if (jobType == UIConstants.JobType.联络)
+            {
+                ContactTask task = new ContactTask(UserId, row.Field<int>("task_id"), row.Field<string>("company_id"), row.Field<string>("company_short_name"),
+                           row.Field<DateTime>("task_date"), row.Field<short>("task_type"), row.Field<sbyte>("isvalid"), row.Field<sbyte>("priority"),
+                           row.Field<DateTime?>("follow_up_date"), row.Field<sbyte?>("company_asset_size"),
+                           row.Field<int?>("creatorid"), row.Field<string>("creator_name"), row.Field<DateTime?>("createtime"),
+                           row.Field<int?>("updaterid"), row.Field<string>("updater_name"), row.Field<DateTime?>("updatetime"));
+
+                if (task != null)
+                {
+                    frmContactTask ctk = new frmContactTask(task);
+
+                    ctk.ShowDialog();
+
+                    // 刷新 grid 数据
+                    if (ctk.DialogResult == DialogResult.OK)
+                    {
+                        LoadTaskList(jobType);
+                    }
+                }
+            }
+            else
+            {
+
+                CollectionTask task = new CollectionTask(UserId, row.Field<int>("task_id"), row.Field<string>("provider_id"), row.Field<string>("provider_name"),
+                                       row.Field<DateTime>("task_date"), row.Field<short>("task_type"),
+                                       row.Field<string>("entity_id"), row.Field<string>("entity_name"),
+                                       row.Field<string>("err_message"), row.Field<sbyte>("isvalid"),
+                                       row.Field<int?>("creatorid"), row.Field<string>("creator_name"), row.Field<DateTime?>("createtime"),
+                                       row.Field<int?>("updaterid"), row.Field<string>("updater_name"), row.Field<DateTime?>("updatetime"));
+
+                if (task != null)
+                {
+                    UICollectionTask ctk = new UICollectionTask(task);
+
+                    ctk.ShowDialog();
+
+                    // 刷新 grid 数据
+                    if (ctk.DialogResult == DialogResult.OK)
+                    {
+                        LoadTaskList(jobType);
+                    }
+                }
+            }
+        }
     }
 
     public class CompanyCoverUser

UIFund.Designer.cs

@@ -731,7 +731,7 @@
             this.grdNav.RowTemplate.Height = 23;
             this.grdNav.Size = new System.Drawing.Size(786, 310);
             this.grdNav.TabIndex = 2;
-            this.grdNav.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdNav_CellContentClick);
+            this.grdNav.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdNav_CellClick);
             // 
             // tbpAsset
             // 

UIFund.cs

@@ -254,7 +254,7 @@ namespace DataManager
             chart.Show();
         }
 
-        private void grdNav_CellContentClick(object sender, DataGridViewCellEventArgs e)
+        private void grdNav_CellClick(object sender, DataGridViewCellEventArgs e)
         {
             //int rowIndex = e.RowIndex;
             //int columnIndex = e.ColumnIndex;