Commit 878d4691 by wuwenlong

Merge remote-tracking branch 'origin/dev' into dev

parents d8a0e824 8570f214
...@@ -40,7 +40,7 @@ $(function() { ...@@ -40,7 +40,7 @@ $(function() {
}); });
// 修改 // 修改
$("#UPDATE").on("click", function () { $("#BTN_UPDATE").on("click", function () {
var rowCount = resultGrid.getCheckedRows(); var rowCount = resultGrid.getCheckedRows();
// 检验是否选中数据 // 检验是否选中数据
if (rowCount == null || rowCount == "") { if (rowCount == null || rowCount == "") {
......
...@@ -24,7 +24,12 @@ ...@@ -24,7 +24,12 @@
<EF:EFColumn ename="id" cname="内码" hidden="true"/> <EF:EFColumn ename="id" cname="内码" hidden="true"/>
<EF:EFColumn ename="inventCode" cname="类型编码" width="100" readonly="false" required="true"/> <EF:EFColumn ename="inventCode" cname="类型编码" width="100" readonly="false" required="true"/>
<EF:EFColumn ename="inventName" cname="存货名称" width="100" readonly="false" required="true"/> <EF:EFColumn ename="inventName" cname="存货名称" width="100" readonly="false" required="true"/>
<EF:EFColumn ename="inventType" cname="存货类型" width="100" readonly="false" required="true"/> <EF:EFComboColumn ename="inventType" cname="存货类型" align="center" columnTemplate="#=textField#-#=valueField#" optionLabel=" "
itemTemplate="#=textField#-#=valueField#" textField="textField"
valueField="valueField" width="100" required="true">
<EF:EFOption label="--请选择--" value=""></EF:EFOption>
<EF:EFOption label="待定" value="1"></EF:EFOption>
</EF:EFComboColumn>
<EF:EFComboColumn ename="status" cname="状态" align="center" columnTemplate="#=textField#-#=valueField#" optionLabel=" " <EF:EFComboColumn ename="status" cname="状态" align="center" columnTemplate="#=textField#-#=valueField#" optionLabel=" "
itemTemplate="#=textField#-#=valueField#" textField="textField" itemTemplate="#=textField#-#=valueField#" textField="textField"
valueField="valueField" width="100" required="true"> valueField="valueField" width="100" required="true">
......
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