From 49b37bdd9089c17cb816d9a3b92134052a5a2e15 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 13 三月 2026 08:44:55 +0800
Subject: [PATCH] 20260312 所有要品牌选择界面的订单类型的“品牌”都删除 20260312 合版工单删除包装要求，后道及工艺要求不要尺寸
---
CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js | 3 +
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs | 8 ++--
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs | 30 +++++++-------
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx | 8 ++--
CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx | 12 +++---
7 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx
index b580604..b32d132 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx
@@ -121,9 +121,9 @@
<th style="text-align: center; width: 56px;">
淇垏瑕佹眰
</th>
- <th style="text-align: center; width: 56px;">
+ <%--<th style="text-align: center; width: 56px;">
鍖呰瑕佹眰
- </th>
+ </th>--%>
<th style="text-align: center;">
鍚庨亾鍙婂伐鑹鸿姹�
</th>
@@ -148,9 +148,9 @@
<td style="text-align: center;">
<%#Eval("PO_TrimRequire")%>
</td>
- <td style="text-align: center;">
+ <%-- <td style="text-align: center;">
<%#Eval("PO_PackagRequire")%>
- </td>
+ </td>--%>
<td>
<div style="width: 254px; overflow: visible; word-break: break-all; word-wrap: normal; text-align: left;">
<%#Eval("PO_RequirementWork").ToString().Replace("锛�+-+锛�", ",")%>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
index bce9706..ca2691d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
@@ -78,9 +78,9 @@
<th style="text-align: center;">
淇垏瑕佹眰
</th>
- <th style="text-align: center;">
+ <%-- <th style="text-align: center;">
鍖呰瑕佹眰
- </th>
+ </th>--%>
<th style="text-align: center;">
鍚庨亾鍙婂伐鑹鸿姹�
</th>
@@ -111,14 +111,14 @@
<option value="涓嶄慨鍒�">涓嶄慨鍒�</option>
</select>
</td>
- <td>
+ <%-- <td>
<select keepDefaultStyle="true" class=" w70px" name="PO_PackagRequire">
<option value="鎵撳寘">鎵撳寘</option>
<option value="鎵撴崋">鎵撴崋</option>
<option value="瑁呯焊绠�">瑁呯焊绠�</option>
<option value="涓嶆墦鍖�">涓嶆墦鍖�</option>
</select>
- </td>
+ </td>--%>
<td>
<%--<input type="text" name="PO_Requirement" class=" noJ" style="width: 300px;" value="<%#Eval("PrintDemandAfterWorksDemand") %>" />--%>
<input type="text" name="PO_Requirement" class=" noJ" maxlength="500" style="width: 405px;" value="<%#Eval("PrintDemandAfterWorksDemand")%>" />
@@ -152,14 +152,14 @@
<option value="涓嶄慨鍒�" <%#Eval("PO_TrimRequire").ToString()=="涓嶄慨鍒�"?"selected":""%>>涓嶄慨鍒�</option>
</select>
</td>
- <td>
+ <%-- <td>
<select keepDefaultStyle="true" class=" w70px" name="PO_PackagRequire" value="<%#Eval("PO_PackagRequire")%>">
<option value="鎵撳寘" <%#Eval("PO_PackagRequire").ToString()=="鎵撳寘"?"selected":""%>>鎵撳寘</option>
<option value="鎵撴崋" <%#Eval("PO_PackagRequire").ToString()=="鎵撴崋"?"selected":""%>>鎵撴崋</option>
<option value="瑁呯焊绠�" <%#Eval("PO_PackagRequire").ToString()=="瑁呯焊绠�"?"selected":""%>>瑁呯焊绠�</option>
<option value="涓嶆墦鍖�" <%#Eval("PO_PackagRequire").ToString()=="涓嶆墦鍖�"?"selected":""%>>涓嶆墦鍖�</option>
</select>
- </td>
+ </td>--%>
<td>
<input type="text" name="PO_Requirement" class=" noJ" style="width: 405px;" value="<%#Eval("PO_RequirementWork").ToString().Replace("锛�+-+锛�", ",")%>" />
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
index 91f3ea4..8f2cd53 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
@@ -222,7 +222,7 @@
}
if(_eC_OrderBasic.PrintTypeId == -1)
{
- ssss = _inquiryCommonModel.PrintDemand;
+ ssss = _inquiryCommonModel.PrintDemand.Replace(_inquiryCommonModel.PrintSizeName+ "锛�", "");
}
if (!string.IsNullOrEmpty(ssss) && ssss.Length > 500)
{
@@ -485,7 +485,7 @@
string[] PO_Count = Request["PO_Count"].ToString2().Split(',');
string[] PO_TrimRequire = Request["PO_TrimRequire"].ToString2().Split(',');
- string[] PO_PackagRequire = Request["PO_PackagRequire"].ToString2().Split(',');
+ //string[] PO_PackagRequire = Request["PO_PackagRequire"].ToString2().Split(',');
string[] PO_Requirement = Request["PO_Requirement"].ToString2().Split(',');
string[] PO_OrderNum = Request["txtOrderNum"].ToString2().Split(',');
string[] PO_Title = Request["txtDocumentName"].ToString2().Split(',');
@@ -493,7 +493,7 @@
- if (orderId.Length != PO_Count.Length || orderId.Length != PO_TrimRequire.Length || orderId.Length != PO_PackagRequire.Length || orderId.Length != PO_Requirement.Length)
+ if (orderId.Length != PO_Count.Length || orderId.Length != PO_TrimRequire.Length || orderId.Length != PO_Requirement.Length)
{
JavaScript.MessageBox("鎻愪氦澶辫触", this);
return;
@@ -524,7 +524,7 @@
m_EC_MergerOrders.PO_Count = PO_Count[i].ToInt32();
m_EC_MergerOrders.PO_Orderid = orderId[i].ToInt32();
m_EC_MergerOrders.PO_OrderNum = PO_OrderNum[i].ToString2();
- m_EC_MergerOrders.PO_PackagRequire = PO_PackagRequire[i].ToString2();
+ m_EC_MergerOrders.PO_PackagRequire = "";// PO_PackagRequire[i].ToString2();
m_EC_MergerOrders.PO_TrimRequire = PO_TrimRequire[i].ToString2();
m_EC_MergerOrders.PO_RequirementWork = PO_Requirement[i].ToString2().Replace("锛�+-+锛�", ",");
m_EC_MergerOrders.PO_Size = PO_Size[i].ToString2();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index 87dd293..2b5b440 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -9,7 +9,7 @@
<link rel="stylesheet" type="text/css" href="../../Styles/base.css" />
<link href="../../Styles/changes.css" rel="stylesheet" type="text/css" />
<link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
- <script src="../../js/Inquiry/Inquiry.js?v=209" type="text/javascript"></script>
+ <script src="../../js/Inquiry/Inquiry.js?v=210" type="text/javascript"></script>
<script src="../../js/business/Order.js?v=56" type="text/javascript"></script>
<!--鍓嶅彴椤甸潰end-->
<script type="text/javascript" language="javascript">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx
index 1839959..f53b123 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx
@@ -9,7 +9,7 @@
<link rel="stylesheet" type="text/css" href="../../Styles/base.css" />
<link href="../../Styles/changes.css" rel="stylesheet" type="text/css" />
<link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
- <script src="../../js/Inquiry/Inquiry.js?v=209" type="text/javascript"></script>
+ <script src="../../js/Inquiry/Inquiry.js?v=210" type="text/javascript"></script>
<script src="../../js/business/Order.js?v=56" type="text/javascript"></script>
<!--鍓嶅彴椤甸潰end-->
<script type="text/javascript" language="javascript">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
index a89a7ea..45ca58a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -347,7 +347,7 @@
if (model.PrintMode == 0)
{
SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
- printDemand += "(" + brandInfo.BrandName + ")";
+ //printDemand += "(" + brandInfo.BrandName + ")";
}
printDemand += "锛�" + model.GramWeight + "鍏�";
}
@@ -477,7 +477,7 @@
if (model.PaperId > 0)
{
SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
- printDemand += "(" + brandInfo.BrandName + ")";
+ // printDemand += "(" + brandInfo.BrandName + ")";
printDemand += "锛�" + model.GramWeight + "鍏�";
}
printDemand += "锛�" + model.SingleOrdouble + "锛�" + model.PrintColor + "锛�4椤�";
@@ -498,7 +498,7 @@
if (insideModelObj.PaperId > 0)
{
SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(insideModelObj.BrandId);
- printDemand += "(" + brandInfo.BrandName + ")";
+ //printDemand += "(" + brandInfo.BrandName + ")";
printDemand += "锛�" + insideModelObj.GramWeight + "鍏�";
}
printDemand += "锛�" + insideModelObj.PrintColor + "锛�" + insideModelObj.PageNum.ToString();
@@ -621,7 +621,7 @@
if (model.PaperId > 0)
{
SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
- printDemand += "(" + brandInfo.BrandName + ")";
+ //printDemand += "(" + brandInfo.BrandName + ")";
printDemand += "锛�" + model.GramWeight + "鍏�";
}
printDemand += "锛�" + model.SingleOrdouble + "锛�" + model.PrintColor + "锛�4椤�";
@@ -642,7 +642,7 @@
if (insideModelObj.PaperId > 0)
{
SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(insideModelObj.BrandId);
- printDemand += "(" + brandInfo.BrandName + ")";
+ // printDemand += "(" + brandInfo.BrandName + ")";
printDemand += "锛�" + insideModelObj.GramWeight + "鍏�";
}
printDemand += "锛�" + insideModelObj.PrintColor + "锛�" + insideModelObj.PageNum.ToString();
@@ -2021,13 +2021,13 @@
printDemand = paperSize.Name + "锛�";
model.PrintSizeName = paperSize.Name;
}
- printDemand += paperInfo.PaperName + "锛�";
+ printDemand += paperInfo.PaperName /*+ "锛�"*/;
if (model.PaperId != 0)
{
if (model.PrintMode == 0)
{
SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
- printDemand += "(" + brandInfo.BrandName + ")";
+ //printDemand += "(" + brandInfo.BrandName + ")";
}
printDemand += "锛�" + model.GramWeight + "鍏�";
}
@@ -2086,7 +2086,7 @@
{
BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
- printDemand += "(" + brandInfo.BrandName + ")";
+ // printDemand += "(" + brandInfo.BrandName + ")";
}
}
if (pId != 0)
@@ -2122,7 +2122,7 @@
{
BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
- printDemand += "(" + brandInfo.BrandName + ")";
+ // printDemand += "(" + brandInfo.BrandName + ")";
}
}
if (pId != 0)
@@ -2166,7 +2166,7 @@
{
BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
- printDemand += "(" + brandInfo.BrandName + ")";
+ // printDemand += "(" + brandInfo.BrandName + ")";
}
printDemand += "锛�" + model.GramWeight + "鍏�";
}
@@ -2199,7 +2199,7 @@
{
BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
- printDemand += "(" + brandInfo.BrandName + ")";
+ // printDemand += "(" + brandInfo.BrandName + ")";
}
}
if (pId != 0)
@@ -2252,7 +2252,7 @@
{
BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
- printDemand += "(" + brandInfo.BrandName + ")";
+ // printDemand += "(" + brandInfo.BrandName + ")";
}
printDemand += "锛�" + model.GramWeight + "鍏�";
}
@@ -2307,7 +2307,7 @@
{
BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
- printDemand += "(" + brandInfo.BrandName + ")";
+ // printDemand += "(" + brandInfo.BrandName + ")";
printDemand += "锛�" + model.GramWeight + "鍏�";
}
printDemand += "锛屾瘡鏈�" + model.PageNum + "浠斤紝";
@@ -2394,7 +2394,7 @@
{
BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
- printDemand += "(" + brandInfo.BrandName + ")";
+ // printDemand += "(" + brandInfo.BrandName + ")";
printDemand += "锛�" + model.GramWeight + "鍏�";
}
printDemand += "锛屾瘡鏈�" + model.PageNum.ToString() + "寮�";
@@ -2498,7 +2498,7 @@
{
BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
- printDemand += "(" + brandInfo.BrandName + ")";
+ //printDemand += "(" + brandInfo.BrandName + ")";
printDemand += "锛�" + model.GramWeight + "鍏�";
}
printDemand += "锛屾瘡鏈�" + model.PageNum.ToString() + "寮�";
diff --git a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
index 4cbe7ae..1b9df7a 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
@@ -2604,6 +2604,7 @@
}
}
else {
+ $(".Brand" + index).hide();
if (paperId == "0") {
$(".Brand" + index).hide();
$(".gramWeight" + index).hide();
@@ -2614,7 +2615,7 @@
$(".Qitazhi" + index).show();
}
else {
- $(".Brand" + index).show();
+ //$(".Brand" + index).show();
$(".gramWeight" + index).show();
$(".Qitazhi" + index).hide();
if (printTypeId == 27) {
--
Gitblit v1.9.1