From e67b811c4601e7a68c2a980cab2982aebf44c60c Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 03 四月 2026 08:46:43 +0800
Subject: [PATCH] 减号要选择性的删除。每行都要有减号 完成 现在的“印刷数量”就是新版格式的“生产数量”，放在“生产要求”前面，跟生产要求一行 完成 消耗格子的宽度适当缩小点 完成
---
CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.designer.cs | 18 +++---
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.designer.cs | 18 +++---
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx | 8 +-
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx | 46 ++++++++-------
CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiManageDAL.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx | 28 +++++----
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx | 30 +++++-----
9 files changed, 81 insertions(+), 73 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiManageDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiManageDAL.cs
index a5ab58b..8af5139 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiManageDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiManageDAL.cs
@@ -227,7 +227,7 @@
condition += " and a.CateId = '" + _CateId + "'";
if (!string.IsNullOrEmpty(_Name))
- condition += " and a.Name = '" + _Name + "'";
+ condition += " and a.Name like '%" + _Name + "%'";
if (!string.IsNullOrEmpty(Anzhuangdidian))
condition += " and a.Anzhuangdidian = '" + Anzhuangdidian + "'";
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs
index 727a1f5..fa75984 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs
@@ -304,7 +304,7 @@
condition += " and a.CateId = '" + _CateId + "'";
if (!string.IsNullOrEmpty(_Name))
- condition += " and a.Name = '" + _Name + "'";
+ condition += " and a.Name like '%" + _Name + "%'";
if (!string.IsNullOrEmpty(Anzhuangdidian))
condition += " and a.Anzhuangdidian = '" + Anzhuangdidian + "'";
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx
index 74203b4..a3ada61 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx
@@ -323,16 +323,16 @@
</td>
</tr>
<tr class=" price_tabbg" style="font-weight: bold; background-color: #E4E4E4;">
- <td>
- <span style="<%#Eval("shifouxianshi")%><%#Eval("shifouxianshilunzhuan")%>" >鍗板埛鏂瑰紡</span>
- </td>
+
<td>
<span style="<%#Eval("shifouxianshi")%>" >姝ｉ潰鑹叉暟</span>
</td>
<td>
<span style="<%#Eval("shifouxianshi")%>" >鑳岄潰鑹叉暟</span>
</td>
-
+ <td>
+ <span style="<%#Eval("shifouxianshi")%><%#Eval("shifouxianshilunzhuan")%>" >鍗板埛鏂瑰紡</span>
+ </td>
</tr>
<tr style="background-color: #FFFFFF;">
<td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
index 9f5f0e1..c5fa704 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
@@ -210,15 +210,16 @@
</td>
</tr>
<tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;" >
- <td>
- <p name="PSF_yinshufangshi" value_openwidthspan="<%#Container.ItemIndex + 1%>">鍗板埛鏂瑰紡</p>
- </td>
+
<td>
<p name="PSF_yinsezheng" value_openwidthspan="<%#Container.ItemIndex + 1%>">姝ｉ潰鑹叉暟</p>
</td>
<td>
<p name="PSF_yinsebei" value_openwidthspan="<%#Container.ItemIndex + 1%>">鑳岄潰鑹叉暟</p>
</td>
+ <td>
+ <p name="PSF_yinshufangshi" value_openwidthspan="<%#Container.ItemIndex + 1%>">鍗板埛鏂瑰紡</p>
+ </td>
</tr>
<tr>
<td>
@@ -364,7 +365,7 @@
<input type="text" class=" w80px int " msg="璇峰～鍐欐暟瀛�" name="PSF_PrintedPositive" value="<%#Eval("PSF_PrintedPositive")%>" value_positiveid="<%#Container.ItemIndex + 1%>" />
</td>
<td colspan="1">
- <input type="text" class=" w80px int " msg="璇峰～鍐欐暟瀛�" name="PSF_LastNum" value="<%#Eval("PSF_LastNum")%>" value_lastnumid="<%#Container.ItemIndex + 1%>" />
+ <input type="text" class=" w60px int " msg="璇峰～鍐欐暟瀛�" name="PSF_LastNum" value="<%#Eval("PSF_LastNum")%>" value_lastnumid="<%#Container.ItemIndex + 1%>" />
</td>
<td colspan="1">
<select keepdefaultstyle="true" class=" w80px" name="PSF_OpenSpecifications" value_selspec="<%#Container.ItemIndex + 1%>">
@@ -513,15 +514,16 @@
瑕佹眰: <input type="text" name="txtYaoqiu" class=" noJ" maxlength="500" style="width: 405px;" value="<%#Eval("PSF_Yaoqiu")%>" />
</td>
+ <td class="w70px " >
+ <a class="Btn AddHoudaos" value_id="<%#Container.ItemIndex + 1%>" style="font-size:20px;" >+</a> <a class="Btn CutHoudaos" value_id="<%#Container.ItemIndex + 1%>" style="font-size:20px;" >-</a>
+ </td>
</tr>
</ItemTemplate>
</asp:Repeater>
</tbody>
</table>
</td>
- <td class="w70px " >
- <a class="Btn AddHoudaos" style="font-size:20px;" >+</a> <a class="Btn CutHoudaos" style="font-size:20px;" >-</a>
- </td>
+
</tr>
</tbody>
</table>
@@ -532,7 +534,7 @@
鐢熶骇瑕佹眰锛�
</td>
<td colspan="9">
- <textarea style="width: 940px; height: 62px;" name="PMS_Remarks" runat = "server" id="PMS_Remarks"></textarea>
+ <textarea style="width: 940px; height: 12px;" name="PMS_Remarks" runat = "server" id="PMS_Remarks"></textarea>
</td>
</tr>
<tr>
@@ -736,16 +738,18 @@
var value_id = parseInt($(".AddHoudao").last().attr("value_id"));
$(".AddHoudao").last().after($(".AddHoudao").last().clone(true));
$(".AddHoudao").last().attr("value_id", value_id + 1);
-
+ $(".AddHoudaos").last().attr("value_id", value_id + 1);
+ $(".CutHoudaos").last().attr("value_id", value_id + 1);
});
$(".CutHoudaos").click(function () {
- var value_id = parseInt($(".AddHoudao").last().attr("value_id"));
- if (value_id == 1) {
+ var value_id = parseInt($(this).attr("value_id"));
+ var count = $('.AddHoudao').length;
+ if (count == 1) {
} else {
- $(".AddHoudao").last().remove();
+ $(".AddHoudao[value_id='" + value_id + "']").remove();
}
});
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx
index 14238a2..1c1b42c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx
@@ -207,14 +207,7 @@
<span id="spanOrderBillModeName" runat="server"></span>
</td>
</tr>
- <tr>
- <td class="ali03">
- 鍗板埛鏁伴噺锛�
- </td>
- <td colspan="5">
- <span id="spanPrintNum" runat="server"></span>
- </td>
- </tr>
+
<tr>
<td class="ali03">
澶囨敞锛�
@@ -260,14 +253,15 @@
</td>
</tr>
<tr class=" price_tabbg" style="font-weight: bold; background-color: #E4E4E4;">
- <td>
- <span style="<%#Eval("shifouxianshi")%><%#Eval("shifouxianshilunzhuan")%>" >鍗板埛鏂瑰紡</span>
- </td>
+
<td>
<span style="<%#Eval("shifouxianshi")%>" >姝ｉ潰鑹叉暟</span>
</td>
<td>
<span style="<%#Eval("shifouxianshi")%>" >鑳岄潰鑹叉暟</span>
+ </td>
+ <td>
+ <span style="<%#Eval("shifouxianshi")%><%#Eval("shifouxianshilunzhuan")%>" >鍗板埛鏂瑰紡</span>
</td>
</tr>
<tr style="background-color: #FFFFFF;">
@@ -514,12 +508,18 @@
</th>
</tr>--%>
<tbody>
-
- <tr>
- <td style="font-weight: bold; background-color: #E6E6E6;width:10%;">
+ <tr>
+ <td style="font-weight: bold; background-color: #E6E6E6;width:10%;">
+ 鍗板埛鏁伴噺锛�
+ </td>
+ <td style="width:10%;">
+ <span id="spanPrintNum" runat="server"></span>
+ </td>
+
+ <td style="font-weight: bold; background-color: #E6E6E6;width:10%;">
鐢熶骇瑕佹眰锛�
</td>
- <td>
+ <td style="width:70%;">
<span runat="server" id="txtPSO_Remarks_o"></span>
</td>
</tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs
index 56b1264..f72e33f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs
@@ -125,7 +125,7 @@
this.txtPSO_Work_o_TR.Visible = false;
if (string.IsNullOrEmpty(m_EC_SpecialOrders.PSO_Remarks))
{
- this.txtPSO_Remarks_o_TR.Visible = false;
+ // this.txtPSO_Remarks_o_TR.Visible = false;
}
else
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.designer.cs
index 9f30da4..ad09af9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.designer.cs
@@ -213,15 +213,6 @@
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderBillModeName;
/// <summary>
- /// spanPrintNum 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPrintNum;
-
- /// <summary>
/// spanOrderRemarks 鎺т欢銆�
/// </summary>
/// <remarks>
@@ -285,6 +276,15 @@
protected global::System.Web.UI.HtmlControls.HtmlTableRow txtPSO_Remarks_o_TR;
/// <summary>
+ /// spanPrintNum 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPrintNum;
+
+ /// <summary>
/// txtPSO_Remarks_o 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
index 2e212a5..02148c4 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
@@ -173,14 +173,7 @@
<span id="spanOrderBillModeName" runat="server"></span>
</td>
</tr>
- <tr>
- <td class="ali03">
- 鍗板埛鏁伴噺锛�
- </td>
- <td colspan="5">
- <input type="text" id="txtOrderNum" class=" w120px int" min="0" runat="server" />
- </td>
- </tr>
+
<tr>
<td class="ali03">
澶囨敞锛�
@@ -229,15 +222,16 @@
</tr>
<tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;" >
- <td>
- <p name="PSF_yinshufangshi" value_openwidthspan="<%#Container.ItemIndex + 1%>">鍗板埛鏂瑰紡</p>
- </td>
+
<td>
<p name="PSF_yinsezheng" value_openwidthspan="<%#Container.ItemIndex + 1%>">姝ｉ潰鑹叉暟</p>
</td>
<td>
<p name="PSF_yinsebei" value_openwidthspan="<%#Container.ItemIndex + 1%>">鑳岄潰鑹叉暟</p>
</td>
+ <td>
+ <p name="PSF_yinshufangshi" value_openwidthspan="<%#Container.ItemIndex + 1%>">鍗板埛鏂瑰紡</p>
+ </td>
</tr>
<tr>
<td>
@@ -384,7 +378,7 @@
<input type="text" class=" w80px int " msg="璇峰～鍐欐暟瀛�" name="PSF_PrintedPositive" value="<%#Eval("PSF_PrintedPositive")%>" value_positiveid="<%#Container.ItemIndex + 1%>" />
</td>
<td colspan="1">
- <input type="text" class=" w80px int " msg="璇峰～鍐欐暟瀛�" name="PSF_LastNum" value="<%#Eval("PSF_LastNum")%>" value_lastnumid="<%#Container.ItemIndex + 1%>" />
+ <input type="text" class=" w60px int " msg="璇峰～鍐欐暟瀛�" name="PSF_LastNum" value="<%#Eval("PSF_LastNum")%>" value_lastnumid="<%#Container.ItemIndex + 1%>" />
</td>
<td colspan="1">
<select keepdefaultstyle="true" class=" w80px" name="PSF_OpenSpecifications" value_selspec="<%#Container.ItemIndex + 1%>">
@@ -533,15 +527,16 @@
瑕佹眰: <input type="text" name="txtYaoqiu" class=" noJ" maxlength="500" style="width: 405px;" value="<%#Eval("PSF_Yaoqiu")%>" />
</td>
+ <td class="w70px " >
+ <a class="Btn AddHoudaos" value_id="<%#Container.ItemIndex + 1%>" style="font-size:20px;" >+</a> <a class="Btn CutHoudaos" value_id="<%#Container.ItemIndex + 1%>" style="font-size:20px;" >-</a>
+ </td>
</tr>
</ItemTemplate>
</asp:Repeater>
</tbody>
</table>
</td>
- <td class="w70px " >
- <a class="Btn AddHoudaos" style="font-size:20px;" >+</a> <a class="Btn CutHoudaos" style="font-size:20px;" >-</a>
- </td>
+
</tr>
</tbody>
</table>
@@ -582,12 +577,19 @@
</tr>
</thead>--%>
<tbody>
- <tr>
+ <tr>
+ <td class="ali03 w70px">
+ 鍗板埛鏁伴噺锛�
+ </td>
+ <td class=" w120px">
+ <input type="text" id="txtOrderNum" class=" w120px int" min="0" runat="server" />
+ </td>
+
<td class="ali03 w70px " >
鐢熶骇瑕佹眰锛�
</td>
<td>
- <textarea style="width: 96%; height: 40px;" name="PSO_Remarks" runat="server" id="txtPSO_Remarks"></textarea>
+ <textarea style="width: 96%; height: 12px;" name="PSO_Remarks" runat="server" id="txtPSO_Remarks"></textarea>
</td>
</tr>
</tbody>
@@ -808,16 +810,18 @@
var value_id = parseInt($(".AddHoudao").last().attr("value_id"));
$(".AddHoudao").last().after($(".AddHoudao").last().clone(true));
$(".AddHoudao").last().attr("value_id", value_id + 1);
-
+ $(".AddHoudaos").last().attr("value_id", value_id + 1);
+ $(".CutHoudaos").last().attr("value_id", value_id + 1);
});
$(".CutHoudaos").click(function () {
- var value_id = parseInt($(".AddHoudao").last().attr("value_id"));
- if (value_id == 1) {
+ var value_id = parseInt($(this).attr("value_id"));
+ var count = $('.AddHoudao').length;
+ if (count == 1) {
} else {
- $(".AddHoudao").last().remove();
+ $(".AddHoudao[value_id='" + value_id + "']").remove();
}
});
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.designer.cs
index f498a10..d4bac62 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.designer.cs
@@ -213,15 +213,6 @@
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderBillModeName;
/// <summary>
- /// txtOrderNum 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlInputText txtOrderNum;
-
- /// <summary>
/// spanOrderRemarks 鎺т欢銆�
/// </summary>
/// <remarks>
@@ -258,6 +249,15 @@
protected global::System.Web.UI.HtmlControls.HtmlTextArea txtPSO_Work;
/// <summary>
+ /// txtOrderNum 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtOrderNum;
+
+ /// <summary>
/// txtPSO_Remarks 鎺т欢銆�
/// </summary>
/// <remarks>
--
Gitblit v1.9.1