Merge branch 'master' of http://git.ichunt.net/semour/semour_admin

app/Admin/Forms/User/EditUserHandle.php

@@ -58,11 +58,11 @@ class EditUserHandle extends Form implements LazyRenderable
         });
         });
         $this->row(function (Row $form) {
         $this->row(function (Row $form) {
             $form->width(5)->text('first_name')->required();
             $form->width(5)->text('first_name')->required();
-            $form->width(5)->text('last_name');
+            $form->width(5)->text('last_name')->required();
         });
         });
         $this->row(function (Row $form) {
         $this->row(function (Row $form) {
             $form->width(5)->mobile('phone')->required();
             $form->width(5)->mobile('phone')->required();
-            $form->width(5)->email('email');
+            $form->width(5)->email('email')->required();
         });
         });
         $this->row(function (Row $form) {
         $this->row(function (Row $form) {
             $form->width(5)->select('account_properties')->options(admin_trans('user.options.account_properties'))->required();
             $form->width(5)->select('account_properties')->options(admin_trans('user.options.account_properties'))->required();

app/Admin/Forms/UserAddress/SaveUserAddressHandle.php

@@ -98,6 +98,8 @@ class SaveUserAddressHandle extends Form implements LazyRenderable
         $this->row(function (Row $row) {
         $this->row(function (Row $row) {
             $row->width(3)->select('country')->options(Country::getCountryMap())->required();
             $row->width(3)->select('country')->options(Country::getCountryMap())->required();
             $row->width(3)->text('province')->default('');
             $row->width(3)->text('province')->default('');
+        });
+        $this->row(function (Row $row) {
             $row->width(3)->text('city')->required();
             $row->width(3)->text('city')->required();
             $row->width(2)->number('post_code')->required();
             $row->width(2)->number('post_code')->required();
         });
         });

app/Admin/Renderable/CreateUser.php

@@ -63,6 +63,8 @@ class CreateUser extends \Dcat\Admin\Support\LazyRenderable
                         (Country::getCountryMap())
                         (Country::getCountryMap())
                             ->required();
                             ->required();
                         $table->width(3)->text('province')->label(trans("user-address.fields.province"));
                         $table->width(3)->text('province')->label(trans("user-address.fields.province"));
+                    });
+                    $table->row(function (Form\Row $table) {
                         $table->width(3)->text('city')->label(trans("user-address.fields.city"))->required();
                         $table->width(3)->text('city')->label(trans("user-address.fields.city"))->required();
                         $table->width(2)->number('post_code')->label(trans("user-address.fields.post_code"))->required();
                         $table->width(2)->number('post_code')->label(trans("user-address.fields.post_code"))->required();
                     });
                     });

app/Admin/Service/UserAddressService.php

@@ -16,7 +16,7 @@ class UserAddressService
         $grid->column('address_id');
         $grid->column('address_id');
         $grid->column('consignee');
         $grid->column('consignee');
         $grid->email('email');
         $grid->email('email');
-        $grid->mobile('phone');
+        $grid->column('phone');
         $grid->column('detail_address');
         $grid->column('detail_address');
         $grid->column('city');
         $grid->column('city');
         $grid->column('address_type')->using(admin_trans('user-address.options.address_type'));
         $grid->column('address_type')->using(admin_trans('user-address.options.address_type'));

app/Console/Commands/updateDepartmentNum.php

+<?php
+
+namespace App\Console\Commands;
+
+use App\Admin\Service\AutoAssignCustomerService;
+use Illuminate\Console\Command;
+
+class updateDepartmentNum extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'command:updateDepartmentNum';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Command description';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        echo date("Y-m-d H:i:s") . "更新部门数量开始" . PHP_EOL;
+        AutoAssignCustomerService::updateDepartmentNum();
+        echo date("Y-m-d H:i:s") . "更新部门数量结束" . PHP_EOL;
+        return 0;
+    }
+}