From 957344a47100f58ac7ac046ec5b2d5201a599d5c Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 21 一月 2025 09:14:05 +0800
Subject: [PATCH] 留样
---
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
index b3f4ae1..5366de6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -1900,12 +1900,13 @@
printDemand += "锛屾瘡鏈�" + model.PageNum + "浠斤紝";
}
printDemand += model.RLNum + "锛�";
- printDemand += model.PrintColor + "锛�";
- printDemand += "灏侀潰瑕佹眰锛�";
- printDemand += model.FrontType;
+ printDemand += model.PrintColor + "";
+
if (model.FrontType != "鏃犲皝闈�")
{
+ printDemand += "锛屽皝闈㈣姹傦細";
+ printDemand += model.FrontType;
printDemand += "锛�" + model.pDemand;
}
@@ -2429,7 +2430,7 @@
if (afterInfo.ParameterName == "鑳跺ご")
{
if(model.PrintTypeId!=27)
- afterInfo.ParameterName = "鑳跺ご(姣忔湰" + model.PageNum.ToString() + "椤�)";
+ afterInfo.ParameterName = "鑳跺ご(姣忔湰" + model.PageNum.ToString() + "寮�)";
if (model.PrintTypeId == 39)
{
@@ -2439,7 +2440,7 @@
if (afterInfo.ParameterName == "鑳跺乏")
{
if (model.PrintTypeId == 29)
- afterInfo.ParameterName = "鑳跺乏(姣忔湰" + model.PaperMP.ToString() + "椤�)";
+ afterInfo.ParameterName = "鑳跺乏(姣忔湰" + model.PaperMP.ToString() + "寮�)";
}
afterWorkStr += afterInfo.ParameterName + "锛�";
}
@@ -2455,13 +2456,20 @@
}
}
- //if (model.PrintTypeId == 27)
- //{
- // afterWorkStr += "濂楀彿鍙锋(" + model.ThStart.ToString() + "-" + model.ThEnd.ToString() + ")";
- // afterWorkStr += "锛�" + model.JTWZ;
- //}
-
- if (model.PrintTypeId == 25)
+ if (model.PrintTypeId == 27)
+ {
+ if (!string.IsNullOrEmpty(model.JTWZ))
+ {
+ afterWorkStr = model.JTWZ ;
+ }
+ if(!string.IsNullOrEmpty(model.ThStart) || !string.IsNullOrEmpty(model.ThEnd))
+ {
+ afterWorkStr += "锛屽鍙峰彿娈�(" + model.ThStart + "-" + model.ThEnd + ")";
+ //afterWorkStr += "锛�" + model.JTWZ;
+ }
+ }
+
+ if (model.PrintTypeId == 25)
{
InquiryInsideModel insideModel = model.InquiryInsideList[0];
--
Gitblit v1.9.1