diff --git a/js/accessory/accessory_apply_list.js b/js/accessory/accessory_apply_list.js index 52feb59..8121dbe 100644 --- a/js/accessory/accessory_apply_list.js +++ b/js/accessory/accessory_apply_list.js @@ -45,9 +45,10 @@ function reloadTable(pageNum) { }, where: { // encryptedData: JSON.stringify({ - 'keyWord': $('#keyWord').val(), - 'startDay': $('#startDay').val(), - 'endDay': $('#endDay').val() + 'status': $('#status').val(), + 'keyWord': $('#keyWord').val(), + 'startDay': $('#startDay').val(), + 'endDay': $('#endDay').val() // }), }, }, @@ -66,6 +67,7 @@ function initTable() { url: dataUrl + "base/partApply/getPartApplyList", where: { encryptedData: JSON.stringify({ + 'status': $('#status').val(), 'keyWord': $('#keyWord').val(), 'startDay': $('#startDay').val(), 'endDay': $('#endDay').val() diff --git a/js/accessory/accessory_out_bound_list.js b/js/accessory/accessory_out_bound_list.js index 54f4ca1..b51bc72 100644 --- a/js/accessory/accessory_out_bound_list.js +++ b/js/accessory/accessory_out_bound_list.js @@ -45,6 +45,7 @@ function reloadTable(pageNum) { }, where: { encryptedData: JSON.stringify({ + 'status': $('#status').val(), 'keyWord': $('#keyWord').val(), 'startDay': $('#startDay').val(), 'endDay': $('#endDay').val() @@ -66,6 +67,7 @@ function initTable() { url: dataUrl + "backstage/partApply/findByPage", where: { encryptedData: JSON.stringify({ + 'status': $('#status').val(), 'keyWord': $('#keyWord').val(), 'startDay': $('#startDay').val(), 'endDay': $('#endDay').val() @@ -89,7 +91,7 @@ function initTable() { cols: [ [ { - width: '9.9%', + width: '4%', title: "序号", align: "center", templet: function (d) { @@ -131,16 +133,16 @@ function initTable() { }, { field: "phone", - width: '10%', - title: "联系电话", + width: '6%', + title: "电话", unresize: true, sort:true, align: "center", }, { field: "applyNum", - width: '10%', - title: "领用数量", + width: '8%', + title: "领用数", unresize: true, sort:true, align: "center", @@ -169,7 +171,7 @@ function initTable() { }, { field: "remark", - width: '10%', + width: '21.8%', title: "备注", unresize: true, align: "center", @@ -231,6 +233,7 @@ function setCheckStatus(status) { // 导出 function exportExcel() { let params = { + 'status': $('#status').val(), 'keyWord': $('#keyWord').val(), 'startDay': $('#startDay').val(), 'endDay': $('#endDay').val() diff --git a/page/accessory/accessory_apply_list.html b/page/accessory/accessory_apply_list.html index 953b9c6..c76793c 100644 --- a/page/accessory/accessory_apply_list.html +++ b/page/accessory/accessory_apply_list.html @@ -21,20 +21,32 @@
-
+
+ placeholder="请输入关键字(单号/领料人)" maxlength="30"> +
+
+
+ +
+
-
+
-
-
+
@@ -47,12 +59,13 @@ -
-
-
+
+ +
diff --git a/page/accessory/accessory_out_bound_list.html b/page/accessory/accessory_out_bound_list.html index d85f806..ef83b20 100644 --- a/page/accessory/accessory_out_bound_list.html +++ b/page/accessory/accessory_out_bound_list.html @@ -21,9 +21,21 @@
-
+
+ class="layui-input" lay-affix="clear" placeholder="请输入关键字(编号/领用人)" maxlength="30"> +
+
+
+ +
+