mkm/dev_oa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

审批列表新增审批理由展现，项目详情修复缺少修改项目状态的按钮

Browse Source
This commit is contained in:
hdm 2023-02-10 11:10:22 +08:00
parent 32abdece55
commit 6008b861ab
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/oa/view/approve/copy.html
View File

@ -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;
}}

5
app/oa/view/approve/list.html
View File

@ -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;
}}

1
app/project/view/index/view_overview.html
View File

@ -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>