cf_cloud/erp
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

!118 fix

Browse Source 
Merge pull request !118 from develop
This commit is contained in:
赵世界 2022-10-27 08:45:11 +00:00 committed by Gitee
commit 86280fbed0
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
11 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Group/GroupsController.php
View File

@ -32,7 +32,7 @@ class GroupsController extends Controller
->filter() ->filter()
->paginate($request->get('per_page')); ->paginate($request->get('per_page'));
foreach ($groups as &$group) { foreach ($groups as &$group) {
$group['children'] = Groups::query()->with(['shop:id,name'])->where('parent_id', $group->id)->get(); $group['children'] = Groups::query()->with(['shop:id,name'])->where('parent_id', $group->id)->get();
} }
return GroupsResource::collection($groups); return GroupsResource::collection($groups);
@ -328,7 +328,7 @@ class GroupsController extends Controller
->when($skuCode, function ($query, $skuCode) { ->when($skuCode, function ($query, $skuCode) {
return $query->where('sku_code', $skuCode); return $query->where('sku_code', $skuCode);
}) })
->when($request->get('has_stock'), function ($query) { ->when((int)$request->get('has_stock'), function ($query) {
return $query->where('stock', '>', 0); return $query->where('stock', '>', 0);
}) })
->filter() ->filter()

1
app/Imports/InventoryImport.php
View File

@ -52,6 +52,7 @@ class InventoryImport implements ToCollection, SkipsEmptyRows
if ('下架' === $goodsSku->status) { if ('下架' === $goodsSku->status) {
$goodsSku->status = 1; $goodsSku->status = 1;
} }
$goodsSku->cost = $row[8];
$goodsSku->save(); $goodsSku->save();
event(new StockUpdateEvent($goodsSku)); event(new StockUpdateEvent($goodsSku));
$updateIds[] = $goodsSku->id; $updateIds[] = $goodsSku->id;

2
public/dist/index.html vendored
View File

