Merge branch 'develop' into feature/mzl_dev

app/common/controller/VehColorController.php

@@ -0,0 +1,56 @@
+<?php
+namespace app\common\controller;
+
+use app\common\model\User;
+use app\common\traits\crud\CrudControllerTrait;
+use app\admin\service\VehColorService;
+
+class VehColorController extends BaseController
+{
+    use CrudControllerTrait;
+
+    protected $service;
+
+    public function __construct()
+    {
+        $this->service = new VehColorService();
+    }
+
+    /**
+     * 列表页数据格式化
+     *
+     * @param array $data
+     * @return array
+     */
+    protected function indexFormat($data)
+    {
+        if (isset($data['created_at']))
+            $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
+        if (isset($data['updated_at']))
+            $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
+        if (isset($data['created_by']) && $data['created_by'])
+            $data['created_by_name'] = User::where('id', $data['created_by'])->value('name');
+        if (isset($data['updated_by']) && $data['updated_by'])
+            $data['updated_by_name'] = User::where('id', $data['updated_by'])->value('name');
+        return $data;
+    }
+
+    /**
+     * 数据格式化
+     *
+     * @param array $data
+     * @return array
+     */
+    protected function showFormat($data)
+    {
+        if (isset($data['created_at']))
+            $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
+        if (isset($data['updated_at']))
+            $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
+        if (isset($data['created_by']) && $data['created_by'])
+            $data['created_by_name'] = User::where('id', $data['created_by'])->value('name');
+        if (isset($data['updated_by']) && $data['updated_by'])
+            $data['updated_by_name'] = User::where('id', $data['updated_by'])->value('name');
+        return $data;
+    }
+}

app/common/model/SysAccount.php

@@ -40,7 +40,7 @@ class SysAccount extends Model
     /**
      * 允许自动填充模型字段
      */
-    protected $fillable = ['id', 'currency_id', 'account_name', 'account_number', 'account_holder', 'bank_name', 'bank_branch', 'daily_limit', 'single_limit', 'description', 'status', 'sort', 'created_at', 'updated_at'];
+    protected $fillable = ['id', 'corp_id', 'currency_id', 'account_name', 'account_number', 'account_holder', 'bank_name', 'bank_branch', 'daily_limit', 'single_limit', 'description', 'status', 'sort', 'created_at', 'updated_at'];
 
     /**
      * 不允许自动填充模型字段

app/common/model/VehColor.php

@@ -40,7 +40,7 @@ class VehColor extends Model
     /**
      * 允许自动填充模型字段
      */
-    protected $fillable = ['id', 'color_code', 'color_text', 'type', 'hex_code', 'rgb_code', 'status', 'sort', 'created_at', 'updated_at'];
+    protected $fillable = ['id', 'color_code', 'color_text', 'type', 'hex_code', 'rgb_code', 'status', 'sort', 'created_at', 'updated_by', 'created_at', 'updated_at'];
 
     /**
      * 不允许自动填充模型字段