增加印件名称模糊查询
电话号码验证修改
订单新增根据单价算总价,根据总价算单价
订单增加单位(其他类型)
35个文件已修改
3个文件已添加
430 ■■■■ 已修改文件
.gitignore 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/EC/EC_OrderExtend.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/CacheFiles/Orders.txt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/CacheFiles/QuoteDemand.txt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/CacheFiles/SeckillBusiness.txt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.designer.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx.designer.cs 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx.designer.cs 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.designer.cs 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/front/OtherType.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx.designer.cs 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx.designer.cs 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
开票修改.sql 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
订单扩展sql.sql 补丁 | 查看 | 原始文档 | blame | 历史
订单查询sql.sql 补丁 | 查看 | 原始文档 | blame | 历史
订单查询存储过程参数测试.sql 补丁 | 查看 | 原始文档 | blame | 历史
.gitignore
@@ -32,3 +32,4 @@
CY_ECommercePlatform/UploadFiles/obj/
CY_ECommercePlatform/UploadFiles/UpLoads/
CY_ECommercePlatform/CY.Config/obj/
/CY_ECommercePlatform/.vs
CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
@@ -510,6 +510,11 @@
            get;
            set;
        }
        /// <summary>
        /// å°åˆ·æ•°é‡å•位
        /// </summary>
        public string yssldw { get; set; }
        #endregion
        #region Visiter
@@ -905,7 +910,11 @@
                this.shifouDelivery = isChange ? MyConvert.ConvertToInt32(value) : this.shifouDelivery;
                theValue = this.shifouDelivery;
            }
            else if ("yssldw".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 96)
            {
                this.yssldw = isChange ? MyConvert.ConvertToString(value) : this.yssldw;
                theValue = this.yssldw;
            }
            #endregion
            return theValue;
CY_ECommercePlatform/CY.Model/EC/EC_OrderExtend.cs
@@ -219,6 +219,12 @@
        #endregion Model 
        public string PrintPackDeliveryRequir { get; set; }
        /// <summary>
        /// å°åˆ·æ•°é‡å•位
        /// </summary>
        public int printunit { get; set; }
    }
}
CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs
@@ -50,6 +50,11 @@
        public int PrintCount { get; set; }
        /// <summary>
        /// å•位代码
        /// </summary>
        public int Unit { get; set; }
        /// <summary>
        /// å•双面
        /// </summary>
        public string SingleOrdouble { get; set; }
