diff --git a/erp_web/js/pages/bill/in_out.js b/erp_web/js/pages/bill/in_out.js
index 5a76cb05..37e16ebe 100644
--- a/erp_web/js/pages/bill/in_out.js
+++ b/erp_web/js/pages/bill/in_out.js
@@ -1215,18 +1215,6 @@
 				});
 			}
 		},
-		//单行删除明细
-		removeit: function () {
-			if (editIndex == undefined) { return }
-			$('#materialData').datagrid('cancelEdit', editIndex)
-				.datagrid('deleteRow', editIndex);
-			editIndex = undefined;
-		},
-		//撤销明细
-		reject: function () {
-			$('#materialData').datagrid('rejectChanges');
-			editIndex = undefined;
-		},
 		//新增仓库
 		appendDepot: function () {
 			$('#depotDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/edit_add.png"/>&nbsp;增加仓库信息');
diff --git a/erp_web/pages/bill/allocation_out_list.html b/erp_web/pages/bill/allocation_out_list.html
index 63146bab..73197408 100644
--- a/erp_web/pages/bill/allocation_out_list.html
+++ b/erp_web/pages/bill/allocation_out_list.html
@@ -274,7 +274,6 @@
         } else {
             initTableData_material("add"); //商品列表
         }
-        inOutService.reject(); //撤销下、刷新商品列表
         function supplierDlgFun(type) {
             $('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui/themes/icons/edit_add.png"/>&nbsp;增加' + type + '信息');
             $('#supplierFM').form('clear');
@@ -344,7 +343,6 @@
             $("#OtherMoney").attr("data-itemArr",JSON.stringify(itemArr)).attr("data-itemMoneyArr",itemMoneyArr);  //json数据存储
         }
         initTableData_material("edit",TotalPrice); //商品列表
-        inOutService.reject(); //撤销下、刷新商品列表
         url = '/depotHead/updateDepotHeadAndDetail?id=' + res.id; //更新接口
     }
     //查看信息
@@ -568,14 +566,6 @@
                         inOutService.batchDel(); //删除行
                     }
                 },
-                {
-                    id:'reject',
-                    text:'撤销',
-                    iconCls:'icon-undo',
-                    handler:function() {
-                        inOutService.reject(); //撤销
-                    }
-                },
                 {
                     id:'appendDepot',
                     text:'新增仓库',
diff --git a/erp_web/pages/bill/assemble_list.html b/erp_web/pages/bill/assemble_list.html
index 89728d3f..c95e8690 100644
--- a/erp_web/pages/bill/assemble_list.html
+++ b/erp_web/pages/bill/assemble_list.html
@@ -273,7 +273,6 @@
         } else {
             initTableData_material("add"); //商品列表
         }
-        inOutService.reject(); //撤销下、刷新商品列表
         function supplierDlgFun(type) {
             $('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui/themes/icons/edit_add.png"/>&nbsp;增加' + type + '信息');
             $('#supplierFM').form('clear');
@@ -342,7 +341,6 @@
             $("#OtherMoney").attr("data-itemArr",JSON.stringify(itemArr)).attr("data-itemMoneyArr",itemMoneyArr);  //json数据存储
         }
         initTableData_material("edit",TotalPrice); //商品列表
-        inOutService.reject(); //撤销下、刷新商品列表
         url = '/depotHead/updateDepotHeadAndDetail?id=' + res.id; //更新接口
     }
     //查看信息
@@ -552,14 +550,6 @@
                         inOutService.batchDel(); //删除行
                     }
                 },
-                {
-                    id:'reject',
-                    text:'撤销',
-                    iconCls:'icon-undo',
-                    handler:function() {
-                        inOutService.reject(); //撤销
-                    }
-                },
                 {
                     id:'appendDepot',
                     text:'新增仓库',
diff --git a/erp_web/pages/bill/disassemble_list.html b/erp_web/pages/bill/disassemble_list.html
index 7885556c..f3d0f03e 100644
--- a/erp_web/pages/bill/disassemble_list.html
+++ b/erp_web/pages/bill/disassemble_list.html
@@ -273,7 +273,6 @@
         } else {
             initTableData_material("add"); //商品列表
         }
