From 1d693cef966cb5d119ea0181d13e4f7866a4d2e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com>
Date: Fri, 15 Mar 2024 18:45:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9F=BA=E7=A1=80=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/Goods/GoodsSkusController.php | 3 --
app/Models/DailySalesReport.php | 1 +
...50026_create_daily_sales_reports_table.php | 2 +-
.../src/views/dataCenter/salesReport.vue | 40 +++++++++++++------
resources/frontend/src/views/goods/goods.vue | 10 +++--
5 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/app/Http/Controllers/Goods/GoodsSkusController.php b/app/Http/Controllers/Goods/GoodsSkusController.php
index 2b4938c..70a1459 100644
--- a/app/Http/Controllers/Goods/GoodsSkusController.php
+++ b/app/Http/Controllers/Goods/GoodsSkusController.php
@@ -483,9 +483,6 @@ class GoodsSkusController extends Controller
$this->log->message = $request->get('reason');
$this->setBeforeUpdateForLog($record->loss_num);
$record->loss_num += $request->loss_num;
- if ('补发' === $request->get('reason')) {
- $record->reissue_num += $request->loss_num;
- }
$record->save();
$this->setAfterUpdateForLog($record->loss_num);
$sku->stock -= $request->loss_num;
diff --git a/app/Models/DailySalesReport.php b/app/Models/DailySalesReport.php
index 150cf6c..3c78e2f 100644
--- a/app/Models/DailySalesReport.php
+++ b/app/Models/DailySalesReport.php
@@ -14,5 +14,6 @@ class DailySalesReport extends Model
public $fieldSearchable = [
'date',
'name' => 'like',
+ 'sales_num' => '>',
];
}
diff --git a/database/migrations/2024_03_14_150026_create_daily_sales_reports_table.php b/database/migrations/2024_03_14_150026_create_daily_sales_reports_table.php
index 8e94f48..f335f80 100644
--- a/database/migrations/2024_03_14_150026_create_daily_sales_reports_table.php
+++ b/database/migrations/2024_03_14_150026_create_daily_sales_reports_table.php
@@ -25,7 +25,7 @@ class CreateDailySalesReportsTable extends Migration
$table->string('external_sku_id', 64);
$table->integer('inventory')->default(0)->comment('盘点数量');
$table->integer('arrived_today_num')->default(0)->comment('今日到货');
- $table->integer('sales_num')->default(0)->comment('销量');
+ $table->integer('sales_num')->default(0)->comment('总销量');
$table->integer('already_cancel_number')->default(0)->comment('已取消数量');
$table->unsignedInteger('loss_num')->default(0)->comment('损耗');
$table->decimal('goal_rate', 8, 4)->default(0)->comment('目标去化率');
diff --git a/resources/frontend/src/views/dataCenter/salesReport.vue b/resources/frontend/src/views/dataCenter/salesReport.vue
index d3072e6..b51a0e6 100644
--- a/resources/frontend/src/views/dataCenter/salesReport.vue
+++ b/resources/frontend/src/views/dataCenter/salesReport.vue
@@ -3,13 +3,18 @@
-
+
+
+
+
+
筛选
重置筛选
@@ -18,53 +23,54 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -92,12 +98,13 @@ export default {
name: "",
sort: "sales_num",
sortOrder: "DESC",
+ sales_num: 0,
},
loading: true,
tableData: [],
Paginationdata: {}, //分页相关数据
current_page: 1, //当前页
- per_page: 50, //每页显示数量
+ per_page: 100, //每页显示数量
};
},
mounted() {
@@ -149,6 +156,15 @@ export default {
this.form.sort = line.prop;
this.form.sortOrder = ('ascending' === line.order) ? 'ASC' : 'DESC';
this.salseReportData(this.form);
+ },
+ tableCellClassName({ row, column, rowIndex, columnIndex }) {
+ if (column.property == 'S2' || column.property == 'S4' || column.property == 'S6' || column.property == 'S2_rate' || column.property == 'S4_rate' || column.property == 'S6_rate') {
+ return {
+ "background-color": "beige"
+ };
+ } else {
+ return '';
+ }
}
},
};
diff --git a/resources/frontend/src/views/goods/goods.vue b/resources/frontend/src/views/goods/goods.vue
index 092cd7c..921a3eb 100644
--- a/resources/frontend/src/views/goods/goods.vue
+++ b/resources/frontend/src/views/goods/goods.vue
@@ -217,7 +217,7 @@
- 保存
+ 保存
@@ -264,7 +264,7 @@
@@ -465,7 +465,7 @@ export default {
},
Paginationdata: {}, //分页相关数据
current_page: 1, //当前页
- per_page: 10, //每页显示数量
+ per_page: 100, //每页显示数量
multipleSelection: [], //多选框选中的id
updateType: "", //更新类型，newest-上新, inventory-库存盘点, stock-库存
stock: false, //点击库存显示输入框变量
@@ -980,8 +980,10 @@ export default {
message: "损耗添加成功！",
type: "success",
});
- this.getList();
+ this.handleChoose();
});
+ this.updateField = "";
+ this.editLossId = "";
},
//损耗框取消