采购数据 货品名称和类型反了，调下顺序 完成

username@email.com

2 天以前 a001acc104e149c73f375638e1ba8224d0d28462

采购数据   货品名称和类型反了，调下顺序  完成

列表  纸张显示吨价   完成

采购管理供应商下拉列表价格查询   完成

物品管理，修改的时候增加 领取人 完成

供应商录入 没有时间 这个重要因素哟  完成

 CY_ECommercePlatform/CY.Model/OA/OA_Suppliers.cs

@@ -292,6 +292,14 @@
            get { return _lastupdatetime; }
        }
        /// <summary>
        /// 最后修改时间
        /// </summary>
        public DateTime? CreateTime
        {
            set;
            get;
        }
        /// <summary>
        /// 操作人
        /// </summary>
        public string Operator
@@ -525,6 +533,13 @@
                this.OrderNum = isChange ? MyConvert.ConvertToInt32(value) : OrderNum;
                theValue = this.OrderNum;
            }
            else if ("CreateTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 35)
            {
                this.CreateTime = isChange ? MyConvert.ConvertToDateTime(value) : CreateTime;
                theValue = this.CreateTime;
            }

            
            #endregion



 CY_ECommercePlatform/CY.SQLDAL/OA/OA_SuppliersDAL.cs

@@ -69,6 +69,7 @@
                    new SqlParameter("@AccountID",string.IsNullOrEmpty(trueModel.AccountID)?"":trueModel.AccountID) ,

                    new SqlParameter("@Huming",string.IsNullOrEmpty(trueModel.Huming)?"":trueModel.Huming) ,
                    new SqlParameter("@CreateTime",trueModel.CreateTime),
            };
            try
            {
@@ -234,7 +235,7 @@

          
            
            return _dataBase.SelectModelPage<Model.OA_Suppliers>(pa, selectTarget, fromSource, "a.OrderNum  ");
            return _dataBase.SelectModelPage<Model.OA_Suppliers>(pa, selectTarget, fromSource, "a.CreateTime desc  ");
        
        }
        /// <summary>

 CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyEdit.aspx

@@ -102,6 +102,14 @@
                </td>
            </tr>
            <tr>
                <td class="ali03">
                    领取人：
                </td>
                <td >
                    <textarea id="txtPlanRemark" runat="server"  style="width: 200px; height: 50px;" MaxLength="500" ></textarea>
                </td>
            </tr>
            <tr>
                <td colspan="2" style="text-align: center;">
                    <asp:Button ID="btn_submit" runat="server" OnClick="btn_submit_form" OnClientClick="if(CheckStaff())return true;else return false; " Text="提交" />
                </td>

 CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyEdit.aspx.cs

@@ -55,6 +55,8 @@
                this.txtPrice.Value = m_OA_PropertyManage.Price.Value.ToString("0.00");
                this.txtAllNum.Value = m_OA_PropertyManage.AllNum.ToString2();
                this.txtReceiveNum.Value = m_OA_PropertyManage.ReceiveNum.ToString2();
                this.txtPlanRemark.Value = m_OA_PropertyManage.Remark;
                this.selStatus.Value = m_OA_PropertyManage.Status.HasValue? m_OA_PropertyManage.Status.ToString():"1";
            }
        }

@@ -81,9 +83,10 @@
                {
                    m_OA_PropertyManage = new OA_PropertyManage();
                    m_OA_PropertyManage.MemberId = CurrentUser.MemberId;
                    m_OA_PropertyManage.Status = 1;
                    m_OA_PropertyManage.Remark = "";
                  
                  
                }
                m_OA_PropertyManage.Status = this.selStatus.Value.ToInt32();
                m_OA_PropertyManage.CateId = this.selCateId.Value.ToInt32();
                m_OA_PropertyManage.AllNum = this.txtAllNum.Value.ToInt32();
                m_OA_PropertyManage.Name = this.txtCarNumber.Value;
