给单据的商品选择增加类别选择
This commit is contained in:
@@ -1293,6 +1293,7 @@
|
||||
{field: 'id',width:35,align:"center",checkbox:true},
|
||||
{field: 'mBarCode', title: '条码', width: 120},
|
||||
{field: 'name', title: '名称', width: 140},
|
||||
{field: 'categoryName', title: '类别', width: 80},
|
||||
{field: 'standard', title: '规格', width: 80},
|
||||
{field: 'model', title: '型号', width: 80},
|
||||
{field: 'unit', title: '单位', width: 60},
|
||||
@@ -1338,6 +1339,7 @@
|
||||
url: "/material/findBySelect",
|
||||
dataType: "json",
|
||||
data: ({
|
||||
categoryId: $("#searchMaterialCategory").combotree("getValue"),
|
||||
q: $("#searchBarCode").textbox("getValue"),
|
||||
mpList: mPropertyList,
|
||||
depotId: depotId,
|
||||
@@ -1372,6 +1374,14 @@
|
||||
pageSize: initPageSize
|
||||
});
|
||||
});
|
||||
//重置按钮
|
||||
$("#searchMaterialResetBtn").unbind().bind({
|
||||
click: function () {
|
||||
$("#searchMaterialCategory").combotree("setValue","");
|
||||
$("#searchBarCode").textbox("setValue","");
|
||||
$("#searchMaterialBtn").click();
|
||||
}
|
||||
});
|
||||
$("#appendMaterial").off("click").on("click",function(){
|
||||
js.addTabPage(null, "商品信息", "/pages/materials/material.html");
|
||||
});
|
||||
|
||||
@@ -136,15 +136,20 @@
|
||||
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
|
||||
<div class="box-body form-inline">
|
||||
<div class="form-group">
|
||||
<label class="control-label">条码:</label>
|
||||
<div class="control-inline">
|
||||
<input type="text" id="searchBarCode" name="searchBarCode" value="" maxlength="100" class="easyui-textbox width-90"/>
|
||||
<input type="text" id="searchBarCode" data-options="prompt:'条码、名称、规格、型号'" maxlength="100" class="easyui-textbox width-180"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
|
||||
<div class="control-inline">
|
||||
<select id="searchMaterialCategory" class="easyui-combotree" style="width:180px;"
|
||||
data-options="url:'/materialCategory/getMaterialCategoryTree?id='">
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchMaterialResetBtn">重置</a>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-add" id="appendMaterial">新增商品</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -136,15 +136,20 @@
|
||||
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
|
||||
<div class="box-body form-inline">
|
||||
<div class="form-group">
|
||||
<label class="control-label">条码:</label>
|
||||
<div class="control-inline">
|
||||
<input type="text" id="searchBarCode" name="searchBarCode" value="" maxlength="100" class="easyui-textbox width-90"/>
|
||||
<input type="text" id="searchBarCode" data-options="prompt:'条码、名称、规格、型号'" maxlength="100" class="easyui-textbox width-180"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
|
||||
<div class="control-inline">
|
||||
<select id="searchMaterialCategory" class="easyui-combotree" style="width:180px;"
|
||||
data-options="url:'/materialCategory/getMaterialCategoryTree?id='">
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchMaterialResetBtn">重置</a>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-add" id="appendMaterial">新增商品</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -136,15 +136,20 @@
|
||||
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
|
||||
<div class="box-body form-inline">
|
||||
<div class="form-group">
|
||||
<label class="control-label">条码:</label>
|
||||
<div class="control-inline">
|
||||
<input type="text" id="searchBarCode" name="searchBarCode" value="" maxlength="100" class="easyui-textbox width-90"/>
|
||||
<input type="text" id="searchBarCode" data-options="prompt:'条码、名称、规格、型号'" maxlength="100" class="easyui-textbox width-180"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
|
||||
<div class="control-inline">
|
||||
<select id="searchMaterialCategory" class="easyui-combotree" style="width:180px;"
|
||||
data-options="url:'/materialCategory/getMaterialCategoryTree?id='">
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchMaterialResetBtn">重置</a>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-add" id="appendMaterial">新增商品</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -151,15 +151,20 @@
|
||||
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
|
||||
<div class="box-body form-inline">
|
||||
<div class="form-group">
|
||||
<label class="control-label">条码:</label>
|
||||
<div class="control-inline">
|
||||
<input type="text" id="searchBarCode" name="searchBarCode" value="" maxlength="100" class="easyui-textbox width-90"/>
|
||||
<input type="text" id="searchBarCode" data-options="prompt:'条码、名称、规格、型号'" maxlength="100" class="easyui-textbox width-180"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
|
||||
<div class="control-inline">
|
||||
<select id="searchMaterialCategory" class="easyui-combotree" style="width:180px;"
|
||||
data-options="url:'/materialCategory/getMaterialCategoryTree?id='">
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchMaterialResetBtn">重置</a>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-add" id="appendMaterial">新增商品</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -145,15 +145,20 @@
|
||||
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
|
||||
<div class="box-body form-inline">
|
||||
<div class="form-group">
|
||||
<label class="control-label">条码:</label>
|
||||
<div class="control-inline">
|
||||
<input type="text" id="searchBarCode" name="searchBarCode" value="" maxlength="100" class="easyui-textbox width-90"/>
|
||||
<input type="text" id="searchBarCode" data-options="prompt:'条码、名称、规格、型号'" maxlength="100" class="easyui-textbox width-180"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
|
||||
<div class="control-inline">
|
||||
<select id="searchMaterialCategory" class="easyui-combotree" style="width:180px;"
|
||||
data-options="url:'/materialCategory/getMaterialCategoryTree?id='">
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchMaterialResetBtn">重置</a>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-add" id="appendMaterial">新增商品</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -272,15 +272,20 @@
|
||||
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
|
||||
<div class="box-body form-inline">
|
||||
<div class="form-group">
|
||||
<label class="control-label">条码:</label>
|
||||
<div class="control-inline">
|
||||
<input type="text" id="searchBarCode" name="searchBarCode" value="" maxlength="100" class="easyui-textbox width-90"/>
|
||||
<input type="text" id="searchBarCode" data-options="prompt:'条码、名称、规格、型号'" maxlength="100" class="easyui-textbox width-180"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
|
||||
<div class="control-inline">
|
||||
<select id="searchMaterialCategory" class="easyui-combotree" style="width:180px;"
|
||||
data-options="url:'/materialCategory/getMaterialCategoryTree?id='">
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchMaterialResetBtn">重置</a>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-add" id="appendMaterial">新增商品</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -300,15 +300,20 @@
|
||||
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
|
||||
<div class="box-body form-inline">
|
||||
<div class="form-group">
|
||||
<label class="control-label">条码:</label>
|
||||
<div class="control-inline">
|
||||
<input type="text" id="searchBarCode" name="searchBarCode" value="" maxlength="100" class="easyui-textbox width-90"/>
|
||||
<input type="text" id="searchBarCode" data-options="prompt:'条码、名称、规格、型号'" maxlength="100" class="easyui-textbox width-180"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
|
||||
<div class="control-inline">
|
||||
<select id="searchMaterialCategory" class="easyui-combotree" style="width:180px;"
|
||||
data-options="url:'/materialCategory/getMaterialCategoryTree?id='">
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchMaterialResetBtn">重置</a>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-add" id="appendMaterial">新增商品</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -200,15 +200,20 @@
|
||||
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
|
||||
<div class="box-body form-inline">
|
||||
<div class="form-group">
|
||||
<label class="control-label">条码:</label>
|
||||
<div class="control-inline">
|
||||
<input type="text" id="searchBarCode" name="searchBarCode" value="" maxlength="100" class="easyui-textbox width-90"/>
|
||||
<input type="text" id="searchBarCode" data-options="prompt:'条码、名称、规格、型号'" maxlength="100" class="easyui-textbox width-180"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
|
||||
<div class="control-inline">
|
||||
<select id="searchMaterialCategory" class="easyui-combotree" style="width:180px;"
|
||||
data-options="url:'/materialCategory/getMaterialCategoryTree?id='">
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchMaterialResetBtn">重置</a>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-add" id="appendMaterial">新增商品</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -212,15 +212,20 @@
|
||||
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
|
||||
<div class="box-body form-inline">
|
||||
<div class="form-group">
|
||||
<label class="control-label">条码:</label>
|
||||
<div class="control-inline">
|
||||
<input type="text" id="searchBarCode" name="searchBarCode" value="" maxlength="100" class="easyui-textbox width-90"/>
|
||||
<input type="text" id="searchBarCode" data-options="prompt:'条码、名称、规格、型号'" maxlength="100" class="easyui-textbox width-180"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
|
||||
<div class="control-inline">
|
||||
<select id="searchMaterialCategory" class="easyui-combotree" style="width:180px;"
|
||||
data-options="url:'/materialCategory/getMaterialCategoryTree?id='">
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchMaterialResetBtn">重置</a>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-add" id="appendMaterial">新增商品</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -249,15 +249,20 @@
|
||||
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
|
||||
<div class="box-body form-inline">
|
||||
<div class="form-group">
|
||||
<label class="control-label">条码:</label>
|
||||
<div class="control-inline">
|
||||
<input type="text" id="searchBarCode" name="searchBarCode" value="" maxlength="100" class="easyui-textbox width-90"/>
|
||||
<input type="text" id="searchBarCode" data-options="prompt:'条码、名称、规格、型号'" maxlength="100" class="easyui-textbox width-180"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
|
||||
<div class="control-inline">
|
||||
<select id="searchMaterialCategory" class="easyui-combotree" style="width:180px;"
|
||||
data-options="url:'/materialCategory/getMaterialCategoryTree?id='">
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchMaterialResetBtn">重置</a>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-add" id="appendMaterial">新增商品</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -273,15 +273,20 @@
|
||||
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
|
||||
<div class="box-body form-inline">
|
||||
<div class="form-group">
|
||||
<label class="control-label">条码:</label>
|
||||
<div class="control-inline">
|
||||
<input type="text" id="searchBarCode" name="searchBarCode" value="" maxlength="100" class="easyui-textbox width-90"/>
|
||||
<input type="text" id="searchBarCode" data-options="prompt:'条码、名称、规格、型号'" maxlength="100" class="easyui-textbox width-180"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
|
||||
<div class="control-inline">
|
||||
<select id="searchMaterialCategory" class="easyui-combotree" style="width:180px;"
|
||||
data-options="url:'/materialCategory/getMaterialCategoryTree?id='">
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchMaterialResetBtn">重置</a>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-add" id="appendMaterial">新增商品</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -202,15 +202,20 @@
|
||||
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
|
||||
<div class="box-body form-inline">
|
||||
<div class="form-group">
|
||||
<label class="control-label">条码:</label>
|
||||
<div class="control-inline">
|
||||
<input type="text" id="searchBarCode" name="searchBarCode" value="" maxlength="100" class="easyui-textbox width-90"/>
|
||||
<input type="text" id="searchBarCode" data-options="prompt:'条码、名称、规格、型号'" maxlength="100" class="easyui-textbox width-180"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
|
||||
<div class="control-inline">
|
||||
<select id="searchMaterialCategory" class="easyui-combotree" style="width:180px;"
|
||||
data-options="url:'/materialCategory/getMaterialCategoryTree?id='">
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchMaterialResetBtn">重置</a>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-add" id="appendMaterial">新增商品</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -300,15 +300,20 @@
|
||||
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
|
||||
<div class="box-body form-inline">
|
||||
<div class="form-group">
|
||||
<label class="control-label">条码:</label>
|
||||
<div class="control-inline">
|
||||
<input type="text" id="searchBarCode" name="searchBarCode" value="" maxlength="100" class="easyui-textbox width-90"/>
|
||||
<input type="text" id="searchBarCode" data-options="prompt:'条码、名称、规格、型号'" maxlength="100" class="easyui-textbox width-180"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
|
||||
<div class="control-inline">
|
||||
<select id="searchMaterialCategory" class="easyui-combotree" style="width:180px;"
|
||||
data-options="url:'/materialCategory/getMaterialCategoryTree?id='">
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchMaterialBtn">查询</a>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchMaterialResetBtn">重置</a>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-add" id="appendMaterial">新增商品</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user