From f6cb981322bc4c2a27921ad0480dce7fb483a4d8 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 10 四月 2026 13:23:54 +0800
Subject: [PATCH] 先提交一部分

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx |   85 +++++++++++++++++++++++-------------------
 1 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
index 9f5f0e1..0d72fce 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%>">姝i潰鑹叉暟</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>
@@ -285,17 +286,21 @@
                         </div>
                                        </td>
                                  <td>
-                                      <input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt CTPCount" name="CTPCount"  value="<%#Eval("PSF_CTPCount")%>" style=" width: 80px" />
+                                      <input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt CTPCount lbCTPCount int" name="CTPCount"  value="<%#Eval("PSF_CTPCount")%>" style=" width: 80px" />
 
                                        </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%>">
@@ -364,7 +369,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%>">
@@ -409,13 +414,13 @@
                                 <td colspan="7">
                                 </td>
                             </tr>
-                            <tr style="display:none;">
-                                <td style="display:none;">
+                            <tr style="display:none;" >
+                                <td >
                                     <select keepdefaultstyle="true" value_selwaerid="<%#Container.ItemIndex + 1%>" name="selPlateType" id="selPlateType">
                                         <option value="鏈巶CTP">鏈巶CTP</option>
                                         <option value="鑷甫CTP">鑷甫CTP</option>
-                                        <option value="鑷甫鑿叉灄">鑷甫鑿叉灄</option>
-                                        <option value="鏈巶鑿叉灄">鏈巶鑿叉灄</option>
+                                      <%--  <option value="鑷甫鑿叉灄">鑷甫鑿叉灄</option>
+                                        <option value="鏈巶鑿叉灄">鏈巶鑿叉灄</option>--%>
                                     </select>
                                     <label class="Btnb CangKubtn_o" style="margin-left: 10px;">
                                         <input type="button" value_waerid="<%#Container.ItemIndex + 1%>" class="Btn FromWarehouseByBanCai" value="杩炴帴浠撳簱" id="BtnStorePlate" /></label><input type="hidden" value_ppwaerid="<%#Container.ItemIndex + 1%>" name="PSF_PaperId2" />
@@ -513,15 +518,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>&nbsp;&nbsp;  <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>&nbsp;&nbsp;  <a class="Btn CutHoudaos" style="font-size:20px;" >-</a> 
-                 </td>
+                             
                         </tr>
                     </tbody>
                 </table>
@@ -532,7 +538,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>
@@ -634,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);
@@ -689,7 +695,7 @@
 
                  $("select[name='PSF_OpenSpecifications']").last().val("8寮�");
                  $("select[name='PSF_OpenSpecifications']").last().change();
-                 $("input[name='CTPSpecName']").last().val("395*460");
+                 $("input[name='CTPSpecName']").last().val("460*395");
                  $("input[name='PSF_PNum']").last().val("");
 
                  if ($("select[name='PSF_Component']").first().val() == "灏侀潰") {
@@ -736,16 +742,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();
                  }
              });
 
@@ -803,9 +811,9 @@
                 } else if ($(this).val() == "鑷甫CTP") {
 
                     $(".FromWarehouseByBanCai[value_WaerId='" + value_SelWaerId + "']").hide();
-                    $(".CTPSpecName[value_ppwaerid='" + value_SelWaerId + "']").hide();
-                    $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
-                    $(".tdCTPCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $(".CTPSpecName[value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $(".tdCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
                     $(".selCTPSpec[value_ppwaerid='" + value_SelWaerId + "']").show();
                     $(".selFilmSpec[value_ppwaerid='" + value_SelWaerId + "']").hide();
 
@@ -813,6 +821,7 @@
                     $(".tdPSSpec[value_ppwaerid='" + value_SelWaerId + "']").hide();
                     $(".lbPSCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
                     $(".tdPsCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $("input[name='PSF_PaperId2'][value_ppwaerid='" + value_WaerId + "']").val("");
                 }
                 else {
 
@@ -1026,7 +1035,7 @@
                 if ($(this).val().indexOf('鍏紑') >= 0) {
                     $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
                     $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍗曡壊");
-                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("395*460");
+                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("460*395");
                     $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("8寮�");
                     $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
                     $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1068,7 +1077,7 @@
                 else if ($(this).val().indexOf('鍥涜壊') >= 0) {
                     $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍥涜壊");
                     $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍥涜壊");
-                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("770*1030");
+                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("1030*770");
                     $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("2寮�");
                     $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
                     $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1106,7 +1115,7 @@
                 else if ($(this).val().indexOf('鍏壊') >= 0) {
                     $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍥涜壊");
                     $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍥涜壊");
-                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("790*1030");
+                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("1030*790");
                     $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("2寮�");
                     $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
                     $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1145,7 +1154,7 @@
                 else if ($(this).val().indexOf('榛戠櫧') >= 0) {
                     $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
                     $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍗曡壊");
-                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("760*920");
+                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("920*760");
                     $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("2寮�");
                     $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
                     $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1184,7 +1193,7 @@
                 else if ($(this).val().indexOf('杞浆') >= 0) {
                     $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
                     $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍗曡壊");
-                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("578*810");
+                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("810*579");
                     $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("");
                     $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
                     $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").hide();
@@ -1259,7 +1268,7 @@
                     
                     $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
                     $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍗曡壊");
-                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("395*460");
+                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("460*395");
                     $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("");
                     $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
                     $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1299,7 +1308,7 @@
 
                     $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
                     $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍗曡壊");
-                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("395*460");
+                    $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("460*395");
                     $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("");
                     $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
                     $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1446,7 +1455,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"));
@@ -1920,7 +1929,7 @@
                  if (keyid != "") {
 
                  } else {
-                     $(vv).val("395*460");
+                     $(vv).val("460*395");
                     
                 }
             });

--
Gitblit v1.9.1