姜永辉 6 ماه پیش
والد
کامیت
8f9c1524fb

+ 1 - 1
wwwroot/mes/mst/holiday/holiday.ashx

@@ -48,7 +48,7 @@ public class post : IHttpHandler, IReadOnlySessionState
                 case "a":
                     {
                         //添加
-                        if (b.btnDetail && context.Request["id"].ToString() != "")
+                        if (b.btnDetail && context.Request["id"] != null)
                             context.Response.Write(detail());
                         else
                         {

+ 98 - 4
wwwroot/mes/mst/holiday/holiday_add.html

@@ -9,7 +9,7 @@
     <script src="/plugins/xeasyui/xeasyui.min.js"></script>
 </head>
 <body class="easyui-layout">
-   
+
     <div data-options="region:'center',plain:true,border:false">
         <form id="ff" method="post" class="w-form">
             <div class="w-div">
@@ -27,17 +27,25 @@
             <div id="more2" style="display:block;">
                 <div class="w-div">
                     <div class="w-fieldname">节假日(用逗号分开):</div>
-                    <div class="w-field"><input class="easyui-textbox" type="text" multiple="true" id="HOLIDAY" name="HOLIDAY" data-options="required:false,prompt:'请填写HOLIDAY...',tipPosition:'top'" style="width:100%;height:100px;"></div>
+                    <input id="ProductDate" type="text" class="easyui-textbox" style="width:355px;height:28px;padding: 3px 5px;" data-options="editable:false,required:true">
+                    <div class="date-hide" onclick="showDate()"></div>
+                    <div class="date-ok" onclick="hideDate()">确认</div>
+
+                    <div class="w-field"><input class="easyui-textbox" type="text" id="HOLIDAY" name="HOLIDAY" data-options="required:false,prompt:'请填写HOLIDAY...',tipPosition:'top'" style="width:100%;height:100px;"></div>
                 </div>
                 <div class="w-div">
                     <div class="w-fieldname">串休日期(用逗号分开):</div>
-                    <div class="w-field"> 
-                        <input class="editor-text-area" id="SHIFTSCHEDULE" name="SHIFTSCHEDULE"  multiple="true"  data-options="required:false,prompt:'请填写SHIFTSCHEDULE...',tipPosition:'top'" style="width:100%;height:100px;" />
+                    <div class="w-field">
+                        <input class="editor-text-area" id="SHIFTSCHEDULE" name="SHIFTSCHEDULE" data-options="required:false,prompt:'请填写SHIFTSCHEDULE...',tipPosition:'top'" style="width:100%;height:100px;" />
                     </div>
                 </div>
             </div>
         </form>
     </div>
+
+    <div id="date-panel">
+        <div id="cc" style="width:180px;height:180px;"></div>
+    </div>
     <div data-options="region:'south',border:false" class="w-bar">
         <a href="javascript:void(0)" id="tbSave" class="easyui-linkbutton" data-options="iconCls:'icon-save'" onclick="submitForm()">保存</a>
         <a href="javascript:void(0)" id="tbClose" class="easyui-linkbutton" data-options="iconCls:'icon-cancel'" onclick="cancelForm()">关闭</a>
@@ -50,6 +58,7 @@
                 url: 'holiday.ashx?m=a'
             });
             $('#more1').toggle();
+            loadinit();
         });
 
         function submitForm() {
@@ -63,6 +72,91 @@
             $.dialog.close();
         }
 
+        function loadinit() {
+            $('#cc').calendar({
+                current: new Date(),
+                validator: function (day) {
+                    var current = new Date();
+                    return day > new Date(current.getFullYear(), current.getMonth(), current.getDate() - 1);
+                },
+                onSelect: function (date) {
+                    //获取点击选择的日期
+                    var y = date.getFullYear();
+                    var m = date.getMonth() + 1;
+                    var d = date.getDate();
+                    //判断点击选择的日期是否存在于已选日期中
+                    var dateSelect = y + "-" + m + "-" + d;
+                    var index = DateList.indexOf(dateSelect);
+                    if (index == -1) {
+                        //不存在,则加入
+                        DateList.push(dateSelect);
+                    } else {
+                        //存在,则删除
+                        DateList.splice(index, 1);
+                    }
+                    //已选中的日期在日历中显示选中状态
+                    $('#cc').calendar({
+                        //遍历当前日历中的所有日期
+                        formatter: function (date) {
+                            var y1 = date.getFullYear();
+                            var m1 = date.getMonth() + 1;
+                            var d1 = date.getDate();
+                            //判断该日期是否存在于已选日期中
+                            var yy = y1 + "-" + m1 + "-" + d1;
+                            var index = DateList.indexOf(yy);
+                            if (index == -1) {
+                                //不存在,则返回日,正常显示
+                                return d1;
+                            } else {
+                                //存在,则加上选中的图标
+                                return '<div class="icon-ok md">' + d1 + '</div>';
+                            }
+                        }
+                    });
+                    //选中的日期显示在文本框中
+                    $("#ProductDate").textbox("setText", DateList);
+                },
+            });
+
+        }
+
     </script>
