From ba966a986bcd9331d031196dfe284696abcf89ce Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Sat, 18 Nov 2023 18:37:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0type?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/api/controller/FinanceExpense.php | 2 +-
app/api/controller/FinanceInvoice.php | 8 ++++----
app/api/controller/Index.php | 6 +++---
app/api/controller/OaApprove.php | 12 ++++++------
app/contract/view/index/view_set.html | 2 +-
app/contract/view/index/view_step.html | 4 ++--
app/finance/controller/Expense.php | 8 ++++----
app/finance/controller/Invoice.php | 8 ++++----
app/finance/view/expense/add.html | 2 +-
app/finance/view/expense/view.html | 4 ++--
app/finance/view/invoice/add.html | 2 +-
app/finance/view/invoice/view.html | 4 ++--
app/oa/controller/Approve.php | 6 +++---
app/oa/view/approve/add_flow.html | 2 +-
app/oa/view/approve/view_script.html | 4 ++--
15 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/app/api/controller/FinanceExpense.php b/app/api/controller/FinanceExpense.php
index 0db3b03..13da0fa 100644
--- a/app/api/controller/FinanceExpense.php
+++ b/app/api/controller/FinanceExpense.php
@@ -433,7 +433,7 @@ class FinanceExpense extends ApiController
$detail['check_user'] = '上级部门负责人';
$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'] = '部门分管领导';
$check_user_ids[]=get_department_leader($detail['admin_id']);
}
diff --git a/app/api/controller/FinanceInvoice.php b/app/api/controller/FinanceInvoice.php
index f7513a4..611488a 100644
--- a/app/api/controller/FinanceInvoice.php
+++ b/app/api/controller/FinanceInvoice.php
@@ -190,7 +190,7 @@ class FinanceInvoice extends ApiController
}
}
// 当前部门分管领导
- if ($item['flow_type'] == 5) {
+ if ($item['flow_type'] == 7) {
$leader = get_department_leader($this->uid);
if (empty($leader)) {
$this->apiError('当前部门分管领导不存在');
@@ -227,7 +227,7 @@ class FinanceInvoice extends ApiController
$manager = get_department_manager($this->uid, 1);
$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);
$param['check_admin_ids'] = $leader;
@@ -306,7 +306,7 @@ class FinanceInvoice extends ApiController
$manager = get_department_manager($this->uid, 1);
$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);
$param['check_admin_ids'] = $leader;
@@ -392,7 +392,7 @@ class FinanceInvoice extends ApiController
$detail['check_user'] = '上级部门负责人';
$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'] = '部门分管领导';
$check_user_ids[]=get_department_leader($detail['admin_id']);
}
diff --git a/app/api/controller/Index.php b/app/api/controller/Index.php
index 6292e9d..01637ee 100644
--- a/app/api/controller/Index.php
+++ b/app/api/controller/Index.php
@@ -274,7 +274,7 @@ class Index extends BaseController
if($val['flow_type'] == 4){
$val['flow_type_txt'] = '指定人员会签';
}
- if($val['flow_type'] == 5){
+ if($val['flow_type'] == 7){
$val['flow_type_txt'] = '当前部门分管领导';
}
if($val['flow_type'] == 6){
@@ -403,7 +403,7 @@ class Index extends BaseController
else if($next_step['flow_type'] == 2){
$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']);
}
else if($next_step['flow_type'] == 6){
@@ -459,7 +459,7 @@ class Index extends BaseController
else if($next_step['flow_type'] == 2){
$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']);
}
else if($next_step['flow_type'] == 6){
diff --git a/app/api/controller/OaApprove.php b/app/api/controller/OaApprove.php
index d2a1e5e..0b2c997 100644
--- a/app/api/controller/OaApprove.php
+++ b/app/api/controller/OaApprove.php
@@ -164,7 +164,7 @@ class OaApprove extends ApiController
}
}
// 当前部门分管领导
- if ($item['flow_type'] == 5) {
+ if ($item['flow_type'] == 7) {
$leader = get_department_leader($this->uid);
if (empty($leader)) {
$this->apiError('当前部门分管领导不存在');
@@ -199,7 +199,7 @@ class OaApprove extends ApiController
$manager = get_department_manager($this->uid, 1);
$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);
$param['check_admin_ids'] = $leader;
@@ -266,7 +266,7 @@ class OaApprove extends ApiController
$manager = get_department_manager($this->uid, 1);
$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);
$param['check_admin_ids'] = $leader;
@@ -405,7 +405,7 @@ class OaApprove extends ApiController
else if($next_step['flow_type'] == 2){
$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']);
}
else if($next_step['flow_type'] == 6){
@@ -461,7 +461,7 @@ class OaApprove extends ApiController
else if($next_step['flow_type'] == 2){
$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']);
}
else if($next_step['flow_type'] == 6){
@@ -693,7 +693,7 @@ class OaApprove extends ApiController
$detail['check_user'] = '上级部门负责人';
$check_user_ids = explode(',',$detail['check_admin_ids']);
}
- else if($flows['flow_type']==5){
+ else if($flows['flow_type']==7){
$detail['check_user'] = '部门分管领导';
$check_user_ids = explode(',',$detail['check_admin_ids']);
}
diff --git a/app/contract/view/index/view_set.html b/app/contract/view/index/view_set.html
index dfaa464..3a00f26 100644
--- a/app/contract/view/index/view_set.html
+++ b/app/contract/view/index/view_set.html
@@ -140,7 +140,7 @@
else if(flow_data[a].flow_type==2){
userList+= '上级部门负责人';
}
- else if(flow_data[a].flow_type==5){
+ else if(flow_data[a].flow_type==7){
userList+= '当前部门分管领导';
}
else if(flow_data[a].flow_type==6){
diff --git a/app/contract/view/index/view_step.html b/app/contract/view/index/view_step.html
index 6954991..5bf5386 100644
--- a/app/contract/view/index/view_step.html
+++ b/app/contract/view/index/view_step.html
@@ -86,8 +86,8 @@
}
}
}
- else if(list[f].flow_type == 5 || list[f].flow_type == 6){
- checkUser=list[f].flow_type == 5?'部门分管领导':'上级部门分管领导';
+ else if(list[f].flow_type == 7 || list[f].flow_type == 6){
+ checkUser=list[f].flow_type == 7?'部门分管领导':'上级部门分管领导';
if(list[f].check_list.length>0){
if(list[f].check_list[0].status == 1){
iconStatus ='';
diff --git a/app/finance/controller/Expense.php b/app/finance/controller/Expense.php
index 3447774..ee4e50f 100644
--- a/app/finance/controller/Expense.php
+++ b/app/finance/controller/Expense.php
@@ -169,7 +169,7 @@ class Expense extends BaseController
}
}
// 当前部门分管领导
- if ($item['flow_type'] == 5) {
+ if ($item['flow_type'] == 7) {
$leader = get_department_leader($this->uid);
if (empty($leader)) {
return to_assign(1,'当前部门分管领导不存在');
@@ -209,7 +209,7 @@ class Expense extends BaseController
$manager = get_department_manager($this->uid, 1);
$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);
$param['check_admin_ids'] = $leader;
@@ -319,7 +319,7 @@ class Expense extends BaseController
$manager = get_department_manager($this->uid, 1);
$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);
$param['check_admin_ids'] = $leader;
@@ -451,7 +451,7 @@ class Expense extends BaseController
$detail['check_user'] = '上级部门负责人';
$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'] = '部门分管领导';
$check_user_ids[]=get_department_leader($detail['admin_id']);
}
diff --git a/app/finance/controller/Invoice.php b/app/finance/controller/Invoice.php
index 767ad8b..fe769c3 100644
--- a/app/finance/controller/Invoice.php
+++ b/app/finance/controller/Invoice.php
@@ -169,7 +169,7 @@ class Invoice extends BaseController
}
}
// 当前部门分管领导
- if ($item['flow_type'] == 5) {
+ if ($item['flow_type'] == 7) {
$leader = get_department_leader($this->uid);
if (empty($leader)) {
return to_assign(1,'当前部门分管领导不存在');
@@ -207,7 +207,7 @@ class Invoice extends BaseController
$manager = get_department_manager($this->uid, 1);
$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);
$param['check_admin_ids'] = $leader;
@@ -287,7 +287,7 @@ class Invoice extends BaseController
$manager = get_department_manager($this->uid, 1);
$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);
$param['check_admin_ids'] = $leader;
@@ -393,7 +393,7 @@ class Invoice extends BaseController
$detail['check_user'] = '上级部门负责人';
$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'] = '部门分管领导';
$check_user_ids[]=get_department_leader($detail['admin_id']);
}
diff --git a/app/finance/view/expense/add.html b/app/finance/view/expense/add.html
index 5e3217d..2b36d6e 100644
--- a/app/finance/view/expense/add.html
+++ b/app/finance/view/expense/add.html
@@ -356,7 +356,7 @@
else if(flow_data[a].flow_type==2){
userList+= '上级部门负责人';
}
- else if(flow_data[a].flow_type==5){
+ else if(flow_data[a].flow_type==7){
userList+= '当前部门分管领导';
}
else if(flow_data[a].flow_type==6){
diff --git a/app/finance/view/expense/view.html b/app/finance/view/expense/view.html
index 8afc31b..8d601f8 100644
--- a/app/finance/view/expense/view.html
+++ b/app/finance/view/expense/view.html
@@ -213,8 +213,8 @@ function gouguInit() {
}
}
}
- else if(list[f].flow_type == 5 || list[f].flow_type == 6){
- checkUser=list[f].flow_type == 5?'部门分管领导':'上级部门分管领导';
+ else if(list[f].flow_type == 7 || list[f].flow_type == 6){
+ checkUser=list[f].flow_type == 7?'部门分管领导':'上级部门分管领导';
if(list[f].check_list.length>0){
if(list[f].check_list[0].status == 1){
iconStatus ='';
diff --git a/app/finance/view/invoice/add.html b/app/finance/view/invoice/add.html
index 82630f3..d6727ad 100644
--- a/app/finance/view/invoice/add.html
+++ b/app/finance/view/invoice/add.html
@@ -291,7 +291,7 @@ function gouguInit() {
else if(flow_data[a].flow_type==2){
userList+= '上级部门负责人';
}
- else if(flow_data[a].flow_type==5){
+ else if(flow_data[a].flow_type==7){
userList+= '当前部门分管领导';
}
else if(flow_data[a].flow_type==6){
diff --git a/app/finance/view/invoice/view.html b/app/finance/view/invoice/view.html
index bc4e8eb..7daed33 100644
--- a/app/finance/view/invoice/view.html
+++ b/app/finance/view/invoice/view.html
@@ -282,8 +282,8 @@ function gouguInit() {
}
}
}
- else if(list[f].flow_type == 5 || list[f].flow_type == 6){
- checkUser=list[f].flow_type == 5?'部门分管领导':'上级部门分管领导';
+ else if(list[f].flow_type == 7 || list[f].flow_type == 6){
+ checkUser=list[f].flow_type == 7?'部门分管领导':'上级部门分管领导';
if(list[f].check_list.length>0){
if(list[f].check_list[0].status == 1){
iconStatus ='';
diff --git a/app/oa/controller/Approve.php b/app/oa/controller/Approve.php
index 1e9266c..7edd835 100644
--- a/app/oa/controller/Approve.php
+++ b/app/oa/controller/Approve.php
@@ -270,7 +270,7 @@ class Approve extends BaseController
}
}
// 当前部门分管领导
- if ($item['flow_type'] == 5) {
+ if ($item['flow_type'] == 7) {
$leader = get_department_leader($this->uid);
if (empty($leader)) {
return to_assign(1,'当前部门分管领导不存在');
@@ -368,7 +368,7 @@ class Approve extends BaseController
$manager = get_department_manager($this->uid, 1);
$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);
$param['check_admin_ids'] = $leader;
@@ -497,7 +497,7 @@ class Approve extends BaseController
$detail['check_user'] = '部门分管领导';
$check_user_ids = explode(',',$detail['check_admin_ids']);
}
- else if($flows['flow_type']==6){
+ else if($flows['flow_type']==7){
$detail['check_user'] = '上级部门分管领导';
$check_user_ids = explode(',',$detail['check_admin_ids']);
}
diff --git a/app/oa/view/approve/add_flow.html b/app/oa/view/approve/add_flow.html
index 6cb24c8..5942f11 100644
--- a/app/oa/view/approve/add_flow.html
+++ b/app/oa/view/approve/add_flow.html
@@ -72,7 +72,7 @@ function flowStep(){
else if(flow_data[a].flow_type==2){
userList+= '上级部门负责人';
}
- else if(flow_data[a].flow_type==5){
+ else if(flow_data[a].flow_type==7){
userList+= '当前部门分管领导';
}
else if(flow_data[a].flow_type==6){
diff --git a/app/oa/view/approve/view_script.html b/app/oa/view/approve/view_script.html
index 516fe43..90d2947 100644
--- a/app/oa/view/approve/view_script.html
+++ b/app/oa/view/approve/view_script.html
@@ -33,8 +33,8 @@ const moduleInit = ['tool','employeepicker','oaTool'];
}
}
}
- else if(list[f].flow_type == 5 || list[f].flow_type == 6){
- checkUser=list[f].flow_type == 5?'部门分管领导':'上级部门分管领导';
+ else if(list[f].flow_type == 7 || list[f].flow_type == 6){
+ checkUser=list[f].flow_type == 7?'部门分管领导':'上级部门分管领导';
if(list[f].check_list.length>0){
if(list[f].check_list[0].status == 1){
iconStatus ='';