diff --git a/erp_web/js/HoorayOS_mini/js/hros.app.js b/erp_web/js/HoorayOS_mini/js/hros.app.js
index 92b04ecb..77d8e313 100644
--- a/erp_web/js/HoorayOS_mini/js/hros.app.js
+++ b/erp_web/js/HoorayOS_mini/js/hros.app.js
@@ -15,6 +15,16 @@ HROS.app = (function(){
 		},
 		get : function(){
 			var userId = sessionStorage.getItem("userId");
+            /**
+             * create by: qiankunpingtai
+             * create time: 2019/3/20 16:26
+             * description:
+             *如果用户的id没有获取到，跳转到登录页面
+             */
+            if(userId==undefined||userId==null){
+                top.location.href = "http://" + location.host + "/login.html";
+                return;
+            }
 		    $.getJSON('../../app/findAppByUserId?userId=' + userId, function (sc) {
 				HROS.VAR.dock = sc['dock'];
 				HROS.VAR.desk = sc['desk'];
diff --git a/erp_web/js/pages/materials/in_out.js b/erp_web/js/pages/materials/in_out.js
index 430b802f..0a449c0b 100644
--- a/erp_web/js/pages/materials/in_out.js
+++ b/erp_web/js/pages/materials/in_out.js
@@ -2940,23 +2940,31 @@
          * 获取所有选中行,直接从列表中移除
          * 点击保存时，将需要后台删除的数据提交到服务器
          * **/
-        var materialData=$('#materialData');
-        var row = materialData.datagrid('getChecked');
-        if(row.length == 0)
-        {
-            $.messager.alert('删除提示','没有记录被选中！','info');
-            return;
-        }
-        if(row.length > 0)
-        {
-            $.messager.confirm('删除确认','确定要删除选中的' + row.length + '条单据信息吗？',function(r)
-            {
-                if (r) {
-                    for(var i = 0 ;i < row.length;i++) {
-                        materialData.datagrid('deleteRow',materialData.datagrid("getRowIndex",row[i]));
+        /**
+         * create by: qiankunpingtai
+         * create time: 2019/3/20 16:26
+         * description:
+         *	这个地方比较坑的，花了一个多小时才搞明白为什么
+		 *	1、删除之前必须先调用endEditing结束编辑
+		 *	2、如果只是调用endEditing结束编辑那么正在编辑行的被选中状态会被去掉
+		 *	所以要在调用endEditing先获取选中的行
+         */
+            //如果编辑的行一开始是选中状态，结束编辑后仍然是选中状态
+        var row = $('#materialData').datagrid('getChecked');
+        if (endEditing()) {
+            if (row.length == 0) {
+                $.messager.alert('删除提示', '没有记录被选中！', 'info');
+                return;
+            }
+            if (row.length > 0) {
+                $.messager.confirm('删除确认', '确定要删除选中的' + row.length + '条单据信息吗？', function (r) {
+                    if (r) {
+                        for (var i = 0; i < row.length; i++) {
+                            $('#materialData').datagrid('deleteRow', $('#materialData').datagrid("getRowIndex", row[i]));
+                        }
                     }
-                }
-            });
+                });
+            }
         }
 	}
 	function removeit(){
diff --git a/erp_web/pages/manage/organization.html b/erp_web/pages/manage/organization.html
index ff4e9332..a59dcb2d 100644
--- a/erp_web/pages/manage/organization.html
+++ b/erp_web/pages/manage/organization.html
@@ -51,7 +51,7 @@
                 <td>简称</td>
                 <td style="padding:5px">
                     <input name="orgAbr" id="orgAbr" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width: 200px;height: 20px"/>
+                           data-options="required:true,validType:'length[2,20]'" style="width: 200px;height: 20px"/>
                 </td>
             </tr>
             <tr>
@@ -69,13 +69,14 @@
                 <td>编号</td>
                 <td style="padding:5px">
                     <input name="orgNo" id="orgNo" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width: 200px;height: 20px"/>
+                           data-options="required:true,validType:'length[2,20]'" style="width: 200px;height: 20px"/>
                 </td>
             </tr>
             <tr>
                 <td>序号</td>
                 <td style="padding:5px">
-                    <input name="sort" id="sort"  style="width: 200px;height: 20px"/>
+                    <input name="sort" id="sort"  class="easyui-validatebox"
+                           data-options="required:true,validType:'length[2,20]'" style="width: 200px;height: 20px"/>
                 </td>
             </tr>
             <tr>
@@ -277,6 +278,18 @@
             $.messager.alert('提示', '编号不能为空！', 'warning');
             return;
         }
+        /**
+         * create by: qiankunpingtai
+         * create time: 2019/3/21 14:56
+         * website：http://39.105.146.63/symphony/
+         * description:
+         *  提交时需要对表格内容进行校验，校验通过后提交后台处理
+         */
+        var isValid = $("#organizationFM").form('validate');
+        if(!isValid){
+            return;
+        }
+
         var objInfo = $("#organizationFM").serializeObject();
         $.ajax({
             type: "post",
diff --git a/erp_web/pages/manage/serialNumber.html b/erp_web/pages/manage/serialNumber.html
index 022217a8..caaca1fa 100644
--- a/erp_web/pages/manage/serialNumber.html
+++ b/erp_web/pages/manage/serialNumber.html
@@ -198,12 +198,19 @@
                 {field: 'depotheadId', hidden: true},
                 {field: 'depotHeadType', hidden: true},
                 {
-                    title: '操作', field: 'op', align: "center", width: 60, formatter: function (value, rec) {
+                    title: '操作', field: 'op', align: "center", width: 60, formatter: function (value, rec,index) {
                         var str = '';
-                        var rowInfo = rec.id + 'AaBb' + rec.materialId + 'AaBb' + rec.materialName + 'AaBb' + rec.serialNumber + 'AaBb' + rec.isSell + 'AaBb' + rec.remark
-                            + 'AaBb' + rec.deleteFlag + 'AaBb' + rec.createTime + 'AaBb' + rec.updateTime + 'AaBb' + rec.creator + 'AaBb' + rec.updater
-                            + 'AaBb' + rec.creatorName + 'AaBb' + rec.updaterName +'AaBb' + rec.depotheadId+'AaBb' + rec.depotHeadNumber +'AaBb' + rec.depotHeadType;
-                        str += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editSerialNumber(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;';
+                        /**
+                         * create by: qiankunpingtai
+                         * create time: 2019/3/21 11:23
+                         * website：http://39.105.146.63/symphony/
+                         * description:
+                         *  对于每次拼接字符串作为参数传递
+                         *  再对字符串分解获取数据的方式，个人感觉效率不是很高，实现也不优雅
+                         *  在此使用传递index，然后根据index获取数据的方式替代
+                         *
+                         */
+                        str += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editSerialNumber(\'' + index + '\');"/>&nbsp;&nbsp;&nbsp;';
                         str += '<img title="删除" src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteSerialNumber(' + rec.id + ');"/>';
                         return str;
                     }
@@ -458,14 +465,14 @@
         });
     });
     //编辑信息
-    function editSerialNumber(serialNumberInfo) {
-        var serialNumberInfo = serialNumberInfo.split("AaBb");
-
-        $("#serialNumberId").focus().val(serialNumberInfo[0]);
-        $("#materialId").focus().val(serialNumberInfo[1]);
-        $("#materialName").focus().val(serialNumberInfo[2]);
-        $("#serialNumber").focus().val(serialNumberInfo[3]);
-        $("#remark").focus().val(serialNumberInfo[5]);
+    function editSerialNumber(index) {
+        //获取当前行
+        var rowsdata = $("#tableData").datagrid("getRows")[index];
+        $("#serialNumberId").val(rowsdata.serialNumberId);
+        $("#materialId").val(rowsdata.materialId);
+        $("#materialName").focus().val(rowsdata.materialName);
+        $("#serialNumber").val(rowsdata.serialNumber);
+        $("#remark").val(rowsdata.remark);
         $('#serialNumberDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑序列号信息');
         $(".window-mask").css({width: webW, height: webH});
         //选中基本资料tab