删除客户管理查询条件中的“客户编号” 完成  新增订单---黑白印件  的后道工序最右边增加一个“口 竖式”,同前面套号、压痕一样,默认不勾选,是竖式的业务经理自己下单时勾选  完成提交外协付款申请时,增加上传审批证明的上传图片功能,可以添加多张图片;查询列表中增加“付款状态:全部、已付款、未付款”查询条件,默认全部;“完工状态”改为默认未完工   完成请示批复----付款申请  中也要向上面的需求一样,增加上传审批证明的上传图片功能,可以添加多张图片   完成在“请示批复”中进行“批复”操作的时候要能查看上传的审批图片  完成包装要求”要显示在打印的订单中 完成包装要求”要显示在打印的订单中 完成收据联单的新增订单中,纸张选无碳纸时,不显示“品牌”、“克重”,在联数的后面增加颜色选择:“颜色:上白下红”(匹配联数)订单管理中的“订单状态”删除,删除后新增两个状态:“完工状态:全部、未完工、已完工”和“送货状态:全部、已送货、未送货”  完成请示批复中默认“未批复”   完成请示批复中默认“未批复”   完成
36个文件已修改
941 ■■■■■ 已修改文件
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlan_attachmentBLL.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlan_attachmentDAL.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/EC/EC_AcceptWayByOrder.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlan_attachmentDAL.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.designer.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.designer.cs 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.designer.cs 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx 91 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.designer.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx 73 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx 118 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.cs 125 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.designer.cs 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.designer.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.designer.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
@@ -463,9 +463,9 @@
        /// <param name="OutOrderId"></param>
        /// <param name="RelationType"></param>
        /// <returns></returns>
        public IEnumerable<EC_OrderBasic> SelectAferOfOutOrder(Infrastructure.Query.Pagination pagination, Guid MemberId, DateTime? StartCreatTime, DateTime? EndCreatTime, DateTime? StartReturnTime, DateTime? EndReturnTime, string Creater, string OutFirm, string WorkStates, string OutOrderId, int? RelationType)
        public IEnumerable<EC_OrderBasic> SelectAferOfOutOrder(Infrastructure.Query.Pagination pagination, Guid MemberId, DateTime? StartCreatTime, DateTime? EndCreatTime, DateTime? StartReturnTime, DateTime? EndReturnTime, string Creater, string OutFirm, string WorkStates, string OutOrderId, int? RelationType, string PayState = null)
        {
            return _eC_OrderBasicDAL.SelectAferOfOutOrder(pagination, MemberId, StartCreatTime, EndCreatTime, StartReturnTime, EndReturnTime, Creater, OutFirm, WorkStates, OutOrderId, RelationType);
            return _eC_OrderBasicDAL.SelectAferOfOutOrder(pagination, MemberId, StartCreatTime, EndCreatTime, StartReturnTime, EndReturnTime, Creater, OutFirm, WorkStates, OutOrderId, RelationType, PayState);
        }
        /// <summary>
CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlan_attachmentBLL.cs
@@ -105,6 +105,18 @@
            return _IOA_WorkPlan_attachmentDAL.GetModelByKaipiaoId(BaozhengjinId);
        }
        /// <summary>
        /// 根据formid获得信息
        /// </summary>
        /// <param name="BaozhengjinId">编号</param>
        /// <returns></returns>
        public IEnumerable<Model.OA_WorkPlan_attachment> GetModelByKaipiaoIdandType(int BaozhengjinId,int AttachmentType)
        {
            return _IOA_WorkPlan_attachmentDAL.GetModelByKaipiaoIdandType(BaozhengjinId, AttachmentType);
        }
        /// <summary>
        /// 获取全部合作客户
        /// </summary>
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
@@ -317,8 +317,9 @@
        /// <param name="WorkStates"></param>
        /// <param name="OutOrderId"></param>
        /// <param name="RelationType"></param>
        /// <param name="PayState"></param>
        /// <returns></returns>
        IEnumerable<EC_OrderBasic> SelectAferOfOutOrder(Infrastructure.Query.Pagination pagination, Guid MemberId, DateTime? StartCreatTime, DateTime? EndCreatTime, DateTime? StartReturnTime, DateTime? EndReturnTime, string Creater, string OutFirm, string WorkStates, string OutOrderId, int? RelationType);
        IEnumerable<EC_OrderBasic> SelectAferOfOutOrder(Infrastructure.Query.Pagination pagination, Guid MemberId, DateTime? StartCreatTime, DateTime? EndCreatTime, DateTime? StartReturnTime, DateTime? EndReturnTime, string Creater, string OutFirm, string WorkStates, string OutOrderId, int? RelationType, string PayState = null);
        /// <summary>
        /// 分页查询外协订单(根据联系人和结束状态)
CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlan_attachmentDAL.cs
@@ -25,5 +25,12 @@
        /// <param name="OA_WorkPlanId">编号</param>
        /// <returns></returns>
        IEnumerable<OA_WorkPlan_attachment> GetModelByKaipiaoId(int OA_WorkPlanId);
        /// <summary>
        /// 根据OA_WorkPlanId获得信息
        /// </summary>
        /// <param name="OA_WorkPlanId">编号</param>
        /// <returns></returns>
        IEnumerable<OA_WorkPlan_attachment> GetModelByKaipiaoIdandType(int OA_WorkPlanId, int AttachmentType);
    }
}
CY_ECommercePlatform/CY.Model/EC/EC_AcceptWayByOrder.cs
@@ -46,6 +46,19 @@
        private string _remark;
        private int? _accepttypeid;
        private string _theawb;
        public string NumPerBag
        {
            set;
            get;
        }
        public string BagNum
        {
            set;
            get;
        }
        /// <summary>
        /// 收货类型编号
        /// </summary>
CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs
@@ -159,6 +159,31 @@
        public string PaperMP { get; set; }
        /// <summary>
        /// 上联
        /// </summary>
        public string shanglian { get; set; }
        /// <summary>
        /// 中联
        /// </summary>
        public string zhonglianlian1 { get; set; }
        /// <summary>
        /// 中联
        /// </summary>
        public string zhonglianlian2 { get; set; }
        /// <summary>
        /// 中联
        /// </summary>
        public string zhonglianlian3 { get; set; }
        /// <summary>
        /// 下联
        /// </summary>
        public string xialian { get; set; }
        /// <summary>
        /// 纸张名称
        /// </summary>
        public string pageNumsbs { get; set; }
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -714,6 +714,8 @@
                     new SqlParameter("@buyerId",DBNull.Value){SqlDbType=SqlDbType.UniqueIdentifier},
                     new SqlParameter("@DocumentName",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=50},
                     new SqlParameter("@Orderids",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=500},
                       new SqlParameter("@WorkStates",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=500},
                         new SqlParameter("@DeleverStates",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=500},
            };
@@ -798,9 +800,9 @@
                }
            }
            /*获取页数与返回数据条数*/
            int? resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[32].Value);
            int? resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[34].Value);
            pagination.PageCount = resultValue.HasValue ? resultValue.Value : 0;
            resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[33].Value);
            resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[35].Value);
            pagination.RecordCount = resultValue.HasValue ? resultValue.Value : 0;
            return result;
