From a737eb14fe1b705b07f017e0edc002fae6f857c3 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 03 四月 2026 12:59:20 +0800
Subject: [PATCH] 发版套数再增加自定义填写数字 补单的生产施工单不要默认开料规格的数据 "付款未开票”列表中的金额合计放在“金额”格子下面,既要单页合计,又要每页的全部合计 生产要求跟“数量: ”的宽度一样 印刷数量的填写格子跟后道工序一样长
---
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs | 4 +-
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx | 30 +++++++++-----
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx | 22 ++++++----
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx | 12 +++---
5 files changed, 41 insertions(+), 29 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
index c5fa704..3064c67 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
@@ -290,13 +290,17 @@
</td>
<td>
- <select keepdefaultstyle="true" class="" name="PSF_Fabantaoshu" value_ppwaerid="<%#Container.ItemIndex + 1%>">
- <option value=""></option>
- <option value="2">2</option>
- <option value="3">3</option>
- <option value="4">4</option>
- <option value="5">5</option>
- </select>
+ <div class="xialap" >
+ <input type="text" class=" w40px int " name="PSF_Fabantaoshu" value_ppwaerid="<%#Container.ItemIndex + 1%>" value="<%#Eval("PSF_Fabantaoshu")%>" />
+ <div class="xialapb" >
+
+ <div class="xialapr">2</div>
+ <div class="xialapr">3</div>
+ <div class="xialapr">4</div>
+ <div class="xialapr">5</div>
+ </div>
+ </div>
+
</td>
</tr>
<tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6; width: 100%" name="PSF_PrintedPaperTd" value_selspec="<%#Container.ItemIndex + 1%>">
@@ -636,7 +640,7 @@
$("select[name='PSF_PressesDesk']").last().attr("value_selspec", value_id + 1);
$("select[name='PSF_PrintedColorPositive']").last().attr("value_selspec", value_id + 1);
$("select[name='PSF_Typesetting']").last().attr("value_ppwaerid", value_id + 1);
- $("select[name='PSF_Fabantaoshu']").last().attr("value_ppwaerid", value_id + 1);
+ $("input[name='PSF_Fabantaoshu']").last().attr("value_ppwaerid", value_id + 1);
$("input[name='PSF_OpenWidth']").last().attr("value_ppwaerid", value_id + 1);
$("input[name='PSF_OpenWidthName']").last().attr("value_ppwaerid", value_id + 1);
$("input[name='PSF_OpenLength']").last().attr("value_ppwaerid", value_id + 1);
@@ -1450,7 +1454,7 @@
$(vv).parent().parent().parent().parent().parent().find("select[name='PSF_PrintedColorRear']").val($(vv).attr("value_hide_psf_printedcolorrear"));
$(vv).parent().parent().parent().parent().parent().find("select[name='PSF_Typesetting']").val($(vv).attr("value_hide_psf_typesetting"));
$(vv).parent().parent().parent().parent().parent().find("select[name='PSF_Typesettinghide']").val($(vv).attr("value_hide_psf_typesetting"));
- $(vv).parent().parent().parent().parent().parent().find("select[name='PSF_Fabantaoshu']").val($(vv).attr("value_hide_psf_fabantaoshu"));
+ // $(vv).parent().parent().parent().parent().parent().find("select[name='PSF_Fabantaoshu']").val($(vv).attr("value_hide_psf_fabantaoshu"));
$(vv).parent().parent().parent().parent().parent().find("select[name='PSF_PaperSource']").val($(vv).attr("value_hide_psf_papersource"));
$(vv).parent().parent().parent().parent().parent().find("select[name='PSF_OpenSpecifications']").val($(vv).attr("value_hide_psf_openspecifications"));
$(vv).parent().parent().parent().parent().parent().find("select[name='selPaperName']").val($(vv).attr("value_hide_psf_selPaperName"));
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx
index 1c1b42c..abcae80 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx
@@ -76,19 +76,19 @@
<td class="ali03 w100px">
绱ф�ョ▼搴︼細
</td>
- <td class="w140px">
+ <td class="w100px">
<span id="spanSpecialExigency" runat="server"></span>
</td>
<td class="ali03 w100px">
鍒� 鍗� 浜猴細
</td>
- <td class="w140px">
+ <td >
<span id="spanSpecialOprator" runat="server"></span>
</td>
<td class="ali03 w100px">
鍒跺崟鏃ユ湡锛�
</td>
- <td>
+ <td class="w100px">
<span id="spanSpecialTime" runat="server"></span>
</td>
</tr>
@@ -159,7 +159,7 @@
<table cellpadding="0" cellspacing="0" style="text-align: left;">
<tr style="border: none; background-color: #E4E4E4;">
<th colspan="6" style="text-align: left; text-indent: 5px;">
- <b>鐢熶骇淇℃伅</b>
+ <b>璁㈠崟瑕佹眰</b>
</th>
</tr>
<tbody>
@@ -178,7 +178,7 @@
</td>
</tr>
<tr>
- <td class="ali03">
+ <td class="ali03 w100px">
鍗板埛瑕佹眰锛�
</td>
<td colspan="5">
@@ -193,7 +193,7 @@
<span id="spanOrderAfterWorksDemand" runat="server"></span>
</td>
</tr>
- <tr>
+ <tr style="display:none;">
<td class="ali03 w100px">
浜よ揣鏂瑰紡锛�
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs
index f72e33f..799f80e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs
@@ -111,7 +111,7 @@
this.spanSpecialNum.InnerText = string.IsNullOrEmpty(m_EC_SpecialOrders.PSO_OrderNum) ? bll_EC_SpecialOrdersBLL.GetPSO_OrderNum(CurrentUser.MemberId) : m_EC_SpecialOrders.PSO_OrderNum;
this.spanSpecialExigency.InnerText = _eC_OrderBasic.OrderExtend.ExigencyCase.Name;
- this.spanSpecialTime.InnerText = m_EC_SpecialOrders.PSO_OrderTime == null ? DateTime.Now.ToString("yyyy-MM-dd HH:mm") : m_EC_SpecialOrders.PSO_OrderTime.Value.ToString("yyyy-MM-dd HH:mm");
+ this.spanSpecialTime.InnerText = m_EC_SpecialOrders.PSO_OrderTime == null ? DateTime.Now.ToString("yyyy-MM-dd") : m_EC_SpecialOrders.PSO_OrderTime.Value.ToString("yyyy-MM-dd");
this.spanSpecialOprator.InnerText = string.IsNullOrEmpty(m_EC_SpecialOrders.Operator) ? CurrentUser.ShortName : m_EC_SpecialOrders.Operator;
if (string.IsNullOrEmpty(m_EC_SpecialOrders.PSO_Work))
@@ -136,7 +136,7 @@
this.spanPrintNum.InnerText = m_EC_SpecialOrders.OrderNum.ToString2() ;
//this.spanOrderType.InnerText = _eC_OrderBasic.OrderType.Name;
this.spanOrderTitle.InnerText = _eC_OrderBasic.DocumentName;
- this.spanOrderDeliveryTime.InnerText = _eC_OrderBasic.DeliveryTime == null ? "" : _eC_OrderBasic.DeliveryTime.Value.ToString("yyyy-MM-dd HH:mm");
+ this.spanOrderDeliveryTime.InnerText = _eC_OrderBasic.DeliveryTime == null ? "" : _eC_OrderBasic.DeliveryTime.Value.ToString("yyyy-MM-dd");
this.spanOrderCustormName.InnerText = _eC_OrderBasic.BuyerName;
this.spanOrderCustormLevel.InnerText = _eC_OrderBasic.OrderExtend.CustomerLevel.Name;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
index 02148c4..cae6c64 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
@@ -302,13 +302,16 @@
</td>
<td>
- <select keepdefaultstyle="true" class="" name="PSF_Fabantaoshu" value_ppwaerid="<%#Container.ItemIndex + 1%>">
- <option value=""></option>
- <option value="2">2</option>
- <option value="3">3</option>
- <option value="4">4</option>
- <option value="5">5</option>
- </select>
+ <div class="xialap" >
+ <input type="text" class=" w40px int " name="PSF_Fabantaoshu" value_ppwaerid="<%#Container.ItemIndex + 1%>" value="<%#Eval("PSF_Fabantaoshu")%>" />
+ <div class="xialapb" >
+
+ <div class="xialapr">2</div>
+ <div class="xialapr">3</div>
+ <div class="xialapr">4</div>
+ <div class="xialapr">5</div>
+ </div>
+ </div>
</td>
</tr>
@@ -581,8 +584,8 @@
<td class="ali03 w70px">
鍗板埛鏁伴噺锛�
</td>
- <td class=" w120px">
- <input type="text" id="txtOrderNum" class=" w120px int" min="0" runat="server" />
+ <td class=" w40px">
+ <input type="text" id="txtOrderNum" class=" w40px int" min="0" runat="server" />
</td>
<td class="ali03 w70px " >
@@ -691,7 +694,7 @@
$("select[name='PSF_PressesDesk']").last().attr("value_selspec", value_id + 1);
$("select[name='PSF_PrintedColorPositive']").last().attr("value_selspec", value_id + 1);
$("select[name='PSF_Typesetting']").last().attr("value_ppwaerid", value_id + 1);
- $("select[name='PSF_Fabantaoshu']").last().attr("value_ppwaerid", value_id + 1);
+ $("input[name='PSF_Fabantaoshu']").last().attr("value_ppwaerid", value_id + 1);
$("input[name='PSF_OpenWidth']").last().attr("value_ppwaerid", value_id + 1);
$("input[name='PSF_OpenWidthName']").last().attr("value_ppwaerid", value_id + 1);
$("input[name='PSF_OpenLength']").last().attr("value_ppwaerid", value_id + 1);
@@ -1426,6 +1429,11 @@
$("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
$("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+ if ($(this).val().indexOf('琛ュ崟') >= 0) {
+ $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").val("");
+ $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").val("");
+ }
+
}
else if ($(this).val().indexOf('涓庡叾浠栬鍗曞悎鐗�') >= 0) {
@@ -1583,7 +1591,7 @@
$(vv).parent().parent().parent().parent().parent().find("select[name='PSF_PrintedColorRear']").val($(vv).attr("value_hide_psf_printedcolorrear"));
$(vv).parent().parent().parent().parent().parent().find("select[name='PSF_Typesetting']").val($(vv).attr("value_hide_psf_typesetting"));
$(vv).parent().parent().parent().parent().parent().find("select[name='PSF_Typesettinghide']").val($(vv).attr("value_hide_psf_typesetting"));
- $(vv).parent().parent().parent().parent().parent().find("select[name='PSF_Fabantaoshu']").val($(vv).attr("value_hide_psf_fabantaoshu"));
+ //$(vv).parent().parent().parent().parent().parent().find("select[name='PSF_Fabantaoshu']").val($(vv).attr("value_hide_psf_fabantaoshu"));
$(vv).parent().parent().parent().parent().parent().find("select[name='PSF_PaperSource']").val($(vv).attr("value_hide_psf_papersource"));
$(vv).parent().parent().parent().parent().parent().find("select[name='PSF_OpenSpecifications']").val($(vv).attr("value_hide_psf_openspecifications"));
$(vv).parent().parent().parent().parent().parent().find("select[name='selPaperName']").val($(vv).attr("value_hide_psf_selPaperName"));
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx
index b13c14e..c7d9b2e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx
@@ -361,7 +361,7 @@
</asp:repeater>
</tbody>
<tr>
- <td colspan="6">
+ <td colspan="9">
鍚堣
</td>
--
Gitblit v1.9.1