From f820d227c54e7686d7b582fcd3c1ffcf885b5d31 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 24 一月 2025 12:22:49 +0800
Subject: [PATCH] 审批拒绝的可以修改后再次提交 完成 报销单需要一个编号 EvaluationContent 报销单编号 完成 增加一个状态，保存状态 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.cs | 90 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 83 insertions(+), 7 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.cs
index e35325b..ffc989d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.cs
@@ -67,22 +67,90 @@
/// </summary>
protected void InitialData()
{
+ var dataTable = _OA_SuppliersBLL.getSupplierTable(CurrentUser.MemberId);
+ var sss = dataTable.Select(" SuppliersTypeId ='182' ");
+
+
+ DataTable dtNew2 = dataTable.Clone(); //澶嶅埗缁撴瀯
+ for (int i = 0; i < sss.Length; i++)
+ {
+ dtNew2.ImportRow(sss[i]); //ImportRow 鏄鍒�
+ }
+
///渚涘簲鍟�
- selSuppliers.DataSource = _OA_SuppliersBLL.getSupplierTable(CurrentUser.MemberId);
-
+ selSuppliers.DataSource = dtNew2;//.Select(" SuppliersTypeId='200' ")
+
selSuppliers.DataBind();
- //selSuppliers.Items.Insert(0, new ListItem("璇烽�夋嫨", "0"));
+ selSuppliers.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
///浜у搧绫诲埆
///
dwCommity.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
- DataTable ds = _OA_CommodityBLL.SelectModelPage(CurrentUser.MemberId, "", "true");
- GetDataByLevel(dwCommity, ds, 0, 0);
+ DataTable dss = _OA_CommodityBLL.SelectModelPage(CurrentUser.MemberId, "", "true");
+ GetDataByLevel(dwCommity, dss, 0, 0);
+
+
+
if (Request["Keyid"].ToInt32() > 0)
{
Keyid = Request["Keyid"].ToString();
ShowProcurementData();
+ }
+ else
+ {
+ dwCommity.SelectedValue = "4";
+ DataTable ds = _OA_GoodsInfoBLL.SlectModleByCommity(dwCommity.SelectedValue, CurrentUser.MemberId);
+ if (ds.Rows.Count > 0)
+ {
+ dwGoodsList.DataSource = ds;
+ dwGoodsList.DataTextField = "GoodsName";
+ dwGoodsList.DataValueField = "Keyid";
+ dwGoodsList.DataBind();
+ dwGoodsList.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ dwBrand.Items.Clear();
+ dwBrand.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ dwSpecification.Items.Clear();
+ dwSpecification.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ dwPaperWeight.Items.Clear();
+ dwPaperWeight.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ if (dwCommity.SelectedItem.Text == "绾稿紶")
+ {
+ this.dwPaperWeight.Visible = true;
+ this.trWeight.Visible = true;
+ this.tanDiv.Visible = true;
+ this.tanDiv1.Visible = false;
+ this.div_td.Visible = true;
+ this.div_td1.Visible = false;
+ }
+ else
+ {
+ this.dwPaperWeight.Visible = false;
+ this.trWeight.Visible = false;
+ this.tanDiv.Visible = false;
+ this.tanDiv1.Visible = true;
+ this.div_td.Visible = false;
+ this.div_td1.Visible = true;
+ }
+ }
+ else
+ {
+ dwGoodsList.Items.Clear();
+ dwGoodsList.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ dwBrand.Items.Clear();
+ dwBrand.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ dwSpecification.Items.Clear();
+ dwSpecification.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ dwPaperWeight.Items.Clear();
+ dwPaperWeight.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+ }
}
@@ -301,10 +369,18 @@
procurement.Price = this.txtPrice.Value.ToDecimal2();
procurement.LastUpdateTime = DateTime.Now;
procurement.Operator = CurrentUser.ShortName;
- procurement.SuppliersId = this.selSuppliers.Value.ToInt32();
+ if (string.IsNullOrEmpty(this.selSuppliers.Value))
+ {
+ procurement.SuppliersId = null;
+ }
+ else
+ {
+ procurement.SuppliersId = this.selSuppliers.Value.ToInt32();
+ }
+
procurement.FirmId = CurrentUser.MemberId;
procurement.GoodsId = this.dwGoodsList.SelectedValue.ToInt32();
- procurement.Remark = "";
+ procurement.Remark = this.txtRemark.Value;
procurement.BrandId = this.dwBrand.SelectedValue.ToInt32();
procurement.SpecificationId = this.dwSpecification.SelectedValue.ToInt32();
procurement.PaperWeightId = this.dwPaperWeight.SelectedValue.ToInt32() ?? 0;
--
Gitblit v1.9.1