@@ -91,6 +94,7 @@
                m_OA_PropertyManage.Price = this.txtPrice.Value.ToDecimal2();
                m_OA_PropertyManage.Operator = CurrentUser.ShortName;
                m_OA_PropertyManage.LastUpdateTime = nowTime;
                m_OA_PropertyManage.Remark = this.txtPlanRemark.Value.Trim();

                if (Request["keyid"].ToInt32() > 0)
                {

 CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyEdit.aspx.designer.cs

@@ -2,15 +2,17 @@
// <自动生成>
//     此代码由工具生成。
//
//     对此文件的更改可能会导致不正确的行为，并且如果
//     重新生成代码，这些更改将会丢失。 
//     对此文件的更改可能导致不正确的行为，如果
//     重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------

namespace CY.WebForm.Pages.Property {
namespace CY.WebForm.Pages.Property
{
    
    
    public partial class PropertyEdit {
    public partial class PropertyEdit
    {
        
        /// <summary>
        /// Head1 控件。
@@ -94,6 +96,15 @@
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtReceiveNum;
        
        /// <summary>
        /// txtPlanRemark 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtPlanRemark;

        /// <summary>
        /// btn_submit 控件。
        /// </summary>
        /// <remarks>

 CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyList.aspx

@@ -8,12 +8,12 @@
    <script type="text/javascript">
        //修改
        function onEdit(keyid) {
            top.Dialog.open({ URL: "/Pages/Property/PropertyEdit.aspx?keyid=" + keyid, Title: "物品修改", Width: 400, Height: 230 });
            top.Dialog.open({ URL: "/Pages/Property/PropertyEdit.aspx?keyid=" + keyid, Title: "物品修改", Width: 500, Height: 430 });
        }

        //添加
        function addModel() {
            top.Dialog.open({ URL: "/Pages/Property/PropertyEdit.aspx", Title: "新增物品", Width: 400, Height: 230 });
            top.Dialog.open({ URL: "/Pages/Property/PropertyEdit.aspx", Title: "新增物品", Width: 500, Height: 430 });
        }

        //删除
@@ -148,6 +148,9 @@
                                已领取
                            </th>
                            <th style="text-align: center">
                                领取人
                            </th>
                            <th style="text-align: center">
                                状态
                            </th>
                            <th style="text-align: center">
@@ -182,6 +185,9 @@
                            <%#Eval("ReceiveNum")%>
                        </td>
                        <td style="text-align: center">
                            <%#Eval("Remark")%>
                        </td>
                        <td style="text-align: center">
                            <%#Eval("Status").ToString()=="1"?"启用":"禁用"%>
                        </td>
                        <td style="text-align: center">

 CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyList.aspx.designer.cs

@@ -2,15 +2,17 @@
// <自动生成>
//     此代码由工具生成。
//
//     对此文件的更改可能会导致不正确的行为，并且如果
//     重新生成代码，这些更改将会丢失。 
//     对此文件的更改可能导致不正确的行为，如果
//     重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------

namespace CY.WebForm.Pages.Property {
namespace CY.WebForm.Pages.Property
{
    
    
    public partial class PropertyList {
    public partial class PropertyList
    {
        
        /// <summary>
        /// Head1 控件。

 CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx

@@ -1311,13 +1311,13 @@
                        $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
                        $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
                        $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
                        $("input[name='PSF_OpenWidthName'][value_ppwaerid='" + value_SelWaerId + "']").val("870");
                       // $("input[name='PSF_OpenWidthName'][value_ppwaerid='" + value_SelWaerId + "']").val("870");
                    }
                    else if ($(vv).val().indexOf('轮转') >= 0) {
           
                        $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").hide();
                        $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").show();
                        $("input[name='PSF_OpenWidthName'][value_ppwaerid='" + value_SelWaerId + "']").val("755");
                       // $("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();

 CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs

@@ -507,7 +507,7 @@
                    //}
                    m_EC_SpecialForums.PSF_BigPaperCount = 0;
                    m_EC_SpecialForums.PSF_OpenSpecifications = PSF_OpenSpecifications[i].ToString2().Replace("，+-+，", ",");
                    if (PSF_PressesDesk[i].IndexOf("轮转")>=0)
                    if (PSF_PressesDesk[i].IndexOf("轮转")>=0 || PSF_PressesDesk[i].IndexOf("黑白") >= 0)
                    {
                        if (PSF_OpenWidthName[i].ToInt32() == null)
                        {

 CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx

@@ -14,8 +14,9 @@
            <table class="tableStyle">
              
  <tr> <td class="ali03 w120px">供应商：</td><td><span  id="spanSuppliers" runat="server" ></span></td></tr>
  <tr>  <td class="ali03 w120px">货品名称：</td><td><span  id="spanGoodsName" runat="server" ></span></td></tr>
  <tr>  <td class="ali03 w100px">货品类型：</td><td><span  id="spanGoodsType" runat="server" ></span></td></tr>
  <tr>  <td class="ali03 w120px">货品名称：</td><td><span  id="spanGoodsName" runat="server" ></span></td></tr>
 
  <tr>  <td class="ali03 w100px">品牌：</td><td><span  id="spanBrandName" runat="server" ></span></td></tr>
  <tr>  <td class="ali03 w100px">规格：</td><td><span  id="spanSpecificationName" runat="server" ></span></td></tr>
   <tr runat="server" id="TrPaperWeight">  <td class="ali03 w100px">克重：</td><td><span  id="spanPaperWeight" runat="server" ></span></td></tr>

 CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx.designer.cs

@@ -42,15 +42,6 @@
        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSuppliers;

        /// <summary>
        /// spanGoodsName 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanGoodsName;

        /// <summary>
        /// spanGoodsType 控件。
        /// </summary>
        /// <remarks>
@@ -60,6 +51,15 @@
        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanGoodsType;

        /// <summary>
        /// spanGoodsName 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanGoodsName;

        /// <summary>
        /// spanBrandName 控件。
        /// </summary>
        /// <remarks>

 CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx

@@ -35,6 +35,48 @@



        //为Select新增过滤功能
        function SelectAddSearch() {
            $("select[SelInputHtml='True']").each(function (i, v) {
                $(this).unbind("blur");
                var old = $(this).html();
                var oldObject = $(this).clone();
                var sign = "selectS" + i;
                $(v).attr("sign", sign);

                var inputClass = "input_" + sign;
                var html = "<span style='margin-left:10px'>过滤：</span><input type='text' class='" + inputClass + "' style='width:80px;height:18px;line-height:18px;'/>";//<span onclick='showCustomer()' style=\"padding-left:10px;\" class=\"a_under\">新增供应商</span>
                $(v).after(html);
                $("." + inputClass).blur(function () {
                    var nowval = $(this).val().trim();
                    var output = "";
                    if (nowval == "" || nowval == null) {
                        output = old;
                    } else {
                        output += "<option value=''>请选择</option>";
                        var valueArr = new Array();
                        oldObject.find("option").each(function (ii, vv) {

                            var value = $.trim($(vv).attr("value"));
                            var text = $.trim($(vv).text());

                            if (text.indexOf(nowval) >= 0)
                                valueArr.push(value + "|||" + text);
                        });
                        for (var ss in valueArr) {
                            var s = valueArr[ss];
                            if (s.split("|||").length == 2) {
                                var value1 = s.split("|||")[0];
                                var text1 = s.split("|||")[1];
                                output += "<option value='" + value1 + "'>" + text1 + "</option>";
                            }
                        }
                    }
                    $(v).html(output);
                });
            });
        }

        /*
确认批量开票申请
*/
@@ -100,6 +142,11 @@
            var url = "/Pages/business/Caigoufukuanshenqing.aspx?id=" + orderId + "&&orderno=" + orderno;
            top.Dialog.open({ URL: url, Title: "采购付款申请", Height: 600, Width: 580 });
        }
        $(function () {
            

            SelectAddSearch();
        });
    </script>
</head>
<body>
@@ -118,7 +165,7 @@
                        供应商：
                    </td>
                    <td>
                        <select id="selSuppliers" runat="server" datatextfield="Name" datavaluefield="Keyid" keepdefaultstyle='true' class="Sreq w122px">
                        <select id="selSuppliers" runat="server" datatextfield="Name" datavaluefield="Keyid" keepdefaultstyle='true' selinputhtml="True"   class="Sreq w122px">
                        </select>
                    </td>
                    <td class="ali03  ">
@@ -231,6 +278,9 @@
                                单价
                            </th>
                            <th>
                                吨价
                            </th>
                            <th>
                                数量
                            </th>
                            <th>
@@ -290,6 +340,9 @@
                            <%#Eval("Price", "{0:F2}")%>
                        </td>
                        <td>
                            <%#Eval("tanPrice", "{0:F2}")%>
                        </td>
                        <td>
                            <%#Eval("Quantity", "{0:F0}")%>
                        </td>
                        <td>

 CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersEdit.aspx.cs

@@ -402,6 +402,7 @@
                supplier.FirmId = CurrentUser.MemberId;
                supplier.Operator = CurrentUser.ShortName;
                supplier.LastUpdateTime = System.DateTime.Now;
                supplier.CreateTime = System.DateTime.Now;
                if (_OA_SuppliersBLL.InsertModel(supplier))
                {
                    if (!string.IsNullOrEmpty(Request["flasss"]))

 CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersList.aspx

@@ -114,6 +114,9 @@
                            <th>
                                合作状态
                            </th>
                             <th>
                                创建时间
                            </th>
                            <th width="80">
                                操作
                            </th>
@@ -142,6 +145,9 @@
                        <td>
                            <%#Eval("CooperativeState.Name")%>
                        </td>
                         <td>
                            <%#Eval("CreateTime", "{0:yyyy-MM-dd}")%>
                        </td>
                        <td class="Operate w120px">
                            <span  menu_member_case_id="case_onView" menu_member_case_name="查看" onclick="onView(<%#Eval("Keyid")%>)">查看</span>
                            <span  menu_member_case_id="case_onEdit" menu_member_case_name="修改" onclick="onEdit('<%#Eval("Keyid")%>')">修改</span>

 CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersList.aspx.designer.cs

@@ -2,15 +2,17 @@
// <自动生成>
//     此代码由工具生成。
//
//     对此文件的更改可能会导致不正确的行为，并且如果
//     重新生成代码，这些更改将会丢失。 
//     对此文件的更改可能导致不正确的行为，如果
//     重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------

namespace CY.WebForm.Pages.procurement {
namespace CY.WebForm.Pages.procurement
{
    
    
    public partial class SuppliersList {
    public partial class SuppliersList
    {
        
        /// <summary>
        /// CMSHead1 控件。

 CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs

@@ -165,6 +165,9 @@
                    oA_Fukuanshenqing.LastUpdateTime = DateTime.Now;

                    var id = _oA_FukuanshenqingBLL.InsertModel(oA_Fukuanshenqing);

                    //其他付款id存在RewardType这个字段
                    m_OA_WorkPlan.RewardType = id;
                }

                if (Request["keyid"].ToInt32() > 0)