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

添加出库时开启序列号的商品强制附加使用序列号

Browse Source
This commit is contained in:
cjl
2019-01-29 10:33:22 +08:00
parent b55e9d1597
commit b08d349b45
31 changed files with 1521 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erp_web/pages/manage/serialNumber.html
View File

@@ -155,11 +155,11 @@
{title: '商品名称', field: 'materialName', width: 100},
{title: '序列号', field: 'serialNumber', width: 80},
{title: '已卖出', field: 'isSell', width: 150 , formatter: function (value) {
return value ? "是" : "否";
return value=='1' ? "是" : "否";
}
},
{title: '已删除', field: 'deleteFlag', width: 60, formatter: function (value) {
return value ? "是" : "否";
return value=='1' ? "是" : "否";
}
},
{title: '创建时间', field: 'createTime', width: 140,formatter: formatDatebox},

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

@@ -684,7 +684,7 @@
},
{
title: '序列号', field: 'enableSerialNumber', width: 70, align: "center", formatter: function (value) {
return value ? "启用" : "禁用";
return value=='1' ? "启用" : "禁用";
}
}
]],
@@ -1363,7 +1363,7 @@
// console.log("enableSerialNumber:"+(materialInfo[24]=='true'?'1':'0'));
// console.log("enableSerialNumber:"+materialInfo[24]);
// $("#enableSerialNumber").combobox('setValue',materialInfo[24]=='true'?'1':'0');
$("#enableSerialNumber").val(materialInfo[24]=='true'?'1':'0');
$("#enableSerialNumber").val(materialInfo[24]=='1'?'1':'0');
// console.log($("#enableSerialNumber").val());
var categoryName = ""; //类型名称