@@ -2901,8 +2903,9 @@
        /// <param name="WorkStates"></param>
        /// <param name="OutOrderId"></param>
        /// <param name="RelationType"></param>
        /// <param name="PayState"></param>
        /// <returns></returns>
        public IEnumerable<EC_OrderBasic> SelectAferOfOutOrder(Infrastructure.Query.Pagination pagination, Guid MemberId, DateTime? StartCreatTime, DateTime? EndCreatTime, DateTime? StartReturnTime, DateTime? EndReturnTime, string Creater, string OutFirm, string WorkStates, string OutOrderId, int? RelationType)
        public IEnumerable<EC_OrderBasic> SelectAferOfOutOrder(Infrastructure.Query.Pagination pagination, Guid MemberId, DateTime? StartCreatTime, DateTime? EndCreatTime, DateTime? StartReturnTime, DateTime? EndReturnTime, string Creater, string OutFirm, string WorkStates, string OutOrderId, int? RelationType, string PayState = null)
        {
            try
            {
@@ -2913,6 +2916,9 @@
                if (RelationType > 0)
                    condition += " and  b.RelationTypeId = '" + RelationType + "' ";
                if (!string.IsNullOrEmpty(PayState))
                    condition += " and  a.PayState = " + PayState + " ";
                if (StartCreatTime != null)
                    condition += " and  a.CreateTime >= '" + StartCreatTime.Value + "' ";
CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlan_attachmentDAL.cs
@@ -166,11 +166,24 @@
        /// <returns></returns>
        public IEnumerable<Model.OA_WorkPlan_attachment> GetModelByKaipiaoId(int OA_WorkPlanId)
        {
            return _dataBase.SelectModel<Model.OA_WorkPlan_attachment>(" * ", " OA_WorkPlan_attachment ", " OA_WorkPlanId = '" + OA_WorkPlanId + "' order by CreateTime desc ") as IList<Model.OA_WorkPlan_attachment>;//执行查询
            return _dataBase.SelectModel<Model.OA_WorkPlan_attachment>(" * ", " OA_WorkPlan_attachment ", " OA_WorkPlanId = '" + OA_WorkPlanId + "' and [AttachmentType] in (1,2) order by CreateTime desc ") as IList<Model.OA_WorkPlan_attachment>;//执行查询
        }
        /// <summary>
        /// 全部查询
        /// </summary>
        /// <param name="query"></param>
        /// <returns></returns>
        public IEnumerable<Model.OA_WorkPlan_attachment> GetModelByKaipiaoIdandType(int OA_WorkPlanId, int AttachmentType)
        {
            return _dataBase.SelectModel<Model.OA_WorkPlan_attachment>(" * ", " OA_WorkPlan_attachment ", " OA_WorkPlanId = '" + OA_WorkPlanId + "' and [AttachmentType] = '" + AttachmentType + "' order by CreateTime desc ") as IList<Model.OA_WorkPlan_attachment>;//执行查询
        }
        /// <summary>
        /// 分页查询
        /// </summary>
        /// <param name="query"></param>
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
@@ -260,11 +260,18 @@
                        <select id='selWorkStates' runat="server" keepdefaultstyle="true">
                            <option value="">全部</option>
                            <option value="true">已完工</option>
                            <option value="false">未完工</option>
                            <option value="false" selected="selected">未完工</option>
                        </select>
                    </td>
                </tr>
                <tr>
                     <td class="ali03">
                        付款状态:
                    </td>
                    <td>
                         <select id='selPayStates' runat="server" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle="true" style="width: 85px">
                        </select>
                    </td>
                    <td class="ali03">
                        返回时间:
                    </td>
@@ -277,7 +284,7 @@
                    <td>
                        <input id="txtOutOrderId" type="text" runat="server" class='w80px' maxlength='20' />
                    </td>
                    <td style="text-align: right;" colspan="3">
                    <td style="text-align: right;" >
                    </td>
                    <td>
                        <asp:Button ID="btn_Search" Text="查询" OnClick="btn_Search_Click" runat="server" />&nbsp;
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.cs
@@ -10,6 +10,7 @@
using CY.BLL.EC;
using CY.Infrastructure.Query;
using System.Transactions;
using CY.BLL.Sys;
namespace CY.WebForm.Pages.business
{
@@ -117,6 +118,11 @@
            this.selOutFirm.DataValueField = "FirmId";
            this.selOutFirm.DataBind();
            this.selOutFirm.Items.Insert(0, new ListItem("全部", ""));
            Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//字典业务逻辑操作类对象
            this.selPayStates.DataSource = _sys_DictionaryBLL.GetDataByType("EC_订单支付状态");
            this.selPayStates.DataBind();
            this.selPayStates.Items.Insert(0,new ListItem("全部", ""));
        }
        //绑定数据
@@ -125,7 +131,7 @@
            Pagination pa = new Pagination();
            pa.PageSize = UCPager1.AspNetPager.PageSize;
            pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
            this.RepClientList.DataSource = bll_EC_OrderBasicBLL.SelectAferOfOutOrder(pa, CurrentUser.MemberId, this.txtStartCreatTime.Value.ToDateTime2(), this.txtEndCreatTime.Value.ToDateTime2(), this.txtStartReturnTime.Value.ToDateTime2(), this.txtEndReturnTime.Value.ToDateTime2(), this.txtCreater.Value, this.selOutFirm.Value, this.selWorkStates.Value, this.txtOutOrderId.Value, 4);
            this.RepClientList.DataSource = bll_EC_OrderBasicBLL.SelectAferOfOutOrder(pa, CurrentUser.MemberId, this.txtStartCreatTime.Value.ToDateTime2(), this.txtEndCreatTime.Value.ToDateTime2(), this.txtStartReturnTime.Value.ToDateTime2(), this.txtEndReturnTime.Value.ToDateTime2(), this.txtCreater.Value, this.selOutFirm.Value, this.selWorkStates.Value, this.txtOutOrderId.Value, 4,this.selPayStates.Value);
            this.RepClientList.DataBind();
            UCPager1.AspNetPager.RecordCount = pa.RecordCount;
        }
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.designer.cs
@@ -87,6 +87,15 @@
        protected global::System.Web.UI.HtmlControls.HtmlSelect selWorkStates;
        /// <summary>
        /// selPayStates 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selPayStates;
        /// <summary>
        /// txtStartReturnTime 控件。
        /// </summary>
        /// <remarks>
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx
@@ -109,11 +109,7 @@
                        <td>
                            <input id="txtRegTimeStart" type="text" class="date w90px" datefmt="yyyy-MM-dd" runat="server" />-<input id="txtRegTimeEnd" type="text" class="date w90px" datefmt="yyyy-MM-dd" runat="server" />
                        </td>
                        <td class="ali03">客户编号:
                        </td>
                        <td>
                            <input type="text" runat="server" id="txtUserNum" />
                        </td>
                        <td class="ali03">客户名称:
                        </td>
                        <td>
@@ -123,6 +119,14 @@
                        </td>
                        <td>
                            <select id="selSourcesInfoId" runat="server" datatextfield="Name" datavaluefield="Keyid" keepdefaultstyle='true'>
                            </select>
                        </td>
                         <td class="ali03" >合同上传:</td>
                        <td>
                            <select id="selHetongshangchuan" runat="server" keepdefaultstyle='true'>
                                <option value="">全部</option>
                                 <option value="1">是</option>
                                 <option value="0">否</option>
                            </select>
                        </td>
                    </tr>
@@ -216,15 +220,14 @@
                                <option value="">未完结</option>
                            </select>
                        </td>
                        <td class="ali03" >合同上传:</td>
                        <td>
                            <select id="selHetongshangchuan" runat="server" keepdefaultstyle='true'>
                                <option value="">全部</option>
                                 <option value="1">是</option>
                                 <option value="0">否</option>
                            </select>
                         <td class="ali03" style="display:none;">客户编号:
                        </td>
                        <td>
                        <td style="display:none;">
                            <input type="text" runat="server" id="txtUserNum" />
                        </td>
                        <td colspan="2">
                            <asp:Button CssClass="button" ID="btn_Search" Text="查询" runat="server" padding="0px" OnClick="btn_Search_Click" />
                            <input type="button" onclick="resetSearch()" value="重置" />
                        </td>
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.designer.cs
@@ -51,15 +51,6 @@
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeEnd;
        /// <summary>
        /// txtUserNum 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtUserNum;
        /// <summary>
        /// txtquery_userName 控件。
        /// </summary>
        /// <remarks>
@@ -76,6 +67,15 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selSourcesInfoId;
        /// <summary>
        /// selHetongshangchuan 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selHetongshangchuan;
        /// <summary>
        /// selCustomerTypeId 控件。
@@ -222,13 +222,13 @@
        protected global::System.Web.UI.HtmlControls.HtmlSelect selShifouwanjie;
        /// <summary>
        /// selHetongshangchuan 控件。
        /// txtUserNum 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selHetongshangchuan;
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtUserNum;
        /// <summary>
        /// btn_Search 控件。
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx
@@ -351,6 +351,20 @@
                                <%#Eval("FetchContacts")%>&nbsp;
                            </td>
                        </tr>
                        <tr>
                        <td class='left'>
                           每包数量:
                        </td>
                        <td>
                            <%#Eval("NumPerBag")%>&nbsp;
                        </td>
                        <td class="left">
                            总包数:
                        </td>
                        <td colspan="5">
                            <%#Eval("BagNum")%>&nbsp;
                        </td>
                    </tr>
                    </div>
                </ItemTemplate>
            </asp:Repeater>
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs
@@ -125,6 +125,9 @@
                return false;
            }
            _eC_AcceptWayByOrder.NumPerBag = _eC_OrderBasic.OrderExtend.NumPerBag;
            _eC_AcceptWayByOrder.BagNum = _eC_OrderBasic.OrderExtend.BagNum;
            EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
            EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(orderId.Value);
            InquiryCommonModel _inquiryCommonModel = null;
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=179" type="text/javascript"></script>
    <script src="../../js/Inquiry/Inquiry.js?v=184" type="text/javascript"></script>
    <script src="../../js/business/Order.js?v=46" type="text/javascript"></script>
    <!--前台页面end-->
    <script type="text/javascript" language="javascript">
