From 835f23f39a9d9ba8dbfdee3673d7c7ea93306449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E4=BC=9F?= <943146732@qq.com>
Date: Sat, 16 Mar 2024 22:12:42 +0800
Subject: [PATCH] update
---
src/common/model/goods/Index.js | 2 +-
src/common/model/goods/MultiSpec.js | 9 ++++++++-
src/common/model/groupon/goods/Index.js | 2 +-
src/common/model/sharp/goods/Index.js | 2 +-
src/views/dataCenter/goods/Copy.vue | 11 ++++++++++-
src/views/dataCenter/goods/Create.vue | 6 +++---
src/views/dataCenter/goods/Update.vue | 8 ++++----
src/views/dataCenter/goods/modules/MultiSpec.vue | 16 +++++++++++++---
8 files changed, 41 insertions(+), 15 deletions(-)
diff --git a/src/common/model/goods/Index.js b/src/common/model/goods/Index.js
index e5f8d11..34898e3 100644
--- a/src/common/model/goods/Index.js
+++ b/src/common/model/goods/Index.js
@@ -114,7 +114,7 @@ export default {
}
// 单规格数据
if (goodsInfo.spec_type == 10) {
- const skuOne = _.pick(goodsInfo.skuList[0], ['goods_price', 'line_price', 'stock_num', 'goods_weight'])
+ const skuOne = _.pick(goodsInfo.skuList[0], ['goods_price', 'line_price', 'cost_price', 'stock_num', 'goods_weight'])
goodsFormData = { ...goodsFormData, ...skuOne }
}
// 商品限购数据
diff --git a/src/common/model/goods/MultiSpec.js b/src/common/model/goods/MultiSpec.js
index 5ef980b..45140d8 100644
--- a/src/common/model/goods/MultiSpec.js
+++ b/src/common/model/goods/MultiSpec.js
@@ -17,11 +17,17 @@ const defaultColumns = [
scopedSlots: { customRender: 'goods_price' }
},
{
+ title: '成本价',
+ dataIndex: 'cost_price',
+ width: 120,
+ scopedSlots: { customRender: 'cost_price' }
+ },
+ /* {
title: '划线价格',
dataIndex: 'line_price',
width: 120,
scopedSlots: { customRender: 'line_price' }
- },
+ }, */
{
title: '库存数量',
dataIndex: 'stock_num',
@@ -49,6 +55,7 @@ const defaultSkuItemData = {
// imageList: [],
goods_price: '',
line_price: '',
+ cost_price: '',
stock_num: '',
goods_weight: '',
goods_sku_no: ''
diff --git a/src/common/model/groupon/goods/Index.js b/src/common/model/groupon/goods/Index.js
index 1dc4007..7a9b624 100644
--- a/src/common/model/groupon/goods/Index.js
+++ b/src/common/model/groupon/goods/Index.js
@@ -53,7 +53,7 @@ export default {
'goods_name', 'goods_no', 'delivery_type', 'sort',
])
// 单规格数据
- const skuOne = _.pick(goodsInfo.skuList[0], ['goods_price', 'line_price', 'stock_num', 'goods_weight'])
+ const skuOne = _.pick(goodsInfo.skuList[0], ['goods_price', 'line_price', 'cost_price', 'stock_num', 'goods_weight'])
return {
...goodsFormData,
...skuOne
diff --git a/src/common/model/sharp/goods/Index.js b/src/common/model/sharp/goods/Index.js
index 1dc4007..7a9b624 100644
--- a/src/common/model/sharp/goods/Index.js
+++ b/src/common/model/sharp/goods/Index.js
@@ -53,7 +53,7 @@ export default {
'goods_name', 'goods_no', 'delivery_type', 'sort',
])
// 单规格数据
- const skuOne = _.pick(goodsInfo.skuList[0], ['goods_price', 'line_price', 'stock_num', 'goods_weight'])
+ const skuOne = _.pick(goodsInfo.skuList[0], ['goods_price', 'line_price', 'cost_price', 'stock_num', 'goods_weight'])
return {
...goodsFormData,
...skuOne
diff --git a/src/views/dataCenter/goods/Copy.vue b/src/views/dataCenter/goods/Copy.vue
index ec72b69..33df171 100644
--- a/src/views/dataCenter/goods/Copy.vue
+++ b/src/views/dataCenter/goods/Copy.vue
@@ -154,6 +154,15 @@
元
+
+ 元
+
+
元
-
+
元
元
-
+
元
+
+
+
+
+
-
+