From b39c4b00431736d4548c12615228b3702ae454b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 29 Dec 2020 23:16:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8D=95=E6=8D=AE=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E5=88=A0=E9=99=A4=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/js/pages/bill/in_out.js              | 17 +++--------------
 erp_web/pages/bill/allocation_out_list.html  |  3 +++
 erp_web/pages/bill/assemble_list.html        |  3 +++
 erp_web/pages/bill/disassemble_list.html     |  3 +++
 erp_web/pages/bill/other_in_list.html        |  3 +++
 erp_web/pages/bill/other_out_list.html       |  3 +++
 erp_web/pages/bill/purchase_back_list.html   |  3 +++
 erp_web/pages/bill/purchase_in_list.html     |  3 +++
 erp_web/pages/bill/purchase_orders_list.html |  3 +++
 erp_web/pages/bill/retail_back_list.html     |  3 +++
 erp_web/pages/bill/retail_out_list.html      |  3 +++
 erp_web/pages/bill/sale_back_list.html       |  3 +++
 erp_web/pages/bill/sale_orders_list.html     |  3 +++
 erp_web/pages/bill/sale_out_list.html        |  3 +++
 14 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/erp_web/js/pages/bill/in_out.js b/erp_web/js/pages/bill/in_out.js
index d46e4245..705133ca 100644
--- a/erp_web/js/pages/bill/in_out.js
+++ b/erp_web/js/pages/bill/in_out.js
@@ -1216,15 +1216,11 @@
 				}
 			},100);
 		},