@@ -500,12 +500,11 @@
        var count = document.getElementById('printCount').value;
        var numPerBag = parseInt($("#txtNumberPerBag").val());
        if (isNaN(count)) {
        if (isNaN(count) || isNaN(numPerBag)) {
            $("#txtBagNum").val(0);
           /* $("#txtBagNum").val("");*/
        }
        else {
            var bagNum = parseInt(count / numPerBag);
            $("#txtBagNum").val(bagNum);
        }
@@ -515,9 +514,9 @@
        var count = document.getElementById('printCount').value;
        var bagNum = parseInt($("#txtBagNum").val());
        if (isNaN(count)) {
        if (isNaN(count) || isNaN(bagNum)) {
            
            $("#txtNumberPerBag").val(0);
          /*  $("#txtNumberPerBag").val("");*/
        }
        else {
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -264,13 +264,7 @@
                    <td>
                        <input id='txtCustormerName' runat="server" maxlength='50' />
                    </td>
                    <td class="ali03">
                        客户经理:
                    </td>
                    <td>
                        <select keepdefaultstyle='true' id='selCustormerManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
                        </select>
                    </td>
                    <td class="ali03">
                        业务经理:
                    </td>
@@ -279,10 +273,23 @@
                        </select>
                    </td>
                    <td class="ali03">
                        订单状态:
                         完工状态:
                    </td>
                    <td>
                        <select keepdefaultstyle='true' id='selOrderStates' runat="server" datatextfield="Name" datavaluefield="MeanValue">
                          <select id='selWorkStates' runat="server" keepdefaultstyle="true">
                            <option value="">全部</option>
                            <option value="true">已完工</option>
                            <option value="false">未完工</option>
                        </select>
                    </td>
                    <td class="ali03">
                        送货状态:
                    </td>
                    <td>
                        <select id='selDeleverStates' runat="server" keepdefaultstyle="true">
                            <option value="">全部</option>
                            <option value="true">已送货</option>
                            <option value="false">未送货</option>
                        </select>
                    </td>
                </tr>
@@ -332,9 +339,13 @@
                </tr>
                 <tr>
                    <td class="ali03">                        
                        客户经理:
                    </td>
                    <td>                        
                        <select keepdefaultstyle='true' id='selCustormerManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
                        </select>
                    </td>
                    <td class="ali03"> </td>
                    <td> </td>
                    <td class="ali03"> </td>
@@ -342,6 +353,13 @@
                    <td class="ali03"> </td>
                    <td> </td>
                    <td> </td>
                      <td class="ali03" style="display:none;">
                        订单状态:
                    </td>
                    <td  style="display:none;">
                        <select keepdefaultstyle='true' id='selOrderStates' runat="server" datatextfield="Name" datavaluefield="MeanValue">
                        </select>
                    </td>
                    <td>
                        <asp:button id="btn_Search" text="查询" runat="server" />&nbsp;<input type="button" value='重置' onclick='document.body.innerHTML="";window.location=window.location;' />
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
@@ -561,6 +561,8 @@
            SetParamValue(searchParam, 20, CurrentUser.StaffId);
            SetParamValue(searchParam, 21, CurrentUser.TrueName);
            SetParamValue(searchParam, 28, this.txtSearchyjname.Value);
            SetParamValue(searchParam, 30, this.selWorkStates.Value);
            SetParamValue(searchParam, 31, this.selDeleverStates.Value);
            if (!IsPostBack && !IsCallback)
            {
                if (Session["OrderList"] != null)
@@ -609,6 +611,10 @@
                            this.selAppraise.SelectedValue = searchParam[index].ToString();
                        if (index == 28)
                            this.txtSearchyjname.Value = searchParam[index].ToString();
                        if (index == 30)
                            this.selWorkStates.Value = searchParam[index].ToString();
                        if (index == 31)
                            this.selDeleverStates.Value = searchParam[index].ToString();
                    }
@@ -620,7 +626,6 @@
                    SetParamValue(searchParam, 19, CurrentUser.TrueMemberId);
                    SetParamValue(searchParam, 20, CurrentUser.StaffId);
                    SetParamValue(searchParam, 21, CurrentUser.TrueName);
                    SetParamValue(searchParam, 28, this.txtSearchyjname.Value);
                }
            }
            else
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.designer.cs
@@ -114,15 +114,6 @@
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtCustormerName;
        /// <summary>
        /// selCustormerManager 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selCustormerManager;
        /// <summary>
        /// selBusinessManager 控件。
        /// </summary>
        /// <remarks>
@@ -132,13 +123,22 @@
        protected global::System.Web.UI.HtmlControls.HtmlSelect selBusinessManager;
        /// <summary>
        /// selOrderStates 控件。
        /// selWorkStates 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selOrderStates;
        protected global::System.Web.UI.HtmlControls.HtmlSelect selWorkStates;
        /// <summary>
        /// selDeleverStates 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selDeleverStates;
        /// <summary>
        /// selPayStates 控件。
@@ -186,6 +186,24 @@
        protected global::System.Web.UI.WebControls.DropDownList selAppraise;
        /// <summary>
        /// selCustormerManager 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selCustormerManager;
        /// <summary>
        /// selOrderStates 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selOrderStates;
        /// <summary>
        /// btn_Search 控件。
        /// </summary>
        /// <remarks>
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx
@@ -43,6 +43,31 @@
                    <td> <span id="ordernjine" runat="server" ></span></td>
                </tr>
                <tr>
             <td class="ali03 w100px">
                    审批证明:
                </td>
                <td>
                     <input type="file" id="file1" name="__hetongFile" keepdefaultstyle="true" runat="server" text="请选择文件" />
                   <input type="button" value="上传图片" onclick="checkSelFile();" />
                </td>
             </tr>
                   <tr    class="AddTab" style="display:none;" >
                                <td class="ali03 w100px">
                </td>
                <td>
                     <input type="hidden" name="HideKeyidFapiao" value="0"   />
                      <input type="hidden" name="HideAttachmentFapiao" value=""   />
                    <a title="查看图片" name="HrefAttachmentFapiao"   target="view_window" href="0">
                               图片
                            </a>
                     <a    name="shanchuAttachmentFapiao"    href="#" onclick="deletefujian(this);" >
                               X
                            </a>
                </td>
                                    </tr>
                <tr>
                    <td colspan="2"></td>
                </tr>
                 <tr id="trbtn" runat="server">
@@ -154,5 +179,71 @@
                alert('请输入有效的正负金额,例如  45.67');
            }
        }
        //查看
        function checkSelFile() {
                var oFile = document.getElementById('file1');
                if (oFile.value == "") {
                    alertMsg('没有选择文件');
                    return;
                }
                var formData = new FormData();
                formData.append('file', oFile.files[0]); // this.files[0]是文件对象
                $.ajax({
                    url: 'https://yocaisim.51zhengcai.com/api/UpFile/UpdateFile', // 替换为你的服务器端点
                    type: 'POST',
                    data: formData,
                    contentType: false,
                    processData: false,
                    async: false,        // 设置为同步
                    success: function (response) {
                        console.log('File uploaded successfully:', response);
                        if (response.code == 1) {
                            $(".AddTab").last().after($(".AddTab").last().clone(true));
                            $(".AddTab").last().show();
                            $("input[name='HideKeyidFapiao']").last().val("");
                            $("input[name='HideAttachmentFapiao']").last().val(response.data);
                            $('a[name="HrefAttachmentFapiao"]').last().attr("href", response.data);
                            $('a[name="HrefAttachmentFapiao"]').last().html('<img src="' + response.data+'" width="20" height="20" />');
                            alertMsg('上传成功');
                        } else {
                            alertMsg('上传失败');
                        }
                    },
                    error: function (xhr, status, error) {
                        console.error('File upload failed:', status, error);
                        alertMsg('上传失败');
                    }
                });
        }
        function deletefujian(obj) {
            if (confirm("是否删除选中数据?")) {
                $(obj).parent().parent().remove()
            }
        }
    </script>
