分仓调整姓名搜索

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -71,12 +71,47 @@ namespace MySystem.Areas.Admin.Controllers
             //仓库归属人真实姓名
             if (!string.IsNullOrEmpty(UserIdRealName))
             {
-                condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
+                DataTable dt = OtherMySqlConn.dtable("SELECT Id FROM Users WHERE RealName like '%" + UserIdRealName + "%'");
+                var Count = dt.Rows.Count;
+                int times = 0;
+                string UserIds = "";
+                foreach (DataRow item in dt.Rows)
+                {
+                    times++;
+                    if (times == Count)
+                    {
+                        UserIds += item["Id"].ToString();
+                    }
+                    else
+                    {
+                        UserIds += item["Id"].ToString() + ",";
+                    }
+                }
+                // condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
+                condition += " and UserId in (" + UserIds + ")";
             }
             //仓库管理员真实姓名
+
             if (!string.IsNullOrEmpty(ManageUserIdRealName))
             {
-                condition += " and ManageUserId in (select ManageUserId from UserForRealName where RealName='" + ManageUserIdRealName + "')";
+                DataTable dts = OtherMySqlConn.dtable("SELECT Id FROM Users WHERE RealName like '%" + ManageUserIdRealName + "%'");
+                var Counts = dts.Rows.Count;
+                int time = 1;
+                string UserIdss = "";
+                foreach (DataRow items in dts.Rows)
+                {
+                    time++;
+                    if (time == Counts)
+                    {
+                        UserIdss += items["Id"].ToString();
+                    }
+                    else
+                    {
+                        UserIdss += items["Id"].ToString() + ",";
+                    }
+                }
+                // condition += " and ManageUserId in (select ManageUserId from UserForRealName where RealName='" + ManageUserIdRealName + "')";
+                condition += " and UserId in (" + UserIdss + ")";
             }
             //仓库管理员手机号
             if (!string.IsNullOrEmpty(ManageUserIdMobile))

Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -1555,6 +1555,7 @@ namespace MySystem.Areas.Admin.Controllers
 
             }
 
+            //个人
             //扶持期
             decimal TotalAmtfc = 0;
             decimal DAmtfc = 0;
@@ -1571,8 +1572,22 @@ namespace MySystem.Areas.Admin.Controllers
             int JCountwd = 0;
             decimal YAmtwd = 0;
 
-            // int BCount = 0;
-            // int ACount = 0;
+            // //团队
+            // //扶持期
+            // decimal TotalAmtfc1 = 0;
+            // decimal DAmtfc1 = 0;
+            // decimal JAmtfc1 = 0;
+            // decimal JfAmtfc1 = 0;
+            // int JCountfc1 = 0;
+            // decimal YAmtfc1 = 0;
+
+            // //稳定期
+            // decimal TotalAmtwd1 = 0;
+            // decimal DAmtwd1 = 0;
+            // decimal JAmtwd1 = 0;
+            // decimal JfAmtwd1 = 0;
+            // int JCountwd1 = 0;
+            // decimal YAmtwd1 = 0;
 
             WebCMSEntities db = new WebCMSEntities();
             Dictionary<string, object> other = new Dictionary<string, object>();
@@ -1637,15 +1652,67 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 YAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
             }
-            // dt = OtherMySqlConn.dtable("SELECT COUNT(0) count FROM PosMachinesTwo WHERE BindingState=1 AND ActivationState=0 AND UserId= '" + ParentId + "'" + cons);
+
+            // DataTable dts = OtherMySqlConn.dtable("select Sum(HelpNonDirectTradeAmt + HelpNonDirectDebitTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team' and UserId= '" + ParentId + "'" + con);
+            // if (dts.Rows.Count > 0)
+            // {
+            //     TotalAmtfc1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][0].ToString()));
+            // }
+            // dts = OtherMySqlConn.dtable("select Sum(HelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team' and UserId= '" + ParentId + "'" + con);
             // if (dt.Rows.Count > 0)
             // {
-            //     BCount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
+            //     DAmtfc1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][0].ToString()));
             // }
