From 1c95dd11aca2ef6ef25235767310869f4e2f14a8 Mon Sep 17 00:00:00 2001
From: hdm <hdm58@qq.com>
Date: Tue, 6 Sep 2022 11:39:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=9B=9E=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/oa/view/work/read.html                 | 6 +++---
 public/static/assets/gougu/module/admin.js | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/oa/view/work/read.html b/app/oa/view/work/read.html
index 01ec224..80f0d5e 100644
--- a/app/oa/view/work/read.html
+++ b/app/oa/view/work/read.html
@@ -24,19 +24,19 @@
 		<tr>
 			<td class="layui-td-gray" style="vertical-align:top;">工作内容</td>
 			<td colspan="5">
-				{$detail.works}
+				{:nl2br($detail.works)}
 			</td>
 		</tr>
 		<tr>
 			<td class="layui-td-gray" style="vertical-align:top;">工作计划</td>
 			<td colspan="5">
-				{$detail.plans}
+				{:nl2br($detail.plans)}
 			</td>
 		</tr>
 		<tr>
 			<td class="layui-td-gray" style="vertical-align:top;">其他事项</td>
 			<td colspan="5">
-				{$detail.remark}
+				{:nl2br($detail.remark)}
 			</td>
 		</tr>
 		{notempty name="$detail.file_array"}
diff --git a/public/static/assets/gougu/module/admin.js b/public/static/assets/gougu/module/admin.js
index 9cb17cd..41ac9da 100644
--- a/public/static/assets/gougu/module/admin.js
+++ b/public/static/assets/gougu/module/admin.js
@@ -144,6 +144,9 @@ layui.define(['element'], function (exports) {
 	element.on('tab(gg-admin-tab)', function (data) {
 		$('#GouguAppBody').find('.gg-tab-page').removeClass('layui-show');
 		$('#GouguAppBody').find('.gg-tab-page').eq(data.index).addClass('layui-show');
+		if(data.index==0){
+			tab.refresh(0);
+		}
 		tab.tabRoll("auto", data.index);
 		tab.tabCookie();
 	});