diff --git a/js/aq_demand_plan/child/choose_type_list.js b/js/aq_demand_plan/child/choose_type_list.js index d3592da..a8bcff9 100644 --- a/js/aq_demand_plan/child/choose_type_list.js +++ b/js/aq_demand_plan/child/choose_type_list.js @@ -111,7 +111,7 @@ function initTable() { [ { type: 'checkbox', width: '5%' }, { - width: '6%', + width: '5%', title: "序号", align: "center", templet: function (d) { @@ -145,14 +145,20 @@ function initTable() { { field: "unitName", title: "单位", - width: '10%', + width: '5%', + unresize: true, + align: "center", + }, + { + field: "storageNum", + title: "库存", + width: '5%', unresize: true, align: "center", - sort:true, }, { field: "needNum", - width: '15%', + width: '10%', title: " * 需用量", unresize: true, align: "center", diff --git a/js/aq_inventory/project_material_statistics.js b/js/aq_inventory/project_material_statistics.js index 9896df4..182d0f8 100644 --- a/js/aq_inventory/project_material_statistics.js +++ b/js/aq_inventory/project_material_statistics.js @@ -34,11 +34,11 @@ function getStatistics() { // 查询/重置 function queryTable(type) { if (type === 1) { - let projectName = $('#projectName').val(); - let flag = checkValue(projectName); + let keyWord = $('#keyWord').val(); + let flag = checkValue(keyWord); if (flag) { - $('#projectName').val(''); - return layer.msg('工程名称查询包含特殊字符,请重新输入', { icon: 2 }); + $('#keyWord').val(''); + return layer.msg('关键字查询包含特殊字符,请重新输入', { icon: 2 }); } let useUnit = $('#useUnit').val(); let flag2 = checkValue(useUnit); @@ -48,7 +48,7 @@ function queryTable(type) { } reloadTable(1); } else if (type === 2) { - $('#projectName').val(''); + $('#keyWord').val(''); $('#useUnit').val(''); $('#isShortage').val(''); layui.form.render(); @@ -67,7 +67,7 @@ function reloadTable(pageNum) { table.reload("currentTableId", { where: { encryptedData: JSON.stringify({ - 'proName': $('#projectName').val(), + 'keyWord': $('#keyWord').val(), 'isShortage': $('#isShortage').val() }), }, @@ -87,7 +87,7 @@ function initTable() { url: dataUrl + "backstage/inventoryCount/queryLedgerListByProjectAndModel", where: { encryptedData: JSON.stringify({ - 'proName': $('#projectName').val(), + 'keyWord': $('#keyWord').val(), 'leaseUnit': $('#useUnit').val(), 'isShortage': $('#isShortage').val() }), @@ -248,11 +248,11 @@ function viewDetail(id) { // 导出Excel function exportExcel() { - let projectName = $('#projectName').val(); + let keyWord = $('#keyWord').val(); let isShortage = $('#isShortage').val(); let params = { - 'proName': projectName, + 'keyWord': keyWord, 'isShortage': isShortage }; diff --git a/js/aq_settlement/child/settlement_detail.js b/js/aq_settlement/child/settlement_detail.js index 634b868..4ad848f 100644 --- a/js/aq_settlement/child/settlement_detail.js +++ b/js/aq_settlement/child/settlement_detail.js @@ -41,7 +41,11 @@ function getPlanApplyPayDetails() { }, null); // 基本数据表格赋值 function setTableData(obj) { - $('#planCode').html("" + obj.planCode + ""); + if (obj.planCode) { + $('#planCode').html("" + obj.planCode + ""); + } else { + $('#planCode').html(""); + } $('#supName').html(obj.supName); $('#proName').html(objParam.proName); $('#cgNum').html(obj.cgNum); @@ -266,6 +270,9 @@ function initTable() { unresize: true, sort:true, templet: function (d) { + if (!d.planCode) { + return ""; // 返回空字符串 + } let html = ""; html += "" + d.planCode + ""; return html; diff --git a/js/aq_settlement/settlement_list.js b/js/aq_settlement/settlement_list.js index c194e89..17397ee 100644 --- a/js/aq_settlement/settlement_list.js +++ b/js/aq_settlement/settlement_list.js @@ -146,6 +146,9 @@ function initTable() { align: "center", sort:true, templet: function (d) { + if (!d.planCode) { + return ""; // 返回空字符串 + } let html = ""; html += "" + d.planCode + ""; return html; diff --git a/page/aq_back_material/back_material_list.html b/page/aq_back_material/back_material_list.html index 7eeeab6..d62847e 100644 --- a/page/aq_back_material/back_material_list.html +++ b/page/aq_back_material/back_material_list.html @@ -23,7 +23,7 @@
+ class="layui-input" lay-affix="clear" placeholder="输入关键字(工程名称/退料单编号/退料人/备注)" maxlength="30">
diff --git a/page/aq_demand_plan/apply_plan_audit_list.html b/page/aq_demand_plan/apply_plan_audit_list.html index 25b8d10..8157eb0 100644 --- a/page/aq_demand_plan/apply_plan_audit_list.html +++ b/page/aq_demand_plan/apply_plan_audit_list.html @@ -51,9 +51,9 @@
-
+
+ class="layui-input" lay-affix="clear" placeholder="输入关键字(计划单号/工程名称/项目部分/提交人/备注)" maxlength="30">
diff --git a/page/aq_demand_plan/apply_plan_list.html b/page/aq_demand_plan/apply_plan_list.html index 46e4d31..bf47534 100644 --- a/page/aq_demand_plan/apply_plan_list.html +++ b/page/aq_demand_plan/apply_plan_list.html @@ -21,9 +21,9 @@
-
+
+ class="layui-input" lay-affix="clear" placeholder="输入关键字(计划编号/工程名称/申请人/备注)" maxlength="30">
diff --git a/page/aq_inventory/inventory_take_stock.html b/page/aq_inventory/inventory_take_stock.html index 793c1c7..9c163f7 100644 --- a/page/aq_inventory/inventory_take_stock.html +++ b/page/aq_inventory/inventory_take_stock.html @@ -23,7 +23,7 @@
+ class="layui-input" lay-affix="clear" placeholder="输入关键字(盘点编号/备注)" maxlength="30">
diff --git a/page/aq_inventory/project_material_statistics.html b/page/aq_inventory/project_material_statistics.html index cdd4a3e..68ce11e 100644 --- a/page/aq_inventory/project_material_statistics.html +++ b/page/aq_inventory/project_material_statistics.html @@ -99,9 +99,9 @@
-
- +
+