diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index 6367116..3f332f5 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -27,7 +27,7 @@ namespace AllBase /// /// 鐗堟湰ID /// - public static int VersionCount = 1036; + public static int VersionCount = 1051; //public static int VersionCount = 613; /// diff --git a/AllBase/Helper/GlobalConfig.cs b/AllBase/Helper/GlobalConfig.cs index d31dced..25e3dae 100644 --- a/AllBase/Helper/GlobalConfig.cs +++ b/AllBase/Helper/GlobalConfig.cs @@ -70,6 +70,7 @@ namespace AllBase.Helper public static System.Drawing.Color KJDMainColor = System.Drawing.Color.FromArgb(63, 126, 255); public static System.Drawing.Color KJDMainColor2 = System.Drawing.Color.FromArgb(185, 215, 255); public static System.Drawing.Color KJDBorderColor = System.Drawing.Color.FromArgb(25, 98, 200); + public static System.Drawing.Color PddMainColor = System.Drawing.Color.FromArgb(225, 120, 135); public static System.Drawing.Color PddMainColor2 = System.Drawing.Color.FromArgb(255, 235, 245); public static System.Drawing.Color PddBorderColor = System.Drawing.Color.FromArgb(195, 112, 135); diff --git a/PackTools/29pdd.ico b/PackTools/29pdd.ico new file mode 100644 index 0000000..2c19894 Binary files /dev/null and b/PackTools/29pdd.ico differ diff --git a/PackTools/package250714.nsi b/PackTools/package250714.nsi index b54b93d..81db3bb 100644 --- a/PackTools/package250714.nsi +++ b/PackTools/package250714.nsi @@ -7,8 +7,8 @@ !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\TemuKJD.exe" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKLM" -!define BUILD_PATH "D:\Projects\TEMU跨境达后台管理\KJD Cef138\PackTools" -!define BIN_PATH "D:\Projects\TEMU跨境达后台管理\KJD Cef138\Bin" +!define BUILD_PATH "D:\Project\TEMU跨境达后台管理\KJD Cef114\PackTools" +!define BIN_PATH "D:\Project\TEMU跨境达后台管理\KJD Cef114\Bin" SetCompressor lzma diff --git a/PackTools/package260507pdd.nsi b/PackTools/package260507pdd.nsi new file mode 100644 index 0000000..ba8a6a1 --- /dev/null +++ b/PackTools/package260507pdd.nsi @@ -0,0 +1,149 @@ +; 该脚本使用 HM VNISEdit 脚本编辑器向导产生 + +; 安装程序初始定义常量 +!define PRODUCT_NAME "29供应链" +!define PRODUCT_VERSION "v11.23" +!define PRODUCT_PUBLISHER "29供应链软件制作组" +!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\TemuKJD.exe" +!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" +!define PRODUCT_UNINST_ROOT_KEY "HKLM" +!define BUILD_PATH "D:\Project\TEMU跨境达后台管理\KJD Cef138\PackTools" +!define BIN_PATH "D:\Project\TEMU跨境达后台管理\KJD Cef138\Bin" + +SetCompressor lzma + +; ------ MUI 现代界面定义 (1.67 版本以上兼容) ------ +!include "MUI.nsh" + +; MUI 预定义常量 +!define MUI_ABORTWARNING +!define MUI_ICON "${BUILD_PATH}\29pdd.ico" +!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico" + +; 语言选择窗口常量设置 +!define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}" +!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}" +!define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language" + +; 欢迎页面 +!insertmacro MUI_PAGE_WELCOME +; 许可协议页面 +!define MUI_LICENSEPAGE_CHECKBOX +!insertmacro MUI_PAGE_LICENSE "${BUILD_PATH}\Licence.txt" +; 安装目录选择页面 +!insertmacro MUI_PAGE_DIRECTORY +; 安装过程页面 +!insertmacro MUI_PAGE_INSTFILES +; 安装完成页面 +!define MUI_FINISHPAGE_RUN "$INSTDIR\TemuKJD.exe" +!insertmacro MUI_PAGE_FINISH + +; 安装卸载过程页面 +!insertmacro MUI_UNPAGE_INSTFILES + +; 安装界面包含的语言设置 +!insertmacro MUI_LANGUAGE "English" +!insertmacro MUI_LANGUAGE "SimpChinese" + +; 安装预释放文件 +!insertmacro MUI_RESERVEFILE_LANGDLL +!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS +; ------ MUI 现代界面定义结束 ------ + +Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" +OutFile "29供应链.exe" +InstallDir "$PROGRAMFILES\29供应链" +InstallDirRegKey HKLM "${PRODUCT_UNINST_KEY}" "UninstallString" +ShowInstDetails show +ShowUnInstDetails show +BrandingText "29供应链安装程序" + +Section "MainSection" SEC01 + SetOutPath "$INSTDIR" + ;SetOverwrite on|off|try|ifnewer ;强制覆盖|不覆盖|仅覆盖可写文件|仅覆盖旧文件 + SetOverwrite on + ;/x 排除的目录或文件 + ;File /r /x "Config.xml" /x "TemuKJD.exe.choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "AllBase.pdb" /x "Work.pdb" /x "TemuKJD.pdb" /x "data" "${BIN_PATH}\*.*" + File /r /x "Config.xml" /x "TemuKJD.exe.choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "*.pdb" /x "*.zip" /x "data" /x "Cache" "${BIN_PATH}\*.*" + CreateDirectory "$SMPROGRAMS\29供应链" + CreateShortCut "$SMPROGRAMS\29供应链\29供应链.lnk" "$INSTDIR\TemuKJD.exe" "" "$INSTDIR\29pdd.ico" + CreateShortCut "$DESKTOP\29供应链.lnk" "$INSTDIR\TemuKJD.exe" "" "$INSTDIR\29pdd.ico" + File "${BIN_PATH}\TemuKJD.exe" + ;SetOutPath "$TEMP" + ;File "${BUILD_PATH}\bin\VC_redist_2015_2022.x64.exe" + ;ExecWait '$TEMP\vc_redist.x86.exe' # 一般(非静默)VC的安装 + ;ExecWait '"$TEMP\vc_redist.x86.exe" /q' # silent install 静默安装 +SectionEnd + +Section -AdditionalIcons + SetOutPath $INSTDIR + CreateShortCut "$SMPROGRAMS\29供应链\Uninstall.lnk" "$INSTDIR\uninst.exe" +SectionEnd + +Section -Post + WriteUninstaller "$INSTDIR\uninst.exe" + WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\TemuKJD.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\TemuKJD.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" +SectionEnd + +#-- 根据 NSIS 脚本编辑规则，所有 Function 区段必须放置在 Section 区段之后编写，以避免安装程序出现未可预知的问题。--# + +Function .onInit + !insertmacro MUI_LANGDLL_DISPLAY +FunctionEnd + +/****************************** + * 以下是安装程序的卸载部分 * + ******************************/ + +Section Uninstall + Delete "$INSTDIR\uninst.exe" + Delete "$TEMP\vc_redist.x86.exe" + Delete "$INSTDIR\TemuKJD.exe" + + Delete "$SMPROGRAMS\29供应链\Uninstall.lnk" + Delete "$DESKTOP\29供应链.lnk" + Delete "$SMPROGRAMS\29供应链\29供应链.lnk" + + RMDir "$SMPROGRAMS\29供应链" + + RMDir /r "$INSTDIR\blob_storage" + RMDir /r "$INSTDIR\Cache" + RMDir /r "$INSTDIR\config" + RMDir /r "$INSTDIR\data" + RMDir /r "$INSTDIR\DawnCache" + RMDir /r "$INSTDIR\GPUCache" + RMDir /r "$INSTDIR\locales" + RMDir /r "$INSTDIR\log" + RMDir /r "$INSTDIR\ru-ru" + RMDir /r "$INSTDIR\static" + RMDir /r "$INSTDIR\taobao" + RMDir /r "$INSTDIR\temp" + RMDir /r "$INSTDIR\upBak" + RMDir /r "$INSTDIR\upTemp" + RMDir /r "$INSTDIR\x64" + RMDir /r "$INSTDIR\x86" + + RMDir /r "$INSTDIR" + + DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" + DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" + SetAutoClose true +SectionEnd + +#-- 根据 NSIS 脚本编辑规则，所有 Function 区段必须放置在 Section 区段之后编写，以避免安装程序出现未可预知的问题。--# + +Function un.onInit +!insertmacro MUI_UNGETLANGUAGE + MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "您确实要完全移除 $(^Name) ，及其所有的组件？" IDYES +2 + Abort +FunctionEnd + +Function un.onUninstSuccess + HideWindow + MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) 已成功地从您的计算机移除。" +FunctionEnd diff --git a/TEMUKJD/BaseForms/BaseForm.cs b/TEMUKJD/BaseForms/BaseForm.cs index 735cac5..bd10b1b 100644 --- a/TEMUKJD/BaseForms/BaseForm.cs +++ b/TEMUKJD/BaseForms/BaseForm.cs @@ -34,6 +34,8 @@ namespace TemuKJD.BaseForms private void BaseForm_Load(object sender, EventArgs e) { + setSkinColor(this); + using (Graphics graphics = Graphics.FromHwnd(IntPtr.Zero)) { dpi = graphics.DpiX; @@ -88,6 +90,18 @@ namespace TemuKJD.BaseForms tree.GroupFont = ngf; } + if (c.Name == "pnlSA") + { + } + } + } + + public void setSkinColor(Control control) + { + foreach (Control c in control.Controls) + { + setSkinColor(c); + // pdd鐨偆棰滆壊 if (BaseClass.MainPath == "binxixi") { @@ -137,6 +151,7 @@ namespace TemuKJD.BaseForms { var dgv = c as UserComponent.DataGridViewEx; dgv.BorderColor = GlobalConfig.PddMainColor; + dgv.DefaultCellStyle.SelectionBackColor = GlobalConfig.PddMainColor; } if (c is UserComponent.UcCheckBox) { @@ -152,10 +167,6 @@ namespace TemuKJD.BaseForms tc.TabSelectTextColor = GlobalConfig.PddMainColor; } } - - if (c.Name == "pnlSA") - { - } } } } diff --git a/TEMUKJD/Extension/ControlExtension.cs b/TEMUKJD/Extension/ControlExtension.cs index 055ac97..a75c9cf 100644 --- a/TEMUKJD/Extension/ControlExtension.cs +++ b/TEMUKJD/Extension/ControlExtension.cs @@ -24,6 +24,9 @@ namespace TemuKJD.Extension } public static Point GetRelativePosition(this Control control, Control parentControl) { + if (control == null || parentControl == null) + return new Point(0, 0); + Point location = control.Location; Control parent = control.Parent; while (parent != null && parent != parentControl) diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj index 092f830..5df82b1 100644 --- a/TEMUKJD/KJD.csproj +++ b/TEMUKJD/KJD.csproj @@ -238,6 +238,7 @@ GetAddressForm.cs + Form diff --git a/TEMUKJD/KJDForms/AdminForms/AdminAccountForm.Designer.cs b/TEMUKJD/KJDForms/AdminForms/AdminAccountForm.Designer.cs index c68ba4e..0d2591d 100644 --- a/TEMUKJD/KJDForms/AdminForms/AdminAccountForm.Designer.cs +++ b/TEMUKJD/KJDForms/AdminForms/AdminAccountForm.Designer.cs @@ -31,7 +31,6 @@ namespace TemuKJD.KJDForms.AdminForms { System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer5 = new System.Windows.Forms.SplitContainer(); this.btnAdd1000 = new DevComponents.DotNetBar.PanelEx(); this.btnAdd100 = new DevComponents.DotNetBar.PanelEx(); @@ -576,17 +575,10 @@ namespace TemuKJD.KJDForms.AdminForms this.colAuthorizedAmount, this.editColumn, this.deleteColumn}); - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle3.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvUser.DefaultCellStyle = dataGridViewCellStyle3; this.dgvUser.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvUser.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); this.dgvUser.Location = new System.Drawing.Point(0, 0); + this.dgvUser.MultiSelectCheckBox = true; this.dgvUser.Name = "dgvUser"; this.dgvUser.ReadOnly = true; this.dgvUser.RowTemplate.Height = 23; @@ -678,6 +670,7 @@ namespace TemuKJD.KJDForms.AdminForms this.ClientSize = new System.Drawing.Size(800, 527); this.Controls.Add(this.splitContainer5); this.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.KeyPreview = true; this.Name = "AdminAccountForm"; this.Text = "AccountForm"; this.Load += new System.EventHandler(this.MainAccountForm_Load); diff --git a/TEMUKJD/KJDForms/ShopForms/SubAccountListForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/SubAccountListForm.Designer.cs index f60101e..50249d9 100644 --- a/TEMUKJD/KJDForms/ShopForms/SubAccountListForm.Designer.cs +++ b/TEMUKJD/KJDForms/ShopForms/SubAccountListForm.Designer.cs @@ -28,9 +28,8 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer5 = new System.Windows.Forms.SplitContainer(); this.label1 = new System.Windows.Forms.Label(); this.btnRefresh = new TemuKJD.UserControls.ButtonEx(); @@ -185,10 +184,10 @@ this.label31.TabIndex = 32; this.label31.Text = "*"; // - // repasstextBox + // txtRePass // this.txtRePass.Location = new System.Drawing.Point(112, 226); - this.txtRePass.Name = "repasstextBox"; + this.txtRePass.Name = "txtRePass"; this.txtRePass.PasswordChar = '*'; this.txtRePass.Size = new System.Drawing.Size(148, 23); this.txtRePass.TabIndex = 24; @@ -243,7 +242,7 @@ this.label36.TabIndex = 27; this.label36.Text = "*"; // - // groupIdcomboBox + // cmbGroup // this.cmbGroup.Enabled = false; this.cmbGroup.FormattingEnabled = true; @@ -254,7 +253,7 @@ "鏁版嵁", "鐧诲綍"}); this.cmbGroup.Location = new System.Drawing.Point(112, 267); - this.cmbGroup.Name = "groupIdcomboBox"; + this.cmbGroup.Name = "cmbGroup"; this.cmbGroup.Size = new System.Drawing.Size(148, 25); this.cmbGroup.TabIndex = 26; this.cmbGroup.Text = "瀹㈡湇"; @@ -269,10 +268,10 @@ this.label37.TabIndex = 25; this.label37.Text = "鍒嗙粍锛"; // - // passwordtextBox + // txtPassword // this.txtPassword.Location = new System.Drawing.Point(112, 184); - this.txtPassword.Name = "passwordtextBox"; + this.txtPassword.Name = "txtPassword"; this.txtPassword.PasswordChar = '*'; this.txtPassword.Size = new System.Drawing.Size(148, 23); this.txtPassword.TabIndex = 23; @@ -325,19 +324,20 @@ // this.dgvUser.AllowUserToAddRows = false; this.dgvUser.AllowUserToDeleteRows = false; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); - this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); + this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.dgvUser.AutoRowNumber = true; this.dgvUser.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvUser.BackgroundColor = System.Drawing.Color.White; this.dgvUser.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle5.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dgvUser.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvUser.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.UserIdColumn, @@ -348,17 +348,10 @@ this.shopCountColumn, this.editColumn, this.deleteColumn}); - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle6.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvUser.DefaultCellStyle = dataGridViewCellStyle6; this.dgvUser.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvUser.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); this.dgvUser.Location = new System.Drawing.Point(0, 5); + this.dgvUser.MultiSelectCheckBox = true; this.dgvUser.Name = "dgvUser"; this.dgvUser.ReadOnly = true; this.dgvUser.RowTemplate.Height = 23; @@ -421,12 +414,12 @@ // // SubAccountListForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.BackColor = System.Drawing.Color.White; this.ClientSize = new System.Drawing.Size(933, 445); this.Controls.Add(this.splitContainer5); this.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.KeyPreview = true; this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Name = "SubAccountListForm"; this.Text = "瀛愯处鍙风鐞"; diff --git a/TEMUKJD/MainForm.designer.cs b/TEMUKJD/MainForm.designer.cs index ea39345..6808811 100644 --- a/TEMUKJD/MainForm.designer.cs +++ b/TEMUKJD/MainForm.designer.cs @@ -42,6 +42,7 @@ namespace TemuKJD this.pnlWebBrowserJS = new DevComponents.DotNetBar.PanelEx(); this.btnDyCollect = new DevComponents.DotNetBar.ButtonX(); this.btnTest = new DevComponents.DotNetBar.ButtonX(); + this.cefPanel = new System.Windows.Forms.Panel(); this.navPanel = new DevComponents.DotNetBar.PanelEx(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.pnlSA = new DevComponents.DotNetBar.PanelEx(); @@ -151,6 +152,7 @@ namespace TemuKJD this.bodyPanel.Controls.Add(this.pnlWebBrowserJS); this.bodyPanel.Controls.Add(this.btnDyCollect); this.bodyPanel.Controls.Add(this.btnTest); + this.bodyPanel.Controls.Add(this.cefPanel); this.bodyPanel.DisabledBackColor = System.Drawing.Color.Empty; this.bodyPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.bodyPanel.Location = new System.Drawing.Point(0, 0); @@ -214,6 +216,17 @@ namespace TemuKJD this.btnTest.Visible = false; this.btnTest.Click += new System.EventHandler(this.btnTest_Click); // + // cefPanel + // + this.cefPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.cefPanel.BackColor = System.Drawing.Color.White; + this.cefPanel.Location = new System.Drawing.Point(49, 77); + this.cefPanel.Name = "cefPanel"; + this.cefPanel.Size = new System.Drawing.Size(1183, 527); + this.cefPanel.TabIndex = 131; + // // navPanel // this.navPanel.CanvasColor = System.Drawing.SystemColors.Control; @@ -770,6 +783,7 @@ namespace TemuKJD private System.Windows.Forms.Label lblVersionInfo; public DevComponents.DotNetBar.PanelEx pnlJit; public System.Windows.Forms.Label lblVersionName; + public System.Windows.Forms.Panel cefPanel; } } diff --git a/TEMUKJD/PDDForms/AdminForms/PDDAdminAccountForm.Designer.cs b/TEMUKJD/PDDForms/AdminForms/PDDAdminAccountForm.Designer.cs index fabd24c..5afdd3b 100644 --- a/TEMUKJD/PDDForms/AdminForms/PDDAdminAccountForm.Designer.cs +++ b/TEMUKJD/PDDForms/AdminForms/PDDAdminAccountForm.Designer.cs @@ -30,10 +30,12 @@ namespace TemuKJD.PDDForms.AdminForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer5 = new System.Windows.Forms.SplitContainer(); + this.chkSetCats = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chkAiImage = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.label7 = new System.Windows.Forms.Label(); this.cmbSaLevel = new System.Windows.Forms.ComboBox(); this.label6 = new System.Windows.Forms.Label(); this.lblWatermark = new System.Windows.Forms.Label(); @@ -66,9 +68,6 @@ namespace TemuKJD.PDDForms.AdminForms this.label40 = new System.Windows.Forms.Label(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.dgvUser = new TemuKJD.UserComponent.DataGridViewEx(); - this.label7 = new System.Windows.Forms.Label(); - this.chkAiImage = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.chkSetCats = new TemuKJD.UserComponent.UcCheckBox(this.components); this.UserIdColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.UserNickNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.mobileColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -145,6 +144,36 @@ namespace TemuKJD.PDDForms.AdminForms this.splitContainer5.SplitterWidth = 1; this.splitContainer5.TabIndex = 3; // + // chkSetCats + // + this.chkSetCats.AutoSize = true; + this.chkSetCats.Location = new System.Drawing.Point(194, 432); + this.chkSetCats.Name = "chkSetCats"; + this.chkSetCats.Size = new System.Drawing.Size(75, 21); + this.chkSetCats.TabIndex = 51; + this.chkSetCats.Text = "绫荤洰鎸囧畾"; + this.chkSetCats.UseVisualStyleBackColor = true; + // + // chkAiImage + // + this.chkAiImage.AutoSize = true; + this.chkAiImage.Location = new System.Drawing.Point(112, 432); + this.chkAiImage.Name = "chkAiImage"; + this.chkAiImage.Size = new System.Drawing.Size(62, 21); + this.chkAiImage.TabIndex = 50; + this.chkAiImage.Text = "Ai浼犲浘"; + this.chkAiImage.UseVisualStyleBackColor = true; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Font = new System.Drawing.Font("寰蒋闆呴粦", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label7.Location = new System.Drawing.Point(27, 432); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(79, 20); + this.label7.TabIndex = 49; + this.label7.Text = "鍔熻兘鏉冮檺锛"; + // // cmbSaLevel // this.cmbSaLevel.FormattingEnabled = true; @@ -481,20 +510,20 @@ namespace TemuKJD.PDDForms.AdminForms // this.dgvUser.AllowUserToAddRows = false; this.dgvUser.AllowUserToDeleteRows = false; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); - this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); + this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.dgvUser.AutoRowNumber = true; this.dgvUser.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvUser.BackgroundColor = System.Drawing.Color.White; this.dgvUser.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle5.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dgvUser.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvUser.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.UserIdColumn, @@ -510,14 +539,6 @@ namespace TemuKJD.PDDForms.AdminForms this.colAddShop, this.editColumn, this.deleteColumn}); - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle6.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvUser.DefaultCellStyle = dataGridViewCellStyle6; this.dgvUser.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvUser.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); this.dgvUser.Location = new System.Drawing.Point(0, 0); @@ -529,36 +550,6 @@ namespace TemuKJD.PDDForms.AdminForms this.dgvUser.TabIndex = 1; this.dgvUser.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvUser_CellContentClick); // - // label7 - // - this.label7.AutoSize = true; - this.label7.Font = new System.Drawing.Font("寰蒋闆呴粦", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(27, 432); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(79, 20); - this.label7.TabIndex = 49; - this.label7.Text = "鍔熻兘鏉冮檺锛"; - // - // chkAiImage - // - this.chkAiImage.AutoSize = true; - this.chkAiImage.Location = new System.Drawing.Point(112, 432); - this.chkAiImage.Name = "chkAiImage"; - this.chkAiImage.Size = new System.Drawing.Size(74, 21); - this.chkAiImage.TabIndex = 50; - this.chkAiImage.Text = "Ai浼犲浘"; - this.chkAiImage.UseVisualStyleBackColor = true; - // - // chkSetCats - // - this.chkSetCats.AutoSize = true; - this.chkSetCats.Location = new System.Drawing.Point(194, 432); - this.chkSetCats.Name = "chkSetCats"; - this.chkSetCats.Size = new System.Drawing.Size(75, 21); - this.chkSetCats.TabIndex = 51; - this.chkSetCats.Text = "绫荤洰鎸囧畾"; - this.chkSetCats.UseVisualStyleBackColor = true; - // // UserIdColumn // this.UserIdColumn.HeaderText = "id"; diff --git a/TEMUKJD/PDDForms/ProductForms/ActivityForms/PDDAddActivityForm.Designer.cs b/TEMUKJD/PDDForms/ProductForms/ActivityForms/PDDAddActivityForm.Designer.cs index 4a40400..9e69e24 100644 --- a/TEMUKJD/PDDForms/ProductForms/ActivityForms/PDDAddActivityForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductForms/ActivityForms/PDDAddActivityForm.Designer.cs @@ -61,7 +61,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms this.chk21365 = new TemuKJD.UserComponent.UcCheckBox(this.components); this.txtAddShippingFeeTimes = new System.Windows.Forms.TextBox(); this.label12 = new System.Windows.Forms.Label(); - this.btnApiUpload = new DevComponents.DotNetBar.PanelEx(); + this.btnSignActivity = new DevComponents.DotNetBar.PanelEx(); this.btnStop = new DevComponents.DotNetBar.PanelEx(); this.chk20981 = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chk22347 = new TemuKJD.UserComponent.UcCheckBox(this.components); @@ -142,7 +142,6 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.btnClear = new DevComponents.DotNetBar.PanelEx(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); - this.panel1 = new System.Windows.Forms.Panel(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -217,7 +216,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms this.ucGroupBoxEx2.Controls.Add(this.chk21365); this.ucGroupBoxEx2.Controls.Add(this.txtAddShippingFeeTimes); this.ucGroupBoxEx2.Controls.Add(this.label12); - this.ucGroupBoxEx2.Controls.Add(this.btnApiUpload); + this.ucGroupBoxEx2.Controls.Add(this.btnSignActivity); this.ucGroupBoxEx2.Controls.Add(this.btnStop); this.ucGroupBoxEx2.Controls.Add(this.chk20981); this.ucGroupBoxEx2.Controls.Add(this.chk22347); @@ -455,30 +454,30 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms this.label12.TabIndex = 755; this.label12.Text = "杩愯垂脳"; // - // btnApiUpload + // btnSignActivity // - this.btnApiUpload.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnApiUpload.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnApiUpload.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnApiUpload.DisabledBackColor = System.Drawing.Color.Empty; - this.btnApiUpload.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnApiUpload.Location = new System.Drawing.Point(967, 33); - this.btnApiUpload.Name = "btnApiUpload"; - this.btnApiUpload.Size = new System.Drawing.Size(66, 23); - this.btnApiUpload.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnApiUpload.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnApiUpload.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnApiUpload.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnApiUpload.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnApiUpload.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnApiUpload.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnApiUpload.Style.GradientAngle = 90; - this.btnApiUpload.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnApiUpload.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnApiUpload.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnApiUpload.TabIndex = 742; - this.btnApiUpload.Text = "鎵归噺鎶ュ悕"; - this.btnApiUpload.Click += new System.EventHandler(this.btnApiUpload_Click); + this.btnSignActivity.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnSignActivity.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSignActivity.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnSignActivity.DisabledBackColor = System.Drawing.Color.Empty; + this.btnSignActivity.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSignActivity.Location = new System.Drawing.Point(967, 33); + this.btnSignActivity.Name = "btnSignActivity"; + this.btnSignActivity.Size = new System.Drawing.Size(66, 23); + this.btnSignActivity.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnSignActivity.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSignActivity.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSignActivity.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnSignActivity.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnSignActivity.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnSignActivity.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnSignActivity.Style.GradientAngle = 90; + this.btnSignActivity.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnSignActivity.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSignActivity.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSignActivity.TabIndex = 742; + this.btnSignActivity.Text = "鎵归噺鎶ュ悕"; + this.btnSignActivity.Click += new System.EventHandler(this.btnApiUpload_Click); // // btnStop // @@ -1598,24 +1597,12 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms this.panelEx1.Text = "鍋滄褰撳墠鎿嶄綔"; this.panelEx1.Visible = false; // - // panel1 - // - this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.panel1.Location = new System.Drawing.Point(699, 552); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(838, 86); - this.panel1.TabIndex = 189; - this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint); - // // PDDAddActivityForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.BackColor = System.Drawing.Color.White; this.ClientSize = new System.Drawing.Size(1540, 641); this.Controls.Add(this.splitContainer1); - this.Controls.Add(this.panel1); this.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.KeyPreview = true; this.Name = "PDDAddActivityForm"; @@ -1671,7 +1658,6 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms private System.Windows.Forms.SplitContainer splitContainer4; private UserControls.StatusBarUserControl statusBar; private System.Windows.Forms.PictureBox pbLoading; - private System.Windows.Forms.Panel panel1; private UserComponent.UcGroupBoxEx ucGroupBoxEx2; private System.Windows.Forms.Label label11; private System.Windows.Forms.TextBox txtAddMorePrice; @@ -1702,7 +1688,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms private UserComponent.UcCheckBox chk20981; private UserComponent.UcCheckBox chk22347; private UserComponent.UcCheckBox chkUseExtCodePrice; - private DevComponents.DotNetBar.PanelEx btnApiUpload; + private DevComponents.DotNetBar.PanelEx btnSignActivity; private DevComponents.DotNetBar.PanelEx btnRefreshApi; private System.Windows.Forms.TextBox txtAddShippingFeeTimes; private System.Windows.Forms.Label label12; diff --git a/TEMUKJD/PDDForms/ProductForms/ActivityForms/PDDAddActivityForm.cs b/TEMUKJD/PDDForms/ProductForms/ActivityForms/PDDAddActivityForm.cs index ec98091..d202a7d 100644 --- a/TEMUKJD/PDDForms/ProductForms/ActivityForms/PDDAddActivityForm.cs +++ b/TEMUKJD/PDDForms/ProductForms/ActivityForms/PDDAddActivityForm.cs @@ -61,10 +61,10 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms dtpStartDay.Value = DateTime.Now.AddDays(-30); this.splitContainer1.Dock = DockStyle.Fill; - this.panel1.Location = new Point(40, 30); - this.panel1.Width = this.Width - 80; - this.panel1.Height = this.Height - 60; - this.panel1.SendToBack(); + //this.panel1.Location = new Point(40, 30); + //this.panel1.Width = this.Width - 80; + //this.panel1.Height = this.Height - 60; + //this.panel1.SendToBack(); //lstTemuDBProductSelect = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("pdd_db_prod_upload_list"); //if (lstTemuDBProductSelect == null) @@ -117,16 +117,15 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms pddActivityRule = NaiBa.Util.Helper.ConfigHelper.LoadConfig("pdd_add_activity_rule"); if (pddActivityRule == null) pddActivityRule = new PddAddActivityRule(); - this.chk22347.Checked = pddActivityRule.sign22347; - this.chk20981.Checked = pddActivityRule.sign20981; - this.chk21365.Checked = pddActivityRule.sign21365; - this.chk15996.Checked = pddActivityRule.sign15996; - this.chk23513.Checked = pddActivityRule.sign23513; - this.chk23730.Checked = pddActivityRule.sign23730; - this.chk23456.Checked = pddActivityRule.sign23456; + this.chk22347.Checked = pddActivityRule.sign22347 = pddActivityRule.sign22347 && this.chk22347.Visible; + this.chk20981.Checked = pddActivityRule.sign20981 = pddActivityRule.sign20981 && this.chk20981.Visible; + this.chk21365.Checked = pddActivityRule.sign21365 = pddActivityRule.sign21365 && this.chk21365.Visible; + this.chk15996.Checked = pddActivityRule.sign15996 = pddActivityRule.sign15996 && this.chk15996.Visible; + this.chk23513.Checked = pddActivityRule.sign23513 = pddActivityRule.sign23513 && this.chk23513.Visible; + this.chk23730.Checked = pddActivityRule.sign23730 = pddActivityRule.sign23730 && this.chk23730.Visible; + this.chk23456.Checked = pddActivityRule.sign23456 = pddActivityRule.sign23456 && this.chk23456.Visible; this.chkUseExtCodePrice.Checked = pddActivityRule.IsUseExtCodePrice; - this.panel1.SendToBack(); chkSelectAll = dgvShop.Columns["colSelect"].AddHeaderCheckBox(HorizontalAlignment.Center, 0, 0, null, null, false); dgvShop.Columns["colSelect"].HeaderText = ""; //chkSelectAll.Width = chkSelectAll.Height = 13; @@ -2101,10 +2100,16 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms if (string.IsNullOrEmpty(out_goods_sn)) return new List(); + List list = new List(); var url = BaseClass.BuildObjString("product/get_product_detail_list"); var data = UserLogin.GetSignaturex() + "&search_secret_spu_ids=" + out_goods_sn; + if (out_goods_sn.StartsWith("EC1") && out_goods_sn.EndsWith("A") && out_goods_sn.Length > 4) + { + out_goods_sn = out_goods_sn.Substring(3, out_goods_sn.Length - 4); + data = UserLogin.GetSignaturex() + "&search_spu=" + out_goods_sn; + } var html = GetHtml.PostUtf8(url, data); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) @@ -2707,20 +2712,24 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms PDDShopLoginForm loginForm = null; Invoke(new Action(() => { - this.panel1.SendToBack(); + if (MainForm.instance.WindowState == FormWindowState.Minimized) + MainForm.instance.WindowState = FormWindowState.Maximized; + + MainForm.instance.cefPanel.SendToBack(); + MainForm.instance.cefPanel.Visible = true; loginForm = new PDDShopLoginForm(shop); loginForm.TopLevel = false; loginForm.openType = EnumOpenType.manage; loginForm.WindowState = FormWindowState.Maximized; loginForm.InitUrl = "https://mms.pinduoduo.com/goods/goods_list?msfrom=mms_sidenav"; loginForm.Dock = DockStyle.Fill; - this.panel1.Controls.Add(loginForm); + MainForm.instance.cefPanel.Controls.Add(loginForm); loginForm.Show(); })); Thread.Sleep(Randomx.GetId(3000, 5000)); - Invoke(new Action(() => { + MainForm.instance.cefPanel.SendToBack(); if (loginForm != null) loginForm.Close(); })); @@ -2857,6 +2866,8 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms BaseMsgForm.ShowError("璇烽夋嫨鎶ュ悕鍟嗗搧"); return; } + + AddActivity(dgvRows); } @@ -2869,7 +2880,13 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms } this.statusBar.lblTaskStatus.Text = "姝ｅ湪鎿嶄綔..."; - btnGetProd.Enabled = false; + btnSignActivity.Enabled = false; + Task.Run(() => + { + Thread.Sleep(5000); + Invoke(new Action(() => { btnSignActivity.Enabled = true; })); + }); + if (cancellationTokenSource != null) cancellationTokenSource.Cancel(); cancellationTokenSource = new CancellationTokenSource(); @@ -3005,7 +3022,6 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms try { prodInfo = JsonHelper.DeserializeJsonToObject(dbProd.product_json); - actProd.productInfo = prodInfo; } catch (Exception ex) { @@ -3020,6 +3036,26 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms continue; } + // 濡傛灉鏈夌紪杈戣繃鐨剆ku浣跨敤缂栬緫杩囩殑sku + if (!dbProd.sku_edit_json.IsNullOrEmpty() && dbProd.sku_edit_json.Length > 10) // > 10 闃叉鏄┖鏁扮粍 + { + prodInfo.detail.sku = JsonHelper.DeserializeJsonToList(dbProd.sku_edit_json); + } + // 濡傛灉娌℃湁璐у彿鎴栨湁鐩稿悓璐у彿鏃犳硶鍖哄垎sku锛岃嚜瀹氫箟璐у彿 + if (dbProd.product_get_type_text != "鍘傚晢鐩撮噰") + { + if (prodInfo.detail.sku.Any(s => s.out_sku_sn.IsNullOrEmpty()) || + prodInfo.detail.sku.Select(s => s.out_sku_sn).ToList().Count > prodInfo.detail.sku.Select(s => s.out_sku_sn).Distinct().ToList().Count) + { + foreach (var sku in prodInfo.detail.sku) + { + sku.out_sku_sn = string.Join(";", sku.spec.Select(s => s.spec_name)); + sku.out_sku_sn = "EC1" + Math.Abs(BaseClass.GetLong(sku.out_sku_sn)) + "A"; + } + } + } + + actProd.productInfo = prodInfo; actProd.dbProduct = dbProd; #endregion @@ -3223,7 +3259,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms prodParam.goods_id = actProd.goods_id; prodParam.gallery = JsonHelper.DeserializeJsonToList(JsonHelper.SerializeObject(actProd.productInfo.detail.galleries)); - // 鐢熸垚姝ｅ父鍔犱环鐨剆ku鍒楄〃 + // 鐢熸垚姝ｅ父鍔犱环鐨勬椿鍔╯ku鍒楄〃 int index = -1; prodParam.skus = new List(); foreach (var skuGetRstInfo in actProd.lstPInfo.sku_list) @@ -3231,7 +3267,11 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms index++; var skuInfo = addPriceSkuInfoLst.FirstOrDefault(s => s.out_sku_sn == skuGetRstInfo.outSkuSn); if (skuInfo == null) - skuInfo = addPriceSkuInfoLst[index]; + { + //skuInfo = addPriceSkuInfoLst[index]; + prodParam.skus = new List(); + break; + } //var skuParam = JsonHelper.DeserializeJsonToObject(JsonHelper.SerializeObject(skuGetRstInfo)); var skuParam = new sku_param(); @@ -3260,6 +3300,19 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms } prodParam.skus.Add(skuParam); } + if (prodParam.skus.Count == 0) + { + Invoke(new Action(() => + { + row.Cells["colOpResult"].Value = "鍟嗗搧鏍煎紡鍖栭敊璇紝婧愬晢鍝乻ku涓嶅尮閰"; + })); + if (chkDown981Failed.Checked) + { + DownProd(shop, new List() { actProd.goods_id }); + } + continue; + } + prodParamLst.Add(prodParam); Invoke(new Action(() => { @@ -3268,23 +3321,34 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms } // 绛涢櫎鍒濆鍖栦笉绗﹀悎鎶ュ悕鏉′欢鐨勫晢鍝佹墍鍦ㄥ垪琛ㄨ rowOperateLst = rowOperateLst.Where(r => prodParamLst.Any(p => p.goods_id == r.Cells["colSpuId"].Value.ParseToLong())).ToList(); + // 鍓╀綑鍟嗗搧鏁伴噺澶т簬0鎵嶆姤鍚嶆椿鍔 + if (prodParamLst.Count == 0) + continue; - bool sign22347 = chk22347.Checked && chk22347.Visible; - bool sign20981 = chk20981.Checked && chk20981.Visible; - bool sign21365 = chk21365.Checked && chk21365.Visible; - bool sign15996 = chk15996.Checked && chk15996.Visible; - bool sign23513 = chk23513.Checked && chk23513.Visible; - bool sign23730 = chk23730.Checked && chk23730.Visible; - bool sign23456 = chk23456.Checked && chk23456.Visible; + bool sign22347 = chk22347.Checked; + bool sign20981 = chk20981.Checked; + bool sign21365 = chk21365.Checked; + bool sign15996 = chk15996.Checked; + bool sign23513 = chk23513.Checked; + bool sign23730 = chk23730.Checked; + bool sign23456 = chk23456.Checked; - if ((sign22347 || sign20981 || sign21365 || sign15996 || sign23513 || sign23730 || sign23456) == false) + while ((sign22347 || sign20981 || sign21365 || sign15996 || sign23513 || sign23730 || sign23456) == false) { Invoke(new Action(() => { foreach (var row in rowOperateLst) row.Cells["colOpResult"].Value = "鏈夋嫨鎶ュ悕娲诲姩"; })); - break; + Thread.Sleep(1000); + + sign22347 = chk22347.Checked; + sign20981 = chk20981.Checked; + sign21365 = chk21365.Checked; + sign15996 = chk15996.Checked; + sign23513 = chk23513.Checked; + sign23730 = chk23730.Checked; + sign23456 = chk23456.Checked; } //浠讳綍鐜妭鎶ュ悕澶辫触鐩存帴涓嬫灦锛屽寘鎷绻 @@ -3587,7 +3651,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms } Invoke(new Action(() => { - btnGetProd.Enabled = true; + btnSignActivity.Enabled = true; string sRst = "鎿嶄綔缁撴潫锛"; if (cancellationTokenSource.IsCancellationRequested) sRst = "宸插彇娑堟搷浣滐紒"; diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs index 626766f..cc6ce40 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs @@ -1072,6 +1072,28 @@ namespace TemuKJD.PDDForms.ProductSelectForms PDDProductInfo prodInfo = null; prodInfo = JsonHelper.DeserializeJsonToObject(dbProd.product_json); + // 妯℃嫙鎺ュ彛鍦ㄥ悗闈㈡湁璁剧疆鑷畾涔塻ku鍜宻ku璐у彿锛屾澶勮烦杩 + //if (!dbProd.sku_edit_json.IsNullOrEmpty() && dbProd.sku_edit_json.Length > 10) // > 10 闃叉鏄┖鏁扮粍 + //{ + // //var skuInfoEditLst = JsonHelper.DeserializeJsonToList(dbProd.sku_edit_json); + // // todo: 濡傛灉鏇存柊浜嗗浘鐗囷紝姝ゅ鍏堝鐞嗗浘鐗囦笂浼犲苟鏇挎崲 thumb_url 鍚庡啀杞崲 // 鏆傛椂鎼佺疆 + + // // 濡傛灉鏈夌紪杈戣繃鐨剆ku浣跨敤缂栬緫杩囩殑sku + // prodInfo.detail.sku = JsonHelper.DeserializeJsonToList(dbProd.sku_edit_json); + //} + //// 濡傛灉娌℃湁璐у彿鎴栨湁鐩稿悓璐у彿鏃犳硶鍖哄垎sku锛岃嚜瀹氫箟璐у彿 + //if (dbProd.product_get_type_text != "鍘傚晢鐩撮噰") + //{ + // if (prodInfo.detail.sku.Any(s => s.out_sku_sn.IsNullOrEmpty()) || + // prodInfo.detail.sku.Select(s => s.out_sku_sn).ToList().Count > prodInfo.detail.sku.Select(s => s.out_sku_sn).Distinct().ToList().Count) + // { + // foreach (var sku in prodInfo.detail.sku) + // { + // sku.out_sku_sn = string.Join(";", sku.spec.Select(s => s.spec_name)); + // sku.out_sku_sn = "EC1" + Math.Abs(BaseClass.GetLong(sku.out_sku_sn)) + "A"; + // } + // } + //} prodInfo.detail.galleries.RemoveAll(g => g.type == 6); // 瑙嗛鏆傛椂绉婚櫎锛屼互鍚庡啀瑙嗘儏鍐靛姞涓 if (prodInfo.detail.cats == null || prodInfo.detail.cats.Where(c => !string.IsNullOrEmpty(c)).Count() == 0) @@ -1086,7 +1108,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms } } - var prodParam = new PDDProductUploadParam(); int currentCount = 0; @@ -1785,6 +1806,19 @@ namespace TemuKJD.PDDForms.ProductSelectForms // 鍚﹀垯浣跨敤鍘熺増sku skuInfoEditLst = JsonHelper.DeserializeJsonToList(JsonHelper.SerializeObject(prodInfo.detail.sku)); } + // 濡傛灉娌℃湁璐у彿鎴栨湁鐩稿悓璐у彿鏃犳硶鍖哄垎sku锛岃嚜瀹氫箟璐у彿 + if (dbProd.product_get_type_text != "鍘傚晢鐩撮噰") + { + if (skuInfoEditLst.Any(s => s.out_sku_sn.IsNullOrEmpty()) || + skuInfoEditLst.Select(s => s.out_sku_sn).ToList().Count > skuInfoEditLst.Select(s => s.out_sku_sn).Distinct().ToList().Count) + { + foreach (var sku in skuInfoEditLst) + { + sku.out_sku_sn = string.Join(";", sku.spec.Select(s => s.spec_name)); + sku.out_sku_sn = "EC1" + Math.Abs(BaseClass.GetLong(sku.out_sku_sn)) + "A"; + } + } + } #endregion // 濡傛灉鍋氭椿鍔ㄥ鍊嶅姞浠凤紝琛ュ叏鍒颁袱涓猻ku瑙勬牸 @@ -7201,6 +7235,27 @@ Content-Type: image/jpeg PDDProductInfo prodInfo = null; prodInfo = JsonHelper.DeserializeJsonToObject(dbProd.product_json); + if (!dbProd.sku_edit_json.IsNullOrEmpty() && dbProd.sku_edit_json.Length > 10) // > 10 闃叉鏄┖鏁扮粍 + { + var skuInfoEditLst = JsonHelper.DeserializeJsonToList(dbProd.sku_edit_json); + // todo: 濡傛灉鏇存柊浜嗗浘鐗囷紝姝ゅ鍏堝鐞嗗浘鐗囦笂浼犲苟鏇挎崲 thumb_url 鍚庡啀杞崲 // 鏆傛椂鎼佺疆 + + // 濡傛灉鏈夌紪杈戣繃鐨剆ku浣跨敤缂栬緫杩囩殑sku + prodInfo.detail.sku = JsonHelper.DeserializeJsonToList(dbProd.sku_edit_json); + } + // 濡傛灉娌℃湁璐у彿鎴栨湁鐩稿悓璐у彿鏃犳硶鍖哄垎sku锛岃嚜瀹氫箟璐у彿 + if (dbProd.product_get_type_text != "鍘傚晢鐩撮噰") + { + if (prodInfo.detail.sku.Any(s => s.out_sku_sn.IsNullOrEmpty()) || + prodInfo.detail.sku.Select(s => s.out_sku_sn).ToList().Count > prodInfo.detail.sku.Select(s => s.out_sku_sn).Distinct().ToList().Count) + { + foreach (var sku in prodInfo.detail.sku) + { + sku.out_sku_sn = string.Join(";", sku.spec.Select(s => s.spec_name)); + sku.out_sku_sn = "EC1" + Math.Abs(BaseClass.GetLong(sku.out_sku_sn)) + "A"; + } + } + } if (BaseClass.UserAuthority.Contains("绫荤洰鎸囧畾") && chkSetCats.Checked) { @@ -7634,8 +7689,14 @@ Content-Type: image/jpeg #endregion #region AI鐢熸垚sku鍥剧墖 - if (chkActivity.Checked && chkAiImage.Checked) + if (/*chkActivity.Checked && */chkAiImage.Checked) { + Invoke(new Action(() => + { + if (cell != null) + cell.Value = "姝ｅ湪Ai鐢熷浘"; + })); + List tList = new List(); foreach (var sku in prodInfo.detail.sku) { @@ -7673,7 +7734,7 @@ Content-Type: image/jpeg var pddUpImgApi = new PddApi(shop); pddUpImgApi.Data["image"] = "data:image/jpeg;base64," + imgBase64; var pddUpImgApiRst = pddUpImgApi.PddGoodsImageUpload(); - if (!pddUpImgApiRst.Contains("\"goods_image_upload_response\"")) + if (!pddUpImgApiRst.Contains("\"goods_image_upload_response\"")) pddUpImgApiRst = pddUpImgApi.PddGoodsImageUpload(); if (!pddUpImgApiRst.Contains("\"goods_image_upload_response\"")) { @@ -7713,6 +7774,11 @@ Content-Type: image/jpeg #endregion #region 鐢熸垚涓缁勯珮鍊嶇巼鍔犱环鍚庣殑sku + Invoke(new Action(() => + { + if (cell != null) + cell.Value = "姝ｅ湪鐢熸垚sku"; + })); List addPriceFakeSkuInfoLst = new List(); Dictionary skuFakeSpecNameDic1 = new Dictionary(); Dictionary skuFakeSpecNameDic2 = new Dictionary(); @@ -7882,7 +7948,7 @@ Content-Type: image/jpeg } #endregion - #region // 娣诲姞涓涓浠秙ku锛屽簱瀛樿缃负0 + #region 娣诲姞涓涓浠秙ku锛屽簱瀛樿缃负0 if (chkMultiPcsSku.Checked) { var addMulitPcsSkuRst = AddMulitPcsSku(shop, addPriceSkuInfoLst, skuFakeSpecNameDic1); @@ -9262,6 +9328,27 @@ Content-Type: image/jpeg { return "{\"success\":false,\"draftId\":0,\"status\":\"鏈笂浼燶",\"errMsg\":\"鍟嗗搧鏍煎紡杞崲閿欒 " + ex.Message + "\"}"; } + if (!dbProd.sku_edit_json.IsNullOrEmpty() && dbProd.sku_edit_json.Length > 10) // > 10 闃叉鏄┖鏁扮粍 + { + var skuInfoEditLst = JsonHelper.DeserializeJsonToList(dbProd.sku_edit_json); + // todo: 濡傛灉鏇存柊浜嗗浘鐗囷紝姝ゅ鍏堝鐞嗗浘鐗囦笂浼犲苟鏇挎崲 thumb_url 鍚庡啀杞崲 // 鏆傛椂鎼佺疆 + + // 濡傛灉鏈夌紪杈戣繃鐨剆ku浣跨敤缂栬緫杩囩殑sku + prodInfo.detail.sku = JsonHelper.DeserializeJsonToList(dbProd.sku_edit_json); + } + // 濡傛灉娌℃湁璐у彿鎴栨湁鐩稿悓璐у彿鏃犳硶鍖哄垎sku锛岃嚜瀹氫箟璐у彿 + if (dbProd.product_get_type_text != "鍘傚晢鐩撮噰") + { + if (prodInfo.detail.sku.Any(s => s.out_sku_sn.IsNullOrEmpty()) || + prodInfo.detail.sku.Select(s => s.out_sku_sn).ToList().Count > prodInfo.detail.sku.Select(s => s.out_sku_sn).Distinct().ToList().Count) + { + foreach (var sku in prodInfo.detail.sku) + { + sku.out_sku_sn = string.Join(";", sku.spec.Select(s => s.spec_name)); + sku.out_sku_sn = "EC1" + Math.Abs(BaseClass.GetLong(sku.out_sku_sn)) + "A"; + } + } + } // 鑾峰彇鏄犲皠鍏崇郴 List relationLst = new List(); diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDFissionProdByChanceImgForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDFissionProdByChanceImgForm.cs index 4c6a243..6b49d64 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDFissionProdByChanceImgForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDFissionProdByChanceImgForm.cs @@ -26,7 +26,7 @@ using Work; namespace TemuKJD.PDDForms.ProductSelectForms { - public partial class PDDFissionProdByChanceImgForm : Form + public partial class PDDFissionProdByChanceImgForm : BaseForm { CheckBox chkSelectAll; ChanceProductConfig chanceProductConfig; diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdByImgForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdByImgForm.cs index 6c70b5e..d8fc654 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdByImgForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdByImgForm.cs @@ -26,7 +26,7 @@ using Work; namespace TemuKJD.PDDForms.ProductSelectForms { - public partial class PDDGetChanceProdByImgForm : Form + public partial class PDDGetChanceProdByImgForm : BaseForm { CheckBox chkSelectAll; ChanceProductConfig chanceProductConfig; diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.cs index ee308e3..2c37d41 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.cs @@ -27,7 +27,7 @@ using Work; namespace TemuKJD.PDDForms.ProductSelectForms { - public partial class PDDGetChanceProdForm : Form + public partial class PDDGetChanceProdForm : BaseForm { /// /// 鏄惁鏄櫘閫氭巿鏉冪敤鎴 diff --git a/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.Designer.cs b/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.Designer.cs index 3465878..5b44812 100644 --- a/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.Designer.cs +++ b/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.Designer.cs @@ -29,8 +29,8 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.label1 = new System.Windows.Forms.Label(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); @@ -39,6 +39,7 @@ this.btnLoginSelect = new TemuKJD.UserControls.ButtonEx(); this.btnCheck = new TemuKJD.UserControls.ButtonEx(); this.panel4 = new System.Windows.Forms.Panel(); + this.label5 = new System.Windows.Forms.Label(); this.btnImport = new DevComponents.DotNetBar.PanelEx(); this.btnAddShop = new DevComponents.DotNetBar.PanelEx(); this.btnOpenOrder = new TemuKJD.UserControls.ButtonEx(); @@ -127,7 +128,7 @@ this.splitContainer1.Panel2.Controls.Add(this.splitContainer2); this.splitContainer1.Panel2.Margin = new System.Windows.Forms.Padding(4); this.splitContainer1.Size = new System.Drawing.Size(1264, 622); - this.splitContainer1.SplitterDistance = 46; + this.splitContainer1.SplitterDistance = 66; this.splitContainer1.TabIndex = 33; // // tableLayoutPanel2 @@ -142,7 +143,7 @@ this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.RowCount = 1; this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(1264, 46); + this.tableLayoutPanel2.Size = new System.Drawing.Size(1264, 66); this.tableLayoutPanel2.TabIndex = 37; // // panel5 @@ -205,6 +206,7 @@ // // panel4 // + this.panel4.Controls.Add(this.label5); this.panel4.Controls.Add(this.btnImport); this.panel4.Controls.Add(this.btnAddShop); this.panel4.Controls.Add(this.btnOpenOrder); @@ -220,9 +222,19 @@ 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(1035, 40); + this.panel4.Size = new System.Drawing.Size(1035, 60); this.panel4.TabIndex = 0; // + // label5 + // + this.label5.AutoSize = true; + this.label5.ForeColor = System.Drawing.Color.OrangeRed; + this.label5.Location = new System.Drawing.Point(1, 42); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(596, 17); + this.label5.TabIndex = 822; + this.label5.Text = "娉細璁㈠崟鎺堟潈鍒版湡鍚庢棤娉曡鍙栬鍗曘佽嚜鍔ㄥ彂璐с佽鍙栧敭鍚庯紱涓婁紶鎺堟潈鍒版湡鍚庢棤娉曡繘琛屽彂甯冨晢鍝佸拰涓婁笅鏋剁瓑鎿嶄綔銆"; + // // btnImport // this.btnImport.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -410,8 +422,8 @@ // this.splitContainer2.Panel2.Controls.Add(this.chkAutoDrag); this.splitContainer2.Panel2.Controls.Add(this.statusBar); - this.splitContainer2.Size = new System.Drawing.Size(1264, 572); - this.splitContainer2.SplitterDistance = 540; + this.splitContainer2.Size = new System.Drawing.Size(1264, 552); + this.splitContainer2.SplitterDistance = 520; this.splitContainer2.TabIndex = 0; // // btnRefreshAuth @@ -435,7 +447,7 @@ // this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoading.Location = new System.Drawing.Point(607, 245); + this.pbLoading.Location = new System.Drawing.Point(607, 235); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(50, 50); this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -446,20 +458,20 @@ // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.dgvShop.AutoRowNumber = true; this.dgvShop.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvShop.BackgroundColor = System.Drawing.Color.White; this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle4.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colSelect, @@ -496,7 +508,7 @@ this.dgvShop.Name = "dgvShop"; this.dgvShop.ReadOnly = true; this.dgvShop.RowTemplate.Height = 23; - this.dgvShop.Size = new System.Drawing.Size(1256, 540); + this.dgvShop.Size = new System.Drawing.Size(1256, 520); this.dgvShop.TabIndex = 5; this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); // @@ -558,7 +570,7 @@ // // colGroupName // - this.colGroupName.FillWeight = 69.42599F; + this.colGroupName.FillWeight = 69F; this.colGroupName.HeaderText = "搴楅摵鍒嗙粍"; this.colGroupName.Name = "colGroupName"; this.colGroupName.ReadOnly = true; @@ -566,7 +578,7 @@ // // colUploadAccount // - this.colUploadAccount.FillWeight = 69.42599F; + this.colUploadAccount.FillWeight = 69F; this.colUploadAccount.HeaderText = "涓婅揣璐︽埛"; this.colUploadAccount.Name = "colUploadAccount"; this.colUploadAccount.ReadOnly = true; @@ -574,7 +586,7 @@ // // colBuyAccount // - this.colBuyAccount.FillWeight = 69.42599F; + this.colBuyAccount.FillWeight = 69F; this.colBuyAccount.HeaderText = "閲囪喘璐︽埛"; this.colBuyAccount.Name = "colBuyAccount"; this.colBuyAccount.ReadOnly = true; @@ -582,7 +594,7 @@ // // colChatAccount // - this.colChatAccount.FillWeight = 69.42599F; + this.colChatAccount.FillWeight = 69F; this.colChatAccount.HeaderText = "瀹㈡湇璐︽埛"; this.colChatAccount.Name = "colChatAccount"; this.colChatAccount.ReadOnly = true; @@ -604,7 +616,7 @@ // // colBindApi // - this.colBindApi.FillWeight = 48F; + this.colBindApi.FillWeight = 68F; this.colBindApi.HeaderText = "涓婁紶鎺堟潈"; this.colBindApi.Name = "colBindApi"; this.colBindApi.ReadOnly = true; @@ -622,7 +634,7 @@ // // colBindOrderApi // - this.colBindOrderApi.FillWeight = 48F; + this.colBindOrderApi.FillWeight = 68F; this.colBindOrderApi.HeaderText = "璁㈠崟鎺堟潈"; this.colBindOrderApi.Name = "colBindOrderApi"; this.colBindOrderApi.ReadOnly = true; @@ -695,7 +707,7 @@ // // colUpdateCookies // - this.colUpdateCookies.FillWeight = 67F; + this.colUpdateCookies.FillWeight = 55F; this.colUpdateCookies.HeaderText = "鑾峰彇Cookie"; this.colUpdateCookies.Name = "colUpdateCookies"; this.colUpdateCookies.ReadOnly = true; @@ -704,7 +716,7 @@ // // colCopyCookies // - this.colCopyCookies.FillWeight = 70F; + this.colCopyCookies.FillWeight = 55F; this.colCopyCookies.HeaderText = "澶嶅埗Cookie"; this.colCopyCookies.Name = "colCopyCookies"; this.colCopyCookies.ReadOnly = true; @@ -812,6 +824,8 @@ private System.Windows.Forms.ComboBox cmbNotes; private UserComponent.UcCheckBox chkUsePddWorkbanch; public UserControls.ButtonEx btnOpenOrder; + private DevComponents.DotNetBar.PanelEx btnAddShop; + private DevComponents.DotNetBar.PanelEx btnImport; private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; private System.Windows.Forms.DataGridViewTextBoxColumn colLoginName; private System.Windows.Forms.DataGridViewTextBoxColumn colMallId; @@ -840,7 +854,6 @@ private System.Windows.Forms.DataGridViewLinkColumn colCopyCookies; private System.Windows.Forms.DataGridViewLinkColumn colEdit; private System.Windows.Forms.DataGridViewLinkColumn colDelete; - private DevComponents.DotNetBar.PanelEx btnAddShop; - private DevComponents.DotNetBar.PanelEx btnImport; + private System.Windows.Forms.Label label5; } } \ No newline at end of file diff --git a/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.cs b/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.cs index 42f9e80..c34351a 100644 --- a/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.cs +++ b/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.cs @@ -484,7 +484,7 @@ namespace TemuKJD.PDDForms.ShopForms param.ChatAccount, "", "璐拱鎺堟潈", - "缁戝畾鎺堟潈", + "缁戝畾鎺堟潈" + (param.AuthExpiresTime < DateTime.Now ? " (宸茶繃鏈)" : param.AuthExpiresTime.ToString(" MM-dd")), "璐拱鎺堟潈", "缁戝畾鎺堟潈", "杩涘叆", @@ -504,6 +504,7 @@ namespace TemuKJD.PDDForms.ShopForms dgvShop.CurrentCell = this.dgvShop.Rows[rowIndex].Cells[2]; } } + displayShopStatus(param); })); } @@ -521,8 +522,28 @@ namespace TemuKJD.PDDForms.ShopForms dgvr.Cells["colGroupName"].Value = param.GroupName; dgvr.Cells["colUploadAccount"].Value = param.UploadAccount; dgvr.Cells["colBuyAccount"].Value = param.BuyAccount; - dgvr.Cells["colChatAccount"].Value = param.ChatAccount; + dgvr.Cells["colChatAccount"].Value = param.ChatAccount; dgvr.Cells["colRelogin"].Value = string.IsNullOrWhiteSpace(param.LoginStatus) ? "鏈櫥褰" : param.LoginStatus.Trim(); + dgvr.Cells["colBindApi"].Value = "缁戝畾鎺堟潈" + (param.AuthExpiresTime < DateTime.Now ? " (宸茶繃鏈)" : param.AuthExpiresTime.ToString(" MM-dd")); + } + + void displayShopStatus(ShopLoginInfo shop) + { + bool canUse = shop.LoginStatus == "鐧诲綍鎴愬姛"; + bool apiAuth = shop.AuthExpiresTime > DateTime.Now; + var rows = this.dgvShop.Rows.Cast().Where(r => r.Cells["colShopId"].Value.ParseToString() == shop?.ShopId); + foreach (var row in rows) + { + (row.Cells["colRelogin"] as DataGridViewLinkCell).Style.ForeColor = canUse ? Color.Blue : Color.Red; + (row.Cells["colRelogin"] as DataGridViewLinkCell).LinkColor = canUse ? Color.Blue : Color.Red; + (row.Cells["colRelogin"] as DataGridViewLinkCell).ActiveLinkColor = canUse ? Color.LightBlue : Color.OrangeRed; + (row.Cells["colRelogin"] as DataGridViewLinkCell).VisitedLinkColor = canUse ? Color.DarkBlue : Color.DarkRed; + + (row.Cells["colBindApi"] as DataGridViewLinkCell).Style.ForeColor = apiAuth ? Color.Blue : Color.Red; + (row.Cells["colBindApi"] as DataGridViewLinkCell).LinkColor = apiAuth ? Color.Blue : Color.Red; + (row.Cells["colBindApi"] as DataGridViewLinkCell).ActiveLinkColor = apiAuth ? Color.LightBlue : Color.OrangeRed; + (row.Cells["colBindApi"] as DataGridViewLinkCell).VisitedLinkColor = apiAuth ? Color.DarkBlue : Color.DarkRed; + } } /// diff --git a/TEMUKJD/PDDForms/ShopForms/PDDSubAccountListForm.Designer.cs b/TEMUKJD/PDDForms/ShopForms/PDDSubAccountListForm.Designer.cs index 9d20b4a..8f51868 100644 --- a/TEMUKJD/PDDForms/ShopForms/PDDSubAccountListForm.Designer.cs +++ b/TEMUKJD/PDDForms/ShopForms/PDDSubAccountListForm.Designer.cs @@ -28,9 +28,8 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer5 = new System.Windows.Forms.SplitContainer(); this.label1 = new System.Windows.Forms.Label(); this.btnRefresh = new TemuKJD.UserControls.ButtonEx(); @@ -185,10 +184,10 @@ this.label31.TabIndex = 32; this.label31.Text = "*"; // - // repasstextBox + // txtRePass // this.txtRePass.Location = new System.Drawing.Point(112, 226); - this.txtRePass.Name = "repasstextBox"; + this.txtRePass.Name = "txtRePass"; this.txtRePass.PasswordChar = '*'; this.txtRePass.Size = new System.Drawing.Size(148, 23); this.txtRePass.TabIndex = 24; @@ -243,7 +242,7 @@ this.label36.TabIndex = 27; this.label36.Text = "*"; // - // groupIdcomboBox + // cmbGroup // this.cmbGroup.Enabled = false; this.cmbGroup.FormattingEnabled = true; @@ -254,7 +253,7 @@ "鏁版嵁", "鐧诲綍"}); this.cmbGroup.Location = new System.Drawing.Point(112, 267); - this.cmbGroup.Name = "groupIdcomboBox"; + this.cmbGroup.Name = "cmbGroup"; this.cmbGroup.Size = new System.Drawing.Size(148, 25); this.cmbGroup.TabIndex = 26; this.cmbGroup.Text = "瀹㈡湇"; @@ -269,10 +268,10 @@ this.label37.TabIndex = 25; this.label37.Text = "鍒嗙粍锛"; // - // passwordtextBox + // txtPassword // this.txtPassword.Location = new System.Drawing.Point(112, 184); - this.txtPassword.Name = "passwordtextBox"; + this.txtPassword.Name = "txtPassword"; this.txtPassword.PasswordChar = '*'; this.txtPassword.Size = new System.Drawing.Size(148, 23); this.txtPassword.TabIndex = 23; @@ -325,19 +324,20 @@ // this.dgvUser.AllowUserToAddRows = false; this.dgvUser.AllowUserToDeleteRows = false; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); - this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); + this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.dgvUser.AutoRowNumber = true; this.dgvUser.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvUser.BackgroundColor = System.Drawing.Color.White; this.dgvUser.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle5.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dgvUser.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvUser.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.UserIdColumn, @@ -348,17 +348,10 @@ this.shopCountColumn, this.editColumn, this.deleteColumn}); - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle6.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvUser.DefaultCellStyle = dataGridViewCellStyle6; this.dgvUser.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvUser.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); this.dgvUser.Location = new System.Drawing.Point(0, 5); + this.dgvUser.MultiSelectCheckBox = true; this.dgvUser.Name = "dgvUser"; this.dgvUser.ReadOnly = true; this.dgvUser.RowTemplate.Height = 23; @@ -419,16 +412,16 @@ this.deleteColumn.Name = "deleteColumn"; this.deleteColumn.ReadOnly = true; // - // SubAccountListForm + // PDDSubAccountListForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.BackColor = System.Drawing.Color.White; this.ClientSize = new System.Drawing.Size(933, 445); this.Controls.Add(this.splitContainer5); this.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.KeyPreview = true; this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.Name = "SubAccountListForm"; + this.Name = "PDDSubAccountListForm"; this.Text = "瀛愯处鍙风鐞"; this.Load += new System.EventHandler(this.SubAccountForm_Load); this.splitContainer5.Panel1.ResumeLayout(false); diff --git a/TEMUKJD/UserComponent/DataGridViewCheckBoxColumnSelectAll.cs b/TEMUKJD/UserComponent/DataGridViewCheckBoxColumnSelectAll.cs new file mode 100644 index 0000000..4a0bd81 --- /dev/null +++ b/TEMUKJD/UserComponent/DataGridViewCheckBoxColumnSelectAll.cs @@ -0,0 +1,202 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using System.Windows.Forms.VisualStyles; + +namespace TemuKJD.UserComponent +{ + public class DataGridViewCheckBoxColumnSelectAll : DataGridViewCheckBoxColumn + { + private DatagridViewCheckBoxHeaderCell headerCell; + private bool loaded; + + public event CheckBoxClickedHandler OnCheckBoxClicked; + int TotalCheckedCheckBoxes = 0; + bool IsHeaderCheckBoxClicked = false; + + public DataGridViewCheckBoxColumnSelectAll() + { + this.headerCell = new DatagridViewCheckBoxHeaderCell(); + base.HeaderCell = this.headerCell; + + this.headerCell.OnCheckBoxClicked += new CheckBoxClickedHandler(this.headerCell_OnCheckBoxClicked); + this.loaded = false; + + } + + public DataGridViewCheckBoxColumnSelectAll(bool threeState) + : base(threeState) + { + this.headerCell = new DatagridViewCheckBoxHeaderCell(); + base.HeaderCell = this.headerCell; + } + + /// + /// 鍦―ataGridView鏀瑰彉鏃惰繘琛屼簨浠剁殑缁戝畾 + /// + protected override void OnDataGridViewChanged() + { + if (this.DataGridView != null) + { + this.DataGridView.CellValueChanged -= DataGridView_CellValueChanged; + this.DataGridView.CellValueChanged += DataGridView_CellValueChanged; + this.DataGridView.CurrentCellDirtyStateChanged -= DataGridView_CurrentCellDirtyStateChanged; + this.DataGridView.CurrentCellDirtyStateChanged += DataGridView_CurrentCellDirtyStateChanged; + } + } + + /// + /// 鍦ㄥ閫夌殑鏃跺欒繘琛屽垽鏂. + /// + /// + /// + void DataGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e) + { + if (e.RowIndex >= 0 && e.ColumnIndex >= 0) + { + if (!IsHeaderCheckBoxClicked) + RowCheckBoxClick((DataGridViewCheckBoxCell)this.DataGridView[e.ColumnIndex, e.RowIndex]); + } + + } + + /// + /// 鍦ㄥ閫夋琚変腑鐨勬椂鍊欒Е鍙戣浜嬩欢, 璇ヤ簨浠剁敤浜庤Е鍙慥alueChanged浜嬩欢 + /// + /// + /// + private void DataGridView_CurrentCellDirtyStateChanged(object sender, EventArgs e) + { + if (this.DataGridView.CurrentCell is DataGridViewCheckBoxCell) + this.DataGridView.CommitEdit(DataGridViewDataErrorContexts.Commit); + } + + /// + /// 澶嶉夋琚偣鍑绘椂鎵闇瑕佸仛鐨勬搷浣 + /// + /// + private void RowCheckBoxClick(DataGridViewCheckBoxCell checkBox) + { + var head = this.headerCell as DatagridViewCheckBoxHeaderCell; + if (checkBox != null) + { + //璁＄畻鎵鏈夎閫変腑鐨勮鐨勬暟閲 + if ((bool)checkBox.Value && TotalCheckedCheckBoxes < this.DataGridView.RowCount) + TotalCheckedCheckBoxes++; + else if (TotalCheckedCheckBoxes > 0) + TotalCheckedCheckBoxes--; + + //褰撴墍鏈夊閫夋閮借閫変腑鐨勬椂鍊,鍒楃殑澶翠笂鐨勫閫夋琚変腑, 鍙嶄箣鍒欎笉琚変腑. + if (TotalCheckedCheckBoxes < this.DataGridView.RowCount) + head.IsChecked = false; + else if (TotalCheckedCheckBoxes == this.DataGridView.RowCount) + head.IsChecked = true; + //寮哄埗repained + head.DataGridView.InvalidateCell(head); + } + } + + + /// + /// 澶磋閫変腑鏃惰Е鍙慜nCheckBoxClicked浜嬩欢. + /// + /// + private void headerCell_OnCheckBoxClicked(bool state) + { + if (this.OnCheckBoxClicked != null) + { + this.OnCheckBoxClicked(state); + } + } + + + public delegate void CheckBoxClickedHandler(bool state); + + internal class DatagridViewCheckBoxHeaderCell : DataGridViewColumnHeaderCell + { + private CheckBoxState _cbState = CheckBoxState.UncheckedNormal; + private Point _cellLocation = new Point(); + private bool _checked; + private Point checkBoxLocation; + private Size checkBoxSize; + + public bool IsChecked + { + get + { + return _checked; + } + + set + { + _checked = value; + if (this._checked) + { + this._cbState = CheckBoxState.CheckedNormal; + } + else + { + this._cbState = CheckBoxState.UncheckedNormal; + } + } + } + + public event CheckBoxClickedHandler OnCheckBoxClicked; + + /// + /// 鐐瑰嚮鍒楀ご鐨勬椂鍊欒Е鍙戠殑浜嬩欢,杩欓噷鏈変釜鍒ゆ柇, 濡傛灉鐐瑰嚮鐨勪綅缃槸澶嶉夋鍒欒Е鍙慜nCheckBoxClicked浜嬩欢. + /// + /// + protected override void OnMouseClick(DataGridViewCellMouseEventArgs e) + { + Point point = new Point(e.X + this._cellLocation.X, e.Y + this._cellLocation.Y); + if (((point.X >= this.checkBoxLocation.X) && (point.X <= (this.checkBoxLocation.X + this.checkBoxSize.Width))) && ((point.Y >= this.checkBoxLocation.Y) && (point.Y <= (this.checkBoxLocation.Y + this.checkBoxSize.Height)))) + { + this._checked = !this._checked; + bool temp = this._checked; + if (this.OnCheckBoxClicked != null) + { + this.OnCheckBoxClicked(this._checked); + base.DataGridView.InvalidateCell(this); + } + foreach (DataGridViewRow row in base.DataGridView.Rows) + { + ((DataGridViewCheckBoxCell)row.Cells[e.ColumnIndex]).Value = temp; + } + base.DataGridView.RefreshEdit(); + } + base.OnMouseClick(e); + } + + /// + /// 缁樺埗涓涓狢heckBox + /// + protected override void Paint(Graphics graphics, Rectangle clipBounds, Rectangle cellBounds, int rowIndex, DataGridViewElementStates dataGridViewElementState, object value, object formattedValue, string errorText, DataGridViewCellStyle cellStyle, DataGridViewAdvancedBorderStyle advancedBorderStyle, DataGridViewPaintParts paintParts) + { + base.Paint(graphics, clipBounds, cellBounds, rowIndex, dataGridViewElementState, value, formattedValue, errorText, cellStyle, advancedBorderStyle, paintParts); + Point point = new Point(); + Size glyphSize = CheckBoxRenderer.GetGlyphSize(graphics, CheckBoxState.UncheckedNormal); + point.X = (cellBounds.Location.X + (cellBounds.Width / 2)) - (glyphSize.Width / 2) - 1; // x浣嶇疆琛ュ伩涓涓儚绱(鍚﹀垯鍦╳in11涓亸鍙) + point.Y = (cellBounds.Location.Y + (cellBounds.Height / 2)) - (glyphSize.Height / 2); + //point.X = cellBounds.Location.X + (cellBounds.Width - glyphSize.Width) / 2; // 鏀句竴鍧椾互鍚庨櫎浠2浼氭湁鎶栧姩 + //point.Y = cellBounds.Location.Y + (cellBounds.Height - glyphSize.Height) / 2; + this._cellLocation = cellBounds.Location; + this.checkBoxLocation = point; + this.checkBoxSize = glyphSize; + if (this._checked) + { + this._cbState = CheckBoxState.CheckedNormal; + } + else + { + this._cbState = CheckBoxState.UncheckedNormal; + } + CheckBoxRenderer.DrawCheckBox(graphics, this.checkBoxLocation, this._cbState); + } + } + } +} diff --git a/TEMUKJD/UserComponent/UcComboBoxMutiSelect .cs b/TEMUKJD/UserComponent/UcComboBoxMutiSelect .cs index 1d6dd98..fd85e8e 100644 --- a/TEMUKJD/UserComponent/UcComboBoxMutiSelect .cs +++ b/TEMUKJD/UserComponent/UcComboBoxMutiSelect .cs @@ -148,7 +148,9 @@ namespace TemuKJD.UserComponent lblX.SendToBack(); //Form form = this.FindForm(); //form.Controls.Add(lblX); - this.GetParentNotTable().Controls.Add(lblX); + var p = this.GetParentNotTable(); + if (p != null) + p.Controls.Add(lblX); } Point relativeLocation = this.GetRelativePosition(this.GetParentNotTable()); lblX.Location = new Point(relativeLocation.X + this.Width - 19 - lblX.Width, relativeLocation.Y + (this.Height - lblX.Height) / 2); diff --git a/TEMUKJD/UserComponent/UcTabControlMetro.cs b/TEMUKJD/UserComponent/UcTabControlMetro.cs index 500fffe..77f6a21 100644 --- a/TEMUKJD/UserComponent/UcTabControlMetro.cs +++ b/TEMUKJD/UserComponent/UcTabControlMetro.cs @@ -144,7 +144,8 @@ namespace TemuKJD.UserControls e.Graphics.DrawLine(new Pen(tabSelectColor), new Point(rect.Left, rect.Top), new Point(rect.Right, rect.Top)); e.Graphics.DrawLine(new Pen(tabSelectColor), new Point(rect.Right, rect.Top), new Point(rect.Right, rect.Bottom)); // 缁樺埗tab鏍囬鏂囧瓧 - e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SystemDefault; + //e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SystemDefault; + e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAliasGridFit; e.Graphics.DrawString(this.TabPages[i].Text, this.Font, new SolidBrush(tabSelectTextColor), textPoint.X, textPoint.Y); } else @@ -152,7 +153,8 @@ namespace TemuKJD.UserControls // 缁樺埗tab妗 e.Graphics.FillRectangle(new SolidBrush(tabSelectColor), this.GetTabRect(i)); // 缁樺埗tab鏍囬鏂囧瓧 - e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SystemDefault; + //e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SystemDefault; + e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAliasGridFit; e.Graphics.DrawString(this.TabPages[i].Text, this.Font, new SolidBrush(tabUnSelectTextColor), textPoint.X, textPoint.Y); } diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs index d38dc56..8c178e9 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs @@ -30,10 +30,10 @@ namespace TemuKJD.WXForms.AdminForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer5 = new System.Windows.Forms.SplitContainer(); + this.chkShopOptimize = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chkChanceProdCollect = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chkShopPoints = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chkWXShowProdGetFromType = new TemuKJD.UserComponent.UcCheckBox(this.components); @@ -87,7 +87,6 @@ namespace TemuKJD.WXForms.AdminForms this.editColumn = new System.Windows.Forms.DataGridViewLinkColumn(); this.deleteColumn = new System.Windows.Forms.DataGridViewLinkColumn(); this.btnExportShopErp = new DevComponents.DotNetBar.PanelEx(); - this.chkShopOptimize = new TemuKJD.UserComponent.UcCheckBox(this.components); ((System.ComponentModel.ISupportInitialize)(this.splitContainer5)).BeginInit(); this.splitContainer5.Panel1.SuspendLayout(); this.splitContainer5.Panel2.SuspendLayout(); @@ -156,6 +155,15 @@ namespace TemuKJD.WXForms.AdminForms this.splitContainer5.SplitterWidth = 1; this.splitContainer5.TabIndex = 3; // + // chkShopOptimize + // + this.chkShopOptimize.Location = new System.Drawing.Point(112, 422); + this.chkShopOptimize.Name = "chkShopOptimize"; + this.chkShopOptimize.Size = new System.Drawing.Size(68, 21); + this.chkShopOptimize.TabIndex = 813; + this.chkShopOptimize.Text = "璇勫垎鑰冩牳"; + this.chkShopOptimize.UseVisualStyleBackColor = true; + // // chkChanceProdCollect // this.chkChanceProdCollect.Location = new System.Drawing.Point(192, 422); @@ -543,20 +551,20 @@ namespace TemuKJD.WXForms.AdminForms // this.dgvUser.AllowUserToAddRows = false; this.dgvUser.AllowUserToDeleteRows = false; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); - this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); + this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.dgvUser.AutoRowNumber = true; this.dgvUser.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvUser.BackgroundColor = System.Drawing.Color.White; this.dgvUser.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle5.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dgvUser.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvUser.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.UserIdColumn, @@ -574,14 +582,6 @@ namespace TemuKJD.WXForms.AdminForms this.colAddShop, this.editColumn, this.deleteColumn}); - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle6.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvUser.DefaultCellStyle = dataGridViewCellStyle6; this.dgvUser.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvUser.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); this.dgvUser.Location = new System.Drawing.Point(0, 0); @@ -722,15 +722,6 @@ namespace TemuKJD.WXForms.AdminForms this.btnExportShopErp.Visible = false; this.btnExportShopErp.Click += new System.EventHandler(this.btnExportShopErp_Click); // - // chkShopOptimize - // - this.chkShopOptimize.Location = new System.Drawing.Point(112, 422); - this.chkShopOptimize.Name = "chkShopOptimize"; - this.chkShopOptimize.Size = new System.Drawing.Size(68, 21); - this.chkShopOptimize.TabIndex = 813; - this.chkShopOptimize.Text = "璇勫垎鑰冩牳"; - this.chkShopOptimize.UseVisualStyleBackColor = true; - // // WXAdminAccountForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.Designer.cs b/TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.Designer.cs index d8433b3..ab33fc4 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.Designer.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.Designer.cs @@ -68,7 +68,11 @@ namespace TemuKJD.WXForms.AdminForms this.btnRemainOK = new DevComponents.DotNetBar.PanelEx(); this.lblAddProdRemaining = new System.Windows.Forms.Label(); this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); - this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.chkAutoDrag = new System.Windows.Forms.CheckBox(); + this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); + this.panel3 = new System.Windows.Forms.Panel(); + this.colSelect = new TemuKJD.UserComponent.DataGridViewCheckBoxColumnSelectAll(); this.colLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopAccount = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -99,10 +103,6 @@ namespace TemuKJD.WXForms.AdminForms this.colEdit = new System.Windows.Forms.DataGridViewLinkColumn(); this.colDelete = new System.Windows.Forms.DataGridViewLinkColumn(); this.colMsg = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.chkAutoDrag = new System.Windows.Forms.CheckBox(); - this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); - this.panel3 = new System.Windows.Forms.Panel(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -670,10 +670,57 @@ namespace TemuKJD.WXForms.AdminForms this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); this.dgvShop.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvShop_CellMouseDown); // + // chkAutoDrag + // + this.chkAutoDrag.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.chkAutoDrag.AutoSize = true; + this.chkAutoDrag.BackColor = System.Drawing.Color.White; + this.chkAutoDrag.Location = new System.Drawing.Point(595, 0); + this.chkAutoDrag.Name = "chkAutoDrag"; + this.chkAutoDrag.Size = new System.Drawing.Size(159, 21); + this.chkAutoDrag.TabIndex = 3; + this.chkAutoDrag.Text = "鐧诲綍鏃惰嚜鍔ㄦ粦鍔ㄦ嫾鍥鹃獙璇"; + this.chkAutoDrag.UseVisualStyleBackColor = false; + this.chkAutoDrag.Visible = false; + // + // ucSplitPage1 + // + this.ucSplitPage1.CurrentPage = 1; + this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; + this.ucSplitPage1.IsShowPageSize = true; + this.ucSplitPage1.Location = new System.Drawing.Point(882, 0); + this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); + this.ucSplitPage1.Name = "ucSplitPage1"; + this.ucSplitPage1.PageSize = 50; + this.ucSplitPage1.Size = new System.Drawing.Size(389, 25); + this.ucSplitPage1.TabIndex = 4; + this.ucSplitPage1.TotalPage = 1; + // + // statusBar + // + this.statusBar.BackColor = System.Drawing.Color.White; + this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; + this.statusBar.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.statusBar.Location = new System.Drawing.Point(0, 0); + this.statusBar.Margin = new System.Windows.Forms.Padding(0); + this.statusBar.Name = "statusBar"; + this.statusBar.Size = new System.Drawing.Size(1271, 25); + this.statusBar.TabIndex = 1; + // + // panel3 + // + this.panel3.BackColor = System.Drawing.Color.White; + this.panel3.Controls.Add(this.splitContainer1); + this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel3.Location = new System.Drawing.Point(1, 33); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(1271, 576); + this.panel3.TabIndex = 35; + // // colSelect // this.colSelect.FillWeight = 26F; - this.colSelect.HeaderText = "閫"; + this.colSelect.HeaderText = ""; this.colSelect.Name = "colSelect"; this.colSelect.ReadOnly = true; this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True; @@ -930,53 +977,6 @@ namespace TemuKJD.WXForms.AdminForms this.colMsg.ReadOnly = true; this.colMsg.Visible = false; // - // chkAutoDrag - // - this.chkAutoDrag.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.chkAutoDrag.AutoSize = true; - this.chkAutoDrag.BackColor = System.Drawing.Color.White; - this.chkAutoDrag.Location = new System.Drawing.Point(595, 0); - this.chkAutoDrag.Name = "chkAutoDrag"; - this.chkAutoDrag.Size = new System.Drawing.Size(159, 21); - this.chkAutoDrag.TabIndex = 3; - this.chkAutoDrag.Text = "鐧诲綍鏃惰嚜鍔ㄦ粦鍔ㄦ嫾鍥鹃獙璇"; - this.chkAutoDrag.UseVisualStyleBackColor = false; - this.chkAutoDrag.Visible = false; - // - // ucSplitPage1 - // - this.ucSplitPage1.CurrentPage = 1; - this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; - this.ucSplitPage1.IsShowPageSize = true; - this.ucSplitPage1.Location = new System.Drawing.Point(882, 0); - this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); - this.ucSplitPage1.Name = "ucSplitPage1"; - this.ucSplitPage1.PageSize = 50; - this.ucSplitPage1.Size = new System.Drawing.Size(389, 25); - this.ucSplitPage1.TabIndex = 4; - this.ucSplitPage1.TotalPage = 1; - // - // statusBar - // - this.statusBar.BackColor = System.Drawing.Color.White; - this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; - this.statusBar.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.statusBar.Location = new System.Drawing.Point(0, 0); - this.statusBar.Margin = new System.Windows.Forms.Padding(0); - this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(1271, 25); - this.statusBar.TabIndex = 1; - // - // panel3 - // - this.panel3.BackColor = System.Drawing.Color.White; - this.panel3.Controls.Add(this.splitContainer1); - this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel3.Location = new System.Drawing.Point(1, 33); - this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(1271, 576); - this.panel3.TabIndex = 35; - // // WXAdminShopListForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1055,7 +1055,7 @@ namespace TemuKJD.WXForms.AdminForms private System.Windows.Forms.Panel panel3; public System.Windows.Forms.Label lblAddToAccount; public DevComponents.DotNetBar.PanelEx btnAddToAccount; - private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; + private UserComponent.DataGridViewCheckBoxColumnSelectAll colSelect; private System.Windows.Forms.DataGridViewTextBoxColumn colLoginName; private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; private System.Windows.Forms.DataGridViewTextBoxColumn colShopAccount; diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.cs b/TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.cs index 8406db8..4565914 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.cs @@ -47,7 +47,7 @@ namespace TemuKJD.WXForms.AdminForms { this.ucSplitPage1.PageChange += UcSplitPage1_PageChange; - this.dgvShop.AddSelectorColumn("colSelect"); + //this.dgvShop.AddSelectorColumn("colSelect"); this.dgvShop.AddMergeColumnHeader(new List() { /*"colMinus",*/ "colProductRemaining", "colPlus" }, "閫夊搧闄愰"); this.dgvShop.AddMergeColumn(new List() { /*"colMinus",*/ "colProductRemaining", "colPlus" }); this.dgvShop.Columns["colMinus"].HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter; diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs index 7f65ce5..272d8a9 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs @@ -1650,8 +1650,25 @@ namespace TemuKJD.WXForms.ProductForms } #endregion - #region 鏆傛椂涓嶄笂浼犺棰 + #region 鎻愬彇婧愬晢鍝佽鎯咃紝鏍规嵁闇瑕佺敓鎴恠ku璐у彿 var prodInfo = JsonHelper.DeserializeJsonToObject(dbProd.product_json); + + // 濡傛灉娌℃湁璐у彿鎴栨湁鐩稿悓璐у彿鏃犳硶鍖哄垎sku锛岃嚜瀹氫箟璐у彿 + if (dbProd.product_get_type_text != "鍘傚晢鐩撮噰") + { + if (prodInfo.detail.sku.Any(s => s.out_sku_sn.IsNullOrEmpty()) || + prodInfo.detail.sku.Select(s => s.out_sku_sn).ToList().Count > prodInfo.detail.sku.Select(s => s.out_sku_sn).Distinct().ToList().Count) + { + foreach (var sku in prodInfo.detail.sku) + { + sku.out_sku_sn = string.Join(";", sku.spec.Select(s => s.spec_name)); + sku.out_sku_sn = "EC1" + Math.Abs(BaseClass.GetLong(sku.out_sku_sn)) + "A"; + } + } + } + #endregion + + #region 鏆傛椂涓嶄笂浼犺棰 prodInfo.detail.galleries.RemoveAll(g => g.type == 6); // 瑙嗛鏆傛椂绉婚櫎锛屼互鍚庡啀瑙嗘儏鍐靛姞涓 #endregion @@ -2852,7 +2869,7 @@ namespace TemuKJD.WXForms.ProductForms { if (propInfo.name == "鍑虹増绀惧悕绉") attr = productAttr.attr.FirstOrDefault(r => r.name == "鍑虹増绀惧悕绉"); - else if (propInfo.name == "ISBN缂栧彿") + else if (propInfo.name == "ISBN缂栧彿" && !prodInfo.property.goods_properties.Any(p => p.name == "ISBN鐗堝彿/CN鍒婂彿")) attr = productAttr.attr.FirstOrDefault(r => r.name == "ISBN鐗堝彿/CN鍒婂彿"); else if (propInfo.name == "涔﹀悕") attr = productAttr.attr.FirstOrDefault(r => r.name == "涔﹀悕"); @@ -3049,7 +3066,7 @@ namespace TemuKJD.WXForms.ProductForms if ((propInfo.values.FirstOrDefault()?.value).ParseToString().EndsWith(attr.value)) attrValue = propInfo.values.FirstOrDefault()?.value; else - attr.value = "100 ml"; + attrValue = "100 ml"; } else if (attr.value == "L") { @@ -3062,7 +3079,7 @@ namespace TemuKJD.WXForms.ProductForms attrValue = "1 L"; } else - attr.value = "1 L"; + attrValue = "1 L"; } else if (attr.value == "g;kg;ml;L") { @@ -3070,7 +3087,26 @@ namespace TemuKJD.WXForms.ProductForms if (propInfoValue.EndsWith("g") || propInfoValue.EndsWith("kg") || propInfoValue.EndsWith("ml") || propInfoValue.EndsWith("L")) attrValue = propInfo.values.FirstOrDefault()?.value; else - attr.value = "100 g"; + attrValue = "100 g"; + } + else + { + attrValue = propInfo.values.FirstOrDefault()?.value.ParseToString(); + var units = attr.value.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); + foreach (var unit in units) + { + var val = attrValue.Replace(unit, "").Trim(); + if (attr.type == "decimal4_unit" && val.ParseToDecimal() != 0m) + { + attrValue = val + " " + unit; + break; + } + if (attr.type == "integer_unit" && val.ParseToInt() != 0) + { + attrValue = val + " " + unit; + break; + } + } } } @@ -3157,6 +3193,8 @@ namespace TemuKJD.WXForms.ProductForms attrValue = new List() { "鏉庤佸笀", "寮犺佸笀", "鐜嬭佸笀" }[Randomx.GetId(3)]; if (attr.name == "鍖呰") attrValue = "骞宠"; + if (attr.name == "鍑虹増鏃堕棿") + attrValue = DateTime.Now.AddMonths(0 - Randomx.GetId(3, 7)).ToString("yyyy-MM"); } if (upProdParam.product.info.category.FirstOrDefault()?.name == "椋熷搧楗枡" || prodInfo.detail.cats.FirstOrDefault() == "椋熷搧楗枡") { diff --git a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.Designer.cs index 689df09..2a5fe29 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.Designer.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.Designer.cs @@ -36,12 +36,38 @@ namespace TemuKJD.WXForms.ShopForms System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle(); @@ -53,32 +79,6 @@ namespace TemuKJD.WXForms.ShopForms System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle46 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.btnWaybillManage = new DevComponents.DotNetBar.PanelEx(); @@ -124,62 +124,27 @@ namespace TemuKJD.WXForms.ShopForms this.panel1 = new System.Windows.Forms.Panel(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.dgvData1 = new TemuKJD.UserComponent.DataGridViewEx(); + this.colDgv1Check = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colDgv1ShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv1ShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv1ShopLogin = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colDgv1InShop = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colDgv1ImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv1Img = new System.Windows.Forms.DataGridViewImageColumn(); + this.colDgv1SpuId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv1ProductName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv1Spec = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv1OutSn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv1OrderId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv1Address = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv1OrderTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv1AfterSaleReason = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv1OptimizeStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv1Optimize = new System.Windows.Forms.DataGridViewLinkColumn(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.panel2 = new System.Windows.Forms.Panel(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.dgvData2 = new TemuKJD.UserComponent.DataGridViewEx(); - this.tabPage3 = new System.Windows.Forms.TabPage(); - this.mainPanel = new System.Windows.Forms.Panel(); - this.pictureBox3 = new System.Windows.Forms.PictureBox(); - this.dgvData3 = new TemuKJD.UserComponent.DataGridViewEx(); - this.tabPage4 = new System.Windows.Forms.TabPage(); - this.panel3 = new System.Windows.Forms.Panel(); - this.pictureBox4 = new System.Windows.Forms.PictureBox(); - this.dgvData4 = new TemuKJD.UserComponent.DataGridViewEx(); - this.tabPage5 = new System.Windows.Forms.TabPage(); - this.chkTestNoAuditUpload = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); - this.splitContainer3 = new System.Windows.Forms.SplitContainer(); - this.colDgv4Check = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.colDgv4ShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv4ShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv4Login = new System.Windows.Forms.DataGridViewLinkColumn(); - this.colDgv4InShop = new System.Windows.Forms.DataGridViewLinkColumn(); - this.colDgv4ImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv4Img = new System.Windows.Forms.DataGridViewImageColumn(); - this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv4OrderId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv4Address = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv4OrderTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv4Addresses = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv4OptimizeStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv4Optimize = new System.Windows.Forms.DataGridViewLinkColumn(); - this.colDgv3Check = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.colDgv3ShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv3ShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv3Login = new System.Windows.Forms.DataGridViewLinkColumn(); - this.colDgv3InShop = new System.Windows.Forms.DataGridViewLinkColumn(); - this.colDgv3ImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv3Img = new System.Windows.Forms.DataGridViewImageColumn(); - this.colDgv3DraftId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv3ProductName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv3Spec = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv3ExtCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv3OrderId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv3Address = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv3OrderTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv3PayTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv3TakeTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv3Duration = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv3DeliveryName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv3OptimizeStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv3Optimize = new System.Windows.Forms.DataGridViewLinkColumn(); this.colDgv2Check = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colDgv2ShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv2ShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -200,23 +165,60 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv2CommentContent = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv2OptimizeStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv2Optimize = new System.Windows.Forms.DataGridViewLinkColumn(); - this.colDgv1Check = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.colDgv1ShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv1ShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv1ShopLogin = new System.Windows.Forms.DataGridViewLinkColumn(); - this.colDgv1InShop = new System.Windows.Forms.DataGridViewLinkColumn(); - this.colDgv1ImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv1Img = new System.Windows.Forms.DataGridViewImageColumn(); - this.colDgv1SpuId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv1ProductName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv1Spec = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv1OutSn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv1OrderId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv1Address = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv1OrderTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv1AfterSaleReason = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv1OptimizeStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv1Optimize = new System.Windows.Forms.DataGridViewLinkColumn(); + this.tabPage3 = new System.Windows.Forms.TabPage(); + this.mainPanel = new System.Windows.Forms.Panel(); + this.pictureBox3 = new System.Windows.Forms.PictureBox(); + this.dgvData3 = new TemuKJD.UserComponent.DataGridViewEx(); + this.tabPage4 = new System.Windows.Forms.TabPage(); + this.panel3 = new System.Windows.Forms.Panel(); + this.pictureBox4 = new System.Windows.Forms.PictureBox(); + this.dgvData4 = new TemuKJD.UserComponent.DataGridViewEx(); + this.tabPage5 = new System.Windows.Forms.TabPage(); + this.chkTestNoAuditUpload = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); + this.splitContainer3 = new System.Windows.Forms.SplitContainer(); + this.colDgv3Check = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colDgv3ShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3ShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3Login = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colDgv3InShop = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colDgv3ImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3Img = new System.Windows.Forms.DataGridViewImageColumn(); + this.colDgv3DraftId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3ProductName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3Spec = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3ExtCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3OrderId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3Address = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3OrderTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3PayTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3TakeTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3Duration = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3DeliveryName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3WaybillId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3OptimizeStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3Optimize = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colDgv4Check = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colDgv4ShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv4ShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv4Login = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colDgv4InShop = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colDgv4ImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv4Img = new System.Windows.Forms.DataGridViewImageColumn(); + this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv4OrderId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv4Address = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv4OrderTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv4WaybillId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv4Addresses = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv4OptimizeStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv4Optimize = new System.Windows.Forms.DataGridViewLinkColumn(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -999,6 +1001,150 @@ namespace TemuKJD.WXForms.ShopForms this.dgvData1.TabIndex = 187; this.dgvData1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvData_CellContentClick); // + // colDgv1Check + // + this.colDgv1Check.Frozen = true; + this.colDgv1Check.HeaderText = "閫夋嫨"; + this.colDgv1Check.Name = "colDgv1Check"; + this.colDgv1Check.ReadOnly = true; + this.colDgv1Check.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv1Check.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colDgv1Check.Width = 30; + // + // colDgv1ShopId + // + this.colDgv1ShopId.HeaderText = "搴楅摵Id"; + this.colDgv1ShopId.Name = "colDgv1ShopId"; + this.colDgv1ShopId.ReadOnly = true; + this.colDgv1ShopId.Visible = false; + // + // colDgv1ShopName + // + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv1ShopName.DefaultCellStyle = dataGridViewCellStyle5; + this.colDgv1ShopName.HeaderText = "搴楅摵鍚嶇О"; + this.colDgv1ShopName.Name = "colDgv1ShopName"; + this.colDgv1ShopName.ReadOnly = true; + // + // colDgv1ShopLogin + // + this.colDgv1ShopLogin.HeaderText = "鐧诲綍"; + this.colDgv1ShopLogin.Name = "colDgv1ShopLogin"; + this.colDgv1ShopLogin.ReadOnly = true; + this.colDgv1ShopLogin.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv1ShopLogin.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colDgv1ShopLogin.Visible = false; + this.colDgv1ShopLogin.Width = 40; + // + // colDgv1InShop + // + this.colDgv1InShop.HeaderText = "杩涘簵"; + this.colDgv1InShop.Name = "colDgv1InShop"; + this.colDgv1InShop.ReadOnly = true; + this.colDgv1InShop.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv1InShop.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colDgv1InShop.Visible = false; + this.colDgv1InShop.Width = 40; + // + // colDgv1ImgUrl + // + this.colDgv1ImgUrl.HeaderText = "鍥剧墖鍦板潃"; + this.colDgv1ImgUrl.Name = "colDgv1ImgUrl"; + this.colDgv1ImgUrl.ReadOnly = true; + this.colDgv1ImgUrl.Visible = false; + // + // colDgv1Img + // + this.colDgv1Img.HeaderText = "鍥剧墖"; + this.colDgv1Img.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; + this.colDgv1Img.Name = "colDgv1Img"; + this.colDgv1Img.ReadOnly = true; + this.colDgv1Img.Width = 60; + // + // colDgv1SpuId + // + this.colDgv1SpuId.HeaderText = "鍟嗗搧Id"; + this.colDgv1SpuId.Name = "colDgv1SpuId"; + this.colDgv1SpuId.ReadOnly = true; + this.colDgv1SpuId.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv1SpuId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.colDgv1SpuId.Width = 110; + // + // colDgv1ProductName + // + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv1ProductName.DefaultCellStyle = dataGridViewCellStyle6; + this.colDgv1ProductName.HeaderText = "鍟嗗搧鏍囬"; + this.colDgv1ProductName.Name = "colDgv1ProductName"; + this.colDgv1ProductName.ReadOnly = true; + this.colDgv1ProductName.Width = 180; + // + // colDgv1Spec + // + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv1Spec.DefaultCellStyle = dataGridViewCellStyle7; + this.colDgv1Spec.HeaderText = "鍟嗗搧瑙勬牸"; + this.colDgv1Spec.Name = "colDgv1Spec"; + this.colDgv1Spec.ReadOnly = true; + this.colDgv1Spec.Width = 145; + // + // colDgv1OutSn + // + this.colDgv1OutSn.HeaderText = "sku缂栫爜"; + this.colDgv1OutSn.Name = "colDgv1OutSn"; + this.colDgv1OutSn.ReadOnly = true; + this.colDgv1OutSn.Visible = false; + this.colDgv1OutSn.Width = 150; + // + // colDgv1OrderId + // + this.colDgv1OrderId.HeaderText = "璁㈠崟鍙"; + this.colDgv1OrderId.Name = "colDgv1OrderId"; + this.colDgv1OrderId.ReadOnly = true; + this.colDgv1OrderId.Width = 145; + // + // colDgv1Address + // + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv1Address.DefaultCellStyle = dataGridViewCellStyle8; + this.colDgv1Address.HeaderText = "鏀惰揣鍦板潃"; + this.colDgv1Address.Name = "colDgv1Address"; + this.colDgv1Address.ReadOnly = true; + // + // colDgv1OrderTime + // + dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv1OrderTime.DefaultCellStyle = dataGridViewCellStyle9; + this.colDgv1OrderTime.HeaderText = "涓嬪崟鏃堕棿"; + this.colDgv1OrderTime.Name = "colDgv1OrderTime"; + this.colDgv1OrderTime.ReadOnly = true; + this.colDgv1OrderTime.Width = 75; + // + // colDgv1AfterSaleReason + // + dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv1AfterSaleReason.DefaultCellStyle = dataGridViewCellStyle10; + this.colDgv1AfterSaleReason.HeaderText = "閫娆惧師鍥"; + this.colDgv1AfterSaleReason.Name = "colDgv1AfterSaleReason"; + this.colDgv1AfterSaleReason.ReadOnly = true; + this.colDgv1AfterSaleReason.Width = 150; + // + // colDgv1OptimizeStatus + // + dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv1OptimizeStatus.DefaultCellStyle = dataGridViewCellStyle11; + this.colDgv1OptimizeStatus.HeaderText = "琛ュ彂鐘舵"; + this.colDgv1OptimizeStatus.Name = "colDgv1OptimizeStatus"; + this.colDgv1OptimizeStatus.ReadOnly = true; + this.colDgv1OptimizeStatus.Width = 80; + // + // colDgv1Optimize + // + this.colDgv1Optimize.HeaderText = "琛ュ彂"; + this.colDgv1Optimize.Name = "colDgv1Optimize"; + this.colDgv1Optimize.ReadOnly = true; + this.colDgv1Optimize.Width = 50; + // // tabPage2 // this.tabPage2.Controls.Add(this.panel2); @@ -1081,570 +1227,6 @@ namespace TemuKJD.WXForms.ShopForms this.dgvData2.TabIndex = 187; this.dgvData2.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvData_CellContentClick); // - // tabPage3 - // - this.tabPage3.Controls.Add(this.mainPanel); - this.tabPage3.Location = new System.Drawing.Point(2, 40); - this.tabPage3.Name = "tabPage3"; - this.tabPage3.Size = new System.Drawing.Size(1408, 489); - this.tabPage3.TabIndex = 1; - this.tabPage3.Text = " 鎻芥敹涓嶈揪鏍 "; - this.tabPage3.UseVisualStyleBackColor = true; - // - // mainPanel - // - this.mainPanel.Controls.Add(this.pictureBox3); - this.mainPanel.Controls.Add(this.dgvData3); - this.mainPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.mainPanel.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.mainPanel.Location = new System.Drawing.Point(0, 0); - this.mainPanel.Name = "mainPanel"; - this.mainPanel.Size = new System.Drawing.Size(1408, 489); - this.mainPanel.TabIndex = 1; - // - // pictureBox3 - // - this.pictureBox3.Anchor = System.Windows.Forms.AnchorStyles.None; - this.pictureBox3.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pictureBox3.Location = new System.Drawing.Point(685, 219); - this.pictureBox3.Name = "pictureBox3"; - this.pictureBox3.Size = new System.Drawing.Size(50, 50); - this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox3.TabIndex = 780; - this.pictureBox3.TabStop = false; - this.pictureBox3.Visible = false; - // - // dgvData3 - // - this.dgvData3.AllowUserToAddRows = false; - this.dgvData3.AllowUserToDeleteRows = false; - dataGridViewCellStyle23.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvData3.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle23; - this.dgvData3.AutoRowNumber = true; - this.dgvData3.BackgroundColor = System.Drawing.Color.White; - this.dgvData3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle24.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvData3.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle24; - this.dgvData3.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dgvData3.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.colDgv3Check, - this.colDgv3ShopId, - this.colDgv3ShopName, - this.colDgv3Login, - this.colDgv3InShop, - this.colDgv3ImgUrl, - this.colDgv3Img, - this.colDgv3DraftId, - this.colDgv3ProductName, - this.colDgv3Spec, - this.colDgv3ExtCode, - this.colDgv3OrderId, - this.colDgv3Address, - this.colDgv3OrderTime, - this.colDgv3PayTime, - this.colDgv3TakeTime, - this.colDgv3Duration, - this.colDgv3DeliveryName, - this.colDgv3OptimizeStatus, - this.colDgv3Optimize}); - this.dgvData3.Dock = System.Windows.Forms.DockStyle.Fill; - this.dgvData3.Location = new System.Drawing.Point(0, 0); - this.dgvData3.MultiSelectCheckBox = true; - this.dgvData3.Name = "dgvData3"; - this.dgvData3.ReadOnly = true; - this.dgvData3.RowTemplate.Height = 23; - this.dgvData3.Size = new System.Drawing.Size(1408, 489); - this.dgvData3.TabIndex = 187; - this.dgvData3.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvData_CellContentClick); - // - // tabPage4 - // - this.tabPage4.Controls.Add(this.panel3); - this.tabPage4.Location = new System.Drawing.Point(2, 40); - this.tabPage4.Name = "tabPage4"; - this.tabPage4.Size = new System.Drawing.Size(1408, 489); - this.tabPage4.TabIndex = 2; - this.tabPage4.Text = " 閰嶉佷笉杈炬爣 "; - this.tabPage4.UseVisualStyleBackColor = true; - // - // panel3 - // - this.panel3.Controls.Add(this.pictureBox4); - this.panel3.Controls.Add(this.dgvData4); - this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel3.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.panel3.Location = new System.Drawing.Point(0, 0); - this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(1408, 489); - this.panel3.TabIndex = 2; - // - // pictureBox4 - // - this.pictureBox4.Anchor = System.Windows.Forms.AnchorStyles.None; - this.pictureBox4.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pictureBox4.Location = new System.Drawing.Point(685, 219); - this.pictureBox4.Name = "pictureBox4"; - this.pictureBox4.Size = new System.Drawing.Size(50, 50); - this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox4.TabIndex = 780; - this.pictureBox4.TabStop = false; - this.pictureBox4.Visible = false; - // - // dgvData4 - // - this.dgvData4.AllowUserToAddRows = false; - this.dgvData4.AllowUserToDeleteRows = false; - dataGridViewCellStyle35.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvData4.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle35; - this.dgvData4.AutoRowNumber = true; - this.dgvData4.BackgroundColor = System.Drawing.Color.White; - this.dgvData4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle36.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvData4.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle36; - this.dgvData4.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dgvData4.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.colDgv4Check, - this.colDgv4ShopId, - this.colDgv4ShopName, - this.colDgv4Login, - this.colDgv4InShop, - this.colDgv4ImgUrl, - this.colDgv4Img, - this.dataGridViewTextBoxColumn4, - this.dataGridViewTextBoxColumn5, - this.dataGridViewTextBoxColumn6, - this.dataGridViewTextBoxColumn7, - this.colDgv4OrderId, - this.colDgv4Address, - this.colDgv4OrderTime, - this.dataGridViewTextBoxColumn9, - this.dataGridViewTextBoxColumn10, - this.colDgv4Addresses, - this.dataGridViewTextBoxColumn12, - this.colDgv4OptimizeStatus, - this.colDgv4Optimize}); - this.dgvData4.Dock = System.Windows.Forms.DockStyle.Fill; - this.dgvData4.Location = new System.Drawing.Point(0, 0); - this.dgvData4.MultiSelectCheckBox = true; - this.dgvData4.Name = "dgvData4"; - this.dgvData4.ReadOnly = true; - this.dgvData4.RowTemplate.Height = 23; - this.dgvData4.Size = new System.Drawing.Size(1408, 489); - this.dgvData4.TabIndex = 187; - this.dgvData4.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvData_CellContentClick); - // - // tabPage5 - // - this.tabPage5.Location = new System.Drawing.Point(2, 40); - this.tabPage5.Name = "tabPage5"; - this.tabPage5.Size = new System.Drawing.Size(1408, 489); - this.tabPage5.TabIndex = 3; - this.tabPage5.Text = " 鐗╂祦璐熷悜鍙嶉 "; - this.tabPage5.UseVisualStyleBackColor = true; - // - // chkTestNoAuditUpload - // - this.chkTestNoAuditUpload.AutoSize = true; - this.chkTestNoAuditUpload.Location = new System.Drawing.Point(1094, 35); - this.chkTestNoAuditUpload.Name = "chkTestNoAuditUpload"; - this.chkTestNoAuditUpload.Size = new System.Drawing.Size(123, 21); - this.chkTestNoAuditUpload.TabIndex = 779; - this.chkTestNoAuditUpload.Text = "娴嬭瘯鍏嶅鎻愪氦鍟嗗搧"; - this.chkTestNoAuditUpload.UseVisualStyleBackColor = true; - this.chkTestNoAuditUpload.Visible = false; - // - // statusBar - // - this.statusBar.BackColor = System.Drawing.Color.White; - this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; - this.statusBar.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.statusBar.Location = new System.Drawing.Point(0, 0); - this.statusBar.Margin = new System.Windows.Forms.Padding(0); - this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(1772, 27); - this.statusBar.TabIndex = 2; - // - // splitContainer3 - // - this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; - this.splitContainer3.Location = new System.Drawing.Point(0, 0); - this.splitContainer3.Name = "splitContainer3"; - this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal; - // - // splitContainer3.Panel1 - // - this.splitContainer3.Panel1.Controls.Add(this.splitContainer2); - // - // splitContainer3.Panel2 - // - this.splitContainer3.Panel2.Controls.Add(this.statusBar); - this.splitContainer3.Size = new System.Drawing.Size(1772, 564); - this.splitContainer3.SplitterDistance = 533; - this.splitContainer3.TabIndex = 3; - // - // colDgv4Check - // - this.colDgv4Check.Frozen = true; - this.colDgv4Check.HeaderText = "閫夋嫨"; - this.colDgv4Check.Name = "colDgv4Check"; - this.colDgv4Check.ReadOnly = true; - this.colDgv4Check.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv4Check.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colDgv4Check.Width = 30; - // - // colDgv4ShopId - // - this.colDgv4ShopId.Frozen = true; - this.colDgv4ShopId.HeaderText = "搴楅摵Id"; - this.colDgv4ShopId.Name = "colDgv4ShopId"; - this.colDgv4ShopId.ReadOnly = true; - this.colDgv4ShopId.Visible = false; - // - // colDgv4ShopName - // - dataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv4ShopName.DefaultCellStyle = dataGridViewCellStyle37; - this.colDgv4ShopName.Frozen = true; - this.colDgv4ShopName.HeaderText = "搴楅摵鍚嶇О"; - this.colDgv4ShopName.Name = "colDgv4ShopName"; - this.colDgv4ShopName.ReadOnly = true; - // - // colDgv4Login - // - this.colDgv4Login.HeaderText = "鐧诲綍"; - this.colDgv4Login.Name = "colDgv4Login"; - this.colDgv4Login.ReadOnly = true; - this.colDgv4Login.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv4Login.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colDgv4Login.Visible = false; - this.colDgv4Login.Width = 40; - // - // colDgv4InShop - // - this.colDgv4InShop.HeaderText = "杩涘簵"; - this.colDgv4InShop.Name = "colDgv4InShop"; - this.colDgv4InShop.ReadOnly = true; - this.colDgv4InShop.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv4InShop.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colDgv4InShop.Visible = false; - this.colDgv4InShop.Width = 40; - // - // colDgv4ImgUrl - // - this.colDgv4ImgUrl.HeaderText = "鍥剧墖鍦板潃"; - this.colDgv4ImgUrl.Name = "colDgv4ImgUrl"; - this.colDgv4ImgUrl.ReadOnly = true; - this.colDgv4ImgUrl.Visible = false; - // - // colDgv4Img - // - this.colDgv4Img.HeaderText = "鍥剧墖"; - this.colDgv4Img.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; - this.colDgv4Img.Name = "colDgv4Img"; - this.colDgv4Img.ReadOnly = true; - this.colDgv4Img.Width = 60; - // - // dataGridViewTextBoxColumn4 - // - this.dataGridViewTextBoxColumn4.HeaderText = "鍟嗗搧Id"; - this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; - this.dataGridViewTextBoxColumn4.ReadOnly = true; - this.dataGridViewTextBoxColumn4.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.dataGridViewTextBoxColumn4.Width = 110; - // - // dataGridViewTextBoxColumn5 - // - dataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle38; - this.dataGridViewTextBoxColumn5.HeaderText = "鍟嗗搧鏍囬"; - this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; - this.dataGridViewTextBoxColumn5.ReadOnly = true; - this.dataGridViewTextBoxColumn5.Width = 160; - // - // dataGridViewTextBoxColumn6 - // - dataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle39; - this.dataGridViewTextBoxColumn6.HeaderText = "鏁伴噺"; - this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; - this.dataGridViewTextBoxColumn6.ReadOnly = true; - this.dataGridViewTextBoxColumn6.Width = 40; - // - // dataGridViewTextBoxColumn7 - // - this.dataGridViewTextBoxColumn7.HeaderText = "sku璐у彿"; - this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7"; - this.dataGridViewTextBoxColumn7.ReadOnly = true; - this.dataGridViewTextBoxColumn7.Visible = false; - this.dataGridViewTextBoxColumn7.Width = 140; - // - // colDgv4OrderId - // - dataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv4OrderId.DefaultCellStyle = dataGridViewCellStyle40; - this.colDgv4OrderId.HeaderText = "鍗曞彿"; - this.colDgv4OrderId.Name = "colDgv4OrderId"; - this.colDgv4OrderId.ReadOnly = true; - this.colDgv4OrderId.Width = 145; - // - // colDgv4Address - // - dataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv4Address.DefaultCellStyle = dataGridViewCellStyle41; - this.colDgv4Address.HeaderText = "鏀惰揣鍦板潃"; - this.colDgv4Address.Name = "colDgv4Address"; - this.colDgv4Address.ReadOnly = true; - // - // colDgv4OrderTime - // - dataGridViewCellStyle42.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv4OrderTime.DefaultCellStyle = dataGridViewCellStyle42; - this.colDgv4OrderTime.HeaderText = "涓嬪崟鏃堕棿"; - this.colDgv4OrderTime.Name = "colDgv4OrderTime"; - this.colDgv4OrderTime.ReadOnly = true; - this.colDgv4OrderTime.Width = 75; - // - // dataGridViewTextBoxColumn9 - // - dataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn9.DefaultCellStyle = dataGridViewCellStyle43; - this.dataGridViewTextBoxColumn9.HeaderText = "鐗╂祦鍏徃"; - this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9"; - this.dataGridViewTextBoxColumn9.ReadOnly = true; - this.dataGridViewTextBoxColumn9.Width = 70; - // - // dataGridViewTextBoxColumn10 - // - dataGridViewCellStyle44.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle44; - this.dataGridViewTextBoxColumn10.HeaderText = "鎻芥敹銆佺鏀舵椂闂"; - this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; - this.dataGridViewTextBoxColumn10.ReadOnly = true; - this.dataGridViewTextBoxColumn10.Width = 140; - // - // colDgv4Addresses - // - dataGridViewCellStyle45.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv4Addresses.DefaultCellStyle = dataGridViewCellStyle45; - this.colDgv4Addresses.HeaderText = "鍙戣揣銆佹敹璐у湴"; - this.colDgv4Addresses.Name = "colDgv4Addresses"; - this.colDgv4Addresses.ReadOnly = true; - this.colDgv4Addresses.Width = 110; - // - // dataGridViewTextBoxColumn12 - // - dataGridViewCellStyle46.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn12.DefaultCellStyle = dataGridViewCellStyle46; - this.dataGridViewTextBoxColumn12.HeaderText = "閰嶉佹椂闀"; - this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12"; - this.dataGridViewTextBoxColumn12.ReadOnly = true; - this.dataGridViewTextBoxColumn12.Width = 80; - // - // colDgv4OptimizeStatus - // - dataGridViewCellStyle47.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv4OptimizeStatus.DefaultCellStyle = dataGridViewCellStyle47; - this.colDgv4OptimizeStatus.HeaderText = "琛ュ彂鐘舵"; - this.colDgv4OptimizeStatus.Name = "colDgv4OptimizeStatus"; - this.colDgv4OptimizeStatus.ReadOnly = true; - this.colDgv4OptimizeStatus.Width = 80; - // - // colDgv4Optimize - // - this.colDgv4Optimize.HeaderText = "琛ュ彂"; - this.colDgv4Optimize.Name = "colDgv4Optimize"; - this.colDgv4Optimize.ReadOnly = true; - this.colDgv4Optimize.Width = 50; - // - // colDgv3Check - // - this.colDgv3Check.Frozen = true; - this.colDgv3Check.HeaderText = "閫夋嫨"; - this.colDgv3Check.Name = "colDgv3Check"; - this.colDgv3Check.ReadOnly = true; - this.colDgv3Check.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv3Check.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colDgv3Check.Width = 30; - // - // colDgv3ShopId - // - this.colDgv3ShopId.Frozen = true; - this.colDgv3ShopId.HeaderText = "搴楅摵Id"; - this.colDgv3ShopId.Name = "colDgv3ShopId"; - this.colDgv3ShopId.ReadOnly = true; - this.colDgv3ShopId.Visible = false; - // - // colDgv3ShopName - // - dataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv3ShopName.DefaultCellStyle = dataGridViewCellStyle25; - this.colDgv3ShopName.Frozen = true; - this.colDgv3ShopName.HeaderText = "搴楅摵鍚嶇О"; - this.colDgv3ShopName.Name = "colDgv3ShopName"; - this.colDgv3ShopName.ReadOnly = true; - // - // colDgv3Login - // - this.colDgv3Login.HeaderText = "鐧诲綍"; - this.colDgv3Login.Name = "colDgv3Login"; - this.colDgv3Login.ReadOnly = true; - this.colDgv3Login.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv3Login.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colDgv3Login.Visible = false; - this.colDgv3Login.Width = 40; - // - // colDgv3InShop - // - this.colDgv3InShop.HeaderText = "杩涘簵"; - this.colDgv3InShop.Name = "colDgv3InShop"; - this.colDgv3InShop.ReadOnly = true; - this.colDgv3InShop.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv3InShop.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colDgv3InShop.Visible = false; - this.colDgv3InShop.Width = 40; - // - // colDgv3ImgUrl - // - this.colDgv3ImgUrl.HeaderText = "鍥剧墖鍦板潃"; - this.colDgv3ImgUrl.Name = "colDgv3ImgUrl"; - this.colDgv3ImgUrl.ReadOnly = true; - this.colDgv3ImgUrl.Visible = false; - // - // colDgv3Img - // - this.colDgv3Img.HeaderText = "鍥剧墖"; - this.colDgv3Img.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; - this.colDgv3Img.Name = "colDgv3Img"; - this.colDgv3Img.ReadOnly = true; - this.colDgv3Img.Width = 60; - // - // colDgv3DraftId - // - this.colDgv3DraftId.HeaderText = "鍟嗗搧Id"; - this.colDgv3DraftId.Name = "colDgv3DraftId"; - this.colDgv3DraftId.ReadOnly = true; - this.colDgv3DraftId.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv3DraftId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.colDgv3DraftId.Width = 110; - // - // colDgv3ProductName - // - dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv3ProductName.DefaultCellStyle = dataGridViewCellStyle26; - this.colDgv3ProductName.HeaderText = "鍟嗗搧鏍囬"; - this.colDgv3ProductName.Name = "colDgv3ProductName"; - this.colDgv3ProductName.ReadOnly = true; - this.colDgv3ProductName.Width = 160; - // - // colDgv3Spec - // - dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv3Spec.DefaultCellStyle = dataGridViewCellStyle27; - this.colDgv3Spec.HeaderText = "sku瑙勬牸"; - this.colDgv3Spec.Name = "colDgv3Spec"; - this.colDgv3Spec.ReadOnly = true; - this.colDgv3Spec.Width = 130; - // - // colDgv3ExtCode - // - this.colDgv3ExtCode.HeaderText = "sku璐у彿"; - this.colDgv3ExtCode.Name = "colDgv3ExtCode"; - this.colDgv3ExtCode.ReadOnly = true; - this.colDgv3ExtCode.Visible = false; - this.colDgv3ExtCode.Width = 145; - // - // colDgv3OrderId - // - dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv3OrderId.DefaultCellStyle = dataGridViewCellStyle28; - this.colDgv3OrderId.HeaderText = "鍗曞彿"; - this.colDgv3OrderId.Name = "colDgv3OrderId"; - this.colDgv3OrderId.ReadOnly = true; - this.colDgv3OrderId.Width = 145; - // - // colDgv3Address - // - dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv3Address.DefaultCellStyle = dataGridViewCellStyle29; - this.colDgv3Address.HeaderText = "鏀惰揣鍦板潃"; - this.colDgv3Address.Name = "colDgv3Address"; - this.colDgv3Address.ReadOnly = true; - // - // colDgv3OrderTime - // - dataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv3OrderTime.DefaultCellStyle = dataGridViewCellStyle30; - this.colDgv3OrderTime.HeaderText = "涓嬪崟鏃堕棿"; - this.colDgv3OrderTime.Name = "colDgv3OrderTime"; - this.colDgv3OrderTime.ReadOnly = true; - this.colDgv3OrderTime.Width = 75; - // - // colDgv3PayTime - // - dataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv3PayTime.DefaultCellStyle = dataGridViewCellStyle31; - this.colDgv3PayTime.HeaderText = "鏀粯鏃堕棿"; - this.colDgv3PayTime.Name = "colDgv3PayTime"; - this.colDgv3PayTime.ReadOnly = true; - this.colDgv3PayTime.Width = 80; - // - // colDgv3TakeTime - // - dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv3TakeTime.DefaultCellStyle = dataGridViewCellStyle32; - this.colDgv3TakeTime.HeaderText = "鎻芥敹鏃堕棿"; - this.colDgv3TakeTime.Name = "colDgv3TakeTime"; - this.colDgv3TakeTime.ReadOnly = true; - this.colDgv3TakeTime.Width = 80; - // - // colDgv3Duration - // - dataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv3Duration.DefaultCellStyle = dataGridViewCellStyle33; - this.colDgv3Duration.HeaderText = "鎻芥敹鏃堕暱"; - this.colDgv3Duration.Name = "colDgv3Duration"; - this.colDgv3Duration.ReadOnly = true; - this.colDgv3Duration.Width = 80; - // - // colDgv3DeliveryName - // - this.colDgv3DeliveryName.HeaderText = "鐗╂祦鍏徃"; - this.colDgv3DeliveryName.Name = "colDgv3DeliveryName"; - this.colDgv3DeliveryName.ReadOnly = true; - this.colDgv3DeliveryName.Width = 70; - // - // colDgv3OptimizeStatus - // - dataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv3OptimizeStatus.DefaultCellStyle = dataGridViewCellStyle34; - this.colDgv3OptimizeStatus.HeaderText = "琛ュ彂鐘舵"; - this.colDgv3OptimizeStatus.Name = "colDgv3OptimizeStatus"; - this.colDgv3OptimizeStatus.ReadOnly = true; - this.colDgv3OptimizeStatus.Width = 80; - // - // colDgv3Optimize - // - this.colDgv3Optimize.HeaderText = "琛ュ彂"; - this.colDgv3Optimize.Name = "colDgv3Optimize"; - this.colDgv3Optimize.ReadOnly = true; - this.colDgv3Optimize.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv3Optimize.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colDgv3Optimize.Width = 50; - // // colDgv2Check // this.colDgv2Check.Frozen = true; @@ -1816,149 +1398,585 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv2Optimize.ReadOnly = true; this.colDgv2Optimize.Width = 50; // - // colDgv1Check + // tabPage3 // - this.colDgv1Check.Frozen = true; - this.colDgv1Check.HeaderText = "閫夋嫨"; - this.colDgv1Check.Name = "colDgv1Check"; - this.colDgv1Check.ReadOnly = true; - this.colDgv1Check.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv1Check.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colDgv1Check.Width = 30; + this.tabPage3.Controls.Add(this.mainPanel); + this.tabPage3.Location = new System.Drawing.Point(2, 40); + this.tabPage3.Name = "tabPage3"; + this.tabPage3.Size = new System.Drawing.Size(1408, 489); + this.tabPage3.TabIndex = 1; + this.tabPage3.Text = " 鎻芥敹涓嶈揪鏍 "; + this.tabPage3.UseVisualStyleBackColor = true; // - // colDgv1ShopId + // mainPanel // - this.colDgv1ShopId.HeaderText = "搴楅摵Id"; - this.colDgv1ShopId.Name = "colDgv1ShopId"; - this.colDgv1ShopId.ReadOnly = true; - this.colDgv1ShopId.Visible = false; + this.mainPanel.Controls.Add(this.pictureBox3); + this.mainPanel.Controls.Add(this.dgvData3); + this.mainPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.mainPanel.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.mainPanel.Location = new System.Drawing.Point(0, 0); + this.mainPanel.Name = "mainPanel"; + this.mainPanel.Size = new System.Drawing.Size(1408, 489); + this.mainPanel.TabIndex = 1; // - // colDgv1ShopName + // pictureBox3 // - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv1ShopName.DefaultCellStyle = dataGridViewCellStyle5; - this.colDgv1ShopName.HeaderText = "搴楅摵鍚嶇О"; - this.colDgv1ShopName.Name = "colDgv1ShopName"; - this.colDgv1ShopName.ReadOnly = true; + this.pictureBox3.Anchor = System.Windows.Forms.AnchorStyles.None; + this.pictureBox3.Image = global::TemuKJD.Properties.Resources.loading_blue; + this.pictureBox3.Location = new System.Drawing.Point(685, 219); + this.pictureBox3.Name = "pictureBox3"; + this.pictureBox3.Size = new System.Drawing.Size(50, 50); + this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox3.TabIndex = 780; + this.pictureBox3.TabStop = false; + this.pictureBox3.Visible = false; // - // colDgv1ShopLogin + // dgvData3 // - this.colDgv1ShopLogin.HeaderText = "鐧诲綍"; - this.colDgv1ShopLogin.Name = "colDgv1ShopLogin"; - this.colDgv1ShopLogin.ReadOnly = true; - this.colDgv1ShopLogin.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv1ShopLogin.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colDgv1ShopLogin.Visible = false; - this.colDgv1ShopLogin.Width = 40; + this.dgvData3.AllowUserToAddRows = false; + this.dgvData3.AllowUserToDeleteRows = false; + dataGridViewCellStyle23.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvData3.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle23; + this.dgvData3.AutoRowNumber = true; + this.dgvData3.BackgroundColor = System.Drawing.Color.White; + this.dgvData3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle24.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvData3.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle24; + this.dgvData3.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvData3.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.colDgv3Check, + this.colDgv3ShopId, + this.colDgv3ShopName, + this.colDgv3Login, + this.colDgv3InShop, + this.colDgv3ImgUrl, + this.colDgv3Img, + this.colDgv3DraftId, + this.colDgv3ProductName, + this.colDgv3Spec, + this.colDgv3ExtCode, + this.colDgv3OrderId, + this.colDgv3Address, + this.colDgv3OrderTime, + this.colDgv3PayTime, + this.colDgv3TakeTime, + this.colDgv3Duration, + this.colDgv3DeliveryName, + this.colDgv3WaybillId, + this.colDgv3OptimizeStatus, + this.colDgv3Optimize}); + this.dgvData3.Dock = System.Windows.Forms.DockStyle.Fill; + this.dgvData3.Location = new System.Drawing.Point(0, 0); + this.dgvData3.MultiSelectCheckBox = true; + this.dgvData3.Name = "dgvData3"; + this.dgvData3.ReadOnly = true; + this.dgvData3.RowTemplate.Height = 23; + this.dgvData3.Size = new System.Drawing.Size(1408, 489); + this.dgvData3.TabIndex = 187; + this.dgvData3.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvData_CellContentClick); // - // colDgv1InShop + // tabPage4 // - this.colDgv1InShop.HeaderText = "杩涘簵"; - this.colDgv1InShop.Name = "colDgv1InShop"; - this.colDgv1InShop.ReadOnly = true; - this.colDgv1InShop.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv1InShop.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colDgv1InShop.Visible = false; - this.colDgv1InShop.Width = 40; + this.tabPage4.Controls.Add(this.panel3); + this.tabPage4.Location = new System.Drawing.Point(2, 40); + this.tabPage4.Name = "tabPage4"; + this.tabPage4.Size = new System.Drawing.Size(1408, 489); + this.tabPage4.TabIndex = 2; + this.tabPage4.Text = " 閰嶉佷笉杈炬爣 "; + this.tabPage4.UseVisualStyleBackColor = true; // - // colDgv1ImgUrl + // panel3 // - this.colDgv1ImgUrl.HeaderText = "鍥剧墖鍦板潃"; - this.colDgv1ImgUrl.Name = "colDgv1ImgUrl"; - this.colDgv1ImgUrl.ReadOnly = true; - this.colDgv1ImgUrl.Visible = false; + this.panel3.Controls.Add(this.pictureBox4); + this.panel3.Controls.Add(this.dgvData4); + this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel3.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.panel3.Location = new System.Drawing.Point(0, 0); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(1408, 489); + this.panel3.TabIndex = 2; // - // colDgv1Img + // pictureBox4 // - this.colDgv1Img.HeaderText = "鍥剧墖"; - this.colDgv1Img.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; - this.colDgv1Img.Name = "colDgv1Img"; - this.colDgv1Img.ReadOnly = true; - this.colDgv1Img.Width = 60; + this.pictureBox4.Anchor = System.Windows.Forms.AnchorStyles.None; + this.pictureBox4.Image = global::TemuKJD.Properties.Resources.loading_blue; + this.pictureBox4.Location = new System.Drawing.Point(685, 219); + this.pictureBox4.Name = "pictureBox4"; + this.pictureBox4.Size = new System.Drawing.Size(50, 50); + this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox4.TabIndex = 780; + this.pictureBox4.TabStop = false; + this.pictureBox4.Visible = false; // - // colDgv1SpuId + // dgvData4 // - this.colDgv1SpuId.HeaderText = "鍟嗗搧Id"; - this.colDgv1SpuId.Name = "colDgv1SpuId"; - this.colDgv1SpuId.ReadOnly = true; - this.colDgv1SpuId.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv1SpuId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.colDgv1SpuId.Width = 110; + this.dgvData4.AllowUserToAddRows = false; + this.dgvData4.AllowUserToDeleteRows = false; + dataGridViewCellStyle35.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvData4.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle35; + this.dgvData4.AutoRowNumber = true; + this.dgvData4.BackgroundColor = System.Drawing.Color.White; + this.dgvData4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle36.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvData4.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle36; + this.dgvData4.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvData4.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.colDgv4Check, + this.colDgv4ShopId, + this.colDgv4ShopName, + this.colDgv4Login, + this.colDgv4InShop, + this.colDgv4ImgUrl, + this.colDgv4Img, + this.dataGridViewTextBoxColumn4, + this.dataGridViewTextBoxColumn5, + this.dataGridViewTextBoxColumn6, + this.dataGridViewTextBoxColumn7, + this.colDgv4OrderId, + this.colDgv4Address, + this.colDgv4OrderTime, + this.dataGridViewTextBoxColumn9, + this.colDgv4WaybillId, + this.dataGridViewTextBoxColumn10, + this.colDgv4Addresses, + this.dataGridViewTextBoxColumn12, + this.colDgv4OptimizeStatus, + this.colDgv4Optimize}); + this.dgvData4.Dock = System.Windows.Forms.DockStyle.Fill; + this.dgvData4.Location = new System.Drawing.Point(0, 0); + this.dgvData4.MultiSelectCheckBox = true; + this.dgvData4.Name = "dgvData4"; + this.dgvData4.ReadOnly = true; + this.dgvData4.RowTemplate.Height = 23; + this.dgvData4.Size = new System.Drawing.Size(1408, 489); + this.dgvData4.TabIndex = 187; + this.dgvData4.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvData_CellContentClick); // - // colDgv1ProductName + // tabPage5 // - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv1ProductName.DefaultCellStyle = dataGridViewCellStyle6; - this.colDgv1ProductName.HeaderText = "鍟嗗搧鏍囬"; - this.colDgv1ProductName.Name = "colDgv1ProductName"; - this.colDgv1ProductName.ReadOnly = true; - this.colDgv1ProductName.Width = 180; + this.tabPage5.Location = new System.Drawing.Point(2, 40); + this.tabPage5.Name = "tabPage5"; + this.tabPage5.Size = new System.Drawing.Size(1408, 489); + this.tabPage5.TabIndex = 3; + this.tabPage5.Text = " 鐗╂祦璐熷悜鍙嶉 "; + this.tabPage5.UseVisualStyleBackColor = true; // - // colDgv1Spec + // chkTestNoAuditUpload // - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv1Spec.DefaultCellStyle = dataGridViewCellStyle7; - this.colDgv1Spec.HeaderText = "鍟嗗搧瑙勬牸"; - this.colDgv1Spec.Name = "colDgv1Spec"; - this.colDgv1Spec.ReadOnly = true; - this.colDgv1Spec.Width = 145; + this.chkTestNoAuditUpload.AutoSize = true; + this.chkTestNoAuditUpload.Location = new System.Drawing.Point(1094, 35); + this.chkTestNoAuditUpload.Name = "chkTestNoAuditUpload"; + this.chkTestNoAuditUpload.Size = new System.Drawing.Size(123, 21); + this.chkTestNoAuditUpload.TabIndex = 779; + this.chkTestNoAuditUpload.Text = "娴嬭瘯鍏嶅鎻愪氦鍟嗗搧"; + this.chkTestNoAuditUpload.UseVisualStyleBackColor = true; + this.chkTestNoAuditUpload.Visible = false; // - // colDgv1OutSn + // statusBar // - this.colDgv1OutSn.HeaderText = "sku缂栫爜"; - this.colDgv1OutSn.Name = "colDgv1OutSn"; - this.colDgv1OutSn.ReadOnly = true; - this.colDgv1OutSn.Visible = false; - this.colDgv1OutSn.Width = 150; + this.statusBar.BackColor = System.Drawing.Color.White; + this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; + this.statusBar.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.statusBar.Location = new System.Drawing.Point(0, 0); + this.statusBar.Margin = new System.Windows.Forms.Padding(0); + this.statusBar.Name = "statusBar"; + this.statusBar.Size = new System.Drawing.Size(1772, 27); + this.statusBar.TabIndex = 2; // - // colDgv1OrderId + // splitContainer3 // - this.colDgv1OrderId.HeaderText = "璁㈠崟鍙"; - this.colDgv1OrderId.Name = "colDgv1OrderId"; - this.colDgv1OrderId.ReadOnly = true; - this.colDgv1OrderId.Width = 145; + this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer3.Location = new System.Drawing.Point(0, 0); + this.splitContainer3.Name = "splitContainer3"; + this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal; // - // colDgv1Address + // splitContainer3.Panel1 // - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv1Address.DefaultCellStyle = dataGridViewCellStyle8; - this.colDgv1Address.HeaderText = "鏀惰揣鍦板潃"; - this.colDgv1Address.Name = "colDgv1Address"; - this.colDgv1Address.ReadOnly = true; + this.splitContainer3.Panel1.Controls.Add(this.splitContainer2); // - // colDgv1OrderTime + // splitContainer3.Panel2 // - dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv1OrderTime.DefaultCellStyle = dataGridViewCellStyle9; - this.colDgv1OrderTime.HeaderText = "涓嬪崟鏃堕棿"; - this.colDgv1OrderTime.Name = "colDgv1OrderTime"; - this.colDgv1OrderTime.ReadOnly = true; - this.colDgv1OrderTime.Width = 75; + this.splitContainer3.Panel2.Controls.Add(this.statusBar); + this.splitContainer3.Size = new System.Drawing.Size(1772, 564); + this.splitContainer3.SplitterDistance = 533; + this.splitContainer3.TabIndex = 3; // - // colDgv1AfterSaleReason + // colDgv3Check // - dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv1AfterSaleReason.DefaultCellStyle = dataGridViewCellStyle10; - this.colDgv1AfterSaleReason.HeaderText = "閫娆惧師鍥"; - this.colDgv1AfterSaleReason.Name = "colDgv1AfterSaleReason"; - this.colDgv1AfterSaleReason.ReadOnly = true; - this.colDgv1AfterSaleReason.Width = 150; + this.colDgv3Check.Frozen = true; + this.colDgv3Check.HeaderText = "閫夋嫨"; + this.colDgv3Check.Name = "colDgv3Check"; + this.colDgv3Check.ReadOnly = true; + this.colDgv3Check.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3Check.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colDgv3Check.Width = 30; // - // colDgv1OptimizeStatus + // colDgv3ShopId // - dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv1OptimizeStatus.DefaultCellStyle = dataGridViewCellStyle11; - this.colDgv1OptimizeStatus.HeaderText = "琛ュ彂鐘舵"; - this.colDgv1OptimizeStatus.Name = "colDgv1OptimizeStatus"; - this.colDgv1OptimizeStatus.ReadOnly = true; - this.colDgv1OptimizeStatus.Width = 80; + this.colDgv3ShopId.Frozen = true; + this.colDgv3ShopId.HeaderText = "搴楅摵Id"; + this.colDgv3ShopId.Name = "colDgv3ShopId"; + this.colDgv3ShopId.ReadOnly = true; + this.colDgv3ShopId.Visible = false; // - // colDgv1Optimize + // colDgv3ShopName // - this.colDgv1Optimize.HeaderText = "琛ュ彂"; - this.colDgv1Optimize.Name = "colDgv1Optimize"; - this.colDgv1Optimize.ReadOnly = true; - this.colDgv1Optimize.Width = 50; + dataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3ShopName.DefaultCellStyle = dataGridViewCellStyle25; + this.colDgv3ShopName.Frozen = true; + this.colDgv3ShopName.HeaderText = "搴楅摵鍚嶇О"; + this.colDgv3ShopName.Name = "colDgv3ShopName"; + this.colDgv3ShopName.ReadOnly = true; + // + // colDgv3Login + // + this.colDgv3Login.HeaderText = "鐧诲綍"; + this.colDgv3Login.Name = "colDgv3Login"; + this.colDgv3Login.ReadOnly = true; + this.colDgv3Login.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3Login.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colDgv3Login.Visible = false; + this.colDgv3Login.Width = 40; + // + // colDgv3InShop + // + this.colDgv3InShop.HeaderText = "杩涘簵"; + this.colDgv3InShop.Name = "colDgv3InShop"; + this.colDgv3InShop.ReadOnly = true; + this.colDgv3InShop.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3InShop.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colDgv3InShop.Visible = false; + this.colDgv3InShop.Width = 40; + // + // colDgv3ImgUrl + // + this.colDgv3ImgUrl.HeaderText = "鍥剧墖鍦板潃"; + this.colDgv3ImgUrl.Name = "colDgv3ImgUrl"; + this.colDgv3ImgUrl.ReadOnly = true; + this.colDgv3ImgUrl.Visible = false; + // + // colDgv3Img + // + this.colDgv3Img.HeaderText = "鍥剧墖"; + this.colDgv3Img.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; + this.colDgv3Img.Name = "colDgv3Img"; + this.colDgv3Img.ReadOnly = true; + this.colDgv3Img.Width = 60; + // + // colDgv3DraftId + // + this.colDgv3DraftId.HeaderText = "鍟嗗搧Id"; + this.colDgv3DraftId.Name = "colDgv3DraftId"; + this.colDgv3DraftId.ReadOnly = true; + this.colDgv3DraftId.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3DraftId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.colDgv3DraftId.Width = 110; + // + // colDgv3ProductName + // + dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3ProductName.DefaultCellStyle = dataGridViewCellStyle26; + this.colDgv3ProductName.HeaderText = "鍟嗗搧鏍囬"; + this.colDgv3ProductName.Name = "colDgv3ProductName"; + this.colDgv3ProductName.ReadOnly = true; + this.colDgv3ProductName.Width = 120; + // + // colDgv3Spec + // + dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3Spec.DefaultCellStyle = dataGridViewCellStyle27; + this.colDgv3Spec.HeaderText = "sku瑙勬牸"; + this.colDgv3Spec.Name = "colDgv3Spec"; + this.colDgv3Spec.ReadOnly = true; + this.colDgv3Spec.Width = 130; + // + // colDgv3ExtCode + // + this.colDgv3ExtCode.HeaderText = "sku璐у彿"; + this.colDgv3ExtCode.Name = "colDgv3ExtCode"; + this.colDgv3ExtCode.ReadOnly = true; + this.colDgv3ExtCode.Visible = false; + this.colDgv3ExtCode.Width = 145; + // + // colDgv3OrderId + // + dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3OrderId.DefaultCellStyle = dataGridViewCellStyle28; + this.colDgv3OrderId.HeaderText = "鍗曞彿"; + this.colDgv3OrderId.Name = "colDgv3OrderId"; + this.colDgv3OrderId.ReadOnly = true; + this.colDgv3OrderId.Width = 145; + // + // colDgv3Address + // + dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3Address.DefaultCellStyle = dataGridViewCellStyle29; + this.colDgv3Address.HeaderText = "鏀惰揣鍦板潃"; + this.colDgv3Address.Name = "colDgv3Address"; + this.colDgv3Address.ReadOnly = true; + // + // colDgv3OrderTime + // + dataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3OrderTime.DefaultCellStyle = dataGridViewCellStyle30; + this.colDgv3OrderTime.HeaderText = "涓嬪崟鏃堕棿"; + this.colDgv3OrderTime.Name = "colDgv3OrderTime"; + this.colDgv3OrderTime.ReadOnly = true; + this.colDgv3OrderTime.Width = 75; + // + // colDgv3PayTime + // + dataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3PayTime.DefaultCellStyle = dataGridViewCellStyle31; + this.colDgv3PayTime.HeaderText = "鏀粯鏃堕棿"; + this.colDgv3PayTime.Name = "colDgv3PayTime"; + this.colDgv3PayTime.ReadOnly = true; + this.colDgv3PayTime.Width = 80; + // + // colDgv3TakeTime + // + dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3TakeTime.DefaultCellStyle = dataGridViewCellStyle32; + this.colDgv3TakeTime.HeaderText = "鎻芥敹鏃堕棿"; + this.colDgv3TakeTime.Name = "colDgv3TakeTime"; + this.colDgv3TakeTime.ReadOnly = true; + this.colDgv3TakeTime.Width = 80; + // + // colDgv3Duration + // + dataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3Duration.DefaultCellStyle = dataGridViewCellStyle33; + this.colDgv3Duration.HeaderText = "鎻芥敹鏃堕暱"; + this.colDgv3Duration.Name = "colDgv3Duration"; + this.colDgv3Duration.ReadOnly = true; + this.colDgv3Duration.Width = 80; + // + // colDgv3DeliveryName + // + this.colDgv3DeliveryName.HeaderText = "鐗╂祦鍏徃"; + this.colDgv3DeliveryName.Name = "colDgv3DeliveryName"; + this.colDgv3DeliveryName.ReadOnly = true; + this.colDgv3DeliveryName.Width = 70; + // + // colDgv3WaybillId + // + this.colDgv3WaybillId.HeaderText = "鐗╂祦鍗曞彿"; + this.colDgv3WaybillId.Name = "colDgv3WaybillId"; + this.colDgv3WaybillId.ReadOnly = true; + this.colDgv3WaybillId.Width = 120; + // + // colDgv3OptimizeStatus + // + dataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3OptimizeStatus.DefaultCellStyle = dataGridViewCellStyle34; + this.colDgv3OptimizeStatus.HeaderText = "琛ュ彂鐘舵"; + this.colDgv3OptimizeStatus.Name = "colDgv3OptimizeStatus"; + this.colDgv3OptimizeStatus.ReadOnly = true; + this.colDgv3OptimizeStatus.Width = 80; + // + // colDgv3Optimize + // + this.colDgv3Optimize.HeaderText = "琛ュ彂"; + this.colDgv3Optimize.Name = "colDgv3Optimize"; + this.colDgv3Optimize.ReadOnly = true; + this.colDgv3Optimize.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3Optimize.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colDgv3Optimize.Width = 50; + // + // colDgv4Check + // + this.colDgv4Check.Frozen = true; + this.colDgv4Check.HeaderText = "閫夋嫨"; + this.colDgv4Check.Name = "colDgv4Check"; + this.colDgv4Check.ReadOnly = true; + this.colDgv4Check.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv4Check.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colDgv4Check.Width = 30; + // + // colDgv4ShopId + // + this.colDgv4ShopId.Frozen = true; + this.colDgv4ShopId.HeaderText = "搴楅摵Id"; + this.colDgv4ShopId.Name = "colDgv4ShopId"; + this.colDgv4ShopId.ReadOnly = true; + this.colDgv4ShopId.Visible = false; + // + // colDgv4ShopName + // + dataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv4ShopName.DefaultCellStyle = dataGridViewCellStyle37; + this.colDgv4ShopName.Frozen = true; + this.colDgv4ShopName.HeaderText = "搴楅摵鍚嶇О"; + this.colDgv4ShopName.Name = "colDgv4ShopName"; + this.colDgv4ShopName.ReadOnly = true; + // + // colDgv4Login + // + this.colDgv4Login.HeaderText = "鐧诲綍"; + this.colDgv4Login.Name = "colDgv4Login"; + this.colDgv4Login.ReadOnly = true; + this.colDgv4Login.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv4Login.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colDgv4Login.Visible = false; + this.colDgv4Login.Width = 40; + // + // colDgv4InShop + // + this.colDgv4InShop.HeaderText = "杩涘簵"; + this.colDgv4InShop.Name = "colDgv4InShop"; + this.colDgv4InShop.ReadOnly = true; + this.colDgv4InShop.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv4InShop.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colDgv4InShop.Visible = false; + this.colDgv4InShop.Width = 40; + // + // colDgv4ImgUrl + // + this.colDgv4ImgUrl.HeaderText = "鍥剧墖鍦板潃"; + this.colDgv4ImgUrl.Name = "colDgv4ImgUrl"; + this.colDgv4ImgUrl.ReadOnly = true; + this.colDgv4ImgUrl.Visible = false; + // + // colDgv4Img + // + this.colDgv4Img.HeaderText = "鍥剧墖"; + this.colDgv4Img.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; + this.colDgv4Img.Name = "colDgv4Img"; + this.colDgv4Img.ReadOnly = true; + this.colDgv4Img.Width = 60; + // + // dataGridViewTextBoxColumn4 + // + this.dataGridViewTextBoxColumn4.HeaderText = "鍟嗗搧Id"; + this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; + this.dataGridViewTextBoxColumn4.ReadOnly = true; + this.dataGridViewTextBoxColumn4.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.dataGridViewTextBoxColumn4.Width = 110; + // + // dataGridViewTextBoxColumn5 + // + dataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle38; + this.dataGridViewTextBoxColumn5.HeaderText = "鍟嗗搧鏍囬"; + this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; + this.dataGridViewTextBoxColumn5.ReadOnly = true; + this.dataGridViewTextBoxColumn5.Width = 120; + // + // dataGridViewTextBoxColumn6 + // + dataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle39; + this.dataGridViewTextBoxColumn6.HeaderText = "鏁伴噺"; + this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; + this.dataGridViewTextBoxColumn6.ReadOnly = true; + this.dataGridViewTextBoxColumn6.Width = 40; + // + // dataGridViewTextBoxColumn7 + // + this.dataGridViewTextBoxColumn7.HeaderText = "sku璐у彿"; + this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7"; + this.dataGridViewTextBoxColumn7.ReadOnly = true; + this.dataGridViewTextBoxColumn7.Visible = false; + this.dataGridViewTextBoxColumn7.Width = 140; + // + // colDgv4OrderId + // + dataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv4OrderId.DefaultCellStyle = dataGridViewCellStyle40; + this.colDgv4OrderId.HeaderText = "鍗曞彿"; + this.colDgv4OrderId.Name = "colDgv4OrderId"; + this.colDgv4OrderId.ReadOnly = true; + this.colDgv4OrderId.Width = 145; + // + // colDgv4Address + // + dataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv4Address.DefaultCellStyle = dataGridViewCellStyle41; + this.colDgv4Address.HeaderText = "鏀惰揣鍦板潃"; + this.colDgv4Address.Name = "colDgv4Address"; + this.colDgv4Address.ReadOnly = true; + // + // colDgv4OrderTime + // + dataGridViewCellStyle42.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv4OrderTime.DefaultCellStyle = dataGridViewCellStyle42; + this.colDgv4OrderTime.HeaderText = "涓嬪崟鏃堕棿"; + this.colDgv4OrderTime.Name = "colDgv4OrderTime"; + this.colDgv4OrderTime.ReadOnly = true; + this.colDgv4OrderTime.Width = 75; + // + // dataGridViewTextBoxColumn9 + // + dataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn9.DefaultCellStyle = dataGridViewCellStyle43; + this.dataGridViewTextBoxColumn9.HeaderText = "鐗╂祦鍏徃"; + this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9"; + this.dataGridViewTextBoxColumn9.ReadOnly = true; + this.dataGridViewTextBoxColumn9.Width = 70; + // + // colDgv4WaybillId + // + this.colDgv4WaybillId.HeaderText = "鐗╂祦鍗曞彿"; + this.colDgv4WaybillId.Name = "colDgv4WaybillId"; + this.colDgv4WaybillId.ReadOnly = true; + this.colDgv4WaybillId.Width = 120; + // + // dataGridViewTextBoxColumn10 + // + dataGridViewCellStyle44.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle44; + this.dataGridViewTextBoxColumn10.HeaderText = "鎻芥敹銆佺鏀舵椂闂"; + this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; + this.dataGridViewTextBoxColumn10.ReadOnly = true; + this.dataGridViewTextBoxColumn10.Width = 120; + // + // colDgv4Addresses + // + dataGridViewCellStyle45.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv4Addresses.DefaultCellStyle = dataGridViewCellStyle45; + this.colDgv4Addresses.HeaderText = "鍙戣揣銆佹敹璐у湴"; + this.colDgv4Addresses.Name = "colDgv4Addresses"; + this.colDgv4Addresses.ReadOnly = true; + this.colDgv4Addresses.Width = 110; + // + // dataGridViewTextBoxColumn12 + // + dataGridViewCellStyle46.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn12.DefaultCellStyle = dataGridViewCellStyle46; + this.dataGridViewTextBoxColumn12.HeaderText = "閰嶉佹椂闀"; + this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12"; + this.dataGridViewTextBoxColumn12.ReadOnly = true; + this.dataGridViewTextBoxColumn12.Width = 80; + // + // colDgv4OptimizeStatus + // + dataGridViewCellStyle47.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv4OptimizeStatus.DefaultCellStyle = dataGridViewCellStyle47; + this.colDgv4OptimizeStatus.HeaderText = "琛ュ彂鐘舵"; + this.colDgv4OptimizeStatus.Name = "colDgv4OptimizeStatus"; + this.colDgv4OptimizeStatus.ReadOnly = true; + this.colDgv4OptimizeStatus.Width = 80; + // + // colDgv4Optimize + // + this.colDgv4Optimize.HeaderText = "琛ュ彂"; + this.colDgv4Optimize.Name = "colDgv4Optimize"; + this.colDgv4Optimize.ReadOnly = true; + this.colDgv4Optimize.Width = 50; // // WXShopOptimizeForm // @@ -2130,6 +2148,7 @@ namespace TemuKJD.WXForms.ShopForms private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3TakeTime; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3Duration; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3DeliveryName; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3WaybillId; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3OptimizeStatus; private System.Windows.Forms.DataGridViewLinkColumn colDgv3Optimize; private System.Windows.Forms.DataGridViewCheckBoxColumn colDgv4Check; @@ -2147,6 +2166,7 @@ namespace TemuKJD.WXForms.ShopForms private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4Address; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4OrderTime; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4WaybillId; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4Addresses; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn12; diff --git a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.cs b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.cs index 7405800..d59f900 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.cs @@ -1222,6 +1222,7 @@ namespace TemuKJD.WXForms.ShopForms orderWaybill.realPickupTime.ParseToInt().IsNullOrZero() ? "" : BaseClass.StampToDateTime(orderWaybill.realPickupTime.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"), orderWaybill.pickupDuration.ParseToInt().IsNullOrZero() ? "" : ((orderWaybill.pickupDuration.ParseToInt() / 3600.0m).ToString("f2") + "灏忔椂" + "\r\n" + "[" + (is24 ? "娆℃棩" : "48灏忔椂") + "]"), orderWaybill.delivery.deliveryName, + orderWaybill.waybillId, orderWaybill.optimizeWaybillId + "\r\n" + orderWaybill.optimizeTime, "琛ュ彂" ); @@ -1514,7 +1515,8 @@ namespace TemuKJD.WXForms.ShopForms orderLinerCgiInfo.orderTime.IsNullOrZero() ? "" : BaseClass.StampToDateTime(orderLinerCgiInfo.orderTime.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"), orderLinerCgiInfo.delivery_name, - BaseClass.StampToDateTime(orderLinerCgiInfo.collect_time.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss") + "\r\n" + BaseClass.StampToDateTime(orderLinerCgiInfo.receipt_time.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"), + orderLinerCgiInfo.waybill_id, + BaseClass.StampToDateTime(orderLinerCgiInfo.collect_time.ParseToInt()).ToString("yy-MM-dd HH:mm:ss") + "\r\n" + BaseClass.StampToDateTime(orderLinerCgiInfo.receipt_time.ParseToInt()).ToString("yy-MM-dd HH:mm:ss"), "鍙戣揣鍦帮細" + orderLinerCgiInfo.ship_city + "\r\n" + "鏀惰揣鍦帮細" + orderLinerCgiInfo.ship_province + orderLinerCgiInfo.receipt_city, (orderLinerCgiInfo.transport_duration.ParseToInt() / 3600) + "灏忔椂" + (orderLinerCgiInfo.transport_duration.ParseToInt() % 3600) / 60 + "鍒" + "\r\n鏍囧噯鏃堕暱" + (orderLinerCgiInfo.transport_std_duration.ParseToInt() / 3600) + "灏忔椂", orderLinerCgiInfo.optimizeWaybillId + "\r\n" + orderLinerCgiInfo.optimizeTime, diff --git a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.resx b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.resx index d956041..48a9261 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.resx +++ b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.resx @@ -318,6 +318,9 @@ True + + True + True @@ -369,6 +372,9 @@ True + + True + True diff --git a/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.Designer.cs index a6b74de..cd54351 100644 --- a/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.Designer.cs +++ b/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.Designer.cs @@ -28,9 +28,8 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer5 = new System.Windows.Forms.SplitContainer(); this.label1 = new System.Windows.Forms.Label(); this.btnRefresh = new TemuKJD.UserControls.ButtonEx(); @@ -185,10 +184,10 @@ this.label31.TabIndex = 32; this.label31.Text = "*"; // - // repasstextBox + // txtRePass // this.txtRePass.Location = new System.Drawing.Point(112, 226); - this.txtRePass.Name = "repasstextBox"; + this.txtRePass.Name = "txtRePass"; this.txtRePass.PasswordChar = '*'; this.txtRePass.Size = new System.Drawing.Size(148, 23); this.txtRePass.TabIndex = 24; @@ -243,7 +242,7 @@ this.label36.TabIndex = 27; this.label36.Text = "*"; // - // groupIdcomboBox + // cmbGroup // this.cmbGroup.Enabled = false; this.cmbGroup.FormattingEnabled = true; @@ -254,7 +253,7 @@ "鏁版嵁", "鐧诲綍"}); this.cmbGroup.Location = new System.Drawing.Point(112, 267); - this.cmbGroup.Name = "groupIdcomboBox"; + this.cmbGroup.Name = "cmbGroup"; this.cmbGroup.Size = new System.Drawing.Size(148, 25); this.cmbGroup.TabIndex = 26; this.cmbGroup.Text = "瀹㈡湇"; @@ -269,10 +268,10 @@ this.label37.TabIndex = 25; this.label37.Text = "鍒嗙粍锛"; // - // passwordtextBox + // txtPassword // this.txtPassword.Location = new System.Drawing.Point(112, 184); - this.txtPassword.Name = "passwordtextBox"; + this.txtPassword.Name = "txtPassword"; this.txtPassword.PasswordChar = '*'; this.txtPassword.Size = new System.Drawing.Size(148, 23); this.txtPassword.TabIndex = 23; @@ -325,19 +324,20 @@ // this.dgvUser.AllowUserToAddRows = false; this.dgvUser.AllowUserToDeleteRows = false; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); - this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); + this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.dgvUser.AutoRowNumber = true; this.dgvUser.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvUser.BackgroundColor = System.Drawing.Color.White; this.dgvUser.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle5.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dgvUser.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvUser.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.UserIdColumn, @@ -348,17 +348,10 @@ this.shopCountColumn, this.editColumn, this.deleteColumn}); - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle6.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvUser.DefaultCellStyle = dataGridViewCellStyle6; this.dgvUser.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvUser.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); this.dgvUser.Location = new System.Drawing.Point(0, 5); + this.dgvUser.MultiSelectCheckBox = true; this.dgvUser.Name = "dgvUser"; this.dgvUser.ReadOnly = true; this.dgvUser.RowTemplate.Height = 23; @@ -419,16 +412,16 @@ this.deleteColumn.Name = "deleteColumn"; this.deleteColumn.ReadOnly = true; // - // SubAccountListForm + // WXSubAccountListForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.BackColor = System.Drawing.Color.White; this.ClientSize = new System.Drawing.Size(933, 445); this.Controls.Add(this.splitContainer5); this.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.KeyPreview = true; this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.Name = "SubAccountListForm"; + this.Name = "WXSubAccountListForm"; this.Text = "瀛愯处鍙风鐞"; this.Load += new System.EventHandler(this.SubAccountForm_Load); this.splitContainer5.Panel1.ResumeLayout(false); diff --git a/TEMUKJD/WXForms/TalkForms/TalkMessageForm.designer.cs b/TEMUKJD/WXForms/TalkForms/TalkMessageForm.designer.cs index 69b3742..3ae811d 100644 --- a/TEMUKJD/WXForms/TalkForms/TalkMessageForm.designer.cs +++ b/TEMUKJD/WXForms/TalkForms/TalkMessageForm.designer.cs @@ -74,15 +74,14 @@ this.panel2.Size = new System.Drawing.Size(254, 110); this.panel2.TabIndex = 189; // - // ChatMessageForm + // TalkMessageForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.ClientSize = new System.Drawing.Size(256, 144); this.Controls.Add(this.panel2); + this.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.ShowMinimizedBox = true; - this.Name = "ChatMessageForm"; + this.Name = "TalkMessageForm"; this.Text = "鏂版秷鎭"; this.TitleText = "鏂版秷鎭"; this.Controls.SetChildIndex(this.panel2, 0); diff --git a/TEMUKJD/WXForms/TalkForms/WxTalkForm.cs b/TEMUKJD/WXForms/TalkForms/WxTalkForm.cs index 3affbd3..1b4c1d9 100644 --- a/TEMUKJD/WXForms/TalkForms/WxTalkForm.cs +++ b/TEMUKJD/WXForms/TalkForms/WxTalkForm.cs @@ -1189,7 +1189,7 @@ namespace TemuKJD.WXForms.TalkForms Invoke(new Action(() => { TalkMessageForm cmf = new TalkMessageForm(shop, this); - cmf.Dragable = false; + //cmf.Dragable = false; cmf.ShowMinimizedBox = false; lstChatMessageForm.Add(cmf); Point p = new Point(Screen.PrimaryScreen.WorkingArea.Width - cmf.Width, Screen.PrimaryScreen.WorkingArea.Height);