添加商品审核申请人和审核人
parent
b92164289a
commit
5c6b2c2b01
|
|
@ -20,7 +20,7 @@ class ProductSkuVerifyController extends AdminController
|
||||||
*/
|
*/
|
||||||
protected function grid()
|
protected function grid()
|
||||||
{
|
{
|
||||||
$builder = ProductSkuVerify::with('sku');
|
$builder = ProductSkuVerify::with(['sku', 'applicant', 'reviewer']);
|
||||||
return Grid::make($builder, function (Grid $grid) {
|
return Grid::make($builder, function (Grid $grid) {
|
||||||
$grid->showRowSelector();
|
$grid->showRowSelector();
|
||||||
$grid->rowSelector()->disable(function ($row) {
|
$grid->rowSelector()->disable(function ($row) {
|
||||||
|
|
@ -33,6 +33,8 @@ class ProductSkuVerifyController extends AdminController
|
||||||
});
|
});
|
||||||
$grid->column('id')->sortable();
|
$grid->column('id')->sortable();
|
||||||
$grid->column('sku.name');
|
$grid->column('sku.name');
|
||||||
|
$grid->column('applicant.name');
|
||||||
|
$grid->column('reviewer.name');
|
||||||
// $grid->column('type');
|
// $grid->column('type');
|
||||||
$grid->column('status')
|
$grid->column('status')
|
||||||
->using([
|
->using([
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
namespace App\Models;
|
namespace App\Models;
|
||||||
|
|
||||||
|
use App\Models\Admin\Administrator;
|
||||||
use Dcat\Admin\Traits\HasDateTimeFormatter;
|
use Dcat\Admin\Traits\HasDateTimeFormatter;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
@ -15,4 +16,24 @@ class ProductSkuVerify extends Model
|
||||||
{
|
{
|
||||||
return $this->belongsTo(ProductSku::class, 'sku_id');
|
return $this->belongsTo(ProductSku::class, 'sku_id');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 申请人
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function applicant()
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Administrator::class, 'applicant_id');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核人
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function reviewer()
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Administrator::class, 'reviewer_id');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ namespace App\Traits;
|
||||||
|
|
||||||
use App\Models\ProductSku;
|
use App\Models\ProductSku;
|
||||||
use App\Models\ProductSkuVerify;
|
use App\Models\ProductSkuVerify;
|
||||||
|
use Dcat\Admin\Admin;
|
||||||
|
|
||||||
trait Release
|
trait Release
|
||||||
{
|
{
|
||||||
|
|
@ -28,6 +29,7 @@ trait Release
|
||||||
ProductSkuVerify::query()->insert(array_map(function ($key) use ($nowTime) {
|
ProductSkuVerify::query()->insert(array_map(function ($key) use ($nowTime) {
|
||||||
return [
|
return [
|
||||||
'sku_id' => $key,
|
'sku_id' => $key,
|
||||||
|
'applicant_id'=> Admin::user()->id,
|
||||||
'created_at' => $nowTime,
|
'created_at' => $nowTime,
|
||||||
'updated_at' => $nowTime,
|
'updated_at' => $nowTime,
|
||||||
];
|
];
|
||||||
|
|
@ -103,6 +105,7 @@ trait Release
|
||||||
}
|
}
|
||||||
|
|
||||||
ProductSkuVerify::whereIn('sku_id', $ids)->where('status', 0)->update([
|
ProductSkuVerify::whereIn('sku_id', $ids)->where('status', 0)->update([
|
||||||
|
'reviewer_id' => Admin::user()->id,
|
||||||
'status'=>$status,
|
'status'=>$status,
|
||||||
'remarks'=>$remarks,
|
'remarks'=>$remarks,
|
||||||
]);
|
]);
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,36 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
class AddApplicantAndReviewerToProductSkuVerifiesTable extends Migration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run the migrations.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function up()
|
||||||
|
{
|
||||||
|
Schema::table('product_sku_verifies', function (Blueprint $table) {
|
||||||
|
//
|
||||||
|
$table->unsignedBigInteger('applicant_id')->comment('申请人ID');
|
||||||
|
$table->unsignedBigInteger('reviewer_id')->nullable()->comment('审核人ID');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reverse the migrations.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function down()
|
||||||
|
{
|
||||||
|
Schema::table('product_sku_verifies', function (Blueprint $table) {
|
||||||
|
//
|
||||||
|
$table->dropColumn('applicant_id');
|
||||||
|
$table->dropColumn('reviewer_id');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -9,6 +9,12 @@ return [
|
||||||
'sku'=>[
|
'sku'=>[
|
||||||
'name'=>'商品名称',
|
'name'=>'商品名称',
|
||||||
],
|
],
|
||||||
|
'applicant' => [
|
||||||
|
'name' => '申请人',
|
||||||
|
],
|
||||||
|
'reviewer'=>[
|
||||||
|
'name' => '审核人',
|
||||||
|
],
|
||||||
'sku_id' => '子商品',
|
'sku_id' => '子商品',
|
||||||
'type' => '审核类别',
|
'type' => '审核类别',
|
||||||
'status' => '状态',
|
'status' => '状态',
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue