diff --git a/erp_web/js/pages/bill/in_out.js b/erp_web/js/pages/bill/in_out.js
index beb1c9d5..698d70f5 100644
--- a/erp_web/js/pages/bill/in_out.js
+++ b/erp_web/js/pages/bill/in_out.js
@@ -1051,7 +1051,6 @@
var appendDom = $("#depotHeadDlg #append");
autoJumpNextInput(inputDom, appendDom); //敲回车键自动跳转到下一个文本框
var body =$("#depotHeadFM .datagrid-view2 .datagrid-body");
- var rowDom = body.find(".datagrid-row");
var footer =$("#depotHeadFM .datagrid-view2 .datagrid-footer");
var input = "input[type=text]";
body.find(".datagrid-row").find("input").off("keyup").on("keyup",function(){
@@ -1083,91 +1082,105 @@
});
}
});
+ //单行删除按钮
+ body.find("[field='op']").find("img").off("click").on("click",function() {
+ $(this).closest(".datagrid-cell").click(); //点击操作
+ var row = $('#materialData').datagrid('getChecked');
+ $('#materialData').datagrid('deleteRow', $('#materialData').datagrid("getRowIndex", row[0]));
+ self.statisticsFun(body,0,0,footer,0);
+ });
//修改数量,自动计算金额和合计,另外计算含税单价、税额、价税合计
body.find("[field='OperNumber']").find(input).off("keyup").on("keyup",function(){
editIndex = $(this).closest(".datagrid-row").attr("datagrid-row-index");
- var UnitPrice = rowDom.eq(editIndex).find("[field='UnitPrice']").find(input).val(); //单价
- var taxRate = rowDom.eq(editIndex).find("[field='TaxRate']").find(input).val(); //税率
+ var rowDom = body.find(".datagrid-row").eq(editIndex);
+ var UnitPrice = rowDom.find("[field='UnitPrice']").find(input).val(); //单价
+ var taxRate = rowDom.find("[field='TaxRate']").find(input).val(); //税率
var OperNumber =$(this).val()-0; //数量
- rowDom.eq(editIndex).find("[field='AllPrice']").find(input).val((UnitPrice*OperNumber).toFixed(2)); //金额
- rowDom.eq(editIndex).find("[field='TaxUnitPrice']").find(input).val((UnitPrice*(1+taxRate/100)).toFixed(2)); //含税单价
- rowDom.eq(editIndex).find("[field='TaxMoney']").find(input).val((UnitPrice*OperNumber*(taxRate/100)).toFixed(2)); //税额
- rowDom.eq(editIndex).find("[field='TaxLastMoney']").find(input).val((UnitPrice*OperNumber*(1+taxRate/100)).toFixed(2)); //价税合计
+ rowDom.find("[field='AllPrice']").find(input).val((UnitPrice*OperNumber).toFixed(2)); //金额
+ rowDom.find("[field='TaxUnitPrice']").find(input).val((UnitPrice*(1+taxRate/100)).toFixed(2)); //含税单价
+ rowDom.find("[field='TaxMoney']").find(input).val((UnitPrice*OperNumber*(taxRate/100)).toFixed(2)); //税额
+ rowDom.find("[field='TaxLastMoney']").find(input).val((UnitPrice*OperNumber*(1+taxRate/100)).toFixed(2)); //价税合计
self.statisticsFun(body,UnitPrice,OperNumber,footer,taxRate);
});
//修改单价,自动计算金额和合计
body.find("[field='UnitPrice']").find(input).off("keyup").on("keyup",function(){
editIndex = $(this).closest(".datagrid-row").attr("datagrid-row-index");
+ var rowDom = body.find(".datagrid-row").eq(editIndex);
var UnitPrice =$(this).val()-0; //单价
- var taxRate = rowDom.eq(editIndex).find("[field='TaxRate']").find(input).val(); //税率
- var OperNumber = rowDom.eq(editIndex).find("[field='OperNumber']").find(input).val(); //数量
- rowDom.eq(editIndex).find("[field='AllPrice']").find(input).val((UnitPrice*OperNumber).toFixed(2)); //金额
- rowDom.eq(editIndex).find("[field='TaxUnitPrice']").find(input).val((UnitPrice*(1+taxRate/100)).toFixed(2)); //含税单价
- rowDom.eq(editIndex).find("[field='TaxMoney']").find(input).val((UnitPrice*OperNumber*(taxRate/100)).toFixed(2)); //税额
- rowDom.eq(editIndex).find("[field='TaxLastMoney']").find(input).val((UnitPrice*OperNumber*(1+taxRate/100)).toFixed(2)); //价税合计
+ var taxRate = rowDom.find("[field='TaxRate']").find(input).val(); //税率
+ var OperNumber = rowDom.find("[field='OperNumber']").find(input).val(); //数量
+ rowDom.find("[field='AllPrice']").find(input).val((UnitPrice*OperNumber).toFixed(2)); //金额
+ rowDom.find("[field='TaxUnitPrice']").find(input).val((UnitPrice*(1+taxRate/100)).toFixed(2)); //含税单价
+ rowDom.find("[field='TaxMoney']").find(input).val((UnitPrice*OperNumber*(taxRate/100)).toFixed(2)); //税额
+ rowDom.find("[field='TaxLastMoney']").find(input).val((UnitPrice*OperNumber*(1+taxRate/100)).toFixed(2)); //价税合计
self.statisticsFun(body,UnitPrice,OperNumber,footer,taxRate);
});
//修改含税单价,自动计算单价、金额、税额、价税合计和合计
body.find("[field='TaxUnitPrice']").find(input).off("keyup").on("keyup",function(){
editIndex = $(this).closest(".datagrid-row").attr("datagrid-row-index");
+ var rowDom = body.find(".datagrid-row").eq(editIndex);
var TaxUnitPrice =$(this).val()-0; //含税单价
- var taxRate = rowDom.eq(editIndex).find("[field='TaxRate']").find(input).val(); //税率
+ var taxRate = rowDom.find("[field='TaxRate']").find(input).val(); //税率
var UnitPrice = TaxUnitPrice/(1+taxRate/100); //计算单价
- rowDom.eq(editIndex).find("[field='UnitPrice']").find(input).val((UnitPrice).toFixed(2)); //单价
+ rowDom.find("[field='UnitPrice']").find(input).val((UnitPrice).toFixed(2)); //单价
var OperNumber = currentRowDom.find("[field='OperNumber']").find(input).val(); //数量
- rowDom.eq(editIndex).find("[field='AllPrice']").find(input).val((UnitPrice*OperNumber).toFixed(2)); //金额
- rowDom.eq(editIndex).find("[field='TaxMoney']").find(input).val((UnitPrice*OperNumber*(taxRate/100)).toFixed(2)); //税额
- rowDom.eq(editIndex).find("[field='TaxLastMoney']").find(input).val((UnitPrice*OperNumber*(1+taxRate/100)).toFixed(2)); //价税合计
+ rowDom.find("[field='AllPrice']").find(input).val((UnitPrice*OperNumber).toFixed(2)); //金额
+ rowDom.find("[field='TaxMoney']").find(input).val((UnitPrice*OperNumber*(taxRate/100)).toFixed(2)); //税额
+ rowDom.find("[field='TaxLastMoney']").find(input).val((UnitPrice*OperNumber*(1+taxRate/100)).toFixed(2)); //价税合计
self.statisticsFun(body,UnitPrice,OperNumber,footer,taxRate);
});
//修改金额,自动计算单价、税额、价税合计和合计
body.find("[field='AllPrice']").find(input).off("keyup").on("keyup",function(){
editIndex = $(this).closest(".datagrid-row").attr("datagrid-row-index");
- var OperNumber = rowDom.eq(editIndex).find("[field='OperNumber']").find(input).val(); //数量
- var taxRate = rowDom.eq(editIndex).find("[field='TaxRate']").find(input).val(); //税率
+ var rowDom = body.find(".datagrid-row").eq(editIndex);
+ var OperNumber = rowDom.find("[field='OperNumber']").find(input).val(); //数量
+ var taxRate = rowDom.find("[field='TaxRate']").find(input).val(); //税率
var AllPrice =$(this).val()-0; //金额
var UnitPrice = (AllPrice/OperNumber).toFixed(2);
- rowDom.eq(editIndex).find("[field='UnitPrice']").find(input).val(UnitPrice); //单价
- rowDom.eq(editIndex).find("[field='TaxUnitPrice']").find(input).val((UnitPrice*(1+taxRate/100)).toFixed(2)); //含税单价
- rowDom.eq(editIndex).find("[field='TaxMoney']").find(input).val((UnitPrice*OperNumber*(taxRate/100)).toFixed(2)); //税额
- rowDom.eq(editIndex).find("[field='TaxLastMoney']").find(input).val((UnitPrice*OperNumber*(1+taxRate/100)).toFixed(2)); //价税合计
+ rowDom.find("[field='UnitPrice']").find(input).val(UnitPrice); //单价
+ rowDom.find("[field='TaxUnitPrice']").find(input).val((UnitPrice*(1+taxRate/100)).toFixed(2)); //含税单价
+ rowDom.find("[field='TaxMoney']").find(input).val((UnitPrice*OperNumber*(taxRate/100)).toFixed(2)); //税额
+ rowDom.find("[field='TaxLastMoney']").find(input).val((UnitPrice*OperNumber*(1+taxRate/100)).toFixed(2)); //价税合计
self.statisticsFun(body,UnitPrice,OperNumber,footer,taxRate);
});
//修改税率,自动计算含税单价、税额、价税合计和合计
body.find("[field='TaxRate']").find(input).off("keyup").on("keyup",function(){
editIndex = $(this).closest(".datagrid-row").attr("datagrid-row-index");
+ var rowDom = body.find(".datagrid-row").eq(editIndex);
var taxRate =$(this).val()-0; //税率
- var OperNumber = rowDom.eq(editIndex).find("[field='OperNumber']").find(input).val(); //数量
- var UnitPrice = rowDom.eq(editIndex).find("[field='UnitPrice']").find(input).val(); //单价
- rowDom.eq(editIndex).find("[field='TaxUnitPrice']").find(input).val((UnitPrice*(1+taxRate/100)).toFixed(2)); //含税单价
- rowDom.eq(editIndex).find("[field='TaxMoney']").find(input).val((UnitPrice*OperNumber*(taxRate/100)).toFixed(2)); //税额
- rowDom.eq(editIndex).find("[field='TaxLastMoney']").find(input).val((UnitPrice*OperNumber*(1+taxRate/100)).toFixed(2)); //价税合计
+ var OperNumber = rowDom.find("[field='OperNumber']").find(input).val(); //数量
+ var UnitPrice = rowDom.find("[field='UnitPrice']").find(input).val(); //单价
+ rowDom.find("[field='TaxUnitPrice']").find(input).val((UnitPrice*(1+taxRate/100)).toFixed(2)); //含税单价
+ rowDom.find("[field='TaxMoney']").find(input).val((UnitPrice*OperNumber*(taxRate/100)).toFixed(2)); //税额
+ rowDom.find("[field='TaxLastMoney']").find(input).val((UnitPrice*OperNumber*(1+taxRate/100)).toFixed(2)); //价税合计
self.statisticsFun(body,UnitPrice,OperNumber,footer,taxRate);
});
//修改税额,自动计算税率、含税单价、价税合计和合计
body.find("[field='TaxMoney']").find(input).off("keyup").on("keyup",function(){
editIndex = $(this).closest(".datagrid-row").attr("datagrid-row-index");
+ var rowDom = body.find(".datagrid-row").eq(editIndex);
var taxMoney =$(this).val()-0; //税额
- var AllPrice = rowDom.eq(editIndex).find("[field='AllPrice']").find(input).val(); //金额
+ var AllPrice = rowDom.find("[field='AllPrice']").find(input).val(); //金额
var taxRate = taxMoney/AllPrice*100; //税率
- var OperNumber = rowDom.eq(editIndex).find("[field='OperNumber']").find(input).val(); //数量
- var UnitPrice = rowDom.eq(editIndex).find("[field='UnitPrice']").find(input).val(); //单价
- rowDom.eq(editIndex).find("[field='TaxUnitPrice']").find(input).val((UnitPrice*(1+taxRate/100)).toFixed(2)); //含税单价
- rowDom.eq(editIndex).find("[field='TaxRate']").find(input).val((taxRate).toFixed(2)); //税率
- rowDom.eq(editIndex).find("[field='TaxLastMoney']").find(input).val((UnitPrice*OperNumber*(1+taxRate/100)).toFixed(2)); //价税合计
+ var OperNumber = rowDom.find("[field='OperNumber']").find(input).val(); //数量
+ var UnitPrice = rowDom.find("[field='UnitPrice']").find(input).val(); //单价
+ rowDom.find("[field='TaxUnitPrice']").find(input).val((UnitPrice*(1+taxRate/100)).toFixed(2)); //含税单价
+ rowDom.find("[field='TaxRate']").find(input).val((taxRate).toFixed(2)); //税率
+ rowDom.find("[field='TaxLastMoney']").find(input).val((UnitPrice*OperNumber*(1+taxRate/100)).toFixed(2)); //价税合计
self.statisticsFun(body,UnitPrice,OperNumber,footer,taxRate);
});
//修改价税合计,自动计算税率、含税单价、税额和合计
body.find("[field='TaxLastMoney']").find(input).off("keyup").on("keyup",function(){
editIndex = $(this).closest(".datagrid-row").attr("datagrid-row-index");
+ var rowDom = body.find(".datagrid-row").eq(editIndex);
var taxLastMoney =$(this).val()-0; //价税合计
- var AllPrice = rowDom.eq(editIndex).find("[field='AllPrice']").find(input).val(); //金额
+ var AllPrice = rowDom.find("[field='AllPrice']").find(input).val(); //金额
var taxRate = (taxLastMoney-AllPrice)/AllPrice*100; //税率
- var OperNumber = rowDom.eq(editIndex).find("[field='OperNumber']").find(input).val(); //数量
- var UnitPrice = rowDom.eq(editIndex).find("[field='UnitPrice']").find(input).val(); //单价
- rowDom.eq(editIndex).find("[field='TaxUnitPrice']").find(input).val((UnitPrice*(1+taxRate/100)).toFixed(2)); //含税单价
- rowDom.eq(editIndex).find("[field='TaxRate']").find(input).val((taxRate).toFixed(2)); //税率
- rowDom.eq(editIndex).find("[field='TaxMoney']").find(input).val((UnitPrice*OperNumber*(taxRate/100)).toFixed(2)); //税额
+ var OperNumber = rowDom.find("[field='OperNumber']").find(input).val(); //数量
+ var UnitPrice = rowDom.find("[field='UnitPrice']").find(input).val(); //单价
+ rowDom.find("[field='TaxUnitPrice']").find(input).val((UnitPrice*(1+taxRate/100)).toFixed(2)); //含税单价
+ rowDom.find("[field='TaxRate']").find(input).val((taxRate).toFixed(2)); //税率
+ rowDom.find("[field='TaxMoney']").find(input).val((UnitPrice*OperNumber*(taxRate/100)).toFixed(2)); //税额
self.statisticsFun(body,UnitPrice,OperNumber,footer,taxRate);
});
//默认税率为0
@@ -1176,7 +1189,7 @@
taxRateDom.val(0);
}
//在商品类型加载 组装件、普通子件
- var mType = rowDom.eq(editIndex).find("[field='MType']");
+ var mType = body.find(".datagrid-row").eq(editIndex).find("[field='MType']");
var rowListLength = mType.find(input).closest(".datagrid-row").attr("datagrid-row-index");
var mTypeValue = "组合件";
if(rowListLength > 0){
@@ -1194,27 +1207,6 @@
$('#materialData').datagrid('selectRow', editIndex).datagrid('beginEdit', editIndex);
this.autoReckon();
},
- //批量删除明细
- batchDel: function () {
- var self = this;
- 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) {
- var body =$("#depotHeadFM .datagrid-body");
- var footer =$("#depotHeadFM .datagrid-footer");
- for (var i = 0; i < row.length; i++) {
- $('#materialData').datagrid('deleteRow', $('#materialData').datagrid("getRowIndex", row[i]));
- self.statisticsFun(body,0,0,footer,0);
- }
- }
- });
- }
- },
//新增仓库
appendDepot: function () {
$('#depotDlg').dialog('open').dialog('setTitle', '
增加仓库信息');
diff --git a/erp_web/pages/bill/allocation_out_list.html b/erp_web/pages/bill/allocation_out_list.html
index 73197408..b9565fe5 100644
--- a/erp_web/pages/bill/allocation_out_list.html
+++ b/erp_web/pages/bill/allocation_out_list.html
@@ -443,17 +443,19 @@
//动画效果
animate:false,
//选中单行
- singleSelect : true,
- collapsible:false,
- selectOnCheck:false,
- //单击行是否选中
- checkOnSelect : false,
+ singleSelect: true,
+ collapsible: false,
pagination: false,
//交替出现背景
striped : true,
showFooter: true,
columns:[[
- { field: 'Id',width:35,align:"center",checkbox:true},
+ { field: 'Id',width:35,align:"center",hidden:true},
+ { field: 'op',align:"center", width:35,
+ formatter:function(value,rec,index) {
+ return '
';
+ }
+ },
{ title: '仓库名称', field: 'DepotId', editor: 'validatebox', width: 90,
formatter: function (value, row, index) {
return row.DepotName;
@@ -558,14 +560,6 @@
inOutService.append(); //新增行
}
},
- {
- id:'delete',
- text:'删除行',
- iconCls:'icon-remove',
- handler:function() {
- inOutService.batchDel(); //删除行
- }
- },
{
id:'appendDepot',
text:'新增仓库',
@@ -614,6 +608,7 @@
});
data.footer = array;
$("#materialData").datagrid('loadData',data);
+ $("#depotHeadFM .datagrid-view2 .datagrid-footer").find("[field='op'] img").hide();
if(type === "add") {
$("#depotHeadDlg #append").click(); //新增行
} else if(type === "edit") {
diff --git a/erp_web/pages/bill/assemble_list.html b/erp_web/pages/bill/assemble_list.html
index c95e8690..8228f9d7 100644
--- a/erp_web/pages/bill/assemble_list.html
+++ b/erp_web/pages/bill/assemble_list.html
@@ -440,17 +440,19 @@
//动画效果
animate:false,
//选中单行
- singleSelect : true,
- collapsible:false,
- selectOnCheck:false,
- //单击行是否选中
- checkOnSelect : false,
+ singleSelect: true,
+ collapsible: false,
pagination: false,
//交替出现背景
striped : true,
showFooter: true,
columns:[[
- { field: 'Id',width:35,align:"center",checkbox:true},
+ { field: 'Id',width:35,align:"center",hidden:true},
+ { field: 'op',align:"center", width:35,
+ formatter:function(value,rec,index) {
+ return '
';
+ }
+ },
{ title: '商品类型',field: 'MType',editor:'validatebox',width:80},
{ title: '仓库名称', field: 'DepotId', editor:'validatebox', width: 90,
formatter: function (value, row, index) {
@@ -542,14 +544,6 @@
inOutService.append(); //新增行
}
},
- {
- id:'delete',
- text:'删除行',
- iconCls:'icon-remove',
- handler:function() {
- inOutService.batchDel(); //删除行
- }
- },
{
id:'appendDepot',
text:'新增仓库',
@@ -598,6 +592,7 @@
});
data.footer = array;
$("#materialData").datagrid('loadData',data);
+ $("#depotHeadFM .datagrid-view2 .datagrid-footer").find("[field='op'] img").hide();
if(type === "add") {
$("#depotHeadDlg #append").click(); //新增行
} else if(type === "edit") {
diff --git a/erp_web/pages/bill/disassemble_list.html b/erp_web/pages/bill/disassemble_list.html
index f3d0f03e..30f4433e 100644
--- a/erp_web/pages/bill/disassemble_list.html
+++ b/erp_web/pages/bill/disassemble_list.html
@@ -441,17 +441,19 @@
//动画效果
animate:false,
//选中单行
- singleSelect : true,
- collapsible:false,
- selectOnCheck:false,
- //单击行是否选中
- checkOnSelect : false,
+ singleSelect: true,
+ collapsible: false,
pagination: false,
//交替出现背景
striped : true,
showFooter: true,
columns:[[
- { field: 'Id',width:35,align:"center",checkbox:true},
+ { field: 'Id',width:35,align:"center",hidden:true},
+ { field: 'op',align:"center", width:35,
+ formatter:function(value,rec,index) {
+ return '
';
+ }
+ },
{ title: '商品类型',field: 'MType',editor:'validatebox',width:80},
{ title: '仓库名称', field: 'DepotId', editor: 'validatebox', width: 90,
formatter: function (value, row, index) {
@@ -543,14 +545,6 @@
inOutService.append(); //新增行
}
},
- {
- id:'delete',
- text:'删除行',
- iconCls:'icon-remove',
- handler:function() {
- inOutService.batchDel(); //删除行
- }
- },
{
id:'appendDepot',
text:'新增仓库',
@@ -599,6 +593,7 @@
});
data.footer = array;
$("#materialData").datagrid('loadData',data);
+ $("#depotHeadFM .datagrid-view2 .datagrid-footer").find("[field='op'] img").hide();
if(type === "add") {
$("#depotHeadDlg #append").click(); //新增行
} else if(type === "edit") {
diff --git a/erp_web/pages/bill/other_in_list.html b/erp_web/pages/bill/other_in_list.html
index 666aeca5..3820a67f 100644
--- a/erp_web/pages/bill/other_in_list.html
+++ b/erp_web/pages/bill/other_in_list.html
@@ -453,17 +453,19 @@
//动画效果
animate:false,
//选中单行
- singleSelect : true,
- collapsible:false,
- selectOnCheck:false,
- //单击行是否选中
- checkOnSelect : false,
+ singleSelect: true,
+ collapsible: false,
pagination: false,
//交替出现背景
striped : true,
showFooter: true,
columns:[[
- { field: 'Id',width:35,align:"center",checkbox:true},
+ { field: 'Id',width:35,align:"center",hidden:true},
+ { field: 'op',align:"center", width:35,
+ formatter:function(value,rec,index) {
+ return '
';
+ }
+ },
{ title: '仓库名称', field: 'DepotId', editor: 'validatebox', width: 90,
formatter: function (value, row, index) {
return row.DepotName;
@@ -554,14 +556,6 @@
inOutService.append(); //新增行
}
},
- {
- id:'delete',
- text:'删除行',
- iconCls:'icon-remove',
- handler:function() {
- inOutService.batchDel(); //删除行
- }
- },
{
id:'appendDepot',
text:'新增仓库',
@@ -610,6 +604,7 @@
});
data.footer = array;
$("#materialData").datagrid('loadData',data);
+ $("#depotHeadFM .datagrid-view2 .datagrid-footer").find("[field='op'] img").hide();
if(type === "add") {
$("#depotHeadDlg #append").click(); //新增行
} else if(type === "edit") {
diff --git a/erp_web/pages/bill/other_out_list.html b/erp_web/pages/bill/other_out_list.html
index 3c92139d..4e2985e2 100644
--- a/erp_web/pages/bill/other_out_list.html
+++ b/erp_web/pages/bill/other_out_list.html
@@ -446,17 +446,19 @@
//动画效果
animate:false,
//选中单行
- singleSelect : true,
- collapsible:false,
- selectOnCheck:false,
- //单击行是否选中
- checkOnSelect : false,
+ singleSelect: true,
+ collapsible: false,
pagination: false,
//交替出现背景
striped : true,
showFooter: true,
columns:[[
- { field: 'Id',width:35,align:"center",checkbox:true},
+ { field: 'Id',width:35,align:"center",hidden:true},
+ { field: 'op',align:"center", width:35,
+ formatter:function(value,rec,index) {
+ return '
';
+ }
+ },
{ title: '仓库名称', field: 'DepotId', editor: 'validatebox', width: 90,
formatter: function (value, row, index) {
return row.DepotName;
@@ -547,14 +549,6 @@
inOutService.append(); //新增行
}
},
- {
- id:'delete',
- text:'删除行',
- iconCls:'icon-remove',
- handler:function() {
- inOutService.batchDel(); //删除行
- }
- },
{
id:'appendDepot',
text:'新增仓库',
@@ -603,6 +597,7 @@
});
data.footer = array;
$("#materialData").datagrid('loadData',data);
+ $("#depotHeadFM .datagrid-view2 .datagrid-footer").find("[field='op'] img").hide();
if(type === "add") {
$("#depotHeadDlg #append").click(); //新增行
} else if(type === "edit") {
diff --git a/erp_web/pages/bill/purchase_back_list.html b/erp_web/pages/bill/purchase_back_list.html
index dfcd6205..1a93d334 100644
--- a/erp_web/pages/bill/purchase_back_list.html
+++ b/erp_web/pages/bill/purchase_back_list.html
@@ -584,17 +584,19 @@
//动画效果
animate:false,
//选中单行
- singleSelect : true,
- collapsible:false,
- selectOnCheck:false,
- //单击行是否选中
- checkOnSelect : false,
+ singleSelect: true,
+ collapsible: false,
pagination: false,
//交替出现背景
striped : true,
showFooter: true,
columns:[[
- { field: 'Id',width:35,align:"center",checkbox:true},
+ { field: 'Id',width:35,align:"center",hidden:true},
+ { field: 'op',align:"center", width:35,
+ formatter:function(value,rec,index) {
+ return '
';
+ }
+ },
{ title: '仓库名称', field: 'DepotId', editor: 'validatebox', width: 90,
formatter: function (value, row, index) {
return row.DepotName;
@@ -689,14 +691,6 @@
inOutService.append(); //新增行
}
},
- {
- id:'delete',
- text:'删除行',
- iconCls:'icon-remove',
- handler:function() {
- inOutService.batchDel(); //删除行
- }
- },
{
id:'appendDepot',
text:'新增仓库',
@@ -745,6 +739,7 @@
});
data.footer = array;
$("#materialData").datagrid('loadData',data);
+ $("#depotHeadFM .datagrid-view2 .datagrid-footer").find("[field='op'] img").hide();
if(type === "add") {
$("#depotHeadDlg #append").click(); //新增行
} else if(type === "edit") {
diff --git a/erp_web/pages/bill/purchase_in_list.html b/erp_web/pages/bill/purchase_in_list.html
index 798ec573..c130f7be 100644
--- a/erp_web/pages/bill/purchase_in_list.html
+++ b/erp_web/pages/bill/purchase_in_list.html
@@ -602,17 +602,19 @@
//动画效果
animate:false,
//选中单行
- singleSelect : true,
- collapsible:false,
- selectOnCheck:false,
- //单击行是否选中
- checkOnSelect : false,
+ singleSelect: true,
+ collapsible: false,
pagination: false,
//交替出现背景
striped : true,
showFooter: true,
columns:[[
- { field: 'Id',width:35,align:"center",checkbox:true},
+ { field: 'Id',width:35,align:"center",hidden:true},
+ { field: 'op',align:"center", width:35,
+ formatter:function(value,rec,index) {
+ return '
';
+ }
+ },
{ title: '仓库名称', field: 'DepotId', editor: 'validatebox', width: 90,
formatter: function (value, row, index) {
return row.DepotName;
@@ -707,14 +709,6 @@
inOutService.append(); //新增行
}
},
- {
- id:'delete',
- text:'删除行',
- iconCls:'icon-remove',
- handler:function() {
- inOutService.batchDel(); //删除行
- }
- },
{
id:'appendDepot',
text:'新增仓库',
@@ -763,6 +757,7 @@
});
data.footer = array;
$("#materialData").datagrid('loadData',data);
+ $("#depotHeadFM .datagrid-view2 .datagrid-footer").find("[field='op'] img").hide();
if(type === "add") {
$("#depotHeadDlg #append").click(); //新增行
} else if(type === "edit") {
diff --git a/erp_web/pages/bill/purchase_orders_list.html b/erp_web/pages/bill/purchase_orders_list.html
index 512f3ee8..2048a192 100644
--- a/erp_web/pages/bill/purchase_orders_list.html
+++ b/erp_web/pages/bill/purchase_orders_list.html
@@ -540,17 +540,19 @@
//动画效果
animate:false,
//选中单行
- singleSelect : true,
- collapsible:false,
- selectOnCheck:false,
- //单击行是否选中
- checkOnSelect : false,
+ singleSelect: true,
+ collapsible: false,
pagination: false,
//交替出现背景
striped : true,
showFooter: true,
columns:[[
- { field: 'Id',width:35,align:"center",checkbox:true},
+ { field: 'Id',width:35,align:"center",hidden:true},
+ { field: 'op',align:"center", width:35,
+ formatter:function(value,rec,index) {
+ return '
';
+ }
+ },
{ title: '仓库名称', field: 'DepotId', editor: 'validatebox', width: 90,
formatter: function (value, row, index) {
return row.DepotName;
@@ -645,14 +647,6 @@
inOutService.append(); //新增行
}
},
- {
- id:'delete',
- text:'删除行',
- iconCls:'icon-remove',
- handler:function() {
- inOutService.batchDel(); //删除行
- }
- },
{
id:'appendDepot',
text:'新增仓库',
@@ -701,6 +695,7 @@
});
data.footer = array;
$("#materialData").datagrid('loadData',data);
+ $("#depotHeadFM .datagrid-view2 .datagrid-footer").find("[field='op'] img").hide();
if(type === "add") {
$("#depotHeadDlg #append").click(); //新增行
} else if(type === "edit") {
diff --git a/erp_web/pages/bill/retail_back_list.html b/erp_web/pages/bill/retail_back_list.html
index 71b8a34c..513821db 100644
--- a/erp_web/pages/bill/retail_back_list.html
+++ b/erp_web/pages/bill/retail_back_list.html
@@ -601,17 +601,19 @@
//动画效果
animate:false,
//选中单行
- singleSelect : true,
- collapsible:false,
- selectOnCheck:false,
- //单击行是否选中
- checkOnSelect : false,
+ singleSelect: true,
+ collapsible: false,
pagination: false,
//交替出现背景
striped : true,
showFooter: true,
columns:[[
- { field: 'Id',width:35,align:"center",checkbox:true},
+ { field: 'Id',width:35,align:"center",hidden:true},
+ { field: 'op',align:"center", width:35,
+ formatter:function(value,rec,index) {
+ return '
';
+ }
+ },
{ title: '仓库名称', field: 'DepotId', editor: 'validatebox', width: 90,
formatter: function (value, row, index) {
return row.DepotName;
@@ -702,14 +704,6 @@
inOutService.append(); //新增行
}
},
- {
- id:'delete',
- text:'删除行',
- iconCls:'icon-remove',
- handler:function() {
- inOutService.batchDel(); //删除行
- }
- },
{
id:'appendDepot',
text:'新增仓库',
@@ -758,6 +752,7 @@
});
data.footer = array;
$("#materialData").datagrid('loadData',data);
+ $("#depotHeadFM .datagrid-view2 .datagrid-footer").find("[field='op'] img").hide();
if(type === "add") {
$("#depotHeadDlg #append").click(); //新增行
} else if(type === "edit") {
diff --git a/erp_web/pages/bill/retail_out_list.html b/erp_web/pages/bill/retail_out_list.html
index 63bb7170..84f1ac1b 100644
--- a/erp_web/pages/bill/retail_out_list.html
+++ b/erp_web/pages/bill/retail_out_list.html
@@ -637,17 +637,19 @@
//动画效果
animate:false,
//选中单行
- singleSelect : true,
- collapsible:false,
- selectOnCheck:false,
- //单击行是否选中
- checkOnSelect : false,
+ singleSelect: true,
+ collapsible: false,
pagination: false,
//交替出现背景
striped : true,
showFooter: true,
columns:[[
- { field: 'Id',width:35,align:"center",checkbox:true},
+ { field: 'Id',width:35,align:"center",hidden:true},
+ { field: 'op',align:"center", width:35,
+ formatter:function(value,rec,index) {
+ return '
';
+ }
+ },
{ title: '仓库名称', field: 'DepotId', editor: 'validatebox', width: 90,
formatter: function (value, row, index) {
return row.DepotName;
@@ -738,14 +740,6 @@
inOutService.append(); //新增行
}
},
- {
- id:'delete',
- text:'删除行',
- iconCls:'icon-remove',
- handler:function() {
- inOutService.batchDel(); //删除行
- }
- },
{
id:'appendDepot',
text:'新增仓库',
@@ -794,6 +788,7 @@
});
data.footer = array;
$("#materialData").datagrid('loadData',data);
+ $("#depotHeadFM .datagrid-view2 .datagrid-footer").find("[field='op'] img").hide();
if(type === "add") {
$("#depotHeadDlg #append").click(); //新增行
} else if(type === "edit") {
diff --git a/erp_web/pages/bill/sale_back_list.html b/erp_web/pages/bill/sale_back_list.html
index d6feb7f2..03a92ab8 100644
--- a/erp_web/pages/bill/sale_back_list.html
+++ b/erp_web/pages/bill/sale_back_list.html
@@ -625,17 +625,19 @@
//动画效果
animate:false,
//选中单行
- singleSelect : true,
- collapsible:false,
- selectOnCheck:false,
- //单击行是否选中
- checkOnSelect : false,
+ singleSelect: true,
+ collapsible: false,
pagination: false,
//交替出现背景
striped : true,
showFooter: true,
columns:[[
- { field: 'Id',width:35,align:"center",checkbox:true},
+ { field: 'Id',width:35,align:"center",hidden:true},
+ { field: 'op',align:"center", width:35,
+ formatter:function(value,rec,index) {
+ return '
';
+ }
+ },
{ title: '仓库名称', field: 'DepotId', editor: 'validatebox', width: 90,
formatter: function (value, row, index) {
return row.DepotName;
@@ -730,14 +732,6 @@
inOutService.append(); //新增行
}
},
- {
- id:'delete',
- text:'删除行',
- iconCls:'icon-remove',
- handler:function() {
- inOutService.batchDel(); //删除行
- }
- },
{
id:'appendDepot',
text:'新增仓库',
@@ -786,6 +780,7 @@
});
data.footer = array;
$("#materialData").datagrid('loadData',data);
+ $("#depotHeadFM .datagrid-view2 .datagrid-footer").find("[field='op'] img").hide();
if(type === "add") {
$("#depotHeadDlg #append").click(); //新增行
} else if(type === "edit") {
diff --git a/erp_web/pages/bill/sale_orders_list.html b/erp_web/pages/bill/sale_orders_list.html
index 580c2678..2c41d995 100644
--- a/erp_web/pages/bill/sale_orders_list.html
+++ b/erp_web/pages/bill/sale_orders_list.html
@@ -584,17 +584,19 @@
//动画效果
animate:false,
//选中单行
- singleSelect : true,
- collapsible:false,
- selectOnCheck:false,
- //单击行是否选中
- checkOnSelect : false,
+ singleSelect: true,
+ collapsible: false,
pagination: false,
//交替出现背景
striped : true,
showFooter: true,
columns:[[
- { field: 'Id',width:35,align:"center",checkbox:true},
+ { field: 'Id',width:35,align:"center",hidden:true},
+ { field: 'op',align:"center", width:35,
+ formatter:function(value,rec,index) {
+ return '
';
+ }
+ },
{ title: '仓库名称', field: 'DepotId', editor: 'validatebox', width: 90,
formatter: function (value, row, index) {
return row.DepotName;
@@ -689,14 +691,6 @@
inOutService.append(); //新增行
}
},
- {
- id:'delete',
- text:'删除行',
- iconCls:'icon-remove',
- handler:function() {
- inOutService.batchDel(); //删除行
- }
- },
{
id:'appendDepot',
text:'新增仓库',
@@ -745,6 +739,7 @@
});
data.footer = array;
$("#materialData").datagrid('loadData',data);
+ $("#depotHeadFM .datagrid-view2 .datagrid-footer").find("[field='op'] img").hide();
if(type === "add") {
$("#depotHeadDlg #append").click(); //新增行
} else if(type === "edit") {
diff --git a/erp_web/pages/bill/sale_out_list.html b/erp_web/pages/bill/sale_out_list.html
index a7df4b37..e024702e 100644
--- a/erp_web/pages/bill/sale_out_list.html
+++ b/erp_web/pages/bill/sale_out_list.html
@@ -661,17 +661,19 @@
//动画效果
animate:false,
//选中单行
- singleSelect : true,
- collapsible:false,
- selectOnCheck:false,
- //单击行是否选中
- checkOnSelect : false,
+ singleSelect: true,
+ collapsible: false,
pagination: false,
//交替出现背景
striped : true,
showFooter: true,
columns:[[
- { field: 'Id',width:35,align:"center",checkbox:true},
+ { field: 'Id',width:35,align:"center",hidden:true},
+ { field: 'op',align:"center", width:35,
+ formatter:function(value,rec,index) {
+ return '
';
+ }
+ },
{ title: '仓库名称', field: 'DepotId', editor: 'validatebox', width: 90,
formatter: function (value, row, index) {
return row.DepotName;
@@ -766,14 +768,6 @@
inOutService.append(); //新增行
}
},
- {
- id:'delete',
- text:'删除行',
- iconCls:'icon-remove',
- handler:function() {
- inOutService.batchDel(); //删除行
- }
- },
{
id:'appendDepot',
text:'新增仓库',
@@ -822,6 +816,7 @@
});
data.footer = array;
$("#materialData").datagrid('loadData',data);
+ $("#depotHeadFM .datagrid-view2 .datagrid-footer").find("[field='op'] img").hide();
if(type === "add") {
$("#depotHeadDlg #append").click(); //新增行
} else if(type === "edit") {