+
+    <style type="text/css">
+        #date-panel {
+            display: none;
+            position: absolute;
+            height: 180px;
+            width: 180px;
+            z-index: 999;
+            top: 70px;
+            left: 36%;
+        }
+
+        .date-ok {
+            position: absolute;
+            background-color: #f3f3f3;
+            font-size: 12px;
+            bottom: 11px;
+            right: 253px;
+            border-radius: 3px;
+            padding: 5px 7px;
+        }
+
+            .date-ok:hover {
+                cursor: pointer;
+            }
+
+        .date-hide {
+            position: absolute;
+            background-color: #fff;
+            height: 26px;
+            width: 310px;
+            bottom: 11px;
+            z-index: 999;
+            opacity: 0;
+        }
+    </style>
+
 </body>
 </html>

+ 46 - 43
wwwroot/mes/mst/user/right.ashx

@@ -20,13 +20,13 @@ public class userright : IHttpHandler, IReadOnlySessionState
 
         string jsonStr = "";
         string userId = context.Request["id"].ToString();
-
-        using(IDataAccess conn = DataAccess.Create())
+        string userIds = context.Request["userIds"].ToString();
+        using (IDataAccess conn = DataAccess.Create())
         {
             conn.BeginTransaction();
 
             //读取权限
-            if(context.Request["m"].ToString() == "t")
+            if (context.Request["m"].ToString() == "t")
             {
                 //取用户权限
                 string rightStr = conn.ExecuteScalar(@"
@@ -38,7 +38,7 @@ public class userright : IHttpHandler, IReadOnlySessionState
 	                        USERID = @USERID@
                             AND FUNCTIONCODE IN (SELECT FUNCTIONCODE FROM TP_SYS_FUNCTION WHERE IS_WEB = '1')
                         ",
-                        new CDAParameter("USERID",userId)
+                        new CDAParameter("USERID", userId)
                     ).ToString();
 
                 //取操作仓库范围权限
@@ -51,88 +51,91 @@ public class userright : IHttpHandler, IReadOnlySessionState
 	                        PURVIEWTYPE = 14
 	                        AND USERID = @USERID@
                         ",
-                        new CDAParameter("USERID",userId)
+                        new CDAParameter("USERID", userId)
                     ).ToString();
 
                 //输出权限
                 JArray array = new JArray();
                 JObject json = new JObject(
-                    new JProperty("right",rightStr),
-                    new JProperty("purviewWareHouse",purviewWareHouseStr)
+                    new JProperty("right", (string.IsNullOrEmpty(userIds) || !userIds.Contains(",")) ? rightStr : ""),
+                    new JProperty("purviewWareHouse", purviewWareHouseStr)
                     );
                 array.Add(json);
                 jsonStr = new JsonResult(array).ToJson();
             }
 
             //修改权限 仅限WEB权限处理