+		//单行单列的点击事件
 		onClickCell: function(index, field) {
 			if (editIndex != index) {
 				if (inOutService.endEditing()) {
-					if(field == "op") {
-						$(this).datagrid('deleteRow', index);
-						var body =$("#depotHeadFM .datagrid-view2 .datagrid-body");
-						var footer =$("#depotHeadFM .datagrid-view2 .datagrid-footer");
-						inOutService.statisticsFun(body,0,0,0,footer,0);
-					} else {
+					if(field != "op") {
 						$(this).datagrid('beginEdit', index);
 						var ed = $(this).datagrid('getEditor', {index: index, field: field});
 						if(ed){
@@ -1264,6 +1260,7 @@
 					$('#materialData').datagrid('getRows')[editIndex]['AnotherDepotName'] = AnotherDepotName;
 				}
 				$('#materialData').datagrid('endEdit', editIndex);
+				this.autoReckon();
 				editIndex = undefined;
 				return true;
 			} else {
@@ -1568,10 +1565,6 @@
 					if(tipInfo){
 						if(tipInfo.code!=200){
 							$.messager.alert('提示', tipInfo.msg, 'warning');
-							for(var i=0; i<rows.length; i++){
-								$('#materialData').datagrid('selectRow', i).datagrid('beginEdit', i);
-								self.autoReckon();
-							}
 							return;
 						}
 						$.messager.alert('提示','保存成功！','info');
@@ -1613,10 +1606,6 @@
 					if(tipInfo){
 						if(tipInfo.code!=200){
 							$.messager.alert('提示', tipInfo.msg, 'warning');
-							for(var i=0; i<rows.length; i++){
-								$('#materialData').datagrid('selectRow', i).datagrid('beginEdit', i);
-								self.autoReckon();
-							}
 							return;
 						}
 						$.messager.alert('提示','保存成功！','info');
diff --git a/erp_web/pages/bill/allocation_out_list.html b/erp_web/pages/bill/allocation_out_list.html
index 0962c714..37986cb0 100644
--- a/erp_web/pages/bill/allocation_out_list.html
+++ b/erp_web/pages/bill/allocation_out_list.html
@@ -619,6 +619,9 @@
                     });
                     data.footer = array;
                     $("#materialData").datagrid('loadData',data);
+                    for(var i=0; i<data.rows.length; i++){
+                        inOutService.autoReckon();
+                    }
                     $("#depotHeadFM .datagrid-view2 .datagrid-footer").find("[field='op'] img").hide();
                     if(type === "add") {
                         $("#depotHeadDlg #append").click(); //新增行
diff --git a/erp_web/pages/bill/assemble_list.html b/erp_web/pages/bill/assemble_list.html
index 331929ee..dd50c1c6 100644
--- a/erp_web/pages/bill/assemble_list.html
+++ b/erp_web/pages/bill/assemble_list.html
@@ -604,6 +604,9 @@
                     });
                     data.footer = array;
                     $("#materialData").datagrid('loadData',data);
+                    for(var i=0; i<data.rows.length; i++){
+                        inOutService.autoReckon();
+                    }
                     $("#depotHeadFM .datagrid-view2 .datagrid-footer").find("[field='op'] img").hide();
                     if(type === "add") {
                         $("#depotHeadDlg #append").click(); //新增行
diff --git a/erp_web/pages/bill/disassemble_list.html b/erp_web/pages/bill/disassemble_list.html
index 626e3b95..fb695fce 100644
--- a/erp_web/pages/bill/disassemble_list.html
+++ b/erp_web/pages/bill/disassemble_list.html
@@ -605,6 +605,9 @@
                     });
                     data.footer = array;
                     $("#materialData").datagrid('loadData',data);
+                    for(var i=0; i<data.rows.length; i++){
+                        inOutService.autoReckon();
+                    }
                     $("#depotHeadFM .datagrid-view2 .datagrid-footer").find("[field='op'] img").hide();
                     if(type === "add") {
                         $("#depotHeadDlg #append").click(); //新增行
diff --git a/erp_web/pages/bill/other_in_list.html b/erp_web/pages/bill/other_in_list.html
index 6fa0bce8..f3d57693 100644
--- a/erp_web/pages/bill/other_in_list.html
+++ b/erp_web/pages/bill/other_in_list.html
@@ -625,6 +625,9 @@
                     });
                     data.footer = array;
                     $("#materialData").datagrid('loadData',data);
+                    for(var i=0; i<data.rows.length; i++){
+                        inOutService.autoReckon();
+                    }
                     $("#depotHeadFM .datagrid-view2 .datagrid-footer").find("[field='op'] img").hide();
                     if(type === "add") {
                         $("#depotHeadDlg #append").click(); //新增行
diff --git a/erp_web/pages/bill/other_out_list.html b/erp_web/pages/bill/other_out_list.html
index a7331e69..d0f31842 100644
--- a/erp_web/pages/bill/other_out_list.html
+++ b/erp_web/pages/bill/other_out_list.html
@@ -618,6 +618,9 @@
                     });
                     data.footer = array;
                     $("#materialData").datagrid('loadData',data);
+                    for(var i=0; i<data.rows.length; i++){
+                        inOutService.autoReckon();
+                    }
                     $("#depotHeadFM .datagrid-view2 .datagrid-footer").find("[field='op'] img").hide();
                     if(type === "add") {
                         $("#depotHeadDlg #append").click(); //新增行
diff --git a/erp_web/pages/bill/purchase_back_list.html b/erp_web/pages/bill/purchase_back_list.html
index d32c5ac6..35b808b1 100644
--- a/erp_web/pages/bill/purchase_back_list.html
+++ b/erp_web/pages/bill/purchase_back_list.html
@@ -750,6 +750,9 @@
                     });
                     data.footer = array;
                     $("#materialData").datagrid('loadData',data);
+                    for(var i=0; i<data.rows.length; i++){
+                        inOutService.autoReckon();
+                    }
                     $("#depotHeadFM .datagrid-view2 .datagrid-footer").find("[field='op'] img").hide();
                     if(type === "add") {
                         $("#depotHeadDlg #append").click(); //新增行
diff --git a/erp_web/pages/bill/purchase_in_list.html b/erp_web/pages/bill/purchase_in_list.html
index 010382a3..a75fbf1a 100644
--- a/erp_web/pages/bill/purchase_in_list.html
+++ b/erp_web/pages/bill/purchase_in_list.html
@@ -879,6 +879,9 @@
                     });
                     data.footer = array;
                     $("#materialData").datagrid('loadData',data);
+                    for(var i=0; i<data.rows.length; i++){
+                        inOutService.autoReckon();
+                    }
                     $("#depotHeadFM .datagrid-view2 .datagrid-footer").find("[field='op'] img").hide();
                     if(type === "add") {
                         $("#depotHeadDlg #append").click(); //新增行
diff --git a/erp_web/pages/bill/purchase_orders_list.html b/erp_web/pages/bill/purchase_orders_list.html
index 49676a78..a2ad5f48 100644
--- a/erp_web/pages/bill/purchase_orders_list.html
+++ b/erp_web/pages/bill/purchase_orders_list.html
@@ -706,6 +706,9 @@
                     });
                     data.footer = array;
                     $("#materialData").datagrid('loadData',data);
