From 326ff097330956538e8110152d7c37bb0673eff5 Mon Sep 17 00:00:00 2001
From: qiankunpingtai <qiankunpingtai@163.com>
Date: Fri, 24 May 2019 09:15:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98=E6=97=B6js?=
 =?UTF-8?q?=E5=87=BA=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/js/pages/materials/allocation_out_list.js  | 6 ++++--
 erp_web/js/pages/materials/assemble_list.js        | 6 ++++--
 erp_web/js/pages/materials/disassemble_list.js     | 6 ++++--
 erp_web/js/pages/materials/other_in_list.js        | 6 ++++--
 erp_web/js/pages/materials/other_out_list.js       | 6 ++++--
 erp_web/js/pages/materials/purchase_back_list.js   | 6 ++++--
 erp_web/js/pages/materials/purchase_in_list.js     | 6 ++++--
 erp_web/js/pages/materials/purchase_orders_list.js | 6 ++++--
 erp_web/js/pages/materials/retail_back_list.js     | 6 ++++--
 erp_web/js/pages/materials/retail_out_list.js      | 6 ++++--
 erp_web/js/pages/materials/sale_back_list.js       | 6 ++++--
 erp_web/js/pages/materials/sale_orders_list.js     | 6 ++++--
 erp_web/js/pages/materials/sale_out_list.js        | 6 ++++--
 13 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/erp_web/js/pages/materials/allocation_out_list.js b/erp_web/js/pages/materials/allocation_out_list.js
index cf98c8a0..7b028507 100644
--- a/erp_web/js/pages/materials/allocation_out_list.js
+++ b/erp_web/js/pages/materials/allocation_out_list.js
@@ -1530,6 +1530,10 @@ function bindEvent(){
                     return;
                 }
             }