-        inOutService.reject(); //撤销下、刷新商品列表
         function supplierDlgFun(type) {
             $('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui/themes/icons/edit_add.png"/>&nbsp;增加' + type + '信息');
             $('#supplierFM').form('clear');
@@ -343,7 +342,6 @@
             $("#OtherMoney").attr("data-itemArr",JSON.stringify(itemArr)).attr("data-itemMoneyArr",itemMoneyArr);  //json数据存储
         }
         initTableData_material("edit",TotalPrice); //商品列表
-        inOutService.reject(); //撤销下、刷新商品列表
         url = '/depotHead/updateDepotHeadAndDetail?id=' + res.id; //更新接口
     }
     //查看信息
@@ -553,14 +551,6 @@
                         inOutService.batchDel(); //删除行
                     }
                 },
-                {
-                    id:'reject',
-                    text:'撤销',
-                    iconCls:'icon-undo',
-                    handler:function() {
-                        inOutService.reject(); //撤销
-                    }
-                },
                 {
                     id:'appendDepot',
                     text:'新增仓库',
diff --git a/erp_web/pages/bill/other_in_list.html b/erp_web/pages/bill/other_in_list.html
index 503c33fd..666aeca5 100644
--- a/erp_web/pages/bill/other_in_list.html
+++ b/erp_web/pages/bill/other_in_list.html
@@ -286,7 +286,6 @@
         } else {
             initTableData_material("add"); //商品列表
         }
-        inOutService.reject(); //撤销下、刷新商品列表
         function supplierDlgFun(type) {
             $('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui/themes/icons/edit_add.png"/>&nbsp;增加' + type + '信息');
             $('#supplierFM').form('clear');
@@ -355,7 +354,6 @@
             $("#OtherMoney").attr("data-itemArr",JSON.stringify(itemArr)).attr("data-itemMoneyArr",itemMoneyArr);  //json数据存储
         }
         initTableData_material("edit",TotalPrice); //商品列表
-        inOutService.reject(); //撤销下、刷新商品列表
         url = '/depotHead/updateDepotHeadAndDetail?id=' + res.id; //更新接口
     }
     //查看信息
@@ -564,14 +562,6 @@
                         inOutService.batchDel(); //删除行
                     }
                 },
-                {
-                    id:'reject',
-                    text:'撤销',
-                    iconCls:'icon-undo',
-                    handler:function() {
-                        inOutService.reject(); //撤销
-                    }
-                },
                 {
                     id:'appendDepot',
                     text:'新增仓库',
diff --git a/erp_web/pages/bill/other_out_list.html b/erp_web/pages/bill/other_out_list.html
index 433fac9f..3c92139d 100644
--- a/erp_web/pages/bill/other_out_list.html
+++ b/erp_web/pages/bill/other_out_list.html
@@ -279,7 +279,6 @@
         } else {
             initTableData_material("add"); //商品列表
         }
-        inOutService.reject(); //撤销下、刷新商品列表
         function supplierDlgFun(type) {
             $('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui/themes/icons/edit_add.png"/>&nbsp;增加' + type + '信息');
             $('#supplierFM').form('clear');
@@ -348,7 +347,6 @@
             $("#OtherMoney").attr("data-itemArr",JSON.stringify(itemArr)).attr("data-itemMoneyArr",itemMoneyArr);  //json数据存储
         }
         initTableData_material("edit",TotalPrice); //商品列表
-        inOutService.reject(); //撤销下、刷新商品列表
         url = '/depotHead/updateDepotHeadAndDetail?id=' + res.id; //更新接口
     }
     //查看信息
@@ -557,14 +555,6 @@
                         inOutService.batchDel(); //删除行
                     }
                 },
