CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -37,6 +37,8 @@ using CY.Model; using CY.Infrastructure.Query; using System.Transactions; using CY.Model.Inquiry; using CY.Infrastructure.Common; namespace CY.SQLDAL { @@ -728,12 +730,26 @@ } if (result != null && result.Count > 0) { _eC_OrderPrintParameterDAL = new EC_OrderPrintParameterDAL(_dataBase); foreach (EC_OrderBasic ob in result) { if (IsComplainant(ob.Keyid.Value)) { ob.IsComplainant = true; } EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterDAL.GetModel(ob.Keyid.Value); InquiryCommonModel _inquiryCommonModel = null; if (null == _eC_OrderPrintParameter) { _inquiryCommonModel = new InquiryCommonModel(); } else { _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel; } ob.PrintSizeName = _inquiryCommonModel.PrintSizeName; } } /*获取页数与返回数据条数*/ CY_ECommercePlatform/CY.WebForm/Pages/business/BackVisitNoteEdit.aspx
@@ -7,7 +7,7 @@ <title>回访</title> <uc:CMSHead ID="CMSHead1" runat="server" /> <script src="../../js/common/KeyBehaviorHook.js" type="text/javascript"></script> <script src="../../js/business/BackVisitNote.js" type="text/javascript"></script> <script src="../../js/business/BackVisitNote.js?v=1" type="text/javascript"></script> <script type="text/javascript"> $(function () { document.getElementById('spnOperator').innerHTML = '<%=Request.RequestContext.RouteData.DataTokens["currentUserName"] %>'; CY_ECommercePlatform/CY.WebForm/Pages/business/BackVisitNoteEdit.aspx.designer.cs
@@ -2,16 +2,18 @@ // <自动生成> // 此代码由工具生成。 // // 对此文件的更改可能会导致不正确的行为，并且如果 // 重新生成代码，这些更改将会丢失。 // 对此文件的更改可能导致不正确的行为，如果 // 重新生成代码，则所做更改将丢失。 // </自动生成> //------------------------------------------------------------------------------ namespace CY.WebForm.Pages.business { public partial class BackVisitNoteEdit { namespace CY.WebForm.Pages.business { public partial class BackVisitNoteEdit { /// <summary> /// Head1 控件。 /// </summary> @@ -20,7 +22,7 @@ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlHead Head1; /// <summary> /// CMSHead1 控件。 /// </summary> CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
@@ -122,7 +122,7 @@ <td class="ali03 ">客户信誉：</td> <td><select id="selCreditId" runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepDefaultStyle='true' class=" w120px"></select></td> </tr> <tr> <td class="ali03 ">中标单位：</td> <td ><select id="selBiddingcompany" runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepDefaultStyle='true' class=" w120px"></select></td> <td ><input id="txtBiddingcompany" type="text" runat="server" class="" maxlength="50" /> </td> <td class="ali03 "><asp:Button ID="Button3" Text="新增中标单位" runat="server" OnClick="btn_SubmitClientsBiddingcompany_Config" /></td> <td colspan="2" ></td> </tr> <tr> <td class="ali03 ">中标单位：</td> <td ><select id="selBiddingcompany" runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepDefaultStyle='true' class=" w200px"></select></td> <td class="ali03 "><input id="txtBiddingcompany" type="text" runat="server" class="" maxlength="50" /> </td> <td ><asp:Button ID="Button3" Text="新增中标单位" runat="server" OnClick="btn_SubmitClientsBiddingcompany_Config" /></td> <td colspan="2" ></td> </tr> <tr> <td class="ali03 ">合同金额：</td> <td><select id="selContracttype" runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepDefaultStyle='true' class=" w120px"></select></td> <td ><input id="txtContractmoney" type="text" runat="server" maxlength="50" class="float w70px" value="0" min="0" />元</td> <td class="ali03 ">到期时间：</td> <td ><select id="selExpiretype" runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepDefaultStyle='true' class=" w120px"></select></td> <td ><input id="txtExpireTime" type="text" runat="server" maxlength="50" class="date w90px" datefmt="yyyy-MM-dd" /></td> </tr> <tr id="ReceiptT_Html"> CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs
@@ -464,12 +464,15 @@ this.selSourcesInfoId.DataValueField = "Keyid"; this.selSourcesInfoId.DataTextField = "Name"; this.selSourcesInfoId.DataBind(); this.selSourcesInfoId.Value = "452"; this.selCustomerIndustriesId.DataSource = bll_Sys_DictionaryBLL.GetDataByType("客户所属行业"); this.selCustomerIndustriesId.DataValueField = "Keyid"; this.selCustomerIndustriesId.DataTextField = "Name"; this.selCustomerIndustriesId.DataBind(); this.selCustomerIndustriesId.Value = "454"; this.selCustomerTypeId.DataSource = bll_Sys_DictionaryBLL.GetDataByType("客户类型"); this.selCustomerTypeId.DataValueField = "Keyid"; this.selCustomerTypeId.DataTextField = "Name"; CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -440,7 +440,7 @@ <%--<input type="button" value="返回列表" id='btnBackList' onclick="window.location='OrderList.aspx';" />--%> <input type="button" value="返回列表" id='btnBackList' onclick="window.location='OrderList.aspx';" /> </td> </tr> <tr> CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
@@ -389,7 +389,7 @@ _inquiryCommonModel.PrintTypeId = -1; _inquiryCommonModel.PrintCount = Request["printCount"].ToString().ToInt32().Value; _inquiryCommonModel.Unit = MyConvert.ConvertToInt32(Request["ysUnit"]).Value; _inquiryCommonModel.PrintDemand = Request["printSizeName"].ToString() + "；" + Request["txtPrintDemand"].ToString(); _inquiryCommonModel.PrintDemand = /*Request["printSizeName"].ToString() + "；" +*/ Request["txtPrintDemand"].ToString(); _inquiryCommonModel.PrintSizeName = Request["printSizeName"].ToString(); } else @@ -569,7 +569,7 @@ _inquiryCommonModel.PrintTypeId = -1; _inquiryCommonModel.PrintCount = Request["printCount"].ToString().ToInt32().Value; _inquiryCommonModel.Unit = MyConvert.ConvertToInt32(Request["ysUnit"]).Value; _inquiryCommonModel.PrintDemand = Request["printSizeName"].ToString() + "；" + Request["txtPrintDemand"].ToString(); _inquiryCommonModel.PrintDemand = /*Request["printSizeName"].ToString() + "；" +*/ Request["txtPrintDemand"].ToString(); _inquiryCommonModel.PrintSizeName = Request["printSizeName"].ToString(); } else CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -396,7 +396,9 @@ deliverPrice:<%#Eval("SumPrice")%>, UnitPrice:'<%#Eval("UnitPrice") %>', sumPrice:<%#Eval("SumPrice")%>, DeliveryOrderId:'<%#Eval("DeliveryOrderId")%>', DeliveryOrderId:'<%#Eval("DeliveryOrderId")%>', yssldw: '<%#Eval("OrderExtend.PrintNum")%><%#Eval("yssldw")%>', PrintSizeName:'<%#Eval("PrintSizeName")%>' }" id='ckBox<%#Container.ItemIndex%>' id='ckBox<%#Container.ItemIndex%>' class='ckBox' /> </td> <td> CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
@@ -530,7 +530,75 @@ SetParamValue(searchParam, 20, CurrentUser.StaffId); SetParamValue(searchParam, 21, CurrentUser.TrueName); SetParamValue(searchParam, 28, this.txtSearchyjname.Value); if (!IsPostBack && !IsCallback) { if (Session["OrderList"] != null) { //先还原表单 searchParam = Session["OrderList"] as Dictionary<int, object>; if (searchParam.Keys.Count(x => x == 4)<=0) { this.txtBeginData.Value = ""; } if (searchParam.Keys.Count(x => x == 5) <= 0) { this.txtEndDate.Value = ""; } foreach (int index in searchParam.Keys) { if (index == 2) this.txtOrderId.Value = searchParam[index].ToString(); if (index == 3) this.txtCustormerName.Value = searchParam[index].ToString(); if (index == 4) this.txtBeginData.Value = searchParam[index].ToString(); if (index == 5) this.txtEndDate.Value = searchParam[index].ToString(); if (index == 6) this.selPrintTypes.Value = searchParam[index].ToString(); if (index == 7) this.selOrderTypes.Value = searchParam[index].ToString(); if (index == 8) this.selOrderStates.Value = searchParam[index].ToString(); if (index == 9) this.selPayStates.Value = searchParam[index].ToString(); if (index == 10) this.txtCreaterName.Value = searchParam[index].ToString(); if (index == 11) this.selCustormerLevels.Value = searchParam[index].ToString(); if (index == 12) this.selCustormerManager.Value = searchParam[index].ToString(); if (index == 13) this.selBusinessManager.Value = searchParam[index].ToString(); if (index == 14) this.selPayType.SelectedValue = searchParam[index].ToString(); if (index == 15) this.selReturnvisit.SelectedValue = searchParam[index].ToString(); if (index == 16) this.selAppraise.SelectedValue = searchParam[index].ToString(); if (index == 28) this.txtSearchyjname.Value = searchParam[index].ToString(); } SetParamValue(searchParam, 1, CurrentUser.MemberId); SetParamValue(searchParam, 18, (CurrentUser.StaffId > 0 ? 1 : 0)); SetParamValue(searchParam, 19, CurrentUser.TrueMemberId); SetParamValue(searchParam, 20, CurrentUser.StaffId); SetParamValue(searchParam, 21, CurrentUser.TrueName); SetParamValue(searchParam, 28, this.txtSearchyjname.Value); } } else { Session["OrderList"] = searchParam; } SearchParam = searchParam; UCPager1.AspNetPager.CurrentPageIndex = 1;//重置页数 //再次查询 AspNetPager_PageChanged(UCPager1.AspNetPager, new EventArgs()); CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx
@@ -429,8 +429,11 @@ printNum:<%#Eval("OrderExtend.PrintNum")%>, deliverPrice:<%#Eval("SumPrice")%>, sumPrice:<%#Eval("SumPrice")%>, UnitPrice:'<%#Eval("UnitPrice") %>', Kaipiaoshenqing:'<%#Eval("Kaipiaoshenqing")%>', PayState:<%#Eval("PayState")%> PayState:<%#Eval("PayState")%>, yssldw: '<%#Eval("OrderExtend.PrintNum")%><%#Eval("yssldw")%>', PrintSizeName:'<%#Eval("PrintSizeName")%>' }" id='ckBox<%#Container.ItemIndex%>' id='ckBox<%#Container.ItemIndex%>' class='ckBox' /> </td> <td class="ItemIndex"> CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx
@@ -37,7 +37,7 @@ var fillOrder = function (orderObj) { var i = -1; var newtr = document.createElement('tr'); var fillTarget = ['ordershowId', 'pdName', 'printName', 'printNum', 'UnitPrice', 'sumPrice']; var fillTarget = ['ordershowId', 'pdName', 'PrintSizeName', 'yssldw', 'UnitPrice', 'sumPrice']; while (++i < fillTarget.length) { setOrderAttr(newtr, orderObj, fillTarget[i]); } @@ -145,7 +145,7 @@ 印刷品名称 </th> <th scope="col"> 业务类别 规格 </th> <th scope="col" style='width: 100px;'> 数量 CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx
@@ -10,7 +10,7 @@ <table class="table2"> <tbody> <tr> <th>请选择印刷方式： <input type="radio" name="printMode" value='1' checked="true" />合版印刷  <input type="radio" name="printMode" value='0'/>专版印刷</th> <th>请选择印刷方式： <input type="radio" name="printMode" value='1' />合版印刷  <input type="radio" name="printMode" value='0' checked="true" />专版印刷</th> </tr> </tbody> </table> CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx
@@ -10,7 +10,7 @@ <table class="table2"> <tbody> <tr> <th>请选择印刷方式： <input type="radio" name="printMode" value='1' checked="true" />合版印刷  <input type="radio" name="printMode" value='0'/>专版印刷</th> <th>请选择印刷方式： <input type="radio" name="printMode" value='1' />合版印刷  <input type="radio" name="printMode" value='0' checked="true" />专版印刷</th> </tr> </tbody> </table> CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx
@@ -10,7 +10,7 @@ <table class="table2"> <tbody> <tr> <th>请选择印刷方式： <input type="radio" name="printMode" value='1' checked="true" id="hebanyinshua" /><label for="hebanyinshua">合版印刷</label>  <input type="radio" name="printMode" value='0' id="zhuanbanyinshua"/><label for="zhuanbanyinshua">专版印刷</label></th> <th>请选择印刷方式： <input type="radio" name="printMode" value='1'id="hebanyinshua" /><label for="hebanyinshua">合版印刷</label>  <input type="radio" name="printMode" value='0' checked="true" id="zhuanbanyinshua"/><label for="zhuanbanyinshua">专版印刷</label></th> </tr> </tbody> </table> CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx
@@ -10,7 +10,7 @@ <table class="table2"> <tbody> <tr> <th>请选择印刷方式： <input type="radio" name="printMode" value='1' checked="true" />合版印刷  <input type="radio" name="printMode" value='0'/>专版印刷</th> <th>请选择印刷方式： <input type="radio" name="printMode" value='1' />合版印刷  <input type="radio" name="printMode" value='0' checked="true" />专版印刷</th> </tr> </tbody> </table> CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx
@@ -10,7 +10,7 @@ <table class="table2"> <tbody> <tr> <th>请选择印刷方式： <input type="radio" name="printMode" value='1' checked="true" />合版印刷  <input type="radio" name="printMode" value='0'/>专版印刷</th> <th>请选择印刷方式： <input type="radio" name="printMode" value='1' />合版印刷  <input type="radio" name="printMode" value='0' checked="true"/>专版印刷</th> </tr> </tbody> </table> CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx
@@ -10,7 +10,7 @@ <table class="table2"> <tbody> <tr> <th>请选择印刷方式： <input type="radio" name="printMode" value='1' checked="true" />合版印刷  <input type="radio" name="printMode" value='0'/>专版印刷</th> <th>请选择印刷方式： <input type="radio" name="printMode" value='1' />合版印刷  <input type="radio" name="printMode" value='0' checked="true" />专版印刷</th> </tr> </tbody> </table> CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbum.aspx
@@ -10,7 +10,7 @@ <table class="table2"> <tbody> <tr> <th>请选择印刷方式: <input type="radio" name="printMode" value='1' checked="true" />合版  <input type="radio" name="printMode" value='0'/>专版</th> <th>请选择印刷方式: <input type="radio" name="printMode" value='1' />合版  <input type="radio" name="printMode" value='0' checked="true" />专版</th> </tr> </tbody> </table> CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbum.aspx.designer.cs
@@ -2,14 +2,16 @@ // <自动生成> // 此代码由工具生成。 // // 对此文件的更改可能会导致不正确的行为，并且如果 // 重新生成代码，这些更改将会丢失。 // 对此文件的更改可能导致不正确的行为，如果 // 重新生成代码，则所做更改将丢失。 // </自动生成> //------------------------------------------------------------------------------ namespace CY.WebForm.Pages.front { public partial class PictureAlbum { namespace CY.WebForm.Pages.front { public partial class PictureAlbum { } } CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx
@@ -10,7 +10,7 @@ <table class="table2"> <tbody> <tr> <th>请选择印刷方式： <input type="radio" name="printMode" value='1' checked="true" />合版印刷  <input type="radio" name="printMode" value='0'/>专版印刷</th> <th>请选择印刷方式： <input type="radio" name="printMode" value='1' />合版印刷  <input type="radio" name="printMode" value='0' checked="true" />专版印刷</th> </tr> </tbody> </table> CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx
@@ -10,7 +10,7 @@ <table class="table2"> <tbody> <tr> <th>请选择印刷方式: <input type="radio" name="printMode" value='1' checked="true" />合版  <input type="radio" name="printMode" value='0'/>专版</th> <th>请选择印刷方式: <input type="radio" name="printMode" value='1' />合版  <input type="radio" name="printMode" value='0' checked="true" />专版</th> </tr> </tbody> </table> CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx
@@ -10,7 +10,7 @@ <table class="table2"> <tbody> <tr> <th>请选择印刷方式： <input type="radio" name="printMode" value='1' checked="true" />合版印刷  <input type="radio" name="printMode" value='0'/>专版印刷</th> <th>请选择印刷方式： <input type="radio" name="printMode" value='1' />合版印刷  <input type="radio" name="printMode" value='0' checked="true" />专版印刷</th> </tr> </tbody> </table> CY_ECommercePlatform/CY.WebForm/js/business/BackVisitNote.js
@@ -34,7 +34,7 @@ // var scores = data.Scores; // data.Scores = ''; // var dataString = alert(data); //alert(data); return data; // window.NoneData.Scores = scores; // return dataString;
