From 6008b861ab964322e5d1eb44a86ae76dade9b494 Mon Sep 17 00:00:00 2001
From: hdm <hdm58@qq.com>
Date: Fri, 10 Feb 2023 11:10:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=88=97=E8=A1=A8=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=AE=A1=E6=89=B9=E7=90=86=E7=94=B1=E5=B1=95=E7=8E=B0?=
 =?UTF-8?q?=EF=BC=8C=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=BC=BA=E5=B0=91=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=9A=84=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/oa/view/approve/copy.html             | 5 +++--
 app/oa/view/approve/list.html             | 5 +++--
 app/project/view/index/view_overview.html | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/oa/view/approve/copy.html b/app/oa/view/approve/copy.html
index 91b13b9..a2641ad 100644
--- a/app/oa/view/approve/copy.html
+++ b/app/oa/view/approve/copy.html
@@ -31,12 +31,13 @@
 					,{field:'create_time',title: '申请时间',width:132,align:'center'}
 					,{field:'flow_type',title: '审批类型',width:100, align:'center'}
 					,{field:'department_name',title: '所属部门',width:100,align:'center'}
-					,{field:'check_user',title: '当前审批人'}
+					,{field:'check_user',title: '当前审批人',width:120,align:'center'}
+					,{field:'content',title: '理由/说明/备注'}
 					,{field:'check_status', title: '审批状态',width:80,align:'center',templet: function(d){
 						var htmlArray = ['<span style="color:#666666">待审批</span>','<span style="color:#4285f4">审批中</span>','<span style="color:#34a853">已通过</span>','<span style="color:#FF5722">已拒绝</span>','<span style="color:#fbbc05">已撤销</span>'];
 						return htmlArray[d.check_status];
 					}}
-					,{width:60,title: '操作', align:'center',templet: function(d){
+					,{width:60,fixed: 'right',title: '操作', align:'center',templet: function(d){
 						var btn='<a class="layui-btn layui-btn-xs" lay-event="view">详情</a>';
 						return btn;
 					}}
diff --git a/app/oa/view/approve/list.html b/app/oa/view/approve/list.html
index 3850e80..3a9aedf 100644
--- a/app/oa/view/approve/list.html
+++ b/app/oa/view/approve/list.html
@@ -48,12 +48,13 @@
 					,{field:'create_time',title: '申请时间',width:132,align:'center'}
 					,{field:'flow_type',title: '审批类型',width:100, align:'center'}
 					,{field:'department_name',title: '所属部门',width:100,align:'center'}
-					,{field:'check_user',title: '当前审批人'}
+					,{field:'check_user',title: '当前审批人',width:120,align:'center'}
+					,{field:'content',title: '理由/说明/备注'}
 					,{field:'check_status', title: '审批状态',width:80,align:'center',templet: function(d){
 						var htmlArray = ['<span style="color:#666666">待审批</span>','<span style="color:#4285f4">审批中</span>','<span style="color:#34a853">已通过</span>','<span style="color:#FF5722">已拒绝</span>','<span style="color:#fbbc05">已撤销</span>'];
 						return htmlArray[d.check_status];
 					}}
-					,{width:60,title: '操作', align:'center',templet: function(d){
+					,{width:60,fixed: 'right',title: '操作', align:'center',templet: function(d){
 						var btn='<a class="layui-btn layui-btn-xs" lay-event="view">详情</a>';
 						return btn;
 					}}
diff --git a/app/project/view/index/view_overview.html b/app/project/view/index/view_overview.html
index a8594d6..8f96c85 100644
--- a/app/project/view/index/view_overview.html
+++ b/app/project/view/index/view_overview.html
@@ -4,6 +4,7 @@
 			<span class="gray">项目状态：</span>
 			<span class="layui-color-{$detail.status}" id="status_{$detail.id}"
 			data-val="{$detail.status}">{$detail.status_name}</span>
+			<i class="iconfont icon-wodedianping" title="编辑" data-id="{$detail.id}" data-name="status"></i>
 			<span class="gray" style="margin-left:32px">负责人：</span>
 			<span id="director_uid_{$detail.id}" data-val="{$detail.director_uid}">{$detail.director_name}</span>
 			<i class="iconfont icon-wodedianping" title="编辑" data-id="{$detail.id}" data-name="director_uid"></i>