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/business/AgOutsourcSingleAllEdit.aspx.cs | 53 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.cs
index 3c00b4a..57498a7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.cs
@@ -137,10 +137,17 @@
Pagination pa = new Pagination();
pa.PageSize = 500;
pa.PageIndex = 1;
- this.selOutFirm.DataSource = bll_OA_CorporateClientsBLL.SelectModelPage(pa, CurrentUser.MemberId, "");
+ var ss = bll_OA_CorporateClientsBLL.SelectModelPage(pa, CurrentUser.MemberId, "");
+ this.selOutFirm.DataSource = ss;
this.selOutFirm.DataTextField = "OutVendorName";
this.selOutFirm.DataValueField = "FirmId";
this.selOutFirm.DataBind();
+ this.selOutFirm.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+ var aaa = ss.FirstOrDefault(x => x.OutVendorName == "鍏朵粬");
+ if (aaa != null)
+ {
+ this.selOutFirm.SelectedValue = aaa.FirmId.ToString();
+ }
selOutFirm_SelectedIndexChanged(null, null);
}
@@ -201,6 +208,12 @@
JavaScript.MessageBox("鏈紶閫掑弬鏁帮紒", this);
return false;
}
+ if (string.IsNullOrEmpty(this.selOutFirm.SelectedValue))
+ {
+ JavaScript.MessageBox("鏈�夋嫨澶栧崗鍘傚晢锛�", this);
+ return false;
+ }
+
int? orderid = MyConvert.ConvertToInt32(orderIdStr);
if (!orderid.HasValue)
{
@@ -326,33 +339,43 @@
protected void selOutFirm_SelectedIndexChanged(object sender, EventArgs e)
{
-
- OA_CorporateClients oA_CorporateClientsModel = new OA_CorporateClients();
- oA_CorporateClientsModel = bll_OA_CorporateClientsBLL.GetModelByMemberIdAndName(CurrentUser.MemberId, selOutFirm.SelectedItem.Text.ToString());
- if (oA_CorporateClientsModel.Keyid != oA_CorporateClientsModel.FirmId)
+ if(selOutFirm.SelectedValue != "")
{
- trFile.Visible = true;
- LF_OrderFile lfModel = new LF_OrderFile();
- LF_OrderFileBLL lF_OrderFileBLL = new LF_OrderFileBLL();
- lfModel = lF_OrderFileBLL.GetModel(Convert.ToInt32(Request["orderid"]));
- if (lfModel == null)
+ OA_CorporateClients oA_CorporateClientsModel = new OA_CorporateClients();
+ oA_CorporateClientsModel = bll_OA_CorporateClientsBLL.GetModelByMemberIdAndName(CurrentUser.MemberId, selOutFirm.SelectedItem.Text.ToString());
+ if (oA_CorporateClientsModel.Keyid != oA_CorporateClientsModel.FirmId)
{
- cbkIsAllRecovery.Visible = false;
- IsFiles = true;
+ trFile.Visible = true;
+ LF_OrderFile lfModel = new LF_OrderFile();
+ LF_OrderFileBLL lF_OrderFileBLL = new LF_OrderFileBLL();
+ lfModel = lF_OrderFileBLL.GetModel(Convert.ToInt32(Request["orderid"]));
+ if (lfModel == null)
+ {
+ cbkIsAllRecovery.Visible = false;
+ IsFiles = true;
+ }
+ else
+ {
+ cbkIsAllRecovery.Visible = true;
+ IsFiles = false;
+ }
+
+
}
else
{
- cbkIsAllRecovery.Visible = true;
+ trFile.Visible = false;
IsFiles = false;
}
-
-
}
else
{
trFile.Visible = false;
IsFiles = false;
}
+ string script = "<script>ReceiptT('member', '"+ CurrentUser.MemberId + "', 4, 100)</script>";
+ this.ClientScript.RegisterStartupScript(this.Page.GetType(), "key", script);
+
}
}
}
\ No newline at end of file
--
Gitblit v1.9.1