每日晨会时间组件修改

分仓申请添加发货状态查询

Areas/Admin/Controllers/MainServer/StoreMachineApplyController.cs

@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 分仓机具申请记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(StoreMachineApply data, string UserIdRealName, string UserIdMakerCode, string CreateDateData, int page = 1, int limit = 30)
+        public JsonResult IndexData(StoreMachineApply data, string UserIdRealName, string UserIdMakerCode, string CreateDateData, string StatusSelect, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -79,6 +79,11 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
 
+            if (!string.IsNullOrEmpty(StatusSelect))
+            {
+                condition += " and Status=" + StatusSelect + "";
+            }
+
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("StoreMachineApply", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;

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

@@ -249,7 +249,7 @@
 
 
             //上传文件
-            WebUploadJs('ListPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("SchoolMakerStudyListPic"))), function (filename) {
+            WebUploadJs('ListPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("SchoolMakerStudyListPic"))), function (filename) {
                 $('#ListPicImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
                 $('#ListPic').val(filename);
             });

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

@@ -262,7 +262,7 @@
 
 
             //上传文件
-            WebUploadJs('ListPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("SchoolMakerStudyListPic"))), function (filename) {
+            WebUploadJs('ListPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("SchoolMakerStudyListPic"))), function (filename) {
                 $('#ListPicImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
                 $('#ListPic').val(filename);
             });

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

@@ -54,7 +54,7 @@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">结束时间</label>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="PublishDate" name="UpdateDate"
+                                    <input class="layui-input" type="text" id="PublishDates" name="UpdateDate"
                                         lay-verify="" autocomplete="off" placeholder="请输入结束时间">
                                 </div>
                             </div>
@@ -280,9 +280,14 @@
                 type: 'datetime'
             });
 
+            laydate.render({
+                elem: '#PublishDates',
+                type: 'datetime'
+            });
+
 
             //上传文件
-            WebUploadJs('PhotoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("SchoolMorningMeetPhoto"))), function (filename) {
+            WebUploadJs('PhotoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("SchoolMorningMeetPhoto"))), function (filename) {
                 $('#PhotoImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
                 $('#Photo').val(filename);
             });

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

@@ -54,14 +54,14 @@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">开始时间</label>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="PublishDate" name="CreateDate" value="@editData.Sort"
+                                    <input class="layui-input" type="text" id="PublishDate" name="CreateDate" value="@(Library.function.ConvertIntDateTime(editData.Sort*60).ToString("yyyy-MM-dd HH:mm:ss"))"
                                         lay-verify="" autocomplete="off" placeholder="请输入开始时间">
                                 </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="PublishDate" name="UpdateDate" value="@editData.QueryCount"
+                                    <input class="layui-input" type="text" id="PublishDates" name="UpdateDate" value="@(Library.function.ConvertIntDateTime(editData.QueryCount*60).ToString("yyyy-MM-dd HH:mm:ss"))"
                                         lay-verify="" autocomplete="off" placeholder="请输入结束时间">
                                 </div>
                             </div>
@@ -291,10 +291,14 @@
                 elem: '#PublishDate',
                 type: 'datetime'
             });
+            laydate.render({
+                elem: '#PublishDates',
+                type: 'datetime'
+            });
 
 
             //上传文件
-            WebUploadJs('PhotoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("SchoolMorningMeetPhoto"))), function (filename) {
+            WebUploadJs('PhotoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("SchoolMorningMeetPhoto"))), function (filename) {
                 $('#PhotoImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
                 $('#Photo').val(filename);
             });

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

@@ -90,7 +90,17 @@
                             <input class="layui-input" type="text" name="UserIdMakerCode" autocomplete="off">
                         </div>
                     </div>
-
+                    <div class="layui-inline">
+                        <label class="layui-form-label">发货状态</label>
+                        <div class="layui-input-inline">
+                            <select id="StatusSelect" name="StatusSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="0">待配货</option>
+                                <option value="1">已发货</option>
+                                <option value="2">已驳回</option>
+                            </select>
+                        </div>
+                    </div>
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
                             <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询