-                {
-                    id:'reject',
-                    text:'撤销',
-                    iconCls:'icon-undo',
-                    handler:function() {
-                        inOutService.reject(); //撤销
-                    }
-                },
                 {
                     id:'appendDepot',
                     text:'新增仓库',
diff --git a/erp_web/pages/bill/purchase_back_list.html b/erp_web/pages/bill/purchase_back_list.html
index c5827dcf..dfcd6205 100644
--- a/erp_web/pages/bill/purchase_back_list.html
+++ b/erp_web/pages/bill/purchase_back_list.html
@@ -417,7 +417,6 @@
         } else {
             initTableData_material("add"); //商品列表
         }
-        inOutService.reject(); //撤销下、刷新商品列表
         function supplierDlgFun(type) {
             $('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui/themes/icons/edit_add.png"/>&nbsp;增加' + type + '信息');
             $('#supplierFM').form('clear');
@@ -486,7 +485,6 @@
             $("#OtherMoney").attr("data-itemArr",JSON.stringify(itemArr)).attr("data-itemMoneyArr",itemMoneyArr);  //json数据存储
         }
         initTableData_material("edit",TotalPrice); //商品列表
-        inOutService.reject(); //撤销下、刷新商品列表
         url = '/depotHead/updateDepotHeadAndDetail?id=' + res.id; //更新接口
     }
     //查看信息
@@ -699,14 +697,6 @@
                         inOutService.batchDel(); //删除行
                     }
                 },
-                {
-                    id:'reject',
-                    text:'撤销',
-                    iconCls:'icon-undo',
-                    handler:function() {
-                        inOutService.reject(); //撤销
-                    }
-                },
                 {
                     id:'appendDepot',
                     text:'新增仓库',
diff --git a/erp_web/pages/bill/purchase_in_list.html b/erp_web/pages/bill/purchase_in_list.html
index 34d29cad..798ec573 100644
--- a/erp_web/pages/bill/purchase_in_list.html
+++ b/erp_web/pages/bill/purchase_in_list.html
@@ -435,7 +435,6 @@
         } else {
             initTableData_material("add"); //商品列表
         }
-        inOutService.reject(); //撤销下、刷新商品列表
         function supplierDlgFun(type) {
             $('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui/themes/icons/edit_add.png"/>&nbsp;增加' + type + '信息');
             $('#supplierFM').form('clear');
@@ -504,7 +503,6 @@
             $("#OtherMoney").attr("data-itemArr",JSON.stringify(itemArr)).attr("data-itemMoneyArr",itemMoneyArr);  //json数据存储
         }
         initTableData_material("edit",TotalPrice); //商品列表
-        inOutService.reject(); //撤销下、刷新商品列表
         url = '/depotHead/updateDepotHeadAndDetail?id=' + res.id; //更新接口
     }
     //查看信息
@@ -717,14 +715,6 @@
                         inOutService.batchDel(); //删除行
                     }
                 },
-                {
-                    id:'reject',
-                    text:'撤销',
-                    iconCls:'icon-undo',
-                    handler:function() {
-                        inOutService.reject(); //撤销
-                    }
-                },
                 {
                     id:'appendDepot',
                     text:'新增仓库',
diff --git a/erp_web/pages/bill/purchase_orders_list.html b/erp_web/pages/bill/purchase_orders_list.html
index a17abb9c..512f3ee8 100644
--- a/erp_web/pages/bill/purchase_orders_list.html
+++ b/erp_web/pages/bill/purchase_orders_list.html
@@ -373,7 +373,6 @@
         } else {
             initTableData_material("add"); //商品列表
         }
-        inOutService.reject(); //撤销下、刷新商品列表
         function supplierDlgFun(type) {
             $('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui/themes/icons/edit_add.png"/>&nbsp;增加' + type + '信息');
             $('#supplierFM').form('clear');
@@ -442,7 +441,6 @@
             $("#OtherMoney").attr("data-itemArr",JSON.stringify(itemArr)).attr("data-itemMoneyArr",itemMoneyArr);  //json数据存储
         }
         initTableData_material("edit",TotalPrice); //商品列表
