From cf4b34c45f52ff8951d8eb1ff564c039593f4b31 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 22 十一月 2024 08:45:35 +0800
Subject: [PATCH] 修改合办工单，专版工单格式，计划订单上传格式
---
CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderBLL.cs | 11
CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js | 4
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.designer.cs | 68 +-
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx | 2
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx | 4
CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderDAL.cs | 7
CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrder.cs | 36 +
CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderDAL.cs | 11
CY_ECommercePlatform/CY.WebForm/Styles/base.css | 48 ++
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.designer.cs | 82 ++-
CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderList.aspx.cs | 338 +++++++++------
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx | 97 ++++
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs | 18
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs | 30 +
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.cs | 13
CY_ECommercePlatform/CY.WebForm/Pages/front/WorkBook.aspx | 62 +-
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx.cs | 8
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.designer.cs | 98 ++--
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx | 239 ++++++++++
CY_ECommercePlatform/CY.WebForm/images/jihuageshi/上传计划订单.xlsx | 0
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx | 19
24 files changed, 868 insertions(+), 335 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
index 6686e61..e397294 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
@@ -720,7 +720,7 @@
}
- var isWin = _eC_OrderBasicDAL.Updatejinedanjia(eC_OrderBasic.Keyid.Value, eC_OrderBasic.SumPrice.Value, eC_OrderBasic.UnitPrice.Value);
+ var isWin = _eC_OrderBasicDAL.Updatejinedanjia(eC_OrderBasic.Keyid.Value, eC_OrderBasic.SumPrice.Value, eC_OrderBasic.UnitPrice.Value, num);
eC_OrderPrintParameter.PrintParameter = SerializationHelper.Serialize(model);
isWin = _eC_OrderPrintParameterDAL.UpdateModel(eC_OrderPrintParameter);
diff --git a/CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderBLL.cs
index c3d4fd8..6020016 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderBLL.cs
@@ -157,6 +157,17 @@
}
/// <summary>
+ /// 鏍规嵁formid鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public IEnumerable<Model.CoreCmsPlanOrder> GetModelByids(string ids)
+ {
+
+ return _ICoreCmsPlanOrderDAL.GetModelByids(ids);
+ }
+
+ /// <summary>
/// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
/// </summary>
/// <param name="Keyid">涓婚敭id</param>
diff --git a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
index 5238c8d..56edef1 100644
--- a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
@@ -283,7 +283,7 @@
/// <param name="orderId"></param>
/// <param name="SumPrice"></param>
/// <param name="UnitPrice"></param>
- bool Updatejinedanjia(int orderId,decimal SumPrice, decimal UnitPrice);
+ bool Updatejinedanjia(int orderId,decimal SumPrice, decimal UnitPrice,int num);
/// <summary>
/// 淇敼鎵撳嵃鐘舵��
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderDAL.cs
index 904219f..1f5440f 100644
--- a/CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderDAL.cs
@@ -32,6 +32,13 @@
/// <returns></returns>
IEnumerable<CoreCmsPlanOrder> GetModelByorderid(int orderid);
+ /// <summary>
+ /// 鏍规嵁orderid鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="ids">缂栧彿</param>
+ /// <returns></returns>
+ IEnumerable<CoreCmsPlanOrder> GetModelByids(string ids);
+
/// <summary>
/// 淇敼
diff --git a/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrder.cs b/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrder.cs
index 9cabd81..83af9f4 100644
--- a/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrder.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrder.cs
@@ -1,6 +1,7 @@
锘縰sing System;
using CY.Infrastructure.Domain;
using CY.Infrastructure.Common;
+using System.Collections.Generic;
namespace CY.Model
{
@@ -509,6 +510,41 @@
public System.Int32 nums { get; set; }
+ public List<JiHuaOrderDetail> jiHuaOrderDetails { get; set; }
+ }
+
+ /// <summary>
+ /// 璁″垝璁㈠崟
+ /// </summary>
+ public class JiHuaOrderDetail
+ {
+
+ /// <summary>
+ /// 鍟嗗搧鍚嶇О
+ /// </summary>
+
+ public System.String name { get; set; }
+
+
+ /// <summary>
+ /// 鍟嗗搧瑙勬牸
+ /// </summary>
+
+ public System.String specification { get; set; }
+
+
+ /// <summary>
+ /// 璐у搧浠锋牸鍗曚环
+ /// </summary>
+
+ public System.Decimal price { get; set; }
+
+
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+
+ public System.Int32 nums { get; set; }
}
}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index 46278c9..bbf428f 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -2750,12 +2750,12 @@
/// 淇敼鎵撳嵃鐘舵��
/// </summary>
/// <param name="orderId"></param>
- public bool Updatejinedanjia(int orderId, decimal SumPrice, decimal UnitPrice)
+ public bool Updatejinedanjia(int orderId, decimal SumPrice, decimal UnitPrice,int num)
{
try
{
string sqlStr = string.Empty;
- sqlStr = "UPDATE EC_OrderBasic SET SumPrice="+ SumPrice + " ,UnitPrice="+ UnitPrice + " WHERE Keyid=@orderId";
+ sqlStr = "UPDATE EC_OrderBasic SET SumPrice="+ SumPrice + " ,UnitPrice="+ UnitPrice + " WHERE Keyid=@orderId;UPDATE [EC_OrderExtend] SET [PrintNum]=" + num + " WHERE Keyid="+ orderId ;
SqlParameter par = new SqlParameter("@orderId", orderId);
_dataBase.ExecuteSql(sqlStr, par);
}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderDAL.cs
index 3b7d3e1..18c1680 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderDAL.cs
@@ -275,6 +275,17 @@
/// <summary>
+ /// 鍏ㄩ儴鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.CoreCmsPlanOrder> GetModelByids(string ids)
+ {
+ return _dataBase.SelectModel<Model.CoreCmsPlanOrder>(" * ", " CoreCmsPlanOrder ", " [id] in ( " + ids + ")") as IList<Model.CoreCmsPlanOrder>;//鎵ц鏌ヨ
+ }
+
+
+ /// <summary>
/// 淇敼
/// </summary>
/// <param name="model"></param>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
index 3c6c658..f9891a0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
@@ -5,7 +5,9 @@
<head runat="server">
<title>鍚堢増鏂藉伐鍗�</title>
<uc:CMSHead ID="CMSHead1" runat="server" />
+ <link rel="stylesheet" type="text/css" href="../../Styles/base.css" />
<script type="text/javascript">
+
$(function () {
$("input[name='PMS_PaperPositive']").blur(function () {
var PMS_PaperCount = parseInt($("input[name='PMS_PaperCount']").val());
@@ -55,6 +57,27 @@
$("#PMS_PaperSource").change();
$("#selPlateType").change();
+
+
+ $(".xialap").hover(function () {
+ $(this).find(".xialapb").show();
+ }, function () {
+ $(this).find(".xialapb").hide();
+ });
+
+ $(".xialapr").hover(function () {
+ $(this).find(".xialapb").show();
+ $(this).removeClass("xialapr").addClass("xialaprh");
+ }, function () {
+ $(this).removeClass("xialaprh").addClass("xialapr");
+ $(this).find(".xialapb").hide();
+ });
+
+ $(".xialapr").click(function () {
+ $(this).parent().parent().find("input").val($(this).text());
+ $(".xialapb").hide();
+ });
+
});
</script>
<script type="text/javascript">
@@ -127,7 +150,40 @@
{
document.getElementById('PrintSizeName').value = "";
}
- }
+ }
+ /*
+浜ゆ槗瀹㈡埛閫変腑鍊煎彂鐢熸敼鍙�
+*/
+ function custormerChange(sel) {
+ if (window.isDataLoading) {
+ return;
+ }
+ if (sel.value.indexOf('鍏紑') >= 0) {
+ document.getElementById('PlateSpec').value = '395*460';
+ document.getElementById('PMS_ChromaticNumber').value = '1';
+ /*document.getElementById('CTPCount').value = '8';*/
+
+ } else if (sel.value.indexOf('鍥涜壊') >= 0 ) {
+ document.getElementById('PlateSpec').value = '770*1030';
+ document.getElementById('PMS_ChromaticNumber').value = '4';
+ /* document.getElementById('CTPCount').value = '2';*/
+ } else if (sel.value.indexOf('鍏壊') >= 0) {
+ document.getElementById('PlateSpec').value = '790*1030';
+ document.getElementById('PMS_ChromaticNumber').value = '4';
+ /* document.getElementById('CTPCount').value = '2';*/
+ } else if (sel.value.indexOf('榛戠櫧') >= 0 ) {
+ document.getElementById('PlateSpec').value = '760*920';
+ document.getElementById('PMS_ChromaticNumber').value = '1';
+ /* document.getElementById('CTPCount').value = '2';*/
+ } else if (sel.value.indexOf('杞浆') >= 0) {
+ document.getElementById('PlateSpec').value = '579*810';
+ document.getElementById('PMS_ChromaticNumber').value = '1';
+ /* document.getElementById('CTPCount').value = '';*/
+ }
+
+
+
+ }
</script>
</head>
<body>
@@ -329,7 +385,7 @@
鍗板埛鏈哄彴锛�
</td>
<td>
- <select keepDefaultStyle="true" name="PMS_Machine" id="selPMS_Machine" runat="server" style=" width:80px;">
+ <select keepDefaultStyle="true" name="PMS_Machine" id="selPMS_Machine" runat="server" style=" width:80px;" onchange='custormerChange(this)'>
<option value="">璇烽�夋嫨</option>
<option value="1寮�鏈�">1寮�鏈�</option>
<option value="2寮�鏈�">2寮�鏈�</option>
@@ -386,22 +442,41 @@
</td>
</tr>
<tr>
- <td class="ali03 w70px ">
- 鐗堟潗绫诲瀷锛�
+ <td class="ali03 w70px " style="display:none;">
+ <%-- 鐗堟潗绫诲瀷锛�--%>
</td>
- <td>
- <select keepDefaultStyle="true" name="selPlateType" onchange='PlateChange(this)' runat = "server" id="selPlateType" style=" width:80px;">
+ <td style="display:none;">
+ <select keepDefaultStyle="true" name="selPlateType" onchange='PlateChange(this)' runat = "server" id="selPlateType" style=" width:80px;display:none;">
<option selected="selected" value="1">鏈巶CTP</option>
<option value="0">鑷甫CTP</option>
<option value="2">鑷甫鑿叉灄</option>
<option value="3">鏈巶鑿叉灄</option>
- </select><label class="Btnb CangKubtn_o" style="margin-left: 2px;"><input type="button" class="Btn FromWarehouseByBanCai" value="杩炴帴浠撳簱" id="BtnStorePlate" /></label><input type="hidden" runat="server" name="PSF_PaperId" id="PSF_PaperId2" />
+ </select><label class="Btnb CangKubtn_o" style="margin-left: 2px;display:none;"><input type="button" class="Btn FromWarehouseByBanCai" value="杩炴帴浠撳簱" id="BtnStorePlate" /></label><input type="hidden" runat="server" name="PSF_PaperId" id="PSF_PaperId2" />
</td>
<td class="ali03 w70px ">
瑙勬牸锛�
</td>
<td>
- <input type="text" class="noJ " name="CTPSpecName" style="width:80px" id="PlateSpec" runat = "server"/>
+
+ <%-- <input type="text" class="noJ " name="CTPSpecName" style="width:80px" id="PlateSpec" runat = "server"/>--%>
+ <%-- <select keepDefaultStyle="true" name="CTPSpecName" id="PlateSpec" runat="server" style="width:80px" >
+
+ </select> --%>
+
+ <div class="xialap">
+ <input type="text" class="noJ " name="CTPSpecName" style="width:80px" id="PlateSpec" runat = "server"/>
+ <div class="xialapb" >
+ <%=xialapr %>
+ <%-- <div class="xialapr">500</div>
+ <div class="xialapr">1000</div>
+ <div class="xialapr">2000</div>
+ <div class="xialapr">3000</div>
+ <div class="xialapr">5000</div>
+ <div class="xialapr">10000</div>--%>
+ </div>
+ </div>
+
+
<select keepDefaultStyle="true" name="selCTPSpec" runat="server" style="display:none;width:80px" id="selCTPSpec" runat = "server"></select>
<select keepDefaultStyle="true" name="selFilmSpec" runat="server" style="display:none;width:80px" id="selFilmSpec" runat = "server"></select>
</td>
@@ -426,7 +501,7 @@
<td id="tdPsCount" style="display:none" runat="server">
<input type="text" class="noJ PS_o" name="PSCount" style="width:80px" id="PSCount" runat = "server" />
</td>
- <td id="tdBlank" colspan = "4">
+ <td id="tdBlank" colspan = "6">
</td>
</tr>
@@ -438,10 +513,10 @@
<input type="text" class="date" name="PMS_CompletionTime" style=" width:140px;" runat = "server" id ="PMS_CompletionTime"/>
</td>
<td class="ali03 w70px ">
- 閲戦锛�
+ <%-- 閲戦锛�--%>
</td>
<td>
- <input type="text" class="float req " min="0" name="PMS_TotalPrice" style="width:80px" runat = "server" id="PMS_TotalPrice" />
+ <input type="text" class="float req " min="0" name="PMS_TotalPrice" style="width:80px;display:none;" runat = "server" id="PMS_TotalPrice" value="0" />
</td>
<td colspan="6">
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
index 6ae7ab1..e47b8b9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
@@ -27,6 +27,7 @@
OA_InventoryBLL bll_OA_InventoryBLL = null;
OA_OutOfStorageBLL bll_OA_OutOfStorageBLL = null;
public Guid targetid = Guid.Empty;
+ public string xialapr = "";
//鍒濆鍖�
public AgMergerOrderEdit()
@@ -91,6 +92,20 @@
this.selFilmSpec.DataBind();
this.selFilmSpec.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
//this.selFilmSpec.Visible = false;
+
+ //this.PlateSpec.DataSource = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "鐗堟潗瑙勬牸");
+ //this.PlateSpec.DataValueField = "ParName";
+ //this.PlateSpec.DataTextField = "ParName";
+ //this.PlateSpec.DataBind();
+ //this.PlateSpec.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+ var sss = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "鐗堟潗瑙勬牸");
+ foreach (var eC_MemberDictionary in sss)
+ {
+ xialapr += " <div class=\"xialapr\">"+ eC_MemberDictionary.ParName + "</div>";
+
+ }
+
+
Pagination pa = new Pagination();
pa.PageSize = 500;
@@ -327,6 +342,7 @@
RepMergerEdit.Visible = false;
this.RepClientList.DataSource = mEC_OrderBasicList;
this.RepClientList.DataBind();
+ this.selOutFirm.Value = "-1";
}
return true;
}
@@ -676,7 +692,7 @@
m_EC_OrderBasicNew.BuyerName = CurrentUser.Name;
m_EC_OrderBasicNew.Creater = CurrentUser.ShortName;
m_EC_OrderBasicNew.Operator = CurrentUser.ShortName;
- m_EC_OrderBasicNew.DeliveryTime = _eC_OrderBasic.DeliveryTime.Value.ToDateTime2();
+ m_EC_OrderBasicNew.DeliveryTime = _eC_OrderBasic.DeliveryTime.ToDateTime2();
m_EC_OrderBasicNew.DocumentName = _eC_OrderBasic.PrintType.PrintName;
m_EC_OrderBasicNew.OrderTypeId = 3;
m_EC_OrderBasicNew.PrintTypeId = _eC_OrderBasic.PrintTypeId;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.designer.cs
index 7f04455..fe4ebb3 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.business {
-
-
- public partial class AgMergerOrderEdit {
-
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class AgMergerOrderEdit
+ {
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// selExigencyDegree 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selExigencyDegree;
-
+
/// <summary>
/// spanSpecialNum 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSpecialNum;
-
+
/// <summary>
/// selOutFirm 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selOutFirm;
-
+
/// <summary>
/// spanSpecialOprator 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSpecialOprator;
-
+
/// <summary>
/// spanSpecialTime 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSpecialTime;
-
+
/// <summary>
/// RepClientList 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater RepClientList;
-
+
/// <summary>
/// RepMergerEdit 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater RepMergerEdit;
-
+
/// <summary>
/// PMS_PaperSource 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect PMS_PaperSource;
-
+
/// <summary>
/// PSF_PaperId1 鎺т欢銆�
/// </summary>
@@ -101,7 +103,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputHidden PSF_PaperId1;
-
+
/// <summary>
/// PMS_PaperCount1 鎺т欢銆�
/// </summary>
@@ -110,7 +112,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputHidden PMS_PaperCount1;
-
+
/// <summary>
/// PMS_PaperName 鎺т欢銆�
/// </summary>
@@ -119,7 +121,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText PMS_PaperName;
-
+
/// <summary>
/// selPaperName 鎺т欢銆�
/// </summary>
@@ -128,7 +130,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selPaperName;
-
+
/// <summary>
/// PMS_PaperSpecification 鎺т欢銆�
/// </summary>
@@ -137,7 +139,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText PMS_PaperSpecification;
-
+
/// <summary>
/// SelPaperSpec 鎺т欢銆�
/// </summary>
@@ -146,7 +148,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect SelPaperSpec;
-
+
/// <summary>
/// PMS_PaperCount 鎺т欢銆�
/// </summary>
@@ -155,7 +157,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText PMS_PaperCount;
-
+
/// <summary>
/// PMS_PaperPositive 鎺т欢銆�
/// </summary>
@@ -164,7 +166,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText PMS_PaperPositive;
-
+
/// <summary>
/// PMS_PaperConsume 鎺т欢銆�
/// </summary>
@@ -173,7 +175,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText PMS_PaperConsume;
-
+
/// <summary>
/// selPMS_Machine 鎺т欢銆�
/// </summary>
@@ -182,7 +184,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selPMS_Machine;
-
+
/// <summary>
/// PSF_Typesetting 鎺т欢銆�
/// </summary>
@@ -191,7 +193,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect PSF_Typesetting;
-
+
/// <summary>
/// PMS_IsRevisedEdition 鎺т欢銆�
/// </summary>
@@ -200,7 +202,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect PMS_IsRevisedEdition;
-
+
/// <summary>
/// PMS_IsColorSamples 鎺т欢銆�
/// </summary>
@@ -209,7 +211,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect PMS_IsColorSamples;
-
+
/// <summary>
/// PMS_ChromaticNumber 鎺т欢銆�
/// </summary>
@@ -218,7 +220,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect PMS_ChromaticNumber;
-
+
/// <summary>
/// selPlateType 鎺т欢銆�
/// </summary>
@@ -227,7 +229,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selPlateType;
-
+
/// <summary>
/// PSF_PaperId2 鎺т欢銆�
/// </summary>
@@ -236,7 +238,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputHidden PSF_PaperId2;
-
+
/// <summary>
/// PlateSpec 鎺т欢銆�
/// </summary>
@@ -245,7 +247,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText PlateSpec;
-
+
/// <summary>
/// selCTPSpec 鎺т欢銆�
/// </summary>
@@ -254,7 +256,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selCTPSpec;
-
+
/// <summary>
/// selFilmSpec 鎺т欢銆�
/// </summary>
@@ -263,7 +265,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selFilmSpec;
-
+
/// <summary>
/// lbCTPCount 鎺т欢銆�
/// </summary>
@@ -272,7 +274,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTableCell lbCTPCount;
-
+
/// <summary>
/// tdCTPCount 鎺т欢銆�
/// </summary>
@@ -281,7 +283,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTableCell tdCTPCount;
-
+
/// <summary>
/// CTPCount 鎺т欢銆�
/// </summary>
@@ -290,7 +292,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText CTPCount;
-
+
/// <summary>
/// lbPSSpec 鎺т欢銆�
/// </summary>
@@ -299,7 +301,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTableCell lbPSSpec;
-
+
/// <summary>
/// tdPSSpec 鎺т欢銆�
/// </summary>
@@ -308,7 +310,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTableCell tdPSSpec;
-
+
/// <summary>
/// PMS_PSBan 鎺т欢銆�
/// </summary>
@@ -317,7 +319,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText PMS_PSBan;
-
+
/// <summary>
/// PSF_PaperId3 鎺т欢銆�
/// </summary>
@@ -326,7 +328,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputHidden PSF_PaperId3;
-
+
/// <summary>
/// lbPSCount 鎺т欢銆�
/// </summary>
@@ -335,7 +337,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTableCell lbPSCount;
-
+
/// <summary>
/// tdPsCount 鎺т欢銆�
/// </summary>
@@ -344,7 +346,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTableCell tdPsCount;
-
+
/// <summary>
/// PSCount 鎺т欢銆�
/// </summary>
@@ -353,7 +355,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText PSCount;
-
+
/// <summary>
/// PMS_CompletionTime 鎺т欢銆�
/// </summary>
@@ -362,7 +364,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText PMS_CompletionTime;
-
+
/// <summary>
/// PMS_TotalPrice 鎺т欢銆�
/// </summary>
@@ -371,7 +373,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText PMS_TotalPrice;
-
+
/// <summary>
/// PMS_Remarks 鎺т欢銆�
/// </summary>
@@ -380,7 +382,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTextArea PMS_Remarks;
-
+
/// <summary>
/// btn_submit 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx
index f4a9588..9fbcb08 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx
@@ -86,7 +86,9 @@
鍒跺崟浜猴細
</td>
<td class="w100px">
- <span id="spanSpecialOprator" runat="server"></span>
+ <%-- <span id="spanSpecialOprator" runat="server"></span>--%>
+ <select keepdefaultstyle='true' id='selBusinessManager' runat="server" datatextfield='Name' datavaluefield='Name'>
+ </select>
</td>
<td class="ali03 w100px">
鍒跺崟鏃ユ湡锛�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.cs
index 2d368d4..3c00b4a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.cs
@@ -21,6 +21,7 @@
OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = null;
Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
EC_OrderBLL bll_EC_OrderBLL = null;
+ OA_StaffBLL bll_OA_StaffBLL = null;
public Guid targetid = Guid.Empty;
public static string Keyid;
@@ -39,6 +40,7 @@
bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
bll_EC_OrderBLL = new EC_OrderBLL();
+ bll_OA_StaffBLL = new OA_StaffBLL();
}
/// <summary>
@@ -127,7 +129,8 @@
this.spanSumPrice.InnerText = (_eC_OrderBasic.SumPrice ??0).ToString("0.00");
this.spanSurplusPrintNum.InnerText = _eC_OrderBasic.OrderExtend.SurplusPrintNum.ToString2();
- this.spanSpecialOprator.InnerText = CurrentUser.ShortName;
+ //this.spanSpecialOprator.InnerText = CurrentUser.ShortName;
+ this.selBusinessManager.Value = _eC_OrderBasic.Creater;
this.spanSpecialTime.InnerText = DateTime.Now.ToString("yyyy-MM-dd HH:mm");
this.txtRemark.Value = _eC_OrderBasic.Remark.ToString2();
@@ -154,6 +157,12 @@
this.selExigencyDegree.DataBind();
this.selExigencyDegree.Items.Add(new ListItem("璇烽�夋嫨", ""));
this.selExigencyDegree.Value = "0";
+
+ this.selBusinessManager.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, true, false);
+ this.selBusinessManager.DataTextField = "Name";
+ this.selBusinessManager.DataValueField = "Name";
+ this.selBusinessManager.DataBind();
+ //this.selBusinessManager.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
}
}
@@ -209,7 +218,7 @@
m_EC_OrderBasicNew.SellerId = this.selOutFirm.SelectedValue.ToGuid2();
m_EC_OrderBasicNew.BuyerId = CurrentUser.MemberId;
m_EC_OrderBasicNew.BuyerName = CurrentUser.Name;
- m_EC_OrderBasicNew.Creater = CurrentUser.ShortName;
+ m_EC_OrderBasicNew.Creater = this.selBusinessManager.Value;// CurrentUser.ShortName;
m_EC_OrderBasicNew.Operator = CurrentUser.ShortName;
m_EC_OrderBasicNew.DeliveryTime = this.txtDeliveryTime.Value.ToDateTime2();
m_EC_OrderBasicNew.DocumentName = _eC_OrderBasic.DocumentName;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.designer.cs
index d5c4783..b157d19 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.business {
-
-
- public partial class AgOutsourcSingleAllEdit {
-
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class AgOutsourcSingleAllEdit
+ {
+
/// <summary>
/// Head1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
/// <summary>
/// selOutFirm 鎺т欢銆�
/// </summary>
@@ -47,16 +49,16 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList selOutFirm;
-
+
/// <summary>
- /// spanSpecialOprator 鎺т欢銆�
+ /// selBusinessManager 鎺т欢銆�
/// </summary>
/// <remarks>
/// 鑷姩鐢熸垚鐨勫瓧娈点��
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSpecialOprator;
-
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selBusinessManager;
+
/// <summary>
/// spanSpecialTime 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSpecialTime;
-
+
/// <summary>
/// txtAllMoney 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtAllMoney;
-
+
/// <summary>
/// selExigencyDegree 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selExigencyDegree;
-
+
/// <summary>
/// txtDeliveryTime 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtDeliveryTime;
-
+
/// <summary>
/// spanOrderNum 鎺т欢銆�
/// </summary>
@@ -101,7 +103,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderNum;
-
+
/// <summary>
/// spanOrderType 鎺т欢銆�
/// </summary>
@@ -110,7 +112,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderType;
-
+
/// <summary>
/// spanOrderDeliveryTime 鎺т欢銆�
/// </summary>
@@ -119,7 +121,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderDeliveryTime;
-
+
/// <summary>
/// spanOrderTitle 鎺т欢銆�
/// </summary>
@@ -128,7 +130,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderTitle;
-
+
/// <summary>
/// spanVerifyWay 鎺т欢銆�
/// </summary>
@@ -137,7 +139,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanVerifyWay;
-
+
/// <summary>
/// spanExigencyDegree 鎺т欢銆�
/// </summary>
@@ -146,7 +148,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanExigencyDegree;
-
+
/// <summary>
/// spanOrderCustormName 鎺т欢銆�
/// </summary>
@@ -155,7 +157,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderCustormName;
-
+
/// <summary>
/// spanOrderBusinessManage 鎺т欢銆�
/// </summary>
@@ -164,7 +166,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderBusinessManage;
-
+
/// <summary>
/// spanOrderCustormManage 鎺т欢銆�
/// </summary>
@@ -173,7 +175,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderCustormManage;
-
+
/// <summary>
/// spanOrderCustormLevel 鎺т欢銆�
/// </summary>
@@ -182,7 +184,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderCustormLevel;
-
+
/// <summary>
/// spanOrderCustormPeople 鎺т欢銆�
/// </summary>
@@ -191,7 +193,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderCustormPeople;
-
+
/// <summary>
/// spanOrderCustormPhone 鎺т欢銆�
/// </summary>
@@ -200,7 +202,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderCustormPhone;
-
+
/// <summary>
/// spanUnitPrice 鎺т欢銆�
/// </summary>
@@ -209,7 +211,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanUnitPrice;
-
+
/// <summary>
/// spanSumPrice 鎺т欢銆�
/// </summary>
@@ -218,7 +220,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSumPrice;
-
+
/// <summary>
/// spanSurplusPrintNum 鎺т欢銆�
/// </summary>
@@ -227,7 +229,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSurplusPrintNum;
-
+
/// <summary>
/// txtPrintDemand 鎺т欢銆�
/// </summary>
@@ -236,7 +238,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTextArea txtPrintDemand;
-
+
/// <summary>
/// txtAfterWorksDemand 鎺т欢銆�
/// </summary>
@@ -245,7 +247,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTextArea txtAfterWorksDemand;
-
+
/// <summary>
/// txtRemark 鎺т欢銆�
/// </summary>
@@ -254,7 +256,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTextArea txtRemark;
-
+
/// <summary>
/// trFile 鎺т欢銆�
/// </summary>
@@ -263,7 +265,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTableRow trFile;
-
+
/// <summary>
/// cbkIsAllRecovery 鎺т欢銆�
/// </summary>
@@ -272,7 +274,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox cbkIsAllRecovery;
-
+
/// <summary>
/// txtKeyid 鎺т欢銆�
/// </summary>
@@ -281,7 +283,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtKeyid;
-
+
/// <summary>
/// txtBillMode 鎺т欢銆�
/// </summary>
@@ -290,7 +292,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtBillMode;
-
+
/// <summary>
/// btnSave 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
index 44a655e..46c9dfc 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
@@ -5,6 +5,7 @@
<head runat="server">
<title>涓撶増鏂藉伐鍗�</title>
<uc:CMSHead ID="CMSHead1" runat="server" />
+ <link rel="stylesheet" type="text/css" href="../../Styles/base.css?v=1" />
<style type="text/css">
body { font-family: 寰蒋闆呴粦; }
tr { line-height: 20px; }
@@ -229,27 +230,27 @@
<input type="text" class=" w80px int " msg="璇峰～鍐欐暟瀛�" name="PSF_PNum" value="<%#Eval("PSF_PNum")%>" />
</td>
<td colspan="2">
- <select keepdefaultstyle="true" class=" w120px" name="PSF_PressesDesk">
+ <select keepdefaultstyle="true" class=" w120px" name="PSF_PressesDesk" value_selspec="<%#Container.ItemIndex + 1%>">
<%--<option value="">璇烽�夋嫨</option>--%>
<%=PressesDeskHtml %>
</select>
</td>
<td>
- <select keepdefaultstyle="true" class="" name="PSF_PrintedColorPositive">
- <option value="鍗曡壊">鍗曡壊</option>
+ <select keepdefaultstyle="true" class="" name="PSF_PrintedColorPositive" value_selspec="<%#Container.ItemIndex + 1%>" >
+ <option value="鍗曡壊" selected="selected">鍗曡壊</option>
<option value="鍙岃壊">鍙岃壊</option>
<option value="涓夎壊">涓夎壊</option>
- <option value="鍥涜壊" selected="selected">鍥涜壊</option>
+ <option value="鍥涜壊" >鍥涜壊</option>
<option value="鍥�+涓�">鍥�+涓�</option>
</select>
</td>
<td>
<select keepdefaultstyle="true" class="" name="PSF_PrintedColorRear" value_ppwaerid="<%#Container.ItemIndex + 1%>">
<option value="0鑹�">0鑹�</option>
- <option value="鍗曡壊">鍗曡壊</option>
+ <option value="鍗曡壊" selected="selected">鍗曡壊</option>
<option value="鍙岃壊">鍙岃壊</option>
<option value="涓夎壊">涓夎壊</option>
- <option value="鍥涜壊" selected="selected">鍥涜壊</option>
+ <option value="鍥涜壊" >鍥涜壊</option>
<option value="鍥�+涓�">鍥�+涓�</option>
</select>
</td>
@@ -289,14 +290,14 @@
<td>
娑堣��
</td>
- <td colspan="1">
- 寮�鏁�
+ <td colspan="1" >
+ <p name="PSF_OpenSpecificationsspan" value_selspecspan="<%#Container.ItemIndex + 1%>">寮�鏁�</p>
</td>
<td>
- 瀹藉害(mm)
+ 瀹藉害(mm)
</td>
<td>
- 闀垮害(mm)
+ <p name="PSF_OpenWidthspan" value_openwidthspan="<%#Container.ItemIndex + 1%>">闀垮害(mm)</p>
</td>
</tr>
<tr>
@@ -332,19 +333,30 @@
</td>
<td colspan="1">
<select keepdefaultstyle="true" class=" w80px" name="PSF_OpenSpecifications" value_selspec="<%#Container.ItemIndex + 1%>">
- <%--<option value="">璇烽�夋嫨</option>--%>
+ <option value="">璇烽�夋嫨</option>
<%=selCuttingPaperSpecHtml%>
</select>
</td>
<td>
<input type="text" class=" w80px int " msg="璇峰～鍐欐暟瀛�" name="PSF_OpenWidth" value="<%#(Eval("PSF_OpenWidth") == null || Eval("PSF_OpenWidth").ToString()=="0")?"":Eval("PSF_OpenWidth").ToString()%>" value_ppwaerid='<%#Container.ItemIndex + 1%>' />
+
+ <div class="xialap" value_ppwaerid='<%#Container.ItemIndex + 1%>' style="display:none;" >
+ <input type="text" class=" w80px int " name="PSF_OpenWidthName" value="<%#(Eval("PSF_OpenWidth") == null || Eval("PSF_OpenWidth").ToString()=="0")?"":Eval("PSF_OpenWidth").ToString()%>" value_ppwaerid='<%#Container.ItemIndex + 1%>' />
+ <div class="xialapb" >
+
+ <div class="xialapr">755</div>
+ <div class="xialapr">760</div>
+ <div class="xialapr">765</div>
+ <div class="xialapr">770</div>
+ </div>
+ </div>
</td>
<td>
- <input type="text" class=" w80px int " msg="璇峰～鍐欐暟瀛�" name="PSF_OpenLength" value="<%#(Eval("PSF_OpenWidth") == null || Eval("PSF_OpenLength").ToString()=="0")?"":Eval("PSF_OpenLength").ToString()%>" value_ppwaerid='<%#Container.ItemIndex + 1%>' />
+ <input type="text" class=" w80px int " msg="璇峰～鍐欐暟瀛�" name="PSF_OpenLength" value="<%#(Eval("PSF_OpenLength") == null || Eval("PSF_OpenLength").ToString()=="0")?"":Eval("PSF_OpenLength").ToString()%>" value_ppwaerid='<%#Container.ItemIndex + 1%>' />
</td>
</tr>
<tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6; width: 100%">
- <td>
+ <td style="display:none;">
鐗堟潗绫诲瀷
</td>
<td colspan="2">
@@ -359,11 +371,11 @@
<td id="lbPSCount" value_ppwaerid='<%#Container.ItemIndex + 1%>' class="lb lbPSCount" colspan="4" style="display: none">
PS鐗堟暟閲�
</td>
- <td colspan="6">
+ <td colspan="7">
</td>
</tr>
<tr>
- <td>
+ <td style="display:none;">
<select keepdefaultstyle="true" value_selwaerid="<%#Container.ItemIndex + 1%>" name="selPlateType" id="selPlateType">
<option value="鏈巶CTP">鏈巶CTP</option>
<option value="鑷甫CTP">鑷甫CTP</option>
@@ -373,8 +385,19 @@
<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" />
</td>
- <td colspan="2">
+ <td colspan="2" >
+ <div class="xialapp" style="margin-left:32%;">
<input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt CTPSpecName " name="CTPSpecName" id="PlateSpec" value="<%#Eval("PSF_CTPSpecType")%>" />
+ <div class="xialapbp" >
+ <%=xialapr %>
+ <%-- <div class="xialapr">500</div>
+ <div class="xialapr">1000</div>
+ <div class="xialapr">2000</div>
+ <div class="xialapr">3000</div>
+ <div class="xialapr">5000</div>
+ <div class="xialapr">10000</div>--%>
+ </div>
+ </div>
<select keepdefaultstyle="true" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="sel selCTPSpec" name="selCTPSpec" style="display: none; width: 80px" id="selCTPSpec">
<option value="">璇烽�夋嫨</option>
<%=selCTPSpecHtml %>
@@ -395,7 +418,7 @@
<td id="tdPsCount" style="display: none" runat="server" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="td tdPsCount" colspan="4">
<input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt PSCount" name="PSCount" style="width: 80px" id="PSCount" value="<%#Eval("PSF_PSCount")%>" />
</td>
- <td colspan="6">
+ <td colspan="7">
</td>
</tr>
<tr>
@@ -511,6 +534,7 @@
var value_id = parseInt($(".AddTab").last().attr("value_id"));
$(".AddTab").last().after($(".AddTab").last().clone(true));
$(".AddTab").last().attr("value_id", value_id + 1);
+ $(".xialap").last().attr("value_ppwaerid", value_id + 1);
$(".AddTab span").last().text(value_id + 1);
$(".FromWarehouse").last().attr("value_WaerId", value_id + 1);
$("input[name='PSF_PaperId']").last().attr("value_PpWaerId", value_id + 1);
@@ -532,9 +556,14 @@
$("input[name='PSF_LastNum']").last().attr("value_lastNumid", value_id + 1);
$("input[name='PSF_PrintedCount']").last().attr("value_ppwaerid", value_id + 1);
$("select[name='PSF_OpenSpecifications']").last().attr("value_selSpec", value_id + 1);
+ $("p[name='PSF_OpenSpecificationsspan']").last().attr("value_selspecspan", value_id + 1);
+ $("p[name='PSF_OpenWidthspan']").last().attr("value_openwidthspan", value_id + 1);
$("select[name='PSF_PrintedColorRear']").last().attr("value_ppwaerid", value_id + 1);
+ $("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);
$("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);
$("select[name='selPlateType']").last().attr("value_selwaerid", value_id + 1);
@@ -553,6 +582,8 @@
$("input[name='PSF_PaperId3']").last().attr("value_PpWaerId", value_id + 1);
// $("select[name='PSF_OpenSpecifications']").last().val("灏忓叏寮�");
+ //$("p[name='PSF_OpenSpecificationsspan']").last().text("寮�鏁�");
+ //$("p[name='PSF_OpenWidthspan']").last().text("闀垮害(mm)");
$("select[name='PSF_OpenSpecifications']").last().change();
$("select[name='PSF_PrintedColorRear']").last().change();
@@ -562,6 +593,10 @@
$("select[name='selPlateType']").last().val("鏈巶CTP");
$("select[name='selPlateType']").last().change();
+ $("select[name='PSF_OpenSpecifications']").last().val("8寮�");
+ $("select[name='PSF_OpenSpecifications']").last().change();
+ $("input[name='CTPSpecName']").last().val("395*460");
+ $("select[name='PSF_PressesDesk']").last().change();
// $("select[name='PSF_Component']").last().val("鍐呴〉");
$("input[name='PSF_PNum']").last().val("");
@@ -570,9 +605,9 @@
$("input[name='PSF_PrintedCount']").last().val("");
$("input[name='PSF_PrintedPositive']").last().val("");
$("input[name='PSF_LastNum']").last().last().val("");
- $("input[name='CTPSpecName']").last().val("");
+ // $("input[name='CTPSpecName']").last().val("");
$("input[name='CTPCount']").last().last().val("");
-
+
});
$(".CutForums").click(function () {
@@ -687,6 +722,84 @@
}
});
+ $("select[name='PSF_PressesDesk']").live("change", function () {
+ var value_SelWaerId = $(this).attr("value_selspec");
+ 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");
+ $("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();
+ $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+
+ }
+ 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");
+ $("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();
+ $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+ }
+ 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");
+ $("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();
+ $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+ }
+ 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");
+ $("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();
+ $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+ }
+ 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");
+ $("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();
+ $("input[name='PSF_OpenWidthName'][value_ppwaerid='" + value_SelWaerId + "']").val("755");
+
+ $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").hide();
+ $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+ $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+ $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+ $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").show();
+
+
+ }
+
+
+ });
+
+
$("select[name='PSF_PrintedColorRear']").live("change", function () {
var value_SelWaerId = $(this).attr("value_ppwaerid");
if ($(this).val() == "0鑹�") {
@@ -726,6 +839,17 @@
$("select[name='selPlateType']").each(function (ii, vv) {
$(vv).change();
});
+
+ $("select[name='PSF_OpenSpecifications']").each(function (ii, vv) {
+ var keyid = "<%=keyid %>";
+ if (keyid != "") {
+
+ } else {
+ $(vv).val("8寮�");
+
+ }
+ });
+
$("select[name='PSF_OpenSpecifications']").each(function (ii, vv) {
var keyid = "<%=keyid %>";
if (keyid != "") {
@@ -734,6 +858,40 @@
$(vv).change();
}
});
+
+ $("select[name='PSF_PressesDesk']").each(function (ii, vv) {
+ var keyid = "<%=keyid %>";
+ if (keyid != "") {
+ var value_SelWaerId = $(this).attr("value_selspec");
+ if ($(vv).val().indexOf('杞浆') >= 0) {
+
+ $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").hide();
+
+ $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").hide();
+ $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+ $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+ $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+ $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").show();
+
+
+ }
+ }
+ });
+
+
+
+ $("input[name='CTPSpecName']").each(function (ii, vv) {
+ var keyid = "<%=keyid %>";
+
+ if (keyid != "") {
+
+ } else {
+ $(vv).val("395*460");
+ }
+ });
+
+
+
$(function () {
$(".FromWarehouse").click(function () {
@@ -753,6 +911,49 @@
});
});
+
+ $(".xialap").hover(function () {
+ $(this).find(".xialapb").show();
+ }, function () {
+ $(this).find(".xialapb").hide();
+ });
+
+ $(".xialapr").hover(function () {
+ $(this).find(".xialapb").show();
+ $(this).removeClass("xialapr").addClass("xialaprh");
+ }, function () {
+ $(this).removeClass("xialaprh").addClass("xialapr");
+ $(this).find(".xialapb").hide();
+ });
+
+ $(".xialapr").click(function () {
+ $(this).parent().parent().find("input").val($(this).text());
+ $(".xialapb").hide();
+ });
+
+
+
+
+
+ $(".xialapp").hover(function () {
+ $(this).find(".xialapbp").show();
+ }, function () {
+ $(this).find(".xialapbp").hide();
+ });
+
+ $(".xialaprp").hover(function () {
+ $(this).find(".xialapbp").show();
+ $(this).removeClass("xialaprp").addClass("xialaprhp");
+ }, function () {
+ $(this).removeClass("xialaprhp").addClass("xialaprp");
+ $(this).find(".xialapbp").hide();
+ });
+
+ $(".xialaprp").click(function () {
+ $(this).parent().parent().find("input").val($(this).text());
+ $(".xialapbp").hide();
+ });
+
});
function CorrectText() {
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
index c4fbc6d..1c2f997 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
@@ -36,6 +36,7 @@
public string printCount = "";
public string[] Width = new string[7];
public string[] Lenth = new string[7];
+ public string xialapr = "";
//鍒濆鍖�
public AgSpecialOrderEdit()
{
@@ -81,6 +82,12 @@
{
PressesDeskHtml += "<option value='" + item.ParName + "'>" + item.ParName + "</option>";
}
+ }
+ var sss = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "鐗堟潗瑙勬牸");
+ foreach (var eC_MemberDictionary in sss)
+ {
+ xialapr += " <div class=\"xialaprp\">" + eC_MemberDictionary.ParName + "</div>";
+
}
if (m_EC_MemberDictionaryList_o != null && m_EC_MemberDictionaryList_o.Count > 0)
{
@@ -365,6 +372,7 @@
string[] PSF_BigPaperCount = Request["PSF_BigPaperCount"].ToString2().Split(',');
string[] PSF_OpenSpecifications = Request["PSF_OpenSpecifications"].ToString2().Split(',');
string[] PSF_OpenWidth = Request["PSF_OpenWidth"].ToString2().Split(',');
+ string[] PSF_OpenWidthName = Request["PSF_OpenWidthName"].ToString2().Split(',');
string[] PSF_OpenLength = Request["PSF_OpenLength"].ToString2().Split(',');
string[] selPlateType = Request["selPlateType"].ToString2().Split(',');
@@ -484,16 +492,30 @@
//}
m_EC_SpecialForums.PSF_BigPaperCount = 0;
m_EC_SpecialForums.PSF_OpenSpecifications = PSF_OpenSpecifications[i].ToString2().Replace("锛�+-+锛�", ",");
-
- if (PSF_OpenWidth[i].ToInt32() == null)
+ if (PSF_PressesDesk[i].IndexOf("杞浆")>=0)
{
- m_EC_SpecialForums.PSF_OpenWidth = 0;
+ if (PSF_OpenWidthName[i].ToInt32() == null)
+ {
+ m_EC_SpecialForums.PSF_OpenWidth = 0;
+ }
+ else
+ {
+ m_EC_SpecialForums.PSF_OpenWidth = PSF_OpenWidthName[i].ToInt32();
+ }
}
else
{
- m_EC_SpecialForums.PSF_OpenWidth = PSF_OpenWidth[i].ToInt32();
+ if (PSF_OpenWidth[i].ToInt32() == null)
+ {
+ m_EC_SpecialForums.PSF_OpenWidth = 0;
+ }
+ else
+ {
+ m_EC_SpecialForums.PSF_OpenWidth = PSF_OpenWidth[i].ToInt32();
+ }
}
+
if (PSF_OpenLength[i].ToInt32() == null)
{
m_EC_SpecialForums.PSF_OpenLength = 0;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.designer.cs
index c4d18e0..a4f0397 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.business {
-
-
- public partial class AgSpecialOrderEdit {
-
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class AgSpecialOrderEdit
+ {
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// FormCon 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm FormCon;
-
+
/// <summary>
/// spanSpecialNum 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSpecialNum;
-
+
/// <summary>
/// spanSpecialExigency 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSpecialExigency;
-
+
/// <summary>
/// spanSpecialTime 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSpecialTime;
-
+
/// <summary>
/// spanSpecialOprator 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSpecialOprator;
-
+
/// <summary>
/// spanOrderNum 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderNum;
-
+
/// <summary>
/// spanOrderType 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderType;
-
+
/// <summary>
/// spanOrderTitle 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderTitle;
-
+
/// <summary>
/// txtDeliveryTime 鎺т欢銆�
/// </summary>
@@ -101,7 +103,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtDeliveryTime;
-
+
/// <summary>
/// spanOrderCustormName 鎺т欢銆�
/// </summary>
@@ -110,7 +112,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderCustormName;
-
+
/// <summary>
/// spanOrderCustormLevel 鎺т欢銆�
/// </summary>
@@ -119,7 +121,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderCustormLevel;
-
+
/// <summary>
/// spanOrderCustormPeople 鎺т欢銆�
/// </summary>
@@ -128,7 +130,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderCustormPeople;
-
+
/// <summary>
/// spanOrderCustormPhone 鎺т欢銆�
/// </summary>
@@ -137,7 +139,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderCustormPhone;
-
+
/// <summary>
/// spanOrderBusinessManage 鎺т欢銆�
/// </summary>
@@ -146,7 +148,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderBusinessManage;
-
+
/// <summary>
/// spanOrderCustormManage 鎺т欢銆�
/// </summary>
@@ -155,7 +157,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderCustormManage;
-
+
/// <summary>
/// spanOrderName 鎺т欢銆�
/// </summary>
@@ -164,7 +166,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderName;
-
+
/// <summary>
/// spanOrderPrintNum 鎺т欢銆�
/// </summary>
@@ -173,7 +175,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderPrintNum;
-
+
/// <summary>
/// spanOrderPrintDemand 鎺т欢銆�
/// </summary>
@@ -182,7 +184,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderPrintDemand;
-
+
/// <summary>
/// spanOrderAfterWorksDemand 鎺т欢銆�
/// </summary>
@@ -191,7 +193,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderAfterWorksDemand;
-
+
/// <summary>
/// spanOrderDeliveryModeName 鎺т欢銆�
/// </summary>
@@ -200,7 +202,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderDeliveryModeName;
-
+
/// <summary>
/// spanOrderBillModeName 鎺т欢銆�
/// </summary>
@@ -209,7 +211,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderBillModeName;
-
+
/// <summary>
/// spanOrderRemarks 鎺т欢銆�
/// </summary>
@@ -218,7 +220,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderRemarks;
-
+
/// <summary>
/// RepClientList 鎺т欢銆�
/// </summary>
@@ -227,7 +229,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater RepClientList;
-
+
/// <summary>
/// txtPSO_Work 鎺т欢銆�
/// </summary>
@@ -236,7 +238,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTextArea txtPSO_Work;
-
+
/// <summary>
/// txtPSO_Remarks 鎺т欢銆�
/// </summary>
@@ -245,7 +247,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTextArea txtPSO_Remarks;
-
+
/// <summary>
/// btn_submit 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx
index a9afb75..49a46d0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx
@@ -46,7 +46,19 @@
}
//鍒犻櫎
function onDeles(orderid) {
- top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookPrintDetail.aspx?orderid=" + orderid, Title: "鎵归噺鎵撳嵃閫佽揣鍗�", Width: 1000, Height: 900 });
+ var keyid = "";
+ var num = 0;
+ $(".SelectCheck:checked").each(function (ii, vv) {
+ keyid = keyid + "," + $(vv).attr("value_kid");
+ num++;
+ });
+ if (num == 0) {
+ alertMsg("鏈�変腑浠讳綍瀛︽牎");
+ return;
+ }
+ top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookPrintDetail.aspx?orderid=" + keyid, Title: "鎵归噺鎵撳嵃閫佽揣鍗�", Width: 1000, Height: 900 });
+
+
}
//鎵归噺鍒犻櫎
@@ -115,6 +127,7 @@
<HeaderTemplate>
<table class="tableStyle">
<tr>
+ <th width="25"></th>
<th width="30" style="text-align: center">
缂栧彿
</th>
@@ -131,7 +144,9 @@
</HeaderTemplate>
<ItemTemplate>
<tr>
-
+ <td>
+ <input type="checkbox" class="SelectCheck" value_kid="<%#Eval("id")%>" />
+ </td>
<td style="text-align: center">
<%#Container.ItemIndex + 1%>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx.cs
index 00558c4..c1fe649 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx.cs
@@ -97,7 +97,7 @@
{
//濡傛灉鏄壒閲忔墦鍗�
string orderIdStr = Request["orderId"];
- this.hideOrderId.Value = orderIdStr;
+
//濡傛灉鏄彧鎵撳嵃涓�寮�
string PlanOrderidStr = Request["PlanOrderid"];
@@ -106,9 +106,11 @@
var coreCmsPlanOrders = new List<CoreCmsPlanOrder>();
if (!string.IsNullOrEmpty(orderIdStr))
{
- var ssss = bll_CoreCmsPlanOrderBLL.GetModelByorderid(orderIdStr.ToInt32().Value);
+ orderIdStr = orderIdStr.Substring(1);
+ this.hideOrderId.Value = orderIdStr;
+ var ssss = bll_CoreCmsPlanOrderBLL.GetModelByids(orderIdStr);
coreCmsPlanOrders = ssss.ToList();
- orderkeyid = orderIdStr.ToInt32().Value;
+ orderkeyid = coreCmsPlanOrders[0].orderkeyid.Value;
}
else if (!string.IsNullOrEmpty(PlanOrderidStr))
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index f3a22ea..f93c303 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -9,7 +9,7 @@
<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=87 type="text/javascript"></script>
+ <script src="../../js/Inquiry/Inquiry.js?v=89 type="text/javascript"></script>
<script src="../../js/business/Order.js?v=36" type="text/javascript"></script>
<!--鍓嶅彴椤甸潰end-->
<script type="text/javascript" language="javascript">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderList.aspx.cs
index 0c3f059..4e910a5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderList.aspx.cs
@@ -29,6 +29,7 @@
//WorkBookTypeBLL _WorkBookTypeBLL = new WorkBookTypeBLL();
CoreCmsPlanOrderItemBLL _coreCmsPlanOrderItemBLL = new CoreCmsPlanOrderItemBLL();
EC_OrderPrintParameterBLL _OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
+ OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
public string orderkeyid = "";
protected void Page_Load(object sender, EventArgs e)
@@ -198,6 +199,7 @@
return;
}
var lie = new List<JiHuaOrder>();
+ var jiHuaOrderDetails = new List<JiHuaOrderDetail>();
using (var fileStream = file.InputStream)
{
// 浣跨敤HSSFWorkbook鎵撳紑.xls鏍煎紡鐨勬枃浠�
@@ -206,10 +208,41 @@
// 鑾峰彇绗竴涓伐浣滆〃
ISheet sheet = workbook.GetSheetAt(0);
- // 杩唬宸ヤ綔琛ㄤ腑鐨勬墍鏈夎
- for (int i = 1; i <= sheet.LastRowNum; i++)
+
+ //鑾峰彇琛ㄥご浣滀笟鏈悕绉�
+ for (int i = 0; i < 1; i++)
+ {
+ IRow row = sheet.GetRow(i);
+ int j = 5;
+ while (true)
+ {
+ var jiHuaOrderDetail = new JiHuaOrderDetail();
+
+ ICell cell1 = row.GetCell(j);
+ if (cell1 == null)
+ {
+ break;
+ }
+ jiHuaOrderDetail.name = getcellvalue(cell1);
+ if (string.IsNullOrEmpty(jiHuaOrderDetail.name))
+ {
+ break;
+ }
+ j += 1;
+ jiHuaOrderDetails.Add(jiHuaOrderDetail);
+ }
+ }
+
+
+
+
+ // 杩唬宸ヤ綔琛ㄤ腑鐨勬墍鏈夎
+ for (int i = 1; i <= sheet.LastRowNum; i++)
{
var hang = new JiHuaOrder();
+ var jiHuaOrderDetails1 = new List<JiHuaOrderDetail>();
+
+
IRow row = sheet.GetRow(i);
if (row == null) continue; // 璺宠繃绌鸿
@@ -217,116 +250,95 @@
ICell cell0 = row.GetCell(0);
if (cell0 == null)
{
- JavaScript.MessageBox("绗�" + (i + 1) + "甯備笉鑳戒负绌�", this);
+ JavaScript.MessageBox("绗�" + (i + 1) + "鐗囧尯涓嶈兘涓虹┖", this);
return;
}
- hang.shi = getcellvalue(cell0);
+ hang.pianqu = getcellvalue(cell0);
ICell cell1 = row.GetCell(1);
if (cell1 == null)
{
- JavaScript.MessageBox("绗�" + (i + 1) + "鍖哄幙涓嶈兘涓虹┖", this);
+ JavaScript.MessageBox("绗�" + (i + 1) + "瀛︽牎涓嶈兘涓虹┖", this);
return;
}
- hang.quxian = getcellvalue(cell1);
+ hang.shipAddress = getcellvalue(cell1);
ICell cell2 = row.GetCell(2);
if (cell2 == null)
{
- JavaScript.MessageBox("绗�" + (i + 1) + "鐗囧尯涓嶈兘涓虹┖", this);
+ JavaScript.MessageBox("绗�" + (i + 1) + "鑱旂郴浜轰笉鑳戒负绌�", this);
return;
}
- hang.pianqu = getcellvalue(cell2);
+ hang.shipName = getcellvalue(cell2);
ICell cell3 = row.GetCell(3);
if (cell3 == null)
{
- JavaScript.MessageBox("绗�" + (i + 1) + "瀛︽牎涓嶈兘涓虹┖", this);
+ JavaScript.MessageBox("绗�" + (i + 1) + "鑱旂郴鐢佃瘽涓嶈兘涓虹┖", this);
return;
}
- hang.shipAddress = getcellvalue(cell3);
+ hang.shipMobile = getcellvalue(cell3);
ICell cell4 = row.GetCell(4);
if (cell4 == null)
{
- JavaScript.MessageBox("绗�" + (i + 1) + "鑱旂郴浜轰笉鑳戒负绌�", this);
- return;
- }
- hang.shipName = getcellvalue(cell4);
-
- ICell cell5 = row.GetCell(5);
- if (cell5 == null)
- {
- JavaScript.MessageBox("绗�" + (i + 1) + "鑱旂郴鐢佃瘽涓嶈兘涓虹┖", this);
- return;
- }
- hang.shipMobile = getcellvalue(cell5);
-
- ICell cell6 = row.GetCell(6);
- if (cell6 == null)
- {
JavaScript.MessageBox("绗�" + (i + 1) + "鏀惰揣鍦板潃涓嶈兘涓虹┖", this);
return;
}
- hang.shouhuoAddress = getcellvalue(cell6);
+ hang.shouhuoAddress = getcellvalue(cell4);
- ICell cell7 = row.GetCell(7);
- if (cell7 == null)
+
+
+ for(int j=0; j< jiHuaOrderDetails.Count; j++)
{
- JavaScript.MessageBox("绗�" + (i + 1) + "鍟嗗搧鍚嶇О涓嶈兘涓虹┖", this);
- return ;
- }
- hang.name = getcellvalue(cell7);
-
+ var jiHuaOrderDetail = new JiHuaOrderDetail();
- ICell cell8 = row.GetCell(8);
- if (cell8 == null)
- {
- JavaScript.MessageBox("绗�" + (i + 1) + "瑙勬牸涓嶈兘涓虹┖", this);
- return ;
- }
- hang.specification = getcellvalue(cell8);
-
+ jiHuaOrderDetail.name = jiHuaOrderDetails[j].name;
- //ICell cell9 = row.GetCell(9);
- //if (cell9 == null)
+ ICell cell9 = row.GetCell(j+5);
+ if (cell9 == null)
+ {
+ JavaScript.MessageBox("绗�" + (i + 1) + "鏁伴噺涓嶈兘涓虹┖", this);
+ return;
+ }
+ int aaa = 0;
+ int.TryParse(getcellvalue(cell9), out aaa);
+ jiHuaOrderDetail.nums = aaa;
+
+ jiHuaOrderDetails1.Add(jiHuaOrderDetail);
+ }
+
+
+
+ //ICell cell7 = row.GetCell(7);
+ //if (cell7 == null)
//{
- // JavaScript.MessageBox("绗�" + (i + 1) + "鍗曚环锛堝厓锛変笉鑳戒负绌�", this);
+ // JavaScript.MessageBox("绗�" + (i + 1) + "鍟嗗搧鍚嶇О涓嶈兘涓虹┖", this);
// return ;
//}
- //hang.price = decimal.Parse(getcellvalue(cell9));
+ //hang.name = getcellvalue(cell7);
- ICell cell9 = row.GetCell(9);
- if (cell9 == null)
- {
- JavaScript.MessageBox("绗�" + (i + 1) + "鏁伴噺涓嶈兘涓虹┖", this);
- return ;
- }
- int aaa = 0;
- int.TryParse(getcellvalue(cell9), out aaa);
- hang.nums = aaa;
+ //ICell cell8 = row.GetCell(8);
+ //if (cell8 == null)
+ //{
+ // JavaScript.MessageBox("绗�" + (i + 1) + "瑙勬牸涓嶈兘涓虹┖", this);
+ // return ;
+ //}
+ //hang.specification = getcellvalue(cell8);
+
+
+
+
+
+ hang.jiHuaOrderDetails = jiHuaOrderDetails1;
lie.Add(hang);
}
}
-
-
if (lie != null && lie.Count > 0)
{
- if (string.IsNullOrEmpty(lie[0].shi))
- {
- JavaScript.MessageBox("绗�" + 1 + "甯備笉鑳戒负绌�", this);
- return;
- }
- if (string.IsNullOrEmpty(lie[0].quxian))
- {
- JavaScript.MessageBox("绗�" + 1 + "鍖哄幙涓嶈兘涓虹┖", this);
- return;
- }
-
-
for (int i = 0; i < lie.Count; i++)
{
if (!string.IsNullOrEmpty(lie[i].shipAddress))
@@ -337,26 +349,77 @@
return;
}
-
+
}
- if (string.IsNullOrEmpty(lie[i].name))
+
+ for(int j = 0;j< lie[i].jiHuaOrderDetails.Count; j++)
{
- JavaScript.MessageBox("绗�" + (i + 1) + "鍟嗗搧鍚嶇О涓嶈兘涓虹┖", this);
- return;
+ if (string.IsNullOrEmpty(lie[i].jiHuaOrderDetails[j].name))
+ {
+ JavaScript.MessageBox("绗�" + (i + 1) + "鍟嗗搧鍚嶇О涓嶈兘涓虹┖", this);
+ return;
+ }
}
- if (string.IsNullOrEmpty(lie[i].specification))
- {
- JavaScript.MessageBox("绗�" + (i + 1) + "瑙勬牸涓嶈兘涓虹┖", this);
- return;
- }
+
+
+
+ //if (string.IsNullOrEmpty(lie[i].specification))
+ //{
+ // JavaScript.MessageBox("绗�" + (i + 1) + "瑙勬牸涓嶈兘涓虹┖", this);
+ // return;
+ //}
}
}
+
+
+
+
+
+
+
+
+
+
var orderid = HideKeyid.Value;
var sys_CitySites = bll_Sys_CitySiteBLL.SelectAllModel(null).ToList();
var eC_OrderPrintParameter = _OrderPrintParameterBLL.GetModel(orderid.ToInt32().Value); ;
InquiryCommonModel model = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
+
+
+ var eC_OrderBasic = _eC_OrderBasicBLL.SelectModelById(orderid.ToInt32().Value);
+ var Province = "";
+ var City = "";
+ var County = "";
+ int Provinceid = 0;
+ int Cityid = 0;
+ int Countyid = 0;
+ if (eC_OrderBasic != null)
+ {
+
+ var customerCommunications = bll_OA_CorporateClientsBLL.GetModel_CustomerCommunications(eC_OrderBasic.BuyerId);
+ Province = customerCommunications.Province;
+ City = customerCommunications.City;
+ County = customerCommunications.County;
+
+ var sys_CitySite = bll_Sys_CitySiteBLL.GetModelByName(Province);
+ if (sys_CitySite != null)
+ {
+ Provinceid = sys_CitySite.Keyid;
+ var sys_CitySite1 = bll_Sys_CitySiteBLL.SelectAllNextModel(sys_CitySite.Keyid, 0, 2).FirstOrDefault(x => x.Name == City);
+ if (sys_CitySite1 != null)
+ {
+ Cityid = sys_CitySite1.Keyid;
+ var sys_CitySite2 = bll_Sys_CitySiteBLL.SelectAllNextModel(sys_CitySite.Keyid, sys_CitySite1.Keyid, 3).FirstOrDefault(x => x.Name == County);
+ if (sys_CitySite2 != null)
+ {
+ Countyid = sys_CitySite2.Keyid;
+ }
+ }
+ }
+ }
+
using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
new TransactionOptions
@@ -370,72 +433,81 @@
string pianqu = "";
if (lie != null && lie.Count > 0)
{
- var order = new List<JiHuaOrder>();
- for (int i = 0; i < lie.Count; i++)
+
+ for (int j = 0; j < lie.Count; j++)
{
- if (i == 0)
+ var coreCmsPlanOrder = _PlanOrderBLL.GetModelByorderid(HideKeyid.Value.ToInt32().Value).Where(x => x.shipAddress == lie[j].shipAddress && x.shouhuoAddress == lie[j].shouhuoAddress).FirstOrDefault();
+ if (coreCmsPlanOrder == null)
{
+ CoreCmsPlanOrder order = new CoreCmsPlanOrder();
+ order.status = 1;
+ order.shipMobile = lie[j].shipMobile;
+ order.shipAddress = lie[j].shipAddress;
+ order.shipName = lie[j].shipName;
+ order.shouhuoAddress = lie[j].shouhuoAddress;
+ order.userMobile = lie[j].shipMobile;
+ order.createBy = CurrentUser.ShortName;
+ order.createTime = DateTime.Now;
+ order.upDataBy = CurrentUser.ShortName;
+ order.upDataTime = DateTime.Now;
+ order.isdelete = false;
+ order.orderkeyid = HideKeyid.Value.ToInt32();
+ order.FirmId = CurrentUser.MemberId;
+ order.sheng = Province;
+ order.shi = City;
+ order.quxian = County;
+ order.shengId = Provinceid;
+ order.shiId = Cityid;
+ order.quxianId = Countyid;
- order.Add(lie[i]);
- pianqu = lie[i].pianqu;
- }
- else
- {
- if (string.IsNullOrEmpty(lie[i].shipAddress))
+ order.pianqu = lie[j].pianqu;
+
+ var jiHuaOrders = lie[j].jiHuaOrderDetails;
+ decimal orderAmount = 0;
+ var cmsPlanOrderItems = new List<CoreCmsPlanOrderItem>();
+ for (int i = 0; i < jiHuaOrders.Count; i++)
{
- order.Add(lie[i]);
- }
- else
- {
- //淇濆瓨璁㈠崟
- //jm = await _coreCmsPlanOrderServices.ToAddJiHua(order, _user.ID, _user.Name);
- //if (jm.code == 1)
- //{
- // return jm;
- //}
- string res = saveorder(order,model.InquiryWorkBookList,sys_CitySites);
- if (!string.IsNullOrEmpty(res))
+ var workbook = model.InquiryWorkBookList.FirstOrDefault(x => (x.WorkBookSizeTxt + x.WorkBookNameTxt ) == jiHuaOrders[i].name || (x.WorkBookNameTxt + x.WorkBookSizeTxt ) == jiHuaOrders[i].name);
+ if (workbook == null)
{
- JavaScript.MessageBox(res, this);
+ JavaScript.MessageBox(jiHuaOrders[i].name + "娌℃壘鍒板崟浠�", this);
return;
}
- order = new List<JiHuaOrder>();
- if (string.IsNullOrEmpty(lie[i].shi))
- {
- lie[i].shi = lie[0].shi;
- }
- if (string.IsNullOrEmpty(lie[i].quxian))
- {
- lie[i].quxian = lie[0].quxian;
- }
- if (string.IsNullOrEmpty(lie[i].pianqu))
- {
- lie[i].pianqu = pianqu;
- }
- else
- {
- pianqu = lie[i].pianqu;
- }
- order.Add(lie[i]);
+ var item = new CoreCmsPlanOrderItem();
+ item.orderId = 0;
+ item.name = workbook.WorkBookNameTxt;
+ item.specification = workbook.WorkBookSizeTxt;
+ item.price = workbook.WorkBookPrice.ToDecimal2().Value;//jiHuaOrders[i].price;
+ item.fengmian = string.IsNullOrEmpty(workbook.fengmian) ? "" : workbook.fengmian;
+ item.neiye = string.IsNullOrEmpty(workbook.neiye) ? "" : workbook.neiye;
+ item.nums = jiHuaOrders[i].nums; ;
+ item.amount = item.price * (decimal)jiHuaOrders[i].nums;
+ item.createBy = CurrentUser.ShortName;
+ item.createTime = DateTime.Now;
+ item.upDataBy = CurrentUser.ShortName;
+ item.upDataTime = DateTime.Now;
+ item.isdelete = false;
+ item.isOld = true;
+ cmsPlanOrderItems.Add(item);
+ orderAmount += item.amount;
+ }
+
+ order.orderAmount = orderAmount;
+ order.oldOrderAmount = orderAmount;
+ order.keYongAmount = 0;
+ order.huaFeiAmount = 0;
+
+
+ var id = _PlanOrderBLL.InsertModelIden(order);
+ var ssss = false;
+ foreach (var cmsPlanOrderItem in cmsPlanOrderItems)
+ {
+ cmsPlanOrderItem.orderId = id;
+ ssss = _PlanOrderBLL.insertModelOrderItem(cmsPlanOrderItem);
}
}
- if (i == lie.Count - 1)
- {
- //淇濆瓨璁㈠崟
- //jm = await _coreCmsPlanOrderServices.ToAddJiHua(order, _user.ID, _user.Name);
- //if (jm.code == 1)
- //{
- // return jm;
- //}
- string res = saveorder(order, model.InquiryWorkBookList, sys_CitySites);
- if (!string.IsNullOrEmpty(res))
- {
- JavaScript.MessageBox(res, this);
- return;
- }
- }
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/WorkBook.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/WorkBook.aspx
index 075e153..2f7bf47 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/WorkBook.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/WorkBook.aspx
@@ -60,7 +60,7 @@
<div id="WorkBooka1">
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�</th>
+ <th colspan="10" align="left">1</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -169,7 +169,7 @@
<div id="WorkBooka2" style="display:none;">
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�2</th>
+ <th colspan="10" align="left">2</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -278,7 +278,7 @@
<div id="WorkBooka3" style="display:none;">
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�3</th>
+ <th colspan="10" align="left">3</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -385,7 +385,7 @@
<div id="WorkBooka4" style="display:none;">
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�4</th>
+ <th colspan="10" align="left">4</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -492,7 +492,7 @@
<div id="WorkBooka5" style="display:none;">
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�5</th>
+ <th colspan="10" align="left">5</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -599,7 +599,7 @@
<div id="WorkBooka6" style="display:none;">
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�6</th>
+ <th colspan="10" align="left">6</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -706,7 +706,7 @@
<div id="WorkBooka7" style="display:none;">
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�7</th>
+ <th colspan="10" align="left">7</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -813,7 +813,7 @@
<div id="WorkBooka8" style="display:none;">
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�8</th>
+ <th colspan="10" align="left">8</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -920,7 +920,7 @@
<div id="WorkBooka9" style="display:none;" >
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�9</th>
+ <th colspan="10" align="left">9</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -1027,7 +1027,7 @@
<div id="WorkBooka10" style="display:none;" >
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�10</th>
+ <th colspan="10" align="left">10</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -1134,7 +1134,7 @@
<div id="WorkBooka11" style="display:none;" >
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�11</th>
+ <th colspan="10" align="left">11</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -1241,7 +1241,7 @@
<div id="WorkBooka12" style="display:none;" >
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�12</th>
+ <th colspan="10" align="left">12</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -1348,7 +1348,7 @@
<div id="WorkBooka13" style="display:none;" >
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�13</th>
+ <th colspan="10" align="left">13</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -1455,7 +1455,7 @@
<div id="WorkBooka14" style="display:none;" >
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�14</th>
+ <th colspan="10" align="left">14</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -1562,7 +1562,7 @@
<div id="WorkBooka15" style="display:none;" >
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�15</th>
+ <th colspan="10" align="left">15</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -1669,7 +1669,7 @@
<div id="WorkBooka16" style="display:none;" >
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�16</th>
+ <th colspan="10" align="left">16</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -1776,7 +1776,7 @@
<div id="WorkBooka17" style="display:none;" >
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�17</th>
+ <th colspan="10" align="left">17</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -1883,7 +1883,7 @@
<div id="WorkBooka18" style="display:none;" >
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�18</th>
+ <th colspan="10" align="left">18</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -1990,7 +1990,7 @@
<div id="WorkBooka19" style="display:none;" >
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�19</th>
+ <th colspan="10" align="left">19</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -2097,7 +2097,7 @@
<div id="WorkBooka20" style="display:none;" >
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�20</th>
+ <th colspan="10" align="left">20</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -2204,7 +2204,7 @@
<div id="WorkBooka21" style="display:none;" >
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�21</th>
+ <th colspan="10" align="left">21</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -2311,7 +2311,7 @@
<div id="WorkBooka22" style="display:none;" >
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�22</th>
+ <th colspan="10" align="left">22</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -2418,7 +2418,7 @@
<div id="WorkBooka23" style="display:none;" >
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�23</th>
+ <th colspan="10" align="left">23</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -2525,7 +2525,7 @@
<div id="WorkBooka24" style="display:none;" >
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�24</th>
+ <th colspan="10" align="left">24</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -2632,7 +2632,7 @@
<div id="WorkBooka25" style="display:none;" >
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�25</th>
+ <th colspan="10" align="left">25</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -2739,7 +2739,7 @@
<div id="WorkBooka26" style="display:none;" >
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�26</th>
+ <th colspan="10" align="left">26</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -2846,7 +2846,7 @@
<div id="WorkBooka27" style="display:none;" >
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�27</th>
+ <th colspan="10" align="left">27</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -2953,7 +2953,7 @@
<div id="WorkBooka28" style="display:none;" >
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�28</th>
+ <th colspan="10" align="left">28</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -3060,7 +3060,7 @@
<div id="WorkBooka29" style="display:none;" >
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�29</th>
+ <th colspan="10" align="left">29</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -3167,7 +3167,7 @@
<div id="WorkBooka30" style="display:none;" >
<table class="table2" style="margin-top: 0px;">
<tr>
- <th colspan="10" align="left">浣滀笟鏈�30</th>
+ <th colspan="10" align="left">30</th>
</tr>
<tr>
<td align="left">鍝佸悕:</td>
@@ -3279,7 +3279,7 @@
<tr>
<td align="left">
<label class="Btnb">
- <input type="button" id="WorkBookAdd" value="浣滀笟鏈�2" class="Btn add nadd" onclick="WorkBookAddClick();" /></label>
+ <input type="button" id="WorkBookAdd" value=" 2 " class="Btn add nadd" onclick="WorkBookAddClick();" /></label>
<label class="Btnb">
<input type="button" value="鍒犻櫎" id="WorkBookDel" class="Btn add" onclick="WorkBookDelClick();" /></label>
<input type="hidden" id="hidWorkBookPageNum" name="hidWorkBookPageNum" value="1" maxValue="30" minValue="1"/>
diff --git a/CY_ECommercePlatform/CY.WebForm/Styles/base.css b/CY_ECommercePlatform/CY.WebForm/Styles/base.css
index 3ac261a..6bf89f9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Styles/base.css
+++ b/CY_ECommercePlatform/CY.WebForm/Styles/base.css
@@ -114,6 +114,54 @@
.xialap .xialapb .xialapr{width:82px; height: 20px;_height: 18px; line-height: 20px;_line-height: 18px;cursor:pointer;}
.xialap .xialapb .xialaprh{width:82px;height: 20px;_height: 18px; line-height: 20px;_line-height: 18px;cursor:pointer;background-color:#3399ff;color:White}
+
+/*涓嬫媺妗�*/
+.xialap{text-align:center;position: relative; width:80px}
+.xialap .xialapb{border: solid 1px #b2b2b2; background-color: White; position:absolute; z-index:10;_top:15px; _left:0px;left:0px;top:18px;display:none;text-align:left;}
+.xialap .xialapb .xialapr{width:82px; height: 20px;_height: 18px; line-height: 20px;_line-height: 18px;cursor:pointer;}
+.xialap .xialapb .xialaprh{width:82px;height: 20px;_height: 18px; line-height: 20px;_line-height: 18px;cursor:pointer;background-color:#3399ff;color:White}
+
+/*涓嬫媺妗�*/
+.xialapp {
+ text-align: center;
+ position: relative;
+ width: 80px
+}
+
+ .xialapp .xialapbp {
+ border: solid 1px #b2b2b2;
+ background-color: White;
+ position: absolute;
+ z-index: 10;
+ _top: 15px;
+ _left: 0px;
+ left: 0px;
+ top: 18px;
+ display: none;
+ text-align: left;
+ }
+
+ .xialapp .xialapbp .xialaprp {
+ width: 82px;
+ height: 20px;
+ _height: 18px;
+ line-height: 20px;
+ _line-height: 18px;
+ cursor: pointer;
+ }
+
+ .xialapp .xialapbp .xialaprhp {
+ width: 82px;
+ height: 20px;
+ _height: 18px;
+ line-height: 20px;
+ _line-height: 18px;
+ cursor: pointer;
+ background-color: #3399ff;
+ color: White
+ }
+
+
.Btnb{border:solid 1px #ffbd76; display:inline-block;}
.Btnb .Btn{height:22px;line-height:22px;padding:0px 5px;border:0px;background:url(../../images/Common/Site_btn_bg.png) repeat-x 0px 0px;color:#d83d00;cursor:pointer;text-decoration:none; display:inline-block;}
diff --git "a/CY_ECommercePlatform/CY.WebForm/images/jihuageshi/\344\270\212\344\274\240\350\256\241\345\210\222\350\256\242\345\215\225.xlsx" "b/CY_ECommercePlatform/CY.WebForm/images/jihuageshi/\344\270\212\344\274\240\350\256\241\345\210\222\350\256\242\345\215\225.xlsx"
index b4681fe..ed87bd5 100644
--- "a/CY_ECommercePlatform/CY.WebForm/images/jihuageshi/\344\270\212\344\274\240\350\256\241\345\210\222\350\256\242\345\215\225.xlsx"
+++ "b/CY_ECommercePlatform/CY.WebForm/images/jihuageshi/\344\270\212\344\274\240\350\256\241\345\210\222\350\256\242\345\215\225.xlsx"
Binary files differ
diff --git a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
index f75347b..0f06751 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
@@ -228,14 +228,14 @@
var minValue = $("#hidWorkBookPageNum").attr("minValue");
var newValue = parseInt(hidValue) + 1;
if (newValue > maxValue) {
- alertMsg("浣滀笟鏈柊澧炰笉鑳借秴杩�30涓紒");
+ alertMsg("鏂板涓嶈兘瓒呰繃30涓紒");
return;
}
$("#WorkBooka" + newValue + "").show();
$("#hidWorkBookPageNum").val(newValue);
if (newValue != maxValue) {
var value = newValue + 1;
- $("#WorkBookAdd").val("浣滀笟鏈�" + value);
+ $("#WorkBookAdd").val(" " + value +" " );
}
$("#WorkBookNamea" + newValue + "").val((parseInt($("#WorkBookNamea" + hidValue + "").val())+1));
$("#WorkBookSizea" + newValue + "").val($("#WorkBookSizea" + hidValue + "").val());
--
Gitblit v1.9.1