@@ -394,10 +399,12 @@
        #endregion
        #region è¯¢ä»·ä»·æ ¼è®°å½•
        /// <summary>
        /// è¯¢ä»·ä»·æ ¼æ˜Žç»†
        /// </summary>
        public InquiryDetail InquiryDetailObj { get; set; }
        #endregion 
    }
}
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -535,6 +535,8 @@
                    new SqlParameter("@Kehuqianshou",DBNull.Value){SqlDbType=SqlDbType.Int},
                     new SqlParameter("@KaipiaoshenqingId",DBNull.Value){SqlDbType=SqlDbType.UniqueIdentifier},
                     new SqlParameter("@buyerId",DBNull.Value){SqlDbType=SqlDbType.UniqueIdentifier},
                     new SqlParameter("@DocumentName",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=50},
            };
            /*
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs
@@ -97,6 +97,7 @@
                     delayTime,
                      new SqlParameter("@Productionprogress",trueModel.Productionprogress),
                       new SqlParameter("@PrintPackDeliveryRequir",trueModel.PrintPackDeliveryRequir),
                       new SqlParameter("@printunit",trueModel.printunit)
            };
            int i = -1;
@@ -158,6 +159,7 @@
                    new SqlParameter("@NumPerBag",trueModel.NumPerBag),
                    new SqlParameter("@BagNum",trueModel.BagNum),
                       new SqlParameter("@PrintPackDeliveryRequir",trueModel.PrintPackDeliveryRequir),
                       new SqlParameter("@printunit",trueModel.printunit)
            };
            try
            {
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj.user
@@ -21,7 +21,7 @@
          <StartAction>CurrentPage</StartAction>
          <AspNetDebugging>True</AspNetDebugging>
          <SilverlightDebugging>False</SilverlightDebugging>
          <NativeDebugging>False</NativeDebugging>
          <NativeDebugging>True</NativeDebugging>
          <SQLDebugging>False</SQLDebugging>
          <ExternalProgram>
          </ExternalProgram>
CY_ECommercePlatform/CY.WebForm/CacheFiles/Orders.txt
@@ -1 +1 @@
2021-09-14 09:59:56
2021-09-16 11:19:55
CY_ECommercePlatform/CY.WebForm/CacheFiles/QuoteDemand.txt
@@ -1 +1 @@
2021-09-14 09:59:56
2021-09-16 11:19:55
CY_ECommercePlatform/CY.WebForm/CacheFiles/SeckillBusiness.txt
@@ -1 +1 @@
2021-09-14 09:59:56
2021-09-16 11:19:55
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -435,7 +435,8 @@
                <td class="contentLeft" colspan="2" style=" padding-left:300px;">
                    <input type="hidden" id='txtKeyid' runat="server" value='0' /><input type="hidden" value='0' id='txtBillMode' runat="server" />
                    <input type="hidden" name='Target' value='default' />
                    <input  name='hidPrintTypeId' id='hidPrintTypeId' type="hidden" /><input type="button" id="btnSaveask" runat="server" value="保存订单和要求" onclick="if(!Saveyaoqiu())return false;" />&nbsp;&nbsp;&nbsp;<input type="button" id="btnSave" runat="server" value="保存订单" onclick="if(!Save())return false;" />&nbsp;&nbsp;&nbsp;<input type="button" value="重 ç½®" id='btnReset' onclick="ReLoad()" />
                    <input  name='hidPrintTypeId' id='hidPrintTypeId' type="hidden" />
                    <input type="button" id="btnSaveask" runat="server" value="保存订单和要求" onclick="if(!Saveyaoqiu())return false;" />&nbsp;&nbsp;&nbsp;<input type="button" id="btnSave" runat="server" value="保存订单" onclick="if(!Save())return false;" />&nbsp;&nbsp;&nbsp;<input type="button" value="重 ç½®" id='btnReset' onclick="ReLoad()" />
                    
@@ -490,18 +491,23 @@
        showWait();
        var OldOrderId = document.getElementById('txtKeyid').value;
        var ssselPrintTypes = document.getElementById('selPrintTypes').value;
        alert(7);
        if (ssselPrintTypes == -1 || ssselPrintTypes == "-1") {//其他类型
            $("#hidOrderId").val(OldOrderId);
            $("#divInquiry").load("/Pages/front/OtherType.aspx", { "PrintTypeId": "-1" });
            setTimeout(function () {
                alert(8);
                if (sel.value != "" || sel.value == "0") {
                    BindControl1(sel.value);
                }
            }, 1000);
            window.hideWaitDiv = window.parent.parent.parent.parent.parent.parent.hideWaitDiv;
            if (window.hideWaitDiv) window.hideWaitDiv();
        } else {
            if (window.hideWaitDiv)
                window.hideWaitDiv();
        }
        else
        {
            DelayLoadPrintType1(ssselPrintTypes, '1', OldOrderId, 'order');
        }
        document.getElementById('hidPrintTypeId').value = ssselPrintTypes;
@@ -520,18 +526,22 @@
    //修改反绑数据
    function BindControl1(orderId) {
        alert(1);
        if (parseInt(orderId) > 0) {
            $.ajax({
                url: '/Pages/front/InquiryOnLine.aspx?tmp' + (new Date()).valueOf(),
                type: "POST",
                data: "BindControl1=true&OrderId=" + orderId,
                success: function (dataJsonStr) {
                    alert(2);
                    if (dataJsonStr == null || dataJsonStr == "")
                        return;
                    var dataJson = eval('(' + dataJsonStr + ')');
                    alert(dataJson.PrintTypeId);
                    if (dataJson.PrintTypeId == "-1" || dataJson.PrintTypeId == -1) {
                        $("[name='printSizeName']").val(dataJson.PrintSizeName);
                        $("[name='printCount']").val(dataJson.PrintCount);
                        $("#ysUnit").attr("value", dataJson.Unit);
                        $("[name='txtPrintDemand']").val(dataJson.PrintDemand);
                    } else {
                        BindControlByPrintType(dataJson);
@@ -579,6 +589,7 @@
    function LoadPrintType1(printTypeId, pvcTypePar, OrderId) {
        alert(4);
        $("#hidOrderId").val(OrderId);
        switch (printTypeId) {
            //名片                            
@@ -690,6 +701,7 @@
    //动态加载页面后执行的语句
    function ExcuteCallBack1() {
        alert(5);
        var printTypeId = $("#hidPrintTypeId").val();
        $("#selDigitalPrintType").live("change",
@@ -739,6 +751,7 @@
        var ssselprintask = $("#selprintask").val();
        //修改反绑数据
        alert(3);
        if (ssselprintask != "" || ssselprintask == "0") {
            BindControl1(ssselprintask);
        }
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
@@ -371,6 +371,7 @@
                eC_OrderExtend.CustomerLevelId = MyConvert.ConvertToInt32(Request["selCustormerLevel"]);
                eC_OrderExtend.Contacts = MyConvert.ConvertToString(Request["txtContact"]).Trim();
                eC_OrderExtend.ContactPhone = MyConvert.ConvertToString(Request["txtPhone"]).Trim();
                eC_OrderExtend.printunit = MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
                eC_OrderBasic.Remark = eC_OrderExtend.Remark;
                eC_OrderBasic.DocumentName = MyConvert.ConvertToString(Request["txtDocumentName"]).Trim();
@@ -387,6 +388,7 @@
                    _inquiryCommonModel = new InquiryCommonModel();
                    _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.PrintSizeName = Request["printSizeName"].ToString();
                }
@@ -549,6 +551,7 @@
                eC_OrderExtend.CustomerLevelId = MyConvert.ConvertToInt32(Request["selCustormerLevel"]);
                eC_OrderExtend.Contacts = MyConvert.ConvertToString(Request["txtContact"]).Trim();
                eC_OrderExtend.ContactPhone = MyConvert.ConvertToString(Request["txtPhone"]).Trim();
                eC_OrderExtend.printunit= MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
                eC_OrderBasic.Remark = eC_OrderExtend.Remark;
                eC_OrderBasic.DocumentName = MyConvert.ConvertToString(Request["txtDocumentName"]).Trim();
@@ -565,6 +568,7 @@
                    _inquiryCommonModel = new InquiryCommonModel();
                    _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.PrintSizeName = Request["printSizeName"].ToString();
                }
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -214,6 +214,12 @@
                        </select>
                    </td>
                    <td class="ali03">
                        å°ä»¶åç§°ï¼š
                    </td>
                    <td>
                        <input id='txtSearchyjname' runat="server" maxlength='50' />
                    </td>
                    <td class="ali03">
                        ä»˜æ¬¾æ–¹å¼ï¼š
                    </td>
                    <td>
@@ -241,9 +247,20 @@
                            <asp:listitem value="0">中评</asp:listitem>
                            <asp:listitem value="-1">差评</asp:listitem>
                        </asp:dropdownlist>
                    </td>
                </tr>
                 <tr>
                    <td class="ali03">
                    </td>
                    <td>
                    <td>
                    </td>
                    <td class="ali03"> </td>
                    <td> </td>
                    <td class="ali03"> </td>
                    <td> </td>
                    <td class="ali03"> </td>
                    <td> </td>
                    <td> </td>
                    <td>
                        <asp:button id="btn_Search" text="查询" runat="server" />&nbsp;<input type="button" value='重置' onclick='document.body.innerHTML="";window.location=window.location;' />
                        <input type="hidden" id='txtCommission' runat="server" />
@@ -304,6 +321,9 @@
                        </th>
                        <th width="36">
                            æ•°é‡
                        </th>
                        <th width="36">
                            å•位
                        </th>
                        <th style="text-align: center;" width="50">
                            è®¢å•状态
@@ -390,7 +410,7 @@
                                </td>
                                <td style="text-align: center;">
                                 <div style="width: 140px; word-wrap: break-word; text-align:justify;">
                                    <a href='javascript:void(0)' title='点击查看 <%#Eval("BuyerName").ToString()%> èµ„æ–™' class='a_under' onclick='View("<%#Eval("BuyerId")%>")'><%#Eval("BuyerName").ToString().Length > 10 ? (Eval("BuyerName").ToString().Substring(0, 10) + "..") : Eval("BuyerName").ToString()%></a>
                                    <a href='javascript:void(0)' title='<%#Eval("BuyerName").ToString()%>' class='a_under' onclick='View("<%#Eval("BuyerId")%>")'><%#Eval("BuyerName").ToString().Length > 15 ? (Eval("BuyerName").ToString().Substring(0, 15) + "..") : Eval("BuyerName").ToString()%></a>
                                        </div>
                                </td>
                                <td>
@@ -406,6 +426,9 @@
                                    <%#Eval("OrderExtend.PrintNum")%>
                                </td>
                                <td>
                                    <%#Eval("yssldw")%>
                                </td>
                                <td>
                                    <%#Eval("OrderStateObj.Name")%>
                                </td>
                                <td>
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
@@ -529,6 +529,7 @@
            SetParamValue(searchParam, 19, CurrentUser.TrueMemberId);
            SetParamValue(searchParam, 20, CurrentUser.StaffId);
            SetParamValue(searchParam, 21, CurrentUser.TrueName);
            SetParamValue(searchParam, 28, this.txtSearchyjname.Value);
            SearchParam = searchParam;
            UCPager1.AspNetPager.CurrentPageIndex = 1;//重置页数
            //再次查询
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.designer.cs
@@ -150,6 +150,15 @@
        protected global::System.Web.UI.HtmlControls.HtmlSelect selPayStates;
        /// <summary>
        /// txtSearchyjname æŽ§ä»¶ã€‚
        /// </summary>
        /// <remarks>
        /// è‡ªåŠ¨ç”Ÿæˆçš„å­—æ®µã€‚
        /// è‹¥è¦è¿›è¡Œä¿®æ”¹ï¼Œè¯·å°†å­—段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtSearchyjname;
        /// <summary>
        /// selPayType æŽ§ä»¶ã€‚
        /// </summary>
        /// <remarks>
CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx
@@ -38,21 +38,31 @@
                        <option value="异型">异型</option>
                    </select>
                 </td>
                     <td align="center">
                    <div class="xialap">
                    <input type="text"  id="printCount" name="printCount" readonly="readonly"  style="height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
                    <div class="xialapb">
                        <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 class="xialapr">20000</div>
                        <div class="xialapr">30000</div>
                        <div class="xialapr">50000</div>
                    </div>
                    </div>
                 <td align="center">
                     <table>
                        <tr>
                            <td>
                                <div class="xialap">
                                    <input type="text"  id="printCount" name="printCount" readonly="readonly"  style="height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
                                    <div class="xialapb">
                                        <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 class="xialapr">20000</div>
                                        <div class="xialapr">30000</div>
                                        <div class="xialapr">50000</div>
                                    </div>
                                </div>
                            </td>
                            <td>
                                <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
                            </td>
                        </tr>
                    </table>
                </td>
             </tr>
        </tbody>
CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx.cs
@@ -1,4 +1,5 @@
using System;
using CY.BLL.Sys;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -16,6 +17,11 @@
            {
                if (Request["PrintTypeId"]!=null)
                PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
                Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//字典业务逻辑操作类对象
                this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("印刷单位");
                this.ysUnit.DataBind();
                this.ysUnit.Value = "1";
            }
        }
    }
CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx.designer.cs
@@ -2,14 +2,25 @@
// <自动生成>
//     æ­¤ä»£ç ç”±å·¥å…·ç”Ÿæˆã€‚
//
//     å¯¹æ­¤æ–‡ä»¶çš„æ›´æ”¹å¯èƒ½ä¼šå¯¼è‡´ä¸æ­£ç¡®çš„行为,并且如果
//     é‡æ–°ç”Ÿæˆä»£ç ï¼Œè¿™äº›æ›´æ”¹å°†ä¼šä¸¢å¤±ã€‚
//     å¯¹æ­¤æ–‡ä»¶çš„æ›´æ”¹å¯èƒ½å¯¼è‡´ä¸æ­£ç¡®çš„行为,如果
//     é‡æ–°ç”Ÿæˆä»£ç ï¼Œåˆ™æ‰€åšæ›´æ”¹å°†ä¸¢å¤±ã€‚
// </自动生成>
//------------------------------------------------------------------------------
namespace CY.WebForm.Pages.front {
    public partial class Adhesive {
namespace CY.WebForm.Pages.front
{
    public partial class Adhesive
    {
        /// <summary>
        /// ysUnit æŽ§ä»¶ã€‚
        /// </summary>
        /// <remarks>
        /// è‡ªåŠ¨ç”Ÿæˆçš„å­—æ®µã€‚
        /// è‹¥è¦è¿›è¡Œä¿®æ”¹ï¼Œè¯·å°†å­—段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
    }
}
CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx
@@ -23,17 +23,28 @@
              </span>
        </td>
        <td align="center">
            <div class="xialap">
                    <input type="text"  id="printCount" name="printCount" readonly="readonly"  style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
                    <div class="xialapb">
                        <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>
             <table>
                <tr>
                    <td>
                        <div class="xialap">
                            <input type="text"  id="printCount" name="printCount" readonly="readonly"  style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
                            <div class="xialapb">
                                <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>
                    </td>
                    <td>
                        <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
                    </td>
                </tr>
            </table>
        </td>
        <td>
            <select name="bindingMode" id="bindingMode">
CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx.cs
@@ -1,4 +1,5 @@
using System;
using CY.BLL.Sys;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -16,6 +17,11 @@
            {
                if (Request["PrintTypeId"] != null)
                PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
                Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//字典业务逻辑操作类对象
                this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("印刷单位");
                this.ysUnit.DataBind();
                this.ysUnit.Value = "1";
            }
        }
    }
CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx.designer.cs
@@ -2,14 +2,25 @@
// <自动生成>
//     æ­¤ä»£ç ç”±å·¥å…·ç”Ÿæˆã€‚
//
//     å¯¹æ­¤æ–‡ä»¶çš„æ›´æ”¹å¯èƒ½ä¼šå¯¼è‡´ä¸æ­£ç¡®çš„行为,并且如果
//     é‡æ–°ç”Ÿæˆä»£ç ï¼Œè¿™äº›æ›´æ”¹å°†ä¼šä¸¢å¤±ã€‚
//     å¯¹æ­¤æ–‡ä»¶çš„æ›´æ”¹å¯èƒ½å¯¼è‡´ä¸æ­£ç¡®çš„行为,如果
//     é‡æ–°ç”Ÿæˆä»£ç ï¼Œåˆ™æ‰€åšæ›´æ”¹å°†ä¸¢å¤±ã€‚
// </自动生成>
//------------------------------------------------------------------------------
namespace CY.WebForm.Pages.front {
    public partial class Book {
namespace CY.WebForm.Pages.front
{
    public partial class Book
    {
        /// <summary>
        /// ysUnit æŽ§ä»¶ã€‚
        /// </summary>
        /// <remarks>
        /// è‡ªåŠ¨ç”Ÿæˆçš„å­—æ®µã€‚
        /// è‹¥è¦è¿›è¡Œä¿®æ”¹ï¼Œè¯·å°†å­—段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
    }
}
CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx
@@ -104,7 +104,7 @@
                                </div>
                            </td>
                            <td>
                                <select id='ysUnit' runat="server" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
                                <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
                            </td>
                        </tr>
                    </table>
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -136,6 +136,7 @@
                int bindingMode = -1;
                string gildingType = string.Empty;
                string laFeng = string.Empty;
                int ysuint = 1;
                if (request["hidPrintTypeId"] != null)
                    printTypeId = request["hidPrintTypeId"].ToString().ToInt32().Value;
                if (request["printMode"] != null)
@@ -224,6 +225,10 @@
                    gildingType = request["gildingType0"].ToString();
                if (request["LaFeng"] != null)
                    laFeng = request["LaFeng"].ToString();
                if (request["ysUnit"] != null)
                    ysuint = request["ysUnit"].ToString().ToInt32().Value;
                model.PrintTypeId = printTypeId;
                model.PrintMode = printMode;
                model.PrintSizeId = sizeId;
@@ -231,6 +236,7 @@
                model.GramWeight = gramWeight;
                model.BrandId = brandId;
                model.PrintCount = printCount;
                model.Unit = ysuint;
                model.SingleOrdouble = singleOrdouble;
                if (!string.IsNullOrEmpty(works))
                {
CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx
@@ -104,6 +104,7 @@
                </td>
                <td align="center">
                    <input type="text"  id="printCount" name="printCount" style="height:15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="5000" value="5000"/>
                    <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
                </td>
            </tr>
        </tbody>
CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.cs
@@ -1,4 +1,5 @@
using System;
using CY.BLL.Sys;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -16,6 +17,11 @@
            {
                if (Request["PrintTypeId"] != null)
                PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
                Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//字典业务逻辑操作类对象
                this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("印刷单位");
                this.ysUnit.DataBind();
                this.ysUnit.Value = "1";
            }
        }
    }
CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.designer.cs
@@ -2,14 +2,25 @@
// <自动生成>
//     æ­¤ä»£ç ç”±å·¥å…·ç”Ÿæˆã€‚
//
//     å¯¹æ­¤æ–‡ä»¶çš„æ›´æ”¹å¯èƒ½ä¼šå¯¼è‡´ä¸æ­£ç¡®çš„行为,并且如果
//     é‡æ–°ç”Ÿæˆä»£ç ï¼Œè¿™äº›æ›´æ”¹å°†ä¼šä¸¢å¤±ã€‚
//     å¯¹æ­¤æ–‡ä»¶çš„æ›´æ”¹å¯èƒ½å¯¼è‡´ä¸æ­£ç¡®çš„行为,如果
//     é‡æ–°ç”Ÿæˆä»£ç ï¼Œåˆ™æ‰€åšæ›´æ”¹å°†ä¸¢å¤±ã€‚
// </自动生成>
//------------------------------------------------------------------------------
namespace CY.WebForm.Pages.front {
    public partial class NewsPaper {
namespace CY.WebForm.Pages.front
{
    public partial class NewsPaper
    {
        /// <summary>
        /// ysUnit æŽ§ä»¶ã€‚
        /// </summary>
        /// <remarks>
        /// è‡ªåŠ¨ç”Ÿæˆçš„å­—æ®µã€‚
        /// è‹¥è¦è¿›è¡Œä¿®æ”¹ï¼Œè¯·å°†å­—段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
    }
}
CY_ECommercePlatform/CY.WebForm/Pages/front/OtherType.aspx
@@ -27,7 +27,7 @@
                </td>
                <td align="left">
                    <input type="text" id="printCount" name="printCount" runat="server" class="validateInt textinput" value="5000" />
                     <select id='ysUnit' runat="server" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
                     <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
                </td>
            </tr>
            <tr>
CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx
@@ -29,17 +29,27 @@
              </span>
        </td>
        <td align="center">
            <div class="xialap">
                    <input type="text"  id="printCount" name="printCount" readonly="readonly"  style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
                    <div class="xialapb">
                        <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>
            <table>
                <tr>
                    <td>
                        <div class="xialap">
                            <input type="text"  id="printCount" name="printCount" readonly="readonly"  style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
                            <div class="xialapb">
                                <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>
                    </td>
                    <td>
                        <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
                    </td>
                </tr>
            </table>
        </td>
        <td>
            <select name="bindingMode" id="bindingMode">
CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx.cs
@@ -1,4 +1,5 @@
using System;
using CY.BLL.Sys;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -16,6 +17,11 @@
            {
                if (Request["PrintTypeId"] != null)
                PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
                Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//字典业务逻辑操作类对象
                this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("印刷单位");
                this.ysUnit.DataBind();
                this.ysUnit.Value = "1";
            }
        }
    }
CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx.designer.cs
@@ -2,14 +2,25 @@
// <自动生成>
//     æ­¤ä»£ç ç”±å·¥å…·ç”Ÿæˆã€‚
//
//     å¯¹æ­¤æ–‡ä»¶çš„æ›´æ”¹å¯èƒ½ä¼šå¯¼è‡´ä¸æ­£ç¡®çš„行为,并且如果
//     é‡æ–°ç”Ÿæˆä»£ç ï¼Œè¿™äº›æ›´æ”¹å°†ä¼šä¸¢å¤±ã€‚
//     å¯¹æ­¤æ–‡ä»¶çš„æ›´æ”¹å¯èƒ½å¯¼è‡´ä¸æ­£ç¡®çš„行为,如果
//     é‡æ–°ç”Ÿæˆä»£ç ï¼Œåˆ™æ‰€åšæ›´æ”¹å°†ä¸¢å¤±ã€‚
// </自动生成>
//------------------------------------------------------------------------------
namespace CY.WebForm.Pages.front {
    public partial class PictureAlbumNew {
namespace CY.WebForm.Pages.front
{
    public partial class PictureAlbumNew
    {
        /// <summary>
        /// ysUnit æŽ§ä»¶ã€‚
        /// </summary>
        /// <remarks>
        /// è‡ªåŠ¨ç”Ÿæˆçš„å­—æ®µã€‚
        /// è‹¥è¦è¿›è¡Œä¿®æ”¹ï¼Œè¯·å°†å­—段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
    }
}
CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx
@@ -26,12 +26,10 @@
                <th style="text-align: center;" class="Brand0">
                    å“ç‰Œ
                </th>
                 <th style="text-align: center;" class="gramWeight0">
                <th style="text-align: center;" class="gramWeight0">
                    å…‹é‡
                </th>
                <th style="text-align: center;">
                    å°åˆ·æ•°é‡
                </th>
                <th>印刷数量</th>
            </tr>
            <tr>
                <td>                   
@@ -70,18 +68,27 @@
                    <select class="selectLaber" id="gramWeight0" name="gramWeight0">
                    </select>
                </td>
                <td>
                    <div class="xialap" style="display: inline-block;">
                    <input type="text"  id="printCount" name="printCount" readonly="readonly"  style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
                    <div class="xialapb">
                        <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>
                <td >
                    <table>
                        <tr>
                            <td>
                                <div class="xialap" style="display: inline-block;">
                                    <input type="text"  id="printCount" name="printCount" readonly="readonly"  style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
                                    <div class="xialapb">
                                        <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>
                            </td>
                            <td>
                                <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
                            </td>
                        </tr>
                    </table>
                </td>
            </tr>
        </tbody>
CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx.cs
@@ -1,4 +1,5 @@
using System;
using CY.BLL.Sys;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -16,6 +17,11 @@
            {
                if (Request["PrintTypeId"] != null)
                PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
                Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//字典业务逻辑操作类对象
                this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("印刷单位");
                this.ysUnit.DataBind();
                this.ysUnit.Value = "1";
            }
        }
    }
CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx.designer.cs
@@ -2,14 +2,25 @@
// <自动生成>
//     æ­¤ä»£ç ç”±å·¥å…·ç”Ÿæˆã€‚
//
//     å¯¹æ­¤æ–‡ä»¶çš„æ›´æ”¹å¯èƒ½ä¼šå¯¼è‡´ä¸æ­£ç¡®çš„行为,并且如果
//     é‡æ–°ç”Ÿæˆä»£ç ï¼Œè¿™äº›æ›´æ”¹å°†ä¼šä¸¢å¤±ã€‚
//     å¯¹æ­¤æ–‡ä»¶çš„æ›´æ”¹å¯èƒ½å¯¼è‡´ä¸æ­£ç¡®çš„行为,如果
//     é‡æ–°ç”Ÿæˆä»£ç ï¼Œåˆ™æ‰€åšæ›´æ”¹å°†ä¸¢å¤±ã€‚
// </自动生成>
//------------------------------------------------------------------------------
namespace CY.WebForm.Pages.front {
    public partial class Reticule {
namespace CY.WebForm.Pages.front
{
    public partial class Reticule
    {
        /// <summary>
        /// ysUnit æŽ§ä»¶ã€‚
        /// </summary>
        /// <remarks>
        /// è‡ªåŠ¨ç”Ÿæˆçš„å­—æ®µã€‚
        /// è‹¥è¦è¿›è¡Œä¿®æ”¹ï¼Œè¯·å°†å­—段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
    }
}
CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
@@ -253,6 +253,7 @@
                if (dataJson.PrintTypeId == "-1" || dataJson.PrintTypeId == -1) {
                    $("[name='printSizeName']").val(dataJson.PrintSizeName);
                    $("[name='printCount']").val(dataJson.PrintCount);
                    $("[name='ysUnit']").val(dataJson.Unit);
                    $("[name='txtPrintDemand']").val(dataJson.PrintDemand);
                } else {
                    BindControlByPrintType(dataJson);
@@ -1215,6 +1216,7 @@
    }
    $("[name='gramWeight0']").val(dataJson.GramWeight);
    $("#printCount").val(dataJson.PrintCount);
    $("[name='ysUnit']").val(dataJson.Unit);
    $("[name='RopeTypeName']").val(dataJson.RopeTypeName);
    $("[name='RopeColor']").val(dataJson.RopeColor);
    $("[name='printColor0']").val(dataJson.PrintColor);
¿ªÆ±ÐÞ¸Ä.sql
@@ -1,11 +1,30 @@
USE [ECTEST]
GO
--2021.09.10 å¢žåŠ å¤‡æ³¨
alter table [OA_Kaipiaoshenqing]
    add [remark]  nvarchar(250) null
go
--更新数据字典 EC_开票申请,管理员登录后台
-- åˆ é™¤ ï¼ˆEC_开票申请—— æœªç”³è¯·ï¼‰
-- ä¿®æ”¹ï¼ˆå·²ç”³è¯·â€”—未开票)
go
--2021.09.13
--更新数据字典 å°åˆ·å•位,管理员登录后台
-- æ–°å¢ž ï¼ˆå°åˆ·å•位—— å¼ ã€æœ¬ã€å†Œã€åªï¼‰
--                 å€¼ï¼ˆ1、 2、 3、 4)
--2021.09.15  å¢žåŠ å°åˆ·æ•°é‡å•ä½
alter table [EC_OrderExtend]
    add [printunit] [int] NULL
update [EC_OrderExtend] set [printunit]=1
ALTER TABLE [dbo].[EC_OrderExtend] ADD  CONSTRAINT [DF_EC_OrderExtend_printunit]  DEFAULT ((1)) FOR [printunit]
--更新存储过程[sp_EC_OrderBasic_Search_Seller] ï¼Œè®¢å•查询sql
--更新存储过程sp_EC_OrderExtend_Insert,订单扩展sql
¶©µ¥À©Õ¹sql.sql
Binary files differ
¶©µ¥²éѯsql.sql
Binary files differ
¶©µ¥²éѯ´æ´¢¹ý³Ì²ÎÊý²âÊÔ.sql
Binary files differ