diff --git a/js/aq_demand_plan/apply_plan_audit_list.js b/js/aq_demand_plan/apply_plan_audit_list.js index d270390..6fea72d 100644 --- a/js/aq_demand_plan/apply_plan_audit_list.js +++ b/js/aq_demand_plan/apply_plan_audit_list.js @@ -175,7 +175,7 @@ function initTable() { let html = ""; html += "详情"; let content = getCheckStatus(d.statusType, d.status); - if (!(content.indexOf('驳回') > -1 || content.indexOf('通过') > -1)) { + if ((!(content.indexOf('驳回') > -1 || content.indexOf('通过') > -1)) && d.hasAuditBtn) { html += "
|
审核"; } return html; diff --git a/js/aq_demand_plan/child/apply_plan_detail.js b/js/aq_demand_plan/child/apply_plan_detail.js index 0ec6aaf..2585455 100644 --- a/js/aq_demand_plan/child/apply_plan_detail.js +++ b/js/aq_demand_plan/child/apply_plan_detail.js @@ -270,19 +270,13 @@ function setOperRecordInfo(list, obj) { operData = '发起申请'; } else if (item.auditType === '1') { operData = '重新提交申请'; - } else if (item.auditType === '2' && item.auditStatus === '2') { + } else if (item.auditStatus === '2' && !item.completed) { operData = '审核确认通过,共间隔:' + item.hours + '小时' + minutes + '分钟 原因备注:' + remark + ''; - } else if (item.auditType === '2' && item.auditStatus === '3') { - operData = '驳回-给发起人' + creator + ',共间隔:' + item.hours + '小时' + minutes + '分钟 原因备注:' + remark + ''; - } else if (item.auditType === '3' && item.auditStatus === '2') { - operData = '审核确认通过,共间隔:' + item.hours + '小时' + minutes + '分钟 原因备注:' + remark + ''; - } else if (item.auditType === '3' && item.auditStatus === '3') { - operData = '驳回-给发起人' + creator + ',共间隔:' + item.hours + '小时' + minutes + '分钟 原因备注:' + remark + ''; - } else if (item.auditType === '4' && item.auditStatus === '2') { + } else if (item.auditStatus === '2' && item.completed) { operData = '完结-审核确认通过,共耗时:' + item.hours + '小时' + minutes + '分钟 原因备注:' + remark + ''; - } else if (item.auditType === '4' && item.auditStatus === '3') { + } else if (item.auditStatus === '3') { operData = '驳回-给发起人' + creator + ',共间隔:' + item.hours + '小时' + minutes + '分钟 原因备注:' + remark + ''; - } + } html += '
' + '' + '
' + diff --git a/js/aq_demand_plan/child/audit_form.js b/js/aq_demand_plan/child/audit_form.js index f565cca..d464adf 100644 --- a/js/aq_demand_plan/child/audit_form.js +++ b/js/aq_demand_plan/child/audit_form.js @@ -44,6 +44,7 @@ function submitApply(data) { } else if (objParam.checkType === '2') { // 需求计划审核 url = dataUrl + 'backstage/planAudit/planAudit'; data.field.applyId = idParam; + data.field.statusType = objParam.statusType; } let params = { encryptedData: JSON.stringify(data.field) diff --git a/page/aq_demand_plan/child/apply_plan_detail.html b/page/aq_demand_plan/child/apply_plan_detail.html index 972cfc1..c45ee95 100644 --- a/page/aq_demand_plan/child/apply_plan_detail.html +++ b/page/aq_demand_plan/child/apply_plan_detail.html @@ -101,7 +101,7 @@

操作记录

-
+
diff --git a/page/aq_demand_plan/child/apply_plan_edit_form.html b/page/aq_demand_plan/child/apply_plan_edit_form.html index b57d226..d72efd6 100644 --- a/page/aq_demand_plan/child/apply_plan_edit_form.html +++ b/page/aq_demand_plan/child/apply_plan_edit_form.html @@ -4,7 +4,7 @@ - 发货 + 需求计划申请修改 diff --git a/page/aq_demand_plan/child/apply_plan_form.html b/page/aq_demand_plan/child/apply_plan_form.html index 13d99ef..1a358fc 100644 --- a/page/aq_demand_plan/child/apply_plan_form.html +++ b/page/aq_demand_plan/child/apply_plan_form.html @@ -4,7 +4,7 @@ - 发货 + 需求计划申请