From 40eacc41d6f70f64ffd8f1fd18a8e12bce3fd86d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 16 十月 2025 12:10:34 +0800
Subject: [PATCH] 没有批准的就不显示在列表中
---
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs | 159 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 114 insertions(+), 45 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
index 6be0cf7..babf137 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -693,6 +693,7 @@
printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍐呰姱绾稿紶</td>";
printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">鍗板埛瑕佹眰</td>";
printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">椤电爜</td>";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">瑁呰</td>";
printDemand += "</tr>";
for (int i = 0; i < hidWorkBookPageNum; i++)
{
@@ -869,6 +870,16 @@
//printDemand += "锛岄〉鏁帮細" + inquiryWorkBookModel.WorkBookpageNum + "";
printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.WorkBookpageNum + "</td>";
}
+ if (request["bindingMode" + (i + 1)] != null)
+ {
+ inquiryWorkBookModel.bindingMode = request["bindingMode" + (i + 1)].ToString();
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.bindingMode + "</td>";
+ }
+ else
+ {
+ inquiryWorkBookModel.bindingMode = "";
+ printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\"></td>";
+ }
printDemand += "</tr>";
model.InquiryWorkBookList.Add(inquiryWorkBookModel);
}
@@ -950,56 +961,61 @@
printDemand += "璇曞嵎琚嬬焊寮狅細" + model.printColorshijuan + "锛�";
}
- if (request["paper1"] != null)
+ if(request["paper1"] != null && !string.IsNullOrEmpty(request["paper1"].ToString()))
{
- model.paper1 = request["paper1"].ToString();
- printDemand += "绛旈鍗★細绾稿紶锛�" + model.paper1 + "锛�";
- }
-
-
-
- if (request["paperSizeA4"] != null)
- {
- model.paperSizeA4 = request["paperSizeA4"].ToString();
- if (model.paperSizeA4 == "-1")
+ if (request["paper1"] != null)
{
- model.PrintSizeNameA4 = request["txtFirstSizeA4"].ToString() + "脳" + request["txtSecondSizeA4"].ToString();
- model.firstSizeA4 = request["txtFirstSizeA4"].ToString();
- model.secondSizeA4 = request["txtSecondSizeA4"].ToString();
- printDemand += "鎴愬搧灏哄锛欰4 " + model.PrintSizeNameA4 + "锛�";
+ model.paper1 = request["paper1"].ToString();
+ printDemand += "绛旈鍗★細绾稿紶锛�" + model.paper1 + "锛�";
}
- else
+
+
+
+ if (request["paperSizeA4"] != null)
{
- printDemand += "鎴愬搧灏哄锛欰4 " + model.paperSizeA4 + "锛�";
+ model.paperSizeA4 = request["paperSizeA4"].ToString();
+ if (model.paperSizeA4 == "-1")
+ {
+ model.PrintSizeNameA4 = request["txtFirstSizeA4"].ToString() + "脳" + request["txtSecondSizeA4"].ToString();
+ model.firstSizeA4 = request["txtFirstSizeA4"].ToString();
+ model.secondSizeA4 = request["txtSecondSizeA4"].ToString();
+ printDemand += "鎴愬搧灏哄锛欰4 " + model.PrintSizeNameA4 + "锛�";
+ }
+ else
+ {
+ printDemand += "鎴愬搧灏哄锛欰4 " + model.paperSizeA4 + "锛�";
+ }
+ }
+
+ if (request["paperSizeA3"] != null)
+ {
+ model.paperSizeA3 = request["paperSizeA3"].ToString();
+ if (model.paperSizeA3 == "-1")
+ {
+ model.PrintSizeNameA3 = request["txtFirstSizeA3"].ToString() + "脳" + request["txtSecondSizeA3"].ToString();
+ model.firstSizeA3 = request["txtFirstSizeA3"].ToString();
+ model.secondSizeA3 = request["txtSecondSizeA3"].ToString();
+ printDemand += "A3 " + model.PrintSizeName + "锛�";
+ }
+ else
+ {
+ printDemand += "A3 " + model.paperSizeA3 + "锛�";
+ }
+ }
+ if (request["printColor1"] != null)
+ {
+ model.printColor1 = request["printColor1"].ToString();
+ printDemand += "鍗板埛棰滆壊锛�" + model.printColor1 + "锛�";
+ }
+
+ if (request["printColor2"] != null)
+ {
+ model.printColor2 = request["printColor2"].ToString();
+ printDemand += "绛旈鍗¤绾稿紶锛�" + model.printColor2 + "锛�";
}
}
- if (request["paperSizeA3"] != null)
- {
- model.paperSizeA3 = request["paperSizeA3"].ToString();
- if (model.paperSizeA3 == "-1")
- {
- model.PrintSizeNameA3 = request["txtFirstSizeA3"].ToString() + "脳" + request["txtSecondSizeA3"].ToString();
- model.firstSizeA3 = request["txtFirstSizeA3"].ToString();
- model.secondSizeA3 = request["txtSecondSizeA3"].ToString();
- printDemand += "A3 " + model.PrintSizeName + "锛�";
- }
- else
- {
- printDemand += "A3 " + model.paperSizeA3 + "锛�";
- }
- }
- if (request["printColor1"] != null)
- {
- model.printColor1 = request["printColor1"].ToString();
- printDemand += "鍗板埛棰滆壊锛�" + model.printColor1 + "锛�";
- }
-
- if (request["printColor2"] != null)
- {
- model.printColor2 = request["printColor2"].ToString();
- printDemand += "绛旈鍗¤绾稿紶锛�" + model.printColor2 + "锛�";
- }
+
InquirySHiJuanModel inquirySHiJuanModel = null;
@@ -1061,6 +1077,14 @@
string[] sixiangpingdedatikacheckboxinput = request["sixiangpingdedatikacheckboxinput"]?.Split(',');
string[] sixiangpingdedatikaselect = request["sixiangpingdedatikaselect"]?.Split(',');
+ string dilidatikahebingcheckbox = request["dilidatikahebingcheckbox"]??"";
+ string lishidatikahebingcheckbox = request["lishidatikahebingcheckbox"] ?? "";
+ string shengwudatikahebingcheckbox = request["shengwudatikahebingcheckbox"] ?? "";
+ string sixiangpingdedatikahebingcheckbox = request["sixiangpingdedatikahebingcheckbox"] ?? "";
+ dilidatikahebingcheckbox = "," + dilidatikahebingcheckbox + ",";
+ lishidatikahebingcheckbox = "," + lishidatikahebingcheckbox + ",";
+ shengwudatikahebingcheckbox = "," + shengwudatikahebingcheckbox + ",";
+ sixiangpingdedatikahebingcheckbox = "," + sixiangpingdedatikahebingcheckbox + ",";
for (int i=0;i< sss; i++)
{
inquirySHiJuanModel = new InquirySHiJuanModel();
@@ -1123,7 +1147,43 @@
inquirySHiJuanModel.zhengzhidatikaselect = zhengzhidatikaselect[i];
inquirySHiJuanModel.sixiangpingdedatikacheckboxinput = sixiangpingdedatikacheckboxinput[i];
inquirySHiJuanModel.sixiangpingdedatikaselect = sixiangpingdedatikaselect[i];
-
+
+
+
+ var ssscishu = "," + (i + 1) + ",";
+ if (dilidatikahebingcheckbox.IndexOf(ssscishu) >= 0)
+ {
+ inquirySHiJuanModel.dilidatikahebingcheckbox = ""+(i + 1);
+ }
+ else
+ {
+ inquirySHiJuanModel.dilidatikahebingcheckbox = "";
+ }
+ if (lishidatikahebingcheckbox.IndexOf(ssscishu) >= 0)
+ {
+ inquirySHiJuanModel.lishidatikahebingcheckbox = "" + (i + 1);
+ }
+ else
+ {
+ inquirySHiJuanModel.lishidatikahebingcheckbox = "";
+ }
+ if (shengwudatikahebingcheckbox.IndexOf(ssscishu) >= 0)
+ {
+ inquirySHiJuanModel.shengwudatikahebingcheckbox = "" + (i + 1);
+ }
+ else
+ {
+ inquirySHiJuanModel.shengwudatikahebingcheckbox = "";
+ }
+ if (sixiangpingdedatikahebingcheckbox.IndexOf(ssscishu) >= 0)
+ {
+ inquirySHiJuanModel.sixiangpingdedatikahebingcheckbox = "" + (i + 1);
+ }
+ else
+ {
+ inquirySHiJuanModel.sixiangpingdedatikahebingcheckbox = "";
+ }
+
if (inquirySHiJuanModel.Nianji != "楂樻牎璇曞嵎")
{
printDemand += "璇曞嵎锛�";
@@ -1420,6 +1480,11 @@
printDemand += "鏀挎不锛�" + inquirySHiJuanModel.zhengzhicheckboxinput + "寮狅紝";
printDemand += inquirySHiJuanModel.zhengzhiselect + "锛�";
}
+ if (!string.IsNullOrEmpty(inquirySHiJuanModel.shengwucheckboxinput))
+ {
+ printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwucheckboxinput + "寮狅紝";
+ printDemand += inquirySHiJuanModel.shengwuselect + "锛�";
+ }
printDemand += "绛旈鍗★細";
@@ -1464,7 +1529,11 @@
printDemand += "鏀挎不锛�" + inquirySHiJuanModel.zhengzhidatikacheckboxinput + "寮狅紝";
printDemand += inquirySHiJuanModel.zhengzhidatikaselect + "锛�";
}
-
+ if (!string.IsNullOrEmpty(inquirySHiJuanModel.shengwudatikacheckboxinput))
+ {
+ printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwudatikacheckboxinput + "寮狅紝";
+ printDemand += inquirySHiJuanModel.shengwudatikaselect + "锛�";
+ }
}
else if (inquirySHiJuanModel.Nianji == "楂樹簩")
{
--
Gitblit v1.9.1