From adee7a71ba7ab1b63cab63381dfe1846437853d6 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期四, 02 三月 2023 17:37:05 +0800
Subject: [PATCH] 增加分销商配置
---
web/web/Bin/Dao.dll | 0
web/Dao/bin/Release/Dao.pdb | 0
web/web/Bin/UMCLib.pdb | 0
web/.vs/Web/v17/.suo | 0
web/Lib/Model.pdb | 0
web/web/Session.ashx | 12 +-
web/Dao/bin/Release/Dao.dll | 0
web/Dao/bin/Release/Model.pdb | 0
web/web/GwClient.aspx.cs | 104 ++++++++--------
web/Model/Model/GwClient.cs | 16 +
web/Dao/GwClientDao.cs | 4
web/web/GwClient.ashx | 88 ++++----------
web/web/Bin/Model.pdb | 0
web/Lib/Model.dll | 0
web/.vs/Web/FileContentIndex/7e29d20c-d7d3-4d90-a1f8-e522c2bc4eeb.vsidx | 0
web/web/GwClient.aspx | 123 ++++++++++++--------
web/.vs/Web/FileContentIndex/d987c372-7924-4a84-a3c6-a0668a707d79.vsidx | 0
web/Dao/bin/Release/Model.dll | 0
web/web/Bin/Model.dll | 0
web/web/Bin/Dao.pdb | 0
20 files changed, 168 insertions(+), 179 deletions(-)
diff --git a/web/.vs/Web/FileContentIndex/cf8e3a47-4342-4b42-9d08-a578e612f6de.vsidx b/web/.vs/Web/FileContentIndex/7e29d20c-d7d3-4d90-a1f8-e522c2bc4eeb.vsidx
similarity index 64%
rename from web/.vs/Web/FileContentIndex/cf8e3a47-4342-4b42-9d08-a578e612f6de.vsidx
rename to web/.vs/Web/FileContentIndex/7e29d20c-d7d3-4d90-a1f8-e522c2bc4eeb.vsidx
index 27ec1d3..45ab787 100644
--- a/web/.vs/Web/FileContentIndex/cf8e3a47-4342-4b42-9d08-a578e612f6de.vsidx
+++ b/web/.vs/Web/FileContentIndex/7e29d20c-d7d3-4d90-a1f8-e522c2bc4eeb.vsidx
Binary files differ
diff --git a/web/.vs/Web/FileContentIndex/cad8a964-ece6-41ac-8981-776149d44edf.vsidx b/web/.vs/Web/FileContentIndex/d987c372-7924-4a84-a3c6-a0668a707d79.vsidx
similarity index 100%
rename from web/.vs/Web/FileContentIndex/cad8a964-ece6-41ac-8981-776149d44edf.vsidx
rename to web/.vs/Web/FileContentIndex/d987c372-7924-4a84-a3c6-a0668a707d79.vsidx
Binary files differ
diff --git a/web/.vs/Web/v17/.suo b/web/.vs/Web/v17/.suo
index 7e9f3e0..881fafe 100644
--- a/web/.vs/Web/v17/.suo
+++ b/web/.vs/Web/v17/.suo
Binary files differ
diff --git a/web/Dao/GwClientDao.cs b/web/Dao/GwClientDao.cs
index 5753d21..196a96f 100644
--- a/web/Dao/GwClientDao.cs
+++ b/web/Dao/GwClientDao.cs
@@ -28,7 +28,6 @@
/// <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 telephone, string agent, string company, string salesman, string supportStaff, string productId, int isEnable,int isSub, string permissionsSQL )
{
@@ -108,7 +107,7 @@
{
oracleParameterArray[8] = new OracleParameter(":CLIENT_PARENTID", OracleDbType.Int32);
((DbParameter)oracleParameterArray[8]).Value = (object)(isSub);
- stringBuilder.Append(" and gwc.CLIENT_PARENTID != :CLIENT_PARENTID");
+ stringBuilder.Append(" and gwc.CLIENT_PARENTID != 0");
}
@@ -530,6 +529,7 @@
o.SupportStaff = oracleReaderWrapper.GetString("SUPPORT_STAFF", "");
o.FinancialStaff = oracleReaderWrapper.GetString("FINANCIAL_STAFF", "");
o.ChargeType = oracleReaderWrapper.GetInt("CHARGE_TYPE", 0);
+ o.SmsBillType = oracleReaderWrapper.GetInt("SMS_BILLTYPE",0);
o.SmsStatusReport = oracleReaderWrapper.GetInt("SMS_STATUS_REPORT", 0);
o.MmsStatusReport = oracleReaderWrapper.GetInt("MMS_STATUS_REPORT", 0);
diff --git a/web/Dao/bin/Release/Dao.dll b/web/Dao/bin/Release/Dao.dll
index 54ef6c3..7d471f0 100644
--- a/web/Dao/bin/Release/Dao.dll
+++ b/web/Dao/bin/Release/Dao.dll
Binary files differ
diff --git a/web/Dao/bin/Release/Dao.pdb b/web/Dao/bin/Release/Dao.pdb
index 1652c2e..e671633 100644
--- a/web/Dao/bin/Release/Dao.pdb
+++ b/web/Dao/bin/Release/Dao.pdb
Binary files differ
diff --git a/web/Dao/bin/Release/Model.dll b/web/Dao/bin/Release/Model.dll
index 74f6747..e955eaf 100644
--- a/web/Dao/bin/Release/Model.dll
+++ b/web/Dao/bin/Release/Model.dll
Binary files differ
diff --git a/web/Dao/bin/Release/Model.pdb b/web/Dao/bin/Release/Model.pdb
index d766629..76a7339 100644
--- a/web/Dao/bin/Release/Model.pdb
+++ b/web/Dao/bin/Release/Model.pdb
Binary files differ
diff --git a/web/Lib/Model.dll b/web/Lib/Model.dll
index 74f6747..e955eaf 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 d766629..76a7339 100644
--- a/web/Lib/Model.pdb
+++ b/web/Lib/Model.pdb
Binary files differ
diff --git a/web/Model/Model/GwClient.cs b/web/Model/Model/GwClient.cs
index 75fdb7f..2bbda75 100644
--- a/web/Model/Model/GwClient.cs
+++ b/web/Model/Model/GwClient.cs
@@ -23,8 +23,6 @@
private string _password;
public string Salt { get; set; } //瀵嗙爜鍔犲瘑鐩�
-
- //private string _parentId;//涓婄骇ID //浣滃簾浜�
private Decimal _totalAmount;
private Decimal _balance;
private int _id;
@@ -33,7 +31,9 @@
private int _certification_Status;//璁よ瘉鐘舵��:0-鏈璇�/1-宸茶璇�
private int _client_Classes;//瀹㈡埛绫诲埆:0-浼佷笟/1-涓汉
+
private string _client_Parentid; //鐖剁骇璐︽埛
+
private int _client_Type;//瀹㈡埛绫诲瀷(0-鐩村/娓犻亾銆�1-瀛愯处鎴�)
private int _is_Enable;//鏄惁鍚敤鐘舵��(1-鍚�/0-鍋�)
private Decimal _top_up_Amount_Total;//绱鍏呭��(閲戦)
@@ -41,11 +41,17 @@
public string CustomerManager { get; set; } //褰掑睘瀹㈡埛缁忕悊
public string SupportStaff { get; set; } //褰掑睘瀹㈡湇浜哄憳
public string FinancialStaff { get; set; } //褰掑睘璐㈠姟浜哄憳
- public int ChargeType { get; set; } //璁¤垂鏂瑰紡锛�1-棰勪粯璐癸紱2-鍚庝粯璐�.
- public int SmsStatusReport { get; set; } //鐭俊鏄惁鏀寔鏄剧ず鐘舵�佹姤鍛婏細0-涓嶆樉绀�;1-鍙樉绀烘彁浜ゅけ璐ヤ负鍙戦�佸け璐ョ姸鎬�;2-鏄剧ず鍏ㄩ儴鐘舵�佺姸鎬�.
+
+ public int ChargeType { get; set; } //缁撶畻鏂瑰紡锛�1-棰勪粯璐癸紱2-鍚庝粯璐�.
+ public int SmsBillType { get; set; } //璁¤垂鏂瑰紡锛�0-鎻愪氦璁¤垂锛�1-鎴愬姛+鏈煡璁¤垂锛�2-鎴愬姛璁¤垂銆�
+ public int SmsStatusReport { get; set; } //鐭俊鏄惁鏀寔鏄剧ず鐘舵�佹姤鍛婏細0-涓嶅紑鏀剧姸鎬侊紝1-寮�鏀炬嫤鎴け璐ョ殑鐘舵�併��2-寮�鏀惧叏閮ㄧ姸鎬�.
+
public int MmsStatusReport { get; set; } //褰╀俊鏄惁鏀寔鏄剧ず鐘舵�佹姤鍛婏細0-涓嶆樉绀�;1-鍙樉绀烘彁浜ゅけ璐ヤ负鍙戦�佸け璐ョ姸鎬�;2-鏄剧ず鍏ㄩ儴鐘舵�佺姸鎬�.
- public int IsEnableSubAccount{ get; set; } //鏄惁鏀寔鍒涘缓瀛愯处鎴凤細0-绂佺敤锛�1-鍚敤
+ public int IsEnableSub{ get; set; } //鏄惁鏀寔鍒涘缓瀛愯处鎴凤細0-绂佺敤锛�1-鍚敤
public string SubAccountPath { get; set; } //瀛愯处鎴疯矾寰�
+
+
+
public int IsEnableWhite { get; set; } //鏄惁鍚敤鐧藉悕鍗�:0-绂佺敤锛�1-鍚敤銆傝繃婊ゅ鎴风櫧鍚嶅崟搴撱��
public int IsSyncChileWhite { get; set; } //鏄惁鍚屾瀛愯处鎴凤紙鐧藉悕鍗曪級:0-涓嶅悓姝ワ紱1-鍚屾銆�
public int IsEnableBlack { get; set; } //鏄惁鍚敤榛戝悕鍗�:0-绂佺敤锛�1-鍚敤銆傝繃婊ゅ鎴烽粦鍚嶅崟搴撳拰绯荤粺榛戝悕鍗曞簱銆�
diff --git a/web/web/Bin/Dao.dll b/web/web/Bin/Dao.dll
index 54ef6c3..7d471f0 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 1652c2e..e671633 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 74f6747..e955eaf 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 d766629..76a7339 100644
--- a/web/web/Bin/Model.pdb
+++ b/web/web/Bin/Model.pdb
Binary files differ
diff --git a/web/web/Bin/UMCLib.pdb b/web/web/Bin/UMCLib.pdb
index 4d95193..cb9b952 100644
--- a/web/web/Bin/UMCLib.pdb
+++ b/web/web/Bin/UMCLib.pdb
Binary files differ
diff --git a/web/web/GwClient.ashx b/web/web/GwClient.ashx
index ebb9d56..3de025b 100644
--- a/web/web/GwClient.ashx
+++ b/web/web/GwClient.ashx
@@ -134,10 +134,7 @@
{
Certification_StatusResult = "宸茶璇�";
}
- //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>" + item.ProductIds + "</td>"
+ "<td>"+ (item.Is_Enable == 1 ? "<span class='label label-primary'>鍚敤</span>" : "<span class='label label-default'>鍋滅敤</span>") + "</td>";
@@ -419,31 +416,25 @@
string customerManager = context.GetString("customerManager");
string supportStaff = context.GetString("supportStaff");
string financialStaff = context.GetString("financialStaff");
+
+
string chargeType = context.GetString("chargeType");
+ string smsBillType = context.GetString("smsBillType");
+
string smsStatusReport = context.GetString("smsStatusReport");
+ string isEnableSub = context.GetString("isEnableSub");
string isEnableWhite = context.GetString("isEnableWhite");
string isEnableBlack = context.GetString("isEnableBlack");
- string isRemoteLoginNotice = context.GetString("isRemoteLoginNotice");
- string isMobileCaptcha = context.GetString("isMobileCaptcha");
- string isHideMobile = context.GetString("isHideMobile");
- string isDisplayStatus = context.GetString("isDisplayStatus");
- string isLoginIpRestrict = context.GetString("isLoginIpRestrict");
- string isLoginIpAllowGather = context.GetString("isLoginIpAllowGather");
- string isLoginCityRestrict = context.GetString("isLoginCityRestrict");
- string isLoginCityAllowGather = context.GetString("isLoginCityAllowGather");
-
- string data = context.GetString("permissionData");
- if(data.Contains("1"))
- {
- data += ",sp.aspx,GwTaskSmssend,SpPrePattern.aspx";
- }
- if(data.Contains("2"))
- {
- data += ",molog.aspx,mtlog.aspx#stat,mtlog.aspx,statis.aspx";
- }
- string permissionData = Newtonsoft.Json.JsonConvert.SerializeObject(data.Split(','));
+ //string isRemoteLoginNotice = context.GetString("isRemoteLoginNotice");
+ //string isMobileCaptcha = context.GetString("isMobileCaptcha");
+ //string isHideMobile = context.GetString("isHideMobile");
+ //string isDisplayStatus = context.GetString("isDisplayStatus");
+ //string isLoginIpRestrict = context.GetString("isLoginIpRestrict");
+ //string isLoginIpAllowGather = context.GetString("isLoginIpAllowGather");
+ //string isLoginCityRestrict = context.GetString("isLoginCityRestrict");
+ //string isLoginCityAllowGather = context.GetString("isLoginCityAllowGather");
if (string.IsNullOrEmpty(clientID))
{
@@ -461,11 +452,6 @@
throw new ArgumentException("鑱旂郴浜�/鑱旂郴鐢佃瘽锛屼笉鑳戒负绌猴紒");
}
- if (string.IsNullOrEmpty(customerManager))
- {
- throw new ArgumentException("褰掑睘瀹㈡埛缁忕悊涓嶈兘涓虹┖锛岃閫夋嫨锛�");
- }
-
if (string.IsNullOrEmpty(salesman))
{
throw new ArgumentException("褰掑睘涓氬姟鍛樹笉鑳戒负绌猴紝璇烽�夋嫨锛�");
@@ -474,11 +460,6 @@
if (string.IsNullOrEmpty(supportStaff))
{
throw new ArgumentException("褰掑睘瀹㈡湇浜哄憳涓嶈兘涓虹┖锛岃閫夋嫨锛�");
- }
-
- if (string.IsNullOrEmpty(financialStaff))
- {
- throw new ArgumentException("褰掑睘璐㈠姟浜哄憳涓嶈兘涓虹┖锛岃閫夋嫨锛�");
}
if (string.IsNullOrEmpty(chargeType))
@@ -490,27 +471,6 @@
{
throw new ArgumentException("鐭俊鏄惁鏀寔鏄剧ず鐘舵�佹姤鍛婁笉鑳戒负绌猴紝璇烽�夋嫨锛�");
}
-
- /**
- if (string.IsNullOrEmpty(mmsStatusReport))
- {
- throw new ArgumentException("褰╀俊鏄惁鏀寔鏄剧ず鐘舵�佹姤鍛婁笉鑳戒负绌猴紝璇烽�夋嫨锛�");
- }**/
-
- /**
- //缂栬緫鏃朵笉鏀寔涓�у瘑鐮�
- string savePassword = "";
- if (!string.IsNullOrEmpty(clientID))
- {
- GwClient gwClient = this._Dao.Get(clientID);
- savePassword = (gwClient.Password == password ? gwClient.Password : DataHelper.MD5Hex(password) );
- }
- else
- {
- savePassword = DataHelper.MD5Hex(password);
- }
-
- **/
var client = new Model.GwClient();
@@ -531,21 +491,23 @@
client.SupportStaff = supportStaff;
client.FinancialStaff = financialStaff;
client.ChargeType = string.IsNullOrEmpty(chargeType) ? 0 : int.Parse(chargeType);
+ client.IsEnableSub = string.IsNullOrEmpty(isEnableSub) ? 0 : int.Parse(isEnableSub);
+ client.SmsBillType = string.IsNullOrEmpty(smsBillType) ? 0 : int.Parse(smsBillType);
client.SmsStatusReport = string.IsNullOrEmpty(smsStatusReport) ? 0 : int.Parse(smsStatusReport);
client.IsEnableWhite = string.IsNullOrEmpty(isEnableWhite) ? 0 : int.Parse(isEnableWhite);
client.IsEnableBlack = string.IsNullOrEmpty(isEnableBlack) ? 0 : int.Parse(isEnableBlack);
- client.IsRemoteLoginNotice = string.IsNullOrEmpty(isRemoteLoginNotice) ? 0 : int.Parse(isRemoteLoginNotice);
- client.IsMobileCaptcha = string.IsNullOrEmpty(isMobileCaptcha) ? 0 : int.Parse(isMobileCaptcha);
- client.IsHideMobile = string.IsNullOrEmpty(isHideMobile) ? 0 : int.Parse(isHideMobile);
- client.IsDisplayStatus = string.IsNullOrEmpty(isDisplayStatus) ? 0 : int.Parse(isDisplayStatus);
- client.IsLoginIpRestrict = string.IsNullOrEmpty(isLoginIpRestrict) ? 0 : int.Parse(isLoginIpRestrict);
- client.IsLoginIpAllowGather = isLoginIpAllowGather;
- client.IsLoginCityRestrict = string.IsNullOrEmpty(isLoginCityRestrict) ? 0 : int.Parse(isLoginCityRestrict);
- client.IsLoginCityAllowGather = isLoginCityAllowGather;
- client.PermissionData = permissionData;
+ //涓嬮潰鏆傛椂鐢ㄤ笉鍒�
+ //client.IsRemoteLoginNotice = string.IsNullOrEmpty(isRemoteLoginNotice) ? 0 : int.Parse(isRemoteLoginNotice);
+ //client.IsMobileCaptcha = string.IsNullOrEmpty(isMobileCaptcha) ? 0 : int.Parse(isMobileCaptcha);
+ //client.IsHideMobile = string.IsNullOrEmpty(isHideMobile) ? 0 : int.Parse(isHideMobile);
+ //client.IsDisplayStatus = string.IsNullOrEmpty(isDisplayStatus) ? 0 : int.Parse(isDisplayStatus);
+ //client.IsLoginIpRestrict = string.IsNullOrEmpty(isLoginIpRestrict) ? 0 : int.Parse(isLoginIpRestrict);
+ //client.IsLoginIpAllowGather = isLoginIpAllowGather;
+ //client.IsLoginCityRestrict = string.IsNullOrEmpty(isLoginCityRestrict) ? 0 : int.Parse(isLoginCityRestrict);
+ //client.IsLoginCityAllowGather = isLoginCityAllowGather;
_Dao.Update(client);
diff --git a/web/web/GwClient.aspx b/web/web/GwClient.aspx
index 7f4c73d..24a6352 100644
--- a/web/web/GwClient.aspx
+++ b/web/web/GwClient.aspx
@@ -83,46 +83,42 @@
$("#clientDialog #telephone").val(r.Message.Telephone);
$("#clientDialog #chargeType").val(r.Message.ChargeType);
$("#clientDialog #smsStatusReport").val(r.Message.SmsStatusReport);
- $("#clientDialog #mmsStatusReport").val(r.Message.MmsStatusReport);
- $("#clientDialog #customerManager").val(r.Message.CustomerManager);
+ $("#clientDialog #smsBillType").val(r.Message.SmsBillType);
+ //$("#clientDialog #mmsStatusReport").val(r.Message.MmsStatusReport);
+ //$("#clientDialog #customerManager").val(r.Message.CustomerManager);
$("#clientDialog #salesman").val(r.Message.Salesman);
$("#clientDialog #supportStaff").val(r.Message.SupportStaff);
- $("#clientDialog #financialStaff").val(r.Message.FinancialStaff);
+ //$("#clientDialog #financialStaff").val(r.Message.FinancialStaff);
$("#clientDialog #remark").val(r.Message.Remark);
- var permissionData = $.evalJSON(r.Message.PermissionData);
- $("#clientDialog input[name=permissionData]").iCheck("uncheck");
- $.each(permissionData, function (i) {
- $("#clientDialog input[name=permissionData][value='" + this + "']").iCheck("check");
- });
- //$("#clientDialog #isEnableWhite").val(r.Message.IsEnableWhite);
+ $("#clientDialog input[name=isEnableSub]").iCheck("uncheck");
+ $("#clientDialog input[name=isEnableSub][value='" + r.Message.IsEnableSub + "']").iCheck("check");
+
$("#clientDialog input[name=isEnableWhite]").iCheck("uncheck");
$("#clientDialog input[name=isEnableWhite][value='" + r.Message.IsEnableWhite + "']").iCheck("check");
-
- //$("#clientDialog #isEnableBlack").val(r.Message.IsEnableBlack);
$("#clientDialog input[name=isEnableBlack]").iCheck("uncheck");
$("#clientDialog input[name=isEnableBlack][value='" + r.Message.IsEnableBlack + "']").iCheck("check");
//$("#clientDialog #isRemoteLoginNotice").val(r.Message.IsRemoteLoginNotice);
- $("#clientDialog input[name=isRemoteLoginNotice]").iCheck("uncheck");
- $("#clientDialog input[name=isRemoteLoginNotice][value='" + r.Message.IsRemoteLoginNotice + "']").iCheck("check");
- //$("#clientDialog #isMobileCaptcha").val(r.Message.IsMobileCaptcha);
- $("#clientDialog input[name=isMobileCaptcha]").iCheck("uncheck");
- $("#clientDialog input[name=isMobileCaptcha][value='" + r.Message.IsMobileCaptcha + "']").iCheck("check");
- //$("#clientDialog #isHideMobile").val(r.Message.IsHideMobile);
- $("#clientDialog input[name=isHideMobile]").iCheck("uncheck");
- $("#clientDialog input[name=isHideMobile][value='" + r.Message.IsHideMobile + "']").iCheck("check");
- //$("#clientDialog #isDisplayStatus").val(r.Message.IsDisplayStatus);
- $("#clientDialog input[name=isDisplayStatus]").iCheck("uncheck");
- $("#clientDialog input[name=isDisplayStatus][value='" + r.Message.IsDisplayStatus + "']").iCheck("check");
- //$("#clientDialog #isLoginIpRestrict").val(r.Message.IsLoginIpRestrict);
- $("#clientDialog input[name=isLoginIpRestrict]").iCheck("uncheck");
- $("#clientDialog input[name=isLoginIpRestrict][value='" + r.Message.IsLoginIpRestrict + "']").iCheck("check");
+ //$("#clientDialog input[name=isRemoteLoginNotice]").iCheck("uncheck");
+ //$("#clientDialog input[name=isRemoteLoginNotice][value='" + r.Message.IsRemoteLoginNotice + "']").iCheck("check");
+ ////$("#clientDialog #isMobileCaptcha").val(r.Message.IsMobileCaptcha);
+ //$("#clientDialog input[name=isMobileCaptcha]").iCheck("uncheck");
+ //$("#clientDialog input[name=isMobileCaptcha][value='" + r.Message.IsMobileCaptcha + "']").iCheck("check");
+ ////$("#clientDialog #isHideMobile").val(r.Message.IsHideMobile);
+ //$("#clientDialog input[name=isHideMobile]").iCheck("uncheck");
+ //$("#clientDialog input[name=isHideMobile][value='" + r.Message.IsHideMobile + "']").iCheck("check");
+ ////$("#clientDialog #isDisplayStatus").val(r.Message.IsDisplayStatus);
+ //$("#clientDialog input[name=isDisplayStatus]").iCheck("uncheck");
+ //$("#clientDialog input[name=isDisplayStatus][value='" + r.Message.IsDisplayStatus + "']").iCheck("check");
+ ////$("#clientDialog #isLoginIpRestrict").val(r.Message.IsLoginIpRestrict);
+ //$("#clientDialog input[name=isLoginIpRestrict]").iCheck("uncheck");
+ //$("#clientDialog input[name=isLoginIpRestrict][value='" + r.Message.IsLoginIpRestrict + "']").iCheck("check");
- $("#clientDialog #isLoginIpAllowGather").val(r.Message.IsLoginIpAllowGather);
- //$("#clientDialog #isLoginCityRestrict").val(r.Message.IsLoginCityRestrict);
- $("#clientDialog input[name=isLoginCityRestrict]").iCheck("uncheck");
- $("#clientDialog input[name=isLoginCityRestrict][value='" + r.Message.IsLoginCityRestrict + "']").iCheck("check");
- $("#clientDialog #isLoginCityAllowGather").val(r.Message.IsLoginCityAllowGather);
+ //$("#clientDialog #isLoginIpAllowGather").val(r.Message.IsLoginIpAllowGather);
+ ////$("#clientDialog #isLoginCityRestrict").val(r.Message.IsLoginCityRestrict);
+ //$("#clientDialog input[name=isLoginCityRestrict]").iCheck("uncheck");
+ //$("#clientDialog input[name=isLoginCityRestrict][value='" + r.Message.IsLoginCityRestrict + "']").iCheck("check");
+ //$("#clientDialog #isLoginCityAllowGather").val(r.Message.IsLoginCityAllowGather);
}
catch (e) {
}
@@ -647,7 +643,6 @@
<div class="col-sm-4">
<input type="text" name="clientID" id="clientID" value="" class="form-control" />
</div>
- <!--<span class="help-block m-b-none"><i class="fa fa-exclamation-triangle"></i>璇疯緭鍏ュ叕鍙稿崟浣嶅悕绉�</span>-->
</div>
<div class="form-group">
@@ -657,7 +652,6 @@
<div class="col-sm-4">
<input type="text" name="company" id="company" value="" class="form-control" />
</div>
- <!--<span class="help-block m-b-none"><i class="fa fa-exclamation-triangle"></i>璇疯緭鍏ュ叕鍙稿崟浣嶅悕绉�</span>-->
</div>
@@ -699,30 +693,45 @@
</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="chargeType" id="chargeType" class="form-control">
- <option value="" ></option>
<option value="1" >棰勪粯璐�</option>
<option value="2" >鍚庝粯璐�</option>
</select>
</div>
</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="smsBillType" id="smsBillType" class="form-control">
+ <option value="0" >鎻愪氦璁¤垂</option>
+ <option value="1" >鎴愬姛+鏈煡璁¤垂</option>
+ <option value="2" >鎴愬姛璁¤垂</option>
+ </select>
+ </div>
+ </div>
+
+
+ <div class="form-group">
+ <label class="control-label col-sm-2">
+ 鐭俊鐘舵�佸紑鏀� <span style="color:red">*</span>
</label>
<div class="col-sm-4">
<select name="smsStatusReport" id="smsStatusReport" class="form-control">
- <option value="0" >涓嶆樉绀�</option>
- <%--<option value="1" >鍙樉绀烘彁浜ゅけ璐ヤ负鍙戦�佸け璐ョ姸鎬�</option>--%>
- <option value="2" >鏄剧ず</option>
+ <option value="0" >涓嶅紑鏀剧姸鎬�</option>
+ <option value="1" >鍙樉绀虹郴缁熸嫤鎴け璐ョ姸鎬�</option>
+ <option value="2" >鏄剧ず鍏ㄩ儴鐘舵�佺姸鎬�</option>
</select>
</div>
</div>
- <div class="form-group">
+ <%--<div class="form-group">
<label class="control-label col-sm-2">
褰掑睘瀹㈡埛缁忕悊 <span style="color:red">*</span>
</label>
@@ -731,7 +740,7 @@
<%=customerManagerOptions(0)%>
</select>
</div>
- </div>
+ </div>--%>
<div class="form-group">
<label class="control-label col-sm-2">
褰掑睘涓氬姟鍛� <span style="color:red">*</span>
@@ -752,7 +761,19 @@
</select>
</div>
</div>
+
+
<div class="form-group">
+ <label class="control-label col-sm-2">
+ 鏄惁鍏佽寮�瀛愯处鎴�
+ </label>
+ <div class="col-sm-4">
+ <input type="radio" class="icheck-me" name="isEnableSub" value="0" checked="checked" /><label>绂佺敤</label>
+ <input type="radio" class="icheck-me" name="isEnableSub" value="1" /><label>鍚敤</label>
+ </div>
+ </div>
+
+ <%--<div class="form-group">
<label class="control-label col-sm-2">
褰掑睘璐㈠姟浜哄憳 <span style="color:red">*</span>
</label>
@@ -761,13 +782,13 @@
<%=financialStaffOptions(0)%>
</select>
</div>
- </div>
- <div class="form-group">
+ </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>--%>
<!--
<div class="form-group">
<label class="control-label col-sm-2">
@@ -801,7 +822,7 @@
<input type="radio" class="icheck-me" name="isEnableBlack" value="1" /><label>鍚敤</label>
</div>
</div>
- <div class="form-group">
+ <%--<div class="form-group">
<label class="control-label col-sm-2">
鏄惁寮傚湴鐧诲綍閫氱煡
</label>
@@ -827,18 +848,18 @@
<input type="radio" class="icheck-me" name="isHideMobile" value="0" checked="checked" /><label>绂佺敤</label>
<input type="radio" class="icheck-me" name="isHideMobile" value="1" /><label>鍚敤</label>
</div>
- </div>
- <div class="form-group">
+ </div>--%>
+ <%--<div class="form-group">
<label class="control-label col-sm-2">
鏄惁鏄剧ず鐘舵�佹帴鍙�
</label>
<div class="col-sm-8">
- <input type="radio" class="icheck-me" name="isDisplayStatus" value="0" checked="checked" /><label>涓嶆樉绀�</label>
- <input type="radio" class="icheck-me" name="isDisplayStatus" value="1" /><label>鍙樉绀烘彁浜ゅけ璐ヤ负鍙戦�佸け璐ョ姸鎬�</label>
+ <input type="radio" class="icheck-me" name="isDisplayStatus" value="0" checked="checked" /><label>涓嶅紑鏀剧姸鎬�</label>
+ <input type="radio" class="icheck-me" name="isDisplayStatus" value="1" /><label>鍙樉绀虹郴缁熸嫤鎴け璐ョ姸鎬�</label>
<input type="radio" class="icheck-me" name="isDisplayStatus" value="2" /><label>鏄剧ず鍏ㄩ儴鐘舵�佺姸鎬�</label>
</div>
- </div>
- <div class="form-group">
+ </div>--%>
+ <%--<div class="form-group">
<label class="control-label col-sm-2">
鏄惁鍚敤鐧诲綍IP闄愬埗
</label>
@@ -875,7 +896,7 @@
<!--<span class="help-block m-b-none">閰嶅悎鏄惁鍚敤鐧诲綍鍩庡競闄愬埗涓�璧蜂娇鐢紝澶氫釜闄愬埗鍦板尯鏃讹紝鎸夊崐瑙掗�楀彿","鍒嗛殧銆� </span>-->
<span class="help-block m-b-none">閰嶅悎鏄惁鍚敤鐧诲綍鍩庡競闄愬埗涓�璧蜂娇鐢紝澶氫釜闄愬埗鍦板尯鏃讹紝姣忎竴琛屼负1涓湴鍖猴紙鍩庡競锛夈�� </span>
</div>
- </div>
+ </div>--%>
<div class="form-group">
<label class="control-label col-sm-2">
澶囨敞
diff --git a/web/web/GwClient.aspx.cs b/web/web/GwClient.aspx.cs
index 11ff8cb..5f07be8 100644
--- a/web/web/GwClient.aspx.cs
+++ b/web/web/GwClient.aspx.cs
@@ -82,33 +82,33 @@
return stringBuilder.ToString();
}
- //褰掑睘瀹㈡埛缁忕悊
- public string customerManagerOptions(int userId)
- {
- StringBuilder stringBuilder = new StringBuilder();
- if (this.SysUserList.Count == 0)
- return "<option value=''>鏃�</option>";
- stringBuilder.AppendFormat("<option value=\"{0}\" >{1}</option>", (object)"", (object)"鏃�");
- foreach (SysUser bean in this.SysUserList)
- {
- //鍋滅敤鐨勭敤鎴蜂笉鍐嶆樉绀�
- if (bean.Status == 0)
- {
- continue;
- }
- //杩囨护鐢ㄦ埛绫诲瀷 1-绠＄悊鍛�;2-涓氬姟鍛�--鍏ㄥ憳;3-瀹㈡埛缁忕悊;4-瀹㈡湇浜哄憳;5-璐㈠姟浜哄憳
- if (!checkStrForArrayStr(1, bean.UserType) && !checkStrForArrayStr(3, bean.UserType))
- {
- continue;
- }
+ ////褰掑睘瀹㈡埛缁忕悊
+ //public string customerManagerOptions(int userId)
+ //{
+ // StringBuilder stringBuilder = new StringBuilder();
+ // if (this.SysUserList.Count == 0)
+ // return "<option value=''>鏃�</option>";
+ // stringBuilder.AppendFormat("<option value=\"{0}\" >{1}</option>", (object)"", (object)"鏃�");
+ // foreach (SysUser bean in this.SysUserList)
+ // {
+ // //鍋滅敤鐨勭敤鎴蜂笉鍐嶆樉绀�
+ // if (bean.Status == 0)
+ // {
+ // continue;
+ // }
+ // //杩囨护鐢ㄦ埛绫诲瀷 1-绠＄悊鍛�;2-涓氬姟鍛�--鍏ㄥ憳;3-瀹㈡埛缁忕悊;4-瀹㈡湇浜哄憳;5-璐㈠姟浜哄憳
+ // if (!checkStrForArrayStr(1, bean.UserType) && !checkStrForArrayStr(3, bean.UserType))
+ // {
+ // continue;
+ // }
- if (userId == bean.UserID)
- stringBuilder.AppendFormat("<option value=\"{0}\" selected>{1}</option>", (object)bean.UserID, (object)bean.UserName);
- else
- stringBuilder.AppendFormat("<option value=\"{0}\">{1}</option>", (object)bean.UserID, (object)bean.UserName);
- }
- return stringBuilder.ToString();
- }
+ // if (userId == bean.UserID)
+ // stringBuilder.AppendFormat("<option value=\"{0}\" selected>{1}</option>", (object)bean.UserID, (object)bean.UserName);
+ // else
+ // stringBuilder.AppendFormat("<option value=\"{0}\">{1}</option>", (object)bean.UserID, (object)bean.UserName);
+ // }
+ // return stringBuilder.ToString();
+ //}
//褰掑睘瀹㈡湇浜哄憳
public string supportStaffOptions(int userId)
@@ -138,33 +138,33 @@
return stringBuilder.ToString();
}
- //褰掑睘璐㈠姟浜哄憳
- public string financialStaffOptions(int userId)
- {
- StringBuilder stringBuilder = new StringBuilder();
- if (this.SysUserList.Count == 0)
- return "<option value=''>鏃�</option>";
- stringBuilder.AppendFormat("<option value=\"{0}\" >{1}</option>", (object)"", (object)"鏃�");
- foreach (SysUser bean in this.SysUserList)
- {
- //鍋滅敤鐨勭敤鎴蜂笉鍐嶆樉绀�
- if (bean.Status == 0)
- {
- continue;
- }
- //杩囨护鐢ㄦ埛绫诲瀷 1-绠＄悊鍛�;2-涓氬姟鍛�--鍏ㄥ憳;3-瀹㈡埛缁忕悊;4-瀹㈡湇浜哄憳;5-璐㈠姟浜哄憳
- if (!checkStrForArrayStr(1, bean.UserType) && !checkStrForArrayStr(5, bean.UserType))
- {
- continue;
- }
+ ////褰掑睘璐㈠姟浜哄憳
+ //public string financialStaffOptions(int userId)
+ //{
+ // StringBuilder stringBuilder = new StringBuilder();
+ // if (this.SysUserList.Count == 0)
+ // return "<option value=''>鏃�</option>";
+ // stringBuilder.AppendFormat("<option value=\"{0}\" >{1}</option>", (object)"", (object)"鏃�");
+ // foreach (SysUser bean in this.SysUserList)
+ // {
+ // //鍋滅敤鐨勭敤鎴蜂笉鍐嶆樉绀�
+ // if (bean.Status == 0)
+ // {
+ // continue;
+ // }
+ // //杩囨护鐢ㄦ埛绫诲瀷 1-绠＄悊鍛�;2-涓氬姟鍛�--鍏ㄥ憳;3-瀹㈡埛缁忕悊;4-瀹㈡湇浜哄憳;5-璐㈠姟浜哄憳
+ // if (!checkStrForArrayStr(1, bean.UserType) && !checkStrForArrayStr(5, bean.UserType))
+ // {
+ // continue;
+ // }
- if (userId == bean.UserID)
- stringBuilder.AppendFormat("<option value=\"{0}\" selected>{1}</option>", (object)bean.UserID, (object)bean.UserName);
- else
- stringBuilder.AppendFormat("<option value=\"{0}\">{1}</option>", (object)bean.UserID, (object)bean.UserName);
- }
- return stringBuilder.ToString();
- }
+ // if (userId == bean.UserID)
+ // stringBuilder.AppendFormat("<option value=\"{0}\" selected>{1}</option>", (object)bean.UserID, (object)bean.UserName);
+ // else
+ // stringBuilder.AppendFormat("<option value=\"{0}\">{1}</option>", (object)bean.UserID, (object)bean.UserName);
+ // }
+ // return stringBuilder.ToString();
+ //}
//鑾峰彇浜у搧淇℃伅
diff --git a/web/web/Session.ashx b/web/web/Session.ashx
index f4ad021..f430a05 100644
--- a/web/web/Session.ashx
+++ b/web/web/Session.ashx
@@ -125,12 +125,12 @@
Content = "璇疯緭鍏ュ瘑鐮佸悗鍐嶇櫥褰曪紒",
Tstatus = num
});
- if (!string.Equals(sessionCode, code, StringComparison.OrdinalIgnoreCase))
- return new JsonPageResult(false, (object) new
- {
- Content = "楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏ワ紒",
- Tstatus = num
- });
+ //if (!string.Equals(sessionCode, code, StringComparison.OrdinalIgnoreCase))
+ // return new JsonPageResult(false, (object) new
+ // {
+ // Content = "楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏ワ紒",
+ // Tstatus = num
+ // });
SysUser user = new SysUser();
try
--
Gitblit v1.9.1