-            // dt = OtherMySqlConn.dtable("SELECT COUNT(0) count FROM PosMachinesTwo WHERE BindingState=1 AND ActivationState=1 AND UserId= '" + ParentId + "'" + cons);
+            // dts = OtherMySqlConn.dtable("select Sum(HelpNonDirectDebitTradeAmt),Sum(HelpNonDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team' and UserId= '" + ParentId + "'" + con);
             // if (dt.Rows.Count > 0)
             // {
-            //     ACount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
+            //     JAmtfc1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][0].ToString())) - Convert.ToDecimal(function.CheckNum(dts.Rows[0][1].ToString()));
+            // }
+            // dts = OtherMySqlConn.dtable("select Sum(HelpNonDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team' and UserId= '" + ParentId + "'" + con);
+            // if (dts.Rows.Count > 0)
+            // {
+            //     JfAmtfc1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][0].ToString()));
+            // }
+            // dts = OtherMySqlConn.dtable("select Sum(HelpNoonDirectDebitCapNum) from TradeDaySummary where QueryCount=0 and SeoTitle='team' and UserId= '" + ParentId + "'" + con);
+            // if (dts.Rows.Count > 0)
+            // {
+            //     JCountfc1 = Convert.ToInt32(function.CheckInt(dts.Rows[0][0].ToString()));
+            // }
+            // dts = OtherMySqlConn.dtable("select Sum(HelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=1 and SeoTitle='team' and UserId= '" + ParentId + "'" + con);
+            // if (dts.Rows.Count > 0)
+            // {
+            //     YAmtfc1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][0].ToString()));
+            // }
+
+            // dts = OtherMySqlConn.dtable("select Sum(NotHelpNoonDirectTradeAmt + NotHelpNonDirectDebitTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team' and UserId= '" + ParentId + "'" + con);
+            // if (dts.Rows.Count > 0)
+            // {
+            //     TotalAmtwd1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][0].ToString()));
+            // }
+            // dts = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team' and UserId= '" + ParentId + "'" + con);
+            // if (dts.Rows.Count > 0)
+            // {
+            //     DAmtwd1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][0].ToString()));
+            // }
+            // dts = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectDebitTradeAmt),Sum(NotHelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team' and UserId= '" + ParentId + "'" + con);
+            // if (dts.Rows.Count > 0)
+            // {
+            //     JAmtwd1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][0].ToString())) - Convert.ToDecimal(function.CheckNum(dts.Rows[0][1].ToString()));
+            // }
+            // dts = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team' and UserId= '" + ParentId + "'" + con);
+            // if (dts.Rows.Count > 0)
+            // {
+            //     JfAmtwd1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][0].ToString()));
+            // }
+            // dts = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectDebitCapNum) from TradeDaySummary where QueryCount=0 and SeoTitle='team' and UserId= '" + ParentId + "'" + con);
+            // if (dts.Rows.Count > 0)
+            // {
+            //     JCountwd1 = Convert.ToInt32(function.CheckInt(dts.Rows[0][0].ToString()));
+            // }
+            // dts = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=1 and SeoTitle='team' and UserId= '" + ParentId + "'" + con);
+            // if (dts.Rows.Count > 0)
+            // {
+            //     YAmtwd1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][0].ToString()));
             // }
 
             other.Add("TotalAmtfc", TotalAmtfc);
@@ -1662,8 +1729,19 @@ namespace MySystem.Areas.Admin.Controllers
             other.Add("JCountwd", JCountwd);
             other.Add("YAmtwd", YAmtwd);
 
-            // other.Add("BCount", BCount);
-            // other.Add("ACount", ACount);
+            // other.Add("TotalAmtfc1", TotalAmtfc1);
+            // other.Add("DAmtfc1", DAmtfc1);
+            // other.Add("JAmtfc1", JAmtfc1);
+            // other.Add("JfAmtfc1", JfAmtfc1);
+            // other.Add("JCountfc1", JCountfc1);
+            // other.Add("YAmtfc1", YAmtfc1);
+
+            // other.Add("TotalAmtwd1", TotalAmtwd1);
+            // other.Add("DAmtwd1", DAmtwd1);
+            // other.Add("JAmtwd1", JAmtwd1);
+            // other.Add("JfAmtwd1", JfAmtwd1);
+            // other.Add("JCountwd1", JCountwd1);
+            // other.Add("YAmtwd1", YAmtwd1);
             db.Dispose();
             obj.Add("other", other);
 

