From ee87c4ceb1a22800f8151db590bc732ca21158c6 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 23 一月 2025 08:59:20 +0800
Subject: [PATCH] 黑白印件的“后道工序”修改为：
---
CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx | 4
CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs | 10 +
CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js | 27 ++++
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx | 4
CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx | 4
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs | 138 ++++++++++++++++++----
CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx | 30 +++++
CY_ECommercePlatform/CY.Model/Inquiry/InquiryInsideModel.cs | 5
CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx | 30 +++++
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs | 3
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx | 16 +-
CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx | 18 ++
CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx | 34 ++++
CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx | 4
14 files changed, 273 insertions(+), 54 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs b/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs
index 9bad503..45d5e45 100644
--- a/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs
+++ b/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs
@@ -49,6 +49,11 @@
public int PaperId { get; set; }
/// <summary>
+ /// 绾稿紶Id
+ /// </summary>
+ public string Qitazhi { get; set; }
+
+ /// <summary>
/// 鍏嬮噸
/// </summary>
public int GramWeight { get; set; }
@@ -307,6 +312,11 @@
public string JTWZ { get; set; }
/// <summary>
+ /// 灏侀潰鍗板埛瑕佹眰
+ /// </summary>
+ public string jtWZFM { get; set; }
+
+ /// <summary>
/// 灏侀潰绫诲瀷
/// </summary>
public string FrontType { get; set; }
diff --git a/CY_ECommercePlatform/CY.Model/Inquiry/InquiryInsideModel.cs b/CY_ECommercePlatform/CY.Model/Inquiry/InquiryInsideModel.cs
index 857f66f..27a3479 100644
--- a/CY_ECommercePlatform/CY.Model/Inquiry/InquiryInsideModel.cs
+++ b/CY_ECommercePlatform/CY.Model/Inquiry/InquiryInsideModel.cs
@@ -29,6 +29,11 @@
public int GramWeight { get; set; }
/// <summary>
+ /// 鍐呴〉鍏嬮噸
+ /// </summary>
+ public string Qitazhi { get; set; }
+
+ /// <summary>
/// 鍝佺墝Id
/// </summary>
public int BrandId { get; set; }
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
index dc96d8f..eb93a57 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
@@ -1002,13 +1002,13 @@
if (ssssaaa.indexOf('脳') >= 0) {
var dfdfdf = ssssaaa.split('脳');
- $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[0]);
- $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[1]);
+ $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[0].replace("mm",""));
+ $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[1].replace("mm", ""));
} else if (ssssaaa.indexOf('*') >= 0) {
var dfdfdf = ssssaaa.split('*');
- $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[0]);
- $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[1]);
+ $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[0].replace("mm", ""));
+ $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[1].replace("mm", ""));
}
@@ -1018,15 +1018,15 @@
var sfdsdfdf = sss[i].split('锛�');
var dfdfdf = sfdsdfdf[0].split('脳');
- $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[0]);
- $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[1]);
+ $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[0].replace("mm", ""));
+ $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[1].replace("mm", ""));
} else if (sss[i].indexOf('*') >= 0) {
var sfdsdfdf = sss[i].split('锛�');
var dfdfdf = sfdsdfdf[0].split('*');
- $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[0]);
- $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[1]);
+ $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[0].replace("mm", ""));
+ $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[1].replace("mm", ""));
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
index 6491a40..c09621f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
@@ -236,9 +236,10 @@
{
m_EC_SpecialForumsList = new List<EC_SpecialForums>();
EC_SpecialForums m_EC_SpecialForums = new EC_SpecialForums();
- m_EC_SpecialForums.PSF_Note = _inquiryCommonModel.AfterWorksDemand;
+ //m_EC_SpecialForums.PSF_Note = _inquiryCommonModel.AfterWorksDemand;
m_EC_SpecialForums.PSF_Forumsid = 1;
m_EC_SpecialForumsList.Add(m_EC_SpecialForums);
+ this.txtPSO_Work.InnerText = _inquiryCommonModel.AfterWorksDemand;
}
this.RepClientList.DataSource = m_EC_SpecialForumsList;
this.RepClientList.DataBind();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index eb73b72..6774756 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -9,8 +9,8 @@
<link rel="stylesheet" type="text/css" href="../../Styles/base.css" />
<link href="../../Styles/changes.css" rel="stylesheet" type="text/css" />
<link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
- <script src="../../js/Inquiry/Inquiry.js?v=130" type="text/javascript"></script>
- <script src="../../js/business/Order.js?v=40" type="text/javascript"></script>
+ <script src="../../js/Inquiry/Inquiry.js?v=153" type="text/javascript"></script>
+ <script src="../../js/business/Order.js?v=43" type="text/javascript"></script>
<!--鍓嶅彴椤甸潰end-->
<script type="text/javascript" language="javascript">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx
index bebe6d1..785eab6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx
@@ -137,11 +137,35 @@
</th>
</tr>
<tr>
- <td align="left" style="padding-left: 40px;"><input type="checkbox" name="works" value="24" /> 濂楀彿</td>
- <td align="left"><input type="checkbox" name="works" value="4" /> 鍘嬬棔</td>
- <td align="left"><input type="checkbox" name="works" value="6" /> 鎵撶偣绾�</td>
- <td align="left"><div style="float:left"><input type="checkbox" id="worksjiaozuo" name="works" value="99" onclick="SelectFuc(this)" index="0"/> 鑳跺乏</div><div style="float:left; display:none" id="divJTT0"> 姣忔湰寮犳暟锛�<input type="text" name="pNameMP" style="width:60px" class="validateInt" defaultValue="1" value="1"/>寮�/鏈�</div></td>
- <td align="left"><div style="float:left"><input type="checkbox" id="worksjiaotou" name="works" value="13" onclick="SelectFuc(this)" index="0"/> 鑳跺ご</div><div style="float:left; display:none" id="divJT0"> 姣忔湰寮犳暟锛�<input type="text" name="pageNum" style="width:60px" class="validateInt" defaultValue="1" value="1"/>寮�/鏈�</div></td>
+ <td align="left" style="padding-left: 40px;width:80px;" ><input type="checkbox" name="works" value="24" /> 濂楀彿</td>
+ <td align="left" style="width:80px;" ><input type="checkbox" name="works" value="4" /> 鍘嬬棔</td>
+ <td align="left" style="width:80px;" ><input type="checkbox" name="works" value="6" /> 鎵撶偣绾�</td>
+ <%-- <td align="left"><div style="float:left"><input type="checkbox" id="worksjiaozuo" name="works" value="99" onclick="SelectFuc(this)" index="0"/> 鑳跺乏</div><div style="float:left; display:none" id="divJTT0"> 姣忔湰寮犳暟锛�<input type="text" name="pNameMP" style="width:60px" class="validateInt" defaultValue="1" value="1"/>寮�/鏈�</div></td>
+ <td align="left"><div style="float:left"><input type="checkbox" id="worksjiaotou" name="works" value="13" onclick="SelectFuc(this)" index="0"/> 鑳跺ご</div><div style="float:left; display:none" id="divJT0"> 姣忔湰寮犳暟锛�<input type="text" name="pageNum" style="width:60px" class="validateInt" defaultValue="1" value="1"/>寮�/鏈�</div></td>--%>
+ <td align="left" style="width:150px;" > 瑁呰锛�<select name='jtWZ' onchange="SelectjtWZ();" >
+ <option value="鑳跺ご">鑳跺ご</option>
+ <option value="鑳跺乏">鑳跺乏</option>
+ <option value="灏侀潰80鍏嬬墰鐨焊">灏侀潰80鍏嬬墰鐨焊</option>
+ <option value="灏侀潰100鍏嬬墰鐨焊">灏侀潰100鍏嬬墰鐨焊</option>
+ <option value="灏侀潰120鍏嬬墰鐨焊">灏侀潰120鍏嬬墰鐨焊</option>
+ <option value="灏侀潰鍏扮毊鏂�">灏侀潰鍏扮毊鏂�</option>
+ <option value="灏侀潰鐧界毊鏂�">灏侀潰鐧界毊鏂�</option>
+ <option value="灏侀潰榛勭毊鏂�">灏侀潰榛勭毊鏂�</option>
+ <option value="灏侀潰绾㈢毊鏂�">灏侀潰绾㈢毊鏂�</option>
+ <option value="灏侀潰200鍏嬬墰鐨焊">灏侀潰200鍏嬬墰鐨焊</option>
+ <option value="灏侀潰230鍏嬬墰鐨焊">灏侀潰230鍏嬬墰鐨焊</option>
+ <option value="鏁ｉ〉">鏁ｉ〉</option>
+ <option value="鍏朵粬">鍏朵粬</option>
+ </select></td>
+ <td align="left" style="display:none;width:150px;" id="jtWZFMyaoqiu"> 灏侀潰鍗板埛瑕佹眰锛�<select name='jtWZFM'>
+ <option value="鍗曢潰榛戣壊">鍗曢潰榛戣壊</option>
+ <option value="鍗曢潰褰╄壊">鍗曢潰褰╄壊</option>
+ <option value="鍙岄潰榛戣壊">鍙岄潰榛戣壊</option>
+ <option value="姝ｅ僵鑳岄粦">姝ｅ僵鑳岄粦</option>
+ <option value="涓嶅嵃鍒�">涓嶅嵃鍒�</option>
+ <option value="鍏朵粬">鍏朵粬</option>
+ </select></td>
+ <td align="left" style="width:150px;" > 姣忔湰寮犳暟锛�<input type="text" name="pageNum" style="width:60px" class="validateInt" defaultValue="1" value="1"/>寮�/鏈� </td>
</tr>
</tbody>
</table>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx
index 75b04d8..f233167 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx
@@ -64,6 +64,7 @@
<td>鍗板埛绾稿紶</td>
<td class="Brand0">鍝佺墝</td>
<td class="gramWeight0">绾稿紶鍏嬮噸</td>
+ <td class="Qitazhi0">绾稿紶</td>
<td class="singleOrdouble">鍗曞弻闈�</td>
<td>鍗板埛棰滆壊</td>
<td>椤电爜</td>
@@ -81,6 +82,7 @@
<%
}
%>
+ <option value="-1">鍏朵粬</option>
</select>
</td>
<td class="Brand0"><select class="selectLaber" id="brand0" name="brand0">
@@ -89,6 +91,9 @@
<td class="gramWeight0">
<select class="selectLaber" id="gramWeight0" name="gramWeight0">
</select>
+ </td>
+ <td class="Qitazhi0" style="display:none;">
+ <input id="Qitazhi0" name="Qitazhi0" type="text" />
</td>
<td class="singleOrdouble">
<select class="selectLaber" name="singleOrdouble0">
@@ -203,6 +208,7 @@
<td>鍗板埛绾稿紶</td>
<td class="Brand1">鍝佺墝</td>
<td class="gramWeight1">绾稿紶鍏嬮噸</td>
+ <td class="Qitazhi1">绾稿紶</td>
<td>鍗板埛棰滆壊</td>
<td><span class="zhang1">椤电爜</span></td>
</tr>
@@ -219,6 +225,7 @@
<%
}
%>
+ <option value="-1">鍏朵粬</option>
</select>
</td>
<td class="Brand1"><select class="selectLaber" id="brand1" name="brand1">
@@ -228,6 +235,9 @@
<select class="selectLaber" id="gramWeight1" name="gramWeight1">
</select>
</td>
+ <td class="Qitazhi1" style="display:none;">
+ <input id="Qitazhi1" name="Qitazhi1" type="text" />
+ </td>
<td>
<select name="printColor1" >
<option value="鍥涜壊鍗板埛">鍥涜壊鍗板埛</option>
@@ -310,6 +320,7 @@
<td>鍗板埛绾稿紶</td>
<td class="Brand2">鍝佺墝</td>
<td class="gramWeight2">绾稿紶鍏嬮噸</td>
+ <td class="Qitazhi2">绾稿紶</td>
<td>鍗板埛棰滆壊</td>
<td><span class="zhang2">椤电爜</span></td>
</tr>
@@ -326,6 +337,7 @@
<%
}
%>
+ <option value="-1">鍏朵粬</option>
</select>
</td>
<td class="Brand2">
@@ -336,6 +348,9 @@
<select class="selectLaber" id="gramWeight2" name="gramWeight2">
</select>
</td>
+ <td class="Qitazhi2" style="display:none;">
+ <input id="Qitazhi2" name="Qitazhi2" type="text" />
+ </td>
<td>
<select name="printColor2" >
<option value="鍥涜壊鍗板埛">鍥涜壊鍗板埛</option>
@@ -417,6 +432,7 @@
<td>鍗板埛绾稿紶</td>
<td class="Brand3">鍝佺墝</td>
<td class="gramWeight3">绾稿紶鍏嬮噸</td>
+ <td class="Qitazhi3">绾稿紶</td>
<td>鍗板埛棰滆壊</td>
<td><span class="zhang3">椤电爜</span></td>
</tr>
@@ -433,6 +449,7 @@
<%
}
%>
+ <option value="-1">鍏朵粬</option>
</select>
</td>
<td class="Brand3"><select class="selectLaber" id="brand3" name="brand3">
@@ -442,6 +459,9 @@
<select class="selectLaber" id="gramWeight3" name="gramWeight3">
</select>
</td>
+ <td class="Qitazhi3" style="display:none;">
+ <input id="Qitazhi3" name="Qitazhi3" type="text" />
+ </td>
<td>
<select name="printColor3" >
<option value="鍥涜壊鍗板埛">鍥涜壊鍗板埛</option>
@@ -523,6 +543,7 @@
<td>鍗板埛绾稿紶</td>
<td class="Brand4">鍝佺墝</td>
<td class="gramWeight4">绾稿紶鍏嬮噸</td>
+ <td class="Qitazhi4">绾稿紶</td>
<td>鍗板埛棰滆壊</td>
<td><span class="zhang4">椤电爜</span></td>
</tr>
@@ -539,6 +560,7 @@
<%
}
%>
+ <option value="-1">鍏朵粬</option>
</select>
</td>
<td class="Brand4"><select class="selectLaber" id="brand4" name="brand4">
@@ -548,6 +570,9 @@
<select class="selectLaber" id="gramWeight4" name="gramWeight4">
</select>
</td>
+ <td class="Qitazhi4" style="display:none;">
+ <input id="Qitazhi4" name="Qitazhi4" type="text" />
+ </td>
<td>
<select name="printColor4" >
<option value="鍥涜壊鍗板埛">鍥涜壊鍗板埛</option>
@@ -629,6 +654,7 @@
<td>鍗板埛绾稿紶</td>
<td class="Brand5">鍝佺墝</td>
<td class="gramWeight5">绾稿紶鍏嬮噸</td>
+ <td class="Qitazhi5">绾稿紶</td>
<td>鍗板埛棰滆壊</td>
<td><span class="zhang5">椤电爜</span></td>
</tr>
@@ -645,6 +671,7 @@
<%
}
%>
+ <option value="-1">鍏朵粬</option>
</select>
</td>
<td class="Brand5"><select class="selectLaber" id="brand5" name="brand5">
@@ -654,6 +681,9 @@
<select class="selectLaber" id="gramWeight5" name="gramWeight5">
</select>
</td>
+ <td class="Qitazhi5" style="display:none;">
+ <input id="Qitazhi5" name="Qitazhi5" type="text" />
+ </td>
<td>
<select name="printColor5" >
<option value="鍥涜壊鍗板埛">鍥涜壊鍗板埛</option>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
index 5366de6..56098d6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -102,6 +102,7 @@
string works = string.Empty;
int printMode = 1;
int gramWeight = -1;
+ string Qitazhi = string.Empty;
int brandId = -1;
int printCount = -1;
string singleOrdouble = string.Empty;
@@ -153,11 +154,16 @@
{
paperId = 3;
}
+ if (request["Qitazhi0"] != null)
+ {
+ Qitazhi = request["Qitazhi0"];
+ }
+
if (request["gramWeight0"] != null)
- gramWeight = request["gramWeight0"].ToString().ToInt32().Value;
+ gramWeight = request["gramWeight0"].ToInt32().HasValue? request["gramWeight0"].ToInt32().Value:0;
if (request["brand0"] != null)
{
- brandId = request["brand0"].ToString().ToInt32().Value;
+ brandId = request["brand0"].ToInt32().HasValue ?request["brand0"].ToString().ToInt32().Value : 0;
}
if (request["printCount"] != null)
printCount = request["printCount"].ToString().ToInt32().Value;
@@ -239,6 +245,7 @@
model.PaperId = paperId;
model.GramWeight = gramWeight;
model.BrandId = brandId;
+ model.Qitazhi = Qitazhi;
model.PrintCount = printCount;
model.Unit = ysuint;
model.SingleOrdouble = singleOrdouble;
@@ -352,9 +359,9 @@
insideModel.PaperId = 3;
insideModel.PrintColor = "鍥涜壊鍗板埛";
if (request["pageNum1"] != null)
- insideModel.PageNum = request["pageNum1"].ToString().ToInt32().Value;
+ insideModel.PageNum = request["pageNum1"].ToInt32().HasValue ? request["pageNum1"].ToString().ToInt32().Value : 0;
if (request["gramWeight1"] != null)
- insideModel.GramWeight = request["gramWeight1"].ToString().ToInt32().Value;
+ insideModel.GramWeight = request["gramWeight1"].ToInt32().HasValue? request["gramWeight1"].ToString().ToInt32().Value:0;
model.InquiryInsideList.Add(insideModel);
printDemand += paperSize.Name + "锛岄獞椹";
printDemand += "锛屽皝闈㈣姹傦細閾滅増绾革紝" + model.GramWeight + "鍏嬶紝" + model.PrintColor + "锛�4椤�";
@@ -401,13 +408,15 @@
insideModel.PaperId = request["paper" + i].ToString().ToInt32().Value;
}
if (request["brand" + i] != null)
- insideModel.BrandId = request["brand" + i].ToString().ToInt32().Value;
+ insideModel.BrandId = request["brand" + i].ToInt32().HasValue ? request["brand" + i].ToString().ToInt32().Value:0;
if (request["gramWeight" + i] != null)
- insideModel.GramWeight = request["gramWeight" + i].ToString().ToInt32().Value;
+ insideModel.GramWeight = request["gramWeight" + i].ToInt32().HasValue ? request["gramWeight" + i].ToString().ToInt32().Value:0;
+ if (request["Qitazhi" + i] != null)
+ insideModel.Qitazhi = request["Qitazhi" + i];
if (request["printColor" + i] != null)
insideModel.PrintColor = request["printColor" + i].ToString();
if (request["pageNum" + i] != null)
- insideModel.PageNum = request["pageNum" + i].ToString().ToInt32().Value;
+ insideModel.PageNum = request["pageNum" + i].ToInt32().HasValue? request["pageNum" + i].ToInt32().Value:0;
if (request["works" + i] != null)
works = request["works" + i].ToString();
if (!string.IsNullOrEmpty(works))
@@ -437,14 +446,25 @@
insideModel.GildingType = request["gildingType" + i].ToString();
model.InquiryInsideList.Add(insideModel);
}
- PaperInfoBLL _paperInfoBLL = new PaperInfoBLL();
- SysInquiry_PaperInfo paperInfo = _paperInfoBLL.GetPaperModel(model.PaperId);
+
+
AfterParameterInfoBLL _afterParameterInfoBLL = new AfterParameterInfoBLL();
SysInquiry_AfterParameterInfo bindingModeObj = _afterParameterInfoBLL.GetModel(model.BindingMode);
printDemand += model.PrintSizeName + "锛�" + bindingModeObj.ParameterName;
- printDemand += "锛屽皝闈㈣姹傦細" + paperInfo.PaperName + "";
+ PaperInfoBLL _paperInfoBLL = new PaperInfoBLL();
+ SysInquiry_PaperInfo paperInfo = null;
+ if (model.PaperId >= 0)
+ {
+ paperInfo = _paperInfoBLL.GetPaperModel(model.PaperId);
+ printDemand += "锛屽皝闈㈣姹傦細" + paperInfo.PaperName + "";
+ }
+ else
+ {
+ printDemand += "锛屽皝闈㈣姹傦細" + model.Qitazhi + "";
+ }
+
BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
- if (model.PaperId != 0)
+ if (model.PaperId > 0)
{
SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
printDemand += "(" + brandInfo.BrandName + ")";
@@ -455,16 +475,24 @@
foreach (InquiryInsideModel insideModelObj in model.InquiryInsideList)
{
printDemand += "鍐呴〉" + insideModelObj.InsideIndex.ToString() + "锛�";
- paperInfo = _paperInfoBLL.GetPaperModel(insideModelObj.PaperId);
- printDemand += paperInfo.PaperName;
- if (insideModelObj.PaperId != 0)
+ if(insideModelObj.PaperId >= 0)
+ {
+ paperInfo = _paperInfoBLL.GetPaperModel(insideModelObj.PaperId);
+ printDemand += paperInfo.PaperName;
+ }
+ else
+ {
+ printDemand += insideModelObj.Qitazhi;
+ }
+
+ if (insideModelObj.PaperId > 0)
{
SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(insideModelObj.BrandId);
printDemand += "(" + brandInfo.BrandName + ")";
printDemand += "锛�" + insideModelObj.GramWeight + "鍏�";
}
printDemand += "锛�" + insideModelObj.PrintColor + "锛�" + insideModelObj.PageNum.ToString();
- if (paperInfo.PaperName == "纭吀绾�")
+ if (insideModelObj.PaperId >= 0 && paperInfo.PaperName == "纭吀绾�")
{
printDemand += "寮�";
}
@@ -527,13 +555,15 @@
insideModel.PaperId = request["paper" + i].ToString().ToInt32().Value;
}
if (request["brand" + i] != null)
- insideModel.BrandId = request["brand" + i].ToString().ToInt32().Value;
+ insideModel.BrandId = request["brand" + i].ToInt32().HasValue ? request["brand" + i].ToString().ToInt32().Value:0;
if (request["gramWeight" + i] != null)
- insideModel.GramWeight = request["gramWeight" + i].ToString().ToInt32().Value;
+ insideModel.GramWeight = request["gramWeight" + i].ToInt32().HasValue? request["gramWeight" + i].ToString().ToInt32().Value:0;
+ if (request["Qitazhi" + i] != null)
+ insideModel.Qitazhi = request["Qitazhi" + i];
if (request["printColor" + i] != null)
insideModel.PrintColor = request["printColor" + i].ToString();
if (request["pageNum" + i] != null)
- insideModel.PageNum = request["pageNum" + i].ToString().ToInt32().Value;
+ insideModel.PageNum = request["pageNum" + i].ToInt32().HasValue ? request["pageNum" + i].ToString().ToInt32().Value:0;
if (request["works" + i] != null)
works = request["works" + i].ToString();
if (!string.IsNullOrEmpty(works))
@@ -564,13 +594,21 @@
model.InquiryInsideList.Add(insideModel);
}
PaperInfoBLL _paperInfoBLL = new PaperInfoBLL();
- SysInquiry_PaperInfo paperInfo = _paperInfoBLL.GetPaperModel(model.PaperId);
+ SysInquiry_PaperInfo paperInfo = null;
AfterParameterInfoBLL _afterParameterInfoBLL = new AfterParameterInfoBLL();
SysInquiry_AfterParameterInfo bindingModeObj = _afterParameterInfoBLL.GetModel(model.BindingMode);
printDemand += model.PrintSizeName + "锛�" + bindingModeObj.ParameterName;
- printDemand += "锛屽皝闈㈣姹傦細" + paperInfo.PaperName + "";
+ if(model.PaperId >= 0)
+ {
+ paperInfo = _paperInfoBLL.GetPaperModel(model.PaperId);
+ printDemand += "锛屽皝闈㈣姹傦細" + paperInfo.PaperName + "";
+ }
+ else
+ {
+ printDemand += "锛屽皝闈㈣姹傦細" + model.Qitazhi + "";
+ }
BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
- if (model.PaperId != 0)
+ if (model.PaperId > 0)
{
SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
printDemand += "(" + brandInfo.BrandName + ")";
@@ -581,16 +619,24 @@
foreach (InquiryInsideModel insideModelObj in model.InquiryInsideList)
{
printDemand += "鍐呴〉" + insideModelObj.InsideIndex.ToString() + "锛�";
- paperInfo = _paperInfoBLL.GetPaperModel(insideModelObj.PaperId);
- printDemand += paperInfo.PaperName;
- if (insideModelObj.PaperId != 0)
+
+ if (insideModelObj.PaperId >= 0)
+ {
+ paperInfo = _paperInfoBLL.GetPaperModel(insideModelObj.PaperId);
+ printDemand += paperInfo.PaperName;
+ }
+ else
+ {
+ printDemand += insideModelObj.Qitazhi;
+ }
+ if (insideModelObj.PaperId > 0)
{
SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(insideModelObj.BrandId);
printDemand += "(" + brandInfo.BrandName + ")";
printDemand += "锛�" + insideModelObj.GramWeight + "鍏�";
}
printDemand += "锛�" + insideModelObj.PrintColor + "锛�" + insideModelObj.PageNum.ToString();
- if (paperInfo.PaperName == "纭吀绾�")
+ if (insideModelObj.PaperId >= 0 && paperInfo.PaperName == "纭吀绾�")
{
printDemand += "寮�";
}
@@ -1630,6 +1676,10 @@
printDemand += "锛�" + model.GramWeight + "鍏�";
}
printDemand += "锛�" + model.SingleOrdouble + "锛�" + model.PrintColor;
+ if (request["jtWZ"] != null)
+ model.JTWZ = request["jtWZ"].ToString();
+ if (request["jtWZFM"] != null)
+ model.jtWZFM = request["jtWZFM"].ToString();
}
else if (model.PrintTypeId == 39) //鍏枃绾�
{
@@ -1869,6 +1919,8 @@
}
if (request["jtWZ"] != null)
model.JTWZ = request["jtWZ"].ToString();
+ if (request["jtWZFM"] != null)
+ model.jtWZFM = request["jtWZFM"].ToString();
if (request["frontType"] != null)
model.FrontType = request["frontType"].ToString();
if (request["pDemand"] != null)
@@ -2159,11 +2211,11 @@
insideModel.PaperId = request["paper" + i].ToString().ToInt32().Value;
}
if (request["gramWeight" + i] != null)
- insideModel.GramWeight = request["gramWeight" + i].ToString().ToInt32().Value;
+ insideModel.GramWeight = request["gramWeight" + i].ToInt32().HasValue? request["gramWeight" + i].ToString().ToInt32().Value:0;
if (request["printColor" + i] != null)
insideModel.PrintColor = request["printColor" + i].ToString();
if (request["pageNum" + i] != null)
- insideModel.PageNum = request["pageNum" + i].ToString().ToInt32().Value;
+ insideModel.PageNum = request["pageNum" + i].ToInt32().HasValue ? request["pageNum" + i].ToString().ToInt32().Value : 0; ;
if (request["works" + i] != null)
works = request["works" + i].ToString();
if (!string.IsNullOrEmpty(works))
@@ -2460,8 +2512,13 @@
{
if (!string.IsNullOrEmpty(model.JTWZ))
{
- afterWorkStr = model.JTWZ ;
+ afterWorkStr = "瑁呰锛�" + model.JTWZ ;
+ if (model.JTWZ != "鑳跺ご" && model.JTWZ != "鑳跺乏" && model.JTWZ != "鍏朵粬")
+ {
+ afterWorkStr += "锛屽皝闈㈠嵃鍒疯姹傦細" + model.jtWZFM;
+ }
}
+
if(!string.IsNullOrEmpty(model.ThStart) || !string.IsNullOrEmpty(model.ThEnd))
{
afterWorkStr += "锛屽鍙峰彿娈�(" + model.ThStart + "-" + model.ThEnd + ")";
@@ -2469,6 +2526,31 @@
}
}
+ if (model.PrintTypeId == 29)
+ {
+ if (!string.IsNullOrEmpty(model.JTWZ))
+ {
+ if (!string.IsNullOrEmpty(afterWorkStr))
+ {
+ afterWorkStr += "锛�";
+ }
+ afterWorkStr += "瑁呰锛�" + model.JTWZ;
+ if (model.JTWZ != "鑳跺ご" && model.JTWZ != "鑳跺乏" && model.JTWZ != "鍏朵粬" && model.JTWZ != "鏁ｉ〉")
+ {
+ if (!string.IsNullOrEmpty(model.jtWZFM))
+ afterWorkStr += "锛屽皝闈㈠嵃鍒疯姹傦細" + model.jtWZFM;
+ }
+ if ( model.PageNum > 0)
+ afterWorkStr += "(姣忔湰" + model.PageNum.ToString() + "寮�)";
+ }
+
+ //if (!string.IsNullOrEmpty(model.ThStart) || !string.IsNullOrEmpty(model.ThEnd))
+ //{
+ // afterWorkStr += "锛屽鍙峰彿娈�(" + model.ThStart + "-" + model.ThEnd + ")";
+ // //afterWorkStr += "锛�" + model.JTWZ;
+ //}
+ }
+
if (model.PrintTypeId == 25)
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx
index 651a121..88fe66a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx
@@ -69,6 +69,7 @@
<td>鍗板埛绾稿紶</td>
<td class="Brand0">鍝佺墝</td>
<td class="gramWeight0">绾稿紶鍏嬮噸</td>
+ <td class="Qitazhi0">绾稿紶</td>
<td class="singleOrdouble">鍗曞弻闈�</td>
<td>鍗板埛棰滆壊</td>
<td>椤电爜</td>
@@ -86,6 +87,7 @@
<%
}
%>
+ <option value="-1">鍏朵粬</option>
</select>
</td>
<td class="Brand0"><select class="selectLaber" id="brand0" name="brand0">
@@ -94,6 +96,9 @@
<td class="gramWeight0">
<select class="selectLaber" id="gramWeight0" name="gramWeight0">
</select>
+ </td>
+ <td class="Qitazhi0" style="display:none;">
+ <input id="Qitazhi0" name="Qitazhi0" type="text" />
</td>
<td class="singleOrdouble">
<select class="selectLaber" name="singleOrdouble0">
@@ -206,6 +211,7 @@
<td>鍗板埛绾稿紶</td>
<td class="Brand1">鍝佺墝</td>
<td class="gramWeight1">绾稿紶鍏嬮噸</td>
+ <td class="Qitazhi1">绾稿紶</td>
<td>鍗板埛棰滆壊</td>
<td><span class="zhang1">椤电爜</span></td>
</tr>
@@ -222,6 +228,7 @@
<%
}
%>
+ <option value="-1">鍏朵粬</option>
</select>
</td>
<td class="Brand1"><select class="selectLaber" id="brand1" name="brand1">
@@ -231,6 +238,9 @@
<select class="selectLaber" id="gramWeight1" name="gramWeight1">
</select>
</td>
+ <td class="Qitazhi1" style="display:none;">
+ <input id="Qitazhi1" name="Qitazhi1" type="text" />
+ </td>
<td>
<select name="printColor1" >
<option value="鍥涜壊鍗板埛">鍥涜壊鍗板埛</option>
@@ -311,6 +321,7 @@
<td>鍗板埛绾稿紶</td>
<td class="Brand2">鍝佺墝</td>
<td class="gramWeight2">绾稿紶鍏嬮噸</td>
+ <td class="Qitazhi2">绾稿紶</td>
<td>鍗板埛棰滆壊</td>
<td><span class="zhang2">椤电爜</span></td>
</tr>
@@ -327,6 +338,7 @@
<%
}
%>
+ <option value="-1">鍏朵粬</option>
</select>
</td>
<td class="Brand2">
@@ -337,6 +349,9 @@
<select class="selectLaber" id="gramWeight2" name="gramWeight2">
</select>
</td>
+ <td class="Qitazhi2" style="display:none;">
+ <input id="Qitazhi2" name="Qitazhi2" type="text" />
+ </td>
<td>
<select name="printColor2" >
<option value="鍥涜壊鍗板埛">鍥涜壊鍗板埛</option>
@@ -415,6 +430,7 @@
<td>鍗板埛绾稿紶</td>
<td class="Brand3">鍝佺墝</td>
<td class="gramWeight3">绾稿紶鍏嬮噸</td>
+ <td class="Qitazhi3">绾稿紶</td>
<td>鍗板埛棰滆壊</td>
<td><span class="zhang3">椤电爜</span></td>
</tr>
@@ -431,6 +447,7 @@
<%
}
%>
+ <option value="-1">鍏朵粬</option>
</select>
</td>
<td class="Brand3"><select class="selectLaber" id="brand3" name="brand3">
@@ -440,6 +457,9 @@
<select class="selectLaber" id="gramWeight3" name="gramWeight3">
</select>
</td>
+ <td class="Qitazhi3" style="display:none;">
+ <input id="Qitazhi3" name="Qitazhi3" type="text" />
+ </td>
<td>
<select name="printColor3" >
<option value="鍥涜壊鍗板埛">鍥涜壊鍗板埛</option>
@@ -519,6 +539,7 @@
<td>鍗板埛绾稿紶</td>
<td class="Brand4">鍝佺墝</td>
<td class="gramWeight4">绾稿紶鍏嬮噸</td>
+ <td class="Qitazhi4">绾稿紶</td>
<td>鍗板埛棰滆壊</td>
<td><span class="zhang4">椤电爜</span></td>
</tr>
@@ -535,6 +556,7 @@
<%
}
%>
+ <option value="-1">鍏朵粬</option>
</select>
</td>
<td class="Brand4"><select class="selectLaber" id="brand4" name="brand4">
@@ -544,6 +566,9 @@
<select class="selectLaber" id="gramWeight4" name="gramWeight4">
</select>
</td>
+ <td class="Qitazhi4" style="display:none;">
+ <input id="Qitazhi4" name="Qitazhi4" type="text" />
+ </td>
<td>
<select name="printColor4" >
<option value="鍥涜壊鍗板埛">鍥涜壊鍗板埛</option>
@@ -623,6 +648,7 @@
<td>鍗板埛绾稿紶</td>
<td class="Brand5">鍝佺墝</td>
<td class="gramWeight5">绾稿紶鍏嬮噸</td>
+ <td class="Qitazhi5">绾稿紶</td>
<td>鍗板埛棰滆壊</td>
<td><span class="zhang5">椤电爜</span></td>
</tr>
@@ -639,6 +665,7 @@
<%
}
%>
+ <option value="-1">鍏朵粬</option>
</select>
</td>
<td class="Brand5"><select class="selectLaber" id="brand5" name="brand5">
@@ -648,6 +675,9 @@
<select class="selectLaber" id="gramWeight5" name="gramWeight5">
</select>
</td>
+ <td class="Qitazhi5" style="display:none;">
+ <input id="Qitazhi5" name="Qitazhi5" type="text" />
+ </td>
<td>
<select name="printColor5" >
<option value="鍥涜壊鍗板埛">鍥涜壊鍗板埛</option>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx
index 4688aac..55016a5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx
@@ -143,16 +143,30 @@
<td align="left" style="padding-left: 40px;">
濂楀彿鍙锋锛�<input type="text" name="thStart" />-<input type="text" name="thEnd" />
<span style=" margin-left:10px">
- 鑳跺ご浣嶇疆锛�<select name='jtWZ'>
+ 瑁呰锛�<select name='jtWZ' onchange="SelectjtWZ();" >
<option value="鑳跺ご">鑳跺ご</option>
<option value="鑳跺乏">鑳跺乏</option>
+ <option value="80鍏嬬墰鐨焊">80鍏嬬墰鐨焊</option>
+ <option value="100鍏嬬墰鐨焊">100鍏嬬墰鐨焊</option>
+ <option value="120鍏嬬墰鐨焊">120鍏嬬墰鐨焊</option>
+ <option value="鍏朵粬">鍏朵粬</option>
+ </select>
+ </span>
+ <span style="margin-left:10px;display:none;" id="jtWZFMyaoqiu">
+ 灏侀潰鍗板埛瑕佹眰锛�<select name='jtWZFM'>
+ <option value="鍗曢潰榛戣壊">鍗曢潰榛戣壊</option>
+ <option value="鍗曢潰褰╄壊">鍗曢潰褰╄壊</option>
+ <option value="鍙岄潰榛戣壊">鍙岄潰榛戣壊</option>
+ <option value="姝ｅ僵鑳岄粦">姝ｅ僵鑳岄粦</option>
+ <option value="涓嶅嵃鍒�">涓嶅嵃鍒�</option>
+ <option value="鍏朵粬">鍏朵粬</option>
</select>
</span>
</td>
</tr>
</tbody>
</table>
- <table class="table2">
+ <table class="table2" style="display:none;">
<tbody>
<tr>
<th>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx
index 497476a..7f083a1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx
@@ -146,7 +146,7 @@
<th width="70" style="text-align: center">
绉戠洰
</th>
- <th style="text-align: center">
+ <th width="250" style="text-align: center">
鎽樿
</th>
<th width="70" style="text-align: center">
@@ -187,7 +187,7 @@
<%#Eval("RewardContent")%>
</td>
<td style="text-align: center">
- <%#Eval("PlanContent")%>
+ <%#(Eval("PlanContent")!=null && Eval("PlanContent").ToString().Length>50)?Eval("PlanContent").ToString().Substring(0,50):Eval("PlanContent") %>
</td>
<td style="text-align: center">
<%#Eval("PlanMoney", "{0:F2}")%>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx
index 39581ab..c97ead8 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx
@@ -147,7 +147,7 @@
<th width="70" style="text-align: center">
绉戠洰
</th>
- <th style="text-align: center">
+ <th width="250" style="text-align: center;">
鎽樿
</th>
<th width="70" style="text-align: center">
@@ -188,7 +188,7 @@
<%#Eval("RewardContent")%>
</td>
<td style="text-align: center">
- <%#Eval("PlanContent")%>
+ <%#(Eval("PlanContent")!=null && Eval("PlanContent").ToString().Length>50)?Eval("PlanContent").ToString().Substring(0,50):Eval("PlanContent") %>
</td>
<td style="text-align: center">
<%#Eval("PlanMoney", "{0:F2}")%>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx
index 93bb4b7..b6f046c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx
@@ -135,7 +135,7 @@
<th width="70" style="text-align: center">
绉戠洰
</th>
- <th style="text-align: center">
+ <th width="250" style="text-align: center;" >
鎽樿
</th>
<th width="70" style="text-align: center">
@@ -170,7 +170,7 @@
<%#Eval("RewardContent")%>
</td>
<td style="text-align: center">
- <%#Eval("PlanContent")%>
+ <%#(Eval("PlanContent")!=null && Eval("PlanContent").ToString().Length>50)?Eval("PlanContent").ToString().Substring(0,50):Eval("PlanContent") %>
</td>
<td style="text-align: center">
<%#Eval("PlanMoney", "{0:F2}")%>
diff --git a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
index 2f92ff0..db63672 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
@@ -1142,10 +1142,16 @@
if (paperId == "0") {
$(".Brand" + index).hide();
$(".gramWeight" + index).hide();
+ $(".Qitazhi" + index).hide();
+ } else if(paperId == "-1") {
+ $(".Brand" + index).hide();
+ $(".gramWeight" + index).hide();
+ $(".Qitazhi" + index).show();
}
else {
$(".Brand" + index).show();
$(".gramWeight" + index).show();
+ $(".Qitazhi" + index).hide();
if (printTypeId == 15 || printTypeId == 6) {
var isSuccess = true;
@@ -1359,9 +1365,9 @@
$("#selCovered").val(dataJson.CoveredTypeId);
$("[name='printBoxNumber']").val(dataJson.PrintBoxNumber);
$("[name='printCountByBox']").val(dataJson.PrintCount);
- $("[name='singleOrdouble0']").val(dataJson.SingleOrdouble);
$("[name='pNameMP']").val(dataJson.PaperMP);
$("[name='paper0']").val(dataJson.PaperId);
+ $("[name='Qitazhi0']").val(dataJson.Qitazhi);
if (dataJson.PrintMode == 0) {
if (dataJson.PaperMP && dataJson.PaperMP != "" && $("#hidPrintTypeId").val() != "29") {
PaperSelect($("[name='pNameMP']").val(), $("#hidPrintTypeId").val(), 0);
@@ -1377,6 +1383,7 @@
if (dataJson.PrintMode == 0) {
$("[name='brand0']").change();
}
+ $("[name='singleOrdouble0']").val(dataJson.SingleOrdouble);
$("[name='gramWeight0']").val(dataJson.GramWeight);
$("#printCount").val(dataJson.PrintCount);
$("[name='ysUnit']").val(dataJson.Unit);
@@ -1399,6 +1406,7 @@
$("[name='thStart']").val(dataJson.ThStart);
$("[name='thEnd']").val(dataJson.ThEnd);
$("[name='jtWZ']").val(dataJson.JTWZ);
+ $("[name='jtWZFM']").val(dataJson.jtWZFM);
$("[name='frontType']").val(dataJson.FrontType);
if (dataJson.FrontType != "鏃犲皝闈�") {
$("#spPrintDemand").show();
@@ -1415,6 +1423,10 @@
$(this).attr("checked", false);
}
);
+ }
+
+ if (printTypeId == 27 || printTypeId == 29) {
+ SelectjtWZ();
}
if (afterWorkArry.length > 0) {
@@ -1541,6 +1553,7 @@
}
$("[name='gramWeight" + index + "']").val(insideArry[j].GramWeight);
$("[name='printColor" + index + "']").val(insideArry[j].PrintColor);
+ $("[name='Qitazhi" + index + "']").val(insideArry[j].Qitazhi);
$("[name='pageNum" + index + "']").val(insideArry[j].PageNum);
$("[name='gildingType" + index + "']").val(insideArry[j].GildingType);
var insideAfterWorkArry = insideArry[j].AfterWorkList;
@@ -2427,7 +2440,17 @@
}
return true;
}
-
+function SelectjtWZ() {
+
+ var dddd = $("[name='jtWZ']").val();
+ if (dddd != "鑳跺ご" && dddd != "鑳跺乏" && dddd != "鍏朵粬" && dddd != "鏁ｉ〉") {
+ $("#jtWZFMyaoqiu").show();
+ } else {
+ $("#jtWZFMyaoqiu").hide();
+ }
+
+
+}
function SelectFuc(obj) {
var index = $(obj).attr("index");
if ($(obj).val() == "8") {
--
Gitblit v1.9.1