Главная Обзор Помощь
Регистрация Вход
lichunlei
/
kxs-admin
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

新建分仓调整

DuGuYang 3 лет назад
Родитель
50af233297
Сommit
222ee9bc71
3 измененных файлов с 250 добавлено и 191 удалено
Единый вид Показать статистику Diff
  1. 4 2
      Areas/Admin/Controllers/MainServer/StoreHouseController.cs
  2. 206 153
      Areas/Admin/Views/MainServer/StoreHouse/Edits.cshtml
  3. 40 36
      wwwroot/layuiadmin/modules_operate/StoreHouse_Admin.js

+ 4 - 2
Areas/Admin/Controllers/MainServer/StoreHouseController.cs
Просмотреть файл 

@@ -329,7 +329,7 @@ namespace MySystem.Areas.Admin.Controllers
 
                     Fields.Add("StoreStatus", 1);

                     Fields.Add("StoreStatus", 1);

                     Fields.Add("Status", 1);

                     Fields.Add("Status", 1);

 

 

-                    var name = db.StoreHouse.FirstOrDefault(m => m.UserId == user.UserId && m.BrandId == BrandId && m.StoreName == data.StoreName);

+                    var name = db.StoreHouse.FirstOrDefault(m => m.UserId == user.UserId && m.BrandId == BrandId && m.StoreName == data.StoreName && m.OpId == 0);

                     if (name != null)

                     if (name != null)

                     {

                     {

                         return "您的仓库名重复，请重新填写";

                         return "您的仓库名重复，请重新填写";

@@ -567,7 +567,7 @@ namespace MySystem.Areas.Admin.Controllers
 
         {

         {

             Dictionary<string, object> Fields = new Dictionary<string, object>();

             Dictionary<string, object> Fields = new Dictionary<string, object>();

             StoreHouse storeHouse = db.StoreHouse.FirstOrDefault(m => m.Id == data.Id);

             StoreHouse storeHouse = db.StoreHouse.FirstOrDefault(m => m.Id == data.Id);

-            var brand = db.StoreHouse.FirstOrDefault(m => m.UserId == storeHouse.UserId && m.BrandId == data.BrandId);

+            var brand = db.StoreHouse.FirstOrDefault(m => m.UserId == storeHouse.UserId && m.BrandId == data.BrandId && m.OpId == 0);

             if (brand != null)

             if (brand != null)

             {

             {

                 return "您已有该品牌类型的仓库，请重新选择";

                 return "您已有该品牌类型的仓库，请重新选择";

@@ -596,6 +596,8 @@ namespace MySystem.Areas.Admin.Controllers
 
             Fields.Add("ManagerEmail", data.ManagerEmail); //管理者邮箱

             Fields.Add("ManagerEmail", data.ManagerEmail); //管理者邮箱

             Fields.Add("ManageMobile", data.ManageMobile);

             Fields.Add("ManageMobile", data.ManageMobile);

             Fields.Add("Remark", data.Remark); //备注

             Fields.Add("Remark", data.Remark); //备注

+            Fields.Add("FilePath", data.FilePath); //附件

+            Fields.Add("Deposit", data.Deposit); //押金

             Fields.Add("LimitTopUserId", data.LimitTopUserId); //限制创客特殊仓库

             Fields.Add("LimitTopUserId", data.LimitTopUserId); //限制创客特殊仓库

             Fields.Add("StoreKind", data.StoreKind); //仓库归属类型

             Fields.Add("StoreKind", data.StoreKind); //仓库归属类型

             int bid = Convert.ToInt32(data.BrandId);

             int bid = Convert.ToInt32(data.BrandId);

+ 206 - 153
Areas/Admin/Views/MainServer/StoreHouse/Edits.cshtml
Просмотреть файл 

@@ -1,192 +1,230 @@
 
 @using MySystem.Models;
 
 @using MySystem.Models;
 
-@{StoreHouse editData = ViewBag.data as StoreHouse;}
 
+@{
 
+    StoreHouse editData = ViewBag.data as StoreHouse;
 
+}
 
 @{
 
 @{
 
     string RightInfo = ViewBag.RightInfo as string;
 
     string RightInfo = ViewBag.RightInfo as string;
 
     string right = ViewBag.right as string;
 
     string right = ViewBag.right as string;
 
-    
+
 
 }
 
 }
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
 <html>
 
 <html>
 
+
 
 <head>
 
 <head>
 
     <meta charset="utf-8">
 
     <meta charset="utf-8">
 
     <title>一键新建仓库</title>
 
     <title>一键新建仓库</title>
 
     <meta name="renderer" content="webkit">
 
     <meta name="renderer" content="webkit">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
 
+    <meta name="viewport"
 
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
 
     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
 
     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
 
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
 
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
 
     <script src="/admin/js/LAreaData2.js"></script>
 
     <script src="/admin/js/LAreaData2.js"></script>
 
     <style>
 
     <style>
 
-        .layui-form-label{
 
+        .layui-form-label {
 
             width: 135px !important;
 
             width: 135px !important;
 
         }
 
         }
 
-        .layui-form-item .layui-input-block{
 
+
 
+        .layui-form-item .layui-input-block {
 
             margin-left: 165px !important;
 
             margin-left: 165px !important;
 
         }
 
         }
 
     </style>
 
     </style>
 
 </head>
 
 </head>
 
+
 
 <body>
 
 <body>
 
 
 
     <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
 
     <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
 
         <input type="hidden" name="Id" value="@editData.Id" />
 
         <input type="hidden" name="Id" value="@editData.Id" />
 
-        
+
 
         <div class="layui-card">
 
         <div class="layui-card">
 
-          <div class="layui-card-body">
 
-            <div class="layui-tab" lay-filter="mytabbar">
 
-                <div class="layui-tab-content mt20">
 
-                    <div class="layui-tab-item layui-show">
 
-                        <div class="layui-form-item">
 
-                            <label class="layui-form-label">*仓库名称</label>
 
-                            <div class="layui-input-inline">
 
-                                <input class="layui-input" type="text" id="StoreName" name="StoreName"
 
-                                    value="@editData.StoreName" maxlength="32" lay-verify="required|" autocomplete="off"
 
-                                    placeholder="请输入仓库名称">
 
+            <div class="layui-card-body">
 
+                <div class="layui-tab" lay-filter="mytabbar">
 
+                    <div class="layui-tab-content mt20">
 
+                        <div class="layui-tab-item layui-show">
 
+                            <div class="layui-form-item">
 
+                                <label class="layui-form-label">*仓库名称</label>
 
+                                <div class="layui-input-inline">
 
+                                    <input class="layui-input" type="text" id="StoreName" name="StoreName"
 
+                                        value="@editData.StoreName" maxlength="32" lay-verify="required|"
 
+                                        autocomplete="off" placeholder="请输入仓库名称">
 
+                                </div>
 
                             </div>
 
                             </div>
 
-                        </div>
 
-                        @{Dictionary<string, string> KqProductsDic = new MySystem.DictionaryClass().getKqProductBrandDic();}
 
-                        <div class="layui-form-item">
 
-                            <label class="layui-form-label">产品类型</label>
 
-                            <div class="layui-input-inline">
 
-                                <select id="BrandId" name="BrandId" lay-search="">
 
-                                    <option value="">全部...</option>
 
-                                    @foreach (string key in KqProductsDic.Keys)
 
-                                    {
 
-                                    <option value="@key" @(editData.BrandId.ToString() == key ? "selected" : "")>@KqProductsDic[key]</option>
 
-                                    }
 
-                                </select>
 
+                            @{
 
+                                Dictionary<string, string> KqProductsDic = new MySystem.DictionaryClass().getKqProductBrandDic();
 
+                            }
 
+                            <div class="layui-form-item">
 
+                                <label class="layui-form-label">产品类型</label>
 
+                                <div class="layui-input-inline">
 
+                                    <select id="BrandId" name="BrandId" lay-search="">
 
+                                        <option value="">全部...</option>
 
+                                        @foreach (string key in KqProductsDic.Keys)
 
+                                        {
 
+                                            <option value="@key" @(editData.BrandId.ToString() == key ? "selected" : "")>@KqProductsDic[key]</option>
 
+                                        }
 
+                                    </select>
 
+                                </div>
 
                             </div>
 
                             </div>
 
-                        </div>
 
-                        <div class="layui-form-item">
 
-                            <label class="layui-form-label">*仓库状态</label>
 
-                            <div class="layui-input-inline">
 
-                                <select id="Status" name="Status" lay-search="" lay-verify="required|">
 
-                                    <option value="">请选择</option>
 
-                                    <option value="1">正常</option>
 
-                                    <option value="0">停用</option>
 
-                                </select>
 
-                                <script>
 
-                                    $("#Status").val("@editData.Status");
 
-                                </script>
 
+                            <div class="layui-form-item">
 
+                                <label class="layui-form-label">*仓库状态</label>
 
+                                <div class="layui-input-inline">
 
+                                    <select id="Status" name="Status" lay-search="" lay-verify="required|">
 
+                                        <option value="">请选择</option>
 
+                                        <option value="1">正常</option>
 
+                                        <option value="0">停用</option>
 
+                                    </select>
 
+                                    <script>
 
+                                        $("#Status").val("@editData.Status");
 
+                                    </script>
 
+                                </div>
 
                             </div>
 
                             </div>
 
-                        </div>
 
-                        <div class="layui-form-item">
 
-                            <label class="layui-form-label">*仓库负责人编号</label>
 
-                            <div class="layui-input-inline">
 
-                                <input class="layui-input" type="text" id="ManageMakerCode" name="ManageMakerCode"
 
-                                    value="@ViewBag.ManageMakerCode" maxlength="30" lay-verify="required|" autocomplete="off"
 
-                                    placeholder="请输入仓库负责人编号">
 
+                            <div class="layui-form-item">
 
+                                <label class="layui-form-label">*仓库负责人编号</label>
 
+                                <div class="layui-input-inline">
 
+                                    <input class="layui-input" type="text" id="ManageMakerCode" name="ManageMakerCode"
 
+                                        value="@ViewBag.ManageMakerCode" maxlength="30" lay-verify="required|"
 
+                                        autocomplete="off" placeholder="请输入仓库负责人编号">
 
+                                </div>
 
                             </div>
 
                             </div>
 
-                        </div>
 
-                        <div class="layui-form-item">
 
-                            <label class="layui-form-label">*仓库管理员</label>
 
-                            <div class="layui-input-inline">
 
-                                <input class="layui-input" type="text" readonly id="ManageRealName" name="ManageRealName"
 
-                                    value="@ViewBag.ManageRealName" maxlength="20" lay-verify="" autocomplete="off"
 
-                                    placeholder="请输入仓库负责人编号">
 
+                            <div class="layui-form-item">
 
+                                <label class="layui-form-label">*仓库管理员</label>
 
+                                <div class="layui-input-inline">
 
+                                    <input class="layui-input" type="text" readonly id="ManageRealName"
 
+                                        name="ManageRealName" value="@ViewBag.ManageRealName" maxlength="20"
 
+                                        lay-verify="" autocomplete="off" placeholder="请输入仓库负责人编号">
 
+                                </div>
 
                             </div>
 
                             </div>
 
-                        </div>                        
-                        <div class="layui-form-item">
 
-                            <label class="layui-form-label">仓库归属创客编号</label>
 
-                            <div class="layui-input-inline">
 
-                                <input class="layui-input" type="text" id="MakerCode" name="MakerCode"
 
-                                    value="@ViewBag.MakerCode" maxlength="30" lay-verify="" autocomplete="off"
 
-                                    placeholder="请输入仓库归属创客编号(操作员)">
 
+                            <div class="layui-form-item">
 
+                                <label class="layui-form-label">仓库归属创客编号</label>
 
+                                <div class="layui-input-inline">
 
+                                    <input class="layui-input" type="text" id="MakerCode" name="MakerCode"
 
+                                        value="@ViewBag.MakerCode" maxlength="30" lay-verify="" autocomplete="off"
 
+                                        placeholder="请输入仓库归属创客编号(操作员)">
 
+                                </div>
 
                             </div>
 
                             </div>
 
-                        </div>
 
-                        <div class="layui-form-item">
 
-                            <label class="layui-form-label">*仓库归属类型</label>
 
-                            <div class="layui-input-inline">
 
-                                <select id="StoreKind" name="StoreKind" lay-search="" lay-verify="required|">
 
-                                    <option value="">请选择</option>
 
-                                    <option value="0">分仓</option>
 
-                                    <option value="1">总仓</option>
 
-                                </select>
 
-                                <script>
 
-                                    $("#StoreKind").val("@editData.StoreKind");
 
-                                </script>
 
+                            <div class="layui-form-item">
 
+                                <label class="layui-form-label">*仓库归属类型</label>
 
+                                <div class="layui-input-inline">
 
+                                    <select id="StoreKind" name="StoreKind" lay-search="" lay-verify="required|">
 
+                                        <option value="">请选择</option>
 
+                                        <option value="0">分仓</option>
 
+                                        <option value="1">总仓</option>
 
+                                    </select>
 
+                                    <script>
 
+                                        $("#StoreKind").val("@editData.StoreKind");
 
+                                    </script>
 
+                                </div>
 
                             </div>
 
                             </div>
 
-                        </div>
 
-                        <div class="layui-form-item">
 
-                            <label class="layui-form-label">*管理者邮箱</label>
 
-                            <div class="layui-input-inline">
 
-                                <input class="layui-input" type="text" id="ManagerEmail" name="ManagerEmail"
 
-                                    value="@editData.ManagerEmail" maxlength="32" lay-verify="required|email|"
 
-                                    autocomplete="off" placeholder="请输入管理者邮箱">
 
+                            <div class="layui-form-item">
 
+                                <label class="layui-form-label">*管理者邮箱</label>
 
+                                <div class="layui-input-inline">
 
+                                    <input class="layui-input" type="text" id="ManagerEmail" name="ManagerEmail"
 
+                                        value="@editData.ManagerEmail" maxlength="32" lay-verify="required|email|"
 
+                                        autocomplete="off" placeholder="请输入管理者邮箱">
 
+                                </div>
 
                             </div>
 
                             </div>
 
-                        </div>
 
-                        <div class="layui-form-item">
 
-                            <label class="layui-form-label">*管理者手机号</label>
 
-                            <div class="layui-input-inline">
 
-                                <input class="layui-input" type="text" id="ManageMobile" name="ManageMobile"
 
-                                    value="@editData.ManageMobile" maxlength="11" lay-verify="required|phone|"
 
-                                    autocomplete="off" placeholder="请输入管理者手机号">
 
+                            <div class="layui-form-item">
 
+                                <label class="layui-form-label">*管理者手机号</label>
 
+                                <div class="layui-input-inline">
 
+                                    <input class="layui-input" type="text" id="ManageMobile" name="ManageMobile"
 
+                                        value="@editData.ManageMobile" maxlength="11" lay-verify="required|phone|"
 
+                                        autocomplete="off" placeholder="请输入管理者手机号">
 
+                                </div>
 
                             </div>
 
                             </div>
 
-                        </div>
 
-                        <div class="layui-form-item">
 
-                            <label class="layui-form-label">限制创客编号</label>
 
-                            <div class="layui-input-inline">
 
-                                <input class="layui-input" type="text" id="LimitTopUserId" name="LimitTopUserId"
 
-                                    value="@editData.LimitTopUserId" maxlength="100" lay-verify="" autocomplete="off"
 
-                                    placeholder="请输入特殊团队仓库专属-限制创客编号(多个用,隔开)">
 
+                            <div class="layui-form-item">
 
+                                <label class="layui-form-label">限制创客编号</label>
 
+                                <div class="layui-input-inline">
 
+                                    <input class="layui-input" type="text" id="LimitTopUserId" name="LimitTopUserId"
 
+                                        value="@editData.LimitTopUserId" maxlength="100" lay-verify=""
 
+                                        autocomplete="off" placeholder="请输入特殊团队仓库专属-限制创客编号(多个用,隔开)">
 
+                                </div>
 
                             </div>
 
                             </div>
 
-                        </div>
 
-                        <div class="layui-form-item">
 
-                            <label class="layui-form-label">*仓库所属地区</label>
 
-                            <input type="hidden" id="Areas" name="Areas" value="@editData.Areas" />
 
-                            <div class="layui-input-inline">
 
-                                <select id="AreasProvince" lay-search="" lay-filter="AreasProvince" lay-verify="required|">
 
-                                    <option value="">省</option>
 
-                                </select>
 
+                            <div class="layui-form-item">
 
+                                <label class="layui-form-label">*仓库所属地区</label>
 
+                                <input type="hidden" id="Areas" name="Areas" value="@editData.Areas" />
 
+                                <div class="layui-input-inline">
 
+                                    <select id="AreasProvince" lay-search="" lay-filter="AreasProvince"
 
+                                        lay-verify="required|">
 
+                                        <option value="">省</option>
 
+                                    </select>
 
+                                </div>
 
+                                <div class="layui-input-inline">
 
+                                    <select id="AreasCity" lay-search="" lay-filter="AreasCity" lay-verify="required|">
 
+                                        <option value="">市</option>
 
+                                    </select>
 
+                                </div>
 
+                                <div class="layui-input-inline">
 
+                                    <select id="AreasArea" lay-search="" lay-filter="AreasArea">
 
+                                        <option value="">县/区</option>
 
+                                    </select>
 
+                                </div>
 
                             </div>
 
                             </div>
 
-                            <div class="layui-input-inline">
 
-                                <select id="AreasCity" lay-search="" lay-filter="AreasCity" lay-verify="required|">
 
-                                    <option value="">市</option>
 
-                                </select>
 
+                            <div class="layui-form-item">
 
+                                <label class="layui-form-label">*仓库地址</label>
 
+                                <div class="layui-input-block">
 
+                                    <input class="layui-input" type="text" id="Address" name="Address"
 
+                                        value="@editData.Address" maxlength="128" lay-verify="required|"
 
+                                        autocomplete="off" placeholder="请输入仓库地址">
 
+                                </div>
 
                             </div>
 
                             </div>
 
-                            <div class="layui-input-inline">
 
-                                <select id="AreasArea" lay-search="" lay-filter="AreasArea">
 
-                                    <option value="">县/区</option>
 
-                                </select>
 
+                            <div class="layui-form-item">
 
+                                <label class="layui-form-label">*押金</label>
 
+                                <div class="layui-input-inline">
 
+                                    <input class="layui-input" type="text" id="Deposit" name="Deposit" value=""
 
+                                        maxlength="32" lay-verify="required|" autocomplete="off" placeholder="请输入押金">
 
+                                </div>
 
                             </div>
 
                             </div>
 
-                        </div>
 
-                        <div class="layui-form-item">
 
-                            <label class="layui-form-label">*仓库地址</label>
 
-                            <div class="layui-input-block">
 
-                                <input class="layui-input" type="text" id="Address" name="Address"
 
-                                    value="@editData.Address" maxlength="128" lay-verify="required|" autocomplete="off"
 
-                                    placeholder="请输入仓库地址">
 
+                            <div class="layui-form-item">
 
+                                <label class="layui-form-label">附件</label>
 
+                                <div class="layui-input-block">
 
+                                    <div class="layui-upload">
 
+                                        <input type="hidden" id="FilePath" name="FilePath" value=""
 
+                                            lay-verify="required|">
 
+                                        <button class="layui-btn" type="button" id="FilePathBtn">选择文件</button>
 
+                                        <div class="layui-inline layui-word-aux">
 
+                                            @(new MySystem.PublicFunction().GetUploadHint("SysAdminFilePath"))</div>
 
+                                    </div>
 
+                                    <div style="margin-top:10px;" id="FilePathFile">
 
+                                    </div>
 
+                                    <div style="width: 50%; margin-top:20px; display:none;" id="FilePathProgressBar">
 
+                                        <div class="layui-progress" lay-showpercent="true"
 
+                                            lay-filter="FilePathProgress">
 
+                                            <div class="layui-progress-bar" lay-percent="0%"></div>
 
+                                        </div>
 
+                                    </div>
 
+                                </div>
 
                             </div>
 
                             </div>
 
-                        </div>
 
-                        <div class="layui-form-item layui-form-text">
 
-                            <label class="layui-form-label">备注</label>
 
-                            <div class="layui-input-block">
 
-                                <textarea class="layui-textarea" id="Remark" name="Remark" maxlength="128"
 
-                                    lay-verify="" placeholder="请输入备注">@editData.Remark</textarea>
 
+                            <div class="layui-form-item layui-form-text">
 
+                                <label class="layui-form-label">备注</label>
 
+                                <div class="layui-input-block">
 
+                                    <textarea class="layui-textarea" id="Remark" name="Remark" maxlength="128"
 
+                                        lay-verify="" placeholder="请输入备注">@editData.Remark</textarea>
 
+                                </div>
 
                             </div>
 
                             </div>
 
+
 
+
 
                         </div>
 
                         </div>
 
-                        
 
 
                     </div>
 
                     </div>
 
-
 
+                </div>
 
+                <div class="layui-form-item layui-hide">
 
+                    <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit"
 
+                        value="确认">
 
                 </div>
 
                 </div>
 
             </div>
 
             </div>
 
-            <div class="layui-form-item layui-hide">
 
-                <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
 
-            </div>
 
-          </div>
 
         </div>
 
         </div>
 
     </div>
 
     </div>
 
 
 
     <script src="/layuiadmin/layui/layui.js"></script>
 
     <script src="/layuiadmin/layui/layui.js"></script>
 
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
 
+    <script
 
+        src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
 
     <script src="/other/mybjq/kindeditor-min.js"></script>
 
     <script src="/other/mybjq/kindeditor-min.js"></script>
 
     <script src="/other/mybjq/lang/zh_CN.js"></script>
 
     <script src="/other/mybjq/lang/zh_CN.js"></script>
 
     <script>
 
     <script>
 
-        
-        
+
 
+
 
         //编辑器
 
         //编辑器
 
         KindEditor.ready(function (K) {
 
         KindEditor.ready(function (K) {
 
-            
+
 
         });
 
         });
 
 
 
         var ids = "";
 
         var ids = "";
 
@@ -311,45 +349,60 @@
 
             tree = layui.tree;
 
             tree = layui.tree;
 
             element = layui.element;
 
             element = layui.element;
 
             upload = layui.upload;
 
             upload = layui.upload;
 
-        
+
 
             //Hash地址的定位
 
             //Hash地址的定位
 
             var layid = location.hash.replace(/^#test=/, '');
 
             var layid = location.hash.replace(/^#test=/, '');
 
             element.tabChange('test', layid);
 
             element.tabChange('test', layid);
 
             element.on('tab(test)', function (elem) {
 
             element.on('tab(test)', function (elem) {
 
                 location.hash = 'test=' + $(this).attr('lay-id');
 
                 location.hash = 'test=' + $(this).attr('lay-id');
 
             });
 
             });
 
-    
+
 
             //日期
 
             //日期
 
-            
+
 
 
 
             //上传文件
 
             //上传文件
 
-            
+            WebUploadJs('FilePathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("SysAdminFilePath"))), function (filename) {
 
+                $('#FilePathFile').html(filename + '<a style="margin-left:20px;text-decoration:underline;color:cornflowerblue;" href="' + osshost + filename + '" target="_blank">点击查看附件</a>');
 
+                $('#FilePath').val(filename);
 
+                setTimeout(function () {
 
+                    $("#FilePathProgressBar").css("display", "none");
 
+                }, 1000);
 
+            }, function (file) {
 
+                $("#FilePathProgressBar").css("display", "block");
 
+                element.progress('FilePathProgress', file.percent + '%');
 
+            });
 
+            WebUploadJs('HeadPhotoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("SysAdminHeadPhoto"))), function (filename) {
 
+                $('#HeadPhotoImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
 
+                $('#HeadPhoto').val(filename);
 
+            });
 
+
 
 
 
             //穿梭框
 
             //穿梭框
 
-            
+
 
 
 
             //TreeView，比如权限管理
 
             //TreeView，比如权限管理
 
-            
+
 
 
 
             //省市区
 
             //省市区
 
             form.on('select(AreasProvince)', function (data) {
 
             form.on('select(AreasProvince)', function (data) {
 
-AreasProvinceSelected("Areas", "@editData.Areas", form, data.value);
 
-});
 
-form.on('select(AreasCity)', function (data) {
 
-AreasCitySelected("Areas", "@editData.Areas", form, data.value)
 
-});
 
-form.on('select(AreasArea)', function (data) {
 
-AreasAreaSelected("Areas", form)
 
-});
 
-setTimeout(function () {
 
-AreasProvinceInit("Areas", "@(Html.Raw(editData.Areas))", form);
 
-AreasProvinceSelected("Areas", "@(Html.Raw(editData.Areas))", form, $("#AreasProvince").val());
 
-AreasCitySelected("Areas", "@(Html.Raw(editData.Areas))", form, $("#AreasCity").val());
 
-AreasAreaSelected("Areas", form);
 
-}, 1000);
 
+                AreasProvinceSelected("Areas", "@editData.Areas", form, data.value);
 
+            });
 
+            form.on('select(AreasCity)', function (data) {
 
+                AreasCitySelected("Areas", "@editData.Areas", form, data.value)
 
+            });
 
+            form.on('select(AreasArea)', function (data) {
 
+                AreasAreaSelected("Areas", form)
 
+            });
 
+            setTimeout(function () {
 
+                AreasProvinceInit("Areas", "@(Html.Raw(editData.Areas))", form);
 
+                AreasProvinceSelected("Areas", "@(Html.Raw(editData.Areas))", form, $("#AreasProvince").val());
 
+                AreasCitySelected("Areas", "@(Html.Raw(editData.Areas))", form, $("#AreasCity").val());
 
+                AreasAreaSelected("Areas", form);
 
+            }, 1000);
 
 
 
         })
 
         })
 
 
 
     </script>
 
     </script>
 
 </body>
 
 </body>
 
+
 
 </html>
 
 </html>

+ 40 - 36
wwwroot/layuiadmin/modules_operate/StoreHouse_Admin.js
Просмотреть файл 

@@ -230,42 +230,42 @@ layui.config({
 
                 title: '创建时间',

                 title: '创建时间',

                 sort: true

                 sort: true

             }

             }

-            // , {

-            //     field: 'Deposit',

-            //     width: 110,

-            //     title: '押金',

-            //     sort: true

-            // }, {

-            //     field: 'ValidAmount',

-            //     width: 110,

-            //     title: '可用额度',

-            //     sort: true

-            // }, {

-            //     field: 'FixedAmount',

-            //     width: 110,

-            //     title: '固定额度',

-            //     sort: true

-            // }, {

-            //     field: 'TempAmount',

-            //     width: 110,

-            //     title: '临时额度',

-            //     sort: true

-            // }, {

-            //     field: 'PromissAmount',

-            //     width: 110,

-            //     title: '担保额度',

-            //     sort: true

-            // }, {

-            //     field: 'ThisMonthPreAmount',

-            //     width: 150,

-            //     title: '本月小分仓额度',

-            //     sort: true

-            // }, {

-            //     field: 'ValidPreAmount',

-            //     width: 150,

-            //     title: '可用小分仓额度',

-            //     sort: true

-            // }

+                // , {

+                //     field: 'Deposit',

+                //     width: 110,

+                //     title: '押金',

+                //     sort: true

+                // }, {

+                //     field: 'ValidAmount',

+                //     width: 110,

+                //     title: '可用额度',

+                //     sort: true

+                // }, {

+                //     field: 'FixedAmount',

+                //     width: 110,

+                //     title: '固定额度',

+                //     sort: true

+                // }, {

+                //     field: 'TempAmount',

+                //     width: 110,

+                //     title: '临时额度',

+                //     sort: true

+                // }, {

+                //     field: 'PromissAmount',

+                //     width: 110,

+                //     title: '担保额度',

+                //     sort: true

+                // }, {

+                //     field: 'ThisMonthPreAmount',

+                //     width: 150,

+                //     title: '本月小分仓额度',

+                //     sort: true

+                // }, {

+                //     field: 'ValidPreAmount',

+                //     width: 150,

+                //     title: '可用小分仓额度',

+                //     sort: true

+                // }

             ]

             ]

         ],

         ],

         where: {

         where: {

@@ -855,6 +855,7 @@ layui.config({
 
                                         });

                                         });

                                     }

                                     }

                                     else {

                                     else {

+                                        layer.close(loadindex);

                                         layer.msg(data);

                                         layer.msg(data);

                                     }

                                     }

                                 }

                                 }

@@ -917,6 +918,7 @@ layui.config({
 
                                 data: userdata + "Id=" + ids,

                                 data: userdata + "Id=" + ids,

                                 dataType: "text",

                                 dataType: "text",

                                 success: function (data) {

                                 success: function (data) {

+                                    layer.close(loadindex);

                                     layer.close(index);

                                     layer.close(index);

                                     if (data == "success") {

                                     if (data == "success") {

                                         table.reload('LAY-list-manage');

                                         table.reload('LAY-list-manage');

@@ -928,6 +930,7 @@ layui.config({
 
                                         });

                                         });

                                     }

                                     }

                                     else {

                                     else {

+                                        layer.close(loadindex);

                                         layer.msg(data);

                                         layer.msg(data);

                                     }

                                     }

                                 }

                                 }

@@ -959,6 +962,7 @@ layui.config({
 
                             layer.close(index);

                             layer.close(index);

                             if (data == "success") {

                             if (data == "success") {

                                 table.reload('LAY-list-manage');

                                 table.reload('LAY-list-manage');

+                                layer.close(index);

                             } else {

                             } else {

                                 layer.msg(data);

                                 layer.msg(data);

                             }

                             }