diff --git a/app/Filters/BusinessGoodsSkuFilter.php b/app/Filters/BusinessGoodsSkuFilter.php index fc89660..052f92f 100644 --- a/app/Filters/BusinessGoodsSkuFilter.php +++ b/app/Filters/BusinessGoodsSkuFilter.php @@ -14,7 +14,7 @@ class BusinessGoodsSkuFilter extends Filters return $this->builder->where('goods_name', '=', trim($value)); } - protected function shipId($value) + protected function shopId($value) { return $this->builder->where('shop_id', '=', trim($value)); } diff --git a/app/Filters/BusinessOrderFilter.php b/app/Filters/BusinessOrderFilter.php new file mode 100644 index 0000000..e13794c --- /dev/null +++ b/app/Filters/BusinessOrderFilter.php @@ -0,0 +1,17 @@ +builder->where('participate_no', '=', trim($value)); + } + + + protected function shopId($value) + { + return $this->builder->where('shop_id', '=', trim($value)); + } +} diff --git a/app/Http/Controllers/Business/BusinessOrderController.php b/app/Http/Controllers/Business/BusinessOrderController.php new file mode 100644 index 0000000..91ea68f --- /dev/null +++ b/app/Http/Controllers/Business/BusinessOrderController.php @@ -0,0 +1,26 @@ +filter() + ->with(['shop:id,name']) + ->paginate($request->get('per_page')); + + return BusinessOrderResource::collection($businessOrders); + } + + public function exportOrderBlank(Request $request) + { + + } +} diff --git a/app/Http/Resources/BusinessOrderResource.php b/app/Http/Resources/BusinessOrderResource.php new file mode 100644 index 0000000..1fa3691 --- /dev/null +++ b/app/Http/Resources/BusinessOrderResource.php @@ -0,0 +1,19 @@ +hasOne(Shop::class, 'id', 'shop_id'); + return $this->belongsTo(Shop::class, 'shop_id', 'id'); } } diff --git a/app/Models/BusinessOrder.php b/app/Models/BusinessOrder.php index be5a2bd..818af0c 100644 --- a/app/Models/BusinessOrder.php +++ b/app/Models/BusinessOrder.php @@ -4,6 +4,11 @@ namespace App\Models; class BusinessOrder extends Model { + public $fieldSearchable = [ + 'participate_no', + 'shop_id' + ]; + protected $fillable = [ 'shop_id', 'receiver_address_detail', @@ -45,4 +50,9 @@ class BusinessOrder extends Model { return $this->hasMany(BusinessOrderItem::class, 'business_order_id'); } + + public function shop() + { + return $this->belongsTo(Shop::class, 'shop_id', 'id'); + } } diff --git a/app/Models/BusinessOrderItem.php b/app/Models/BusinessOrderItem.php index 3772649..0aa80da 100644 --- a/app/Models/BusinessOrderItem.php +++ b/app/Models/BusinessOrderItem.php @@ -32,11 +32,11 @@ class BusinessOrderItem extends Model public function order() { - return $this->hasOne(BusinessOrder::class, 'id', 'business_order_id'); + return $this->belongsTo(BusinessOrder::class, 'business_order_id', 'id'); } public function shop() { - return $this->hasOne(Shop::class, 'id', 'shop_id'); + return $this->belongsTo(Shop::class, 'shop_id', 'id'); } } diff --git a/app/Models/Goods.php b/app/Models/Goods.php index 2f90534..1fc8969 100644 --- a/app/Models/Goods.php +++ b/app/Models/Goods.php @@ -42,11 +42,11 @@ class Goods extends Model public function brand() { - return $this->hasOne(GoodsBrand::class, 'id', 'brand_id'); + return $this->belongsTo(GoodsBrand::class, 'brand_id', 'id'); } public function type() { - return $this->hasOne(GoodsType::class, 'id', 'type_id'); + return $this->belongsTo(GoodsType::class, 'type_id', 'id'); } } diff --git a/app/Models/GoodsSku.php b/app/Models/GoodsSku.php index 554ccfb..9e29289 100644 --- a/app/Models/GoodsSku.php +++ b/app/Models/GoodsSku.php @@ -64,7 +64,7 @@ class GoodsSku extends Model */ public function goods() { - return $this->hasOne(Goods::class, 'id', 'goods_id'); + return $this->belongsTo(Goods::class, 'goods_id', 'id'); } /** @@ -74,9 +74,4 @@ class GoodsSku extends Model { return $this->hasOne(DailyStockRecord::class, 'sku_id', 'id'); } - - public function order() - { - return $this->hasOne(BusinessOrderItem::class, 'external_sku_id', 'id'); - } } diff --git a/app/Models/Groups.php b/app/Models/Groups.php index a9fff5d..85e67a9 100644 --- a/app/Models/Groups.php +++ b/app/Models/Groups.php @@ -63,6 +63,6 @@ class Groups extends Model public function shop() { - return $this->hasOne(Shop::class, 'id', 'shop_id'); + return $this->belongsTo(Shop::class, 'shop_id', 'id'); } } diff --git a/app/Models/Log.php b/app/Models/Log.php index 75150bf..eb5c829 100644 --- a/app/Models/Log.php +++ b/app/Models/Log.php @@ -122,6 +122,6 @@ class Log extends Model public function user() { - return $this->hasOne(User::class, 'id', 'user_id'); + return $this->belongsTo(User::class, 'user_id', 'id'); } } diff --git a/app/Models/Model.php b/app/Models/Model.php index 8635ba0..2983c9c 100644 --- a/app/Models/Model.php +++ b/app/Models/Model.php @@ -12,7 +12,7 @@ class Model extends EloquentModel return $query->orderBy('id', 'desc'); } - public function scopeOlder($query) + public function scopeOrder($query) { return $query->orderBy('id', 'asc'); } diff --git a/database/seeds/MenusTableSeeder.php b/database/seeds/MenusTableSeeder.php index 38d75f8..ee294e3 100644 --- a/database/seeds/MenusTableSeeder.php +++ b/database/seeds/MenusTableSeeder.php @@ -34,6 +34,7 @@ class MenusTableSeeder extends Seeder $id = DB::table('menus')->insertGetId(['parent_id' => 0, 'code' => 'PLAT', 'name' => '平台', 'seq' => 40]); DB::table('menus')->insert([ ['parent_id' => $id, 'code' => 'PLAT_GOODS_LIST', 'name' => '货品列表', 'seq' => 0], + ['parent_id' => $id, 'code' => 'PLAT_ORDER_LIST', 'name' => '订单列表', 'seq' => 1], ]); // 团购 DB::table('menus')->insertGetId(['parent_id' => 0, 'code' => 'GROUP_MANAGEMENT', 'name' => '团购管理', 'seq' => 1]); diff --git a/resources/frontend/src/router/list.js b/resources/frontend/src/router/list.js index efd3904..5ab8c01 100644 --- a/resources/frontend/src/router/list.js +++ b/resources/frontend/src/router/list.js @@ -70,6 +70,11 @@ const list = [ name: "货品列表", component: () => import("../views/plat/goodsList.vue"), }, + { + path: "PLAT_ORDER_LIST", + name: "订单列表", + component: () => import("../views/plat/orderList.vue"), + }, { path: "GROUP_MANAGEMENT", name: "团购管理", diff --git a/resources/frontend/vue.config.js b/resources/frontend/vue.config.js index f8dd4da..ac1d434 100644 --- a/resources/frontend/vue.config.js +++ b/resources/frontend/vue.config.js @@ -11,8 +11,8 @@ module.exports = { proxy: { // 配置代理 "/api": { - // target: "http://172.23.134.136:81", - target: "http://erp.chutang66.com", + target: "http://192.168.247.186:81", + // target: "http://erp.chutang66.com", changeOrigin: true, // 开启代理 pathRewrite: { // 重命名 diff --git a/resources/lang/zh-CN/permission.php b/resources/lang/zh-CN/permission.php index d7e01ba..b689c81 100644 --- a/resources/lang/zh-CN/permission.php +++ b/resources/lang/zh-CN/permission.php @@ -282,6 +282,16 @@ return [ 'name' => '同步库存', 'parent_id' => 120, ], + 'PLAT_ORDER_LIST' => [ + 'id' => 14, + 'name' => '订单列表', + 'parent_id' => 12, + ], + 'plat_orders.index' => [ + 'id' => 140, + 'name' => '订单列表', + 'parent_id' => 14, + ], // 团购管理 'GROUP_MANAGEMENT' => [ 'id' => 13, diff --git a/routes/api.php b/routes/api.php index 7605aa8..d7a1195 100644 --- a/routes/api.php +++ b/routes/api.php @@ -7,6 +7,7 @@ use App\Http\Controllers\Shop\ShopsController; use App\Http\Controllers\Goods\GoodsSkusController; use App\Http\Controllers\Business\BusinessGoodsSkusController; use App\Http\Controllers\Group\GroupsController; +use App\Http\Controllers\Business\BusinessOrderController; /* |-------------------------------------------------------------------------- @@ -46,6 +47,7 @@ Route::middleware(['auth:api', 'check.permissions'])->group(function () { ]]); // 平台 Route::resource('plat_goods', 'Business\BusinessGoodsSkusController', ['only' => ['index', 'update', 'destroy']]); + Route::get('plat_orders', [BusinessOrderController::class, 'index']); Route::post('plat/sync/{id}/stock', [BusinessGoodsSkusController::class, 'syncStock'])->name('plat.sync.stock'); // 团购 Route::resource('group', 'Group\GroupsController', ['only' => ['index', 'store', 'show', 'update', 'destroy']]);