purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化商品模块

Browse Source
This commit is contained in:
季圣华
2020-12-27 21:58:35 +08:00
parent ed2c4ba070
commit d1fa807514
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erp_web/pages/materials/material.html
View File

@@ -1604,12 +1604,22 @@
var meList = $("#materialExtendData").datagrid('getRows'); var meList = $("#materialExtendData").datagrid('getRows');
var unit = $("#Unit").val(); var unit = $("#Unit").val();
var manyUnitselected = $("#manyUnit").find("option:selected").text(); var manyUnitselected = $("#manyUnit").find("option:selected").text();
var manyUnitInfo = manyUnitselected.substring(0, manyUnitselected.indexOf("("));
var unitArr = manyUnitInfo.split(",");
if(!unit) { if(!unit) {
//此时为多单位 //此时为多单位
if (meList.length<2){ if (meList.length<2){
$.messager.alert('提示',"多单位的商品条码行数至少要有两行，请再新增一行条码信息！",'warning'); $.messager.alert('提示',"多单位的商品条码行数至少要有两行，请再新增一行条码信息！",'warning');
return; return;
} }
if(meList[0].CommodityUnit != unitArr[0]) {
$.messager.alert('提示','条码之后的单位填写有误，单位<b>' + meList[0].CommodityUnit + '</b>请修改为<b>' + unitArr[0] + '</b>！','warning');
return;
}
if(meList[1].CommodityUnit != unitArr[1]) {
$.messager.alert('提示','条码之后的单位填写有误，单位<b>' + meList[1].CommodityUnit + '</b>请修改为<b>' + unitArr[1] + '</b>！','warning');
return;
}
} }
for(var i=0; i<meList.length; i++) { for(var i=0; i<meList.length; i++) {
var commodityUnit = meList[i].CommodityUnit; var commodityUnit = meList[i].CommodityUnit;
@@ -1619,8 +1629,6 @@
return; return;
} }
} else if(manyUnitselected) { } else if(manyUnitselected) {
var manyUnitInfo = manyUnitselected.substring(0, manyUnitselected.indexOf("("));
var unitArr = manyUnitInfo.split(",");
if(commodityUnit != unitArr[0] && commodityUnit != unitArr[1]) { if(commodityUnit != unitArr[0] && commodityUnit != unitArr[1]) {
$.messager.alert('提示', '条码之后的单位填写有误，单位<b>' + commodityUnit + '</b>请修改为' + $.messager.alert('提示', '条码之后的单位填写有误，单位<b>' + commodityUnit + '</b>请修改为' +
'<b>' + unitArr[0]+ '</b>或<b>' + unitArr[1]+ '</b>！', 'warning'); '<b>' + unitArr[0]+ '</b>或<b>' + unitArr[1]+ '</b>！', 'warning');