-        inOutService.reject(); //撤销下、刷新商品列表
         url = '/depotHead/updateDepotHeadAndDetail?id=' + res.id; //更新接口
     }
     //查看信息
@@ -655,14 +653,6 @@
                         inOutService.batchDel(); //删除行
                     }
                 },
-                {
-                    id:'reject',
-                    text:'撤销',
-                    iconCls:'icon-undo',
-                    handler:function() {
-                        inOutService.reject(); //撤销
-                    }
-                },
                 {
                     id:'appendDepot',
                     text:'新增仓库',
diff --git a/erp_web/pages/bill/retail_back_list.html b/erp_web/pages/bill/retail_back_list.html
index f672c63b..71b8a34c 100644
--- a/erp_web/pages/bill/retail_back_list.html
+++ b/erp_web/pages/bill/retail_back_list.html
@@ -352,7 +352,6 @@
         } else {
             initTableData_material("add"); //商品列表
         }
-        inOutService.reject(); //撤销下、刷新商品列表
         function supplierDlgFun(type) {
             $('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui/themes/icons/edit_add.png"/>&nbsp;增加' + type + '信息');
             $('#supplierFM').form('clear');
@@ -489,7 +488,6 @@
             $("#OtherMoney").attr("data-itemArr",JSON.stringify(itemArr)).attr("data-itemMoneyArr",itemMoneyArr);  //json数据存储
         }
         initTableData_material("edit",TotalPrice); //商品列表
-        inOutService.reject(); //撤销下、刷新商品列表
         url = '/depotHead/updateDepotHeadAndDetail?id=' + res.id; //更新接口
     }
     //查看信息
@@ -712,14 +710,6 @@
                         inOutService.batchDel(); //删除行
                     }
                 },
-                {
-                    id:'reject',
-                    text:'撤销',
-                    iconCls:'icon-undo',
-                    handler:function() {
-                        inOutService.reject(); //撤销
-                    }
-                },
                 {
                     id:'appendDepot',
                     text:'新增仓库',
diff --git a/erp_web/pages/bill/retail_out_list.html b/erp_web/pages/bill/retail_out_list.html
index 9782883a..63bb7170 100644
--- a/erp_web/pages/bill/retail_out_list.html
+++ b/erp_web/pages/bill/retail_out_list.html
@@ -390,7 +390,6 @@
         } else {
             initTableData_material("add"); //商品列表
         }
-        inOutService.reject(); //撤销下、刷新商品列表
         function supplierDlgFun(type) {
             $('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui/themes/icons/edit_add.png"/>&nbsp;增加' + type + '信息');
             $('#supplierFM').form('clear');
@@ -527,7 +526,6 @@
             $("#OtherMoney").attr("data-itemArr",JSON.stringify(itemArr)).attr("data-itemMoneyArr",itemMoneyArr);  //json数据存储
         }
         initTableData_material("edit",TotalPrice); //商品列表
-        inOutService.reject(); //撤销下、刷新商品列表
         url = '/depotHead/updateDepotHeadAndDetail?id=' + res.id; //更新接口
     }
     //查看信息
@@ -748,14 +746,6 @@
                         inOutService.batchDel(); //删除行
                     }
                 },
-                {
-                    id:'reject',
-                    text:'撤销',
-                    iconCls:'icon-undo',
-                    handler:function() {
-                        inOutService.reject(); //撤销
-                    }
-                },
                 {
                     id:'appendDepot',
                     text:'新增仓库',
diff --git a/erp_web/pages/bill/sale_back_list.html b/erp_web/pages/bill/sale_back_list.html
index f46e7e90..d6feb7f2 100644
--- a/erp_web/pages/bill/sale_back_list.html
+++ b/erp_web/pages/bill/sale_back_list.html
@@ -417,7 +417,6 @@
         } else {
             initTableData_material("add"); //商品列表
         }
