From 68576ddad1c90760f98c51113c698ea20b0048a8 Mon Sep 17 00:00:00 2001
From: qiankunpingtai <qiankunpingtai@163.com>
Date: Thu, 28 Feb 2019 11:11:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E6=8D=AE=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E7=BC=96=E8=BE=91=E6=97=B6=E5=88=97=E8=A1=A8=E4=B8=AD?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/js/pages/materials/in_out.js | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/erp_web/js/pages/materials/in_out.js b/erp_web/js/pages/materials/in_out.js
index d556c0a0..413aae15 100644
--- a/erp_web/js/pages/materials/in_out.js
+++ b/erp_web/js/pages/materials/in_out.js
@@ -1065,7 +1065,7 @@
 					iconCls:'icon-remove',
 					handler:function()
 					{
-						removeit(); //删除	
+						batchDel(); //删除
 					}
 				},
 				{
@@ -2839,13 +2839,13 @@
 	    }
 	}
 	//删除
-	function removeit(){
-		/**
-		 * 重写一下删除的逻辑
-		 * 获取所有选中行,直接从列表中移除
-		 * 点击保存时，将需要后台删除的数据提交到服务器
-		 * **/
-		var materialData=$('#materialData');
+	function batchDel(){
+        /**
+         * 重写一下删除的逻辑
+         * 获取所有选中行,直接从列表中移除
+         * 点击保存时，将需要后台删除的数据提交到服务器
+         * **/
+        var materialData=$('#materialData');
         var row = materialData.datagrid('getChecked');
         if(row.length == 0)
         {
@@ -2864,6 +2864,12 @@
             });
         }
 	}
+	function removeit(){
+	    if (editIndex == undefined) { return }
+	    $('#materialData').datagrid('cancelEdit', editIndex)
+	            .datagrid('deleteRow', editIndex);
+	    editIndex = undefined;
+	}
 	//撤销
 	function reject() {
 	    $('#materialData').datagrid('rejectChanges');