cqp 1 month ago
parent
commit
191ab09e7f

+ 76 - 0
app/Http/Controllers/Api/CostManagementController.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Service\CostManagementService;
+use Illuminate\Http\Request;
+
+class CostManagementController extends BaseController
+{
+    public function costManagementEdit(Request $request)
+    {
+        $service = new CostManagementService();
+        $user = $request->userData;
+        list($status,$data) = $service->costManagementEdit($request->all(),$user);
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+
+    public function costManagementAdd(Request $request)
+    {
+        $service = new CostManagementService();
+        $user = $request->userData;
+        list($status,$data) = $service->costManagementAdd($request->all(),$user);
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+
+    }
+
+    public function costManagementDel(Request $request)
+    {
+        $service = new CostManagementService();
+        $user = $request->userData;
+        list($status,$data) = $service->costManagementDel($request->all());
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+
+    }
+
+    public function costManagementList(Request $request)
+    {
+        $service = new CostManagementService();
+        $user = $request->userData;
+        list($status,$data) = $service->costManagementList($request->all(),$user);
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+
+    public function costManagementDetail(Request $request)
+    {
+        $service = new CostManagementService();
+        $user = $request->userData;
+        list($status,$data) = $service->costManagementDetail($request->all(),$user);
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+}

+ 14 - 0
app/Model/CostManagement.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Model;
+
+class CostManagement extends UseScopeBaseModel
+{
+    protected $table = "cost_management"; //指定表
+    const CREATED_AT = 'crt_time';
+    const UPDATED_AT = 'upd_time';
+    protected $dateFormat = 'U';
+    const employee_column = "crt_id";
+
+    public static $field = ['man_mark','id','mark','amount','crt_id','crt_time','customer_supply_id', 'order_time'];
+}

+ 2 - 0
app/Model/Dimension.php

@@ -13,9 +13,11 @@ class Dimension extends UseScopeBaseModel
 
     const type_one = 1;
     const type_two = 2;
+    const type_three = 3;
     public static $type_name = [
         self::type_one => '能力量化',
         self::type_two => '合作现状量化',
+        self::type_three => '人物记忆',
     ];
 
     const is_use_zero = 0;

+ 3 - 1
app/Model/Quantization.php

@@ -9,7 +9,7 @@ class Quantization extends UseScopeBaseModel
     const UPDATED_AT = 'upd_time';
     protected $dateFormat = 'U';
 
-    public static $field = ['title','id','code','crt_time','is_use','crt_id','type'];
+    public static $field = ['title','id','code','crt_time','is_use','crt_id','type','industry','model_mark'];
 
     const is_use_zero = 0;
     const is_use_one = 1;
@@ -20,8 +20,10 @@ class Quantization extends UseScopeBaseModel
 
     const type_one = 1;
     const type_two = 2;
+    const type_three = 3;
     public static $type_name = [
         self::type_one => '能力量化',
         self::type_two => '合作现状量化',
+        self::type_three => '人物记忆',
     ];
 }

+ 3 - 1
app/Model/QuantizationCreate.php

@@ -10,12 +10,14 @@ class QuantizationCreate extends UseScopeBaseModel
     protected $dateFormat = 'U';
     const employee_column = "crt_id";
 
-    public static $field = ['customer_supply_id','id','crt_time','crt_id','type','products','score','start_time','end_time','quantization_id'];
+    public static $field = ['data_id','data_title','id','crt_time','crt_id','type','products','score','start_time','end_time','quantization_id','address', 'man_mark', 'address_title'];
 
     const type_one = 1;
     const type_two = 2;
+    const type_three = 3;
     public static $type_name = [
         self::type_one => '能力量化',
         self::type_two => '合作现状量化',
+        self::type_three => '人物记忆',
     ];
 }

+ 167 - 0
app/Service/CostManagementService.php

@@ -0,0 +1,167 @@
+<?php
+
+namespace App\Service;
+
+use App\Model\CustomerSupply;
+use App\Model\Employee;
+use App\Model\CostManagement;
+use App\Model\CostManagementDetails;
+use Illuminate\Support\Facades\DB;
+
+class CostManagementService extends Service
+{
+    public function costManagementEdit($data,$user){
+        list($status,$msg) = $this->costManagementRule($data, $user, false);
+        if(!$status) return [$status,$msg];
+
+        try {
+            DB::beginTransaction();
+
+            $model = CostManagement::where('id',$data['id'])->first();
+            $model->customer_supply_id = $data['customer_supply_id'] ?? 0;
+            $model->order_time = $data['order_time'] ?? 0;
+            $model->man_mark = $data['man_mark'] ?? '';
+            $model->mark = $data['mark'] ?? 0;
+            $model->amount = $data['amount'] ?? 0;
+            $model->save();
+
+            DB::commit();
+        }catch (\Exception $exception){
+            DB::rollBack();
+            return [false,$exception->getMessage()];
+        }
+
+        return [true, ''];
+    }
+
+    public function costManagementAdd($data,$user){
+        list($status,$msg) = $this->costManagementRule($data, $user);
+        if(!$status) return [$status,$msg];
+
+        try {
+            DB::beginTransaction();
+
+            $model = new CostManagement();
+            $model->customer_supply_id = $data['customer_supply_id'] ?? 0;
+            $model->order_time = $data['order_time'] ?? 0;
+            $model->man_mark = $data['man_mark'] ?? '';
+            $model->mark = $data['mark'] ?? 0;
+            $model->amount = $data['amount'] ?? 0;
+            $model->crt_id = $user['id'];
+            $model->save();
+
+            DB::commit();
+        }catch (\Exception $exception){
+            DB::rollBack();
+            return [false,$exception->getMessage()];
+        }
+
+        return [true, ''];
+    }
+
+    private function saveDetail($id, $time, $data){
+
+    }
+
+    private function getDetail($id){
+
+    }
+
+    public function costManagementDel($data){
+        if($this->isEmpty($data,'id')) return [false,'请选择数据!'];
+
+        try {
+            DB::beginTransaction();
+            $time = time();
+
+            CostManagement::where('del_time',0)
+                ->whereIn('id',$data['id'])
+                ->update(['del_time' => $time]);
+
+            DB::commit();
+        }catch (\Exception $exception){
+            DB::rollBack();
+            return [false,$exception->getMessage()];
+        }
+
+        return [true, ''];
+    }
+
+    public function costManagementDetail($data, $user){
+        if($this->isEmpty($data,'id')) return [false,'请选择数据!'];
+        $customer = CostManagement::where('del_time',0)
+            ->where('id',$data['id'])
+            ->first();
+        if(empty($customer)) return [false,'费用不存在或已被删除'];
+        $customer = $customer->toArray();
+        $customer['crt_name'] = Employee::where('id',$customer['crt_id'])->value('emp_name');
+        $customer['crt_time'] = $customer['crt_time'] ? date("Y-m-d H:i:s",$customer['crt_time']): '';
+        $customer['order_time'] = $customer['order_time'] ? date("Y-m-d",$customer['order_time']): '';
+        $customer['customer_supply_title'] = $customer['customer_supply_id'] ? CustomerSupply::where('id',$customer['customer_supply_id'])->value('title') : "";
+
+        return [true, $customer];
+    }
+
+    public function costManagementCommon($data,$user, $field = []){
+        if(empty($field)) $field = CostManagement::$field;
+
+        $model = CostManagement::Clear($user,$data);
+        $model = $model->where('del_time',0)
+            ->select($field)
+            ->orderby('id', 'desc');
+
+        if(! empty($data['man_mark'])) $model->where('man_mark', 'LIKE', '%'.$data['man_mark'].'%');
+        if(! empty($data['id'])) $model->whereIn('id', $data['id']);
+        if(! empty($data['order_time'][0]) && ! empty($data['order_time'][1])) {
+            $return = $this->changeDateToTimeStampAboutRange($data['order_time']);
+            $model->where('order_time','>=',$return[0]);
+            $model->where('order_time','<=',$return[1]);
+        }
+
+        return $model;
+    }
+
+    public function costManagementList($data,$user){
+        $model = $this->costManagementCommon($data, $user);
+        $list = $this->limit($model,'',$data);
+        $list = $this->fillData($list,$user,$data);
+
+        $list['count'] = $this->countTotal($list['data'], $user['header_default']);
+
+        return [true, $list];
+    }
+
+    public function costManagementRule(&$data, $user, $is_add = true){
+        if(empty($data['order_time'])) return [false, '费用日期不能为空'];
+        $data['order_time'] = $this->changeDateToDate($data['order_time']);
+        if(empty($data['amount'])) return [false, '总金额不能为空'];
+        $res = $this->checkNumber($data['amount'],2,'positive');
+        if(! $res['valid']) return [false,'总金额:' . $res['error']];
+        if($is_add){
+
+        }else{
+            if(empty($data['id'])) return [false,'ID不能为空'];
+            $bool = CostManagement::where('id','<>',$data['id'])
+                ->where('del_time',0)
+                ->exists();
+            if(! $bool) return [false, '费用不存在'];
+        }
+
+        return [true, ''];
+    }
+
+    public function fillData($data, $user, $search){
+        if(empty($data['data'])) return $data;
+
+        $emp = (new EmployeeService())->getEmployeeMap(array_unique(array_column($data['data'],'crt_id')));
+        $emp_2 = (new CustomerSupplyService())->getEmployeeMap(array_unique(array_column($data['data'],'customer_supply_id')));
+        foreach ($data['data'] as $key => $value){
+            $data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s',$value['crt_time']) : '';
+            $data['data'][$key]['order_time'] = $value['order_time'] ? date('Y-m-d',$value['order_time']) : '';
+            $data['data'][$key]['crt_name'] = $emp[$value['crt_id']] ?? '';
+            $data['data'][$key]['customer_supply_title'] = $emp_2[$value['customer_supply_id']] ?? '';
+        }
+
+        return $data;
+    }
+}

+ 17 - 0
app/Service/OrganizationService.php

@@ -235,6 +235,14 @@ class OrganizationService extends Service
         return $model;
     }
 
+    public function organizationListForSearch($data,$user){
+        $model = $this->organizationCommon($data, $user,['id']);
+        $id = $model->get()->toArray();
+        $id = array_column($id,'id');
+
+        return [true, $id];
+    }
+
     public function organizationList($data,$user){
         $model = $this->organizationCommon($data, $user);
         $list = $this->limit($model,'',$data);
@@ -328,4 +336,13 @@ class OrganizationService extends Service
         });
     }
 
+    public function getMap($id){
+        if(empty($id)) return [];
+        if(! is_array($id)) $id = [$id];
+
+        return Organization::whereIn('id', $id)
+            ->pluck('title', 'id')
+            ->all();
+    }
+
 }

+ 68 - 42
app/Service/QuantizationService.php

@@ -5,6 +5,7 @@ namespace App\Service;
 use App\Model\CustomerSupply;
 use App\Model\Dimension;
 use App\Model\Employee;
+use App\Model\Organization;
 use App\Model\Quantization;
 use App\Model\QuantizationCreate;
 use App\Model\QuantizationCreateDetails;
@@ -25,6 +26,8 @@ class QuantizationService extends Service
             $model->title = $data['title'] ?? '';
             $model->code = $data['code'] ?? '';
             $model->is_use = $data['is_use'] ?? 0;
+            $model->industry = $data['industry'] ?? '';
+            $model->model_mark = $data['model_mark'] ?? '';
             $model->save();
 
             $time = time();
@@ -55,6 +58,8 @@ class QuantizationService extends Service
             $model->code = $data['code'] ?? '';
             $model->is_use = $data['is_use'] ?? 0;
             $model->type = $data['type'] ?? 0;
+            $model->industry = $data['industry'] ?? '';
+            $model->model_mark = $data['model_mark'] ?? '';
             $model->crt_id = $user['id'];
             $model->save();
 
@@ -284,12 +289,17 @@ class QuantizationService extends Service
             DB::beginTransaction();
 
             $model = QuantizationCreate::where('id',$data['id'])->first();
-            $model->customer_supply_id = $data['customer_supply_id'];
+            $model->data_id = $data['data_id'] ?? 0;
+            $model->data_title = $data['data_title'] ?? '';
             $model->quantization_id = $data['quantization_id'];
             $model->start_time = $data['start_time'] ?? 0;
             $model->end_time = $data['end_time'] ?? 0;
             $model->products = $data['products'] ?? '';
             $model->score = $data['score'] ?? 0;
+            $model->address = $data['address'] ?? '';
+            $model->address_title = $data['address_title'] ?? '';
+            $model->man_mark = $data['man_mark'] ?? '';
+            $model->result_type = $data['result_type'] ?? 0;
             $model->save();
 
             $time = time();