-        inOutService.reject(); //撤销下、刷新商品列表
         function supplierDlgFun(type) {
             $('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui/themes/icons/edit_add.png"/>&nbsp;增加' + type + '信息');
             $('#supplierFM').form('clear');
@@ -496,7 +495,6 @@
             $("#OtherMoney").attr("data-itemArr",JSON.stringify(itemArr)).attr("data-itemMoneyArr",itemMoneyArr);  //json数据存储
         }
         initTableData_material("edit",TotalPrice); //商品列表
-        inOutService.reject(); //撤销下、刷新商品列表
         url = '/depotHead/updateDepotHeadAndDetail?id=' + res.id; //更新接口
     }
     //查看信息
@@ -740,14 +738,6 @@
                         inOutService.batchDel(); //删除行
                     }
                 },
-                {
-                    id:'reject',
-                    text:'撤销',
-                    iconCls:'icon-undo',
-                    handler:function() {
-                        inOutService.reject(); //撤销
-                    }
-                },
                 {
                     id:'appendDepot',
                     text:'新增仓库',
diff --git a/erp_web/pages/bill/sale_orders_list.html b/erp_web/pages/bill/sale_orders_list.html
index b8d1f836..580c2678 100644
--- a/erp_web/pages/bill/sale_orders_list.html
+++ b/erp_web/pages/bill/sale_orders_list.html
@@ -375,7 +375,6 @@
         } else {
             initTableData_material("add"); //商品列表
         }
-        inOutService.reject(); //撤销下、刷新商品列表
         function supplierDlgFun(type) {
             $('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui/themes/icons/edit_add.png"/>&nbsp;增加' + type + '信息');
             $('#supplierFM').form('clear');
@@ -454,7 +453,6 @@
             $("#OtherMoney").attr("data-itemArr",JSON.stringify(itemArr)).attr("data-itemMoneyArr",itemMoneyArr);  //json数据存储
         }
         initTableData_material("edit",TotalPrice); //商品列表
-        inOutService.reject(); //撤销下、刷新商品列表
         url = '/depotHead/updateDepotHeadAndDetail?id=' + res.id; //更新接口
     }
     //查看信息
@@ -699,14 +697,6 @@
                         inOutService.batchDel(); //删除行
                     }
                 },
-                {
-                    id:'reject',
-                    text:'撤销',
-                    iconCls:'icon-undo',
-                    handler:function() {
-                        inOutService.reject(); //撤销
-                    }
-                },
                 {
                     id:'appendDepot',
                     text:'新增仓库',
diff --git a/erp_web/pages/bill/sale_out_list.html b/erp_web/pages/bill/sale_out_list.html
index 655e6adc..a7df4b37 100644
--- a/erp_web/pages/bill/sale_out_list.html
+++ b/erp_web/pages/bill/sale_out_list.html
@@ -437,7 +437,6 @@
         } else {
             initTableData_material("add"); //商品列表
         }
-        inOutService.reject(); //撤销下、刷新商品列表
         function supplierDlgFun(type) {
             $('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui/themes/icons/edit_add.png"/>&nbsp;增加' + type + '信息');
             $('#supplierFM').form('clear');
@@ -532,7 +531,6 @@
             $("#OtherMoney").attr("data-itemArr",JSON.stringify(itemArr)).attr("data-itemMoneyArr",itemMoneyArr);  //json数据存储
         }
         initTableData_material("edit",TotalPrice); //商品列表
-        inOutService.reject(); //撤销下、刷新商品列表
         url = '/depotHead/updateDepotHeadAndDetail?id=' + res.id; //更新接口
     }
     //查看信息
@@ -776,14 +774,6 @@
                         inOutService.batchDel(); //删除行
                     }
                 },
-                {
-                    id:'reject',
-                    text:'撤销',
-                    iconCls:'icon-undo',
-                    handler:function() {
-                        inOutService.reject(); //撤销
-                    }
-                },
                 {
                     id:'appendDepot',
                     text:'新增仓库',