yaooo
/
lihai-oa
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新type

This commit is contained in:
yaooo 2023-11-18 18:37:38 +08:00
parent d0f67e57ae
commit ba966a986b
15 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/controller/FinanceExpense.php
View File

@ -433,7 +433,7 @@ class FinanceExpense extends ApiController
$detail['check_user'] = '上级部门负责人'; $detail['check_user'] = '上级部门负责人';
$check_user_ids[]=get_department_manager($detail['admin_id'],1); $check_user_ids[]=get_department_manager($detail['admin_id'],1);
} }
else if($flows['flow_type']==5){ else if($flows['flow_type']==7){
$detail['check_user'] = '部门分管领导'; $detail['check_user'] = '部门分管领导';
$check_user_ids[]=get_department_leader($detail['admin_id']); $check_user_ids[]=get_department_leader($detail['admin_id']);
} }

8
app/api/controller/FinanceInvoice.php
View File

@ -190,7 +190,7 @@ class FinanceInvoice extends ApiController
} }
} }
// 当前部门分管领导 // 当前部门分管领导
if ($item['flow_type'] == 5) { if ($item['flow_type'] == 7) {
$leader = get_department_leader($this->uid); $leader = get_department_leader($this->uid);
if (empty($leader)) { if (empty($leader)) {
$this->apiError('当前部门分管领导不存在'); $this->apiError('当前部门分管领导不存在');
@ -227,7 +227,7 @@ class FinanceInvoice extends ApiController
$manager = get_department_manager($this->uid, 1); $manager = get_department_manager($this->uid, 1);
$param['check_admin_ids'] = $manager; $param['check_admin_ids'] = $manager;
} }
else if($flow[0]['flow_type'] == 5){ else if($flow[0]['flow_type'] == 7){
// 部门分管领导 // 部门分管领导
$leader = get_department_leader($this->uid); $leader = get_department_leader($this->uid);
$param['check_admin_ids'] = $leader; $param['check_admin_ids'] = $leader;
@ -306,7 +306,7 @@ class FinanceInvoice extends ApiController
$manager = get_department_manager($this->uid, 1); $manager = get_department_manager($this->uid, 1);
$param['check_admin_ids'] = $manager; $param['check_admin_ids'] = $manager;
} }
else if($flow[0]['flow_type'] == 5){ else if($flow[0]['flow_type'] == 7){
// 部门分管领导 // 部门分管领导
$leader = get_department_leader($this->uid); $leader = get_department_leader($this->uid);
$param['check_admin_ids'] = $leader; $param['check_admin_ids'] = $leader;
@ -392,7 +392,7 @@ class FinanceInvoice extends ApiController
$detail['check_user'] = '上级部门负责人'; $detail['check_user'] = '上级部门负责人';
$check_user_ids[]=get_department_manager($detail['admin_id'],1); $check_user_ids[]=get_department_manager($detail['admin_id'],1);
} }
else if($flows['flow_type']==5){ else if($flows['flow_type']==7){
$detail['check_user'] = '部门分管领导'; $detail['check_user'] = '部门分管领导';
$check_user_ids[]=get_department_leader($detail['admin_id']); $check_user_ids[]=get_department_leader($detail['admin_id']);
} }

6
app/api/controller/Index.php
View File

@ -274,7 +274,7 @@ class Index extends BaseController
if($val['flow_type'] == 4){ if($val['flow_type'] == 4){
$val['flow_type_txt'] = '指定人员会签'; $val['flow_type_txt'] = '指定人员会签';
} }
if($val['flow_type'] == 5){ if($val['flow_type'] == 7){
$val['flow_type_txt'] = '当前部门分管领导'; $val['flow_type_txt'] = '当前部门分管领导';
} }
if($val['flow_type'] == 6){ if($val['flow_type'] == 6){
@ -403,7 +403,7 @@ class Index extends BaseController
else if($next_step['flow_type'] == 2){ else if($next_step['flow_type'] == 2){
$param['check_admin_ids'] = get_department_manager($detail['admin_id'],1); $param['check_admin_ids'] = get_department_manager($detail['admin_id'],1);
} }
else if($next_step['flow_type'] == 5){ else if($next_step['flow_type'] == 7){
$param['check_admin_ids'] = get_department_leader($detail['admin_id']); $param['check_admin_ids'] = get_department_leader($detail['admin_id']);
} }
else if($next_step['flow_type'] == 6){ else if($next_step['flow_type'] == 6){
@ -459,7 +459,7 @@ class Index extends BaseController
else if($next_step['flow_type'] == 2){ else if($next_step['flow_type'] == 2){
$param['check_admin_ids'] = get_department_manager($detail['admin_id'],1); $param['check_admin_ids'] = get_department_manager($detail['admin_id'],1);
} }
else if($next_step['flow_type'] == 5){ else if($next_step['flow_type'] == 7){
$param['check_admin_ids'] = get_department_leader($detail['admin_id']); $param['check_admin_ids'] = get_department_leader($detail['admin_id']);
} }
else if($next_step['flow_type'] == 6){ else if($next_step['flow_type'] == 6){

12
app/api/controller/OaApprove.php
View File

@ -164,7 +164,7 @@ class OaApprove extends ApiController
} }
} }
// 当前部门分管领导 // 当前部门分管领导
if ($item['flow_type'] == 5) { if ($item['flow_type'] == 7) {
$leader = get_department_leader($this->uid); $leader = get_department_leader($this->uid);
if (empty($leader)) { if (empty($leader)) {
$this->apiError('当前部门分管领导不存在'); $this->apiError('当前部门分管领导不存在');
@ -199,7 +199,7 @@ class OaApprove extends ApiController
$manager = get_department_manager($this->uid, 1); $manager = get_department_manager($this->uid, 1);
$param['check_admin_ids'] = $manager; $param['check_admin_ids'] = $manager;
} }
else if($flow[0]['flow_type'] == 5){ else if($flow[0]['flow_type'] == 7){
// 部门分管领导 // 部门分管领导
$leader = get_department_leader($this->uid); $leader = get_department_leader($this->uid);
$param['check_admin_ids'] = $leader; $param['check_admin_ids'] = $leader;
@ -266,7 +266,7 @@ class OaApprove extends ApiController
$manager = get_department_manager($this->uid, 1); $manager = get_department_manager($this->uid, 1);
$param['check_admin_ids'] = $manager; $param['check_admin_ids'] = $manager;
} }
else if($flow[0]['flow_type'] == 5){ else if($flow[0]['flow_type'] == 7){
// 部门分管领导 // 部门分管领导
$leader = get_department_leader($this->uid); $leader = get_department_leader($this->uid);
$param['check_admin_ids'] = $leader; $param['check_admin_ids'] = $leader;
@ -405,7 +405,7 @@ class OaApprove extends ApiController
else if($next_step['flow_type'] == 2){ else if($next_step['flow_type'] == 2){
$param['check_admin_ids'] = get_department_manager($detail['admin_id'],1); $param['check_admin_ids'] = get_department_manager($detail['admin_id'],1);
} }
else if($next_step['flow_type'] == 5){ else if($next_step['flow_type'] == 7){
$param['check_admin_ids'] = get_department_leader($detail['admin_id']); $param['check_admin_ids'] = get_department_leader($detail['admin_id']);
} }
else if($next_step['flow_type'] == 6){ else if($next_step['flow_type'] == 6){
@ -461,7 +461,7 @@ class OaApprove extends ApiController
else if($next_step['flow_type'] == 2){ else if($next_step['flow_type'] == 2){
$param['check_admin_ids'] = get_department_manager($detail['admin_id'],1); $param['check_admin_ids'] = get_department_manager($detail['admin_id'],1);
} }
else if($next_step['flow_type'] == 5){ else if($next_step['flow_type'] == 7){
$param['check_admin_ids'] = get_department_leader($detail['admin_id']); $param['check_admin_ids'] = get_department_leader($detail['admin_id']);
} }
else if($next_step['flow_type'] == 6){ else if($next_step['flow_type'] == 6){
@ -693,7 +693,7 @@ class OaApprove extends ApiController
$detail['check_user'] = '上级部门负责人'; $detail['check_user'] = '上级部门负责人';
$check_user_ids = explode(',',$detail['check_admin_ids']); $check_user_ids = explode(',',$detail['check_admin_ids']);
} }
else if($flows['flow_type']==5){ else if($flows['flow_type']==7){
$detail['check_user'] = '部门分管领导'; $detail['check_user'] = '部门分管领导';
$check_user_ids = explode(',',$detail['check_admin_ids']); $check_user_ids = explode(',',$detail['check_admin_ids']);
} }

2
app/contract/view/index/view_set.html
View File

@ -140,7 +140,7 @@
else if(flow_data[a].flow_type==2){ else if(flow_data[a].flow_type==2){
userList+= '<li style="padding:3px 0">上级部门负责人</li>'; userList+= '<li style="padding:3px 0">上级部门负责人</li>';
} }
else if(flow_data[a].flow_type==5){ else if(flow_data[a].flow_type==7){
userList+= '<li style="padding:3px 0">当前部门分管领导</li>'; userList+= '<li style="padding:3px 0">当前部门分管领导</li>';
} }
else if(flow_data[a].flow_type==6){ else if(flow_data[a].flow_type==6){

4
app/contract/view/index/view_step.html
View File

@ -86,8 +86,8 @@
} }
} }
} }
else if(list[f].flow_type == 5 || list[f].flow_type == 6){ else if(list[f].flow_type == 7 || list[f].flow_type == 6){
checkUser=list[f].flow_type == 5?'部门分管领导':'上级部门分管领导'; checkUser=list[f].flow_type == 7?'部门分管领导':'上级部门分管领导';
if(list[f].check_list.length>0){ if(list[f].check_list.length>0){
if(list[f].check_list[0].status == 1){ if(list[f].check_list[0].status == 1){
iconStatus ='<i class="layui-icon layui-icon-ok-circle" data-ok=""></i>'; iconStatus ='<i class="layui-icon layui-icon-ok-circle" data-ok=""></i>';

8
app/finance/controller/Expense.php
View File

@ -169,7 +169,7 @@ class Expense extends BaseController
} }
} }
// 当前部门分管领导 // 当前部门分管领导
if ($item['flow_type'] == 5) { if ($item['flow_type'] == 7) {
$leader = get_department_leader($this->uid); $leader = get_department_leader($this->uid);
if (empty($leader)) { if (empty($leader)) {
return to_assign(1,'当前部门分管领导不存在'); return to_assign(1,'当前部门分管领导不存在');
@ -209,7 +209,7 @@ class Expense extends BaseController
$manager = get_department_manager($this->uid, 1); $manager = get_department_manager($this->uid, 1);
$param['check_admin_ids'] = $manager; $param['check_admin_ids'] = $manager;
} }
else if($flow[0]['flow_type'] == 5){ else if($flow[0]['flow_type'] == 7){
// 部门分管领导 // 部门分管领导
$leader = get_department_leader($this->uid); $leader = get_department_leader($this->uid);
$param['check_admin_ids'] = $leader; $param['check_admin_ids'] = $leader;
@ -319,7 +319,7 @@ class Expense extends BaseController
$manager = get_department_manager($this->uid, 1); $manager = get_department_manager($this->uid, 1);
$param['check_admin_ids'] = $manager; $param['check_admin_ids'] = $manager;
} }
else if($flow[0]['flow_type'] == 5){ else if($flow[0]['flow_type'] == 7){
// 部门分管领导 // 部门分管领导
$leader = get_department_leader($this->uid); $leader = get_department_leader($this->uid);
$param['check_admin_ids'] = $leader; $param['check_admin_ids'] = $leader;
@ -451,7 +451,7 @@ class Expense extends BaseController
$detail['check_user'] = '上级部门负责人'; $detail['check_user'] = '上级部门负责人';
$check_user_ids[]=get_department_manager($detail['admin_id'],1); $check_user_ids[]=get_department_manager($detail['admin_id'],1);
} }
else if($flows['flow_type']==5){ else if($flows['flow_type']==7){
$detail['check_user'] = '部门分管领导'; $detail['check_user'] = '部门分管领导';
$check_user_ids[]=get_department_leader($detail['admin_id']); $check_user_ids[]=get_department_leader($detail['admin_id']);
} }

8
app/finance/controller/Invoice.php
View File

@ -169,7 +169,7 @@ class Invoice extends BaseController
} }
} }
// 当前部门分管领导 // 当前部门分管领导
if ($item['flow_type'] == 5) { if ($item['flow_type'] == 7) {
$leader = get_department_leader($this->uid); $leader = get_department_leader($this->uid);
if (empty($leader)) { if (empty($leader)) {
return to_assign(1,'当前部门分管领导不存在'); return to_assign(1,'当前部门分管领导不存在');
@ -207,7 +207,7 @@ class Invoice extends BaseController
$manager = get_department_manager($this->uid, 1); $manager = get_department_manager($this->uid, 1);
$param['check_admin_ids'] = $manager; $param['check_admin_ids'] = $manager;
} }
else if($flow[0]['flow_type'] == 5){ else if($flow[0]['flow_type'] == 7){
// 部门分管领导 // 部门分管领导
$leader = get_department_leader($this->uid); $leader = get_department_leader($this->uid);
$param['check_admin_ids'] = $leader; $param['check_admin_ids'] = $leader;
@ -287,7 +287,7 @@ class Invoice extends BaseController
$manager = get_department_manager($this->uid, 1); $manager = get_department_manager($this->uid, 1);
$param['check_admin_ids'] = $manager; $param['check_admin_ids'] = $manager;
} }
else if($flow[0]['flow_type'] == 5){ else if($flow[0]['flow_type'] == 7){
// 部门分管领导 // 部门分管领导
$leader = get_department_leader($this->uid); $leader = get_department_leader($this->uid);
$param['check_admin_ids'] = $leader; $param['check_admin_ids'] = $leader;
@ -393,7 +393,7 @@ class Invoice extends BaseController
$detail['check_user'] = '上级部门负责人'; $detail['check_user'] = '上级部门负责人';
$check_user_ids[]=get_department_manager($detail['admin_id'],1); $check_user_ids[]=get_department_manager($detail['admin_id'],1);
} }
else if($flows['flow_type']==5){ else if($flows['flow_type']==7){
$detail['check_user'] = '部门分管领导'; $detail['check_user'] = '部门分管领导';
$check_user_ids[]=get_department_leader($detail['admin_id']); $check_user_ids[]=get_department_leader($detail['admin_id']);
} }

2
app/finance/view/expense/add.html
View File

@ -356,7 +356,7 @@
else if(flow_data[a].flow_type==2){ else if(flow_data[a].flow_type==2){
userList+= '<li style="padding:3px 0">上级部门负责人</li>'; userList+= '<li style="padding:3px 0">上级部门负责人</li>';
} }
else if(flow_data[a].flow_type==5){ else if(flow_data[a].flow_type==7){
userList+= '<li style="padding:3px 0">当前部门分管领导</li>'; userList+= '<li style="padding:3px 0">当前部门分管领导</li>';
} }
else if(flow_data[a].flow_type==6){ else if(flow_data[a].flow_type==6){

4
app/finance/view/expense/view.html
View File

@ -213,8 +213,8 @@ function gouguInit() {
} }
} }
} }
else if(list[f].flow_type == 5 || list[f].flow_type == 6){ else if(list[f].flow_type == 7 || list[f].flow_type == 6){
checkUser=list[f].flow_type == 5?'部门分管领导':'上级部门分管领导'; checkUser=list[f].flow_type == 7?'部门分管领导':'上级部门分管领导';
if(list[f].check_list.length>0){ if(list[f].check_list.length>0){
if(list[f].check_list[0].status == 1){ if(list[f].check_list[0].status == 1){
iconStatus ='<i class="layui-icon layui-icon-ok-circle" data-ok=""></i>'; iconStatus ='<i class="layui-icon layui-icon-ok-circle" data-ok=""></i>';

2
app/finance/view/invoice/add.html
View File

@ -291,7 +291,7 @@ function gouguInit() {
else if(flow_data[a].flow_type==2){ else if(flow_data[a].flow_type==2){
userList+= '<li style="padding:3px 0">上级部门负责人</li>'; userList+= '<li style="padding:3px 0">上级部门负责人</li>';
} }
else if(flow_data[a].flow_type==5){ else if(flow_data[a].flow_type==7){
userList+= '<li style="padding:3px 0">当前部门分管领导</li>'; userList+= '<li style="padding:3px 0">当前部门分管领导</li>';
} }
else if(flow_data[a].flow_type==6){ else if(flow_data[a].flow_type==6){

4
app/finance/view/invoice/view.html
View File

@ -282,8 +282,8 @@ function gouguInit() {
} }
} }
} }
else if(list[f].flow_type == 5 || list[f].flow_type == 6){ else if(list[f].flow_type == 7 || list[f].flow_type == 6){
checkUser=list[f].flow_type == 5?'部门分管领导':'上级部门分管领导'; checkUser=list[f].flow_type == 7?'部门分管领导':'上级部门分管领导';
if(list[f].check_list.length>0){ if(list[f].check_list.length>0){
if(list[f].check_list[0].status == 1){ if(list[f].check_list[0].status == 1){
iconStatus ='<i class="layui-icon layui-icon-ok-circle" data-ok=""></i>'; iconStatus ='<i class="layui-icon layui-icon-ok-circle" data-ok=""></i>';

6
app/oa/controller/Approve.php
View File

@ -270,7 +270,7 @@ class Approve extends BaseController
} }
} }
// 当前部门分管领导 // 当前部门分管领导
if ($item['flow_type'] == 5) { if ($item['flow_type'] == 7) {
$leader = get_department_leader($this->uid); $leader = get_department_leader($this->uid);
if (empty($leader)) { if (empty($leader)) {
return to_assign(1,'当前部门分管领导不存在'); return to_assign(1,'当前部门分管领导不存在');
@ -368,7 +368,7 @@ class Approve extends BaseController
$manager = get_department_manager($this->uid, 1); $manager = get_department_manager($this->uid, 1);
$param['check_admin_ids'] = $manager; $param['check_admin_ids'] = $manager;
} }
else if($flow[0]['flow_type'] == 5){ else if($flow[0]['flow_type'] == 7){
// 部门分管领导 // 部门分管领导
$leader = get_department_leader($this->uid); $leader = get_department_leader($this->uid);
$param['check_admin_ids'] = $leader; $param['check_admin_ids'] = $leader;
@ -497,7 +497,7 @@ class Approve extends BaseController
$detail['check_user'] = '部门分管领导'; $detail['check_user'] = '部门分管领导';
$check_user_ids = explode(',',$detail['check_admin_ids']); $check_user_ids = explode(',',$detail['check_admin_ids']);
} }
else if($flows['flow_type']==6){ else if($flows['flow_type']==7){
$detail['check_user'] = '上级部门分管领导'; $detail['check_user'] = '上级部门分管领导';
$check_user_ids = explode(',',$detail['check_admin_ids']); $check_user_ids = explode(',',$detail['check_admin_ids']);
} }

2
app/oa/view/approve/add_flow.html
View File

@ -72,7 +72,7 @@ function flowStep(){
else if(flow_data[a].flow_type==2){ else if(flow_data[a].flow_type==2){
userList+= '<li style="padding:3px 0">上级部门负责人</li>'; userList+= '<li style="padding:3px 0">上级部门负责人</li>';
} }
else if(flow_data[a].flow_type==5){ else if(flow_data[a].flow_type==7){
userList+= '<li style="padding:3px 0">当前部门分管领导</li>'; userList+= '<li style="padding:3px 0">当前部门分管领导</li>';
} }
else if(flow_data[a].flow_type==6){ else if(flow_data[a].flow_type==6){

4
app/oa/view/approve/view_script.html
View File

@ -33,8 +33,8 @@ const moduleInit = ['tool','employeepicker','oaTool'];
} }
} }
} }
else if(list[f].flow_type == 5 || list[f].flow_type == 6){ else if(list[f].flow_type == 7 || list[f].flow_type == 6){
checkUser=list[f].flow_type == 5?'部门分管领导':'上级部门分管领导'; checkUser=list[f].flow_type == 7?'部门分管领导':'上级部门分管领导';
if(list[f].check_list.length>0){ if(list[f].check_list.length>0){
if(list[f].check_list[0].status == 1){ if(list[f].check_list[0].status == 1){
iconStatus ='<i class="layui-icon layui-icon-ok-circle" data-ok=""></i>'; iconStatus ='<i class="layui-icon layui-icon-ok-circle" data-ok=""></i>';