</html>
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs
@@ -26,6 +26,7 @@
        OA_StaffBLL bll_OA_StaffBLL = null;
        OA_WorkPlanBll oA_WorkReminderBll = null;
        OA_SuppliersBLL _OA_SuppliersBLL = null;
        OA_WorkPlan_attachmentBLL oA_WorkPlan_AttachmentBLL = null;
        //初始化
@@ -38,6 +39,7 @@
            bll_OA_StaffBLL = new OA_StaffBLL();
            oA_WorkReminderBll = new OA_WorkPlanBll();
            _OA_SuppliersBLL = new OA_SuppliersBLL();
            oA_WorkPlan_AttachmentBLL = new OA_WorkPlan_attachmentBLL();
        }
        //页面加载
@@ -271,7 +273,29 @@
                            m_OA_WorkPlan.PlanTitle =  "订单金额:" + this.ordernjine.InnerText + ", 收款单位:" + _SupplierName + "。"; 
                            m_OA_WorkPlan.PlanType = 3;
                            m_OA_WorkPlan.LastUpdateTime = nowTime;
                        result = oA_WorkReminderBll.InsertModel(m_OA_WorkPlan);
                        var workid = oA_WorkReminderBll.InserModelAndGetId(m_OA_WorkPlan);
                        m_OA_WorkPlan.Keyid = workid;
                        if (workid > 0)
                        {
                            var HideKeyidFapiao = Request["HideKeyidFapiao"].Split(',');
                            var HideAttachmentFapiao = Request["HideAttachmentFapiao"].Split(',');
                            for (int i = 0; i < HideKeyidFapiao.Length; i++)
                            {
                                if (HideKeyidFapiao[i] != "0")
                                {
                                    var a_WorkPlan_Attachment = new OA_WorkPlan_attachment();
                                    a_WorkPlan_Attachment.OA_WorkPlanId = m_OA_WorkPlan.Keyid;
                                    a_WorkPlan_Attachment.AttachmentType = 14;
                                    a_WorkPlan_Attachment.PlanAttachment = HideAttachmentFapiao[i];
                                    a_WorkPlan_Attachment.CreateTime = DateTime.Now;
                                    a_WorkPlan_Attachment.Operator = CurrentUser.TrueName;
                                    var sss = oA_WorkPlan_AttachmentBLL.InsertModel(a_WorkPlan_Attachment);
                                }
                                else
                                {
                                    continue;
                                }
                            }
@@ -280,6 +304,15 @@
                        
                     
                        }
                        result = true;
                        
                        if (!result)
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.designer.cs
@@ -96,6 +96,15 @@
        protected global::System.Web.UI.HtmlControls.HtmlGenericControl ordernjine;
        /// <summary>
        /// file1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputFile file1;
        /// <summary>
        /// trbtn 控件。
        /// </summary>
        /// <remarks>
CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx
@@ -138,6 +138,7 @@
                <td align="left" style="padding-left: 40px;width:80px;" ><input type="checkbox" name="works" value="24" />&nbsp;套号</td>
                <td align="left" style="width:80px;" ><input type="checkbox" name="works" value="4" />&nbsp;压痕</td>
                <td align="left" style="width:80px;" ><input type="checkbox" name="works" value="6" />&nbsp;打点线</td>
                <td align="left" style="width:80px;" ><input type="checkbox" name="works" value="101" />&nbsp;竖式</td>
               <%--  <td align="left"><div style="float:left"><input type="checkbox" id="worksjiaozuo"  name="works" value="99" onclick="SelectFuc(this)" index="0"/>&nbsp;胶左</div><div style="float:left; display:none" id="divJTT0">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;每本张数:<input type="text" name="pNameMP" style="width:60px" class="validateInt" defaultValue="1" value="1"/>张/本</div></td>
                <td align="left"><div style="float:left"><input type="checkbox" id="worksjiaotou"  name="works" value="13" onclick="SelectFuc(this)" index="0"/>&nbsp;胶头</div><div style="float:left; display:none" id="divJT0">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;每本张数:<input type="text" name="pageNum" style="width:60px" class="validateInt" defaultValue="1" value="1"/>张/本</div></td>--%>
                 <td align="left" style="width:150px;" > 装订:<select name='jtWZ'   onchange="SelectjtWZ();"  >
@@ -146,10 +147,10 @@
                     <option value="封面80克牛皮纸">封面80克牛皮纸</option>
                     <option value="封面100克牛皮纸">封面100克牛皮纸</option>
                     <option value="封面120克牛皮纸">封面120克牛皮纸</option>
                     <option value="封面兰皮文">封面兰皮文</option>
                     <option value="封面白皮文">封面白皮文</option>
                     <option value="封面黄皮文">封面黄皮文</option>
                     <option value="封面红皮文">封面红皮文</option>
                     <option value="封面兰皮文">封面兰皮纹</option>
                     <option value="封面白皮文">封面白皮纹</option>
                     <option value="封面黄皮文">封面黄皮纹</option>
                     <option value="封面红皮文">封面红皮纹</option>
                     <option value="封面200克铜版纸">封面200克铜版纸</option>
                     <option value="封面230克铜版纸">封面230克铜版纸</option>
                     <option value="散页">散页</option>
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -195,6 +195,16 @@
                    remarks = request["remarks"].ToString();
                if (request["pNameMP"] != null)
                    paperMP = request["pNameMP"].ToString();
                if (request["shanglian"] != null)
                    model.shanglian = request["shanglian"].ToString();
                if (request["zhonglianlian1"] != null)
                    model.zhonglianlian1 = request["zhonglianlian1"].ToString();
                if (request["zhonglianlian2"] != null)
                    model.zhonglianlian2 = request["zhonglianlian2"].ToString();
                if (request["zhonglianlian3"] != null)
                    model.zhonglianlian3 = request["zhonglianlian3"].ToString();
                if (request["xialian"] != null)
                    model.xialian = request["xialian"].ToString();
                if (request["pageNumsbs"] != null)
                    pageNumsbs = request["pageNumsbs"].ToString();
                if (request["printBoxNumber"] != null)
@@ -1964,7 +1974,7 @@
                    if (model.PrintMode == 1)
                    {
                        printDemand += model.PaperMP + ",";
                        printDemand += model.RLNum + ",";
                    }
                    else
                    {
@@ -1972,7 +1982,7 @@
                        PaperInfoBLL _paperInfoBLL = new PaperInfoBLL();
                        SysInquiry_PaperInfo paperInfo = _paperInfoBLL.GetPaperModel(model.PaperMP.ToInt32().Value);
                        printDemand += paperInfo.PaperName;
                        if (model.PaperId != 0)
                        if (model.PaperId != 0 && paperInfo.PaperName != "无碳复写纸")
                        {
                            BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
                            SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
@@ -1980,8 +1990,43 @@
                            printDemand += "," + model.GramWeight + "克";
                        }
                        printDemand += ",每本" + model.PageNum + "份,";
                    }
                    printDemand += model.RLNum + ",";
                        if (paperInfo.PaperName == "无碳复写纸")
                        {
                            if(model.RLNum == "两联")
                            {
                                printDemand += model.shanglian + ",";
                                printDemand += model.xialian + ",";
                            }
                            else if (model.RLNum == "三联")
                            {
                                printDemand += model.shanglian + ",";
                                printDemand += model.zhonglianlian1 + ",";
                                printDemand += model.xialian + ",";
                            }
                            else if (model.RLNum == "四联")
                            {
                                printDemand += model.shanglian + ",";
                                printDemand += model.zhonglianlian1 + ",";
                                printDemand += model.zhonglianlian2 + ",";
                                printDemand += model.xialian + ",";
                            }
                            else if (model.RLNum == "五联")
                            {
                                printDemand += model.shanglian + ",";
                                printDemand += model.zhonglianlian1 + ",";
                                printDemand += model.zhonglianlian2 + ",";
                                printDemand += model.zhonglianlian3 + ",";
                                printDemand += model.xialian + ",";
                            }
                        }
                    }
                    printDemand += model.PrintColor + "";
                  
CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx
@@ -5,6 +5,40 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
    <title>收据联单询价</title>
       <script type="text/javascript" language="javascript">
           function selectrlNum() {
               var rlNum0 = $("#rlNum0").val();
               if (rlNum0 == "两联") {
                   $("#shanglian0").show();
                   $("#zhonglianlian1").hide();
                   $("#zhonglianlian2").hide();
                   $("#zhonglianlian3").hide();
                   $("#xialian0").show();
               } else if (rlNum0 == "三联") {
                   $("#shanglian0").show();
                   $("#zhonglianlian1").show();
                   $("#zhonglianlian2").hide();
                   $("#zhonglianlian3").hide();
                   $("#xialian0").show();
               } else if (rlNum0 == "四联") {
                   $("#shanglian0").show();
                   $("#zhonglianlian1").show();
                   $("#zhonglianlian2").show();
                   $("#zhonglianlian3").hide();
                   $("#xialian0").show();
               } else if (rlNum0 == "五联") {
                   $("#shanglian0").show();
                   $("#zhonglianlian1").show();
                   $("#zhonglianlian2").show();
                   $("#zhonglianlian3").show();
                   $("#xialian0").show();
               }
           }
       </script>
</head>
<body>
    <table class="table2">
@@ -31,6 +65,9 @@
                </th>
                <th style="text-align: center;">
                    联数
                </th>
                <th style="text-align: center;"  class="yanse0">
                    颜色
                </th>
                <th style="text-align: center;">
                    印刷数量(本)
