yjc/erp
1
0
Fork 0
mirror of https://gitee.com/hzchunfen/erp.git synced 2025-12-01 06:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

鲜花2.0-文案调整

Browse Source
This commit is contained in:
杨建炊 2024-08-24 14:23:06 +08:00
parent 2c974cfbc0
commit 374787b57c
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Shop/ShopsController.php
View File

@ -52,7 +52,7 @@ class ShopsController extends Controller
$validator = Validator::make($request->all(), [ $validator = Validator::make($request->all(), [
'name' => 'required|string|max:191|unique:shops,name', 'name' => 'required|string|max:191|unique:shops,name',
'plat_id' => 'required|integer', 'plat_id' => 'required|integer',
'ratio' => 'required', 'ratio' => 'sometimes|default:*1',
]); ]);
if ($validator->fails()) { if ($validator->fails()) {
$this->setValidatorFailResponse($validator->getMessageBag()->getMessages()); $this->setValidatorFailResponse($validator->getMessageBag()->getMessages());

4
app/Models/Log.php
View File

@ -72,6 +72,9 @@ class Log extends Model
'kuaituantuan' => '快团团', 'kuaituantuan' => '快团团',
'miaoxuan' => '妙选', 'miaoxuan' => '妙选',
'goods' => '商品', 'goods' => '商品',
"sku_stock_purchase" => "入库采购",
"sku_stock_loss" => "报损记录",
"sku_stock_inventory" => "盘点记录",
]; ];
return $map[$value] ?? $value; return $map[$value] ?? $value;
@ -89,6 +92,7 @@ class Log extends Model
'set' => '设置', 'set' => '设置',
'cost' => '成本', 'cost' => '成本',
'stock' => '库存', 'stock' => '库存',
'sale_stock' => '在售库存',
'inventory' => '库存盘点', 'inventory' => '库存盘点',
'reserve' => '预留量 ', 'reserve' => '预留量 ',
'timingInventory' => '7点盘点', 'timingInventory' => '7点盘点',

2
app/Services/GoodSku/GoodSkuService.php
View File

@ -172,7 +172,7 @@ class GoodSkuService
{ {
$userId = Auth::id(); $userId = Auth::id();
$costLog = [ $costLog = [
'module' => 'goodSkus', 'module' => 'goods',
'action' => "POST", 'action' => "POST",
'target_type' => $targetType, 'target_type' => $targetType,
'target_id' => $goodsSkuItem['id'] ?? 0, 'target_id' => $goodsSkuItem['id'] ?? 0,

4
resources/lang/zh-CN/permission.php
View File

@ -203,7 +203,7 @@ return [
'id' => 13, 'id' => 13,
'name' => '团购管理', 'name' => '团购管理',
'parent_id' => 0, 'parent_id' => 0,
'show' => 1, 'show' => 0,
], ],
'group.index' => [ 'group.index' => [
'id' => 130, 'id' => 130,
@ -447,7 +447,7 @@ return [
'id' => 17, 'id' => 17,
'name' => '电子面单', 'name' => '电子面单',
'parent_id' => 12, 'parent_id' => 12,
'show' => 1, 'show' => 0,
], ],
'shop_ship.index' => [ 'shop_ship.index' => [
'id' => 170, 'id' => 170,