+            if (editIndex != undefined) {
+                $('#materialData').datagrid('endEdit', editIndex);
+                editIndex = undefined;
+            }
             //进行明细的校验
             if(depotHeadID ==0) {
                 //新增模式下
@@ -2258,8 +2262,6 @@ function reject() {
 }
 //判断
 function CheckData(type) {
-    append();
-    removeit();
     var change = $('#materialData').datagrid('getChanges').length;
     if(type =="add" && !change) {
         $.messager.alert('提示','请输入明细信息！','warning');
diff --git a/erp_web/js/pages/materials/assemble_list.js b/erp_web/js/pages/materials/assemble_list.js
index 6b728d52..740d8162 100644
--- a/erp_web/js/pages/materials/assemble_list.js
+++ b/erp_web/js/pages/materials/assemble_list.js
@@ -1529,6 +1529,10 @@ function bindEvent(){
                     return;
                 }
             }
+            if (editIndex != undefined) {
+                $('#materialData').datagrid('endEdit', editIndex);
+                editIndex = undefined;
+            }
             //进行明细的校验
             if(depotHeadID ==0) {
                 //新增模式下
@@ -2213,8 +2217,6 @@ function reject() {
 }
 //判断
 function CheckData(type) {
-    append();
-    removeit();
     var change = $('#materialData').datagrid('getChanges').length;
     if(type =="add" && !change) {
         $.messager.alert('提示','请输入明细信息！','warning');
diff --git a/erp_web/js/pages/materials/disassemble_list.js b/erp_web/js/pages/materials/disassemble_list.js
index c6100282..c87b105d 100644
--- a/erp_web/js/pages/materials/disassemble_list.js
+++ b/erp_web/js/pages/materials/disassemble_list.js
@@ -1533,6 +1533,10 @@ function bindEvent(){
                     return;
                 }
             }
+            if (editIndex != undefined) {
+                $('#materialData').datagrid('endEdit', editIndex);
+                editIndex = undefined;
+            }
             //进行明细的校验
             if(depotHeadID ==0) {
                 //新增模式下
@@ -2217,8 +2221,6 @@ function reject() {
 }
 //判断
 function CheckData(type) {
-    append();
-    removeit();
     var change = $('#materialData').datagrid('getChanges').length;
     if(type =="add" && !change) {
         $.messager.alert('提示','请输入明细信息！','warning');
diff --git a/erp_web/js/pages/materials/other_in_list.js b/erp_web/js/pages/materials/other_in_list.js
index 5540ceb4..c58b9b5a 100644
--- a/erp_web/js/pages/materials/other_in_list.js
+++ b/erp_web/js/pages/materials/other_in_list.js
@@ -1534,6 +1534,10 @@ function bindEvent(){
                 $.messager.alert('提示','请选择往来单位！','warning');
                 return;
             }
+            if (editIndex != undefined) {
+                $('#materialData').datagrid('endEdit', editIndex);
+                editIndex = undefined;
+            }
             //进行明细的校验
             if(depotHeadID ==0) {
                 //新增模式下
@@ -2300,8 +2304,6 @@ function reject() {
 }
 //判断
 function CheckData(type) {
-    append();
-    removeit();
     var change = $('#materialData').datagrid('getChanges').length;
     if(type =="add" && !change) {
         $.messager.alert('提示','请输入明细信息！','warning');
diff --git a/erp_web/js/pages/materials/other_out_list.js b/erp_web/js/pages/materials/other_out_list.js
index a3352c8a..13cdbd06 100644
--- a/erp_web/js/pages/materials/other_out_list.js
+++ b/erp_web/js/pages/materials/other_out_list.js
@@ -1527,6 +1527,10 @@ function bindEvent(){
                 $.messager.alert('提示','请选择往来单位！','warning');
                 return;
             }
+            if (editIndex != undefined) {
+                $('#materialData').datagrid('endEdit', editIndex);
+                editIndex = undefined;
+            }
             //进行明细的校验
             if(depotHeadID ==0) {
                 //新增模式下
@@ -2254,8 +2258,6 @@ function reject() {
 }
 //判断
 function CheckData(type) {
-    append();
-    removeit();
     var change = $('#materialData').datagrid('getChanges').length;
     if(type =="add" && !change) {
         $.messager.alert('提示','请输入明细信息！','warning');
diff --git a/erp_web/js/pages/materials/purchase_back_list.js b/erp_web/js/pages/materials/purchase_back_list.js
index ddc1ac47..11fc80bf 100644
--- a/erp_web/js/pages/materials/purchase_back_list.js
+++ b/erp_web/js/pages/materials/purchase_back_list.js
@@ -1566,6 +1566,10 @@ function bindEvent(){
                 $.messager.alert('提示','请选择收款账户！','warning');
                 return;
             }
+            if (editIndex != undefined) {
+                $('#materialData').datagrid('endEdit', editIndex);
+                editIndex = undefined;
+            }
             //进行明细的校验
             if(depotHeadID ==0) {
                 //新增模式下
@@ -2294,8 +2298,6 @@ function reject() {
 }
 //判断
 function CheckData(type) {
-    append();
-    removeit();
     var change = $('#materialData').datagrid('getChanges').length;
     if(type =="add" && !change) {
         $.messager.alert('提示','请输入明细信息！','warning');
diff --git a/erp_web/js/pages/materials/purchase_in_list.js b/erp_web/js/pages/materials/purchase_in_list.js
index 0da74195..3b52af48 100644
--- a/erp_web/js/pages/materials/purchase_in_list.js
+++ b/erp_web/js/pages/materials/purchase_in_list.js
@@ -1556,6 +1556,10 @@ function bindEvent(){
                 $.messager.alert('提示','请选择结算账户！','warning');
                 return;
             }
+            if (editIndex != undefined) {
+                $('#materialData').datagrid('endEdit', editIndex);
+                editIndex = undefined;
+            }
             //进行明细的校验
             if(depotHeadID ==0) {
                 //新增模式下
@@ -2326,8 +2330,6 @@ function reject() {
 }
 //判断
 function CheckData(type) {
-    append();
-    removeit();
     var change = $('#materialData').datagrid('getChanges').length;
     if(type =="add" && !change) {
         $.messager.alert('提示','请输入明细信息！','warning');
diff --git a/erp_web/js/pages/materials/purchase_orders_list.js b/erp_web/js/pages/materials/purchase_orders_list.js
index ad351497..84464c96 100644
--- a/erp_web/js/pages/materials/purchase_orders_list.js
+++ b/erp_web/js/pages/materials/purchase_orders_list.js
@@ -1551,6 +1551,10 @@ function bindEvent(){
                 $.messager.alert('提示','请选择供应商！','warning');
                 return;
             }
+            if (editIndex != undefined) {
+                $('#materialData').datagrid('endEdit', editIndex);
+                editIndex = undefined;
+            }
             //进行明细的校验
             if(depotHeadID ==0) {
                 //新增模式下
@@ -2322,8 +2326,6 @@ function reject() {
 }
 //判断
 function CheckData(type) {
-    append();
-    removeit();
     var change = $('#materialData').datagrid('getChanges').length;
     if(type =="add" && !change) {
         $.messager.alert('提示','请输入明细信息！','warning');
diff --git a/erp_web/js/pages/materials/retail_back_list.js b/erp_web/js/pages/materials/retail_back_list.js
index c546a04f..80bb0186 100644
--- a/erp_web/js/pages/materials/retail_back_list.js
+++ b/erp_web/js/pages/materials/retail_back_list.js
@@ -1642,6 +1642,10 @@ function bindEvent(){
                 $.messager.alert('提示','请选择付款账户！','warning');
                 return;
             }
+            if (editIndex != undefined) {
+                $('#materialData').datagrid('endEdit', editIndex);
+                editIndex = undefined;
+            }
             //进行明细的校验
             if(depotHeadID ==0) {
                 //新增模式下
@@ -2378,8 +2382,6 @@ function reject() {
 }
 //判断
 function CheckData(type) {
-    append();
-    removeit();
     var change = $('#materialData').datagrid('getChanges').length;
     if(type =="add" && !change) {
         $.messager.alert('提示','请输入明细信息！','warning');
diff --git a/erp_web/js/pages/materials/retail_out_list.js b/erp_web/js/pages/materials/retail_out_list.js
index aaec811c..6e5c4d13 100644
--- a/erp_web/js/pages/materials/retail_out_list.js
+++ b/erp_web/js/pages/materials/retail_out_list.js
@@ -1670,6 +1670,10 @@ function bindEvent(){
                     $.messager.alert('提示', '选择多账户时的找零金额不能大于0！', 'warning');
                     return;
                 }
+            if (editIndex != undefined) {
+                $('#materialData').datagrid('endEdit', editIndex);
+                editIndex = undefined;
+            }
             //进行明细的校验
             if(depotHeadID ==0) {
                 //新增模式下
@@ -2440,8 +2444,6 @@ function reject() {
 }
 //判断
 function CheckData(type) {
-    append();
-    removeit();
     var change = $('#materialData').datagrid('getChanges').length;
     if(type =="add" && !change) {
         $.messager.alert('提示','请输入明细信息！','warning');
diff --git a/erp_web/js/pages/materials/sale_back_list.js b/erp_web/js/pages/materials/sale_back_list.js
index 69f46b5c..0a8faa0c 100644
--- a/erp_web/js/pages/materials/sale_back_list.js
+++ b/erp_web/js/pages/materials/sale_back_list.js
@@ -1601,6 +1601,10 @@ function bindEvent(){
                     $.messager.alert('提示','请选择付款账户！','warning');
                     return;
                 }
+            if (editIndex != undefined) {
+                $('#materialData').datagrid('endEdit', editIndex);
+                editIndex = undefined;
+            }
             //进行明细的校验
             if(depotHeadID ==0) {
                 //新增模式下
@@ -2349,8 +2353,6 @@ function reject() {
 }
 //判断
 function CheckData(type) {
-    append();
-    removeit();
     var change = $('#materialData').datagrid('getChanges').length;
     if(type =="add" && !change) {
         $.messager.alert('提示','请输入明细信息！','warning');
diff --git a/erp_web/js/pages/materials/sale_orders_list.js b/erp_web/js/pages/materials/sale_orders_list.js
index a68af91e..486d9847 100644
--- a/erp_web/js/pages/materials/sale_orders_list.js
+++ b/erp_web/js/pages/materials/sale_orders_list.js
@@ -1553,6 +1553,10 @@ function bindEvent(){
                 $.messager.alert('提示','请选择购买单位！','warning');
                 return;
             }
+            if (editIndex != undefined) {
+                $('#materialData').datagrid('endEdit', editIndex);
+                editIndex = undefined;
+            }
             //进行明细的校验
             if(depotHeadID ==0) {
                 //新增模式下
@@ -2319,8 +2323,6 @@ function reject() {
 }
 //判断
 function CheckData(type) {
-    append();
-    removeit();
     var change = $('#materialData').datagrid('getChanges').length;
     if(type =="add" && !change) {
         $.messager.alert('提示','请输入明细信息！','warning');
diff --git a/erp_web/js/pages/materials/sale_out_list.js b/erp_web/js/pages/materials/sale_out_list.js
index b437009d..76b4506a 100644
--- a/erp_web/js/pages/materials/sale_out_list.js
+++ b/erp_web/js/pages/materials/sale_out_list.js
@@ -1595,6 +1595,10 @@ function bindEvent(){
                 $.messager.alert('提示','请选择收款账户！','warning');
                 return;
             }
+            if (editIndex != undefined) {
+                $('#materialData').datagrid('endEdit', editIndex);
+                editIndex = undefined;
+            }
             //进行明细的校验
             if(depotHeadID ==0) {
                 //新增模式下
@@ -2417,8 +2421,6 @@ function reject() {
 }
 //判断
 function CheckData(type) {
-    append();
-    removeit();
     var change = $('#materialData').datagrid('getChanges').length;
     if(type =="add" && !change) {
         $.messager.alert('提示','请输入明细信息！','warning');