From 04be125365bfd254166072f75da87e406f633ba3 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 09 一月 2025 18:36:56 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/operation_pc-v2
---
utils/mark-up-config.js | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/utils/mark-up-config.js b/utils/mark-up-config.js
index b5e10d2..f610b59 100644
--- a/utils/mark-up-config.js
+++ b/utils/mark-up-config.js
@@ -2,7 +2,7 @@
getGoodsCategoryListConfig,
getGoodsListConfig,
} from '@/utils/form-item-config'
-export const categoryMarkUpConfig = (route, h) => {
+export const categoryMarkUpConfig = (route, h, multiple = false) => {
return {
extraQuery: {
partnerId: route.params.partnerId,
@@ -64,7 +64,7 @@
],
form: [
{
- ...getGoodsCategoryListConfig(true),
+ ...getGoodsCategoryListConfig(true, multiple),
rules: { required: true, message: '请选择商品分类' },
str: true,
strKey: 'name',
@@ -198,6 +198,7 @@
{ label: '供应商', prop: 'supplierName', minWidth: 100 },
{ label: '底价(元)', prop: 'price', minWidth: 100 },
{ label: '加价(元)', prop: 'fee', minWidth: 100 },
+ { label: '售价(元)', prop: 'sellPrice', minWidth: 100 },
{ label: '销量', prop: 'sales', minWidth: 100 },
{ label: '库存', prop: 'stock', minWidth: 100 },
],
@@ -224,6 +225,21 @@
clearable: true,
},
},
+ {
+ label: '加价',
+ id: 'isFee',
+ type: 'bus-select-dict',
+ el: {
+ code: 'GOODS_IS_FEE',
+ clearable: true,
+ style: 'width:100%',
+ },
+ },
+ {
+ label: '供应商',
+ id: 'supplierName',
+ type: 'input',
+ },
],
},
],
--
Gitblit v1.9.3