From 3b18a48485f7207438d9d0eb3038d979e069431d Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期四, 26 五月 2022 17:58:18 +0800
Subject: [PATCH] 优化产品及产品分类，订单，对称加密，IP转地区名称
---
web/web/Bin/Dao.dll | 0
web/web/GwOrderComplete.aspx | 34 +
web/Dao/SysFlowNodeDao.cs | 2
web/Model/obj/Debug/Model.pdb | 0
web/Dao/obj/Debug/Dao.dll | 0
web/Model/obj/Debug/Model.dll | 0
web/web/Bin/Common.dll | 0
web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache | 0
web/Lib/Model.dll | 0
web/web/GwOrder.ashx | 58 +-
web/web/GwProduct.aspx | 72 ++-
web/web/GwSpPrePattern.aspx | 10
web/web/Bin/Dao.pdb | 0
web/Common/Common.csproj | 4
web/web/GwProduct.ashx | 22
web/Dao/GwOrderDao.cs | 11
web/web/Bin/Common.pdb | 0
web/web/web.config | 11
web/Lib/Common.dll | 0
web/Lib/Model.pdb | 0
web/web/GwClient.aspx.cs | 27
web/Dao/obj/Debug/Dao.pdb | 0
web/Dao/GwClientDao.cs | 14
web/Lib/Dao.dll | 0
web/Common/Utils.cs | 127 +++++++
web/web/GwClient.ashx | 35 +
web/Lib/Common.pdb | 0
web/web/Bin/Model.pdb | 0
web/Model/Model/GwOrder.cs | 2
web/web/GwClient.aspx | 53 ++
web/web/GwStatisProfit.aspx | 443 +++++++++++++-------------
web/Common/DESEncrypt.cs | 23
web/web/GwProduct.aspx.cs | 4
web/web/GwOrderAudit.aspx | 32 +
web/web/Bin/Model.dll | 0
web/Lib/Dao.pdb | 0
36 files changed, 610 insertions(+), 374 deletions(-)
diff --git a/web/Common/Common.csproj b/web/Common/Common.csproj
index 910542c..23e60fe 100644
--- a/web/Common/Common.csproj
+++ b/web/Common/Common.csproj
@@ -35,6 +35,10 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\web\Bin\Newtonsoft.Json.dll</HintPath>
+ </Reference>
<Reference Include="Oracle.DataAccess, Version=2.112.1.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>lib\Oracle.DataAccess.dll</HintPath>
diff --git a/web/Common/DESEncrypt.cs b/web/Common/DESEncrypt.cs
index 4f8109c..a1842d9 100644
--- a/web/Common/DESEncrypt.cs
+++ b/web/Common/DESEncrypt.cs
@@ -6,18 +6,24 @@
namespace Common
{
+
public class DESEncrypt
{
- public static string Encrypt(string Text)
+ //鍔犲瘑涓�
+ //public static string encryptStr = "litianping";
+ public static string encryptStr = "abcDEF123@$@";
+
+ public static string Encrypt(string Text)
{
- return DESEncrypt.Encrypt(Text, "litianping");
+ return DESEncrypt.Encrypt(Text, encryptStr );
}
public static string Encrypt(string Text, string sKey)
{
DESCryptoServiceProvider cryptoServiceProvider = new DESCryptoServiceProvider();
byte[] bytes = Encoding.Default.GetBytes(Text);
- cryptoServiceProvider.Key = Encoding.ASCII.GetBytes(FormsAuthentication.HashPasswordForStoringInConfigFile(sKey, "md5").Substring(0, 8));
+ //c#鐨凞ES鍔犲瘑鏄痥ey涓�8浣�
+ cryptoServiceProvider.Key = Encoding.ASCII.GetBytes(FormsAuthentication.HashPasswordForStoringInConfigFile(sKey, "md5").Substring(0, 8));
cryptoServiceProvider.IV = Encoding.ASCII.GetBytes(FormsAuthentication.HashPasswordForStoringInConfigFile(sKey, "md5").Substring(0, 8));
MemoryStream memoryStream = new MemoryStream();
CryptoStream cryptoStream = new CryptoStream((Stream) memoryStream, cryptoServiceProvider.CreateEncryptor(), CryptoStreamMode.Write);
@@ -31,7 +37,7 @@
public static string Decrypt(string Text)
{
- return DESEncrypt.Decrypt(Text, "litianping");
+ return DESEncrypt.Decrypt(Text, encryptStr);
}
public static string Decrypt(string Text, string sKey)
@@ -43,10 +49,11 @@
{
int num = Convert.ToInt32(Text.Substring(index * 2, 2), 16);
buffer[index] = (byte) num;
- }
- cryptoServiceProvider.Key = Encoding.ASCII.GetBytes(FormsAuthentication.HashPasswordForStoringInConfigFile(sKey, "md5").Substring(0, 8));
- cryptoServiceProvider.IV = Encoding.ASCII.GetBytes(FormsAuthentication.HashPasswordForStoringInConfigFile(sKey, "md5").Substring(0, 8));
- MemoryStream memoryStream = new MemoryStream();
+ }
+ //c#鐨凞ES鍔犲瘑鏄痥ey涓�8浣�
+ cryptoServiceProvider.Key = Encoding.ASCII.GetBytes(FormsAuthentication.HashPasswordForStoringInConfigFile(sKey, "md5").Substring(0, 8));
+ cryptoServiceProvider.IV = Encoding.ASCII.GetBytes(FormsAuthentication.HashPasswordForStoringInConfigFile(sKey, "md5").Substring(0, 8));
+ MemoryStream memoryStream = new MemoryStream();
CryptoStream cryptoStream = new CryptoStream((Stream) memoryStream, cryptoServiceProvider.CreateDecryptor(), CryptoStreamMode.Write);
cryptoStream.Write(buffer, 0, buffer.Length);
cryptoStream.FlushFinalBlock();
diff --git a/web/Common/Utils.cs b/web/Common/Utils.cs
index 5aff652..db8f640 100644
--- a/web/Common/Utils.cs
+++ b/web/Common/Utils.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing Newtonsoft.Json.Linq;
+using System;
using System.IO;
using System.Net;
using System.Net.Mail;
@@ -7,6 +8,7 @@
using System.Text.RegularExpressions;
using System.Threading;
using System.Web;
+using System.Xml;
namespace Common
{
@@ -816,8 +818,129 @@
string str = string.Empty;
return HttpContext.Current.Request.ServerVariables["HTTP_VIA"] == null ? (HttpContext.Current.Request.ServerVariables["REMOTE_ADDR"] == null ? "0.0.0.0" : HttpContext.Current.Request.ServerVariables["REMOTE_ADDR"].ToString()) : (HttpContext.Current.Request.ServerVariables["HTTP_X_FORWARDED_FOR"] != null ? HttpContext.Current.Request.ServerVariables["HTTP_X_FORWARDED_FOR"].ToString() : (HttpContext.Current.Request.ServerVariables["HTTP_CLIENT_IP"] == null ? (HttpContext.Current.Request.ServerVariables["REMOTE_ADDR"] == null ? "0.0.0.0" : HttpContext.Current.Request.ServerVariables["REMOTE_ADDR"].ToString()) : HttpContext.Current.Request.ServerVariables["HTTP_CLIENT_IP"].ToString()));
}
+ /// <summary>
+ /// 鑾峰彇瀹㈡埛绔疘P鍦板潃
+ /// </summary>
+ /// <returns>鑻ュけ璐ュ垯杩斿洖鍥為�佸湴鍧�</returns>
+ public static string GetCurrentUserIp()
+ {
+ //濡傛灉瀹㈡埛绔娇鐢ㄤ簡浠ｇ悊鏈嶅姟鍣紝鍒欏埄鐢℉TTP_X_FORWARDED_FOR鎵惧埌瀹㈡埛绔疘P鍦板潃
+ string userHostAddress = string.IsNullOrEmpty(HttpContext.Current.Request.ServerVariables["HTTP_X_FORWARDED_FOR"]) ? null : HttpContext.Current.Request.ServerVariables["HTTP_X_FORWARDED_FOR"].ToString().Split(',')[0].Trim();
+ //鍚﹀垯鐩存帴璇诲彇REMOTE_ADDR鑾峰彇瀹㈡埛绔疘P鍦板潃
+ if (string.IsNullOrEmpty(userHostAddress))
+ {
+ userHostAddress = HttpContext.Current.Request.ServerVariables["REMOTE_ADDR"];
+ }
+ //鍓嶄袱鑰呭潎澶辫触锛屽垯鍒╃敤Request.UserHostAddress灞炴�ц幏鍙朓P鍦板潃锛屼絾姝ゆ椂鏃犳硶纭畾璇P鏄鎴风IP杩樻槸浠ｇ悊IP
+ if (string.IsNullOrEmpty(userHostAddress))
+ {
+ userHostAddress = HttpContext.Current.Request.UserHostAddress;
+ }
+ //鏈�鍚庡垽鏂幏鍙栨槸鍚︽垚鍔燂紝骞舵鏌P鍦板潃鐨勬牸寮忥紙妫�鏌ュ叾鏍煎紡闈炲父閲嶈锛�
+ if (!string.IsNullOrEmpty(userHostAddress) && IsIP(userHostAddress))
+ {
+ return userHostAddress;
+ }
+ return "127.0.0.1";
+ }
- public static string GetTrueWebSitePath()
+
+ //鑾峰彇鏈湴IP鍦板潃,濡傦細192.168.1.102
+ public static string GetLocalIPAddress()
+ {
+ var host = Dns.GetHostEntry(Dns.GetHostName());
+ foreach (var ip in host.AddressList)
+ {
+ if (ip.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
+ {
+ return ip.ToString();
+ }
+ }
+ throw new Exception("No network adapters with an IPv4 address in the system!");
+ }
+
+ /// <summary>
+ /// 鏍规嵁IP 鑾峰彇鐗╃悊鍦板潃
+ /// </summary>
+ /// <param name="ip">Ip鍦板潃</param>
+ /// <param name="AddressClasses">杩斿洖鍦板潃绫诲埆锛�0-鍏ㄥ湴鍧�锛�1-鍥藉缂栫爜锛� 2-鍥藉锛�3-鍦板尯缂栫爜锛�4-鍦板尯鍚嶇О锛�5-鍩庡競鍚嶇О</param>
+ /// <returns></returns>
+ public static string GetIpAddress(string ip, string addressClasses)
+ {
+ string url = "http://ip-api.com/json/" + ip + "?lang=zh-CN";
+ string result = "";
+ WebRequest wrt = null;
+ WebResponse wrp = null;
+ try
+ {
+ wrt = WebRequest.Create(url);
+ wrt.Credentials = CredentialCache.DefaultCredentials;
+
+ wrp = wrt.GetResponse();
+ StreamReader sr = new StreamReader(wrp.GetResponseStream(), Encoding.UTF8);
+ //鑾峰彇鍒扮殑鏄疛son鏁版嵁
+ string html = sr.ReadToEnd();
+
+ if (string.IsNullOrEmpty(html))
+ return null;
+
+ //Newtonsoft.Json璇诲彇鏁版嵁
+ JObject obj = Newtonsoft.Json.JsonConvert.DeserializeObject<JObject>(html);
+ string countryCode = obj["countryCode"] == null ? "" : obj["countryCode"].ToString(); //鍥藉缂栫爜
+ string country = obj["country"] == null ? "" : obj["country"].ToString(); //鍥藉
+ string region = obj["region"] == null ? "" : obj["region"].ToString(); //鍦板尯缂栫爜
+ string regionName = obj["regionName"] == null ? "" : obj["regionName"].ToString(); //鍦板尯鍚嶇О
+ string city = obj["city"] == null ? "" : obj["city"].ToString(); //鍩庡競鍚嶇О
+ //string province = obj["regionName"].ToString();
+
+ //鍦板潃鍏ㄧО
+ if (addressClasses.Equals("0"))
+ return country + (city.Equals(regionName) ? city : (regionName + city));
+ //鍥藉缂栫爜
+ if (addressClasses.Equals("1"))
+ return countryCode;
+ //鍥藉鍚嶇О
+ if (addressClasses.Equals("2"))
+ return country;
+ //鍦板尯缂栫爜
+ if (addressClasses.Equals("3"))
+ return region;
+ //鍦板尯鍚嶇О
+ if (addressClasses.Equals("4"))
+ return regionName;
+ //鍩庡競鍚嶇О
+ if (addressClasses.Equals("5"))
+ //return city.Equals(regionName) ? city : (regionName + city);
+ return city;
+
+ else
+ return country + (city.Equals(regionName) ? city : (regionName + city));
+
+ }
+ catch (Exception)
+ {
+ }
+ finally
+ {
+ if (wrp != null)
+ wrp.Close();
+ if (wrt != null)
+ wrt.Abort();
+ }
+ return result;
+ }
+
+ /// <summary>
+ /// 妫�鏌P鍦板潃鏍煎紡
+ /// </summary>
+ /// <param name="ip"></param>
+ /// <returns></returns>
+ public static bool IsIP(string ip)
+ {
+ return System.Text.RegularExpressions.Regex.IsMatch(ip, @"^((2[0-4]\d|25[0-5]|[01]?\d\d?)\.){3}(2[0-4]\d|25[0-5]|[01]?\d\d?)$");
+ }
+
+ public static string GetTrueWebSitePath()
{
string path = HttpContext.Current.Request.Path;
return path.LastIndexOf("/") == path.IndexOf("/") ? "/" : path.Substring(path.IndexOf("/"), path.LastIndexOf("/") + 1);
diff --git a/web/Dao/GwClientDao.cs b/web/Dao/GwClientDao.cs
index cae844f..63c97d9 100644
--- a/web/Dao/GwClientDao.cs
+++ b/web/Dao/GwClientDao.cs
@@ -23,9 +23,13 @@
/// <param name="clientName">鑱旂郴浜�</param>
/// <param name="telphone">鑱旂郴鐢佃瘽</param>
/// <param name="agent">涓氬姟鍛�</param>
+ /// <param name="company">鍏徃鍚嶇О</param>
+ /// <param name="salesman">褰掑睘涓氬姟鍛�</param>
+ /// <param name="supportStaff">褰掑睘瀹㈡湇浜哄憳</param>
+ /// <param name="productId">浜у搧ID</param>
/// <returns></returns>
//public List<GwClient> LoadInfoList(out int recordCount, int pageIndex, int pageSizestring, string clientID, string clientName, string telphone, string agent)
- public List<GwClient> LoadInfoList(out int recordCount, int pageIndex, int pageSizestring, string clientID, string clientName, string telphone, string agent, string company, string salesman, string productId, string permissionsSQL )
+ public List<GwClient> LoadInfoList(out int recordCount, int pageIndex, int pageSizestring, string clientID, string clientName, string telphone, string agent, string company, string salesman, string supportStaff, string productId, string permissionsSQL )
{
List<GwClient> list = new List<GwClient>();
@@ -34,7 +38,7 @@
{
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.Append("from GW_CLIENT where 1=1");
- OracleParameter[] oracleParameterArray = new OracleParameter[6];
+ OracleParameter[] oracleParameterArray = new OracleParameter[7];
if (clientID != null && clientID != "")
{
oracleParameterArray[0] = new OracleParameter(":ClientID", (OracleDbType)126);
@@ -71,6 +75,12 @@
((DbParameter)oracleParameterArray[5]).Value = (object)("%" + agent + "%");
stringBuilder.Append(" and Agent like :Agent");
}
+ if (supportStaff != null && supportStaff != "")
+ {
+ oracleParameterArray[6] = new OracleParameter(":SupportStaff", (OracleDbType)126);
+ ((DbParameter)oracleParameterArray[6]).Value = (object)(supportStaff);
+ stringBuilder.Append(" and SUPPORT_STAFF = :SupportStaff");
+ }
if (productId != null && productId != "")
{
diff --git a/web/Dao/GwOrderDao.cs b/web/Dao/GwOrderDao.cs
index 973f0f3..1d1944e 100644
--- a/web/Dao/GwOrderDao.cs
+++ b/web/Dao/GwOrderDao.cs
@@ -32,7 +32,7 @@
//flag: 0-寰呭鏍歌鍗�(宸叉彁浜ゃ�佸鏍镐腑)锛�1-宸插畬鎴愯鍗曪紙瀹℃牳閫氳繃銆佸鏍镐笉閫氳繃銆佸彇娑堬級
- public List<GwOrder> LoadInfoList(string spId, string clientId, string clientName, int flag, DateTime startDate, DateTime endDate, int pageSize, int PageIndex, string permissionsSQL, out int recordcount)
+ public List<GwOrder> LoadInfoList(string spId, string clientId, string compay, int flag, DateTime startDate, DateTime endDate, int pageSize, int PageIndex, string permissionsSQL, out int recordcount)
{
List<GwOrder> list = new List<GwOrder>();
@@ -41,7 +41,7 @@
{
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.Append(" FROM ( ");
- stringBuilder.Append("SELECT GWO.*, GWC.CLIENT_NAME ");
+ stringBuilder.Append("SELECT GWO.*, GWC.CLIENT_NAME, GWC.COMPANY ");
stringBuilder.Append(" FROM GW_ORDER GWO ");
stringBuilder.Append(" LEFT JOIN GW_SP GWS ON GWS.SP_ID = GWO.SP_ID ");
stringBuilder.Append(" LEFT JOIN GW_CLIENT GWC ON GWC.CLIENT_ID = GWO.CLIENT_ID ");
@@ -81,9 +81,9 @@
{
stringBuilder.Append(" and GWO.CLIENT_ID like '%" + clientId + "%'");
}
- if ((clientName != null) && (clientName != ""))
+ if ((compay != null) && (compay != ""))
{
- stringBuilder.Append(" and GWC.CLIENT_NAME like '%" + clientName + "%'");
+ stringBuilder.Append(" and GWC.COMPANY like '%" + compay + "%'");
}
//瀹㈡埛鏉冮檺SQL鑴氭湰
stringBuilder.Append(permissionsSQL);
@@ -308,7 +308,8 @@
OracleReaderWrapper oracleReaderWrapper = new OracleReaderWrapper(reader);
o.OrderId = oracleReaderWrapper.GetString("ORDER_ID", "");
o.SpId = oracleReaderWrapper.GetString("SP_ID", "");
- o.ClientId = oracleReaderWrapper.GetString("CLIENT_ID", "");
+ o.ClientId = oracleReaderWrapper.GetString("CLIENT_ID", "");
+ o.Company = oracleReaderWrapper.GetString("COMPANY", "");
o.ClientName = oracleReaderWrapper.GetString("CLIENT_NAME", "");
o.ProductId = oracleReaderWrapper.GetString("PRODUCT_ID", "");
o.ComboId = oracleReaderWrapper.GetString("COMBO_ID", "");
diff --git a/web/Dao/SysFlowNodeDao.cs b/web/Dao/SysFlowNodeDao.cs
index c289723..767778d 100644
--- a/web/Dao/SysFlowNodeDao.cs
+++ b/web/Dao/SysFlowNodeDao.cs
@@ -172,7 +172,7 @@
}
if (sysFlowNode.UserId != null && sysFlowNode.UserId != "")
{
- stringBuilder.Append(" AND INSTR(','||USER_ID||',','" + sysFlowNode.UserId + "') > 0");
+ stringBuilder.Append(" AND INSTR(','||USER_ID||',', '" + sysFlowNode.UserId + "') > 0"); //瀵瑰簲MySql鐨凢IND_IN_SET璇硶銆�
}
stringBuilder.Append(" ORDER BY BUSINESS_TYPE ");
diff --git a/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache b/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache
index e082746..48936f7 100644
--- a/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache
+++ b/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache
Binary files differ
diff --git a/web/Dao/obj/Debug/Dao.dll b/web/Dao/obj/Debug/Dao.dll
index e567808..a7b22ce 100644
--- a/web/Dao/obj/Debug/Dao.dll
+++ b/web/Dao/obj/Debug/Dao.dll
Binary files differ
diff --git a/web/Dao/obj/Debug/Dao.pdb b/web/Dao/obj/Debug/Dao.pdb
index cb1f233..49e31d1 100644
--- a/web/Dao/obj/Debug/Dao.pdb
+++ b/web/Dao/obj/Debug/Dao.pdb
Binary files differ
diff --git a/web/Lib/Common.dll b/web/Lib/Common.dll
index a695c6b..2ecc5df 100644
--- a/web/Lib/Common.dll
+++ b/web/Lib/Common.dll
Binary files differ
diff --git a/web/Lib/Common.pdb b/web/Lib/Common.pdb
index 1d5053e..06e0fa5 100644
--- a/web/Lib/Common.pdb
+++ b/web/Lib/Common.pdb
Binary files differ
diff --git a/web/Lib/Dao.dll b/web/Lib/Dao.dll
index 8d5e470..a7b22ce 100644
--- a/web/Lib/Dao.dll
+++ b/web/Lib/Dao.dll
Binary files differ
diff --git a/web/Lib/Dao.pdb b/web/Lib/Dao.pdb
index 9adeddd..49e31d1 100644
--- a/web/Lib/Dao.pdb
+++ b/web/Lib/Dao.pdb
Binary files differ
diff --git a/web/Lib/Model.dll b/web/Lib/Model.dll
index b1414dd..04bcab3 100644
--- a/web/Lib/Model.dll
+++ b/web/Lib/Model.dll
Binary files differ
diff --git a/web/Lib/Model.pdb b/web/Lib/Model.pdb
index 561d13f..c28c4a9 100644
--- a/web/Lib/Model.pdb
+++ b/web/Lib/Model.pdb
Binary files differ
diff --git a/web/Model/Model/GwOrder.cs b/web/Model/Model/GwOrder.cs
index cad08b0..aff3798 100644
--- a/web/Model/Model/GwOrder.cs
+++ b/web/Model/Model/GwOrder.cs
@@ -13,6 +13,8 @@
public string ClientId { get; set; }
+ public string Company { get; set; }
+
public string ClientName { get; set; }
public string ProductId { get; set; }
diff --git a/web/Model/obj/Debug/Model.dll b/web/Model/obj/Debug/Model.dll
index b1414dd..04bcab3 100644
--- a/web/Model/obj/Debug/Model.dll
+++ b/web/Model/obj/Debug/Model.dll
Binary files differ
diff --git a/web/Model/obj/Debug/Model.pdb b/web/Model/obj/Debug/Model.pdb
index 561d13f..c28c4a9 100644
--- a/web/Model/obj/Debug/Model.pdb
+++ b/web/Model/obj/Debug/Model.pdb
Binary files differ
diff --git a/web/web/Bin/Common.dll b/web/web/Bin/Common.dll
index a695c6b..2ecc5df 100644
--- a/web/web/Bin/Common.dll
+++ b/web/web/Bin/Common.dll
Binary files differ
diff --git a/web/web/Bin/Common.pdb b/web/web/Bin/Common.pdb
index 1d5053e..06e0fa5 100644
--- a/web/web/Bin/Common.pdb
+++ b/web/web/Bin/Common.pdb
Binary files differ
diff --git a/web/web/Bin/Dao.dll b/web/web/Bin/Dao.dll
index 8d5e470..a7b22ce 100644
--- a/web/web/Bin/Dao.dll
+++ b/web/web/Bin/Dao.dll
Binary files differ
diff --git a/web/web/Bin/Dao.pdb b/web/web/Bin/Dao.pdb
index 9adeddd..49e31d1 100644
--- a/web/web/Bin/Dao.pdb
+++ b/web/web/Bin/Dao.pdb
Binary files differ
diff --git a/web/web/Bin/Model.dll b/web/web/Bin/Model.dll
index b1414dd..04bcab3 100644
--- a/web/web/Bin/Model.dll
+++ b/web/web/Bin/Model.dll
Binary files differ
diff --git a/web/web/Bin/Model.pdb b/web/web/Bin/Model.pdb
index 561d13f..c28c4a9 100644
--- a/web/web/Bin/Model.pdb
+++ b/web/web/Bin/Model.pdb
Binary files differ
diff --git a/web/web/GwClient.ashx b/web/web/GwClient.ashx
index 667d11a..70a909e 100644
--- a/web/web/GwClient.ashx
+++ b/web/web/GwClient.ashx
@@ -24,6 +24,7 @@
private int _userId = -1;
private int _userType = -1;
private string _account = "";
+ private string initPwd = ConfigurationManager.AppSettings["initPwd"];
public override JsonPageResult ProcessRequestInternal(PageContext<Model.SysUser> context)
{
@@ -66,6 +67,9 @@
//鎵归噺鍒嗛厤瀹㈡埛鐨勪釜鎬т骇鍝�
case "batchUpdateClientProduct":
return BatchUpdateClientProduct(context);
+ //閲嶇疆瀵嗙爜
+ case "resetPwd":
+ return ResetPwd(context);
default:
throw new Exception("Invalid Action=" + action);
@@ -87,6 +91,7 @@
string ClientName = context.GetString("ClientName");
string Telephone = context.GetString("Telephone");
string Salesman = context.GetString("Salesman");
+ string SupportStaff = context.GetString("SupportStaff");
string ProductId = context.GetString("ProductId");
int pageIndex = context.GetInt("pageIndex", 1);
@@ -100,7 +105,7 @@
using (GwClientDao dao = new GwClientDao())
{
string permissionsSQL = dao.GetClientPermissions(_userId, _userType, null);
- var list = dao.LoadInfoList(out recordCount, pageIndex, pageSize, ClientID, ClientName, Telephone, Agent, Company, Salesman, ProductId, permissionsSQL);
+ var list = dao.LoadInfoList(out recordCount, pageIndex, pageSize, ClientID, ClientName, Telephone, Agent, Company, Salesman, SupportStaff, ProductId, permissionsSQL);
if (list != null && list.Count > 0)
{
@@ -114,8 +119,8 @@
//edit:yangzh by 20220511
//str += @"<tr ><td>" + item.ClientID + "</td><td>" + item.Company + "</td><td>" + item.ClientName + "</td><td>" + item.Telephone + "</td><td>" + item.Top_up_Amount_Total + "鍏�</td><td>" + item.Agent + "</td><td>" + Certification_StatusResult + "</td>";
//str += @"<tr ><td>" + item.ClientID + "</td><td>" + item.Company + "</td><td>" + item.ClientName + "</td><td>" + item.Telephone + "</td><td>" + item.Balance/1000 + "鍏�</td><td>" + item.Top_up_Amount_Total/1000 + "鍏�</td><td>" + item.Agent + "</td><td>" + Certification_StatusResult + "</td>";
- str += @"<tr ><td rowspan='1' ><input type='checkbox' name='checkbox' value='" + item.ClientID + "'/></td><td>" + item.ClientID + "</td><td>" + item.Company + "</td><td>" + item.ClientName + "</td><td>" + item.Telephone + "</td><td>" + item.Balance/1000 + "鍏�</td><td>" + item.Top_up_Amount_Total/1000 + "鍏�</td><td>" + SysUserName(string.IsNullOrEmpty(item.Salesman)? 0: int.Parse(item.Salesman) ) + "</td><td>" + Certification_StatusResult + "</td>";
-
+ //str += @"<tr ><td rowspan='1' ><input type='checkbox' name='checkbox' value='" + item.ClientID + "'/></td><td>" + item.ClientID + "</td><td>" + item.Company + "</td><td>" + item.ClientName + "</td><td>" + item.Telephone + "</td><td>" + item.Balance/1000 + "鍏�</td><td>" + item.Top_up_Amount_Total/1000 + "鍏�</td><td>" + SysUserName(string.IsNullOrEmpty(item.Salesman)? 0: int.Parse(item.Salesman) ) + "</td><td>" + Certification_StatusResult + "</td>";
+ str += @"<tr ><td rowspan='1' ><input type='checkbox' name='checkbox' value='" + item.ClientID + "'/></td><td>" + item.ClientID + "</td><td>" + item.Company + "</td><td>" + item.ClientName + "</td><td>" + item.Telephone + "</td><td>" + item.Balance/1000 + "</td><td>" + item.Top_up_Amount_Total/1000 + "</td><td>" + SysUserName(string.IsNullOrEmpty(item.Salesman)? 0: int.Parse(item.Salesman) ) + "</td></td>";
str += @"<td>";
string loginStr = "http://" + serverIp + ":" + clientPort + "/Attachedlogin.aspx?action=Attachedlogin&account=" + item.Account + "&password=" + item.Password;
@@ -134,6 +139,10 @@
str += @"榛戝悕鍗�";
str += @"</a> ";
+ str += string.Format(@"<a class=""action-modal-resetPwd btn btn-xs btn-primary"" href=""javascript:;"" data-id=""{0}"">", item.ClientID);
+ str += @"閲嶇疆瀵嗙爜";
+ str += @"</a> ";
+
str += string.Format(@"<a class=""action-delete btn btn-xs btn-default"" href=""javascript:;"" data-id=""{0}"">", item.ClientID);
str += @"鍒犻櫎";
str += @"</a>";
@@ -143,7 +152,7 @@
}
else
{
- str += @"<tr><td colspan=""10"">鏆傛棤淇℃伅</td></tr>";
+ str += @"<tr><td colspan=""9"">鏆傛棤淇℃伅</td></tr>";
}
}
@@ -216,6 +225,20 @@
string clientID = context.GetString("clientID");
return new JsonPageResult(true, _Dao.GetBlackList(clientID));
+ }
+
+ //閲嶇疆瀵嗙爜
+ private JsonPageResult ResetPwd(PageContext<Model.SysUser> context)
+ {
+ string clientID = context.GetString("clientID");
+ string password = string.IsNullOrEmpty(initPwd ) ? "123456" : initPwd;
+
+ //瀵嗙爜MD5鍔犲瘑锛�
+ password = DataHelper.MD5Hex(password);
+
+ _Dao.UpdatePassword(clientID, password);
+
+ return new JsonPageResult(true, "閲嶇疆瀵嗙爜鎴愬姛锛�");
}
/// <summary>
@@ -620,14 +643,14 @@
}
}
- //绠＄悊绔处鎴峰悕绉�
+ //绠＄悊绔敤鎴稩D杞悕绉�
private string SysUserName(int userId)
{
if (this.SysUserList == null)
return string.Empty;
SysUser sysUser = this._SysUserList.Find((Predicate<SysUser>)(bean => bean.UserID == userId));
if (sysUser != null)
- return string.Format("{0}-{1}", (object)sysUser.UserID, (object)sysUser.UserName);
+ return string.Format("{0}", (object)sysUser.UserName);
return string.Empty;
}
}
diff --git a/web/web/GwClient.aspx b/web/web/GwClient.aspx
index ee6bba0..b148960 100644
--- a/web/web/GwClient.aspx
+++ b/web/web/GwClient.aspx
@@ -20,11 +20,12 @@
var Telephone = $("#Telephone").val();
var Agent = $("#Agent").val();
var Salesman = $("#Salesman").val();
+ var SupportStaff = $("#SupportStaff").val();
var ProductId = $("#ProductId").val();
$.ajax({
url: "GwClient.ashx",
type: "POST",
- data: { action: "loadGwClientPageList", ClientID: ClientID, Company: Company, ClientName: ClientName, Telephone: Telephone, Agent: Agent, Salesman: Salesman, ProductId: ProductId , pageSize: $("#pager").Pager("getPageSize"), pageIndex: $("#pager").Pager("getPageIndex") },
+ data: { action: "loadGwClientPageList", ClientID: ClientID, Company: Company, ClientName: ClientName, Telephone: Telephone, Agent: Agent, Salesman: Salesman, SupportStaff: SupportStaff, ProductId: ProductId , pageSize: $("#pager").Pager("getPageSize"), pageIndex: $("#pager").Pager("getPageIndex") },
success: function (result) {
if (result.OK) {
$("#gwclientTable tbody").html(result.Message.Table);
@@ -161,6 +162,20 @@
mytek.confirm("鏄惁闇�瑕佸垹闄よ瀹㈡埛锛�", "瀹㈡埛鍒犻櫎鍚庡皢鏃犳硶鎭㈠锛岃璋ㄦ厧鎿嶄綔锛�", function (b) {
if (b) {
$.post("gwclient.ashx", { action: "delete", clientID: id }, function (r) {
+ mytek.alert(r.Message, r.OK, function () {
+ window.location.reload();
+ });
+ });
+ }
+ });
+ });
+
+ //閲嶇疆瀵嗙爜
+ $(document).on("click", ".action-modal-resetPwd", function () {
+ var id = $(this).data("id");
+ mytek.confirm("閲嶇疆瀵嗙爜锛�", "鏄惁閲嶇疆瀵嗙爜锛熻璋ㄦ厧鎿嶄綔锛�", function (b) {
+ if (b) {
+ $.post("gwclient.ashx", { action: "resetPwd", clientID: id }, function (r) {
mytek.alert(r.Message, r.OK, function () {
window.location.reload();
});
@@ -316,7 +331,7 @@
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">
<span aria-hidden="true">×</span><span class="sr-only">Close</span></button>
- <h4 class="modal-title">鍒涘缓/淇敼瀹㈡埛
+ <h4 class="modal-title">鍒涘缓/淇敼瀹㈡埛淇℃伅
</h4>
<input name="action" value="add" type="hidden" />
<input name="id" id="id" type="hidden" value="" />
@@ -334,7 +349,7 @@
<div class="form-group">
<label class="control-label col-sm-2">
- 瀹㈡埛鍚嶇О <span style="color:red">*</span>
+ 鍏徃鍚嶇О锛堝叏绉帮級 <span style="color:red">*</span>
</label>
<div class="col-sm-4">
<input type="text" name="company" id="company" value="" class="form-control" />
@@ -352,7 +367,7 @@
</div>
<div class="col-sm-6">
<a class="btn btn-xs btn-primary action-generate-password ">鐢熸垚瀵嗙爜</a>
- <a class="btn btn-xs btn-success action-generate-password ">澶嶅埗瀵嗙爜</a>
+ <a class="btn btn-xs btn-success action-copyPwd ">澶嶅埗瀵嗙爜</a>
</div>
</div>
<div class="form-group">
@@ -403,6 +418,7 @@
</select>
</div>
</div>
+ <!--
<div class="form-group">
<label class="control-label col-sm-2">
褰╀俊鏄惁鏀寔鏄剧ず鐘舵�佹姤鍛� <span style="color:red">*</span>
@@ -415,6 +431,7 @@
</select>
</div>
</div>
+ -->
<!--
<div class="form-group">
<label class="control-label col-sm-2">
@@ -447,7 +464,7 @@
</div>
<div class="form-group">
<label class="control-label col-sm-2">
- 褰掑睘瀹㈡埛浜哄憳 <span style="color:red">*</span>
+ 褰掑睘瀹㈡湇浜哄憳 <span style="color:red">*</span>
</label>
<div class="col-sm-4">
<select name="supportStaff" id="supportStaff" class="form-control">
@@ -465,27 +482,27 @@
</select>
</div>
</div>
- <!--
<div class="form-group">
<label class="control-label col-sm-2">钀ヤ笟鎵х収</label>
<div class="col-sm-4">
<input type="file" name="txt_file" id="txt_file" class="file-loading" />
</div>
</div>
- -->
+ <!--
<div class="form-group">
<label class="control-label col-sm-2">
鏉冮檺绠＄悊
</label>
<div class="col-sm-10">
<input type="checkbox" class="icheck-me" value="GwClientList.aspx" name="permissionData" />浠ｇ悊鍟嗙鐞�(*鏄惁鏀寔鍒涘缓涓嬬骇浠ｇ悊)
- <!--
+ <!//--
<input type="checkbox" class="icheck-me" value="LgSmsDetailReport.aspx" name="permissionData" />鏌ョ湅鐘舵�佹姤鍛�
<input type="checkbox" class="icheck-me" value="1" name="permissionData" />鍙戦�佹潈闄�
<input type="checkbox" class="icheck-me" value="2" name="permissionData" />鏌ョ湅鏁版嵁鏉冮檺
- -->
+ --//>
</div>
</div>
+ -->
<div class="form-group">
<label class="control-label col-sm-2">
澶囨敞
@@ -521,7 +538,7 @@
</div>
<div class="form-group">
<div class="input-group m-b">
- <span class="input-group-addon">瀹㈡埛鍚嶇О</span>
+ <span class="input-group-addon">鑱旂郴浜�</span>
<input type="text" name="ClientName" id="ClientName" class="form-control" />
</div>
</div>
@@ -536,6 +553,14 @@
<span class="input-group-addon">褰掑睘涓氬姟鍛�</span>
<select name="Salesman" id="Salesman" class="form-control">
<%=salesmanOptions(-1)%>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="input-group m-b">
+ <span class="input-group-addon">褰掑睘瀹㈡湇浜哄憳</span>
+ <select name="SupportStaff" id="SupportStaff" class="form-control">
+ <%=supportStaffOptions(-1)%>
</select>
</div>
</div>
@@ -567,19 +592,21 @@
<th>瀹㈡埛璐﹀彿
</th>
<th>鍏徃鍚嶇О</th>
- <th>瀹㈡埛鍚嶇О
+ <th>鑱旂郴浜�
</th>
<th>鑱旂郴鐢佃瘽
</th>
- <th>璐︽埛浣欓
+ <th>璐︽埛浣欓(鍏�)
</th>
- <th>绱鍏呭��
+ <th>绱鍏呭��(鍏�)
</th>
<th>涓氬姟鍛�
</th>
+ <!--
<th>璁よ瘉鐘舵��
</th>
+ -->
<th>鎿嶄綔
</th>
</tr>
diff --git a/web/web/GwClient.aspx.cs b/web/web/GwClient.aspx.cs
index e579884..b8a666f 100644
--- a/web/web/GwClient.aspx.cs
+++ b/web/web/GwClient.aspx.cs
@@ -8,12 +8,15 @@
using Dao;
using System.Collections.Generic;
using System.Text;
+using System.Configuration;
public partial class _GwClient : PageBase<SysUser>, IRequiresSessionState
{
protected List<SysUser> SysUserList;
protected List<GwProduct> GwProductList;
+
+ string addressClasses = ConfigurationManager.AppSettings["addressClasses"];
protected void Page_Load(object sender, EventArgs e)
{
@@ -64,9 +67,9 @@
}
if (userId == bean.UserID)
- stringBuilder.AppendFormat("<option value=\"{0}\" selected>{0}-{1}</option>", (object)bean.UserID, (object)bean.UserName);
+ stringBuilder.AppendFormat("<option value=\"{0}\" selected>{1}</option>", (object)bean.UserID, (object)bean.UserName);
else
- stringBuilder.AppendFormat("<option value=\"{0}\">{0}-{1}</option>", (object)bean.UserID, (object)bean.UserName);
+ stringBuilder.AppendFormat("<option value=\"{0}\">{1}</option>", (object)bean.UserID, (object)bean.UserName);
}
return stringBuilder.ToString();
}
@@ -92,9 +95,9 @@
}
if (userId == bean.UserID)
- stringBuilder.AppendFormat("<option value=\"{0}\" selected>{0}-{1}</option>", (object)bean.UserID, (object)bean.UserName);
+ stringBuilder.AppendFormat("<option value=\"{0}\" selected>{1}</option>", (object)bean.UserID, (object)bean.UserName);
else
- stringBuilder.AppendFormat("<option value=\"{0}\">{0}-{1}</option>", (object)bean.UserID, (object)bean.UserName);
+ stringBuilder.AppendFormat("<option value=\"{0}\">{1}</option>", (object)bean.UserID, (object)bean.UserName);
}
return stringBuilder.ToString();
}
@@ -120,9 +123,9 @@
}
if (userId == bean.UserID)
- stringBuilder.AppendFormat("<option value=\"{0}\" selected>{0}-{1}</option>", (object)bean.UserID, (object)bean.UserName);
+ stringBuilder.AppendFormat("<option value=\"{0}\" selected>{1}</option>", (object)bean.UserID, (object)bean.UserName);
else
- stringBuilder.AppendFormat("<option value=\"{0}\">{0}-{1}</option>", (object)bean.UserID, (object)bean.UserName);
+ stringBuilder.AppendFormat("<option value=\"{0}\">{1}</option>", (object)bean.UserID, (object)bean.UserName);
}
return stringBuilder.ToString();
}
@@ -148,9 +151,9 @@
}
if (userId == bean.UserID)
- stringBuilder.AppendFormat("<option value=\"{0}\" selected>{0}-{1}</option>", (object)bean.UserID, (object)bean.UserName);
+ stringBuilder.AppendFormat("<option value=\"{0}\" selected>{1}</option>", (object)bean.UserID, (object)bean.UserName);
else
- stringBuilder.AppendFormat("<option value=\"{0}\">{0}-{1}</option>", (object)bean.UserID, (object)bean.UserName);
+ stringBuilder.AppendFormat("<option value=\"{0}\">{1}</option>", (object)bean.UserID, (object)bean.UserName);
}
return stringBuilder.ToString();
}
@@ -177,9 +180,9 @@
}
if (productId.Equals(bean.Id))
- stringBuilder.AppendFormat("<option value=\"{0}\" selected>{0}-{1}</option>", (object)bean.Id, (object)bean.Name);
+ stringBuilder.AppendFormat("<option value=\"{0}\" selected>{1}</option>", (object)bean.Id, (object)bean.Name);
else
- stringBuilder.AppendFormat("<option value=\"{0}\">{0}-{1}</option>", (object)bean.Id, (object)bean.Name);
+ stringBuilder.AppendFormat("<option value=\"{0}\">{1}</option>", (object)bean.Id, (object)bean.Name);
}
return stringBuilder.ToString();
}
@@ -211,9 +214,9 @@
}
if (productId.Equals(bean.Id))
- stringBuilder.AppendFormat("<option value=\"{0}\" selected>{0}-{1}</option>", (object)bean.Id, (object)bean.Name);
+ stringBuilder.AppendFormat("<option value=\"{0}\" selected>{1}</option>", (object)bean.Id, (object)bean.Name);
else
- stringBuilder.AppendFormat("<option value=\"{0}\">{0}-{1}</option>", (object)bean.Id, (object)bean.Name);
+ stringBuilder.AppendFormat("<option value=\"{0}\">{1}</option>", (object)bean.Id, (object)bean.Name);
}
return stringBuilder.ToString();
}
diff --git a/web/web/GwOrder.ashx b/web/web/GwOrder.ashx
index cdb1c66..dbe8cc6 100644
--- a/web/web/GwOrder.ashx
+++ b/web/web/GwOrder.ashx
@@ -67,7 +67,7 @@
//Console.WriteLine("List.............[" + context.GetInt("name") + "][" + context.GetInt("classes") + "]");
string spId = context.GetString("spId");
string clientId = context.GetString("clientId");
- string clientName = context.GetString("clientName");
+ string compay = context.GetString("compay");
int flag = context.GetInt("flag");
DateTime startDate = context.GetDateTime("startDate");
DateTime endDate = context.GetDateTime("endDate");
@@ -78,7 +78,7 @@
string permissionsSQL = new GwClientDao().GetClientPermissions(_userId, _userType, "GWC");
- List<GwOrder> list = _Dao.LoadInfoList(spId, clientId, clientName, flag, startDate, endDate, pageSize, pageIndex, permissionsSQL, out recordCount);
+ List<GwOrder> list = _Dao.LoadInfoList(spId, clientId, compay, flag, startDate, endDate, pageSize, pageIndex, permissionsSQL, out recordCount);
string str1 = "";
if (list != null && list.Count > 0)
@@ -96,10 +96,10 @@
//str1 = str1 + "<td>" + bean.ComboId + "</td>";
str1 = str1 + "<td>" + bean.BasicNum + "</td>";
str1 = str1 + "<td>" + bean.GivingNum + "</td>";
- str1 = str1 + string.Format("<td>{0}鍏�/鏉�</td>", (object)(Convert.ToDecimal(bean.Price) / new Decimal(1000)));
+ str1 = str1 + string.Format("<td>{0}</td>", (object)(Convert.ToDecimal(bean.Price) / new Decimal(1000)));
str1 = str1 + "<td>" + bean.OrderNumTotal + "</td>";
- str1 = str1 + string.Format("<td>{0}鍏�</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));
- str1 = str1 + string.Format("<td>{0}鍏�</td>", (object)(Convert.ToDecimal(bean.PayAmount) / new Decimal(1000)));
+ str1 = str1 + string.Format("<td>{0}</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));
+ str1 = str1 + string.Format("<td>{0}</td>", (object)(Convert.ToDecimal(bean.PayAmount) / new Decimal(1000)));
str1 = str1 + "<td>" + bean.BeforeBalanceNum + "</td>";
str1 = str1 + "<td>" + bean.Creator + "</td>";
str1 = str1 + "<td>" + bean.CreateTime + "</td>";
@@ -149,17 +149,18 @@
{
++num;
- str1 += "<tr><td>" + bean.OrderId + "</td>";
- str1 = str1 + "<td>" + bean.SpId + "</td>";
- str1 = str1 + "<td>" + bean.ClientId + "-" + bean.ClientName + "</td>";
+ //str1 += "<tr><td>" + bean.OrderId + "</td>";
+ str1 = str1 + "<tr><td>" + bean.SpId + "</td>";
+ str1 = str1 + "<td>" + bean.ClientId + "</td>";
+ str1 = str1 + "<td>" + bean.Company + "</td>";
str1 = str1 + "<td>" + ProductToName(bean.ProductId) + "</td>";
//str1 = str1 + "<td>" + bean.ComboId + "</td>";
str1 = str1 + "<td>" + bean.BasicNum + "</td>";
str1 = str1 + "<td>" + bean.GivingNum + "</td>";
- str1 = str1 + string.Format("<td>{0}鍏�/鏉�</td>", (object)(Convert.ToDecimal(bean.Price) / new Decimal(1000)));
+ str1 = str1 + string.Format("<td>{0}</td>", (object)(Convert.ToDecimal(bean.Price) / new Decimal(1000)));
str1 = str1 + "<td>" + bean.OrderNumTotal + "</td>";
- str1 = str1 + string.Format("<td>{0}鍏�</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));
- str1 = str1 + string.Format("<td>{0}鍏�</td>", (object)(Convert.ToDecimal(bean.PayAmount) / new Decimal(1000)));
+ str1 = str1 + string.Format("<td>{0}</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));
+ str1 = str1 + string.Format("<td>{0}</td>", (object)(Convert.ToDecimal(bean.PayAmount) / new Decimal(1000)));
str1 = str1 + "<td>" + bean.BeforeBalanceNum + "</td>";
str1 = str1 + "<td>" + bean.Creator + "</td>";
str1 = str1 + "<td>" + bean.CreateTime + "</td>";
@@ -228,24 +229,25 @@
{
++num;
- str1 += "<tr><td>" + bean.OrderId + "</td>";
+ //str1 += "<tr><td>" + bean.OrderId + "</td>";
str1 = str1 + "<td>" + bean.SpId + "</td>";
- str1 = str1 + "<td>" + bean.ClientId + "-" + bean.ClientName + "</td>";
+ str1 = str1 + "<td>" + bean.ClientId + "</td>";
+ str1 = str1 + "<td>" + bean.Company + "</td>";
str1 = str1 + "<td>" + ProductToName(bean.ProductId) + "</td>";
//str1 = str1 + "<td>" + bean.ComboId + "</td>";
str1 = str1 + "<td>" + bean.BasicNum + "</td>";
str1 = str1 + "<td>" + bean.GivingNum + "</td>";
- str1 = str1 + string.Format("<td>{0}鍏�/鏉�</td>", (object)(Convert.ToDecimal(bean.Price) / new Decimal(1000)));
+ str1 = str1 + string.Format("<td>{0}</td>", (object)(Convert.ToDecimal(bean.Price) / new Decimal(1000)));
str1 = str1 + "<td>" + bean.OrderNumTotal + "</td>";
- str1 = str1 + string.Format("<td>{0}鍏�</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));
- str1 = str1 + string.Format("<td>{0}鍏�</td>", (object)(Convert.ToDecimal(bean.PayAmount) / new Decimal(1000)));
+ str1 = str1 + string.Format("<td>{0}</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));
+ str1 = str1 + string.Format("<td>{0}</td>", (object)(Convert.ToDecimal(bean.PayAmount) / new Decimal(1000)));
str1 = str1 + "<td>" + bean.BeforeBalanceNum + "</td>";
str1 = str1 + "<td>" + bean.Creator + "</td>";
str1 = str1 + "<td>" + bean.CreateTime + "</td>";
str1 = str1 + "<td>" + StatusToName(bean.Status) + "</td>";
//str1 = str1 + "<td>" + bean.Remark + "</td>";
- str1 += "<td class=\"text-right\">";
+ str1 += "<td class=\"text-center\">";
str1 += string.Format("<a href=\"javascript:;\" data-orderid=\"{0}\" class=\"action-modal-detail btn btn-success btn-xs\"><i class=\"fa fa-search\"></i> 鏌ョ湅</a> ", (object) bean.OrderId);
//str1 += string.Format("<a href=\"javascript:;\" data-orderid=\"{0}\" class=\"action-modal-audit btn btn-success btn-xs\"><i class=\"fa fa-search\"></i> 瀹℃牳</a> ", (object) bean.OrderId);
//if(bean.Status == 0) {
@@ -830,9 +832,9 @@
if (classes == -1)
return string.Empty;
else if(classes == 0)
- return "0-浜у搧鍒嗙被";
+ return "浜у搧鍒嗙被";
else if(classes == 1)
- return "1-浜у搧";
+ return "浜у搧";
return string.Empty;
}
@@ -843,9 +845,9 @@
if (isDefault == -1)
return string.Empty;
else if(isDefault == 0)
- return "0-涓�у寲";
+ return "涓�у寲";
else if(isDefault == 1)
- return "1-绯荤粺榛樿";
+ return "绯荤粺榛樿";
return string.Empty;
}
@@ -856,9 +858,9 @@
if (isEnable == -1)
return string.Empty;
else if(isEnable == 0)
- return "0-鍋滅敤";
+ return "鍋滅敤";
else if(isEnable == 1)
- return "1-鍚敤";
+ return "鍚敤";
return string.Empty;
}
@@ -880,15 +882,15 @@
if (status == -1)
return string.Empty;
else if(status == 0)
- return "0-寰呭鏍革紙宸叉彁浜わ級";
+ return "寰呭鏍革紙宸叉彁浜わ級";
else if(status == 1)
- return "1-瀹℃牳涓�";
+ return "瀹℃牳涓�";
else if(status == 2)
- return "2-瀹℃牳閫氳繃";
+ return "瀹℃牳閫氳繃";
else if(status == 3)
- return "3-瀹℃牳涓嶉�氳繃";
+ return "瀹℃牳涓嶉�氳繃";
else if(status == 4)
- return "4-鍙栨秷";
+ return "鍙栨秷";
return string.Empty;
}
diff --git a/web/web/GwOrderAudit.aspx b/web/web/GwOrderAudit.aspx
index 693a9a5..3af525f 100644
--- a/web/web/GwOrderAudit.aspx
+++ b/web/web/GwOrderAudit.aspx
@@ -9,14 +9,14 @@
function loadPageList() {
var clientId = $("#ClientId").val();
- var clientName = $("#ClientName").val();
+ var compay = $("#Compay").val();
var spId = $("#SpId").val();
var startDate = $("#StartTime").val();
var endDate = $("#EndTime").val();
$.ajax({
url: "GwOrder.ashx",
type: "POST",
- data: { action: "listAudit", clientId: clientId, clientName: clientName, spId: spId, startDate: startDate, endDate: endDate, flag: 0, pageIndex: pagination.getPageIndex(), pageSize: pagination.getPageSize() },
+ data: { action: "listAudit", clientId: clientId, compay: compay, spId: spId, startDate: startDate, endDate: endDate, flag: 0, pageIndex: pagination.getPageIndex(), pageSize: pagination.getPageSize() },
success: function (result) {
if (result.OK) {
$("#orderTable tbody").html(result.Message.Table);
@@ -205,8 +205,8 @@
</div>
<div class="form-group">
<div class="input-group m-b">
- <span class="input-group-addon">瀹㈡埛鍚嶇О</span>
- <input type="text" name="ClientName" id="ClientName" class="form-control col-md-2" />
+ <span class="input-group-addon">鍏徃鍚嶇О</span>
+ <input type="text" name="Compay" id="Compay" class="form-control col-md-2" />
</div>
</div>
<div class="form-group">
@@ -236,24 +236,28 @@
<table class="table table-striped table-bordered table-hover" id="orderTable">
<thead>
<tr class="header">
+ <!--
<th>璁㈠崟ID
</th>
- <th>璐﹀彿ID
+ -->
+ <th>鐭俊璐﹀彿
</th>
- <th>瀹㈡埛ID
+ <th>瀹㈡埛璐﹀彿
</th>
- <th>浜у搧ID
+ <th>鍏徃鍚嶇О
+ </th>
+ <th>浜у搧鍚嶇О
</th>
<%--<th>濂楅ID
</th>
--%>
- <th>璁㈠崟鍩烘湰鏉℃暟
+ <th>璁㈠崟鍩烘湰鏉℃暟锛堟潯锛�
</th>
- <th>璁㈠崟璧犻�佹潯鏁�
+ <th>璁㈠崟璧犻�佹潯鏁帮紙鏉★級
</th>
<th>鍗曚环锛堝厓/鏉★級
</th>
- <th>璁㈠崟鎬绘潯鏁�
+ <th>璁㈠崟鎬绘潯鏁帮紙鏉★級
</th>
<th>璁㈠崟鎬婚噾棰濓紙鍏冿級
</th>
@@ -267,7 +271,7 @@
</th>
<th>鐘舵��
</th>
- <th class="text-right">鎿嶄綔
+ <th class="text-center">鎿嶄綔
</th>
</tr>
</thead>
@@ -301,14 +305,14 @@
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
- 璐﹀彿ID</label>
+ 鐭俊璐﹀彿</label>
<div class="col-sm-4 ">
<input type="text" class="form-control" name="spId" id="spId" value="" />
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
- 瀹㈡埛ID</label>
+ 瀹㈡埛璐﹀彿</label>
<div class="col-sm-4 ">
<select name="clientId" id="clientId" class="form-control">
<%=GetClientOptions("0")%>
@@ -317,7 +321,7 @@
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
- 浜у搧ID</label>
+ 浜у搧鍚嶇О</label>
<div class="col-sm-4 ">
<select name="productId" id="productId" class="form-control">
<%=GetProductOptions("0")%>
diff --git a/web/web/GwOrderComplete.aspx b/web/web/GwOrderComplete.aspx
index 3af1a0e..2ff3163 100644
--- a/web/web/GwOrderComplete.aspx
+++ b/web/web/GwOrderComplete.aspx
@@ -9,14 +9,14 @@
function loadPageList() {
var clientId = $("#ClientId").val();
- var clientName = $("#ClientName").val();
+ var compay = $("#Compay").val();
var spId = $("#SpId").val();
var startDate = $("#StartTime").val();
var endDate = $("#EndTime").val();
$.ajax({
url: "GwOrder.ashx",
type: "POST",
- data: { action: "listComplete", clientId: clientId, clientName: clientName, spId: spId, startDate: startDate, endDate: endDate, flag: 1, pageIndex: pagination.getPageIndex(), pageSize: pagination.getPageSize() },
+ data: { action: "listComplete", clientId: clientId, compay: compay, spId: spId, startDate: startDate, endDate: endDate, flag: 1, pageIndex: pagination.getPageIndex(), pageSize: pagination.getPageSize() },
success: function(result) {
if (result.OK) {
$("#orderTable tbody").html(result.Message.Table);
@@ -99,13 +99,13 @@
</div>
<div class="form-group">
<div class="input-group m-b">
- <span class="input-group-addon">瀹㈡埛鍚嶇О</span>
- <input type="text" name="ClientName" id="ClientName" class="form-control col-md-2" />
+ <span class="input-group-addon">鍏徃鍚嶇О</span>
+ <input type="text" name="Compay" id="Compay" class="form-control col-md-2" />
</div>
</div>
<div class="form-group">
<div class="input-group m-b">
- <span class="input-group-addon">SP璐﹀彿</span>
+ <span class="input-group-addon">鐭俊璐﹀彿</span>
<input type="text" name="SpId" id="SpId" class="form-control col-md-2" />
</div>
</div>
@@ -130,24 +130,28 @@
<table class="table table-striped table-bordered table-hover" id="orderTable">
<thead>
<tr class="header">
+ <!--
<th>璁㈠崟ID
</th>
- <th>璐﹀彿ID
+ -->
+ <th>鐭俊璐﹀彿
</th>
- <th>瀹㈡埛ID
+ <th>瀹㈡埛璐﹀彿
</th>
- <th>浜у搧ID
+ <th>鍏徃鍚嶇О
+ </th>
+ <th>浜у搧鍚嶇О
</th>
<%--<th>濂楅ID
</th>
--%>
- <th>璁㈠崟鍩烘湰鏉℃暟
+ <th>璁㈠崟鍩烘湰鏉℃暟锛堟潯锛�
</th>
- <th>璁㈠崟璧犻�佹潯鏁�
+ <th>璁㈠崟璧犻�佹潯鏁帮紙鏉★級
</th>
<th>鍗曚环锛堝厓/鏉★級
</th>
- <th>璁㈠崟鎬绘潯鏁�
+ <th>璁㈠崟鎬绘潯鏁帮紙鏉★級
</th>
<th>璁㈠崟鎬婚噾棰濓紙鍏冿級
</th>
@@ -161,7 +165,7 @@
</th>
<th>鐘舵��
</th>
- <th class="text-right">鎿嶄綔
+ <th class="text-center">鎿嶄綔
</th>
</tr>
</thead>
@@ -195,14 +199,14 @@
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
- 璐﹀彿ID</label>
+ 鐭俊璐﹀彿</label>
<div class="col-sm-4 ">
<input type="text" class="form-control" name="spId" id="spId" value="" />
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
- 瀹㈡埛ID</label>
+ 瀹㈡埛璐﹀彿</label>
<div class="col-sm-4 ">
<select name="clientId" id="clientId" class="form-control">
<%=GetClientOptions("0")%>
@@ -211,7 +215,7 @@
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
- 浜у搧ID</label>
+ 浜у搧鍚嶇О</label>
<div class="col-sm-4 ">
<select name="productId" id="productId" class="form-control">
<%=GetProductOptions("0")%>
diff --git a/web/web/GwProduct.ashx b/web/web/GwProduct.ashx
index 261a614..829c88d 100644
--- a/web/web/GwProduct.ashx
+++ b/web/web/GwProduct.ashx
@@ -87,12 +87,12 @@
//str1 = str1 + "<td>" + (object)this.ClassesToName(bean.Classes) + "</td>";
if (bean.RouterType == 1)
{
- str1 += "<td rowspan=\"1\"><div class=\"btn btn-primary btn-xs\">鐐硅矾鐢�</div>";
+ str1 += "<td rowspan=\"1\"><span class='label label-primary'>閫氶亾</span>";
str1 += string.Format("<div>绉诲姩锛歿0}</div><div>鐢典俊锛歿1}</div><div>鑱旈�氾細{2}</div>", (object)this.GetOpName(bean.CmOpId), (object)this.GetOpName(bean.CtOpId), (object)this.GetOpName(bean.CuOpId));
}
else if (bean.RouterType == 3)
{
- str1 += "<td rowspan=\"1\"><div class=\"btn btn-success btn-xs\">缁勮矾鐢�</div>";
+ str1 += "<td rowspan=\"1\"><span class='label label-success'>閫氶亾缁�</span>";
str1 += string.Format("<div>绉诲姩锛歿0}</div><div>鐢典俊锛歿1}</div><div>鑱旈�氾細{2}</div>", (object)this.GetGroupName(bean.CmGroupid), (object)this.GetGroupName(bean.CtGroupid), (object)this.GetGroupName(bean.CuGroupid));
}
else
@@ -117,7 +117,7 @@
"</td>"
});
- str1 += string.Format("<td>{0}鍏�/鏉�</td>", (object)(Convert.ToDecimal(bean.Price) / new Decimal(1000)));
+ str1 += string.Format("<td>{0}</td>", (object)(Convert.ToDecimal(bean.Price) / new Decimal(1000)));
str1 = str1 + "<td>" + bean.CreateTime + "</td>";
str1 = string.Concat(new object[4]
{
@@ -126,7 +126,7 @@
bean.Instructions,
"</td>"
});
- str1 += "<td class=\"text-right\">";
+ str1 += "<td class=\"text-center \">";
str1 = bean.IsEnable != 0 ? str1 + string.Format("<a href=\"javascript:;\" data-id=\"{0}\" data-is_enable=\"0\" class=\"action-update-status btn btn-primary btn-xs\"><i class=\"fa fa-toggle-off\"></i> 鍋滅敤</a> ", (object) bean.Id ) : str1 + string.Format("<a href=\"javascript:;\" data-id=\"{0}\" data-is_enable=\"1\" class=\"action-update-status btn btn-default btn-xs\"><i class=\"fa fa-toggle-on\"/></i> 鍚敤</a> ", (object) bean.Id );
str1 += string.Format("<a href=\"javascript:;\" data-id=\"{0}\" class=\"action-modal-edit btn btn-success btn-xs\"><i class=\"fa fa-edit\"></i> 缂栬緫</a> ", (object) bean.Id);
str1 += string.Format("<a href=\"javascript:;\" data-id=\"{0}\" class=\"action-delete btn btn-default btn-xs\"><i class=\"fa fa-trash\"></i> 鍒犻櫎</a> ", (object) bean.Id);
@@ -176,7 +176,7 @@
str1 = str1 + "<td>" + bean.CreateTime + "</td>";
str1 = str1 + "<td>" + bean.Remark + "</td>";
- str1 += "<td class=\"text-right\">";
+ str1 += "<td class=\"text-center\">";
str1 = bean.IsEnable != 0 ? str1 + string.Format("<a href=\"javascript:;\" data-id=\"{0}\" data-is_enable=\"0\" class=\"action-update-status btn btn-primary btn-xs\"><i class=\"fa fa-toggle-off\"></i> 鍋滅敤</a> ", (object) bean.Id ) : str1 + string.Format("<a href=\"javascript:;\" data-id=\"{0}\" data-is_enable=\"1\" class=\"action-update-status btn btn-default btn-xs\"><i class=\"fa fa-toggle-on\"/></i> 鍚敤</a> ", (object) bean.Id );
str1 += string.Format("<a href=\"javascript:;\" data-id=\"{0}\" class=\"action-modal-edit btn btn-success btn-xs\"><i class=\"fa fa-edit\"></i> 缂栬緫</a> ", (object) bean.Id);
str1 += string.Format("<a href=\"javascript:;\" data-id=\"{0}\" class=\"action-delete btn btn-default btn-xs\"><i class=\"fa fa-trash\"></i> 鍒犻櫎</a> ", (object) bean.Id);
@@ -760,9 +760,9 @@
if (classes == -1)
return string.Empty;
else if(classes == 0)
- return "0-浜у搧鍒嗙被";
+ return "浜у搧鍒嗙被";
else if(classes == 1)
- return "1-浜у搧";
+ return "浜у搧";
return string.Empty;
}
@@ -773,9 +773,9 @@
if (isDefault == -1)
return string.Empty;
else if(isDefault == 0)
- return "0-涓�у寲";
+ return "<span class='label label-warning'>涓�у寲</span>";
else if(isDefault == 1)
- return "1-绯荤粺榛樿";
+ return "<span class='label label-success'>绯荤粺榛樿</span>";
return string.Empty;
}
@@ -786,9 +786,9 @@
if (isEnable == -1)
return string.Empty;
else if(isEnable == 0)
- return "0-鍋滅敤";
+ return "<span class='label label-default'>宸插仠鐢�</span>";
else if(isEnable == 1)
- return "1-鍚敤";
+ return "<span class='label label-primary'>宸插惎鐢�</span>";
return string.Empty;
}
diff --git a/web/web/GwProduct.aspx b/web/web/GwProduct.aspx
index fa56267..3ff390a 100644
--- a/web/web/GwProduct.aspx
+++ b/web/web/GwProduct.aspx
@@ -162,10 +162,21 @@
//data鐨勫睘鎬у弬鏁颁笉鑳藉惈鏈夊ぇ鍐欏瓧姣嶃��
var id = $(this).data("id");
var isEnable = $(this).data("is_enable");
- $.post("gwProduct.ashx", { "action": "updateStatus", id: id, isEnable: isEnable }, function (r) {
- mytek.alert(r.Message, r.OK, function () {
- loadPageList();
- });
+ var statusStr = "";
+ if (isEnable == 0) {
+ statusStr = "銆愬仠鐢ㄣ��";
+ }
+ else {
+ statusStr = "銆愬惎鐢ㄣ��";
+ }
+ mytek.confirm("鏄惁闇�瑕�" + statusStr + "璇ヤ俊鎭紵", "纭鏇存柊淇℃伅鐘舵�侊紝璇疯皑鎱庢搷浣滐紒", function (b) {
+ if (b) {
+ $.post("gwProduct.ashx", { "action": "updateStatus", id: id, isEnable: isEnable }, function (r) {
+ mytek.alert(r.Message, r.OK, function () {
+ loadPageList();
+ });
+ });
+ }
});
});
@@ -236,13 +247,13 @@
</th>
<th>浜у搧绫诲埆
</th>
- <th>鍚嶇О
+ <th>浜у搧鍚嶇О
</th>
<!--
<th>绫诲埆
</th>
-->
- <th>閫氶亾
+ <th>閫氶亾鎴栭�氶亾缁�
</th>
<th>鏄惁榛樿
</th>
@@ -254,13 +265,13 @@
-->
<th>璧犻�佹潯鏁�
</th>
- <th>鍙傝�冨崟浠�
+ <th>鍙傝�冨崟浠凤紙鍏�/鏉★級
</th>
<th>鍒涘缓鏃堕棿
</th>
<th>浣跨敤璇存槑
</th>
- <th class="text-right">鎿嶄綔
+ <th class="text-center">鎿嶄綔
</th>
</tr>
</thead>
@@ -299,7 +310,7 @@
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
- 鐖剁骇鍒嗙被ID</label>
+ 鐖剁骇鍒嗙被</label>
<div class="col-sm-4 ">
<select name="parentId" id="parentId" class="form-control">
<%=GetProductClassOptions("0")%>
@@ -371,18 +382,16 @@
<label class="col-sm-2 control-label">
鎺掑簭</label>
<div class="col-sm-4">
- <div class="input-group">
- <input type="text" class="form-control" name="sort" id="sort" value=""
- maxlength="5" onkeyup="value=value.replace(/[^\d]/g,'')" onpaste="value=value.replace(/[^\d]/g,'')"
- oncontextmenu="return false" />
- </div>
+ <input type="text" class="form-control" name="sort" id="sort" value=""
+ maxlength="5" onkeyup="value=value.replace(/[^\d]/g,'')" onpaste="value=value.replace(/[^\d]/g,'')"
+ oncontextmenu="return false" />
</div>
</div>
<div class="form-group classes-span classes-span-1">
<label class="col-sm-2 control-label">
閫氶亾璺敱</label>
- <div class="col-sm-10">
- <select name="RouterType" id="RouterType">
+ <div class="col-sm-4">
+ <select name="RouterType" id="RouterType" class="form-control">
<option value="1" >鎸囧畾閫氶亾璺敱</option>
<option value="3" >閫氶亾缁勮矾鐢辨ā寮�</option>
</select>
@@ -390,26 +399,37 @@
<div class="router-type-span router-type-span-1">
<div style="padding: 5px">
- 绉诲姩锛�<select name="cmOpId" id="cmOpId">
+ 绉诲姩锛�<select name="cmOpId" id="cmOpId" >
<%=GetOpOptions(0)%>
- </select> 鎵╁睍鍙傛暟锛�<input type="text" name="cmExtParams" id="cmExtParams" maxlength="600"
+ </select>
+ <!--
+ 鎵╁睍鍙傛暟锛�<input type="text" name="cmExtParams" id="cmExtParams" maxlength="600"
value="" style="width: 50%;" placeholder="绉诲姩鎵╁睍鍙傛暟" />
+ -->
</div>
<div style="padding: 5px">
- 鑱旈�氾細<select name="cuOpId" id="cuOpId">
+ 鑱旈�氾細<select name="cuOpId" id="cuOpId" >
<%=GetOpOptions(0)%>
- </select> 鎵╁睍鍙傛暟锛�<input type="text" name="cuExtParams" id="cuExtParams" maxlength="600"
+ </select>
+ <!--
+ 鎵╁睍鍙傛暟锛�<input type="text" name="cuExtParams" id="cuExtParams" maxlength="600"
value="" style="width: 50%;" placeholder="鑱旈�氭墿灞曞弬鏁�" />
+ -->
</div>
<div style="padding: 5px">
- 鐢典俊锛�<select name="ctOpId" id="ctOpId">
+ 鐢典俊锛�<select name="ctOpId" id="ctOpId" >
<%=GetOpOptions(0)%>
- </select> 鎵╁睍鍙傛暟锛�<input type="text" name="ctExtParams" id="ctExtParams" maxlength="600"
+ </select>
+ <!--
+ 鎵╁睍鍙傛暟锛�<input type="text" name="ctExtParams" id="ctExtParams" maxlength="600"
value="" style="width: 50%;" placeholder="鐢典俊鎵╁睍鍙傛暟" />
+ -->
</div>
+ <!--
<span class="help-block m-b-none">CMPP2.0,CMPP3.0鍗忚鏀寔鎵╁睍鍙傛暟鏈夛細SERVICEID(鏈嶅姟浠ｇ爜/涓氬姟浠ｇ爜(鏈�闀�10浣�)),FEECODE(璐圭敤浠ｇ爜(鏈�闀�6浣�)),FEETYPE(璐圭敤绫诲瀷),FEEUSERTYPE,FEETERMINALID(璁¤垂鍙风爜)
SGIP鏀寔鎵╁睍鍙傛暟鏈夛細SERVICETYPE(涓氬姟浠ｇ爜(鏈�闀�10浣�)),CHARGENUMBER(璁¤垂鍙风爜(鏈�闀�21浣�)),FEEVALUE(鏀惰垂鍊�(鏈�闀�6浣�)),GIVENVALUE,NODEID(鑺傜偣(鏈�闀�6浣�)),CONNTIMEOUT(杩炴帴瓒呮椂)
SMGP鏀寔鎵╁睍鍙傛暟鏈夛細SERVICEID(鏈嶅姟浠ｇ爜/涓氬姟浠ｇ爜(鏈�闀�10浣�)),FIXEDFEE(鍖呮湀璐�/灏侀《璐�(鏈�闀�6浣�)),FEECODE(璐圭敤浠ｇ爜/璧勮垂浠ｇ爜(鏈�澶�6浣�));</span>
+ -->
</div>
<div class="router-type-span router-type-span-3">
<div style="padding: 5px">
@@ -441,7 +461,7 @@
鍙傝�冨崟浠�</label>
<div class="col-sm-4">
<div class="input-group">
- <input type="text" class="form-control" name="price" id="price" value="" maxlength="5"
+ <input type="text" class="form-control" name="price" id="price" value="" maxlength="10"
onkeyup="value=value.replace(/[^\d\.]/g,'')" onpaste="value=value.replace(/[^\d\.]/g,'')"
oncontextmenu="return false" /><span class="input-group-addon">鍏�/鏉� </span>
</div>
@@ -452,7 +472,7 @@
榛樿璧犻�佹潯鏁�</label>
<div class="col-sm-4">
<div class="input-group">
- <input type="text" class="form-control" name="givingNum" id="givingNum" value="" maxlength="5"
+ <input type="text" class="form-control" name="givingNum" id="givingNum" value="" maxlength="10"
onkeyup="value=value.replace(/[^\d\.]/g,'')" onpaste="value=value.replace(/[^\d\.]/g,'')"
oncontextmenu="return false" /><span class="input-group-addon">鏉� </span>
</div>
@@ -461,8 +481,8 @@
<div class="form-group">
<label class="col-sm-2 control-label">
澶囨敞</label>
- <div class="col-sm-10 input-group m-b">
- <input type="text" class="form-control" name="remark" id="remark" value="" />
+ <div class="col-sm-4">
+ <textarea class="form-control" name="remark" id="remark" rows="4" ></textarea>
</div>
</div>
</div>
diff --git a/web/web/GwProduct.aspx.cs b/web/web/GwProduct.aspx.cs
index 2fdda61..eeb26d7 100644
--- a/web/web/GwProduct.aspx.cs
+++ b/web/web/GwProduct.aspx.cs
@@ -105,9 +105,9 @@
}
if (productId.Equals(bean.Id) )
- stringBuilder.AppendFormat("<option value=\"{0}\" selected>{0}-{1}</option>", (object)bean.Id, (object)bean.Name);
+ stringBuilder.AppendFormat("<option value=\"{0}\" selected>{1}</option>", (object)bean.Id, (object)bean.Name);
else
- stringBuilder.AppendFormat("<option value=\"{0}\">{0}-{1}</option>", (object)bean.Id, (object)bean.Name);
+ stringBuilder.AppendFormat("<option value=\"{0}\">{1}</option>", (object)bean.Id, (object)bean.Name);
}
return stringBuilder.ToString();
}
diff --git a/web/web/GwSpPrePattern.aspx b/web/web/GwSpPrePattern.aspx
index 2c9f93c..50617dc 100644
--- a/web/web/GwSpPrePattern.aspx
+++ b/web/web/GwSpPrePattern.aspx
@@ -146,7 +146,7 @@
if (idArray.length == 0) {
idArray.push(patternID);
if (idArray.length == 0) {
- mytek.alert("璇烽�夋嫨瑕佷慨鏀圭殑璐﹀彿锛�", false);
+ mytek.alert("璇烽�夋嫨瑕佷慨鏀圭殑鐭俊璐﹀彿锛�", false);
return;
}
}
@@ -224,11 +224,11 @@
<div class="listCanvas">
<div class="ibox">
<div class="input-group m-b">
- <span class="input-group-addon">瀹㈡埛ID</span>
+ <span class="input-group-addon">瀹㈡埛璐﹀彿</span>
<input type="text" name="ClientID" id="ClientID" class="form-control col-md-2" />
</div>
<div class="input-group m-b">
- <span class="input-group-addon">SPID</span>
+ <span class="input-group-addon">鐭俊璐﹀彿</span>
<input type="text" name="SpID" id="SpID" class="form-control col-md-2" />
</div>
<div class="input-group m-b">
@@ -245,10 +245,10 @@
<input type="checkbox" name="check-all-row" id="check-all-row" value="" />
</th>
<th class="col-md-1">
- 瀹㈡埛ID
+ 瀹㈡埛璐﹀彿
</th>
<th class="col-md-1">
- SPID
+ 鐭俊璐﹀彿
</th>
<th class="col-md-5">
鎶ュ鍐呭
diff --git a/web/web/GwStatisProfit.aspx b/web/web/GwStatisProfit.aspx
index d94aa18..dfb7fed 100644
--- a/web/web/GwStatisProfit.aspx
+++ b/web/web/GwStatisProfit.aspx
@@ -1,221 +1,222 @@
-锘�<%@ Page Language="C#" AutoEventWireup="true" CodeFile="GwStatisProfit.aspx.cs" Inherits="_GwStatisProfit" %>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head><meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
-<meta name="renderer" content="webkit" />
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-<title>鍒╂鼎缁熻</title>
- <!--[if lt IE 9]>
- <meta http-equiv="refresh" content="0;ie.html" />
- <![endif]-->
- <link rel="shortcut icon" href="favicon.ico" />
- <link href="css/bootstrap.min14ed.css?v=3.3.6" rel="stylesheet" />
- <link href="css/font-awesome.min93e3.css?v=4.4.0" rel="stylesheet" />
- <link href="css/plugins/iCheck/custom.css" rel="stylesheet" />
- <link href="css/animate.min.css" rel="stylesheet" />
- <link href="css/style.min862f.css?v=4.1.0" rel="stylesheet" />
- <link href="css/plugins/sweetalert/sweetalert.css" rel="stylesheet" />
- <link href="css/plugins/datapicker/datepicker3.css" rel="stylesheet" />
- <link href="css/jquery.numberedtextarea.css" rel="stylesheet" />
- <script src="js/loading.js" type="text/javascript"></script>
- <script src="js/jquery.min.js?v=2.1.4"></script>
- <script src="js/json.js"></script>
- <script src="js/bootstrap.min.js?v=3.3.6"></script>
- <script src="js/content.min.js?v=1.0.0"></script>
- <script src="js/plugins/iCheck/icheck.min.js"></script>
- <script src="js/plugins/sweetalert/sweetalert.min.js"></script>
- <script src="js/plugins/datapicker/bootstrap-datepicker.js"></script>
- <script type="text/javascript" src="/js/jquery-loading.js"></script>
- <script type="text/javascript" src="/js/jquery-form.js"></script>
- <script type="text/javascript" src="/js/jquery.numberedtextarea.js"></script>
- <script type="text/javascript" src="/js/mytek-pager.js"></script>
- <script src="js/mytek-pagination.js?r=11" type="text/javascript"></script>
- <style>
- body { font-size: 12px; color: #111111; }
- .mask { position: absolute; top: 0px; filter: alpha(opacity=60); background-color: #777; z-index: 1002; left: 0px; opacity: 0.5; -moz-opacity: 0.5; text-align: center; display: none; }
- .mask span { height: 70%; display: inline-block; vertical-align: middle; }
- .mask span img { vertical-align: middle; }
- </style>
- <script>
- (function ($) {
- $.ajaxBak = $.ajax;
-
- $.ajax = function (options) {
- options.timeout = 300000;
- options.url = options.url + (options.url.indexOf("?") > 0 ? "&" : "?") + "r=" + Math.random();
-
- options.complete = function (e) {
- $("body").hideLoading();
- }
-
- if (options.showloading !== false) {
- $("body").showLoading();
- }
-
- try {
- return $.ajaxBak.call(this, options);
- } catch (e) {
- if (options.showloading !== false) {
- $("body").hideLoading();
- }
- }
- return this;
- }
- })(jQuery);
-
- $(document).ready(function(){
- $(".icheck-me").iCheck({checkboxClass:"icheckbox_square-green",radioClass:"iradio_square-green",});
- $(".input-group.date").datepicker({todayBtn:"linked",keyboardNavigation:!1,forceParse:!1,calendarWeeks:!0,autoclose:!0});
- $("[data-toggle='tooltip']").tooltip();
- $("[data-toggle=popover]").popover()
- });
- </script>
-
- <script type="text/javascript">
- $(function () {
-
- $(".action-query").on("click", function () {
- var clientid = $("#clientid").val();
- var spid = $("#spid").val();
- var apid = $("#apid").val();
- var opid = $("#opid").val();
- var begintime = $("#begintime").val();
- var endtime = $("#endtime").val();
- var statistype = $("#statistype").val();
-
- var statisoption = 0;
-
- $(".statusoption").each(function () {
- var me = $(this);
- if (me.is(":checked"))
- statisoption += parseInt(me.val());
- });
-
- $.post("GwStatisProfit.ashx", {action: "loadStatisProfit",
- clientid: clientid, spid: spid, apid: apid, opid: opid, statistype: statistype, statisoption: statisoption, begintime: begintime, endtime: endtime
- }, function (result) {
- if (!result.OK)
- alert(result.Message);
- else {
- $("#resultTable").html(result.Message);
- }
- }, "json");
- });
- });
- </script>
-</head>
-<body class="white-bg">
-
- <div class="wrapper wrapper-content table-responsive">
-
- <div class="searchCanvas form-inline">
- <div class="ibox">
- <div class="form-group ">
- <div class="input-group m-b">
- <span class="input-group-addon">閫氶亾</span>
- <select name="opid" id="opid" class="form-control">
- <%=this.GenerateOPIDOptions()%>
- </select>
- </div>
- </div>
- <div class="form-group ">
- <div class="input-group m-b">
- <span class="input-group-addon">甯愬彿</span>
- <select name="spid" id="spid" class="form-control">
- <%=this.GenerateSpIDOptions()%>
- </select>
- </div>
- </div>
- <div class="form-group ">
- <div class="input-group m-b">
- <span class="input-group-addon">鎶ヨ〃绫诲瀷</span>
- <select name="statistype" id="statistype" class="form-control">
-
-
- <%
- __w.Write("<option value='YYYY\"骞碶"MM\"鏈圽"DD\"鏃' ");
- __w.Write(this.StatisType == "YYYY\"骞碶"MM\"鏈圽"DD\"鏃"" ? "selected" : "");
- __w.Write(">\r\n 鏃ユ姤琛�</option>\r\n <option value='YYYY\"骞碶"MM\"鏈圽"' ");
- __w.Write(this.StatisType == "YYYY\"骞碶"MM\"鏈圽"" ? "selected" : "");
- __w.Write(">\r\n 鏈堟姤琛�</option>\r\n <option value='YYYY\"骞寸\"WW\"鍛╘"' ");
- __w.Write(this.StatisType == "YYYY\"骞寸\"WW\"鍛╘"" ? "selected" : "");
- __w.Write(">\r\n 鍛ㄦ姤琛�</option>\r\n ");
-
- %>
-
-
- <%-- <option value='YYYY"骞�"MM"鏈�"DD"鏃�"' >
- 鏃ユ姤琛�</option>
- <option value='YYYY"骞�"MM"鏈�"' >
- 鏈堟姤琛�</option>
- <option value='YYYY"骞寸"WW"鍛�"' >
- 鍛ㄦ姤琛�</option> --%>
-
-
- </select>
- </div>
- </div>
- <div class="input-group m-b" style="margin-bottom: 0px;">
- <div class="input-group date m-b">
- <span class="input-group-addon">鏃堕棿鑼冨洿 <i class="fa fa-calendar"></i></span>
- <input type="text" class="input-sm form-control" name="begintime" id="begintime"
- value="<%=this.StartTime.ToString("yyyy-MM-dd")%>" />
- <span class="input-group-addon">鍒�</span>
- </div>
- <div class=" input-group date m-b" style="margin-left: -4px;">
- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
- <input type="text" class="input-sm form-control" name="endtime" id="endtime" value="<%=this.EndTime.ToString("yyyy-MM-dd")%>" />
- </div>
- </div>
- <div class="form-group ">
- <div class="input-group m-b">
-
-
- <%
-
- __w.Write("<input type=\"checkbox\" class=\"statusoption icheck-me\" data-color=\"blue\" data-skin=\"minimal\"\r\n name=\"StatisOption\" value=\"2\" ");
- __w.Write((this.SelectedOptions & Dao.StatisOption.OPID) == Dao.StatisOption.OPID ? "checked" : "");
- __w.Write(" />\r\n 閫氶亾\r\n <input type=\"checkbox\" class=\"statusoption icheck-me\" data-color=\"blue\" data-skin=\"minimal\"\r\n name=\"StatisOption\" value=\"4\" ");
- __w.Write((this.SelectedOptions & Dao.StatisOption.SpID) == Dao.StatisOption.SpID ? "checked" : "");
- __w.Write(" />\r\n 璐﹀彿\r\n ");
-
- %>
-
-
-
-
-
- </div>
- </div>
- <div class="form-group ">
- <div class="input-group m-b">
- <input type="button" value="鏌ヨ" class="btn-primary btn action-query " />
- </div>
- </div>
- </div>
- </div>
- <div class="table-responsive">
- <table class="table table-striped table-bordered table-hover" id="resultTable">
- </table>
- </div>
- <div>
- <h4>
- 缁熻璇存槑</h4>
- <ul>
- <li class="text-info">涓氬姟缁熻涓洪潪瀹炴椂缁熻锛岀敱鍚庡彴杩涚▼姣�2灏忔椂缁熻涓�娆°��</li>
- <li>AP鎺ユ敹鎬昏垂鐢細浠ｇ悊鍟嗘彁浜ゅ埌缃戝叧鐨勮璐规�绘暟锛�</li>
- <li>AP鎴愬姛璐圭敤锛氫唬鐞嗗晢鎻愪氦鎴愬姛鍒扮綉鍏崇殑璁¤垂鎬绘暟锛�</li>
- <li>OP鎻愪氦鎬昏垂鐢細姝ょ綉鍏虫彁浜ゅ埌杩愯惀鍟嗛�氶亾鐨勮璐规�绘暟锛�</li>
- <li>OP鎴愬姛璐圭敤锛氭缃戝叧鎻愪氦鎴愬姛鍒拌繍钀ュ晢閫氶亾鐨勮璐规�绘暟锛�</li>
- <li>姣涘埄娑︼細AP鎺ユ敹鎬昏垂鐢ㄤ笌OP鎻愪氦鎬昏垂鐢ㄤ箣闂寸殑宸�硷紱</li>
- <li>鍑�鍒╂鼎锛欰P鎴愬姛璐圭敤涓嶰P鎴愬姛璐圭敤涔嬮棿鐨勫樊鍊硷紱</li>
- </ul>
- </div>
-
- <div id="mask" class="mask">
- <span></span>
- <img src="img/spinning-circles.svg" alt="杞藉叆涓�..." /></div>
- </div>
-</body>
-</html>
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeFile="GwStatisProfit.aspx.cs" Inherits="_GwStatisProfit" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
+<meta name="renderer" content="webkit" />
+<meta http-equiv="Cache-Control" content="no-siteapp" />
+<title>鍒╂鼎缁熻</title>
+ <!--[if lt IE 9]>
+ <meta http-equiv="refresh" content="0;ie.html" />
+ <![endif]-->
+ <link rel="shortcut icon" href="favicon.ico" />
+ <link href="css/bootstrap.min14ed.css?v=3.3.6" rel="stylesheet" />
+ <link href="css/font-awesome.min93e3.css?v=4.4.0" rel="stylesheet" />
+ <link href="css/plugins/iCheck/custom.css" rel="stylesheet" />
+ <link href="css/animate.min.css" rel="stylesheet" />
+ <link href="css/style.min862f.css?v=4.1.0" rel="stylesheet" />
+ <link href="css/plugins/sweetalert/sweetalert.css" rel="stylesheet" />
+ <link href="css/plugins/datapicker/datepicker3.css" rel="stylesheet" />
+ <link href="css/jquery.numberedtextarea.css" rel="stylesheet" />
+ <script src="js/loading.js" type="text/javascript"></script>
+ <script src="js/jquery.min.js?v=2.1.4"></script>
+ <script src="js/json.js"></script>
+ <script src="js/bootstrap.min.js?v=3.3.6"></script>
+ <script src="js/content.min.js?v=1.0.0"></script>
+ <script src="js/plugins/iCheck/icheck.min.js"></script>
+ <script src="js/plugins/sweetalert/sweetalert.min.js"></script>
+ <script src="js/plugins/datapicker/bootstrap-datepicker.js"></script>
+ <script type="text/javascript" src="/js/jquery-loading.js"></script>
+ <script type="text/javascript" src="/js/jquery-form.js"></script>
+ <script type="text/javascript" src="/js/jquery.numberedtextarea.js"></script>
+ <script type="text/javascript" src="/js/mytek-pager.js"></script>
+ <script src="js/mytek-pagination.js?r=11" type="text/javascript"></script>
+ <style>
+ body { font-size: 12px; color: #111111; }
+ .mask { position: absolute; top: 0px; filter: alpha(opacity=60); background-color: #777; z-index: 1002; left: 0px; opacity: 0.5; -moz-opacity: 0.5; text-align: center; display: none; }
+ .mask span { height: 70%; display: inline-block; vertical-align: middle; }
+ .mask span img { vertical-align: middle; }
+ </style>
+ <script>
+ (function ($) {
+ $.ajaxBak = $.ajax;
+
+ $.ajax = function (options) {
+ options.timeout = 300000;
+ options.url = options.url + (options.url.indexOf("?") > 0 ? "&" : "?") + "r=" + Math.random();
+
+ options.complete = function (e) {
+ $("body").hideLoading();
+ }
+
+ if (options.showloading !== false) {
+ $("body").showLoading();
+ }
+
+ try {
+ return $.ajaxBak.call(this, options);
+ } catch (e) {
+ if (options.showloading !== false) {
+ $("body").hideLoading();
+ }
+ }
+ return this;
+ }
+ })(jQuery);
+
+ $(document).ready(function(){
+ $(".icheck-me").iCheck({checkboxClass:"icheckbox_square-green",radioClass:"iradio_square-green",});
+ $(".input-group.date").datepicker({todayBtn:"linked",keyboardNavigation:!1,forceParse:!1,calendarWeeks:!0,autoclose:!0});
+ $("[data-toggle='tooltip']").tooltip();
+ $("[data-toggle=popover]").popover()
+ });
+ </script>
+
+ <script type="text/javascript">
+ $(function () {
+
+ $(".action-query").on("click", function () {
+ var clientid = $("#clientid").val();
+ var spid = $("#spid").val();
+ var apid = $("#apid").val();
+ var opid = $("#opid").val();
+ var begintime = $("#begintime").val();
+ var endtime = $("#endtime").val();
+ var statistype = $("#statistype").val();
+
+ var statisoption = 0;
+
+ $(".statusoption").each(function () {
+ var me = $(this);
+ if (me.is(":checked"))
+ statisoption += parseInt(me.val());
+ });
+
+ $.post("GwStatisProfit.ashx", {action: "loadStatisProfit",
+ clientid: clientid, spid: spid, apid: apid, opid: opid, statistype: statistype, statisoption: statisoption, begintime: begintime, endtime: endtime
+ }, function (result) {
+ if (!result.OK)
+ alert(result.Message);
+ else {
+ $("#resultTable").html(result.Message);
+ }
+ }, "json");
+ });
+ });
+ </script>
+</head>
+<body class="white-bg">
+
+ <div class="wrapper wrapper-content table-responsive">
+
+ <div class="searchCanvas form-inline">
+ <div class="ibox">
+ <div class="form-group ">
+ <div class="input-group m-b">
+ <span class="input-group-addon">閫氶亾</span>
+ <select name="opid" id="opid" class="form-control">
+ <%=this.GenerateOPIDOptions()%>
+ </select>
+ </div>
+ </div>
+ <div class="form-group ">
+ <div class="input-group m-b">
+ <span class="input-group-addon">甯愬彿</span>
+ <select name="spid" id="spid" class="form-control">
+ <%=this.GenerateSpIDOptions()%>
+ </select>
+ </div>
+ </div>
+ <div class="form-group ">
+ <div class="input-group m-b">
+ <span class="input-group-addon">鎶ヨ〃绫诲瀷</span>
+ <select name="statistype" id="statistype" class="form-control">
+
+
+ <%
+ __w.Write("<option value='YYYY\"骞碶"MM\"鏈圽"DD\"鏃' ");
+ __w.Write(this.StatisType == "YYYY\"骞碶"MM\"鏈圽"DD\"鏃"" ? "selected" : "");
+ __w.Write(">\r\n 鏃ユ姤琛�</option>\r\n <option value='YYYY\"骞碶"MM\"鏈圽"' ");
+ __w.Write(this.StatisType == "YYYY\"骞碶"MM\"鏈圽"" ? "selected" : "");
+ __w.Write(">\r\n 鏈堟姤琛�</option>\r\n <option value='YYYY\"骞寸\"WW\"鍛╘"' ");
+ __w.Write(this.StatisType == "YYYY\"骞寸\"WW\"鍛╘"" ? "selected" : "");
+ __w.Write(">\r\n 鍛ㄦ姤琛�</option>\r\n ");
+
+ %>
+
+
+ <%-- <option value='YYYY"骞�"MM"鏈�"DD"鏃�"' >
+ 鏃ユ姤琛�</option>
+ <option value='YYYY"骞�"MM"鏈�"' >
+ 鏈堟姤琛�</option>
+ <option value='YYYY"骞寸"WW"鍛�"' >
+ 鍛ㄦ姤琛�</option> --%>
+
+
+
+ </select>
+ </div>
+ </div>
+ <div class="input-group m-b" style="margin-bottom: 0px;">
+ <div class="input-group date m-b">
+ <span class="input-group-addon">鏃堕棿鑼冨洿 <i class="fa fa-calendar"></i></span>
+ <input type="text" class="input-sm form-control" name="begintime" id="begintime"
+ value="<%=this.StartTime.ToString("yyyy-MM-dd")%>" />
+ <span class="input-group-addon">鍒�</span>
+ </div>
+ <div class=" input-group date m-b" style="margin-left: -4px;">
+ <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+ <input type="text" class="input-sm form-control" name="endtime" id="endtime" value="<%=this.EndTime.ToString("yyyy-MM-dd")%>" />
+ </div>
+ </div>
+ <div class="form-group ">
+ <div class="input-group m-b">
+
+
+ <%
+
+ __w.Write("<input type=\"checkbox\" class=\"statusoption icheck-me\" data-color=\"blue\" data-skin=\"minimal\"\r\n name=\"StatisOption\" value=\"2\" ");
+ __w.Write((this.SelectedOptions & Dao.StatisOption.OPID) == Dao.StatisOption.OPID ? "checked" : "");
+ __w.Write(" />\r\n 閫氶亾\r\n <input type=\"checkbox\" class=\"statusoption icheck-me\" data-color=\"blue\" data-skin=\"minimal\"\r\n name=\"StatisOption\" value=\"4\" ");
+ __w.Write((this.SelectedOptions & Dao.StatisOption.SpID) == Dao.StatisOption.SpID ? "checked" : "");
+ __w.Write(" />\r\n 璐﹀彿\r\n ");
+
+ %>
+
+
+
+
+
+ </div>
+ </div>
+ <div class="form-group ">
+ <div class="input-group m-b">
+ <input type="button" value="鏌ヨ" class="btn-primary btn action-query " />
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="table-responsive">
+ <table class="table table-striped table-bordered table-hover" id="resultTable">
+ </table>
+ </div>
+ <div>
+ <h4>
+ 缁熻璇存槑</h4>
+ <ul>
+ <li class="text-info">涓氬姟缁熻涓洪潪瀹炴椂缁熻锛岀敱鍚庡彴杩涚▼姣�2灏忔椂缁熻涓�娆°��</li>
+ <li>AP鎺ユ敹鎬昏垂鐢細浠ｇ悊鍟嗘彁浜ゅ埌缃戝叧鐨勮璐规�绘暟锛�</li>
+ <li>AP鎴愬姛璐圭敤锛氫唬鐞嗗晢鎻愪氦鎴愬姛鍒扮綉鍏崇殑璁¤垂鎬绘暟锛�</li>
+ <li>OP鎻愪氦鎬昏垂鐢細姝ょ綉鍏虫彁浜ゅ埌杩愯惀鍟嗛�氶亾鐨勮璐规�绘暟锛�</li>
+ <li>OP鎴愬姛璐圭敤锛氭缃戝叧鎻愪氦鎴愬姛鍒拌繍钀ュ晢閫氶亾鐨勮璐规�绘暟锛�</li>
+ <li>姣涘埄娑︼細AP鎺ユ敹鎬昏垂鐢ㄤ笌OP鎻愪氦鎬昏垂鐢ㄤ箣闂寸殑宸�硷紱</li>
+ <li>鍑�鍒╂鼎锛欰P鎴愬姛璐圭敤涓嶰P鎴愬姛璐圭敤涔嬮棿鐨勫樊鍊硷紱</li>
+ </ul>
+ </div>
+
+ <div id="mask" class="mask">
+ <span></span>
+ <img src="img/spinning-circles.svg" alt="杞藉叆涓�..." /></div>
+ </div>
+</body>
+</html>
diff --git a/web/web/web.config b/web/web/web.config
index c5b145a..6a26f98 100644
--- a/web/web/web.config
+++ b/web/web/web.config
@@ -19,11 +19,16 @@
<!--瀹㈡埛绔疘P鍜岀鍙�-->
<add key="serverIp" value="8.129.227.30"/>
<add key="clientPort" value="8888"/>
- <add key="connectionString" value="Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=8.129.227.30)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SID=SMGW)));User ID=smgw;Password=smgw2018"/>
-
+ <!--IP杞崲鍦板潃杩斿洖鐨勭被鍒細0-鍏ㄥ湴鍧�锛�1-鍥藉缂栫爜锛� 2-鍥藉锛�3-鍦板尯缂栫爜锛�4-鍦板尯鍚嶇О锛�5-鍩庡競鍚嶇О-->
+ <add key="addressClasses" value="3"/>
+ <!--鍒濆瀵嗙爜锛氱敤浜庣郴缁熺敤鎴凤紝瀹㈡埛-->
+ <add key="initPwd" value="123456"/>
+
<!--
- <add key="connectionString" value="Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=8.129.227.30)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SID=SMGW)));User ID=smgwtest;Password=smgwtest"/>
+ <add key="connectionString" value="Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=8.129.227.30)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SID=SMGW)));User ID=smgw;Password=smgw2018"/>
-->
+ <add key="connectionString" value="Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=8.129.227.30)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SID=SMGW)));User ID=smgwtest;Password=smgwtest"/>
+
</appSettings>
<connectionStrings/>
<system.web>
--
Gitblit v1.9.1