dengyu
/
DS7
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

'20220826-3'

Browse Source
临时发布20240103
dengyu 2 years ago
parent a51ef4c9c2
commit 8d6913f00a
11 changed files with 44 additions and 19 deletions
Show Stats Download Patch File Download Diff File

2
BookingJieFeng/BookingJieFeng.csproj.user
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
</PropertyGroup> </PropertyGroup>
<ProjectExtensions> <ProjectExtensions>

BIN
BookingJieFeng/obj/Debug/BookingJieFeng.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
BookingWeb/BookingWeb.csproj.user
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup> </PropertyGroup>
<ProjectExtensions> <ProjectExtensions>
<VisualStudio> <VisualStudio>

BIN
BookingWeb/obj/Debug/BookingWeb.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
DSWeb.Common/DB/Comm.cs
Unescape Escape View File

@ -1276,7 +1276,7 @@ namespace DSWeb.Common.DB
public string USERID { get; set; } public string USERID { get; set; }
public string ISSALEMAN { get; set; }
//public string WeChatAccount { get; set; } //public string WeChatAccount { get; set; }

25
DSWeb/Areas/MvcShipping/DAL/MsInfoClient/MsInfoClientDAL.cs
Unescape Escape View File

@ -1542,8 +1542,32 @@ namespace DSWeb.MvcShipping.DAL.MsInfoClient
#region 权限范围 #region 权限范围
/// <summary>
/// 该算法改为只限制销售
///
/// </summary>
/// <param name="tb"></param>
/// <param name="userid"></param>
/// <param name="username"></param>
/// <param name="companyid"></param>
/// <returns></returns>
public static string GetRangDAStr(string tb, string userid, string username, string companyid) public static string GetRangDAStr(string tb, string userid, string username, string companyid)
{ {
string str = " ISNULL(BLSTATUS,1)=0 and RANGETYPE='集团' ";
var cdc = new CommonDataContext();
var userinfo = cdc.VW_user.FirstOrDefault(x => x.USERID == userid);
if (userinfo == null) return (" 1=2 ");
if (userinfo != null && userinfo.ISSALEMAN== "true") {
//是销售 看不到录入人 不是自己且不为空的 Rangetype=个人 的往来单位
str += " and (RANGETYPE='个人' and in)"
}
return str;
/*
string str = ""; string str = "";
var strSql = new StringBuilder(); var strSql = new StringBuilder();
strSql.Append("SELECT "); strSql.Append("SELECT ");
@ -1644,6 +1668,7 @@ namespace DSWeb.MvcShipping.DAL.MsInfoClient
} }
return str; return str;
*/
} }
#endregion #endregion

2
DSWeb/DSWeb.csproj.user
Unescape Escape View File

@ -4,7 +4,7 @@
<ProjectView>ShowAllFiles</ProjectView> <ProjectView>ShowAllFiles</ProjectView>
<NameOfLastUsedPublishProfile>E:\DS7GIT\DSWeb\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>E:\DS7GIT\DSWeb\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />
<IISExpressAnonymousAuthentication /> <IISExpressAnonymousAuthentication />

28
DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user
Unescape Escape View File

