类目识别功能 多选功能优化 微信上货优化 微信客服信息识别优化等
This commit is contained in:
1 parent
c27063d704
commit
a2a6719a99
31 files changed
+2223
-750
No files matched your search
+241
-143
@@ -34,24 +34,27 @@
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
|
||||
this.panel5 = new System.Windows.Forms.Panel();
|
||||
this.btnRefreshShop = new TemuKJD.UserControls.ButtonEx();
|
||||
this.btnLoginSelect = new TemuKJD.UserControls.ButtonEx();
|
||||
this.btnCheck = new TemuKJD.UserControls.ButtonEx();
|
||||
this.panel4 = new System.Windows.Forms.Panel();
|
||||
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
|
||||
this.label5 = new System.Windows.Forms.Label();
|
||||
this.label2 = new System.Windows.Forms.Label();
|
||||
this.cmbNotes = new TemuKJD.UserComponent.UcComboBoxMutiSelect();
|
||||
this.txtShopId = new System.Windows.Forms.TextBox();
|
||||
this.label3 = new System.Windows.Forms.Label();
|
||||
this.txtShopName = new System.Windows.Forms.TextBox();
|
||||
this.label4 = new System.Windows.Forms.Label();
|
||||
this.cmbSubAccount = new TemuKJD.UserComponent.UcComboBoxMutiSelect();
|
||||
this.btnRefreshShop = new DevComponents.DotNetBar.PanelEx();
|
||||
this.pnlEmpty = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnSearch = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnOpenOrder = new TemuKJD.UserControls.ButtonEx();
|
||||
this.btnAddShop = new TemuKJD.UserControls.ButtonEx();
|
||||
this.cmbNotes = new System.Windows.Forms.ComboBox();
|
||||
this.pnlEmpty = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnSearch = new TemuKJD.UserControls.ButtonEx();
|
||||
this.label4 = new System.Windows.Forms.Label();
|
||||
this.txtShopName = new System.Windows.Forms.TextBox();
|
||||
this.label3 = new System.Windows.Forms.Label();
|
||||
this.txtShopId = new System.Windows.Forms.TextBox();
|
||||
this.label2 = new System.Windows.Forms.Label();
|
||||
this.btnImport = new TemuKJD.UserControls.ButtonEx();
|
||||
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
||||
this.btnRefreshAuth = new TemuKJD.UserControls.ButtonEx();
|
||||
this.pbLoading = new System.Windows.Forms.PictureBox();
|
||||
this.btnImport = new TemuKJD.UserControls.ButtonEx();
|
||||
this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
|
||||
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
@@ -86,6 +89,7 @@
|
||||
this.tableLayoutPanel2.SuspendLayout();
|
||||
this.panel5.SuspendLayout();
|
||||
this.panel4.SuspendLayout();
|
||||
this.tableLayoutPanel1.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
|
||||
this.splitContainer2.Panel1.SuspendLayout();
|
||||
this.splitContainer2.Panel2.SuspendLayout();
|
||||
@@ -141,30 +145,13 @@
|
||||
//
|
||||
// panel5
|
||||
//
|
||||
this.panel5.Controls.Add(this.btnRefreshShop);
|
||||
this.panel5.Controls.Add(this.btnLoginSelect);
|
||||
this.panel5.Controls.Add(this.btnCheck);
|
||||
this.panel5.Location = new System.Drawing.Point(1032, 3);
|
||||
this.panel5.Location = new System.Drawing.Point(1094, 3);
|
||||
this.panel5.Name = "panel5";
|
||||
this.panel5.Size = new System.Drawing.Size(229, 40);
|
||||
this.panel5.Size = new System.Drawing.Size(167, 40);
|
||||
this.panel5.TabIndex = 1;
|
||||
//
|
||||
// btnRefreshShop
|
||||
//
|
||||
this.btnRefreshShop.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnRefreshShop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
|
||||
this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnRefreshShop.ForeColor = System.Drawing.Color.White;
|
||||
this.btnRefreshShop.Location = new System.Drawing.Point(21, 9);
|
||||
this.btnRefreshShop.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.btnRefreshShop.Name = "btnRefreshShop";
|
||||
this.btnRefreshShop.Size = new System.Drawing.Size(66, 26);
|
||||
this.btnRefreshShop.TabIndex = 375;
|
||||
this.btnRefreshShop.Text = "刷新店铺";
|
||||
this.btnRefreshShop.UseVisualStyleBackColor = false;
|
||||
this.btnRefreshShop.Click += new System.EventHandler(this.btnRefreshCookie_Click);
|
||||
//
|
||||
// btnLoginSelect
|
||||
//
|
||||
this.btnLoginSelect.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
@@ -172,10 +159,10 @@
|
||||
this.btnLoginSelect.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
|
||||
this.btnLoginSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnLoginSelect.ForeColor = System.Drawing.Color.White;
|
||||
this.btnLoginSelect.Location = new System.Drawing.Point(162, 9);
|
||||
this.btnLoginSelect.Location = new System.Drawing.Point(85, 9);
|
||||
this.btnLoginSelect.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.btnLoginSelect.Name = "btnLoginSelect";
|
||||
this.btnLoginSelect.Size = new System.Drawing.Size(66, 26);
|
||||
this.btnLoginSelect.Size = new System.Drawing.Size(66, 25);
|
||||
this.btnLoginSelect.TabIndex = 373;
|
||||
this.btnLoginSelect.Text = "登录选中";
|
||||
this.btnLoginSelect.UseVisualStyleBackColor = false;
|
||||
@@ -188,10 +175,10 @@
|
||||
this.btnCheck.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
|
||||
this.btnCheck.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnCheck.ForeColor = System.Drawing.Color.White;
|
||||
this.btnCheck.Location = new System.Drawing.Point(92, 9);
|
||||
this.btnCheck.Location = new System.Drawing.Point(17, 9);
|
||||
this.btnCheck.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.btnCheck.Name = "btnCheck";
|
||||
this.btnCheck.Size = new System.Drawing.Size(66, 26);
|
||||
this.btnCheck.Size = new System.Drawing.Size(66, 25);
|
||||
this.btnCheck.TabIndex = 372;
|
||||
this.btnCheck.Text = "检测选中";
|
||||
this.btnCheck.UseVisualStyleBackColor = false;
|
||||
@@ -199,73 +186,177 @@
|
||||
//
|
||||
// panel4
|
||||
//
|
||||
this.panel4.Controls.Add(this.tableLayoutPanel1);
|
||||
this.panel4.Controls.Add(this.btnOpenOrder);
|
||||
this.panel4.Controls.Add(this.btnAddShop);
|
||||
this.panel4.Controls.Add(this.cmbNotes);
|
||||
this.panel4.Controls.Add(this.pnlEmpty);
|
||||
this.panel4.Controls.Add(this.btnSearch);
|
||||
this.panel4.Controls.Add(this.label4);
|
||||
this.panel4.Controls.Add(this.txtShopName);
|
||||
this.panel4.Controls.Add(this.label3);
|
||||
this.panel4.Controls.Add(this.txtShopId);
|
||||
this.panel4.Controls.Add(this.label2);
|
||||
this.panel4.Controls.Add(this.btnImport);
|
||||
this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.panel4.Location = new System.Drawing.Point(3, 3);
|
||||
this.panel4.Name = "panel4";
|
||||
this.panel4.Size = new System.Drawing.Size(1023, 40);
|
||||
this.panel4.Size = new System.Drawing.Size(1085, 40);
|
||||
this.panel4.TabIndex = 0;
|
||||
//
|
||||
// btnOpenOrder
|
||||
// tableLayoutPanel1
|
||||
//
|
||||
this.btnOpenOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnOpenOrder.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnOpenOrder.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnOpenOrder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
|
||||
this.btnOpenOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnOpenOrder.ForeColor = System.Drawing.Color.White;
|
||||
this.btnOpenOrder.Location = new System.Drawing.Point(902, 10);
|
||||
this.btnOpenOrder.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.btnOpenOrder.Name = "btnOpenOrder";
|
||||
this.btnOpenOrder.Size = new System.Drawing.Size(119, 25);
|
||||
this.btnOpenOrder.TabIndex = 465;
|
||||
this.btnOpenOrder.Text = "登录订单系统";
|
||||
this.btnOpenOrder.UseVisualStyleBackColor = false;
|
||||
this.btnOpenOrder.Click += new System.EventHandler(this.btnOpenOrder_Click);
|
||||
this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.tableLayoutPanel1.ColumnCount = 11;
|
||||
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
|
||||
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25.00067F));
|
||||
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
|
||||
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25.00066F));
|
||||
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
|
||||
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25.00066F));
|
||||
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
|
||||
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 24.99801F));
|
||||
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
|
||||
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
|
||||
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
|
||||
this.tableLayoutPanel1.Controls.Add(this.label5, 6, 0);
|
||||
this.tableLayoutPanel1.Controls.Add(this.label2, 0, 0);
|
||||
this.tableLayoutPanel1.Controls.Add(this.cmbNotes, 5, 0);
|
||||
this.tableLayoutPanel1.Controls.Add(this.txtShopId, 1, 0);
|
||||
this.tableLayoutPanel1.Controls.Add(this.label3, 2, 0);
|
||||
this.tableLayoutPanel1.Controls.Add(this.txtShopName, 3, 0);
|
||||
this.tableLayoutPanel1.Controls.Add(this.label4, 4, 0);
|
||||
this.tableLayoutPanel1.Controls.Add(this.cmbSubAccount, 7, 0);
|
||||
this.tableLayoutPanel1.Controls.Add(this.btnRefreshShop, 8, 0);
|
||||
this.tableLayoutPanel1.Controls.Add(this.pnlEmpty, 10, 0);
|
||||
this.tableLayoutPanel1.Controls.Add(this.btnSearch, 9, 0);
|
||||
this.tableLayoutPanel1.Location = new System.Drawing.Point(94, 1);
|
||||
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
|
||||
this.tableLayoutPanel1.RowCount = 1;
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
|
||||
this.tableLayoutPanel1.Size = new System.Drawing.Size(719, 39);
|
||||
this.tableLayoutPanel1.TabIndex = 375;
|
||||
//
|
||||
// btnAddShop
|
||||
// label5
|
||||
//
|
||||
this.btnAddShop.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnAddShop.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnAddShop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
|
||||
this.btnAddShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnAddShop.ForeColor = System.Drawing.Color.White;
|
||||
this.btnAddShop.Location = new System.Drawing.Point(1, 9);
|
||||
this.btnAddShop.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.btnAddShop.Name = "btnAddShop";
|
||||
this.btnAddShop.Size = new System.Drawing.Size(107, 26);
|
||||
this.btnAddShop.TabIndex = 370;
|
||||
this.btnAddShop.Text = "扫码添加店铺";
|
||||
this.btnAddShop.UseVisualStyleBackColor = false;
|
||||
this.btnAddShop.Click += new System.EventHandler(this.btnAddShop_Click);
|
||||
this.label5.Anchor = System.Windows.Forms.AnchorStyles.None;
|
||||
this.label5.AutoSize = true;
|
||||
this.label5.Location = new System.Drawing.Point(398, 11);
|
||||
this.label5.Margin = new System.Windows.Forms.Padding(3, 3, 0, 3);
|
||||
this.label5.Name = "label5";
|
||||
this.label5.Size = new System.Drawing.Size(44, 17);
|
||||
this.label5.TabIndex = 414;
|
||||
this.label5.Text = "子账户";
|
||||
//
|
||||
// label2
|
||||
//
|
||||
this.label2.Anchor = System.Windows.Forms.AnchorStyles.None;
|
||||
this.label2.AutoSize = true;
|
||||
this.label2.Location = new System.Drawing.Point(3, 11);
|
||||
this.label2.Margin = new System.Windows.Forms.Padding(3, 3, 0, 3);
|
||||
this.label2.Name = "label2";
|
||||
this.label2.Size = new System.Drawing.Size(43, 17);
|
||||
this.label2.TabIndex = 373;
|
||||
this.label2.Text = "店铺id";
|
||||
//
|
||||
// cmbNotes
|
||||
//
|
||||
this.cmbNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.cmbNotes.DefaultText = "全部";
|
||||
this.cmbNotes.DropDownHeight = 1;
|
||||
this.cmbNotes.DropDownWidth = 1;
|
||||
this.cmbNotes.FormattingEnabled = true;
|
||||
this.cmbNotes.Location = new System.Drawing.Point(584, 10);
|
||||
this.cmbNotes.IntegralHeight = false;
|
||||
this.cmbNotes.Location = new System.Drawing.Point(314, 6);
|
||||
this.cmbNotes.Margin = new System.Windows.Forms.Padding(0, 1, 0, 3);
|
||||
this.cmbNotes.Name = "cmbNotes";
|
||||
this.cmbNotes.Size = new System.Drawing.Size(120, 25);
|
||||
this.cmbNotes.Size = new System.Drawing.Size(81, 25);
|
||||
this.cmbNotes.TabIndex = 413;
|
||||
this.cmbNotes.Text = "全部";
|
||||
//
|
||||
// txtShopId
|
||||
//
|
||||
this.txtShopId.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.txtShopId.Location = new System.Drawing.Point(46, 8);
|
||||
this.txtShopId.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
|
||||
this.txtShopId.Name = "txtShopId";
|
||||
this.txtShopId.Size = new System.Drawing.Size(81, 23);
|
||||
this.txtShopId.TabIndex = 372;
|
||||
//
|
||||
// label3
|
||||
//
|
||||
this.label3.Anchor = System.Windows.Forms.AnchorStyles.None;
|
||||
this.label3.AutoSize = true;
|
||||
this.label3.Location = new System.Drawing.Point(130, 11);
|
||||
this.label3.Margin = new System.Windows.Forms.Padding(3, 3, 0, 3);
|
||||
this.label3.Name = "label3";
|
||||
this.label3.Size = new System.Drawing.Size(44, 17);
|
||||
this.label3.TabIndex = 375;
|
||||
this.label3.Text = "店铺名";
|
||||
//
|
||||
// txtShopName
|
||||
//
|
||||
this.txtShopName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.txtShopName.Location = new System.Drawing.Point(174, 8);
|
||||
this.txtShopName.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
|
||||
this.txtShopName.Name = "txtShopName";
|
||||
this.txtShopName.Size = new System.Drawing.Size(81, 23);
|
||||
this.txtShopName.TabIndex = 374;
|
||||
//
|
||||
// label4
|
||||
//
|
||||
this.label4.Anchor = System.Windows.Forms.AnchorStyles.None;
|
||||
this.label4.AutoSize = true;
|
||||
this.label4.Location = new System.Drawing.Point(258, 11);
|
||||
this.label4.Margin = new System.Windows.Forms.Padding(3, 3, 0, 3);
|
||||
this.label4.Name = "label4";
|
||||
this.label4.Size = new System.Drawing.Size(56, 17);
|
||||
this.label4.TabIndex = 377;
|
||||
this.label4.Text = "分组备注";
|
||||
//
|
||||
// cmbSubAccount
|
||||
//
|
||||
this.cmbSubAccount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.cmbSubAccount.DefaultText = "全部";
|
||||
this.cmbSubAccount.DropDownHeight = 1;
|
||||
this.cmbSubAccount.DropDownWidth = 1;
|
||||
this.cmbSubAccount.FormattingEnabled = true;
|
||||
this.cmbSubAccount.IntegralHeight = false;
|
||||
this.cmbSubAccount.Location = new System.Drawing.Point(442, 8);
|
||||
this.cmbSubAccount.Margin = new System.Windows.Forms.Padding(0, 1, 0, 3);
|
||||
this.cmbSubAccount.Name = "cmbSubAccount";
|
||||
this.cmbSubAccount.Size = new System.Drawing.Size(80, 25);
|
||||
this.cmbSubAccount.TabIndex = 415;
|
||||
this.cmbSubAccount.Text = "全部";
|
||||
//
|
||||
// btnRefreshShop
|
||||
//
|
||||
this.btnRefreshShop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnRefreshShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnRefreshShop.Location = new System.Drawing.Point(524, 8);
|
||||
this.btnRefreshShop.Margin = new System.Windows.Forms.Padding(2, 3, 0, 3);
|
||||
this.btnRefreshShop.Name = "btnRefreshShop";
|
||||
this.btnRefreshShop.Size = new System.Drawing.Size(58, 23);
|
||||
this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnRefreshShop.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||
this.btnRefreshShop.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
||||
this.btnRefreshShop.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
||||
this.btnRefreshShop.Style.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnRefreshShop.Style.GradientAngle = 90;
|
||||
this.btnRefreshShop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnRefreshShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnRefreshShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnRefreshShop.TabIndex = 802;
|
||||
this.btnRefreshShop.Text = "刷新店铺";
|
||||
this.btnRefreshShop.Click += new System.EventHandler(this.btnRefreshCookie_Click);
|
||||
//
|
||||
// pnlEmpty
|
||||
//
|
||||
this.pnlEmpty.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control;
|
||||
this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.pnlEmpty.Location = new System.Drawing.Point(786, 9);
|
||||
this.pnlEmpty.Location = new System.Drawing.Point(644, 8);
|
||||
this.pnlEmpty.Margin = new System.Windows.Forms.Padding(2, 3, 0, 3);
|
||||
this.pnlEmpty.Name = "pnlEmpty";
|
||||
this.pnlEmpty.Size = new System.Drawing.Size(66, 26);
|
||||
this.pnlEmpty.Size = new System.Drawing.Size(75, 23);
|
||||
this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.pnlEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||
this.pnlEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||
@@ -284,77 +375,62 @@
|
||||
//
|
||||
// btnSearch
|
||||
//
|
||||
this.btnSearch.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnSearch.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
|
||||
this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnSearch.ForeColor = System.Drawing.Color.White;
|
||||
this.btnSearch.Location = new System.Drawing.Point(715, 9);
|
||||
this.btnSearch.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.btnSearch.Location = new System.Drawing.Point(584, 8);
|
||||
this.btnSearch.Margin = new System.Windows.Forms.Padding(2, 3, 0, 3);
|
||||
this.btnSearch.Name = "btnSearch";
|
||||
this.btnSearch.Size = new System.Drawing.Size(66, 26);
|
||||
this.btnSearch.TabIndex = 372;
|
||||
this.btnSearch.Text = "搜索";
|
||||
this.btnSearch.UseVisualStyleBackColor = false;
|
||||
this.btnSearch.Size = new System.Drawing.Size(58, 23);
|
||||
this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnSearch.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnSearch.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnSearch.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||
this.btnSearch.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
||||
this.btnSearch.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
||||
this.btnSearch.Style.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnSearch.Style.GradientAngle = 90;
|
||||
this.btnSearch.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnSearch.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnSearch.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnSearch.TabIndex = 798;
|
||||
this.btnSearch.Text = "筛选";
|
||||
this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
|
||||
//
|
||||
// label4
|
||||
// btnOpenOrder
|
||||
//
|
||||
this.label4.AutoSize = true;
|
||||
this.label4.Location = new System.Drawing.Point(525, 14);
|
||||
this.label4.Name = "label4";
|
||||
this.label4.Size = new System.Drawing.Size(68, 17);
|
||||
this.label4.TabIndex = 377;
|
||||
this.label4.Text = "分组备注:";
|
||||
this.btnOpenOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnOpenOrder.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnOpenOrder.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnOpenOrder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
|
||||
this.btnOpenOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnOpenOrder.ForeColor = System.Drawing.Color.White;
|
||||
this.btnOpenOrder.Location = new System.Drawing.Point(964, 9);
|
||||
this.btnOpenOrder.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.btnOpenOrder.Name = "btnOpenOrder";
|
||||
this.btnOpenOrder.Size = new System.Drawing.Size(119, 25);
|
||||
this.btnOpenOrder.TabIndex = 465;
|
||||
this.btnOpenOrder.Text = "登录订单系统";
|
||||
this.btnOpenOrder.UseVisualStyleBackColor = false;
|
||||
this.btnOpenOrder.Click += new System.EventHandler(this.btnOpenOrder_Click);
|
||||
//
|
||||
// txtShopName
|
||||
// btnAddShop
|
||||
//
|
||||
this.txtShopName.Location = new System.Drawing.Point(402, 11);
|
||||
this.txtShopName.Name = "txtShopName";
|
||||
this.txtShopName.Size = new System.Drawing.Size(110, 23);
|
||||
this.txtShopName.TabIndex = 374;
|
||||
//
|
||||
// label3
|
||||
//
|
||||
this.label3.AutoSize = true;
|
||||
this.label3.Location = new System.Drawing.Point(354, 14);
|
||||
this.label3.Name = "label3";
|
||||
this.label3.Size = new System.Drawing.Size(56, 17);
|
||||
this.label3.TabIndex = 375;
|
||||
this.label3.Text = "店铺名:";
|
||||
//
|
||||
// txtShopId
|
||||
//
|
||||
this.txtShopId.Location = new System.Drawing.Point(232, 11);
|
||||
this.txtShopId.Name = "txtShopId";
|
||||
this.txtShopId.Size = new System.Drawing.Size(110, 23);
|
||||
this.txtShopId.TabIndex = 372;
|
||||
//
|
||||
// label2
|
||||
//
|
||||
this.label2.AutoSize = true;
|
||||
this.label2.Location = new System.Drawing.Point(184, 14);
|
||||
this.label2.Name = "label2";
|
||||
this.label2.Size = new System.Drawing.Size(55, 17);
|
||||
this.label2.TabIndex = 373;
|
||||
this.label2.Text = "店铺id:";
|
||||
//
|
||||
// btnImport
|
||||
//
|
||||
this.btnImport.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnImport.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnImport.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
|
||||
this.btnImport.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnImport.ForeColor = System.Drawing.Color.White;
|
||||
this.btnImport.Location = new System.Drawing.Point(71, 9);
|
||||
this.btnImport.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.btnImport.Name = "btnImport";
|
||||
this.btnImport.Size = new System.Drawing.Size(66, 26);
|
||||
this.btnImport.TabIndex = 371;
|
||||
this.btnImport.Text = "导入店铺";
|
||||
this.btnImport.UseVisualStyleBackColor = false;
|
||||
this.btnImport.Visible = false;
|
||||
this.btnImport.Click += new System.EventHandler(this.btnImport_Click);
|
||||
this.btnAddShop.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnAddShop.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnAddShop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
|
||||
this.btnAddShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnAddShop.ForeColor = System.Drawing.Color.White;
|
||||
this.btnAddShop.Location = new System.Drawing.Point(1, 9);
|
||||
this.btnAddShop.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.btnAddShop.Name = "btnAddShop";
|
||||
this.btnAddShop.Size = new System.Drawing.Size(90, 25);
|
||||
this.btnAddShop.TabIndex = 370;
|
||||
this.btnAddShop.Text = "扫码添加店铺";
|
||||
this.btnAddShop.UseVisualStyleBackColor = false;
|
||||
this.btnAddShop.Click += new System.EventHandler(this.btnAddShop_Click);
|
||||
//
|
||||
// splitContainer2
|
||||
//
|
||||
@@ -369,6 +445,7 @@
|
||||
this.splitContainer2.Panel1.BackColor = System.Drawing.Color.White;
|
||||
this.splitContainer2.Panel1.Controls.Add(this.btnRefreshAuth);
|
||||
this.splitContainer2.Panel1.Controls.Add(this.pbLoading);
|
||||
this.splitContainer2.Panel1.Controls.Add(this.btnImport);
|
||||
this.splitContainer2.Panel1.Controls.Add(this.dgvShop);
|
||||
this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||
//
|
||||
@@ -408,6 +485,23 @@
|
||||
this.pbLoading.TabIndex = 6;
|
||||
this.pbLoading.TabStop = false;
|
||||
//
|
||||
// btnImport
|
||||
//
|
||||
this.btnImport.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnImport.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnImport.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
|
||||
this.btnImport.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnImport.ForeColor = System.Drawing.Color.White;
|
||||
this.btnImport.Location = new System.Drawing.Point(81, 35);
|
||||
this.btnImport.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.btnImport.Name = "btnImport";
|
||||
this.btnImport.Size = new System.Drawing.Size(66, 26);
|
||||
this.btnImport.TabIndex = 371;
|
||||
this.btnImport.Text = "导入店铺";
|
||||
this.btnImport.UseVisualStyleBackColor = false;
|
||||
this.btnImport.Visible = false;
|
||||
this.btnImport.Click += new System.EventHandler(this.btnImport_Click);
|
||||
//
|
||||
// dgvShop
|
||||
//
|
||||
this.dgvShop.AllowUserToAddRows = false;
|
||||
@@ -704,7 +798,8 @@
|
||||
this.tableLayoutPanel2.ResumeLayout(false);
|
||||
this.panel5.ResumeLayout(false);
|
||||
this.panel4.ResumeLayout(false);
|
||||
this.panel4.PerformLayout();
|
||||
this.tableLayoutPanel1.ResumeLayout(false);
|
||||
this.tableLayoutPanel1.PerformLayout();
|
||||
this.splitContainer2.Panel1.ResumeLayout(false);
|
||||
this.splitContainer2.Panel2.ResumeLayout(false);
|
||||
this.splitContainer2.Panel2.PerformLayout();
|
||||
@@ -738,11 +833,9 @@
|
||||
private System.Windows.Forms.Label label3;
|
||||
private System.Windows.Forms.TextBox txtShopId;
|
||||
private System.Windows.Forms.Label label2;
|
||||
private UserControls.ButtonEx btnSearch;
|
||||
private System.Windows.Forms.Label label4;
|
||||
private DevComponents.DotNetBar.PanelEx pnlEmpty;
|
||||
private UserControls.ButtonEx btnRefreshShop;
|
||||
private System.Windows.Forms.ComboBox cmbNotes;
|
||||
private UserComponent.UcComboBoxMutiSelect cmbNotes;
|
||||
private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colLoginName;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
|
||||
@@ -768,5 +861,10 @@
|
||||
private System.Windows.Forms.DataGridViewLinkColumn colEdit;
|
||||
private System.Windows.Forms.DataGridViewLinkColumn colDelete;
|
||||
public UserControls.ButtonEx btnOpenOrder;
|
||||
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
|
||||
private System.Windows.Forms.Label label5;
|
||||
private UserComponent.UcComboBoxMutiSelect cmbSubAccount;
|
||||
private DevComponents.DotNetBar.PanelEx btnSearch;
|
||||
private DevComponents.DotNetBar.PanelEx btnRefreshShop;
|
||||
}
|
||||
}
|
||||
@@ -384,14 +384,6 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
return;
|
||||
}
|
||||
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
cmbNotes.Items.Clear();
|
||||
var notes = GlobalConfig.ShopLoginList.Select(s => s.Notes).Distinct();
|
||||
cmbNotes.Items.Add("全部");
|
||||
cmbNotes.Items.AddRange(notes.ToArray());
|
||||
}));
|
||||
|
||||
Task.Run(() =>
|
||||
{
|
||||
isLoading = true;
|
||||
@@ -400,6 +392,18 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
Thread.Sleep(1000);
|
||||
}
|
||||
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
cmbNotes.Items.Clear();
|
||||
var notes = GlobalConfig.ShopLoginList.Select(s => s.Notes).Distinct();
|
||||
cmbNotes.Items.AddRange(notes.Where(n => !n.IsNullOrEmpty()).ToArray());
|
||||
|
||||
cmbSubAccount.Items.Clear();
|
||||
var subAccountStr = string.Join(",", GlobalConfig.ShopLoginList.Select(s => s.SubUserName).Distinct());
|
||||
var subAccounts = subAccountStr.Split(',').Distinct();
|
||||
cmbSubAccount.Items.AddRange(subAccounts.Where(s => !s.IsNullOrEmpty()).ToArray());
|
||||
}));
|
||||
|
||||
var shopList = GlobalConfig.ShopLoginList.Where(s => !string.IsNullOrEmpty(s.ShopId)
|
||||
|| GlobalConfig.ShopLoginList.Where(ss=>ss.LoginName == s.LoginName).Count() == 1)
|
||||
.OrderBy(s=>s.LoginName).ToList();
|
||||
@@ -408,7 +412,15 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(cmbNotes.Text) && cmbNotes.Text.Trim() != "全部")
|
||||
{
|
||||
shopList = shopList.Where(s => s.Notes.ParseToString().ToLower().Contains(cmbNotes.Text.ToLower())).ToList();
|
||||
var notes = cmbNotes.Text.ToLower();
|
||||
var notesLst = cmbNotes.Text.ToLower().Split(new string[] { ";", ",", ",", " " }, StringSplitOptions.RemoveEmptyEntries);
|
||||
shopList = shopList.Where(s => s.Notes.ParseToString().ToLower().Contains(notes) || notesLst.Contains(s.Notes.ParseToString().ToLower())).ToList();
|
||||
}
|
||||
if (!string.IsNullOrWhiteSpace(cmbSubAccount.Text) && cmbSubAccount.Text.Trim() != "全部")
|
||||
{
|
||||
var subAccount = cmbSubAccount.Text.ToLower();
|
||||
var subAccountLst = cmbSubAccount.Text.ToLower().Split(new string[] { ";", ",", ",", " " }, StringSplitOptions.RemoveEmptyEntries);
|
||||
shopList = shopList.Where(s => s.SubUserName.ParseToString().ToLower().Contains(subAccount) || subAccountLst.Any(sa => s.SubUserName.ParseToString().ToLower().Contains(sa))).ToList();
|
||||
}
|
||||
if (!string.IsNullOrEmpty(txtShopId.Text))
|
||||
{
|
||||
@@ -988,43 +1000,44 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
|
||||
private void btnSearch_Click(object sender, EventArgs e)
|
||||
{
|
||||
//Task.Run(() =>
|
||||
//{
|
||||
// RefreshDataGridView(false);
|
||||
//});
|
||||
|
||||
this.pbLoading.Visible = true;
|
||||
this.splitContainer1.Panel1.Enabled = false;
|
||||
var t = Task.Run(() =>
|
||||
{
|
||||
try
|
||||
{
|
||||
UpdateShop();
|
||||
RefreshDataGridView(false);
|
||||
}
|
||||
catch (Exception ex) { BaseMsgForm.ShowError(ex.Message); }
|
||||
});
|
||||
Task.Run(() =>
|
||||
{
|
||||
while (true)
|
||||
{
|
||||
Thread.Sleep(1000);
|
||||
if (t.IsCompleted || t.IsCanceled || t.IsFaulted)
|
||||
{
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
this.pbLoading.Visible = false;
|
||||
this.splitContainer1.Panel1.Enabled = true;
|
||||
}));
|
||||
break;
|
||||
}
|
||||
}
|
||||
RefreshDataGridView(false);
|
||||
});
|
||||
|
||||
//this.pbLoading.Visible = true;
|
||||
//this.splitContainer1.Panel1.Enabled = false;
|
||||
//var t = Task.Run(() =>
|
||||
//{
|
||||
// try
|
||||
// {
|
||||
// UpdateShop();
|
||||
// RefreshDataGridView(false);
|
||||
// }
|
||||
// catch (Exception ex) { BaseMsgForm.ShowError(ex.Message); }
|
||||
//});
|
||||
//Task.Run(() =>
|
||||
//{
|
||||
// while (true)
|
||||
// {
|
||||
// Thread.Sleep(1000);
|
||||
// if (t.IsCompleted || t.IsCanceled || t.IsFaulted)
|
||||
// {
|
||||
// Invoke(new Action(() =>
|
||||
// {
|
||||
// this.pbLoading.Visible = false;
|
||||
// this.splitContainer1.Panel1.Enabled = true;
|
||||
// }));
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
//});
|
||||
}
|
||||
|
||||
private void btnEmpty_Click(object sender, EventArgs e)
|
||||
{
|
||||
this.cmbNotes.Text = "全部";
|
||||
this.cmbSubAccount.Text = "全部";
|
||||
this.txtShopId.Text = "";
|
||||
this.txtShopName.Text = "";
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user