机具需求计划
- -机具需求计划
+基本信息
-基本信息
+diff --git a/css/demandPlan/apply_plan_detail.css b/css/demandPlan/apply_plan_detail.css index d1070be..ad53314 100644 --- a/css/demandPlan/apply_plan_detail.css +++ b/css/demandPlan/apply_plan_detail.css @@ -32,9 +32,8 @@ body { #plan-detail-box { width: 100%; height: 80px; - flex-direction: column; - align-items: baseline; - justify-content: space-evenly; + align-items: center; + justify-content: space-between; } #plan-detail-box>p, diff --git a/js/demandPlan/apply_plan_list.js b/js/demandPlan/apply_plan_list.js index 157c2b2..d5bdda7 100644 --- a/js/demandPlan/apply_plan_list.js +++ b/js/demandPlan/apply_plan_list.js @@ -57,7 +57,7 @@ function initTable() { authorization: sessionStorage.getItem("gz-token"), }, height: "full-170", - url: dataUrl + "backstage/partInput/findByPage", + url: dataUrl + "backstage/planApplication/findByPage", where: { encryptedData: JSON.stringify({ 'keyWord': $('#keyWord').val(), @@ -80,7 +80,7 @@ function initTable() { cols: [ [ { - width: '6.9%', + width: '5.9%', title: "序号", align: "center", templet: function (d) { @@ -89,72 +89,55 @@ function initTable() { }, { field: "code", + width: '10%', + title: "计划编号", + unresize: true, + align: "center", + }, + { + field: "proName", width: '15%', title: "工程名称", unresize: true, align: "center", }, { - field: "inputUser", - width: '8%', - title: "工程状态", + field: "needTime", + width: '10%', + title: "需用日期", unresize: true, align: "center", - templet: function (d) { - return setProStatus('1'); - }, }, { - field: "inputNum", + field: "creator", width: '10%', - title: "维修单数量", + title: "申请人", unresize: true, align: "center", - templet: function (d) { - return '1'; - }, }, { - field: "allPrice", - width: '10%', - title: "配件领料单数量", + field: "createTime", + width: '15%', + title: "申请时间", unresize: true, align: "center", - templet: function (d) { - return '1'; - }, - }, - { - field: "allPrice", - width: '10%', - title: "配件退回单数量", - unresize: true, - align: "center", - templet: function (d) { - return '1'; - }, }, { field: "remark", - width: '15%', - title: "领用/使用/退回配件数量", + width: '14%', + title: "备注", unresize: true, align: "center", - templet: function (d) { - return '
领:2,563
'; - // return '领:2,563
用:2,000
退:563
'; - }, }, { field: "remark", - width: '15%', - title: "领用/使用/退回配件金额", + width: '10%', + title: "审核状态", unresize: true, align: "center", templet: function (d) { - return '领:2,563
'; - // return '领:2,563
用:2,000
退:563
'; + return getCheckStatus(d.statusType,d.status); }, }, { @@ -164,7 +147,7 @@ function initTable() { unresize: true, templet: function (d) { let html = ""; - html += "详情"; + html += "详情"; return html; }, }, @@ -183,28 +166,42 @@ function initTable() { // 导出 function exportExcel() { let params = { - 'proName': $('#proName').val(), - 'status': $('#status').val() + 'keyWord': $('#keyWord').val(), } - let url = dataUrl + "backstage/export/exportFhList"; - exportExcelUtil(url, '配件入库数据', JSON.stringify(params)); + let url = dataUrl + "backstage/export/export"; + exportExcelUtil(url, '需求计划申请', JSON.stringify(params)); } -// 配件退料详情 -function proCountDetail(obj) { - openIframeByParamObj("pro_count_detail", "详情", "./child/pro_count_detail.html", "92%", "95%", obj); -} -// 工程状态 -function setProStatus(status) { - if (status === '1') { - return "●在建"; - } else if (status === '2') { - return "●完工"; - } + +//审核状态 +function getCheckStatus(statusType, status) { + var company = ""; + if (statusType === '1') { + return "●审核通过"; + } else if (statusType === '2') { + company = "分公司"; + } else if (statusType === '3') { + company = "项目管理中心"; + } else if (statusType === '4') { + company = "机具公司"; + } + if (status === '1') { + return "●待" + company + "审核"; + } else if (status === '2') { + return "●审核通过"; + } else if (status === '3') { + return "●"+company + "审核驳回"; + } + return "●待审核"; } // 查询流程 function showProcess(){ openIframeByParamObj("show_process", "流程说明", "./child/show_process.html", "70%", "65%", null); +} + +// 详情 +function applyPlanDetail(obj) { + openIframeByParamObj("apply_plan_detail", "详情", "./child/apply_plan_detail.html", "92%", "95%", obj); } \ No newline at end of file diff --git a/page/demandPlan/apply_plan_list.html b/page/demandPlan/apply_plan_list.html index 920a846..fc8bd1c 100644 --- a/page/demandPlan/apply_plan_list.html +++ b/page/demandPlan/apply_plan_list.html @@ -23,15 +23,9 @@机具需求计划
- -机具需求计划
+基本信息
-基本信息
+