@ -389,16 +389,16 @@
<publishTime>08/26/2022 15:18:29</publishTime> <publishTime>08/26/2022 15:18:29</publishTime>
</File> </File>
<File Include="Areas/Account/Viewsjs/Chfee_Audit/Chfee_Audit.js"> <File Include="Areas/Account/Viewsjs/Chfee_Audit/Chfee_Audit.js">
<publishTime>08/26/2022 15:18:29</publishTime> <publishTime>08/26/2022 17:36:20</publishTime>
</File> </File>
<File Include="Areas/Account/Viewsjs/Chfee_Audit/Chfee_AuditBL.js"> <File Include="Areas/Account/Viewsjs/Chfee_Audit/Chfee_AuditBL.js">
<publishTime>08/26/2022 15:18:29</publishTime> <publishTime>08/26/2022 17:36:20</publishTime>
</File> </File>
<File Include="Areas/Account/Viewsjs/Chfee_Audit/Chfee_AuditLR.js"> <File Include="Areas/Account/Viewsjs/Chfee_Audit/Chfee_AuditLR.js">
<publishTime>08/26/2022 15:18:29</publishTime> <publishTime>08/26/2022 17:36:20</publishTime>
</File> </File>
<File Include="Areas/Account/Viewsjs/Chfee_Audit/Chfee_AuditTruck.js"> <File Include="Areas/Account/Viewsjs/Chfee_Audit/Chfee_AuditTruck.js">
<publishTime>08/26/2022 15:18:29</publishTime> <publishTime>08/26/2022 17:36:20</publishTime>
</File> </File>
<File Include="Areas/Account/Viewsjs/Chfee_Audit/Index.js"> <File Include="Areas/Account/Viewsjs/Chfee_Audit/Index.js">
<publishTime>08/26/2022 14:59:28</publishTime> <publishTime>08/26/2022 14:59:28</publishTime>
@ -3479,7 +3479,7 @@
<publishTime>08/26/2022 15:18:30</publishTime> <publishTime>08/26/2022 15:18:30</publishTime>
</File> </File>
<File Include="Areas/MvcContainer/Viewsjs/MsOpCtnBsCard/MsOpCtnBsCtnChfee_Audit.js"> <File Include="Areas/MvcContainer/Viewsjs/MsOpCtnBsCard/MsOpCtnBsCtnChfee_Audit.js">
<publishTime>08/26/2022 15:18:30</publishTime> <publishTime>08/26/2022 17:36:15</publishTime>
</File> </File>
<File Include="Areas/MvcContainer/Viewsjs/MsOpCtnBsCard/MsOpCtnBsCtnStatusEdit.js"> <File Include="Areas/MvcContainer/Viewsjs/MsOpCtnBsCard/MsOpCtnBsCtnStatusEdit.js">
<publishTime>08/26/2022 15:18:30</publishTime> <publishTime>08/26/2022 15:18:30</publishTime>
@ -6704,7 +6704,7 @@
<publishTime>08/26/2022 14:59:30</publishTime> <publishTime>08/26/2022 14:59:30</publishTime>
</File> </File>
<File Include="Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientEdit.js"> <File Include="Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientEdit.js">
<publishTime>08/26/2022 15:18:30</publishTime> <publishTime>08/26/2022 17:52:01</publishTime>
</File> </File>
<File Include="Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientHangXinCustIndex.js"> <File Include="Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientHangXinCustIndex.js">
<publishTime>08/26/2022 14:59:30</publishTime> <publishTime>08/26/2022 14:59:30</publishTime>
@ -12821,10 +12821,10 @@
<publishTime>08/26/2022 14:59:24</publishTime> <publishTime>08/26/2022 14:59:24</publishTime>
</File> </File>
<File Include="bin/App_global.asax.compiled"> <File Include="bin/App_global.asax.compiled">
<publishTime>08/26/2022 16:55:25</publishTime> <publishTime>08/26/2022 18:15:05</publishTime>
</File> </File>
<File Include="bin/App_global.asax.dll"> <File Include="bin/App_global.asax.dll">
<publishTime>08/26/2022 16:55:25</publishTime> <publishTime>08/26/2022 18:15:05</publishTime>
</File> </File>
<File Include="bin/AspNetPager.dll"> <File Include="bin/AspNetPager.dll">
<publishTime>08/26/2022 14:59:36</publishTime> <publishTime>08/26/2022 14:59:36</publishTime>
@ -12884,19 +12884,19 @@
<publishTime>08/26/2022 16:54:15</publishTime> <publishTime>08/26/2022 16:54:15</publishTime>
</File> </File>
<File Include="bin/DSWeb.dll"> <File Include="bin/DSWeb.dll">
<publishTime>08/26/2022 16:54:48</publishTime> <publishTime>08/26/2022 18:14:48</publishTime>
</File> </File>
<File Include="bin/DSWeb.Interface.dll"> <File Include="bin/DSWeb.Interface.dll">
<publishTime>08/26/2022 16:54:17</publishTime> <publishTime>08/26/2022 18:14:15</publishTime>
</File> </File>
<File Include="bin/DSWeb.Interface.pdb"> <File Include="bin/DSWeb.Interface.pdb">
<publishTime>08/26/2022 16:54:17</publishTime> <publishTime>08/26/2022 18:14:15</publishTime>
</File> </File>
<File Include="bin/DSWeb.pdb"> <File Include="bin/DSWeb.pdb">
<publishTime>08/26/2022 16:54:48</publishTime> <publishTime>08/26/2022 18:14:48</publishTime>
</File> </File>
<File Include="bin/DSWeb.XmlSerializers.dll"> <File Include="bin/DSWeb.XmlSerializers.dll">
<publishTime>08/26/2022 16:54:49</publishTime> <publishTime>08/26/2022 18:14:49</publishTime>
</File> </File>
<File Include="bin/DSWebComponent.dll"> <File Include="bin/DSWebComponent.dll">
<publishTime>08/26/2022 16:54:15</publishTime> <publishTime>08/26/2022 16:54:15</publishTime>
@ -17528,7 +17528,7 @@
<publishTime>08/26/2022 14:59:33</publishTime> <publishTime>08/26/2022 14:59:33</publishTime>
</File> </File>
<File Include="PrecompiledApp.config"> <File Include="PrecompiledApp.config">
<publishTime>08/26/2022 16:55:19</publishTime> <publishTime>08/26/2022 18:14:58</publishTime>
</File> </File>
<File Include="PriceCarrier/CrmPriceCarrierInfo.aspx"> <File Include="PriceCarrier/CrmPriceCarrierInfo.aspx">
<publishTime>08/26/2022 14:59:33</publishTime> <publishTime>08/26/2022 14:59:33</publishTime>

BIN
DSWeb/bin/DSWeb.XmlSerializers.dll
View File

Binary file not shown.

2
DispatchWeb/DispatchWeb.csproj.user
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup> </PropertyGroup>
<ProjectExtensions> <ProjectExtensions>
<VisualStudio> <VisualStudio>

BIN
DispatchWeb/obj/Debug/DispatchWeb.csproj.AssemblyReference.cache
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save