@@ -81,13 +118,47 @@
                    </select>
                </td>
                <td>
                    <select class="selectLaber" name="rlNum">
                    <select class="selectLaber" name="rlNum" id="rlNum0" onchange="selectrlNum();">
                        <option value="两联">两联</option>
                        <option value="三联">三联</option>
                        <option value="四联">四联</option>
                        <option value="五联">五联</option>
                    </select>
                </td>
                 <td  class="yanse0" >
                    <select class="selectLaber" name="shanglian" id="shanglian0">
                        <option value="白">白</option>
                    </select>
                      <select class="selectLaber" name="zhonglianlian1" id="zhonglianlian1">
                        <option value="红">红</option>
                          <option value="黄">黄</option>
                          <option value="蓝">蓝</option>
                          <option value="绿">绿</option>
                          <option value="白">白</option>
                    </select>
                       <select class="selectLaber" name="zhonglianlian2" id="zhonglianlian2">
                        <option value="红">红</option>
                          <option value="黄">黄</option>
                          <option value="蓝">蓝</option>
                          <option value="绿">绿</option>
                          <option value="白">白</option>
                    </select>
                       <select class="selectLaber" name="zhonglianlian3" id="zhonglianlian3">
                        <option value="红">红</option>
                          <option value="黄">黄</option>
                          <option value="蓝">蓝</option>
                          <option value="绿">绿</option>
                          <option value="白">白</option>
                    </select>
                       <select class="selectLaber" name="xialian" id="xialian0">
                        <option value="红">红</option>
                          <option value="黄">黄</option>
                          <option value="蓝">蓝</option>
                          <option value="绿">绿</option>
                          <option value="白">白</option>
                    </select>
                </td>
                <td align="center">
                    <table>
                        <tr>
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx
@@ -19,9 +19,13 @@
                if ($(this).val() == "15") {
                    
                    $(".trShoukuandanwei").css("display", "table-row");
                    $(".shangchanfujian").show();
                } else {
                   
                    $(".trShoukuandanwei").css("display", "none");
                    $(".shangchanfujian").hide();
                }
                
@@ -37,9 +41,11 @@
            if ($("#selPlanDataType").val() == "15") {
                $(".trShoukuandanwei").css("display", "table-row");
                $(".shangchanfujian").show();
            } else {
                $(".trShoukuandanwei").css("display", "none");
                $(".shangchanfujian").hide();
            }
            SelectAddSearch();
@@ -93,6 +99,74 @@
                });
            });
        }
        //查看
        function checkSelFile() {
            var oFile = document.getElementById('file1');
            if (oFile.value == "") {
                alertMsg('没有选择文件');
                return;
            }
            var formData = new FormData();
            formData.append('file', oFile.files[0]); // this.files[0]是文件对象
            $.ajax({
                url: 'https://yocaisim.51zhengcai.com/api/UpFile/UpdateFile', // 替换为你的服务器端点
                type: 'POST',
                data: formData,
                contentType: false,
                processData: false,
                async: false,        // 设置为同步
                success: function (response) {
                    console.log('File uploaded successfully:', response);
                    if (response.code == 1) {
                        $(".AddTab").last().after($(".AddTab").last().clone(true));
                        $(".AddTab").last().show();
                        $("input[name='HideKeyidFapiao']").last().val("");
                        $("input[name='HideAttachmentFapiao']").last().val(response.data);
                        $('a[name="HrefAttachmentFapiao"]').last().attr("href", response.data);
                        $('a[name="HrefAttachmentFapiao"]').last().html('<img src="' + response.data + '" width="20" height="20" />');
                        alertMsg('上传成功');
                    } else {
                        alertMsg('上传失败');
                    }
                },
                error: function (xhr, status, error) {
                    console.error('File upload failed:', status, error);
                    alertMsg('上传失败');
                }
            });
        }
        function deletefujian(obj) {
            if (confirm("是否删除选中数据?")) {
                $(obj).parent().parent().remove()
            }
        }
    </script>
