Commit bd791048 by 宋祥

1.采购入库和其他入库重量显示异常修复

2.规格不显示ID,材质和单位非必填
parent acd22d14
...@@ -203,7 +203,7 @@ public class ServiceHPKC001 extends ServiceBase { ...@@ -203,7 +203,7 @@ public class ServiceHPKC001 extends ServiceBase {
} }
/** /**
* 删除操作 * 删除操作intCompact = 14040
* *
* @param inInfo * @param inInfo
* @return * @return
......
...@@ -92,12 +92,12 @@ $(function() { ...@@ -92,12 +92,12 @@ $(function() {
}, { }, {
field: "unitWeight", field: "unitWeight",
template: function (options) { template: function (options) {
return options.length == 0 ? "-" : options.length; return options.unitWeight == 0 ? "-" : options.unitWeight;
} }
}, { }, {
field: "weight", field: "weight",
template: function (options) { template: function (options) {
return options.length == 0 ? "-" : options.length; return options.weight == 0 ? "-" : options.weight;
} }
}, { }, {
field: "length", field: "length",
......
...@@ -95,12 +95,12 @@ $(function() { ...@@ -95,12 +95,12 @@ $(function() {
}, { }, {
field: "unitWeight", field: "unitWeight",
template: function (options) { template: function (options) {
return options.length == 0 ? "-" : options.length; return options.unitWeight == 0 ? "-" : options.unitWeight;
} }
}, { }, {
field: "weight", field: "weight",
template: function (options) { template: function (options) {
return options.length == 0 ? "-" : options.length; return options.weight == 0 ? "-" : options.weight;
} }
}, { }, {
field: "length", field: "length",
......
...@@ -123,14 +123,6 @@ let save = function () { ...@@ -123,14 +123,6 @@ let save = function () {
message("选中的第" + (i + 1) + "行\"存货名称\",不能为空!"); message("选中的第" + (i + 1) + "行\"存货名称\",不能为空!");
return false; return false;
} }
if (isBlank(row["material"])) {
message("选中的第" + (i + 1) + "行\"材质\",不能为空!");
return false;
}
if (isBlank(row["unit"])) {
message("选中的第" + (i + 1) + "行\"单位\",不能为空!");
return false;
}
if (isBlank(row["status"])) { if (isBlank(row["status"])) {
message("选中的第" + (i + 1) + "行\"状态\",不能为空!"); message("选中的第" + (i + 1) + "行\"状态\",不能为空!");
return false; return false;
...@@ -150,11 +142,6 @@ let save = function () { ...@@ -150,11 +142,6 @@ let save = function () {
message("选中的第" + (i + 1) + "行\"\",必须是数值!"); message("选中的第" + (i + 1) + "行\"\",必须是数值!");
return false; return false;
} }
let coefficient = row["coefficient"];
if (!isBlank(coefficient) && !isNumber(coefficient)) {
message("选中的第" + (i + 1) + "行\"\",必须是数值!");
return false;
}
} }
JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", { JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
ok: function () { ok: function () {
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<EF:EFRegion id="result" title="明细信息"> <EF:EFRegion id="result" title="明细信息">
<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row"> <EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
<EF:EFColumn ename="id" cname="档案ID" enable="false" width="60" align="center"/> <EF:EFColumn ename="id" cname="档案ID" hidden="true"/>
<EF:EFComboColumn ename="inventType" cname="存货类型" width="80" align="center" required="true" <EF:EFComboColumn ename="inventType" cname="存货类型" width="80" align="center" required="true"
readonly="true"> readonly="true">
<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/> <EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
...@@ -35,10 +35,10 @@ ...@@ -35,10 +35,10 @@
<EF:EFColumn ename="length" cname="长(MM)" width="100" align="right" format="{0:N2}" maxLength="10"/> <EF:EFColumn ename="length" cname="长(MM)" width="100" align="right" format="{0:N2}" maxLength="10"/>
<EF:EFColumn ename="width" cname="宽(MM)" width="100" align="right" format="{0:N2}" maxLength="10"/> <EF:EFColumn ename="width" cname="宽(MM)" width="100" align="right" format="{0:N2}" maxLength="10"/>
<EF:EFColumn ename="thick" cname="厚(MM)" width="100" align="right" format="{0:N2}" maxLength="10"/> <EF:EFColumn ename="thick" cname="厚(MM)" width="100" align="right" format="{0:N2}" maxLength="10"/>
<EF:EFColumn ename="material" cname="材质" width="100" align="center" required="true"/> <EF:EFColumn ename="material" cname="材质" width="100" align="center"/>
<EF:EFColumn ename="coefficient" cname="系数" width="80" align="right" format="{0:N2}" maxLength="10" <EF:EFColumn ename="coefficient" cname="系数" width="80" align="right" format="{0:N2}" maxLength="10"
defaultValue="1"/> defaultValue="1"/>
<EF:EFColumn ename="unit" cname="单位" width="80" align="center" required="true"/> <EF:EFColumn ename="unit" cname="单位" width="80" align="center"/>
<EF:EFComboColumn ename="status" cname="状态" align="center" width="80" required="true" defaultValue="1"> <EF:EFComboColumn ename="status" cname="状态" align="center" width="80" required="true" defaultValue="1">
<EF:EFCodeOption codeName="hpjx.hpjx.status"/> <EF:EFCodeOption codeName="hpjx.hpjx.status"/>
</EF:EFComboColumn> </EF:EFComboColumn>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment