提交

application/common/service/ApproveInfoService.php

@@ -72,11 +72,11 @@ class ApproveInfoService
             if ($info->status != CommonConstant::STATUS_4) {
                 except('非审批驳回状态无法操作');
             }
-        } else{
+        } else {
             // 9=合同呈批申请
-            if ($module==CommonConstant::MODULE_9) {
+            if ($module == CommonConstant::MODULE_9) {
                 // 存在申购申请单 判断申购申请单
-                if($params['apply_id'] > 0){
+                if ($params['apply_id'] > 0) {
                     $apply = ApproveInfo::field('id')
                         ->where('module', CommonConstant::MODULE_1)
                         ->where('status', CommonConstant::STATUS_3)
@@ -106,10 +106,11 @@ class ApproveInfoService
             'cur_num' => 0,
             'order_no' => $order_no,
             'apply_date' => date("Y-m-d"),
+            'reason' => $reason,
             'type' => $params['type'],
             'desc' => $params['desc'],
-            'start_time' => $module == CommonConstant::MODULE_6 ? $params['start_time'].' '.$params['start_am'] : $params['start_time'],
-            'end_time' => $module == CommonConstant::MODULE_6 ? $params['end_time'].' '.$params['end_am'] : $params['end_time'],
+            'start_time' => $module == CommonConstant::MODULE_6 ? $params['start_time''] . '  . $params['start_am'] : $params['start_time'],
+            'end_time' => $module == CommonConstant::MODULE_6 ? $params['end_time'] . ' ' . $params['end_am'] : $params['end_time'],
             'apply_id' => $params['apply_id'],
         ];
 
@@ -123,6 +124,9 @@ class ApproveInfoService
                 self::create_approve($approve_user, $copy_user, $userid, $id, 'update');
 
                 // 编辑审批申请
+                if ($module == CommonConstant::MODULE_9) {
+                    unset($data['reason']);
+                }
                 $save_data = [
                     'create_at' => date('Y-m-d H:i:s'),
                 ];
@@ -130,7 +134,6 @@ class ApproveInfoService
                 $info->save($data);
             } else {
                 // 添加审批申请
-                $data['reason'] = $reason;
                 $info = ApproveInfo::create($data);
                 $info_id = $info->id;
 
@@ -252,11 +255,8 @@ class ApproveInfoService
                 $data['images'] = $params['images'];
                 break;
             case CommonConstant::MODULE_9:
-                if ($type == 'update') {
-                } else{
-                    $data['reason'] = $params['reason'];
-                }
                 $data['info_id'] = $info_id;
+                $data['reason'] = $params['reason'];
                 $data['type'] = $params['type'];
                 $data['desc'] = $params['desc'];
                 $data['number'] = $params['number'];
@@ -264,6 +264,9 @@ class ApproveInfoService
                 $data['legal_opinion'] = $params['legal_opinion'];
                 $data['document'] = $params['document'];
                 $data['remark'] = $params['remark'];
+                if ($type == 'update') {
+                    unset($data['reason']);
+                }
                 break;
             case CommonConstant::MODULE_10:
                 $data['info_id'] = $info_id;
@@ -425,28 +428,28 @@ class ApproveInfoService
         if ($category_first_data) {
             $category_first_list = GoodsCategoryService::get_list([['name', 'in', array_keys($category_first_data)]]);
             $category_first_object = $category_first_list ? array_column($category_first_list->toArray(), null, 'name') : [];
-            foreach ($category_first_data as $key=>$value){
-                if(array_key_exists($key,$category_first_object)){
+            foreach ($category_first_data as $key => $value) {
+                if (array_key_exists($key, $category_first_object)) {
                     // 一级里有该商品分类
                     $category_first_info = $category_first_object[$key];
                     $goods_category_first_id = $category_first_info['id'];
                     $category_second_object = $category_first_info['childlist'] ? array_column($category_first_info['childlist'], null, 'name') : [];
-                } else{
+                } else {
                     // 一级里没有该商品分类 创建
-                    $goods_category_first = GoodsCategory::create(['name'=>$key]);
+                    $goods_category_first = GoodsCategory::create(['name' => $key]);
                     $goods_category_first_id = $goods_category_first->id;
                     $category_second_object = [];
                 }
 
                 $childlist = [];
-                foreach ($value as $kk=>$vv){
-                    if(array_key_exists($kk,$category_second_object)){
+                foreach ($value as $kk => $vv) {
+                    if (array_key_exists($kk, $category_second_object)) {
                         // 二级里有该商品分类
                         $category_second_info = $category_second_object[$kk];
                         $goods_category_id = $category_second_info['id'];
                     } else {
                         // 二级里没有该商品分类 创建
-                        $goods_category = GoodsCategory::create(['pid'=>$goods_category_first_id,'name'=>$kk]);
+                        $goods_category = GoodsCategory::create(['pid' => $goods_category_first_id, 'name' => $kk]);
                         $goods_category_id = $goods_category->id;
                     }
                     $childlist[] = [
@@ -455,15 +458,15 @@ class ApproveInfoService
                     ];
                 }
                 $category_data[] = [
-                    'id'=>$goods_category_first_id,
-                    'name'=>$key,
-                    'childlist'=>$childlist
+                    'id' => $goods_category_first_id,
+                    'name' => $key,
+                    'childlist' => $childlist
                 ];
             }
         }
         $category_object = $category_data ? array_column($category_data, null, 'name') : [];
 
-        foreach ($params as $key=>$value) {
+        foreach ($params as $key => $value) {
             if ($value['flag'] == '1') {
                 // 添加新商品
                 $goods_ids_new[$key] = $value;
@@ -482,7 +485,7 @@ class ApproveInfoService
             }
             if ($value['flag'] == '2') {
                 // 批量导入
-                if(array_key_exists($value['goods_category_first'],$category_object)) {
+                if (array_key_exists($value['goods_category_first'], $category_object)) {
                     $category_info = $category_object[$value['goods_category_first']];
                     $goods_category_first_id = $category_info['id'];
                     $category_info_object = array_column($category_info['childlist'], null, 'name');
@@ -820,7 +823,7 @@ class ApproveInfoService
                     ->where('module', CommonConstant::MODULE_9)
                     ->where('status', CommonConstant::STATUS_3)
                     ->where('is_deleted', CommonConstant::IS_DELETED_0)
-                    ->where('apply_id',$id)
+                    ->where('apply_id', $id)
                     ->select();
                 $info['create_user'] = $create_user;
                 $info['apply_user'] = $apply_user;
@@ -866,13 +869,13 @@ class ApproveInfoService
                                 ]);
                         },
                         'applyGoods' => function ($query) {
-                            $query->field('create_at',true);
+                            $query->field('create_at', true);
                         },
                     ]);
                 } else {
                     $list = $list->with([
                         'applyGoods' => function ($query) {
-                            $query->field('create_at',true);
+                            $query->field('create_at', true);
                         },
                     ]);
                 }