@@ -316,13 +326,18 @@ class QuantizationService extends Service
             DB::beginTransaction();
 
             $model = new QuantizationCreate();
-            $model->customer_supply_id = $data['customer_supply_id'];
+            $model->data_id = $data['data_id'] ?? 0;
+            $model->data_title = $data['data_title'] ?? '';
             $model->quantization_id = $data['quantization_id'];
             $model->start_time = $data['start_time'] ?? 0;
             $model->end_time = $data['end_time'] ?? 0;
             $model->products = $data['products'] ?? '';
             $model->score = $data['score'] ?? 0;
             $model->type = $data['type'] ?? 0;
+            $model->address = $data['address'] ?? '';
+            $model->address_title = $data['address_title'] ?? '';
+            $model->man_mark = $data['man_mark'] ?? '';
+            $model->result_type = $data['result_type'] ?? 0;
             $model->crt_id = $user['id'];
             $model->save();
 
@@ -434,12 +449,6 @@ class QuantizationService extends Service
             ->first();
         if(empty($customer)) return [false,'量化信息不存在或已被删除'];
         $customer = $customer->toArray();
-
-        $emp_2 = (new CustomerSupplyService())->getEmployeeMap([$customer['customer_supply_id']],'detail');
-        $e = $emp_2[$customer['customer_supply_id']] ?? [];
-        $customer['organization_title'] = $e['organization_title'] ?? "";
-        $customer['customer_supply_title'] = $e['title'] ?? "";
-        $customer['customer_supply_code'] = $e['code'] ?? "";
         $customer['quantization_title'] = Quantization::where('id', $customer['quantization_id'])->value('title');
 
         $details = $this->getDetail1($customer['id']);
@@ -460,14 +469,19 @@ class QuantizationService extends Service
             ->orderby('id', 'desc');
 
         if(! empty($data['type'])) $model->where('type', $data['type']);
+        if(! empty($data['result_type'])) $model->where('result_type', $data['result_type']);
         if(! empty($data['id'])) $model->whereIn('id', $data['id']);
