From 957344a47100f58ac7ac046ec5b2d5201a599d5c Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 21 一月 2025 09:14:05 +0800
Subject: [PATCH] 留样
---
CY_ECommercePlatform/CY.Model/CY.Model.csproj | 1
CY_ECommercePlatform/CY.Model/OA/EC_OrderLiuyang.cs | 51 ++
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 9
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderUpLoadLiuyang.aspx.cs | 452 ++++++++++++++++++++++
CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs | 6
CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs | 6
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx | 14
CY_ECommercePlatform/CY.WebForm/Helper/upLoadLiuyangFile.cs | 232 +++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderUpLoadLiuyang.aspx | 321 ++++++++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderUpLoadLiuyang.aspx.designer.cs | 80 ++++
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs | 7
11 files changed, 1,176 insertions(+), 3 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/CY.Model.csproj b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
index aa5a836..5b4eb81 100644
--- a/CY_ECommercePlatform/CY.Model/CY.Model.csproj
+++ b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
@@ -202,6 +202,7 @@
<Compile Include="OA\CoreCmsPlanOrder.cs" />
<Compile Include="OA\CoreCmsPlanOrderItem.cs" />
<Compile Include="OA\CoreDeliverOrderItem.cs" />
+ <Compile Include="OA\EC_OrderLiuyang.cs" />
<Compile Include="OA\OA_Baozhengjin.cs" />
<Compile Include="OA\OA_Baozhengjincuishou.cs" />
<Compile Include="OA\OA_CarDictionary.cs" />
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs
index 84b96a4..15f14f2 100644
--- a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs
@@ -339,6 +339,12 @@
_outid = value;
}
}
+
+ /// <summary>
+ /// 鏄惁鐣欐牱 1鏄� 鍏朵粬鍚�
+ /// </summary>
+ public int? LiuyangStatus { get; set; }
+
#endregion Model
}
}
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
index a29fc8d..10ccaac 100644
--- a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
@@ -957,6 +957,12 @@
this.Duiyinghetongbianhao = isChange ? MyConvert.ConvertToString(value) : this.Duiyinghetongbianhao;
theValue = this.Duiyinghetongbianhao;
}
+ else if ("LiuyangStatus".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 101)
+ {
+ this.LiuyangStatus = isChange ? MyConvert.ConvertToInt32(value) : this.LiuyangStatus;
+ theValue = this.LiuyangStatus;
+ }
+
#endregion
diff --git a/CY_ECommercePlatform/CY.Model/OA/EC_OrderLiuyang.cs b/CY_ECommercePlatform/CY.Model/OA/EC_OrderLiuyang.cs
new file mode 100644
index 0000000..7ce3b16
--- /dev/null
+++ b/CY_ECommercePlatform/CY.Model/OA/EC_OrderLiuyang.cs
@@ -0,0 +1,51 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace CY.Model.OA
+{
+ /// <summary>
+ /// OA_CorporateClientsContract 妯″瀷 瀵规爣鏁版嵁搴撲腑鐨凮A_CorporateClientsContract琛�
+ /// 鐢ㄦ埛鍚堝悓闄勪欢瀛愯〃锛屾暟鎹簱涓负鍋氫换浣曞叧鑱�
+ /// </summary>
+ public class EC_OrderLiuyang
+ {
+ /// <summary>
+ /// 涓婚敭
+ /// </summary>
+ public Guid Keyid { get; set; }
+ /// <summary>
+ /// 鐢ㄦ埛ID
+ /// </summary>
+ public int orderid { get; set; }
+ /// <summary>
+ /// 鏂囦欢鍚�
+ /// </summary>
+ public string FileName { get; set; }
+ /// <summary>
+ /// 鏂囦欢淇濆瓨璺緞
+ /// </summary>
+ public string FilePath { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ public string Remark { get; set; }
+ /// <summary>
+ /// 鍒涘缓鑰�
+ /// </summary>
+ public Guid? Creater { get; set; }
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public DateTime? CreateTime { get; set; }
+ /// <summary>
+ /// 淇敼鑰�
+ /// </summary>
+ public Guid? Updater { get; set; }
+ /// <summary>
+ /// 淇敼鏃堕棿
+ /// </summary>
+ public DateTime? LastUpdateTime { get; set; }
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index 5190394..d34882a 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1886,6 +1886,7 @@
<Content Include="Pages\business\Caigoufukuanshenqing.aspx" />
<Content Include="Pages\business\Baozhengjinfukuan.aspx" />
<Content Include="Pages\business\BaozhengjinCuishou.aspx" />
+ <Content Include="Pages\business\OrderUpLoadLiuyang.aspx" />
<Content Include="Pages\business\WaixieOrderPrint.aspx" />
<Content Include="Pages\business\Waixiefukuanweikaipiao.aspx" />
<Content Include="Pages\business\Waixiefukuanfukuan.aspx" />
@@ -2946,6 +2947,7 @@
<DependentUpon>Global.asax</DependentUpon>
</Compile>
<Compile Include="Helper\TimeTaskHelper.cs" />
+ <Compile Include="Helper\upLoadLiuyangFile.cs" />
<Compile Include="Helper\upLoadContractFile.cs" />
<Compile Include="Index.aspx.cs">
<DependentUpon>Index.aspx</DependentUpon>
@@ -3338,6 +3340,13 @@
<Compile Include="Pages\business\BaozhengjinCuishou.aspx.designer.cs">
<DependentUpon>BaozhengjinCuishou.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\business\OrderUpLoadLiuyang.aspx.cs">
+ <DependentUpon>OrderUpLoadLiuyang.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\OrderUpLoadLiuyang.aspx.designer.cs">
+ <DependentUpon>OrderUpLoadLiuyang.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\business\WaixieOrderPrint.aspx.cs">
<DependentUpon>WaixieOrderPrint.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/CY_ECommercePlatform/CY.WebForm/Helper/upLoadLiuyangFile.cs b/CY_ECommercePlatform/CY.WebForm/Helper/upLoadLiuyangFile.cs
new file mode 100644
index 0000000..b2bcb2d
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Helper/upLoadLiuyangFile.cs
@@ -0,0 +1,232 @@
+锘縰sing CY.Infrastructure.Logging;
+using CY.Model.OA;
+using CY.SQLDAL;
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.IO;
+using System.Linq;
+using System.Web;
+
+namespace CY.WebForm.Helper
+{
+ public class upLoadLiuyangFile
+ {
+
+
+
+ /// <summary>
+ /// 涓婁紶涓�涓枃浠堕〉闈紝骞朵繚瀛橈紝鍖呮嫭淇慨
+ /// </summary>
+ /// <param name="filel">postFileUI瀵硅薄</param>
+ /// <param name="Contract">瀹㈡埛鏂囦欢琛ㄥ叧鑱� </param>
+ /// <param name="CountractFileKeiId">鍚堝悓鏂囦欢ID</param>
+ /// <remarks>鍏堝垽鍐虫槸鍚﹀瓨鍦–ountractFileKeiId 濡傛灉涓嶅瓨鍦紝鍒欐牴鎹瓹orporateClientKeyid 鏂板缓 杩欎袱涓狪D涓嶈兘鍚屾椂涓簄ull </remarks>
+ public void SavAndUpDataContractFile(HttpPostedFile filel, EC_OrderLiuyang Contract = null, Guid? CountractFileKeiId = null)
+ {
+ if (Contract == null && CountractFileKeiId == null)
+ {
+ throw new Exception("璁㈠崟ID鍜岀暀鏍稩D鍚屾椂涓虹┖锛屼笉鑳戒慨鏀规垨鑰呮洿鏂扮暀鏍�");
+
+ }
+ Database DC = new Database();
+ string FilePath = "";
+ try
+ {
+ String sqlStr = "";
+
+ if (CountractFileKeiId != null)
+ {
+ //淇敼鏂囦欢
+ sqlStr = string.Format(@"SELECT [Keyid],[orderid],[FileName],[FilePath],[Remark],[Creater],[CreateTime],[Updater],[LastUpdateTime] FROM [ECTEST].[dbo].[EC_OrderLiuyang] where Keyid='{0}'", CountractFileKeiId.ToString());
+ //寮�濮嬩慨鏀规枃浠�
+ SqlCommand myCmd = new SqlCommand(sqlStr, DC.Connection);
+
+ var a = myCmd.ExecuteReader();
+
+ EC_OrderLiuyang Contract1 = new EC_OrderLiuyang();
+ while (a.Read())
+ { //娉ㄦ剰濡備綍灏嗘瘡娆¤鍙栧埌鐨勮褰曟坊鍔犲埌listbox1涓紙鍥犱负绗竴娆″仛鏃跺嚭閿欎簡锛屽樋鍢匡級
+ Contract1.Keyid = a.GetGuid(0);
+ Contract1.orderid = a.GetInt32(1);
+ Contract1.FileName = a.GetString(2);
+ Contract1.FilePath = a.GetString(3);
+ Contract1.Remark = a.GetString(4);
+ }
+
+ a.Close(); //鍏抽棴sqldatareader
+
+ UploadFileTIhuan(filel, Contract1.FilePath); //鐩存帴鏇挎崲鏂囦欢
+
+
+
+
+ }
+ else
+ {
+ //涓嶆槸淇敼锛屽垯澧炲姞
+
+ //淇敼鏂囦欢
+
+ if(Contract.orderid==0)
+ {
+ throw new Exception("璁㈠崟ID涓虹┖锛屼笉鑳界暀鏍�");
+ }
+ //寮�濮嬩笂浼犲悎鍚�
+ try
+ {
+ FilePath= UploadFile(filel, "LiuyangIMG", Contract.FileName); //涓婁紶鏂囦欢
+ }
+ catch (Exception e)
+ {
+
+ throw e;
+ }
+ //鍐欏叆鏁版嵁搴�
+ sqlStr = string.Format(@" INSERT INTO [dbo].[EC_OrderLiuyang] ( [Keyid],[orderid],[FileName],[FilePath],[Remark],[Creater],[CreateTime] ) VALUES('{0}' ,'{1}' ,'{2}' ,'{3}' ,'{4}' ,'{5}' ,'{6}' )", Guid.NewGuid().ToString(), Contract.orderid , Contract.FileName, FilePath, Contract.Remark, Contract.Creater,DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+ try
+ {
+ SqlCommand myCmd = new SqlCommand(sqlStr, DC.Connection);
+
+ var a = myCmd.ExecuteNonQuery();
+ if (a == 1)
+ {
+ sqlStr = string.Format(@" update [EC_OrderBasic] set [LiuyangStatus] = 1 where [Keyid]= {0} ", Contract.orderid);
+ myCmd = new SqlCommand(sqlStr, DC.Connection);
+ a = myCmd.ExecuteNonQuery();
+ return;
+ }
+ else
+ {
+ //鍒犻櫎鏂囦欢锛�
+ }
+
+ }
+ catch (Exception e)
+ {
+ //鍒犻櫎鏂囦欢锛�
+ throw e;
+ }
+ //寮�濮嬩慨鏀规枃浠�
+
+
+
+
+
+ }
+
+ }
+ catch (Exception ee)
+ {
+ new Log4NetAdapter().Log("鏂囦欢涓婁紶 閿欒锛�" + ee.Message);
+
+ }
+ finally
+ {
+ if (DC.Connection.State != System.Data.ConnectionState.Closed)
+ DC.Connection.Close();
+ }
+ }
+
+
+
+
+
+ /// <summary>
+ /// 鐩存帴鏇挎崲鏂囦欢
+ /// </summary>
+ /// <param name="filel"> postFileUI瀵硅薄</param>
+ /// <param name="Filepath"> /UpFile+鏂囦欢璺緞</param>
+ /// <param name="fileName"> 鏂囦欢鍚�</param>
+ /// <returns></returns>
+ public string UploadFileTIhuan(HttpPostedFile filel, string fileName)
+ {
+ try
+ {
+ string DirPath = System.Web.HttpContext.Current.Request.MapPath(fileName);
+
+
+
+
+
+ filel.SaveAs(DirPath );
+
+ return fileName; //杩斿洖鐩稿璺緞
+
+ }
+ catch (Exception e)
+ {
+
+ throw e;
+ }
+
+ }
+
+
+
+
+ /// <summary>
+ /// 涓婁紶鏂囦欢
+ /// </summary>
+ /// <param name="filel"> postFileUI瀵硅薄</param>
+ /// <param name="Filepath"> /UpFile+鏂囦欢璺緞</param>
+ /// <param name="fileName"> 鏂囦欢鍚�</param>
+ /// <returns></returns>
+ public string UploadFile(HttpPostedFile filel, string Filepath,string fileName)
+ {
+ try
+ {
+ string DirPath = System.Web.HttpContext.Current.Request.MapPath("/UpFile");
+
+ if (Directory.Exists(DirPath))
+ {
+ //鏂囦欢澶瑰凡缁忓瓨鍦�
+ }
+ else
+ {
+ try
+ {
+ Directory.CreateDirectory(DirPath);
+ //鍒涘缓鎴愬姛
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+
+ }
+ }
+ //鍒涘缓绗簩绾�
+ if (Directory.Exists(DirPath+"/"+ Filepath))
+ {
+ //鏂囦欢澶瑰凡缁忓瓨鍦�
+ }
+ else
+ {
+ try
+ {
+ Directory.CreateDirectory(DirPath + "/" + Filepath);
+ //鍒涘缓鎴愬姛
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+
+ }
+ }
+ string File = Filepath + "/" + DateTime.Now.ToString("yyyy_MM_dd_hh_mm_ss") + fileName;
+
+ filel.SaveAs(DirPath+ "/"+File);
+
+ return "/UpFile/"+File; //杩斿洖鐩稿璺緞
+
+ }
+ catch (Exception e)
+ {
+
+ throw e;
+ }
+
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index 7938c51..b4e8f50 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -27,6 +27,13 @@
top.Dialog.open({ URL: url, Title: "璁㈠崟鍥炶", Height: 400 });
}
+ function Liuyang(orderId) {
+ var url = "/Pages/business/OrderUpLoadLiuyang.aspx?Keyid=" + orderId;
+ top.Dialog.open({ URL: url, Title: "鐣欐牱", Height: 600, Width: 800 });
+ }
+
+
+
function CompledWork(orderId) {
var url = "/Pages/business/CompledWork.aspx?ids=" + orderId;
top.Dialog.open({ URL: url, Title: "瀹屽伐", Height: 300, Width: 680 });
@@ -440,6 +447,9 @@
<th width="26" menu_member_case_id="case_DeferPay" menu_member_case_name="寤舵湡">
寤舵湡
</th>
+ <th width="26" menu_member_case_id="case_Liuyang" menu_member_case_name="鐣欐牱">
+ 鐣欐牱
+ </th>
<th width="26" menu_member_case_id="case_OpenVisit" menu_member_case_name="鍥炶">
鍥炶
</th>
@@ -573,6 +583,10 @@
<span style='display: ' class='hand_no' <%#true.Equals(Eval("IsDeferPay"))?"title='宸插欢鏈�'":"title=''"%>>
<%#true.Equals(Eval("IsDeferPay")) ? "鈭�" : ""%></span>
</td>
+ <td menu_member_case_id="case_Liuyang" menu_member_case_name="鐣欐牱">
+ <span class="hand_yes" <%#1.Equals(Eval("LiuyangStatus"))?"title='宸茬暀鏍�'":"title=''"%> onclick="Liuyang(<%#Eval("Keyid")%>);" >
+ <%#1.Equals(Eval("LiuyangStatus")) ? "鈭�" : "鐣欐牱"%></span>
+ </td>
<td class="td_hide" menu_member_case_id="case_OpenVisit" menu_member_case_name="鍥炶">
<%-- <span class="hand_yes" title="鍥炶" onclick="dialog.open({URL: '/Pages/business/BackVisitNoteEdit.aspx?id=<%#Eval("Keyid") %>&orderId=<%#Eval("SellerOrderId") %>&buyerName=<%#Eval("BuyerName") %>' , Title: '璁㈠崟鍥炶',Height:400});">鍥炶</span>--%>
<span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"鍥炶")?"hand_yes":"hand_no"%>" <%#true.Equals(Eval("IsVisit"))?"title='宸插洖璁�'":"title='鍥炶'"%> style='display: ' onclick='OpenVisit(<%#Eval("Keyid")%>,"<%#Eval("SellerOrderId")%>","<%#Eval("BuyerName")%>")'>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderUpLoadLiuyang.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderUpLoadLiuyang.aspx
new file mode 100644
index 0000000..a89d26d
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderUpLoadLiuyang.aspx
@@ -0,0 +1,321 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="OrderUpLoadLiuyang.aspx.cs" Inherits="CY.WebForm.Pages.business.OrderUpLoadLiuyang" %>
+
+<%-- 涓婁紶鍚堝悓椤甸潰 寤� 20210916澧炲姞--%>
+<!DOCTYPE html>
+<script src="./../../myPagination/js/share/js/jquery.min.js" type="text/javascript"></script>
+<%--<script src="./../../js/jquery.hammer.min.js" type="text/javascript"></script>--%>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title></title>
+
+
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ <style>
+ .toast-message {
+ position: absolute;
+ width: 90px; /* 鍥哄畾瀹藉害 */
+ height: 60px; /* 鍥哄畾楂樺害 */
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%); /* 璋冩暣浣嶇疆浣垮叾灞呬腑 */
+ background-color: lightblue;
+ font-size: 20px; /* 璁剧疆鏂囧瓧澶у皬 */
+ text-align: center; /* 璁剧疆鏂囧瓧灞呬腑 */
+ }
+</style>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <%-- <div class="box1" paneltitle="鍔熻兘闈㈡澘" roller="false">
+ <table class="TableNewStyle">
+ <tr>
+ <td style="width:200px">鏂板鎴栬�呮浛鎹㈠悎鍚岄〉闈細
+ </td>
+
+ <td style="width:100px">绗�
+ <input type="text" runat="server" id="TextPage" style="width:40px" onkeyup="value=value.replace(/[^\d]/g,'')" />
+ 椤�
+ </td>
+ <td class="ali03"></td>
+
+ <td class="ali03">
+ <input type="file" id="filesel" name="__hetongFile" keepdefaultstyle="true" runat="server" text="璇烽�夋嫨鏂囦欢" /></td>
+ <td>
+ <asp:Button ID="UpdateFileNew" Text="涓婁紶" runat="server" OnClick="btn_Submit_Click" OnClientClick="return checkSelFile()" />
+<div id="loading" class="toast-message" style="display: none;">涓婁紶涓紒</div>
+ </td>
+
+ </tr>
+ </table>
+
+
+ </div>--%>
+
+ <div class="box1" paneltitle="鍔熻兘闈㈡澘" roller="false">
+ <table class="TableNewStyle">
+ <tr>
+ <td class="ali06" style="width:200px">
+
+ 鎵归噺涓婁紶锛�
+
+ </td>
+ <td class="ali03" style="width:100px">
+ </td>
+
+ <td class="ali03"></td>
+
+ <td class="ali03">
+ <input type="file" id="file2" name="__hetongMutilfiles" keepdefaultstyle="true" multiple="multiple" runat="server" text="璇烽�夋嫨鏂囦欢"/></td>
+ <td>
+ <asp:Button ID="Button1" Text="鎵归噺涓婁紶" runat="server" OnClick="btn_Submit_Click_multi" OnClientClick="return checkSelMulitFile()" /></td>
+ </tr>
+ </table>
+ </div>
+ <div>
+
+ <p style="text-align: center">宸叉湁椤甸潰</p>
+
+ <asp:Repeater ID="RepClientList" runat="server">
+ <HeaderTemplate>
+ <table class="tableStyle">
+ <tr>
+ <%-- <th width="25"></th>--%>
+ <th width="200" style="text-align: center">鍚嶇О
+ </th>
+ <th style="text-align: center">棰勮
+ </th>
+ <th style="text-align: center">鎿嶄綔
+ </th>
+
+
+ </tr>
+ </HeaderTemplate>
+
+
+ <ItemTemplate>
+ <tr>
+ <%-- <td>
+ <input type="checkbox" class="SelectCheck" value_kid="<%#Eval("Keyid")%>" />
+ </td>--%>
+ <td> <%#Eval("FileName")%>
+ </td>
+ <td>
+
+ <a title="鐐瑰嚮鏌ョ湅鍘熷浘" href="<%#Eval("FilePath").ToString() %>" target="view_window">
+ <img src="<%#Eval("FilePath").ToString() %>" width="80" height="100" />
+ </a>
+
+ </td>
+
+
+ <td>
+
+ <a onclick="delelid('<%#Eval("Keyid")%>','<%= Request["Keyid"]%>')">鍒犻櫎褰撳墠椤甸潰</a>
+ </td>
+
+
+
+
+
+
+
+ </tr>
+ </ItemTemplate>
+
+
+ <FooterTemplate>
+ </table>
+ </FooterTemplate>
+
+
+
+
+
+ </asp:Repeater>
+ <div id="page">
+ <uc:UCPager ID="UCPager1" runat="server" />
+ </div>
+
+
+
+
+ </div>
+ <%-- <button id="Buttonupload" onclick="onViewuplodshow('<%= Request["Keyid"]%>')">娴忚鍏ㄩ儴</button>--%>
+
+ <%-- <asp:Button ID="Button3" Text="鍒犻櫎鎵�鏈夌暀鏍�" runat="server" OnClick="btn_Submit_Click_DELLALL" />--%>
+
+
+ </form>
+</body>
+</html>
+<script type="text/javascript">
+
+ //鏌ョ湅
+ function checkSelMulitFile() {
+
+ var oFile = document.getElementById('file2');
+ if (oFile.value == "") {
+ alertMsg('娌℃湁閫夋嫨鏂囦欢');
+ return false;
+
+ }
+ //debugger;
+ //replaceParamVal("deleteKeyIds", "");
+ showLoadingIndicator();
+ return true;
+ }
+ //鏌ョ湅
+ function checkSelFile() {
+
+ if (document.getElementById("TextPage").value == "") {
+ alertMsg("娌℃湁杈撳叆椤垫暟");
+
+ return false;
+ }
+ var oFile = document.getElementById('filesel');
+ if (oFile.value == "") {
+ alertMsg('娌℃湁閫夋嫨鏂囦欢');
+ return false;
+
+ }
+ showLoadingIndicator();
+ //debugger;
+ //replaceParamVal("deleteKeyIds", "");
+ return true;
+ }
+
+
+ function showLoadingIndicator() {
+ document.getElementById('loading').style.display = 'block';
+ }
+
+ function hideLoadingIndicator() {
+ document.getElementById('loading').style.display = 'none';
+ }
+
+ //鏀瑰彉鍙傛暟
+ function changeURLArg(url, arg, arg_val) {
+ var pattern = arg + '=([^&]*)';
+ var replaceText = arg + '=' + arg_val;
+ if (url.match(pattern)) {
+ var tmp = '/(' + arg + '=)([^&]*)/gi';
+ tmp = url.replace(eval(tmp), replaceText);
+ return tmp;
+ } else {
+ if (url.match('[\?]')) {
+ return url + '&' + replaceText;
+ } else {
+ return url + '?' + replaceText;
+ }
+ }
+ }
+
+
+ // 鑾峰彇url閲岀殑鍙傛暟
+
+ function getURLString(arg) {
+ var reg = new RegExp("(^|&)" + arg + "=([^&]*)(&|$)", "i");
+ var r = window.location.search.substr(1).match(reg);
+ if (r != null)
+ return unescape(r[2]);
+ return null;
+ }
+
+ //鏇挎崲鎸囧畾浼犲叆鍙傛暟鐨勫��,paramName涓哄弬鏁�,replaceWith涓烘柊鍊�
+ function replaceParamVal(paramName, replaceWith) {
+ var oUrl = this.location.href.toString();
+ var re = eval('/(' + paramName + '=)([^&]*)/gi');
+ var nUrl = oUrl.replace(re, paramName + '=' + replaceWith);
+ this.location = nUrl;
+ window.location.href = nUrl
+ }
+ //鍒犻櫎鍒跺畾鍚堝悓椤甸潰
+ function delelid(KeyID, pageID) {
+
+
+ top.Dialog.confirm("鏄惁瑕佸垹闄よ鐣欐牱椤甸潰锛�", function () {
+ window.location = "/Pages/business/OrderUpLoadLiuyang.aspx?deleteKeyIds=" + KeyID + "&Keyid=" + pageID;
+ }
+ );
+ }
+
+
+
+ //缁存姢
+ function onViewuplodshow(keyid) {
+
+
+ top.Dialog.open({ URL: "/Pages/business/CorporateClientsContractShow.aspx?Keyid=" + keyid, Title: "娴忚鍚堝悓", Width: 1024, Height: 750 });
+ }
+
+ $(document).ready(function () {
+ //$("#file2").change(function () {
+ // var myfile = document.getElementById('file2');
+
+
+ // for (let i = 0; i < myfile.files.length; i++)
+ //{
+ // var filepath = myfile.files[i].name;
+
+ // var extStart = filepath.lastIndexOf(".");
+ // var ext = filepath.substring(extStart, filepath.length).toUpperCase();
+ // if (ext != ".BMP" && ext != ".PNG" && ext != ".GIF" && ext != ".JPG" && ext != ".JPEG") {
+ // alertMsg("鍥剧墖闄愪簬bmp,png,gif,jpeg,jpg鏍煎紡");
+
+ // return false;
+ // } else { $("#fileType").text(ext) }
+
+ // var ext = filepath.substring(0, extStart);
+ // if (isNumber(ext)) {
+
+ // }
+ // else {
+ // alertMsg(filepath + '鏂囦欢鍚嶆湁璇�');
+ // return false;
+ // }
+
+ //}
+
+ // //var file_size = 0;
+ // //if ($.browser.msie) {
+ // // var img = new Image();
+ // // img.src = filepath;
+ // // while (true) {
+ // // if (img.fileSize > 0) {
+ // // if (img.fileSize > 3 * 1024 * 1024) {
+ // // alert("鍥剧墖涓嶅ぇ浜�100MB銆�");
+ // // } else {
+ // // var num03 = img.fileSize / 1024;
+ // // num04 = num03.toFixed(2)
+ // // $("#fileSize").text(num04 + "KB");
+ // // }
+ // // break;
+ // // }
+ // // }
+ // //} else {
+ // // file_size = this.files[0].size;
+ // // var size = file_size / 1024;
+ // // if (size > 10240) {
+ // // alert("涓婁紶鐨勫浘鐗囧ぇ灏忎笉鑳借秴杩�10M锛�");
+ // // } else {
+ // // var num01 = file_size / 1024;
+ // // num02 = num01.toFixed(2);
+ // // $("#fileSize").text(num02 + " KB");
+ // // }
+ // //}
+ // return true;
+ //});
+ });
+ function isNumber(val) {
+ var regPos = /^\d+(\.\d+)?$/; //闈炶礋娴偣鏁�
+ var regNeg = /^(-(([0-9]+\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\.[0-9]+)|([0-9]*[1-9][0-9]*)))$/; //璐熸诞鐐规暟
+ if (regPos.test(val) || regNeg.test(val)) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+</script>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderUpLoadLiuyang.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderUpLoadLiuyang.aspx.cs
new file mode 100644
index 0000000..0b756e9
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderUpLoadLiuyang.aspx.cs
@@ -0,0 +1,452 @@
+锘縰sing CY.Infrastructure.Common;
+using CY.Infrastructure.Logging;
+using CY.SQLDAL;
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using static CY.WebForm.MainPage;
+using CY.Model.OA;
+using CY.WebForm.Helper;
+using CY.Infrastructure.Query;
+using System.IO;
+
+namespace CY.WebForm.Pages.business
+{
+ public partial class OrderUpLoadLiuyang : BasePage
+ {
+
+
+ /// <summary>
+ /// 閫夋嫨鏂囦欢
+ /// </summary>
+ List<HttpFileCollection> SelFile { set; get; }
+ /// <summary>
+ /// 鐣欐牱闄勪欢闆嗗悎
+ /// </summary>
+ List<EC_OrderLiuyang> fileDataList { set; get; } = new List<EC_OrderLiuyang>();
+ /// <summary>
+ /// 闄勪欢涓暟
+ /// </summary>
+ public int FileCount { get; set; }
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ UCPager1.AspNetPager.PageSize=5;
+ UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
+
+
+
+ if (Request["deleteKeyIds"] != null&& Request["deleteKeyIds"]!="")
+ {
+ if (Request["deleteKeyIds"] == "all")
+ {
+ //鍒犻櫎璇存湁椤甸潰
+ string keyid = Request["deleteKeyIds"].ToString();
+ string pageID = Request["Keyid"];
+ Database DC = new Database();
+ string sqlStr = string.Format(@" select [Keyid],[orderid],[FileName],[FilePath],[Remark],[Creater],[CreateTime],[Updater],[LastUpdateTime] FROM [ECTEST].[dbo].[EC_OrderLiuyang] where [orderid]={0} ORDER BY [CreateTime] ", pageID);
+
+
+ try
+ {
+ SqlCommand myCmd = new SqlCommand(sqlStr, DC.Connection);
+ //SqlDataAdapter myDa = new SqlDataAdapter(myCmd);
+ var a = myCmd.ExecuteReader();
+ //myDa.Dispose();
+ fileDataList = new List<EC_OrderLiuyang>();
+ EC_OrderLiuyang Contract;
+ while (a.Read())
+ { //娉ㄦ剰濡備綍灏嗘瘡娆¤鍙栧埌鐨勮褰曟坊鍔犲埌listbox1涓紙鍥犱负绗竴娆″仛鏃跺嚭閿欎簡锛屽樋鍢匡級
+ Contract = new EC_OrderLiuyang();
+ Contract.Keyid = a.GetGuid(0);
+ Contract.orderid = a.GetInt32(1);
+ Contract.FileName = a.GetString(2);
+ Contract.FilePath = a.GetString(3);
+ Contract.Remark = a.GetString(4);
+
+
+ fileDataList.Add(Contract);
+ }
+ a.Close(); //鍏抽棴sqldatareader
+ if (fileDataList.Count > 0)
+ {
+ foreach (var item in fileDataList)
+ {
+ FileInfo file = new FileInfo(Server.MapPath(item.FilePath));//鎸囧畾鏂囦欢璺緞
+ if (file.Exists)//鍒ゆ柇鏂囦欢鏄惁瀛樺湪
+ {
+ file.Attributes = FileAttributes.Normal;//灏嗘枃浠跺睘鎬ц缃负鏅��,姣旀柟璇村彧璇绘枃浠惰缃负鏅��
+ file.Delete();//鍒犻櫎鏂囦欢
+ }
+ sqlStr = string.Format(@" DELETE FROM [dbo].[EC_OrderLiuyang] where Keyid='{0}'", item.Keyid);
+ myCmd = new SqlCommand(sqlStr, DC.Connection);
+ myCmd.ExecuteNonQuery();
+ myCmd.Dispose();
+ }
+
+ }
+
+ JavaScript.MessageBox("鍒犻櫎鎴愬姛", this);
+ // Response.Redirect("/Pages/business/OrderUpLoadLiuyang.aspx");
+ }
+ catch (Exception ee)
+ {
+ new Log4NetAdapter().Log("鏌ユ壘鐣欐牱鍑洪敊锛�" + ee.Message);
+ JavaScript.MessageBox("鍒犻櫎澶辫触", this);
+
+ }
+ finally
+ {
+ if (DC.Connection.State != System.Data.ConnectionState.Closed)
+ DC.Connection.Close();
+ }
+
+
+
+ }
+ else
+ {
+ //鍒犻櫎椤甸潰
+ string keyid = Request["deleteKeyIds"].ToString();
+
+ string orderid = Request["Keyid"].ToString();
+
+ Database DC = new Database();
+ string sqlStr = string.Format(@" select [Keyid],[orderid],[FileName],[FilePath],[Remark],[Creater],[CreateTime],[Updater],[LastUpdateTime] FROM [ECTEST].[dbo].[EC_OrderLiuyang] where Keyid='{0}'ORDER BY [CreateTime] ", keyid);
+
+
+ try
+ {
+ SqlCommand myCmd = new SqlCommand(sqlStr, DC.Connection);
+ //SqlDataAdapter myDa = new SqlDataAdapter(myCmd);
+ var a = myCmd.ExecuteReader();
+ //myDa.Dispose();
+ fileDataList = new List<EC_OrderLiuyang>();
+ EC_OrderLiuyang Contract;
+ while (a.Read())
+ { //娉ㄦ剰濡備綍灏嗘瘡娆¤鍙栧埌鐨勮褰曟坊鍔犲埌listbox1涓紙鍥犱负绗竴娆″仛鏃跺嚭閿欎簡锛屽樋鍢匡級
+ Contract = new EC_OrderLiuyang();
+ Contract.Keyid = a.GetGuid(0);
+ Contract.orderid = a.GetInt32(1);
+ Contract.FileName = a.GetString(2);
+ Contract.FilePath = a.GetString(3);
+ Contract.Remark = a.GetString(4);
+
+
+ fileDataList.Add(Contract);
+ }
+ a.Close(); //鍏抽棴sqldatareader
+ if (fileDataList.Count > 0)
+ {
+ FileInfo file = new FileInfo(Server.MapPath(fileDataList[0].FilePath));//鎸囧畾鏂囦欢璺緞
+ if (file.Exists)//鍒ゆ柇鏂囦欢鏄惁瀛樺湪
+ {
+ file.Attributes = FileAttributes.Normal;//灏嗘枃浠跺睘鎬ц缃负鏅��,姣旀柟璇村彧璇绘枃浠惰缃负鏅��
+ file.Delete();//鍒犻櫎鏂囦欢
+ }
+ }
+ sqlStr = string.Format(@" DELETE FROM [dbo].[EC_OrderLiuyang] where Keyid='{0}'", keyid);
+ myCmd = new SqlCommand(sqlStr, DC.Connection);
+ myCmd.ExecuteNonQuery();
+ //if (fileDataList.Count<=1)
+ //{
+ // sqlStr = string.Format(@" update [EC_OrderBasic] set [LiuyangStatus] = 0 where [Keyid]= {0} ", orderid);
+ // myCmd = new SqlCommand(sqlStr, DC.Connection);
+ // myCmd.ExecuteNonQuery();
+ //}
+ JavaScript.MessageBox("鍒犻櫎鎴愬姛", this);
+ // Response.Redirect("/Pages/business/OrderUpLoadLiuyang.aspx");
+ }
+ catch (Exception ee)
+ {
+ new Log4NetAdapter().Log("鏌ユ壘鐣欐牱鍑洪敊锛�" + ee.Message);
+ JavaScript.MessageBox("鍒犻櫎澶辫触", this);
+
+ }
+ finally
+ {
+ if (DC.Connection.State != System.Data.ConnectionState.Closed)
+ DC.Connection.Close();
+ }
+ }
+
+ Response.AppendHeader("deleteKeyIds", "");
+
+ }
+
+ if (!IsPostBack)
+ BindList();
+
+ }
+ public Guid GetKeyid()
+ {
+ return Request["Keyid"].ToGuid2();
+ }
+ //缁戝畾鍒楄〃
+ private void BindList()
+ {
+
+
+ Pagination pa = new Pagination();
+ pa.PageSize = UCPager1.AspNetPager.PageSize;
+ pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
+ int Keyid = Request["Keyid"].ToInt32().Value ;
+
+ if(Keyid==0)
+ {
+ JavaScript.MessageBox("鏈壘鍒拌瀹㈡埛", this, false, false);
+ return;
+ }
+ Database DC = new Database();
+ string sqlStr =string.Format(@" select * from (select ROW_NUMBER() OVER(Order by CreateTime ) AS RowNumber,* from [dbo].[EC_OrderLiuyang] where orderid='{0}' ) as b where b.RowNumber BETWEEN ({1}-1)*({2})+1 and {1}*{2} order by CreateTime ", Keyid,pa.PageIndex,pa.PageSize);
+ int count = 0;
+ try
+ {
+ SqlCommand myCmd = new SqlCommand(sqlStr, DC.Connection);
+ //SqlDataAdapter myDa = new SqlDataAdapter(myCmd);
+ var a = myCmd.ExecuteReader();
+ //myDa.Dispose();
+ fileDataList = new List <EC_OrderLiuyang>();
+ EC_OrderLiuyang Contract ;
+ while (a.Read())
+ { //娉ㄦ剰濡備綍灏嗘瘡娆¤鍙栧埌鐨勮褰曟坊鍔犲埌listbox1涓紙鍥犱负绗竴娆″仛鏃跺嚭閿欎簡锛屽樋鍢匡級
+ Contract = new EC_OrderLiuyang();
+ Contract.Keyid = a.GetGuid(1);
+ Contract.orderid = a.GetInt32(2);
+ Contract.FileName = a.GetString(3);
+ Contract.FilePath = a.GetString(4);
+ Contract.Remark = a.GetString(5);
+
+
+ fileDataList.Add(Contract);
+ }
+ a.Close(); //鍏抽棴sqldatareader
+ sqlStr = string.Format("select count(*) from [dbo].[EC_OrderLiuyang] where orderid='{0}'", Keyid);
+ myCmd = new SqlCommand(sqlStr, DC.Connection);
+ count = (int)myCmd.ExecuteScalar();
+
+
+ }
+ catch (Exception ee)
+ {
+ new Log4NetAdapter().Log("鏌ユ壘鐣欐牱鍑洪敊锛�" + ee.Message);
+
+ }
+ finally
+ {
+ if (DC.Connection.State != System.Data.ConnectionState.Closed)
+ DC.Connection.Close();
+ }
+
+
+
+ FileCount = fileDataList.Count;
+
+ this.RepClientList.DataSource = fileDataList;// fileDataList.AsEnumerable<EC_OrderLiuyang>();
+
+ this.RepClientList.DataBind();
+
+ UCPager1.AspNetPager.RecordCount = count;
+ }
+ //鍒嗛〉浜嬩欢
+ protected void AspNetPager1_PageChanged(object src, EventArgs e)
+ {
+ BindList();
+ }
+
+ protected void btn_Submit_Click_multi(object sender, EventArgs e)
+ {
+
+ var files = Request.Files;
+ //if (files.Count <= 0)
+ // return;
+ HttpPostedFile postedFile;
+ List<HttpPostedFile> fileList = new List<HttpPostedFile>();
+
+
+ for (int i=0;i< files.Count;i++)
+ {
+
+ if (files.Keys[i]=="file2")
+ {
+ postedFile = files[i];
+ if (postedFile.ContentLength == 0)
+ continue;
+ fileList.Add(postedFile);
+ }
+
+ }
+
+ upLoadLiuyangFile uploadContract = new upLoadLiuyangFile();
+ EC_OrderLiuyang contract = null;
+ //Guid? g = null;
+ foreach (var item in fileList)
+ {
+
+ //int page = 0;
+ //try
+ //{
+ // page = pagecount(item);
+ //}
+ //catch (Exception)
+ //{
+
+ // continue;
+ //}
+ //try
+ //{
+ // g = GetContractFileID(page);
+ //}
+ //catch (Exception)
+ //{
+
+ // continue;
+ //}
+
+ //uploadContract = new upLoadLiuyangFile();
+ //if (g != null)
+ //{
+
+ // try
+ // {
+ // uploadContract.SavAndUpDataContractFile(item, CountractFileKeiId: g);
+
+ // JavaScript.MessageBoxandhideLoadingIndicator( "涓婁紶鏂囦欢鎴愬姛", this);
+ // //JavaScript.RefreshSelf(this);
+ // //JavaScript.RefreshOpener(this);
+
+ // }
+ // catch (Exception)
+ // {
+ // JavaScript.MessageBoxandhideLoadingIndicator("涓婁紶鏂囦欢澶辫触", this);
+ // // JavaScript.RefreshSelf(this);
+ // //JavaScript.RefreshOpener(this);
+
+
+ // }
+
+ // continue;
+ //}
+
+ //鏂板缓璧颁笅闈㈤〉闈�
+ contract = new EC_OrderLiuyang
+ {
+ orderid = Request["Keyid"].ToInt32().Value,
+ FileName = System.IO.Path.GetFileName(item.FileName),
+ Creater = CurrentUser.TrueMemberId,
+
+ };
+
+
+
+ try
+ {
+ uploadContract.SavAndUpDataContractFile(item, contract);
+
+ JavaScript.MessageBox("涓婁紶鏂囦欢鎴愬姛", this);
+
+
+ }
+ catch (Exception)
+ {
+ JavaScript.MessageBox( "涓婁紶鏂囦欢澶辫触", this);
+
+
+ }
+
+
+ }
+ BindList();
+
+
+
+
+
+ }
+ protected void btn_Submit_Click_DELLALL(object sender, EventArgs e)
+ {
+
+
+ string pageID = Request["Keyid"];
+ Database DC = new Database();
+ string sqlStr = string.Format(@" SELECT [Keyid],[orderid],[FileName],[FilePath],[Remark],[Creater],[CreateTime],[Updater],[LastUpdateTime] FROM [ECTEST].[dbo].[EC_OrderLiuyang] where orderid={0} ORDER BY CreateTime ", pageID);
+
+
+ try
+ {
+ SqlCommand myCmd = new SqlCommand(sqlStr, DC.Connection);
+ //SqlDataAdapter myDa = new SqlDataAdapter(myCmd);
+ var a = myCmd.ExecuteReader();
+ //myDa.Dispose();
+ fileDataList = new List<EC_OrderLiuyang>();
+ EC_OrderLiuyang Contract;
+ while (a.Read())
+ { //娉ㄦ剰濡備綍灏嗘瘡娆¤鍙栧埌鐨勮褰曟坊鍔犲埌listbox1涓紙鍥犱负绗竴娆″仛鏃跺嚭閿欎簡锛屽樋鍢匡級
+ Contract = new EC_OrderLiuyang();
+ Contract.Keyid = a.GetGuid(0);
+ Contract.orderid = a.GetInt32(1);
+ Contract.FileName = a.GetString(2);
+ Contract.FilePath = a.GetString(3);
+ Contract.Remark = a.GetString(4);
+
+
+ fileDataList.Add(Contract);
+ }
+ a.Close(); //鍏抽棴sqldatareader
+ if (fileDataList.Count > 0)
+ {
+ foreach (var item in fileDataList)
+ {
+ FileInfo file = new FileInfo(Server.MapPath(item.FilePath));//鎸囧畾鏂囦欢璺緞
+ if (file.Exists)//鍒ゆ柇鏂囦欢鏄惁瀛樺湪
+ {
+ file.Attributes = FileAttributes.Normal;//灏嗘枃浠跺睘鎬ц缃负鏅��,姣旀柟璇村彧璇绘枃浠惰缃负鏅��
+ file.Delete();//鍒犻櫎鏂囦欢
+ }
+ sqlStr = string.Format(@" DELETE FROM [dbo].[EC_OrderLiuyang] where Keyid='{0}'", item.Keyid);
+ myCmd = new SqlCommand(sqlStr, DC.Connection);
+ myCmd.ExecuteNonQuery();
+
+ }
+ sqlStr = string.Format(@" update [EC_OrderBasic] set [LiuyangStatus] = 0 where [Keyid]= {0} ", pageID);
+ myCmd = new SqlCommand(sqlStr, DC.Connection);
+
+ myCmd.ExecuteNonQuery();
+ myCmd.Dispose();
+
+ }
+
+ JavaScript.MessageBox("鍒犻櫎鎴愬姛", this);
+ // Response.Redirect("/Pages/business/OrderUpLoadLiuyang.aspx");
+ }
+ catch (Exception ee)
+ {
+ new Log4NetAdapter().Log("鏌ユ壘鐣欐牱鍑洪敊锛�" + ee.Message);
+ JavaScript.MessageBox("鍒犻櫎澶辫触", this);
+
+ }
+ finally
+ {
+ if (DC.Connection.State != System.Data.ConnectionState.Closed)
+ DC.Connection.Close();
+ }
+
+ BindList();
+ }
+
+
+ public void test()
+ {
+ return;
+ }
+
+
+
+
+
+
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderUpLoadLiuyang.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderUpLoadLiuyang.aspx.designer.cs
new file mode 100644
index 0000000..f6e3e61
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderUpLoadLiuyang.aspx.designer.cs
@@ -0,0 +1,80 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class OrderUpLoadLiuyang
+ {
+
+ /// <summary>
+ /// Head1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ /// <summary>
+ /// file2 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputFile file2;
+
+ /// <summary>
+ /// Button1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button Button1;
+
+ /// <summary>
+ /// RepClientList 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater RepClientList;
+
+ /// <summary>
+ /// UCPager1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.UCPager UCPager1;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
index a32cda7..5366de6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -1900,12 +1900,13 @@
printDemand += "锛屾瘡鏈�" + model.PageNum + "浠斤紝";
}
printDemand += model.RLNum + "锛�";
- printDemand += model.PrintColor + "锛�";
- printDemand += "灏侀潰瑕佹眰锛�";
- printDemand += model.FrontType;
+ printDemand += model.PrintColor + "";
+
if (model.FrontType != "鏃犲皝闈�")
{
+ printDemand += "锛屽皝闈㈣姹傦細";
+ printDemand += model.FrontType;
printDemand += "锛�" + model.pDemand;
}
--
Gitblit v1.9.1