From e51dd7c73c52636b87e8b6bcfadceebe2c66c010 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 16 Aug 2024 18:44:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=81=E7=A8=8B=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=A8=A1=E6=9D=BF=EF=BC=8C=E6=94=AF=E6=8C=81=E4=BB=8E?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E8=BF=9B=E5=85=A5=E6=98=BE=E7=A4=BA=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=84=8F=E8=A7=81=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/modules/gen/include/viewForm.html      | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/include/viewForm.html b/modules/core/src/main/resources/templates/modules/gen/include/viewForm.html
index 38dc217b..19460e53 100644
--- a/modules/core/src/main/resources/templates/modules/gen/include/viewForm.html
+++ b/modules/core/src/main/resources/templates/modules/gen/include/viewForm.html
@@ -41,8 +41,7 @@
 				<% include('/templates/modules/gen/include/formControl.html'){} %>
 				<% include('/templates/modules/gen/include/formChildTable.html'){} %>
 			<% if(toBoolean(table.optionMap['isBpmForm'])){ %>
-				\<% if(isNotBlank(${className}.bpm.taskId)){ %>
-				<div class="row">
+				<div class="row taskComment hide">
 					<div class="col-xs-12">
 						<div class="form-group">
 							<label class="control-label col-xs-2">${text('审批意见')}：</label>
@@ -52,7 +51,6 @@
 						</div>
 					</div>
 				</div>
-				\<% } %>
 				<${'#'}bpm:nextTaskInfo bpmEntity="\${${className}}" />
 			<% } %>
 			</div>
@@ -89,13 +87,17 @@ $('#btnDraft').click(function(){
 });
 // 流程按钮操作事件
 BpmButton = window.BpmButton || {};
-BpmButton.init = function(task){}
+BpmButton.init = function(task){
+	if (task.status != '2') {
+		$('.taskComment').removeClass('hide');
+	}
+}
 BpmButton.complete = function($this, task){
 	$('#status').val(Global.STATUS_AUDIT);
 };
 // 表单验证提交事件
 <% } %>
-$("#inputForm").validate({
+$('#inputForm').validate({
 	submitHandler: function(form){
 		js.ajaxSubmitForm($(form), function(data){
 			js.showMessage(data.message);