From a7e05ebe00fdcb649c012e5afc4a42a8d631e824 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 02 四月 2025 08:38:24 +0800
Subject: [PATCH] 删除客户管理查询条件中的“客户编号” 完成 新增订单---黑白印件 的后道工序最右边增加一个“口 竖式”，同前面套号、压痕一样，默认不勾选，是竖式的业务经理自己下单时勾选 完成提交外协付款申请时，增加上传审批证明的上传图片功能，可以添加多张图片；查询列表中增加“付款状态：全部、已付款、未付款”查询条件，默认全部；“完工状态”改为默认未完工 完成请示批复----付款申请 中也要向上面的需求一样，增加上传审批证明的上传图片功能，可以添加多张图片 完成在“请示批复”中进行“批复”操作的时候要能查看上传的审批图片 完成包装要求”要显示在打印的订单中 完成包装要求”要显示在打印的订单中 完成收据联单的新增订单中，纸张选无碳纸时，不显示“品牌”、“克重”，在联数的后面增加颜色选择：“颜色：上白下红”（匹配联数）订单管理中的“订单状态”删除，删除后新增两个状态：“完工状态：全部、未完工、已完工”和“送货状态：全部、已送货、未送货” 完成请示批复中默认“未批复” 完成请示批复中默认“未批复” 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/procurement/BrandList.aspx.cs | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/BrandList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/BrandList.aspx.cs
index dd6fb09..46c0fd5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/BrandList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/BrandList.aspx.cs
@@ -8,6 +8,8 @@
using CY.BLL.OA;
using CY.Infrastructure.Query;
using CY.Infrastructure.Common;
+using System.Data;
+
namespace CY.WebForm.Pages.procurement
{
public partial class BrandList : BasePage
@@ -15,11 +17,13 @@
OA_Brand brand = null;
OA_BrandBLL _OA_BrandBLL = null;
+ OA_CommodityBLL _OA_CommodityBLL = null;
public BrandList()
{
brand = new OA_Brand();
_OA_BrandBLL = new OA_BrandBLL();
+ _OA_CommodityBLL = new OA_CommodityBLL();
}
protected void Page_Load(object sender, EventArgs e)
@@ -28,6 +32,9 @@
UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
if (!IsPostBack)
{
+ DataTable ds = _OA_CommodityBLL.SelectModelPage(CurrentUser.MemberId, "", "true");
+ GetDataByLevel(dwCommity, ds, 0, 0);
+ dwCommity.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
if (Request["Keyid"].ToInt32() > 0) //濡傛灉keyid>0 鍒欏垹闄ゅ搴斿璞�
{
@@ -72,7 +79,7 @@
Pagination pa = new Pagination();
pa.PageSize = this.UCPager1.AspNetPager.PageSize;
pa.PageIndex = this.UCPager1.AspNetPager.CurrentPageIndex;
- this.RepBrandList.DataSource = _OA_BrandBLL.getAllBrandNameByGoods(pa, CurrentUser.MemberId, txtBrandName.Value, this.txtGoodsName.Value, this.txtCommodity.Value);
+ this.RepBrandList.DataSource = _OA_BrandBLL.getAllBrandNameByGoods(pa, CurrentUser.MemberId, txtBrandName.Value, this.txtGoodsName.Value, this.dwCommity.SelectedValue);
this.RepBrandList.DataBind();
UCPager1.AspNetPager.RecordCount = pa.RecordCount;
}
@@ -86,6 +93,29 @@
{
BindList();
}
+ #region 涓婄骇鐖剁被鏁版嵁鍒濆鍖�
+ public static void GetDataByLevel(System.Web.UI.WebControls.DropDownList dwCommity, DataTable data, int parentId, int level)
+ {
+ DataRow[] result = data.Select(string.Format("ParentId={0}", parentId));
+ int i = -1;
+ while (++i < result.Length)
+ {
+ dwCommity.Items.Add(new ListItem(GetSplitChar(level) + result[i]["CommodityName"].ToString2(), result[i]["Keyid"].ToString2()));
+ GetDataByLevel(dwCommity, data, result[i]["Keyid"].ToInt32().Value, level + 1);
+ }
+ }
+ public static string GetSplitChar(int level)
+ {
+ string splitchar = "";
+ int i = -1;
+ while (++i < level)
+ {
+ splitchar += ".";
+ }
+ return splitchar;
+ }
+
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1