@ -1 +1 @@
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><link href="css/chunk-088acbde.902ebb66.css" rel="prefetch"><link href="css/chunk-0cbcaa56.e05858e7.css" rel="prefetch"><link href="css/chunk-0f6f9608.b3153d73.css" rel="prefetch"><link href="css/chunk-10d9ee19.84a6683c.css" rel="prefetch"><link href="css/chunk-26daa808.62429343.css" rel="prefetch"><link href="css/chunk-35db73ce.1f9c10ff.css" rel="prefetch"><link href="css/chunk-4caed774.ad94328f.css" rel="prefetch"><link href="css/chunk-52fcdd7c.51e3ffbd.css" rel="prefetch"><link href="css/chunk-6ae0a0d3.84a02b23.css" rel="prefetch"><link href="css/chunk-743f0316.fb5066fb.css" rel="prefetch"><link href="css/chunk-75426f71.902ebb66.css" rel="prefetch"><link href="css/chunk-904e5abc.902ebb66.css" rel="prefetch"><link href="css/chunk-a3ddd952.902ebb66.css" rel="prefetch"><link href="css/chunk-ab4d3e40.d941d6ef.css" rel="prefetch"><link href="css/chunk-e35186f0.902ebb66.css" rel="prefetch"><link href="css/chunk-f0b6f0d4.a3b83cc4.css" rel="prefetch"><link href="css/chunk-f35dfe36.ea52b615.css" rel="prefetch"><link href="js/chunk-088acbde.46503dcc.js" rel="prefetch"><link href="js/chunk-0cbcaa56.46e3dd42.js" rel="prefetch"><link href="js/chunk-0f6f9608.540fa080.js" rel="prefetch"><link href="js/chunk-10d9ee19.6bc719ae.js" rel="prefetch"><link href="js/chunk-26daa808.a340b60b.js" rel="prefetch"><link href="js/chunk-35db73ce.e1ffc5fa.js" rel="prefetch"><link href="js/chunk-4caed774.92751344.js" rel="prefetch"><link href="js/chunk-52fcdd7c.0f505f93.js" rel="prefetch"><link href="js/chunk-63c1eac8.59f3df74.js" rel="prefetch"><link href="js/chunk-6ae0a0d3.b08743d0.js" rel="prefetch"><link href="js/chunk-743f0316.503949a4.js" rel="prefetch"><link href="js/chunk-75426f71.1a12b5c7.js" rel="prefetch"><link href="js/chunk-904e5abc.3cea2bdf.js" rel="prefetch"><link href="js/chunk-a3ddd952.dc1ed0be.js" rel="prefetch"><link href="js/chunk-ab4d3e40.1f5f6d89.js" rel="prefetch"><link href="js/chunk-e35186f0.efed2a2b.js" rel="prefetch"><link href="js/chunk-f0b6f0d4.e264ca96.js" rel="prefetch"><link href="js/chunk-f35dfe36.e7038b09.js" rel="prefetch"><link href="css/app.6c30acd7.css" rel="preload" as="style"><link href="css/chunk-vendors.9181e156.css" rel="preload" as="style"><link href="js/app.a48f0419.js" rel="preload" as="script"><link href="js/chunk-vendors.524d6b36.js" rel="preload" as="script"><link href="css/chunk-vendors.9181e156.css" rel="stylesheet"><link href="css/app.6c30acd7.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.524d6b36.js"></script><script src="js/app.a48f0419.js"></script></body></html> <!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><link href="css/chunk-088acbde.902ebb66.css" rel="prefetch"><link href="css/chunk-0cbcaa56.e05858e7.css" rel="prefetch"><link href="css/chunk-0f6f9608.b3153d73.css" rel="prefetch"><link href="css/chunk-10d9ee19.84a6683c.css" rel="prefetch"><link href="css/chunk-26daa808.62429343.css" rel="prefetch"><link href="css/chunk-35db73ce.1f9c10ff.css" rel="prefetch"><link href="css/chunk-4caed774.ad94328f.css" rel="prefetch"><link href="css/chunk-52fcdd7c.51e3ffbd.css" rel="prefetch"><link href="css/chunk-6ae0a0d3.84a02b23.css" rel="prefetch"><link href="css/chunk-743f0316.fb5066fb.css" rel="prefetch"><link href="css/chunk-75426f71.902ebb66.css" rel="prefetch"><link href="css/chunk-904e5abc.902ebb66.css" rel="prefetch"><link href="css/chunk-a3ddd952.902ebb66.css" rel="prefetch"><link href="css/chunk-ab4d3e40.d941d6ef.css" rel="prefetch"><link href="css/chunk-e35186f0.902ebb66.css" rel="prefetch"><link href="css/chunk-f0b6f0d4.a3b83cc4.css" rel="prefetch"><link href="css/chunk-f35dfe36.ea52b615.css" rel="prefetch"><link href="js/chunk-088acbde.d8a3ec83.js" rel="prefetch"><link href="js/chunk-0cbcaa56.46e3dd42.js" rel="prefetch"><link href="js/chunk-0f6f9608.540fa080.js" rel="prefetch"><link href="js/chunk-10d9ee19.6bc719ae.js" rel="prefetch"><link href="js/chunk-26daa808.a340b60b.js" rel="prefetch"><link href="js/chunk-35db73ce.e1ffc5fa.js" rel="prefetch"><link href="js/chunk-4caed774.92751344.js" rel="prefetch"><link href="js/chunk-52fcdd7c.0f505f93.js" rel="prefetch"><link href="js/chunk-63c1eac8.59f3df74.js" rel="prefetch"><link href="js/chunk-6ae0a0d3.b08743d0.js" rel="prefetch"><link href="js/chunk-743f0316.503949a4.js" rel="prefetch"><link href="js/chunk-75426f71.1a12b5c7.js" rel="prefetch"><link href="js/chunk-904e5abc.3cea2bdf.js" rel="prefetch"><link href="js/chunk-a3ddd952.dc1ed0be.js" rel="prefetch"><link href="js/chunk-ab4d3e40.1f5f6d89.js" rel="prefetch"><link href="js/chunk-e35186f0.8d8d124a.js" rel="prefetch"><link href="js/chunk-f0b6f0d4.e264ca96.js" rel="prefetch"><link href="js/chunk-f35dfe36.e7038b09.js" rel="prefetch"><link href="css/app.6c30acd7.css" rel="preload" as="style"><link href="css/chunk-vendors.9181e156.css" rel="preload" as="style"><link href="js/app.a0140b01.js" rel="preload" as="script"><link href="js/chunk-vendors.524d6b36.js" rel="preload" as="script"><link href="css/chunk-vendors.9181e156.css" rel="stylesheet"><link href="css/app.6c30acd7.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.524d6b36.js"></script><script src="js/app.a0140b01.js"></script></body></html>

4
public/dist/js/app.a48f0419.js → public/dist/js/app.a0140b01.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/app.a48f0419.js.map → public/dist/js/app.a0140b01.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
public/dist/js/chunk-088acbde.46503dcc.js → public/dist/js/chunk-088acbde.d8a3ec83.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/chunk-088acbde.46503dcc.js.map → public/dist/js/chunk-088acbde.d8a3ec83.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
public/dist/js/chunk-e35186f0.efed2a2b.js → public/dist/js/chunk-e35186f0.8d8d124a.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/chunk-e35186f0.efed2a2b.js.map → public/dist/js/chunk-e35186f0.8d8d124a.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
resources/frontend/src/views/group/addGroup.vue
View File

@ -134,7 +134,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="goods.type.name" label="分类"> <el-table-column prop="goods.type.name" label="分类">
</el-table-column> </el-table-column>
<el-table-column prop="num" label="库存"> <el-table-column prop="stock" label="库存">
</el-table-column> </el-table-column>
</el-table> </el-table>
<div style="display: flex; flex-direction: row-reverse; align-items: center; margin-top: 10px;"> <div style="display: flex; flex-direction: row-reverse; align-items: center; margin-top: 10px;">

2
resources/frontend/src/views/group/editGroup.vue
View File

@ -133,7 +133,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="goods.type.name" label="分类"> <el-table-column prop="goods.type.name" label="分类">
</el-table-column> </el-table-column>
<el-table-column prop="num" label="库存"> <el-table-column prop="stock" label="库存">
</el-table-column> </el-table-column>
</el-table> </el-table>
<div style="display: flex; flex-direction: row-reverse; align-items: center; margin-top: 10px;"> <div style="display: flex; flex-direction: row-reverse; align-items: center; margin-top: 10px;">