+                    for(var i=0; i<data.rows.length; i++){
+                        inOutService.autoReckon();
+                    }
                     $("#depotHeadFM .datagrid-view2 .datagrid-footer").find("[field='op'] img").hide();
                     if(type === "add") {
                         $("#depotHeadDlg #append").click(); //新增行
diff --git a/erp_web/pages/bill/retail_back_list.html b/erp_web/pages/bill/retail_back_list.html
index ab7d071d..3d08aabc 100644
--- a/erp_web/pages/bill/retail_back_list.html
+++ b/erp_web/pages/bill/retail_back_list.html
@@ -766,6 +766,9 @@
                     });
                     data.footer = array;
                     $("#materialData").datagrid('loadData',data);
+                    for(var i=0; i<data.rows.length; i++){
+                        inOutService.autoReckon();
+                    }
                     $("#depotHeadFM .datagrid-view2 .datagrid-footer").find("[field='op'] img").hide();
                     if(type === "add") {
                         $("#depotHeadDlg #append").click(); //新增行
diff --git a/erp_web/pages/bill/retail_out_list.html b/erp_web/pages/bill/retail_out_list.html
index 43177e12..069f5031 100644
--- a/erp_web/pages/bill/retail_out_list.html
+++ b/erp_web/pages/bill/retail_out_list.html
@@ -801,6 +801,9 @@
                     });
                     data.footer = array;
                     $("#materialData").datagrid('loadData',data);
+                    for(var i=0; i<data.rows.length; i++){
+                        inOutService.autoReckon();
+                    }
                     $("#depotHeadFM .datagrid-view2 .datagrid-footer").find("[field='op'] img").hide();
                     if(type === "add") {
                         $("#depotHeadDlg #append").click(); //新增行
diff --git a/erp_web/pages/bill/sale_back_list.html b/erp_web/pages/bill/sale_back_list.html
index 7b8fd8ca..6e55714f 100644
--- a/erp_web/pages/bill/sale_back_list.html
+++ b/erp_web/pages/bill/sale_back_list.html
@@ -792,6 +792,9 @@
                     });
                     data.footer = array;
                     $("#materialData").datagrid('loadData',data);
+                    for(var i=0; i<data.rows.length; i++){
+                        inOutService.autoReckon();
+                    }
                     $("#depotHeadFM .datagrid-view2 .datagrid-footer").find("[field='op'] img").hide();
                     if(type === "add") {
                         $("#depotHeadDlg #append").click(); //新增行
diff --git a/erp_web/pages/bill/sale_orders_list.html b/erp_web/pages/bill/sale_orders_list.html
index 7cc971ae..5b336548 100644
--- a/erp_web/pages/bill/sale_orders_list.html
+++ b/erp_web/pages/bill/sale_orders_list.html
@@ -750,6 +750,9 @@
                     });
                     data.footer = array;
                     $("#materialData").datagrid('loadData',data);
+                    for(var i=0; i<data.rows.length; i++){
+                        inOutService.autoReckon();
+                    }
                     $("#depotHeadFM .datagrid-view2 .datagrid-footer").find("[field='op'] img").hide();
                     if(type === "add") {
                         $("#depotHeadDlg #append").click(); //新增行
diff --git a/erp_web/pages/bill/sale_out_list.html b/erp_web/pages/bill/sale_out_list.html
index 1a98d7cd..dcf6e34f 100644
--- a/erp_web/pages/bill/sale_out_list.html
+++ b/erp_web/pages/bill/sale_out_list.html
@@ -956,6 +956,9 @@
                     });
                     data.footer = array;
                     $("#materialData").datagrid('loadData',data);
+                    for(var i=0; i<data.rows.length; i++){
+                        inOutService.autoReckon();
+                    }
                     $("#depotHeadFM .datagrid-view2 .datagrid-footer").find("[field='op'] img").hide();
                     if(type === "add") {
                         $("#depotHeadDlg #append").click(); //新增行