Areas/Admin/Views/MainServer/SchoolMakerStudy/Index.cshtml

@@ -80,12 +80,12 @@
                         <button class="layui-btn" data-type="batchdel"><i
                             class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
                     }
-                    @if (RightInfo.Contains("," + right + "_edit,"))
+                    @* @if (RightInfo.Contains("," + right + "_edit,"))
                     {
                         <button class="layui-btn" data-type="Open">开启</button>
                         <button class="layui-btn" data-type="Close">关闭</button>
 
-                    }
+                    } *@
                 </div>
 
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
@@ -132,7 +132,7 @@
     </div>
 
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules/SchoolMakerStudy_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script src="/layuiadmin/modules_main/SchoolMakerStudy_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
 
     </script>

Areas/Admin/Views/MainServer/SchoolMorningMeet/Index.cshtml

@@ -87,12 +87,12 @@
                         <button class="layui-btn" data-type="batchdel"><i
                             class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
                     }
-                    @if (RightInfo.Contains("," + right + "_edit,"))
+                    @* @if (RightInfo.Contains("," + right + "_edit,"))
                     {
                         <button class="layui-btn" data-type="Open">开启</button>
                         <button class="layui-btn" data-type="Close">关闭</button>
 
-                    }
+                    } *@
                 </div>
 
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
@@ -139,7 +139,7 @@
     </div>
 
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules/SchoolMorningMeet_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script src="/layuiadmin/modules_main/SchoolMorningMeet_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
 
     </script>

Areas/Admin/Views/MainServer/StoreChangeHistory/Index.cshtml

@@ -82,13 +82,22 @@
                     </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">交易类型</label>
-                        <div class="layui-input-inline">
+                        @* <div class="layui-input-inline">
                             <select id="TransTypeSelect" name="TransTypeSelect" lay-search="">
                                 <option value="">全部...</option>
                                 <option value="10">领取</option>
                                 <option value="11">划拨</option>
                                 <option value="13">退货</option>
                             </select>
+                        </div> *@
+                        <div class="layui-input-inline">
+                            <select id="TransTypeSelect" name="TransTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="1">调拨</option>
+                                <option value="2">出货</option>
+                                <option value="3">退货</option>
+                                <option value="0">采购</option>
+                            </select>
                         </div>
                     </div>
                     <div class="layui-inline">

Areas/Admin/Views/MainServer/SysTools/Loop.cshtml

@@ -73,8 +73,8 @@
                     <img style="display: inline-block; width: 50%; height: 100%;" src={{ d.avatar }}>
                 </script>
                 <script type="text/html" id="Loop">
-                    <a lay-href="/Admin/SysTools/Index?right=@right&SwapSnExpand=@("{{d.SnNos}}")" lay-text="发货机信息" style="color: #428bca;">{{d.SwapSnExpand}}</a>
-                    <a lay-href="/Admin/SysTools/Index?right=@right&SnNos=@("{{d.SwapSnExpand}}")" lay-text="申请机信息" style="color: #428bca;">{{d.SnNos}}</a>
+                    <a lay-href="/Admin/SysTools/Loop?right=@right&SwapSnExpand=@("{{d.SnNos}}")" lay-text="发货机信息" style="color: #428bca;">{{d.SwapSnExpand}}</a>
+                    <a lay-href="/Admin/SysTools/Loop?right=@right&SnNos=@("{{d.SwapSnExpand}}")" lay-text="申请机信息" style="color: #428bca;">{{d.SnNos}}</a>
                 </script>
             </div>
         </div>

Areas/Admin/Views/MainServer/Users/Children.cshtml

