1挪动一些老旧文件的位置以备后续删除 2图片显示 3店铺登录信息优化显示
This commit is contained in:
1 parent
011b909bfc
commit
157f7e9f3e
59 files changed
+1160
-432
No files matched your search
@@ -15,6 +15,7 @@ using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
using TemuKJD.KJDForms.BaseForms;
|
||||
using TemuKJD.KJDForms.ToolForms;
|
||||
using Work;
|
||||
|
||||
namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
@@ -313,6 +314,10 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
dgvDbProduct.Rows[e.RowIndex].Cells["colEndWords"].Value = dbProduct.end_words;
|
||||
dgvDbProduct.Rows[e.RowIndex].Cells["colFissionWords"].Value = dbProduct.fission_words;
|
||||
break;
|
||||
case "主图":
|
||||
ShowImgForm imgFrom = new ShowImgForm(dgvDbProduct.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString());
|
||||
imgFrom.ShowDialog();
|
||||
break;
|
||||
case "认领":
|
||||
Task.Run(() => { SelectProduct(new TemuDBProduct[] { dbProduct }); });
|
||||
break;
|
||||
|
||||
+33
-19
@@ -113,6 +113,7 @@
|
||||
this.colOpResult = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
|
||||
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
|
||||
this.chkOriginalPriceMarkUp = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
|
||||
this.splitContainer1.Panel1.SuspendLayout();
|
||||
this.splitContainer1.Panel2.SuspendLayout();
|
||||
@@ -470,6 +471,7 @@
|
||||
this.flowLayoutPanel1.Controls.Add(this.chkSkuRandomPrice);
|
||||
this.flowLayoutPanel1.Controls.Add(this.numSkuRandomPrice);
|
||||
this.flowLayoutPanel1.Controls.Add(this.label11);
|
||||
this.flowLayoutPanel1.Controls.Add(this.chkOriginalPriceMarkUp);
|
||||
this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 36);
|
||||
this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.flowLayoutPanel1.Name = "flowLayoutPanel1";
|
||||
@@ -493,7 +495,7 @@
|
||||
this.txtSkuHeadText.Location = new System.Drawing.Point(55, 3);
|
||||
this.txtSkuHeadText.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
|
||||
this.txtSkuHeadText.Name = "txtSkuHeadText";
|
||||
this.txtSkuHeadText.Size = new System.Drawing.Size(91, 23);
|
||||
this.txtSkuHeadText.Size = new System.Drawing.Size(85, 23);
|
||||
this.txtSkuHeadText.TabIndex = 452;
|
||||
this.txtSkuHeadText.TextChanged += new System.EventHandler(this.txtSkuHeadText_TextChanged);
|
||||
//
|
||||
@@ -501,7 +503,7 @@
|
||||
//
|
||||
this.label10.Anchor = System.Windows.Forms.AnchorStyles.None;
|
||||
this.label10.AutoSize = true;
|
||||
this.label10.Location = new System.Drawing.Point(149, 6);
|
||||
this.label10.Location = new System.Drawing.Point(143, 6);
|
||||
this.label10.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
|
||||
this.label10.Name = "label10";
|
||||
this.label10.Size = new System.Drawing.Size(52, 17);
|
||||
@@ -511,10 +513,10 @@
|
||||
// txtSkuEndText
|
||||
//
|
||||
this.txtSkuEndText.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.txtSkuEndText.Location = new System.Drawing.Point(201, 3);
|
||||
this.txtSkuEndText.Location = new System.Drawing.Point(195, 3);
|
||||
this.txtSkuEndText.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
|
||||
this.txtSkuEndText.Name = "txtSkuEndText";
|
||||
this.txtSkuEndText.Size = new System.Drawing.Size(92, 23);
|
||||
this.txtSkuEndText.Size = new System.Drawing.Size(85, 23);
|
||||
this.txtSkuEndText.TabIndex = 454;
|
||||
this.txtSkuEndText.TextChanged += new System.EventHandler(this.txtSkuEndText_TextChanged);
|
||||
//
|
||||
@@ -522,7 +524,7 @@
|
||||
//
|
||||
this.chkFission.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.chkFission.AutoSize = true;
|
||||
this.chkFission.Location = new System.Drawing.Point(299, 4);
|
||||
this.chkFission.Location = new System.Drawing.Point(286, 4);
|
||||
this.chkFission.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
|
||||
this.chkFission.Name = "chkFission";
|
||||
this.chkFission.Size = new System.Drawing.Size(75, 21);
|
||||
@@ -534,8 +536,8 @@
|
||||
//
|
||||
this.chkHeadWords.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.chkHeadWords.AutoSize = true;
|
||||
this.chkHeadWords.Location = new System.Drawing.Point(376, 4);
|
||||
this.chkHeadWords.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0);
|
||||
this.chkHeadWords.Location = new System.Drawing.Point(361, 4);
|
||||
this.chkHeadWords.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.chkHeadWords.Name = "chkHeadWords";
|
||||
this.chkHeadWords.Size = new System.Drawing.Size(75, 21);
|
||||
this.chkHeadWords.TabIndex = 473;
|
||||
@@ -546,8 +548,8 @@
|
||||
//
|
||||
this.chkEndWords.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.chkEndWords.AutoSize = true;
|
||||
this.chkEndWords.Location = new System.Drawing.Point(453, 4);
|
||||
this.chkEndWords.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0);
|
||||
this.chkEndWords.Location = new System.Drawing.Point(436, 4);
|
||||
this.chkEndWords.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.chkEndWords.Name = "chkEndWords";
|
||||
this.chkEndWords.Size = new System.Drawing.Size(75, 21);
|
||||
this.chkEndWords.TabIndex = 474;
|
||||
@@ -558,8 +560,8 @@
|
||||
//
|
||||
this.chkReFissionAllProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.chkReFissionAllProdName.AutoSize = true;
|
||||
this.chkReFissionAllProdName.Location = new System.Drawing.Point(530, 4);
|
||||
this.chkReFissionAllProdName.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0);
|
||||
this.chkReFissionAllProdName.Location = new System.Drawing.Point(511, 4);
|
||||
this.chkReFissionAllProdName.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.chkReFissionAllProdName.Name = "chkReFissionAllProdName";
|
||||
this.chkReFissionAllProdName.Size = new System.Drawing.Size(99, 21);
|
||||
this.chkReFissionAllProdName.TabIndex = 472;
|
||||
@@ -571,8 +573,8 @@
|
||||
//
|
||||
this.chkRandomSkuOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.chkRandomSkuOrder.AutoSize = true;
|
||||
this.chkRandomSkuOrder.Location = new System.Drawing.Point(631, 4);
|
||||
this.chkRandomSkuOrder.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0);
|
||||
this.chkRandomSkuOrder.Location = new System.Drawing.Point(610, 4);
|
||||
this.chkRandomSkuOrder.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.chkRandomSkuOrder.Name = "chkRandomSkuOrder";
|
||||
this.chkRandomSkuOrder.Size = new System.Drawing.Size(95, 21);
|
||||
this.chkRandomSkuOrder.TabIndex = 469;
|
||||
@@ -583,11 +585,10 @@
|
||||
// chkSkuRandomPrice
|
||||
//
|
||||
this.chkSkuRandomPrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.chkSkuRandomPrice.AutoSize = true;
|
||||
this.chkSkuRandomPrice.Location = new System.Drawing.Point(728, 4);
|
||||
this.chkSkuRandomPrice.Location = new System.Drawing.Point(707, 4);
|
||||
this.chkSkuRandomPrice.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0);
|
||||
this.chkSkuRandomPrice.Name = "chkSkuRandomPrice";
|
||||
this.chkSkuRandomPrice.Size = new System.Drawing.Size(119, 21);
|
||||
this.chkSkuRandomPrice.Size = new System.Drawing.Size(110, 21);
|
||||
this.chkSkuRandomPrice.TabIndex = 468;
|
||||
this.chkSkuRandomPrice.Text = "sku随机价格变化";
|
||||
this.chkSkuRandomPrice.UseVisualStyleBackColor = true;
|
||||
@@ -601,7 +602,7 @@
|
||||
0,
|
||||
0,
|
||||
131072});
|
||||
this.numSkuRandomPrice.Location = new System.Drawing.Point(847, 3);
|
||||
this.numSkuRandomPrice.Location = new System.Drawing.Point(817, 3);
|
||||
this.numSkuRandomPrice.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
|
||||
this.numSkuRandomPrice.Name = "numSkuRandomPrice";
|
||||
this.numSkuRandomPrice.Size = new System.Drawing.Size(44, 23);
|
||||
@@ -617,8 +618,8 @@
|
||||
//
|
||||
this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.label11.AutoSize = true;
|
||||
this.label11.Location = new System.Drawing.Point(897, 6);
|
||||
this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
|
||||
this.label11.Location = new System.Drawing.Point(861, 6);
|
||||
this.label11.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.label11.Name = "label11";
|
||||
this.label11.Size = new System.Drawing.Size(20, 17);
|
||||
this.label11.TabIndex = 471;
|
||||
@@ -1087,6 +1088,18 @@
|
||||
this.statusBar.Size = new System.Drawing.Size(1558, 25);
|
||||
this.statusBar.TabIndex = 5;
|
||||
//
|
||||
// chkOriginalPriceMarkUp
|
||||
//
|
||||
this.chkOriginalPriceMarkUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.chkOriginalPriceMarkUp.AutoSize = true;
|
||||
this.chkOriginalPriceMarkUp.Location = new System.Drawing.Point(883, 4);
|
||||
this.chkOriginalPriceMarkUp.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0);
|
||||
this.chkOriginalPriceMarkUp.Name = "chkOriginalPriceMarkUp";
|
||||
this.chkOriginalPriceMarkUp.Size = new System.Drawing.Size(95, 21);
|
||||
this.chkOriginalPriceMarkUp.TabIndex = 469;
|
||||
this.chkOriginalPriceMarkUp.Text = "sku原价加价";
|
||||
this.chkOriginalPriceMarkUp.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// DbProductSelectListManageForm
|
||||
//
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||
@@ -1196,5 +1209,6 @@
|
||||
private System.Windows.Forms.Label label13;
|
||||
private System.Windows.Forms.ComboBox cmbNotes;
|
||||
private DevComponents.DotNetBar.PanelEx btnDel;
|
||||
private UserComponent.UcCheckBox chkOriginalPriceMarkUp;
|
||||
}
|
||||
}
|
||||
@@ -22,6 +22,7 @@ using System.Threading;
|
||||
using TemuKJD.KJDForms.AdminForms;
|
||||
using TemuKJD.KJDForms.ShopForms;
|
||||
using System.Globalization;
|
||||
using TemuKJD.KJDForms.ToolForms;
|
||||
|
||||
namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
{
|
||||
@@ -306,7 +307,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
var dbId = dgvSelectProduct.Rows[e.RowIndex].Cells["colSelectId"].Value.ParseToString();
|
||||
var dbSelectProduct = lstAdminTemuDBProductSelect.FirstOrDefault(p => p.id.ToString() == dbId);
|
||||
var shopId = dgvSelectProduct.Rows[e.RowIndex].Cells["colSupplierId"].Value.ParseToString();
|
||||
var draftId = dgvSelectProduct.Rows[e.RowIndex].Cells["colDraftId"].Value.ParseToString();
|
||||
var draftId = dgvSelectProduct.Rows[e.RowIndex].Cells["colDraftId"].Value.ParseToString();
|
||||
|
||||
switch (headerText)
|
||||
{
|
||||
@@ -325,6 +326,10 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
dgvSelectProduct.Rows[e.RowIndex].Cells["colNotes"].Value = dbSelectProduct.notes;
|
||||
dgvSelectProduct.Rows[e.RowIndex].Cells["colProductName"].Value = dbSelectProduct.fission_product_name;
|
||||
break;
|
||||
case "Skc图片":
|
||||
ShowImgForm imgFrom = new ShowImgForm(dgvSelectProduct.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString());
|
||||
imgFrom.ShowDialog();
|
||||
break;
|
||||
case "认领":
|
||||
//Task.Run(() => { SelectProduct(new TemuDBProduct[] { dbProduct }); });
|
||||
break;
|
||||
@@ -1160,9 +1165,13 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
JsonHelper.SerializeObject(skuInfo.productSkuWhExtAttr.productSkuWeight)),
|
||||
};
|
||||
skuItem.supplierPrice = skuInfo.supplierPrice;
|
||||
//var dbPrice = lstDbPrice.FirstOrDefault(p => p.ext_code == dbProd.ext_code);
|
||||
//if (dbPrice != null)
|
||||
// skuItem.supplierPrice = dbPrice.original_price * dbPrice.markup_times + dbPrice.extra_price;
|
||||
// 按照批号原价取商品原价和加价规则并修改商品上传价格
|
||||
if (chkOriginalPriceMarkUp.Checked)
|
||||
{
|
||||
var dbPrice = lstDbPrice.FirstOrDefault(p => p.ext_code == dbProd.ext_code);
|
||||
if (dbPrice != null)
|
||||
skuItem.supplierPrice = dbPrice.original_price * dbPrice.markup_times + dbPrice.extra_price;
|
||||
}
|
||||
|
||||
#region 使用随机sku价格上传(第一个sku价格不变,此处有bug,平台最后的sku排列不是按照提交上去的顺序排的)
|
||||
if (skuCount != 1 && chkSkuRandomPrice.Checked)
|
||||
|
||||
@@ -67,8 +67,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colLoginStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colSelectProduct = new System.Windows.Forms.DataGridViewLinkColumn();
|
||||
this.colLoginStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colRemaining = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
@@ -82,6 +83,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
this.colLogin = new System.Windows.Forms.DataGridViewLinkColumn();
|
||||
this.colSpuId = new System.Windows.Forms.DataGridViewLinkColumn();
|
||||
this.colSkcId = new System.Windows.Forms.DataGridViewLinkColumn();
|
||||
this.colImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colProductSkcPic = new System.Windows.Forms.DataGridViewImageColumn();
|
||||
this.colProductName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colProductCat = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
@@ -507,7 +509,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
this.splitContainer2.Panel2.Controls.Add(this.dgvSelectProduct);
|
||||
this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0);
|
||||
this.splitContainer2.Size = new System.Drawing.Size(1284, 392);
|
||||
this.splitContainer2.SplitterDistance = 270;
|
||||
this.splitContainer2.SplitterDistance = 300;
|
||||
this.splitContainer2.TabIndex = 0;
|
||||
//
|
||||
// dgvShop
|
||||
@@ -532,8 +534,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
this.colShopLoginName,
|
||||
this.colShopId,
|
||||
this.colShopName,
|
||||
this.colLoginStatus,
|
||||
this.colShopNotes,
|
||||
this.colSelectProduct,
|
||||
this.colLoginStatus,
|
||||
this.colCanUse,
|
||||
this.colRemaining,
|
||||
this.colMessage});
|
||||
@@ -541,9 +544,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
this.dgvShop.Location = new System.Drawing.Point(4, 0);
|
||||
this.dgvShop.Name = "dgvShop";
|
||||
this.dgvShop.ReadOnly = true;
|
||||
this.dgvShop.RowHeadersWidth = 30;
|
||||
this.dgvShop.RowHeadersWidth = 25;
|
||||
this.dgvShop.RowTemplate.Height = 23;
|
||||
this.dgvShop.Size = new System.Drawing.Size(266, 392);
|
||||
this.dgvShop.Size = new System.Drawing.Size(296, 392);
|
||||
this.dgvShop.TabIndex = 6;
|
||||
this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick);
|
||||
//
|
||||
@@ -578,14 +581,14 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
this.colShopName.Name = "colShopName";
|
||||
this.colShopName.ReadOnly = true;
|
||||
this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colShopName.Width = 75;
|
||||
this.colShopName.Width = 70;
|
||||
//
|
||||
// colLoginStatus
|
||||
// colShopNotes
|
||||
//
|
||||
this.colLoginStatus.HeaderText = "登录状态";
|
||||
this.colLoginStatus.Name = "colLoginStatus";
|
||||
this.colLoginStatus.ReadOnly = true;
|
||||
this.colLoginStatus.Visible = false;
|
||||
this.colShopNotes.HeaderText = "分组";
|
||||
this.colShopNotes.Name = "colShopNotes";
|
||||
this.colShopNotes.ReadOnly = true;
|
||||
this.colShopNotes.Width = 70;
|
||||
//
|
||||
// colSelectProduct
|
||||
//
|
||||
@@ -594,7 +597,14 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
this.colSelectProduct.ReadOnly = true;
|
||||
this.colSelectProduct.Resizable = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colSelectProduct.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
|
||||
this.colSelectProduct.Width = 65;
|
||||
this.colSelectProduct.Width = 62;
|
||||
//
|
||||
// colLoginStatus
|
||||
//
|
||||
this.colLoginStatus.HeaderText = "登录状态";
|
||||
this.colLoginStatus.Name = "colLoginStatus";
|
||||
this.colLoginStatus.ReadOnly = true;
|
||||
this.colLoginStatus.Visible = false;
|
||||
//
|
||||
// colCanUse
|
||||
//
|
||||
@@ -622,7 +632,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
//
|
||||
this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
|
||||
this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
|
||||
this.pbLoading.Location = new System.Drawing.Point(480, 171);
|
||||
this.pbLoading.Location = new System.Drawing.Point(465, 171);
|
||||
this.pbLoading.Name = "pbLoading";
|
||||
this.pbLoading.Size = new System.Drawing.Size(50, 50);
|
||||
this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
|
||||
@@ -656,6 +666,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
this.colLogin,
|
||||
this.colSpuId,
|
||||
this.colSkcId,
|
||||
this.colImgUrl,
|
||||
this.colProductSkcPic,
|
||||
this.colProductName,
|
||||
this.colProductCat,
|
||||
@@ -670,9 +681,10 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
this.dgvSelectProduct.Name = "dgvSelectProduct";
|
||||
this.dgvSelectProduct.ReadOnly = true;
|
||||
this.dgvSelectProduct.RowTemplate.Height = 23;
|
||||
this.dgvSelectProduct.Size = new System.Drawing.Size(1006, 392);
|
||||
this.dgvSelectProduct.Size = new System.Drawing.Size(976, 392);
|
||||
this.dgvSelectProduct.TabIndex = 187;
|
||||
this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick);
|
||||
this.dgvSelectProduct.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dgvSelectProduct_Scroll);
|
||||
//
|
||||
// colCheck
|
||||
//
|
||||
@@ -745,6 +757,13 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
this.colSkcId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
|
||||
this.colSkcId.Width = 80;
|
||||
//
|
||||
// colImgUrl
|
||||
//
|
||||
this.colImgUrl.HeaderText = "图片地址";
|
||||
this.colImgUrl.Name = "colImgUrl";
|
||||
this.colImgUrl.ReadOnly = true;
|
||||
this.colImgUrl.Visible = false;
|
||||
//
|
||||
// colProductSkcPic
|
||||
//
|
||||
this.colProductSkcPic.HeaderText = "图片";
|
||||
@@ -961,15 +980,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
private System.Windows.Forms.ComboBox cmbStatus;
|
||||
private System.Windows.Forms.Label label8;
|
||||
private DevComponents.DotNetBar.PanelEx btnDelSelect;
|
||||
private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colShopName;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colLoginStatus;
|
||||
private System.Windows.Forms.DataGridViewLinkColumn colSelectProduct;
|
||||
private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colRemaining;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
|
||||
private System.Windows.Forms.Label label13;
|
||||
private System.Windows.Forms.Label label6;
|
||||
private System.Windows.Forms.ComboBox cmbNotes;
|
||||
@@ -986,6 +996,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
private System.Windows.Forms.TextBox txtSKC;
|
||||
private System.Windows.Forms.TextBox txtSPU;
|
||||
private System.Windows.Forms.Label label1;
|
||||
private DevComponents.DotNetBar.PanelEx pnlEmpty;
|
||||
private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colSelectId;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierId;
|
||||
@@ -994,6 +1005,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
private System.Windows.Forms.DataGridViewLinkColumn colLogin;
|
||||
private System.Windows.Forms.DataGridViewLinkColumn colSpuId;
|
||||
private System.Windows.Forms.DataGridViewLinkColumn colSkcId;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colImgUrl;
|
||||
private System.Windows.Forms.DataGridViewImageColumn colProductSkcPic;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colProductName;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colProductCat;
|
||||
@@ -1003,6 +1015,15 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colNotes;
|
||||
private System.Windows.Forms.DataGridViewLinkColumn colUserNotes;
|
||||
private System.Windows.Forms.DataGridViewLinkColumn ColDelete;
|
||||
private DevComponents.DotNetBar.PanelEx pnlEmpty;
|
||||
private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colShopName;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes;
|
||||
private System.Windows.Forms.DataGridViewLinkColumn colSelectProduct;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colLoginStatus;
|
||||
private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colRemaining;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
|
||||
}
|
||||
}
|
||||
@@ -19,6 +19,7 @@ using System.Windows.Forms;
|
||||
using TemuKJD.Extension;
|
||||
using TemuKJD.KJDForms.BaseForms;
|
||||
using TemuKJD.KJDForms.ShopForms;
|
||||
using TemuKJD.KJDForms.ToolForms;
|
||||
using Work;
|
||||
|
||||
namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
@@ -124,8 +125,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
shopEntity.LoginName,
|
||||
shopEntity.ShopId,
|
||||
shopEntity.ShopAccount,
|
||||
shopEntity.LoginStatus,
|
||||
shopEntity.Notes,
|
||||
"选择商品",
|
||||
canUse ? "在线" : "掉线",
|
||||
canUse,
|
||||
shopEntity.AddProductRemaining,
|
||||
string.Empty
|
||||
@@ -136,7 +138,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
row.Cells["colSelect"].Value = !isInit || (selectShopId.Contains(shopEntity.ShopId) && canUse);
|
||||
row.Cells["colShopLoginName"].Value = shopEntity.LoginName;
|
||||
row.Cells["colShopName"].Value = shopEntity.ShopAccount;
|
||||
row.Cells["colLoginStatus"].Value = shopEntity.LoginStatus;
|
||||
row.Cells["colShopNotes"].Value = shopEntity.Notes;
|
||||
row.Cells["colLoginStatus"].Value = canUse ? "在线" : "掉线";
|
||||
row.Cells["colLoginStatus"].Style.ForeColor = canUse ? Color.Green : Color.Red;
|
||||
row.Cells["colCanUse"].Value = canUse;
|
||||
row.Cells["colRemaining"].Value = shopEntity.AddProductRemaining;
|
||||
}
|
||||
@@ -223,13 +227,13 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
|
||||
foreach (var prodSelect in lstTemuDBProductSelect)
|
||||
{
|
||||
Image image = null;
|
||||
string imgUrl = prodSelect?.main_img?.Replace("https", "http");
|
||||
string rst = "";
|
||||
if (!string.IsNullOrWhiteSpace(imgUrl))
|
||||
image = GetHtml.GetUrlImg(imgUrl, out rst);
|
||||
if (!string.IsNullOrEmpty(rst))
|
||||
BaseMsgForm.ShowError(rst);
|
||||
//Image image = null;
|
||||
//string imgUrl = prodSelect?.main_img?.Replace("https", "http");
|
||||
//string rst = "";
|
||||
//if (!string.IsNullOrWhiteSpace(imgUrl))
|
||||
// image = GetHtml.GetUrlImg(imgUrl, out rst);
|
||||
//if (!string.IsNullOrEmpty(rst))
|
||||
// BaseMsgForm.ShowError(rst);
|
||||
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
@@ -242,7 +246,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
"登录",
|
||||
prodSelect.spu_id,
|
||||
prodSelect.skc_id,
|
||||
image,//prod.main_img,
|
||||
prodSelect.main_img,
|
||||
defaultBitmap,
|
||||
prodSelect.product_name, // 用户端显示商品原名
|
||||
prodSelect.cat_name,
|
||||
prodSelect.ext_code,
|
||||
@@ -258,6 +263,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
ShowDgvImg();
|
||||
this.pbLoading.Visible = false;
|
||||
}));
|
||||
});
|
||||
@@ -377,6 +383,10 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
// shopLoginForm.ShowDialog();
|
||||
//}
|
||||
break;
|
||||
case "图片":
|
||||
ShowImgForm imgFrom = new ShowImgForm(dgvSelectProduct.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString());
|
||||
imgFrom.ShowDialog();
|
||||
break;
|
||||
case "":
|
||||
dgvSelectProduct.Rows[e.RowIndex].Cells["colCheck"].Value = !(bool)dgvSelectProduct.Rows[e.RowIndex].Cells["colCheck"].Value;
|
||||
break;
|
||||
@@ -464,5 +474,57 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
this.cmbNotes.Text = "全部";
|
||||
this.cmbUserNotes.Text = "全部";
|
||||
}
|
||||
|
||||
Bitmap defaultBitmap = new Bitmap(80, 80);
|
||||
void ShowDgvImg()
|
||||
{
|
||||
Task.Run(() =>
|
||||
{
|
||||
foreach (DataGridViewRow row in this.dgvSelectProduct.Rows)
|
||||
{
|
||||
if (row.Index > 0 && row.Cells["colProductSkcPic"].Displayed == false)
|
||||
{
|
||||
try
|
||||
{
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
row.Cells["colProductSkcPic"].Value = defaultBitmap;
|
||||
}));
|
||||
}
|
||||
catch
|
||||
{
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
if (row.Cells["colProductSkcPic"].Value != null && row.Cells["colProductSkcPic"].Value != defaultBitmap)
|
||||
continue;
|
||||
|
||||
Image image = null;
|
||||
string imgUrl = row.Cells["colImgUrl"]?.Value.ParseToString();
|
||||
string getImgError = "";
|
||||
if (!string.IsNullOrWhiteSpace(imgUrl))
|
||||
image = GetHtml.GetUrlImg(imgUrl, out getImgError);
|
||||
if (!string.IsNullOrEmpty(getImgError))
|
||||
BaseMsgForm.ShowError(getImgError);
|
||||
|
||||
try
|
||||
{
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
row.Cells["colProductSkcPic"].Value = image;
|
||||
}));
|
||||
}
|
||||
catch
|
||||
{
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void dgvSelectProduct_Scroll(object sender, ScrollEventArgs e)
|
||||
{
|
||||
ShowDgvImg();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -126,12 +126,15 @@
|
||||
<metadata name="colShopId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="colLoginStatus.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<metadata name="colShopNotes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="colSelectProduct.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="colLoginStatus.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="colCanUse.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
@@ -162,6 +165,9 @@
|
||||
<metadata name="colSpuId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="colImgUrl.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="colProductSkcPic.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
|
||||
Reference in new issue
Block a user