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-28 23:36:38 +08:00
parent 0e91d84c39
commit 70ecb4df75
16 changed files with 142 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
erp_web/pages/reports/buy_in_report.html
View File

@@ -30,15 +30,9 @@
</div>
</div>
<div class="form-group">
<label class="control-label">名称：</label>
<label class="control-label">商品信息：</label>
<div class="control-inline">
<input name="mName" id="mName" style="width:100px;"></input>
</div>
</div>
<div class="form-group">
<label class="control-label">型号：</label>
<div class="control-inline">
<input type="text" name="mModel" id="mModel" class="easyui-textbox" style="width:100px;"></input>
<input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" class="easyui-textbox width-120"/>
</div>
</div>
<div class="form-group">
@@ -55,7 +49,6 @@
$(function () {
var thisDate = getNowFormatMonth(); //当前月份
$("#searchMonth").val(thisDate);
initMaterialNameList();
initMProperty(); //初始化商品属性
initTableData();
ininPager();
@@ -63,21 +56,6 @@
print();
});
//初始化商品名称模糊匹配
function initMaterialNameList() {
$('#mName').combobox({
method:"get",
url: "/material/getMaterialNameList",
valueField: 'value',
textField: 'text',
hasDownArrow: false,
filter: function(q, row){
var opts = $(this).combobox('options');
return row[opts.textField].indexOf(q) >-1;
}
});
}
//初始化商品属性
function initMProperty() {
$.ajax({
@@ -222,8 +200,7 @@
currentPage: pageNo,
pageSize: pageSize,
monthTime: $("#searchMonth").val(),
name: $("#mName").combobox("getValue"),
model: $("#mModel").textbox("getValue"),
materialParam: $.trim($("#searchMaterial").val()),
mpList: mPropertyList
}),
success: function (res) {

7
erp_web/pages/reports/in_detail.html
View File

@@ -36,6 +36,12 @@
<select name="searchProjectId" id="searchProjectId" style="width:100px;height: 30px;border: 1px solid #d3d3d3;border-radius:5px;"></select>
</div>
</div>
<div class="form-group">
<label class="control-label">商品信息：</label>
<div class="control-inline">
<input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" class="easyui-textbox width-120"/>
</div>
</div>
<div class="form-group">
<label class="control-label">单据日期：</label>
<div class="control-inline">
@@ -282,6 +288,7 @@
currentPage: pageNo,
pageSize: pageSize,
organId: $('#OrganId').combobox('getValue'),
materialParam: $.trim($("#searchMaterial").val()),
projectId: $.trim($("#searchProjectId").val()),
depotIds: depotString,
beginTime: $("#searchBeginTime").val(),

7
erp_web/pages/reports/in_material_count.html
View File

@@ -34,6 +34,12 @@
<select name="searchProjectId" id="searchProjectId" style="width:100px;height: 30px;border: 1px solid #d3d3d3;border-radius:5px;"></select>
</div>
</div>
<div class="form-group">
<label class="control-label">商品信息：</label>
<div class="control-inline">
<input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" class="easyui-textbox width-120"/>
</div>
</div>
<div class="form-group">
<label class="control-label">单据日期：</label>
<div class="control-inline">
@@ -271,6 +277,7 @@
currentPage: pageNo,
pageSize: pageSize,
organId: $('#OrganId').combobox('getValue'),
materialParam: $.trim($("#searchMaterial").val()),
projectId: $.trim($("#searchProjectId").val()),
depotIds: depotString,
beginTime: $("#searchBeginTime").val(),

35
erp_web/pages/reports/in_out_stock_report.html
View File

@@ -29,15 +29,9 @@
</div>
</div>
<div class="form-group">
<label class="control-label">名称：</label>
<label class="control-label">商品信息：</label>
<div class="control-inline">
<input name="mName" id="mName" style="width:100px;"></input>
</div>
</div>
<div class="form-group">
<label class="control-label">型号：</label>
<div class="control-inline">
<input type="text" name="mModel" id="mModel" class="easyui-textbox" style="width:100px;"></input>
<input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" class="easyui-textbox width-120"/>
</div>
</div>
<div class="form-group">
@@ -72,7 +66,6 @@
initSelectInfo_UB();
initSystemData_depot();
initSelectInfo_depot();
initMaterialNameList();
initMProperty(); //初始化商品属性
initTableData();
ininPager();
@@ -166,21 +159,6 @@
}
}
//初始化商品名称模糊匹配
function initMaterialNameList() {
$('#mName').combobox({
method:"get",
url: "/material/getMaterialNameList",
valueField: 'value',
textField: 'text',
hasDownArrow: false,
filter: function(q, row){
var opts = $(this).combobox('options');
return row[opts.textField].indexOf(q) >-1;
}
});
}
//初始化商品属性
function initMProperty() {
$.ajax({
@@ -324,8 +302,7 @@
+ "&currentPage=" + pageNo + "&pageSize=" + pageSize
+ "&depotId=" + $.trim($("#searchProjectId").val())
+ "&monthTime=" + $("#searchMonth").val()
+ "&name=" + $("#mName").combobox("getValue")
+ "&model=" + $("#mModel").textbox("getValue");
+ "&materialParam=" + $.trim($("#searchMaterial").val());
}
else {
$.ajax({
@@ -337,8 +314,7 @@
pageSize: pageSize,
depotId: $.trim($("#searchProjectId").val()),
monthTime: $("#searchMonth").val(),
name: $("#mName").combobox("getValue"),
model: $("#mModel").textbox("getValue"),
materialParam: $.trim($("#searchMaterial").val()),
mpList: mPropertyList
}),
success: function (res) {
@@ -361,8 +337,7 @@
data: ({
depotId: $.trim($("#searchProjectId").val()),
monthTime: $("#searchMonth").val(),
name: $("#mName").combobox("getValue"),
model: $("#mModel").textbox("getValue")
materialParam: $.trim($("#searchMaterial").val())
}),
success: function (res) {
if(res && res.code === 200) {

7
erp_web/pages/reports/out_detail.html
View File

@@ -36,6 +36,12 @@
<select name="searchProjectId" id="searchProjectId" style="width:100px;height: 30px;border: 1px solid #d3d3d3;border-radius:5px;"></select>
</div>
</div>
<div class="form-group">
<label class="control-label">商品信息：</label>
<div class="control-inline">
<input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" class="easyui-textbox width-120"/>
</div>
</div>
<div class="form-group">
<label class="control-label">单据日期：</label>
<div class="control-inline">
@@ -282,6 +288,7 @@
currentPage: pageNo,
pageSize: pageSize,
organId: $('#OrganId').combobox('getValue'),
materialParam: $.trim($("#searchMaterial").val()),
projectId: $.trim($("#searchProjectId").val()),
depotIds: depotString,
beginTime: $("#searchBeginTime").val(),

7
erp_web/pages/reports/out_material_count.html
View File

@@ -34,6 +34,12 @@
<select name="searchProjectId" id="searchProjectId" style="width:100px;height: 30px;border: 1px solid #d3d3d3;border-radius:5px;"></select>
</div>
</div>
<div class="form-group">
<label class="control-label">商品信息：</label>
<div class="control-inline">
<input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" class="easyui-textbox width-120"/>
</div>
</div>
<div class="form-group">
<label class="control-label">单据日期：</label>
<div class="control-inline">
@@ -271,6 +277,7 @@
currentPage: pageNo,
pageSize: pageSize,
organId: $('#OrganId').combobox('getValue'),
materialParam: $.trim($("#searchMaterial").val()),
projectId: $.trim($("#searchProjectId").val()),
depotIds: depotString,
beginTime: $("#searchBeginTime").val(),

29
erp_web/pages/reports/sale_out_report.html
View File

@@ -30,15 +30,9 @@
</div>
</div>
<div class="form-group">
<label class="control-label">名称：</label>
<label class="control-label">商品信息：</label>
<div class="control-inline">
<input name="mName" id="mName" style="width:100px;"></input>
</div>
</div>
<div class="form-group">
<label class="control-label">型号：</label>
<div class="control-inline">
<input type="text" name="mModel" id="mModel" class="easyui-textbox" style="width:100px;"></input>
<input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" class="easyui-textbox width-120"/>
</div>
</div>
<div class="form-group">
@@ -59,7 +53,6 @@
$("#searchTable .tip").css("padding-left", "15px").css("color", "red");
var thisDate = getNowFormatMonth(); //当前月份
$("#searchMonth").val(thisDate);
initMaterialNameList();
initMProperty(); //初始化商品属性
initTableData();
ininPager();
@@ -67,21 +60,6 @@
print();
});
//初始化商品名称模糊匹配
function initMaterialNameList() {
$('#mName').combobox({
method:"get",
url: "/material/getMaterialNameList",
valueField: 'value',
textField: 'text',
hasDownArrow: false,
filter: function(q, row){
var opts = $(this).combobox('options');
return row[opts.textField].indexOf(q) >-1;
}
});
}
//初始化商品属性
function initMProperty() {
$.ajax({
@@ -229,8 +207,7 @@
currentPage: pageNo,
pageSize: pageSize,
monthTime: $("#searchMonth").val(),
name: $("#mName").combobox("getValue"),
model: $("#mModel").textbox("getValue"),
materialParam: $.trim($("#searchMaterial").val()),
mpList: mPropertyList
}),
success: function (res) {

8
erp_web/pages/reports/stock_warning_report.html
View File

@@ -28,6 +28,12 @@
<select name="searchProjectId" id="searchProjectId" style="width:100px;height: 30px;border: 1px solid #d3d3d3;border-radius:5px;"></select>
</div>
</div>
<div class="form-group">
<label class="control-label">商品信息：</label>
<div class="control-inline">
<input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" class="easyui-textbox width-120"/>
</div>
</div>
<div class="form-group">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="exprotBtn">导出</a>
@@ -291,6 +297,7 @@
data: ({
currentPage: pageNo,
pageSize: pageSize,
materialParam: $.trim($("#searchMaterial").val()),
projectId : $.trim($("#searchProjectId").val()),
mpList: mPropertyList
}),
@@ -299,6 +306,7 @@
if (pageSize === 3000) {
window.location.href = "/depotItem/exportWarningExcel?browserType=" + getOs()
+ "&currentPage=" + pageNo + "&pageSize=" + pageSize
+ "&materialParam=" + $.trim($("#searchMaterial").val())
+ "&projectId=" + $.trim($("#searchProjectId").val())
+ "&mpList=" + mPropertyList;
}