@@ -96,6 +96,13 @@
                     刷卡交易总额(扶)(元)：<span style="color: #f00;" id="TotalAmtfc">0.00</span>　| 贷记卡交易额(扶)(元)：<span style="color: #f00;" id="DAmtfc">0.00</span>　|　借记卡非封顶交易额(扶)(元)：<span style="color: #f00;" id="JAmtfc">0.00</span>　|　借记卡封顶交易额(扶)(元)：<span style="color: #f00;" id="JfAmtfc">0.00</span>　|　借记卡交易笔数(扶)(元)：<span style="color: #f00;" id="JCountfc">0.00</span>　|　云闪付小额交易额(扶)(元)：<span style="color: #f00;" id="YAmtfc">0.00</span>
                     </br>
                     刷卡交易总额(稳)(元)：<span style="color: #f00;" id="TotalAmtwd">0.00</span>　| 贷记卡交易额(稳)(元)：<span style="color: #f00;" id="DAmtwd">0.00</span>　|　借记卡非封顶交易额(稳)(元)：<span style="color: #f00;" id="JAmtwd">0.00</span>　|　借记卡封顶交易额(稳)(元)：<span style="color: #f00;" id="JfAmtwd">0.00</span>　|　借记卡交易笔数(稳)(元)：<span style="color: #f00;" id="JCountwd">0.00</span>　|　云闪付小额交易额(稳)(元)：<span style="color: #f00;" id="YAmtwd">0.00</span>
+                    </br>
+                    @* 团队交易额：
+                    </br>
+                    刷卡交易总额(扶)(元)：<span style="color: #f00;" id="TotalAmtfc1">0.00</span>　| 贷记卡交易额(扶)(元)：<span style="color: #f00;" id="DAmtfc1">0.00</span>　|　借记卡非封顶交易额(扶)(元)：<span style="color: #f00;" id="JAmtfc1">0.00</span>　|　借记卡封顶交易额(扶)(元)：<span style="color: #f00;" id="JfAmtfc1">0.00</span>　|　借记卡交易笔数(扶)(元)：<span style="color: #f00;" id="JCountfc1">0.00</span>　|　云闪付小额交易额(扶)(元)：<span style="color: #f00;" id="YAmtfc1">0.00</span>
+                    </br>
+                    刷卡交易总额(稳)(元)：<span style="color: #f00;" id="TotalAmtwd1">0.00</span>　| 贷记卡交易额(稳)(元)：<span style="color: #f00;" id="DAmtwd1">0.00</span>　|　借记卡非封顶交易额(稳)(元)：<span style="color: #f00;" id="JAmtwd1">0.00</span>　|　借记卡封顶交易额(稳)(元)：<span style="color: #f00;" id="JfAmtwd1">0.00</span>　|　借记卡交易笔数(稳)(元)：<span style="color: #f00;" id="JCountwd1">0.00</span>　|　云闪付小额交易额(稳)(元)：<span style="color: #f00;" id="YAmtwd1">0.00</span>
+                 *@
                 </blockquote>
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
             </div>

wwwroot/layuiadmin/modules_main/UsersChildren_Admin.js

@@ -143,8 +143,22 @@ layui.config({
             $("#JCountwd").text(res.other.JCountwd);
             $("#YAmtwd").text(res.other.YAmtwd);
 
-            $("#BCount").text(res.other.BCount);
-            $("#ACount").text(res.other.ACount);
+            // $("#TotalAmtfc1").text(res.other.TotalAmtfc1);
+            // $("#DAmtfc1").text(res.other.DAmtfc1);
+            // $("#JAmtfc1").text(res.other.JAmtfc1);
+            // $("#JfAmtfc1").text(res.other.JfAmtfc1);
+            // $("#JCountfc1").text(res.other.JCountfc1);
+            // $("#YAmtfc1").text(res.other.YAmtfc1);
+
+            // $("#TotalAmtwd1").text(res.other.TotalAmtwd1);
+            // $("#DAmtwd1").text(res.other.DAmtwd1);
+            // $("#JAmtwd1").text(res.other.JAmtwd1);
+            // $("#JfAmtwd1").text(res.other.JfAmtwd1);
+            // $("#JCountwd1").text(res.other.JCountwd1);
+            // $("#YAmtwd1").text(res.other.YAmtwd1);
+
+            // $("#BCount").text(res.other.BCount);
+            // $("#ACount").text(res.other.ACount);
 
             $(".layui-none").text("无数据");
         }