-        if(! empty($data['customer_supply_title'])){
-            list($status, $id) = (new CustomerSupplyService())->customerSupplyListForSearch(['title' => $data['customer_supply_title']], $user);
-            $model->whereIn('customer_supply_id', $id);
-        }
-        if(! empty($data['customer_supply_code'])){
-            list($status, $id) = (new CustomerSupplyService())->customerSupplyListForSearch(['code' => $data['customer_supply_code']], $user);
-            $model->whereIn('customer_supply_id', $id);
+        if(! empty($data['data_title'])) $model->where('data_title', 'LIKE', '%'.$data['data_title'].'%');
+        if($data['type'] == QuantizationCreate::type_one || $data['type'] == QuantizationCreate::type_two){
+            if(! empty($data['data_code'])){
+                list($status, $id) = (new OrganizationService())->organizationListForSearch(['code' => $data['data_code']], $user);
+                $model->whereIn('data_id', $id);
+            }
+        }else{
+            if(! empty($data['data_code'])){
+                list($status, $id) = (new CustomerSupplyService())->customerSupplyListForSearch(['code' => $data['data_code']], $user);
+                $model->whereIn('data_id', $id);
+            }
         }
         if(! empty($data['crt_time'][0]) && ! empty($data['crt_time'][1])) {
             $return = $this->changeDateToTimeStampAboutRange($data['crt_time']);
@@ -502,16 +516,33 @@ class QuantizationService extends Service
         $q = $q->toArray();
         if(! isset(QuantizationCreate::$type_name[$data['type']])) return [false, '量化档案类型错误'];
         if($q['type'] != $data['type']) return [false, '引用档案类型与量化档案类型不一致'];
-        if($data['type'] == QuantizationCreate::type_two){
+        if($data['type'] == QuantizationCreate::type_one){
+            if(empty($data['address']) && ! is_string($data['address'])) return [false, '地点(省市)编码不能为空'];
+            if(empty($data['address_title']) && ! is_string($data['address_title'])) return [false, '地点(省市)不能为空'];
+        }elseif($data['type'] == QuantizationCreate::type_two){
             if(empty($data['start_time']) || empty($data['end_time'])) return [false, '周期不能为空'];
             $data['start_time'] = $this->changeDateToDate($data['start_time']);
             $data['end_time'] = $this->changeDateToDate($data['end_time']);
         }
-        if(empty($data['customer_supply_id'])) return [false, '人员id不能为空'];
-        $bool = CustomerSupply::where('del_time',0)
-            ->where('id',$data['customer_supply_id'])
-            ->exists();
-        if(! $bool) return [false, '人员不存在或已被删除'];
+
+        if($data['type'] == Quantization::type_one || $data['type'] == Quantization::type_two){
+            if(empty($data['data_id'])) return [false, '组织id不能为空'];
+            $title = Organization::where('del_time',0)
+                ->where('id',$data['data_id'])
+                ->value('title');
+            if(! $title) return [false, '组织不存在或已被删除'];
+            $data['data_title'] = $title;
+        }else{
+            if(! empty($data['data_id'])){
+                $title = CustomerSupply::where('del_time',0)
+                    ->where('id',$data['data_id'])
+                    ->value('title');
+                if(! $title) return [false, '人员不存在或已被删除'];
+                $data['data_title'] = $title;
+            }
+            if(empty($data['result_type'])) return [false,'人物类型不能为空'];
+        }
+
         if(! isset($data['score'])) return [false, '分数不存在'];
         $res = $this->checkNumber($data['score']);
         if(! $res['valid']) return [false,'分数:' . $res['error']];
@@ -562,21 +593,20 @@ class QuantizationService extends Service
         $startTime = $data['start_time'] ?? 0;
         $endTime   = $data['end_time'] ?? 0;
         if ($is_add) {
-
             if ($data['type'] == QuantizationCreate::type_one) {
                 // 能力量化:只允许唯一一份
-                $bool = QuantizationCreate::where('customer_supply_id', $data['customer_supply_id'])
+                $bool = QuantizationCreate::where('data_id', $data['data_id'])
                     ->where('type', QuantizationCreate::type_one)
                     ->where('del_time', 0)
                     ->exists();
 
                 if ($bool) {
-                    return [false, '该人员已创建能力量化档案,请勿重复创建'];
+                    return [false, '该组织已创建能力量化档案,请勿重复创建'];
                 }
 
             } else {
                 // 合作量化:检查时间区间重叠
-                $bool = QuantizationCreate::where('customer_supply_id', $data['customer_supply_id'])
+                $bool = QuantizationCreate::where('data_id', $data['data_id'])
                     ->where('type', QuantizationCreate::type_two) // 建议限定 type,防止误匹配
                     ->where('del_time', 0)
                     ->where(function($query) use ($startTime, $endTime) {
@@ -586,7 +616,7 @@ class QuantizationService extends Service
                     ->exists();
 
                 if ($bool) {
-                    return [false, '该人员在该周期内已创建合作量化档案,请勿重复创建'];
+                    return [false, '该组织在该周期内已创建合作量化档案,请勿重复创建'];
                 }
             }
 
@@ -596,14 +626,14 @@ class QuantizationService extends Service
             $id = $data['id'];
 
             if ($data['type'] == QuantizationCreate::type_one) {
-                $bool = QuantizationCreate::where('customer_supply_id', $data['customer_supply_id'])
+                $bool = QuantizationCreate::where('data_id', $data['data_id'])
                     ->where('type', QuantizationCreate::type_one)
                     ->where('id', '<>', $id)
                     ->where('del_time', 0)
                     ->exists();
-                if ($bool) return [false, '该人员已创建能力量化档案,请勿重复创建'];
+                if ($bool) return [false, '该组织已创建能力量化档案,请勿重复创建'];
             } else {
-                $bool = QuantizationCreate::where('customer_supply_id', $data['customer_supply_id'])
+                $bool = QuantizationCreate::where('data_id', $data['data_id'])
                     ->where('type', QuantizationCreate::type_two)
                     ->where('del_time', 0)
                     ->where(function($query) use ($startTime, $endTime) {
@@ -613,11 +643,11 @@ class QuantizationService extends Service
                     ->where('id', '<>', $id)
                     ->exists();
 
-                if ($bool) return [false, '该人员在该周期内已创建合作量化档案,请勿重复创建'];
+                if ($bool) return [false, '该组织在该周期内已创建合作量化档案,请勿重复创建'];
             }
         }
 
-        return [true, $data];
+        return [true, ''];
     }
 
     function getDimensionIdByRate($map, $rate) {
@@ -630,17 +660,12 @@ class QuantizationService extends Service
         if(empty($data['data'])) return $data;
 
         $emp = (new EmployeeService())->getEmployeeMap(array_unique(array_column($data['data'],'crt_id')));
-        $emp_2 = (new CustomerSupplyService())->getEmployeeMap(array_unique(array_column($data['data'],'customer_supply_id')),'detail');
         foreach ($data['data'] as $key => $value){
             $data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s',$value['crt_time']) : '';
             $data['data'][$key]['start_time'] = $value['start_time'] ? date('Y-m-d',$value['start_time']) : '';
             $data['data'][$key]['end_time'] = $value['end_time'] ? date('Y-m-d',$value['end_time']) : '';
             $data['data'][$key]['crt_name'] = $emp[$value['crt_id']] ?? '';
             $data['data'][$key]['type_title'] = QuantizationCreate::$type_name[$value['type']] ?? '';
-            $e = $emp_2[$value['customer_supply_id']] ?? [];
-            $data['data'][$key]['organization_title'] = $e['organization_title'] ?? "";
-            $data['data'][$key]['customer_supply_title'] = $e['title'] ?? "";
-            $data['data'][$key]['customer_supply_code'] = $e['code'] ?? "";
             $data['data'][$key]['result'] = $this->fillDataResult($value);
         }
 
@@ -652,14 +677,15 @@ class QuantizationService extends Service
         $score = isset($value['score']) ? floatval($value['score']) : 0;
         $type  = $value['type'] ?? null;
 
-        if ($type == QuantizationCreate::type_one) {
-            if ($score < 50) return '不合格';
-            if ($score < 70) return '改善后评估';
-            return '合格';
+        if ($type != QuantizationCreate::type_one && $type != QuantizationCreate::type_two) {
+            return '';
         }
 
-        // 其他类型
-        return $score < 60 ? '不合格' : '合格';
+        if ($score >= 90) return '优秀';
+        if ($score >= 80) return '良好';
+        if ($score >= 60) return '合格';
+
+        return '不合格';
     }
 
     //量化创建-----------------------------------------------

+ 4 - 8
config/header/69.php

@@ -7,16 +7,12 @@
 
 return [
     [
-        'key' =>'customer_supply_code',
-        'value' => '人员编码',
-    ],
-    [
-        'key' =>'customer_supply_title',
-        'value' => '人员名称',
+        'key' =>'data_title',
+        'value' => '组织名称',
     ],
     [
-        'key' =>'organization_title',
-        'value' => '组织名称',
+        'key' =>'address_title',
+        'value' => '地址(省市)',
     ],
     [
         'key' =>'products',

+ 1 - 9
config/header/70.php

@@ -7,15 +7,7 @@
 
 return [
     [
-        'key' =>'customer_supply_code',
-        'value' => '人员编码',
-    ],
-    [
-        'key' =>'customer_supply_title',
-        'value' => '人员名称',
-    ],
-    [
-        'key' =>'organization_title',
+        'key' =>'data_title',
         'value' => '组织名称',
     ],
     [

+ 8 - 0
config/header/78.php

@@ -18,6 +18,14 @@ return [
         'key' =>'type_title',
         'value' => '类型',
     ],
+    [
+        'key' =>'industry',
+        'value' => '行业',
+    ],
+    [
+        'key' =>'model_mark',
+        'value' => '模板说明',
+    ],
     [
         'key' =>'is_use_title',
         'value' => '是否启用',

+ 33 - 0
config/header/80.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * '菜单ID' => [
+ *     '字段英文名' =》 '字段中文名'
+ * ]
+ */
+
+return [
+    [
+        'key' =>'data_title',
+        'value' => '人员名称',
+    ],
+    [
+        'key' =>'man_mark',
+        'value' => '人员备注',
+    ],
+    [
+        'key' =>'score',
+        'value' => '得分',
+    ],
+    [
+        'key' =>'result',
+        'value' => '结论',
+    ],
+    [
+        'key' =>'crt_name',
+        'value' => '创建人',
+    ],
+    [
+        'key' =>'crt_time',
+        'value' => '创建时间',
+    ],
+];

+ 38 - 0
config/header/81.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * '菜单ID' => [
+ *     '字段英文名' =》 '字段中文名'
+ * ]
+ */
+
+return [
+    [
+        'key' =>'order_time',
+        'value' => '费用日期',
+    ],
+    [
+        'key' =>'customer_supply_title',
+        'value' => '人员名称',
+    ],
+    [
+        'key' =>'man_mark',
+        'value' => '人员备注',
+    ],
+    [
+        'key' =>'mark',
+        'value' => '费用备注',
+    ],
+    [
+        'key' =>'amount',
+        'value' => '总金额',
+        'sum' => 1,
+    ],
+    [
+        'key' =>'crt_name',
+        'value' => '创建人',
+    ],
+    [
+        'key' =>'crt_time',
+        'value' => '创建时间',
+    ],
+];

+ 1 - 0
config/header/common.php

@@ -21,4 +21,5 @@ return [
     75 => ['has_detail' => false, 'is_jump' => false], //
     77 => ['has_detail' => true, 'is_jump' => false], // 维度选项档案
     78 => ['has_detail' => true, 'is_jump' => false], // 量化档案
+    81 => ['has_detail' => true, 'is_jump' => false], // 费用档案
 ];

+ 7 - 0
routes/api.php

@@ -150,6 +150,13 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
     $route->any('toDoDetail', 'Api\OrderController@toDoDetail');
     $route->any('toDoFinished', 'Api\OrderController@toDoFinished');
 
+    //费用
+    $route->any('costManagementList', 'Api\CostManagementController@costManagementList');
+    $route->any('costManagementEdit', 'Api\CostManagementController@costManagementEdit');
+    $route->any('costManagementAdd', 'Api\CostManagementController@costManagementAdd');
+    $route->any('costManagementDel', 'Api\CostManagementController@costManagementDel');
+    $route->any('costManagementDetail', 'Api\CostManagementController@costManagementDetail');
+
     //报表
     $route->any('valueStatistics', 'Api\StatisticsController@valueStatistics');