From ebfd4705580e157a478e1d9726fe3679ca6af4dc Mon Sep 17 00:00:00 2001 From: qiankunpingtai Date: Wed, 20 Mar 2019 16:32:23 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=96=B0=E5=A2=9E=E6=97=B6=E5=88=A0=E9=99=A4=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erp_web/js/pages/materials/in_out.js | 40 +++++++++++++++++----------- 1 file changed, 24 insertions(+), 16 deletions(-) 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(){ From 2dd654b3b30c2d10bb5ed132e8c3b0c3d3a7ad57 Mon Sep 17 00:00:00 2001 From: qiankunpingtai Date: Wed, 20 Mar 2019 16:48:33 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=9A=84id=E6=B2=A1=E6=9C=89=E8=8E=B7=E5=8F=96=E5=88=B0?= =?UTF-8?q?=EF=BC=8C=E8=B7=B3=E8=BD=AC=E5=88=B0=E7=99=BB=E5=BD=95=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erp_web/js/HoorayOS_mini/js/hros.app.js | 10 ++++++++++ 1 file changed, 10 insertions(+) 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']; From a003ce03e48173090ce6d4193cb9440505b400cd Mon Sep 17 00:00:00 2001 From: qiankunpingtai Date: Thu, 21 Mar 2019 11:30:30 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=B0=86=E5=AD=97=E7=AC=A6=E4=B8=B2?= =?UTF-8?q?=E4=BC=A0=E9=80=92=E5=80=BC=E7=9A=84=E6=96=B9=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=80=9A=E8=BF=87index=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erp_web/pages/manage/serialNumber.html | 33 ++++++++++++++++---------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/erp_web/pages/manage/serialNumber.html b/erp_web/pages/manage/serialNumber.html index 022217a8..f7415411 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 += '   '; + /** + * create by: qiankunpingtai + * create time: 2019/3/21 11:23 + * website：http://39.105.146.63/symphony/ + * description: + * 对于每次拼接字符串作为参数传递 + * 再对字符串分解获取数据的方式，个人感觉效率是很高，实现也不优雅 + * 在此使用传递index，然后根据index获取数据的方式替代 + * + */ + str += '   '; str += ''; 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").focus().val(rowsdata.serialNumberId); + $("#materialId").focus().val(rowsdata.materialId); + $("#materialName").focus().val(rowsdata.materialName); + $("#serialNumber").focus().val(rowsdata.serialNumber); + $("#remark").focus().val(rowsdata.remark); $('#serialNumberDlg').dialog('open').dialog('setTitle', ' 编辑序列号信息'); $(".window-mask").css({width: webW, height: webH}); //选中基本资料tab From 0cf5a5e461af5e15b630328ddde77d67a077d357 Mon Sep 17 00:00:00 2001 From: qiankunpingtai Date: Thu, 21 Mar 2019 11:42:04 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84focus()=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erp_web/pages/manage/serialNumber.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/erp_web/pages/manage/serialNumber.html b/erp_web/pages/manage/serialNumber.html index f7415411..caaca1fa 100644 --- a/erp_web/pages/manage/serialNumber.html +++ b/erp_web/pages/manage/serialNumber.html @@ -206,7 +206,7 @@ * website：http://39.105.146.63/symphony/ * description: * 对于每次拼接字符串作为参数传递 - * 再对字符串分解获取数据的方式，个人感觉效率是很高，实现也不优雅 + * 再对字符串分解获取数据的方式，个人感觉效率不是很高，实现也不优雅 * 在此使用传递index，然后根据index获取数据的方式替代 * */ @@ -468,11 +468,11 @@ function editSerialNumber(index) { //获取当前行 var rowsdata = $("#tableData").datagrid("getRows")[index]; - $("#serialNumberId").focus().val(rowsdata.serialNumberId); - $("#materialId").focus().val(rowsdata.materialId); + $("#serialNumberId").val(rowsdata.serialNumberId); + $("#materialId").val(rowsdata.materialId); $("#materialName").focus().val(rowsdata.materialName); - $("#serialNumber").focus().val(rowsdata.serialNumber); - $("#remark").focus().val(rowsdata.remark); + $("#serialNumber").val(rowsdata.serialNumber); + $("#remark").val(rowsdata.remark); $('#serialNumberDlg').dialog('open').dialog('setTitle', ' 编辑序列号信息'); $(".window-mask").css({width: webW, height: webH}); //选中基本资料tab From c1b7a36ccf7231cd22ad9411c417aae40e20a8be Mon Sep 17 00:00:00 2001 From: qiankunpingtai Date: Thu, 21 Mar 2019 15:03:50 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=B6=E5=AF=B9?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=AD=97=E6=AE=B5=E5=81=9A=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erp_web/pages/manage/organization.html | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) 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 @@ 简称 + data-options="required:true,validType:'length[2,20]'" style="width: 200px;height: 20px"/> @@ -69,13 +69,14 @@ 编号 + data-options="required:true,validType:'length[2,20]'" style="width: 200px;height: 20px"/> 序号 - + @@ -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",