-            if(context.Request["m"].ToString() == "u")
+            if (context.Request["m"].ToString() == "u")
             {
-                //删除功能权限 TP_MST_USERRIGHT
-                conn.ExecuteNonQuery(@"
+                string[] uidArray = userIds.Split(',');
+                for (int m = 0; m < uidArray.Length; m++)
+                {
+                    //删除功能权限 TP_MST_USERRIGHT
+                    conn.ExecuteNonQuery(@"
                     DELETE TP_MST_USERRIGHT 
                     WHERE
 	                    FUNCTIONCODE IN ( SELECT FUNCTIONCODE FROM TP_SYS_FUNCTION WHERE FUNCTIONCODE LIKE '80%' ) 
 	                    AND USERID = @USERID@
                     ",
-                    new CDAParameter("USERID",userId)
-                );
-                //写入功能权限
-                if(context.Request["right"] is object)
-                {
-                    string right = context.Request["right"].ToString();
-                    string[] rightArray = right.Split(',');
-                    for(int i=0;i<rightArray.Length;i++)
+                        new CDAParameter("USERID", uidArray[m])
+                    );
+                    //写入功能权限
+                    if (context.Request["right"] is object)
                     {
-                        if (rightArray[i] != "")
+                        string right = context.Request["right"].ToString();
+                        string[] rightArray = right.Split(',');
+                        for (int i = 0; i < rightArray.Length; i++)
                         {
-                            conn.ExecuteNonQuery(@"
+                            if (rightArray[i] != "")
+                            {
+                                conn.ExecuteNonQuery(@"
                                 INSERT INTO TP_MST_USERRIGHT 
                                     (  USERID,   FUNCTIONCODE,  CREATETIME,  CREATEUSERID )
                                 VALUES
 	                                ( @USERID@, @FUNCTIONCODE@, SYSDATE,    @CREATEUSERID@ )
                             ",
-                            new CDAParameter("USERID", userId),
-                            new CDAParameter("FUNCTIONCODE", rightArray[i]),
-                            new CDAParameter("CREATEUSERID", context.Session["userId"])
-                            );
+                                new CDAParameter("USERID", uidArray[m]),
+                                new CDAParameter("FUNCTIONCODE", rightArray[i]),
+                                new CDAParameter("CREATEUSERID", context.Session["userId"])
+                                );
+                            }
                         }
                     }
-                }
 
 
-                //删除范围权限 TP_MST_USERPURVIEW
-                conn.ExecuteNonQuery(@"
+                    //删除范围权限 TP_MST_USERPURVIEW
+                    conn.ExecuteNonQuery(@"
                     DELETE TP_MST_USERPURVIEW 
                     WHERE
 	                    PURVIEWTYPE = 14 
 	                    AND USERID = @USERID@
                     ",
-                    new CDAParameter("USERID",userId)
-                );
-                //写入范围权限
-                if(context.Request["purviewWareHouse"] is object)
-                {
-                    string purviewWareHouse = context.Request["purviewWareHouse"].ToString();
-                    string[] purviewWareHouseArray = purviewWareHouse.Split(',');
-                    for(int i=0;i<purviewWareHouseArray.Length;i++)
+                        new CDAParameter("USERID", uidArray[m])
+                    );
+                    //写入范围权限
+                    if (context.Request["purviewWareHouse"] is object)
                     {
-                        if (purviewWareHouseArray[i] != "")
+                        string purviewWareHouse = context.Request["purviewWareHouse"].ToString();
+                        string[] purviewWareHouseArray = purviewWareHouse.Split(',');
+                        for (int i = 0; i < purviewWareHouseArray.Length; i++)
                         {
-                            conn.ExecuteNonQuery(@"
+                            if (purviewWareHouseArray[i] != "")
+                            {
+                                conn.ExecuteNonQuery(@"
                                 INSERT INTO TP_MST_USERPURVIEW 
                                     (  USERID,   PURVIEWID, PURVIEWTYPE,  CREATETIME,  CREATEUSERID )
                                 VALUES
 	                                ( @USERID@, @PURVIEWID@,14,           SYSDATE,    @CREATEUSERID@ )
                             ",
-                            new CDAParameter("USERID", userId),
-                            new CDAParameter("PURVIEWID", purviewWareHouseArray[i]),
-                            new CDAParameter("CREATEUSERID", context.Session["userId"])
-                            );
+                                new CDAParameter("USERID", uidArray[m]),
+                                new CDAParameter("PURVIEWID", purviewWareHouseArray[i]),
+                                new CDAParameter("CREATEUSERID", context.Session["userId"])
+                                );
+                            }
                         }
                     }
-                }
-
 
+                }
 
                 jsonStr = new JsonResult(JsonStatus.success).ToJson();
                 conn.Commit();

+ 9 - 2
wwwroot/mes/mst/user/user_index.html

@@ -133,7 +133,7 @@
         }
 
         //修改按钮
-        function tbEdit() {
+        function tbEdit() {           
             $('#dg').datagridDialog({
                 title: '修改数据',
                 width: 640,
@@ -165,11 +165,18 @@
 
         //功能权限
         function tbRight() {
+            var result = new Array();
+            $($("#dg").datagrid("getSelections")).each(function (i, o) {
+                result.push(o.USERID)
+            })
+            
+            var userIds = result.join(",");//获取选中后的工单id
+            console.log('tbEdit', result, userIds)
             $('#dg').datagridDialog({
                 title: '功能权限',
                 width: 640,
                 height: 600,
-                url: 'user_right.html',
+                url: 'user_right.html?userIds=' + userIds,
                 requireSelect: true
             });
         }

+ 3 - 3
wwwroot/mes/mst/user/user_right.html

@@ -49,15 +49,15 @@
 
         $(function () {
             $('#ff').formLoad({
-                url: 'right.ashx?m=t'
+                url: 'right.ashx?m=t' + "&userIds=" + request('userIds')
             });
-            $('#more1').toggle();
+            $('#more1').toggle(); 
         });
 
         function submitForm() {
             $.dialog.save({
                 formid: 'ff',
-                url: 'right.ashx?m=u&id=' + request('id')
+                url: 'right.ashx?m=u&id=' + request('id') + "&userIds=" + request('userIds')
             });
         }