From 138f679b71689204ce247d867eebece3d4162392 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 24 Jan 2025 14:39:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/aq_demand_plan/apply_plan_audit_list.js         |  2 +-
 js/aq_demand_plan/child/apply_plan_detail.js       | 14 ++++----------
 js/aq_demand_plan/child/audit_form.js              |  1 +
 page/aq_demand_plan/child/apply_plan_detail.html   |  4 ++--
 .../aq_demand_plan/child/apply_plan_edit_form.html |  2 +-
 page/aq_demand_plan/child/apply_plan_form.html     |  2 +-
 6 files changed, 10 insertions(+), 15 deletions(-)

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 += "<a onclick='planAuditDetail(" + JSON.stringify(d) + ")'>详情</a>";
                         let content = getCheckStatus(d.statusType, d.status);
-                        if (!(content.indexOf('驳回') > -1 || content.indexOf('通过') > -1)) {
+                        if ((!(content.indexOf('驳回') > -1 || content.indexOf('通过') > -1)) && d.hasAuditBtn) {
                             html += "<div class='splitLine'>|</div><a onclick='checkDetail(" + JSON.stringify(d) + ")'>审核</a>";
                         }
                         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 += '<div class="layui-timeline-item">' +
                 '<i class="layui-icon layui-timeline-axis"></i>' +
                 '<div class="layui-timeline-content layui-text">' +
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 @@
 				<p>操作记录</p>
 			</div>
 			<div class="layui-timeline">
-				<div class="layui-timeline-item">
+				<!-- <div class="layui-timeline-item">
 					<i class="layui-icon layui-timeline-axis"></i>
 					<div class="layui-timeline-content layui-text">
 						<h3 class="layui-timeline-title">8月18日</h3>
@@ -125,7 +125,7 @@
 							</div>
 						</div>
 					</div>
-				</div>
+				</div> -->
 			</div>
 		</div>
 	</div>
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 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>发货</title>
+    <title>需求计划申请修改</title>
     <link rel="stylesheet" href="../../../lib/layui-v2.9.18/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../css/font.css" media="all">
     <link rel="stylesheet" href="../../../css/data_form.css" media="all">
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 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>发货</title>
+    <title>需求计划申请</title>
     <link rel="stylesheet" href="../../../lib/layui-v2.9.18/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../css/font.css" media="all">
     <link rel="stylesheet" href="../../../css/data_form.css" media="all">