</head>
<body>
@@ -168,6 +242,50 @@
                    <textarea id="txtPlanRemark" runat="server" style="width: 390px; height: 50px;" ></textarea>
                </td>
            </tr>
            <tr class="shangchanfujian">
             <td class="ali03 w100px">
                    审批证明:
                </td>
                <td colspan="3">
                     <input type="file" id="file1" name="__hetongFile" keepdefaultstyle="true" runat="server" text="请选择文件" />
                   <input type="button" value="上传图片" onclick="checkSelFile();" />
                </td>
             </tr>
                   <tr    class="AddTab" style="display:none;" >
                                <td class="ali03 w100px">
                </td>
                <td colspan="3">
                     <input type="hidden" name="HideKeyidFapiao" value="0"   />
                      <input type="hidden" name="HideAttachmentFapiao" value=""   />
                    <a title="查看图片" name="HrefAttachmentFapiao"   target="view_window" href="0">
                               图片
                            </a>
                     <a    name="shanchuAttachmentFapiao"    href="#" onclick="deletefujian(this);" >
                               X
                            </a>
                </td>
                                    </tr>
              <asp:Repeater ID="RepClientList" runat="server">
                           <ItemTemplate>
                               <tr    class="AddTab shangchanfujian" >
                                <td class="ali03 w100px">
                </td>
                <td colspan="3">
                     <input type="hidden" name="HideKeyidFapiao" value="<%#Eval("Keyid")%>"   />
                      <input type="hidden" name="HideAttachmentFapiao" value="<%#Eval("PlanAttachment")%>"   />
                    <a title="查看图片" name="HrefAttachmentFapiao"   target="view_window" href="<%#Eval("PlanAttachment")%>">
                               <img src="<%#Eval("PlanAttachment")%>" width="20" height="20" />
                            </a>
                     <a    name="shanchuAttachmentFapiao"    href="#" onclick="deletefujian(this);" >
                               X
                            </a>
                </td>
                                    </tr>
                                </ItemTemplate>
                           </asp:Repeater>
            <tr>
                <td colspan="4" style="text-align: center;">
                    <asp:Button ID="btn_submit" runat="server" OnClick="btn_submit_form" Text="提交" />
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.cs
@@ -14,6 +14,7 @@
using CY.Infrastructure.DESEncrypt;
using CY.Infrastructure.Query;
using CY.BLL.OA;
using System.Transactions;
namespace CY.WebForm.Pages.work
{
@@ -28,6 +29,7 @@
        OA_WorkPlanBll oA_WorkReminderBll = null;
        OA_CarDictionaryBLL bll_OA_CarDictionaryBLL = null;
        OA_SuppliersBLL _OA_SuppliersBLL = null;
        OA_WorkPlan_attachmentBLL oA_WorkPlan_AttachmentBLL = null;
        public MyRequestAdd()
        {
            departmentBll = new OA_DepartmentBll();
@@ -36,6 +38,7 @@
            oA_StaffBLL = new OA_StaffBLL();
            bll_OA_CarDictionaryBLL = new OA_CarDictionaryBLL();
            _OA_SuppliersBLL = new OA_SuppliersBLL(); 
            oA_WorkPlan_AttachmentBLL = new OA_WorkPlan_attachmentBLL();
        }
        //页面加载
@@ -89,14 +92,32 @@
                    this.txtShoukuandanwei.Value = "";
                }
                this.txtPlanContent.Value = m_OA_WorkPlan.PlanContent.ToString();
                if(m_OA_WorkPlan.PlanDataType == 15)
                {
                    this.RepClientList.DataSource = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoIdandType(Request["keyid"].ToInt32().Value,15);
                    this.RepClientList.DataBind();
                }
            }
        }
        //表单提交
        protected void btn_submit_form(object sender, EventArgs e)
        {
            using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
    new TransactionOptions
    {
        IsolationLevel = System.Transactions.IsolationLevel.ReadCommitted,
        Timeout = TransactionManager.MaximumTimeout
    }
    )
             )
            {
            try
            {
                    bool res = true;
                DateTime nowTime = DateTime.Now;
                OA_WorkPlan m_OA_WorkPlan = oA_WorkReminderBll.GetModelByKeyid(Request["keyid"].ToInt32());
                if (m_OA_WorkPlan == null)
@@ -175,24 +196,118 @@
                if (Request["keyid"].ToInt32() > 0)
                {
                    if (oA_WorkReminderBll.UpdateModel(m_OA_WorkPlan))
                        JavaScript.MessageBox("更新成功", this, true, true);
                    else
                        JavaScript.MessageBox("操作失败", this);
                        res = oA_WorkReminderBll.UpdateModel(m_OA_WorkPlan);
                        if (res && m_OA_WorkPlan.PlanDataType == 15)
                        {
                            var HideKeyidFapiao = Request["HideKeyidFapiao"].Split(',');
                            var HideAttachmentFapiao = Request["HideAttachmentFapiao"].Split(',');
                            //需要删除的附件
                            var oA_WorkPlan_Attachments = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoIdandType(m_OA_WorkPlan.Keyid.Value, 15);
                            List<int> HideKeyidFujianid = new List<int>();
                            for (int i = 0; i < HideKeyidFapiao.Length; i++)
                            {
                                if (!string.IsNullOrEmpty(HideKeyidFapiao[i]) && HideKeyidFapiao[i].ToInt32() != 0)
                                {
                                    HideKeyidFujianid.Add(HideKeyidFapiao[i].ToInt32().Value);
                                }
                            }
                            var oA_WorkPlan_Attachments1 = oA_WorkPlan_Attachments.Where(x => !HideKeyidFujianid.Contains(x.Keyid)).ToList();
                            foreach (var oa_WorkPlan_Attachment in oA_WorkPlan_Attachments1)
                            {
                                res = oA_WorkPlan_AttachmentBLL.DeleteModel(oa_WorkPlan_Attachment);
                            }
                            for (int i = 0; i < HideKeyidFapiao.Length; i++)
                            {
                                if (string.IsNullOrEmpty(HideKeyidFapiao[i]))
                                {
                                    var a_WorkPlan_Attachment = new OA_WorkPlan_attachment();
                                    a_WorkPlan_Attachment.OA_WorkPlanId = m_OA_WorkPlan.Keyid;
                                    a_WorkPlan_Attachment.AttachmentType = 15;
                                    a_WorkPlan_Attachment.PlanAttachment = HideAttachmentFapiao[i];
                                    a_WorkPlan_Attachment.CreateTime = DateTime.Now;
                                    a_WorkPlan_Attachment.Operator = CurrentUser.TrueName;
                                    var sss = oA_WorkPlan_AttachmentBLL.InsertModel(a_WorkPlan_Attachment);
                }
                else
                {
                    if (oA_WorkReminderBll.InsertModel(m_OA_WorkPlan))
                                    continue;
                                }
                            }
                            scope.Complete();
                            JavaScript.MessageBox("更新成功", this, true, true);
                        }
                        else
                            JavaScript.MessageBox("操作失败", this);
                    }
                    else
                    {
                        var aaaa = oA_WorkReminderBll.InserModelAndGetId(m_OA_WorkPlan);
                        m_OA_WorkPlan.Keyid = aaaa;
                        if (aaaa > 0 && m_OA_WorkPlan.PlanDataType == 15)
                        {
                            var HideKeyidFapiao = Request["HideKeyidFapiao"].Split(',');
                            var HideAttachmentFapiao = Request["HideAttachmentFapiao"].Split(',');
                            for (int i = 0; i < HideKeyidFapiao.Length; i++)
                            {
                                if (string.IsNullOrEmpty(HideKeyidFapiao[i]))
                                {
                                    var a_WorkPlan_Attachment = new OA_WorkPlan_attachment();
                                    a_WorkPlan_Attachment.OA_WorkPlanId = m_OA_WorkPlan.Keyid;
                                    a_WorkPlan_Attachment.AttachmentType = 15;
                                    a_WorkPlan_Attachment.PlanAttachment = HideAttachmentFapiao[i];
                                    a_WorkPlan_Attachment.CreateTime = DateTime.Now;
                                    a_WorkPlan_Attachment.Operator = CurrentUser.TrueName;
                                    var sss = oA_WorkPlan_AttachmentBLL.InsertModel(a_WorkPlan_Attachment);
                                }
                                else
                                {
                                    continue;
                                }
                            }
                            scope.Complete();
                        JavaScript.MessageBox("新增成功", this, true, true);
                        }
                    else
                        JavaScript.MessageBox("操作失败", this);
                }
            }
            catch (Exception ex)
            {
                PAGEHandleException(ex);
                JavaScript.MessageBox("操作失败", this);
            }
                finally
                {
                    // 释放资源
                    scope.Dispose();
                }
            }
        }
    }
}
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.designer.cs
@@ -114,6 +114,24 @@
        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtPlanRemark;
        /// <summary>
        /// file1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputFile file1;
        /// <summary>
        /// RepClientList 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Repeater RepClientList;
        /// <summary>
        /// btn_submit 控件。
        /// </summary>
        /// <remarks>
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx
@@ -78,6 +78,23 @@
                        </div>
                    </td>
                </tr>
                 <tr  style='<%=planDataType=="14"||planDataType=="15"?"":"display:none;"  %>' >
                    <td class="ali03 " >
                       审批证明:
                    </td>
                    <td colspan="3">
                         <asp:Repeater ID="RepClientList" runat="server">
                           <ItemTemplate>
                    <a title="查看图片"    target="view_window" href="<%#Eval("PlanAttachment")%>">
                            <img src="<%#Eval("PlanAttachment")%>" width="20" height="20" />
                            </a>  &nbsp; &nbsp; &nbsp;
                                </ItemTemplate>
                           </asp:Repeater>
                    </td>
                </tr>
            </table>
        </fieldset>
        <fieldset>
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.cs
@@ -22,9 +22,11 @@
    {
        OA_WorkPlanBll oA_WorkReminderBll = null;
        public string planDataType = "";
        OA_WorkPlan_attachmentBLL oA_WorkPlan_AttachmentBLL = null;
        public MyRequestDetail()
        {
            oA_WorkReminderBll = new OA_WorkPlanBll();
            oA_WorkPlan_AttachmentBLL = new OA_WorkPlan_attachmentBLL();
        }
        //页面加载
@@ -51,6 +53,20 @@
                this.spanPlanTitle.InnerText = m_OA_WorkPlan.PlanTitle.ToString();
                this.spanPlanContent.InnerText = m_OA_WorkPlan.PlanContent.ToString();
                this.spanShoukuandanwei.InnerText = m_OA_WorkPlan.PlanComplany;
                if(m_OA_WorkPlan.PlanDataType == 14)
                {
                    this.RepClientList.DataSource = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoIdandType(Request["keyid"].ToInt32().Value, 14);
                    this.RepClientList.DataBind();
                }
                else if (m_OA_WorkPlan.PlanDataType == 15)
                {
                    this.RepClientList.DataSource = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoIdandType(Request["keyid"].ToInt32().Value, 15);
                    this.RepClientList.DataBind();
                }
                if (m_OA_WorkPlan.PlanStatus == 1)
                {
                    this.panelApprovalNo.Visible = true;
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.designer.cs
@@ -114,6 +114,15 @@
        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanRemark;
        /// <summary>
        /// RepClientList 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Repeater RepClientList;
        /// <summary>
        /// panelApprovalNo 控件。
        /// </summary>
        /// <remarks>
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx
@@ -80,6 +80,23 @@
                        </div>
                    </td>
                </tr>
                  <tr  style='<%=planDataType=="14"||planDataType=="15"?"":"display:none;"  %>' >
                    <td class="ali03 " >
                       审批证明:
                    </td>
                    <td colspan="3">
                         <asp:Repeater ID="RepClientList" runat="server">
                           <ItemTemplate>
                    <a title="查看图片"    target="view_window" href="<%#Eval("PlanAttachment")%>">
                            <img src="<%#Eval("PlanAttachment")%>" width="20" height="20" />
                            </a>  &nbsp; &nbsp; &nbsp;
                                </ItemTemplate>
                           </asp:Repeater>
                    </td>
                </tr>
            </table>
        </fieldset>
        <fieldset>
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
@@ -26,6 +26,7 @@
        OA_FukuanshenqingBLL _oA_FukuanshenqingBLL = null;
        EC_MemberBasicBLL _eC_MemberBasicBLL = null;
        public string planDataType = "";
        OA_WorkPlan_attachmentBLL oA_WorkPlan_AttachmentBLL = null;
        public RequestReplyAdd()
        {
            oA_WorkReminderBll = new OA_WorkPlanBll();
@@ -33,6 +34,7 @@
            _eC_OrderBLL = new EC_OrderBLL();
            _oA_FukuanshenqingBLL = new OA_FukuanshenqingBLL();
            _eC_MemberBasicBLL = new EC_MemberBasicBLL();
            oA_WorkPlan_AttachmentBLL = new OA_WorkPlan_attachmentBLL();
        }
        //页面加载
@@ -64,6 +66,17 @@
                this.spanPlanTitle.InnerText = m_OA_WorkPlan.PlanTitle.ToString();
                this.spanPlanContent.InnerText = m_OA_WorkPlan.PlanContent.ToString();
                this.spanShoukuandanwei.InnerText = m_OA_WorkPlan.PlanComplany;
                if (m_OA_WorkPlan.PlanDataType == 14)
                {
                    this.RepClientList.DataSource = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoIdandType(Request["keyid"].ToInt32().Value, 14);
                    this.RepClientList.DataBind();
                }
                else if (m_OA_WorkPlan.PlanDataType == 15)
                {
                    this.RepClientList.DataSource = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoIdandType(Request["keyid"].ToInt32().Value, 15);
                    this.RepClientList.DataBind();
                }
            }
        }
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.designer.cs
@@ -114,6 +114,15 @@
        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanRemark;
        /// <summary>
        /// RepClientList 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Repeater RepClientList;
        /// <summary>
        /// selApprovalStatus 控件。
        /// </summary>
        /// <remarks>
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
@@ -71,7 +71,7 @@
                        <select keepdefaultstyle="true" runat="server" id="selPlanStatus">
                            <option value="">全部</option>
                            <option value="2">已批复</option>
                            <option value="1">未批复</option>
                            <option value="1" selected="selected">未批复</option>
                        </select>
                    </td>
                    <td class="ali03">
CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
@@ -1610,6 +1610,48 @@
            $(".Brand" + index).show();
            $(".gramWeight" + index).show();
            $(".Qitazhi" + index).hide();
            if (printTypeId == 27) {
                // 使用属性选择器找到对应的option元素
                var optionText = $("#paper0MP option[value='" + paperId + "']").text();
                if (optionText == "无碳复写纸") {
                    $(".Brand" + index).hide();
                    $(".gramWeight" + index).hide();
                    $(".yanse0").show();
                    $(".Qitazhi" + index).show();
                    var rlNum0 = $("#rlNum0").val();
                    if (rlNum0 == "两联") {
                        $("#shanglian0").show();
                        $("#zhonglianlian1").hide();
                        $("#zhonglianlian2").hide();
                        $("#zhonglianlian3").hide();
                        $("#xialian0").show();
                    } else if (rlNum0 == "三联") {
                        $("#shanglian0").show();
                        $("#zhonglianlian1").show();
                        $("#zhonglianlian2").hide();
                        $("#zhonglianlian3").hide();
                        $("#xialian0").show();
                    } else if (rlNum0 == "四联") {
                        $("#shanglian0").show();
                        $("#zhonglianlian1").show();
                        $("#zhonglianlian2").show();
                        $("#zhonglianlian3").hide();
                        $("#xialian0").show();
                    } else if (rlNum0 == "五联") {
                        $("#shanglian0").show();
                        $("#zhonglianlian1").show();
                        $("#zhonglianlian2").show();
                        $("#zhonglianlian3").show();
                        $("#xialian0").show();
                    }
                } else {
                    $(".yanse0").hide();
                }
            }
            if (printTypeId == 15 || printTypeId == 6) {
                var isSuccess = true;
@@ -1824,6 +1866,12 @@
    $("[name='printBoxNumber']").val(dataJson.PrintBoxNumber);
    $("[name='printCountByBox']").val(dataJson.PrintCount);
    $("[name='pNameMP']").val(dataJson.PaperMP);
    $("[name='rlNum']").val(dataJson.RLNum);
    $("[name='shanglian']").val(dataJson.shanglian);
    $("[name='zhonglianlian1']").val(dataJson.zhonglianlian1);
    $("[name='zhonglianlian2']").val(dataJson.zhonglianlian2);
    $("[name='zhonglianlian3']").val(dataJson.zhonglianlian3);
    $("[name='xialian']").val(dataJson.xialian);
    $("[name='paper0']").val(dataJson.PaperId);
    $("[name='Qitazhi0']").val(dataJson.Qitazhi);
    if (dataJson.PrintMode == 0) {