Compare commits
No commits in common. "3d12b5e8272c2020407139089bbbe6d647e1d21a" and "2c5dd992a87b6e0da97b9e5e1501a47b5174afcb" have entirely different histories.
3d12b5e827
...
2c5dd992a8
@ -120,18 +120,7 @@
|
|||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-row">
|
|
||||||
<el-form-item
|
|
||||||
label="商品溢价率"
|
|
||||||
:prop="'items.' + index + '.premiumRate'"
|
|
||||||
>
|
|
||||||
<el-input
|
|
||||||
v-model.number="item.premiumRate"
|
|
||||||
placeholder="商品溢价率(%)"
|
|
||||||
type="number"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
</div>
|
|
||||||
<div class="form-row">
|
<div class="form-row">
|
||||||
<el-form-item
|
<el-form-item
|
||||||
label="描述"
|
label="描述"
|
||||||
@ -321,8 +310,7 @@
|
|||||||
specUnit: item.specUnit,
|
specUnit: item.specUnit,
|
||||||
description: item.description,
|
description: item.description,
|
||||||
sortOrder: item.sortOrder,
|
sortOrder: item.sortOrder,
|
||||||
productNumber:item.productNumber,
|
productNumber:item.productNumber
|
||||||
premiumRate:item.premiumRate
|
|
||||||
}))
|
}))
|
||||||
|
|
||||||
// 过滤掉空项(新增模式下)
|
// 过滤掉空项(新增模式下)
|
||||||
|
|||||||
@ -8,13 +8,6 @@
|
|||||||
placeholder="输入商品名称"
|
placeholder="输入商品名称"
|
||||||
prefix-icon="el-icon-search"
|
prefix-icon="el-icon-search"
|
||||||
/>
|
/>
|
||||||
<el-input
|
|
||||||
v-model="filter.productNumber"
|
|
||||||
class="input_item"
|
|
||||||
clearable
|
|
||||||
placeholder="输入商品货号"
|
|
||||||
prefix-icon="el-icon-search"
|
|
||||||
/>
|
|
||||||
<el-select
|
<el-select
|
||||||
v-model="filter.storeId"
|
v-model="filter.storeId"
|
||||||
clearable
|
clearable
|
||||||
@ -113,10 +106,6 @@
|
|||||||
<el-table-column label="店铺ID" prop="storeId" />
|
<el-table-column label="店铺ID" prop="storeId" />
|
||||||
<el-table-column label="商品名称" prop="productName" />
|
<el-table-column label="商品名称" prop="productName" />
|
||||||
<el-table-column label="商品描述" prop="description" />
|
<el-table-column label="商品描述" prop="description" />
|
||||||
<el-table-column
|
|
||||||
label="商品溢价率"
|
|
||||||
prop="premiumRate"
|
|
||||||
:formatter="(row) => row.premiumRate + '%'" />
|
|
||||||
<el-table-column label="商品规格" prop="specValue">
|
<el-table-column label="商品规格" prop="specValue">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
{{ scope.row.specValue }}{{ scope.row.specUnit }}
|
{{ scope.row.specValue }}{{ scope.row.specUnit }}
|
||||||
@ -190,7 +179,6 @@
|
|||||||
filter: {
|
filter: {
|
||||||
productName: '',
|
productName: '',
|
||||||
storeId: '',
|
storeId: '',
|
||||||
productNumber:'',
|
|
||||||
},
|
},
|
||||||
pagination: {
|
pagination: {
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
|
|||||||
@ -108,21 +108,12 @@
|
|||||||
<el-radio :label="'2'">自动</el-radio>
|
<el-radio :label="'2'">自动</el-radio>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="是否同步活动" prop="isSyncActive">
|
<el-form-item label="允许负库存售卖" prop="isNegativeAllowed">
|
||||||
<el-radio-group v-model="innerFormData.isSyncActive">
|
<el-radio-group v-model="innerFormData.isNegativeAllowed">
|
||||||
<el-radio :label="'1'">是</el-radio>
|
<el-radio :label="'1'">是</el-radio>
|
||||||
<el-radio :label="'0'">否</el-radio>
|
<el-radio :label="'0'">否</el-radio>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="是否同步会员" prop="isSyncMember">
|
|
||||||
<el-radio-group v-model="innerFormData.isSyncMember">
|
|
||||||
<el-radio :label="'1'">是</el-radio>
|
|
||||||
<el-radio :label="'0'">否</el-radio>
|
|
||||||
</el-radio-group>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="营业员账号" prop="saleAccount">
|
|
||||||
<el-input v-model="innerFormData.saleAccount" type="text"/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="备注信息" prop="remark">
|
<el-form-item label="备注信息" prop="remark">
|
||||||
<el-input v-model="innerFormData.remark" type="textarea" />
|
<el-input v-model="innerFormData.remark" type="textarea" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@ -226,20 +217,6 @@
|
|||||||
trigger: 'change',
|
trigger: 'change',
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
isSyncActive: [
|
|
||||||
{
|
|
||||||
required: true,
|
|
||||||
message: '请选择是否同步活动',
|
|
||||||
trigger: 'change',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
isSyncMember: [
|
|
||||||
{
|
|
||||||
required: true,
|
|
||||||
message: '请选择是否同步会员',
|
|
||||||
trigger: 'change',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
cronExpression: [
|
cronExpression: [
|
||||||
{
|
{
|
||||||
required: true,
|
required: true,
|
||||||
@ -291,9 +268,6 @@
|
|||||||
isTowSync: '0',
|
isTowSync: '0',
|
||||||
priorityMode: '1',
|
priorityMode: '1',
|
||||||
isNegativeAllowed:'0',
|
isNegativeAllowed:'0',
|
||||||
saleAccount:'',
|
|
||||||
isSyncActive:'0',
|
|
||||||
isSyncMember:'0',
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user