|
@@ -252,7 +252,7 @@ class OaService extends Service
|
|
|
if (isset($data['id'])) $first = $first->where('id', '<>', $data['id']);
|
|
|
if (isset($data['type'])) $first = $first->where('type', $data['type']);
|
|
|
$first = $first->first();
|
|
|
- if ($first) return [false, '该菜单oa已存在!'];
|
|
|
+ if ($first) return [false, '该菜单对应审批流已存在'];
|
|
|
|
|
|
try {
|
|
|
DB::beginTransaction();
|
|
@@ -577,7 +577,7 @@ class OaService extends Service
|
|
|
->leftJoin('oa_sub as os', 'os.oa_id', 'o.id')
|
|
|
->select('os.sort', 'os.type', 'os.sub_id')
|
|
|
->where('o.del_time', 0)
|
|
|
- ->where('o.sub_type', 2)
|
|
|
+ ->where('o.sub_type', Oa::sub_type_two)
|
|
|
->where('os.del_time', 0)
|
|
|
->where('o.menu_id', $menu_id)
|
|
|
->orderBy('os.sort')
|
|
@@ -603,7 +603,7 @@ class OaService extends Service
|
|
|
//特殊的审批 分社采购单
|
|
|
$oa_id = Oa::where('menu_id',$menu_id)
|
|
|
->where('del_time', 0)
|
|
|
- ->where('sub_type',2)
|
|
|
+ ->where('sub_type',Oa::sub_type_two)
|
|
|
->value('id');
|
|
|
if(empty($oa_id)) {
|
|
|
//其它
|
|
@@ -618,7 +618,10 @@ class OaService extends Service
|
|
|
|
|
|
//获取oaOrder
|
|
|
public function getOaOrder($menu_id, $order_no){
|
|
|
- $oa_id = Oa::where('menu_id',$menu_id)->where('del_time', 0)->where('sub_type',2)->exists();
|
|
|
+ $oa_id = Oa::where('menu_id',$menu_id)
|
|
|
+ ->where('del_time', 0)
|
|
|
+ ->where('sub_type',Oa::sub_type_two)
|
|
|
+ ->exists();
|
|
|
if($oa_id){
|
|
|
//特殊的审批 分社采购单
|
|
|
$detail = OaOrder::where('order_no', $order_no)
|