添加区域和整理商品组合

feature/0423
fanfan 10 months ago
parent 012efd4116
commit b7a362f332
  1. 30
      src/components/SelectGoods/SelectGoods.vue
  2. 263
      src/views/goods/Create.vue
  3. 146
      src/views/goods/Update.vue
  4. 11
      src/views/goods/modules/MultiSpec.vue

@ -1,31 +1,6 @@
<template>
<div>
<a-button @click="handleSelectGoods">选择商品</a-button>
<a-table
v-show="selectedItems.length"
class="table-goodsList"
rowKey="goods_id"
:columns="columns"
:dataSource="selectedItems"
:pagination="false"
>
<!-- 商品信息 -->
<template slot="item" slot-scope="item">
<GoodsItem
:data="{
image: item.goods_image,
imageAlt: '商品图片',
title: item.goods_name,
subtitle: `¥${item.goods_price_min}`
}"
:subTitleColor="true"
/>
</template>
<!-- 操作项 -->
<span slot="action" slot-scope="text, item, index">
<a v-action:delete @click="handleDeleteItem(index)">删除</a>
</span>
</a-table>
<GoodsModal
ref="GoodsModal"
:multiple="multiple"
@ -40,7 +15,6 @@
import PropTypes from 'ant-design-vue/es/_util/vue-types'
import cloneDeep from 'lodash.clonedeep'
import { GoodsModal } from '@/components/Modal'
import { GoodsItem } from '@/components/Table'
const columns = [
{
@ -67,8 +41,7 @@ const columns = [
export default {
name: 'SelectGoods',
components: {
GoodsModal,
GoodsItem
GoodsModal
},
model: {
prop: 'value',
@ -145,6 +118,7 @@ export default {
onChange () {
const { multiple, selectedGoodsIds } = this
const sGoodsIds = multiple ? selectedGoodsIds : (selectedGoodsIds.length ? selectedGoodsIds[0] : undefined)
this.$emit('select', multiple ? this.selectedItems : this.selectedItems[0])
return this.$emit('change', sGoodsIds)
}

@ -53,26 +53,20 @@
</a-form-item>
<a-form-item label="是否大牌正品" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-radio-group
v-decorator="['is_brand', { initialValue: 0, rules: [{ required: true }] }]"
>
<a-radio-group v-decorator="['is_brand', { initialValue: 0, rules: [{ required: true }] }]">
<a-radio :value="0"></a-radio>
<a-radio :value="1"></a-radio>
</a-radio-group>
</a-form-item>
<a-form-item label="是否新品首发" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-radio-group
v-decorator="['is_new', { initialValue: 0, rules: [{ required: true }] }]"
>
<a-radio-group v-decorator="['is_new', { initialValue: 0, rules: [{ required: true }] }]">
<a-radio :value="0"></a-radio>
<a-radio :value="1"></a-radio>
</a-radio-group>
</a-form-item>
<a-form-item label="是否店内" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-radio-group
v-decorator="['is_in_store', { initialValue: 0, rules: [{ required: true }] }]"
>
<a-radio-group v-decorator="['is_in_store', { initialValue: 0, rules: [{ required: true }] }]">
<a-radio :value="0"></a-radio>
<a-radio :value="1"></a-radio>
</a-radio-group>
@ -106,8 +100,14 @@
<div v-show="form.getFieldValue('is_ind_delivery_type')">
<a-form-item extra="需在 [设置 - 配送方式] 中,开启支持的配送方式才可生效">
<a-checkbox-group
:options="[{ label: '快递配送', value: 10 }, { label: '上门自提', value: 20 }]"
v-decorator="['delivery_type', { initialValue: [10, 20], rules: [{ required: true, message: '配送方式至少选择一个' }] }]"
:options="[
{ label: '快递配送', value: 10 },
{ label: '上门自提', value: 20 },
]"
v-decorator="[
'delivery_type',
{ initialValue: [10, 20], rules: [{ required: true, message: '配送方式至少选择一个' }] },
]"
/>
</a-form-item>
</div>
@ -127,29 +127,22 @@
v-for="(item, index) in formData.deliveryList"
:key="index"
:value="item.delivery_id"
>{{ item.name }}</a-select-option>
>{{ item.name }}</a-select-option
>
</a-select>
<div class="form-item-help">
<router-link
target="_blank"
:to="{ path: '/setting/delivery/template/create' }"
>新增模板</router-link>
<router-link target="_blank" :to="{ path: '/setting/delivery/template/create' }">新增模板</router-link>
<a href="javascript:;" @click="onReloadDeliveryList">刷新</a>
</div>
</a-form-item>
<a-form-item label="商品状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-radio-group
v-decorator="['status', { initialValue: 10, rules: [{ required: true }] }]"
>
<a-radio-group v-decorator="['status', { initialValue: 10, rules: [{ required: true }] }]">
<a-radio :value="10">上架</a-radio>
<a-radio :value="20">下架</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item label="商品排序" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="数字越小越靠前">
<a-input-number
:min="0"
v-decorator="['sort', { initialValue: 100, rules: [{ required: true }] }]"
/>
<a-input-number :min="0" v-decorator="['sort', { initialValue: 100, rules: [{ required: true }] }]" />
</a-form-item>
</div>
@ -179,16 +172,14 @@
<a-input-number
:min="0.01"
:precision="2"
v-decorator="['goods_price', { initialValue: 1, rules: [{ required: true, message: '请输入商品价格' }] }]"
v-decorator="[
'goods_price',
{ initialValue: 1, rules: [{ required: true, message: '请输入商品价格' }] },
]"
/>
<span class="ml-10"></span>
</a-form-item>
<a-form-item
label="成本价"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
extra="成本价仅用于商品页展示"
>
<a-form-item label="成本价" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="成本价仅用于商品页展示">
<a-input-number :min="0" :precision="2" v-decorator="['cost_price']" />
<span class="ml-10"></span>
</a-form-item>
@ -201,7 +192,10 @@
<a-input-number
:min="0"
:precision="0"
v-decorator="['stock_num', { initialValue: 100, rules: [{ required: true, message: '请输入库存数量' }] }]"
v-decorator="[
'stock_num',
{ initialValue: 100, rules: [{ required: true, message: '请输入库存数量' }] },
]"
/>
<span class="ml-10"></span>
</a-form-item>
@ -213,15 +207,16 @@
>
<a-input-number
:min="0"
v-decorator="['goods_weight', { initialValue: 0, rules: [{ required: true, message: '请输入库存数量' }] }]"
v-decorator="[
'goods_weight',
{ initialValue: 0, rules: [{ required: true, message: '请输入库存数量' }] },
]"
/>
<span class="ml-10">千克 (Kg)</span>
</a-form-item>
</div>
<a-form-item label="库存计算方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-radio-group
v-decorator="['deduct_stock_type', { initialValue: 10, rules: [{ required: true }] }]"
>
<a-radio-group v-decorator="['deduct_stock_type', { initialValue: 10, rules: [{ required: true }] }]">
<a-radio :value="10">下单减库存</a-radio>
<a-radio :value="20">付款减库存</a-radio>
</a-radio-group>
@ -265,9 +260,7 @@
<!-- 商品详情 -->
<div class="tab-pane" v-show="tabKey == 2">
<a-form-item label="商品详情" :labelCol="labelCol" :wrapperCol="{ span: 16 }">
<Ueditor
v-decorator="['content', { rules: [{ required: true, message: '商品详情不能为空' }] }]"
/>
<Ueditor v-decorator="['content', { rules: [{ required: true, message: '商品详情不能为空' }] }]" />
</a-form-item>
</div>
@ -304,11 +297,9 @@
v-decorator="['serviceIds', { initialValue: formData.defaultServiceIds }]"
placeholder="请选择服务与承诺"
>
<a-select-option
v-for="(item, index) in formData.serviceList"
:key="index"
:value="item.service_id"
>{{ item.name }}</a-select-option>
<a-select-option v-for="(item, index) in formData.serviceList" :key="index" :value="item.service_id">{{
item.name
}}</a-select-option>
</a-select>
<div class="form-item-help">
<router-link target="_blank" :to="{ path: '/goods/service/index' }">去新增</router-link>
@ -323,7 +314,41 @@
>
<a-input-number v-decorator="['sales_initial', { initialValue: 0 }]" />
</a-form-item>
<div>
<a-divider orientation="left">销售区域</a-divider>
<a-form-item label="销售区域" :labelCol="labelCol" :wrapperCol="{ span: 15 }">
<a-table
v-show="ruleList.length"
class="table-rules"
:columns="columns"
:dataSource="ruleList"
:pagination="false"
bordered
>
<!-- 销售区域 -->
<template slot="region_text" slot-scope="text, item, index">
<p class="content">
<span v-for="(province, pidx) in text" :key="pidx">
<span>{{ province.name }}</span>
<template v-if="province.citys.length">
<span>(</span>
<span class="city-name" v-for="(city, cidx) in province.citys" :key="cidx"
>{{ city.name }}{{ province.citys.length > cidx + 1 ? '、' : '' }}</span
>
<span>)</span>
</template>
<span>{{ ' ' }}</span>
</span>
</p>
<p class="operation">
<a href="javascript:void(0);" class="edit" @click="handleEdit(index, item)">编辑</a>
<a href="javascript:void(0);" class="delete" @click="handleDelete(index)">删除</a>
</p>
</template>
</a-table>
<a-button icon="environment" v-if="ruleList.length == 0" @click="handleAdd">点击添加销售区域</a-button>
</a-form-item>
</div>
<div v-show="$module('market-points')">
<a-divider orientation="left">积分设置</a-divider>
<a-form-item
@ -332,9 +357,7 @@
:wrapperCol="wrapperCol"
extra="开启后用户购买此商品将获得积分"
>
<a-radio-group
v-decorator="['is_points_gift', { initialValue: 1, rules: [{ required: true }] }]"
>
<a-radio-group v-decorator="['is_points_gift', { initialValue: 1, rules: [{ required: true }] }]">
<a-radio :value="1">开启</a-radio>
<a-radio :value="0">关闭</a-radio>
</a-radio-group>
@ -345,9 +368,7 @@
:wrapperCol="wrapperCol"
extra="开启后用户购买此商品可以使用积分进行抵扣"
>
<a-radio-group
v-decorator="['is_points_discount', { initialValue: 1, rules: [{ required: true }] }]"
>
<a-radio-group v-decorator="['is_points_discount', { initialValue: 1, rules: [{ required: true }] }]">
<a-radio :value="1">开启</a-radio>
<a-radio :value="0">关闭</a-radio>
</a-radio-group>
@ -390,17 +411,20 @@
:addonBefore="item.name"
addonAfter="折"
:inputProps="{ min: 0, max: 9.9 }"
v-decorator="[`alone_grade_equity[grade_id:${item.grade_id}]`, {
initialValue: formData.defaultUserGradeValue[item.grade_id], rules: [{ required: true, message: '折扣率不能为空' }]
}]"
v-decorator="[
`alone_grade_equity[grade_id:${item.grade_id}]`,
{
initialValue: formData.defaultUserGradeValue[item.grade_id],
rules: [{ required: true, message: '折扣率不能为空' }],
},
]"
/>
</a-form-item>
</div>
<div class="form-item-help">
<p
class="extra"
v-if="form.getFieldValue('is_alone_grade')"
>单独折扣折扣率范围0.0-9.9例如: 9.8代表98折0代表不折扣</p>
<p class="extra" v-if="form.getFieldValue('is_alone_grade')">
单独折扣折扣率范围0.0-9.9例如: 9.8代表98折0代表不折扣
</p>
<p class="extra" v-else>默认折扣默认为用户所属会员等级的折扣率</p>
</div>
</a-form-item>
@ -450,6 +474,7 @@
<a-button type="primary" html-type="submit" :loading="isBtnLoading">提交</a-button>
</a-form-item>
</a-form>
<AreasModal ref="AreasModal" @handleSubmit="handleAreaSubmit" />
</a-spin>
</a-card>
</template>
@ -459,7 +484,12 @@ import * as GoodsApi from '@/api/goods'
import { SelectImage, SelectVideo, Ueditor, InputNumberGroup } from '@/components'
import GoodsModel from '@/common/model/goods/Index'
import { GoodsType, MultiSpec } from './modules'
import { AreasModal } from '@/components/Modal'
const defaultItem = {
key: 0,
region: [],
region_text: [],
}
export default {
components: {
GoodsType,
@ -467,7 +497,8 @@ export default {
SelectVideo,
Ueditor,
InputNumberGroup,
MultiSpec
MultiSpec,
AreasModal,
},
data() {
return {
@ -483,26 +514,39 @@ export default {
//
form: this.$form.createForm(this),
//
formData: GoodsModel.formData
formData: GoodsModel.formData,
checkList: [],
//
ruleList: [],
//
columns: [
{
title: '销售区域',
dataIndex: 'region_text',
width: '400px',
scopedSlots: { customRender: 'region_text' },
},
],
//
citysCount: null,
}
},
//
created() {
this.isLoading = true
// form
GoodsModel.getFromData()
.then(() => {
GoodsModel.getFromData().then(() => {
this.isLoading = false
})
},
methods: {
//
onForceUpdate(bool = false) {
this.$forceUpdate()
// booltrue $forceUpdate,
// $forceUpdate, v-decoratorform.getFieldValue
bool && setTimeout(() => {
bool &&
setTimeout(() => {
this.$forceUpdate()
}, 10)
},
@ -540,7 +584,9 @@ export default {
handleSubmit(e) {
e.preventDefault()
//
const { form: { validateFields } } = this
const {
form: { validateFields }, ruleList
} = this
validateFields((errors, values) => {
// tab
if (errors) {
@ -557,8 +603,9 @@ export default {
//
values.specData = MultiSpec.getFromSpecData()
}
values.rules = ruleList
// ID
values.categoryIds = values.categorys.map(item => item.value)
values.categoryIds = values.categorys.map((item) => item.value)
delete values.categorys
// api
this.onFormSubmit(values)
@ -574,7 +621,7 @@ export default {
['goods_type', 'goods_name', 'categorys', 'imagesIds', 'delivery_id', 'is_ind_delivery_type', 'delivery_type'],
['spec_type', 'goods_price', 'is_restrict', 'restrict_total', 'restrict_single'],
['content'],
['alone_grade_equity', 'first_money', 'second_money', 'third_money']
['alone_grade_equity', 'first_money', 'second_money', 'third_money'],
]
const field = Object.keys(errors).shift()
for (const key in tabsFieldsMap) {
@ -590,7 +637,7 @@ export default {
this.isLoading = true
this.isBtnLoading = true
GoodsApi.add({ form: values })
.then(result => {
.then((result) => {
//
this.$message.success(result.message, 1.5)
//
@ -601,13 +648,89 @@ export default {
.catch(() => {
this.isBtnLoading = false
})
.finally(() => this.isLoading = false)
.finally(() => (this.isLoading = false))
},
//
handleAdd() {
const index = this.ruleList.length
const newItem = { ...defaultItem, key: index }
// id(id)
const excludedCityIds = this.getExcludedCityIds()
if (excludedCityIds.length === this.citysCount) {
this.$message.error('已选择了所有的区域', 0.8)
return false
}
//
this.handleAreasModal('add', index, newItem, excludedCityIds)
},
//
handleEdit(index, item) {
// id(id)
const excludedCityIds = this.getExcludedCityIds()
//
this.handleAreasModal('edit', index, item, excludedCityIds)
},
//
handleAreaSubmit(result) {
const {
custom: { scene, item },
} = result
item.region = result.selectedCityIds
item.region_text = result.selectedText
if (scene === 'add') {
this.ruleList.push(item)
}
}
},
// id(id)
getExcludedCityIds() {
const excludedCityIds = []
this.ruleList.forEach((item) => {
item.region.forEach((cityId) => {
excludedCityIds.push(cityId)
})
})
return excludedCityIds
},
//
handleAreasModal(scene, index, item, excludedCityIds) {
this.$refs.AreasModal.handle({ scene, index, item }, item.region, excludedCityIds)
},
//
handleDelete(index) {
const app = this
const modal = this.$confirm({
title: '您确定要删除该记录吗?',
onOk() {
app.ruleList.splice(index, 1)
modal.destroy()
},
})
},
},
}
</script>
<style lang="less" scoped>
@import './style.less';
.table-rules {
.operation {
text-align: right;
a {
font-size: @font-size-base;
margin-left: 6px;
}
}
.content {
color: #505050;
white-space: normal;
.city-name {
font-size: 12.5px;
color: #7b7b7b;
}
}
}
</style>

@ -342,7 +342,41 @@
>
<a-input-number v-decorator="['sales_initial', { initialValue: 0}]" />
</a-form-item>
<div>
<a-divider orientation="left">销售区域</a-divider>
<a-form-item label="销售区域" :labelCol="labelCol" :wrapperCol="{ span: 15 }">
<a-table
v-show="ruleList.length"
class="table-rules"
:columns="columns"
:dataSource="ruleList"
:pagination="false"
bordered
>
<!-- 销售区域 -->
<template slot="region_text" slot-scope="text, item, index">
<p class="content">
<span v-for="(province, pidx) in text" :key="pidx">
<span>{{ province.name }}</span>
<template v-if="province.citys.length">
<span>(</span>
<span class="city-name" v-for="(city, cidx) in province.citys" :key="cidx"
>{{ city.name }}{{ province.citys.length > cidx + 1 ? '、' : '' }}</span
>
<span>)</span>
</template>
<span>{{ ' ' }}</span>
</span>
</p>
<p class="operation">
<a href="javascript:void(0);" class="edit" @click="handleEdit(index, item)">编辑</a>
<a href="javascript:void(0);" class="delete" @click="handleDelete(index)">删除</a>
</p>
</template>
</a-table>
<a-button icon="environment" v-if="ruleList.length == 0" @click="handleAdd">点击添加销售区域</a-button>
</a-form-item>
</div>
<div v-show="$module('market-points')">
<a-divider orientation="left">积分设置</a-divider>
<a-form-item
@ -469,6 +503,7 @@
<a-button type="primary" html-type="submit" :loading="isBtnLoading">提交</a-button>
</a-form-item>
</a-form>
<AreasModal ref="AreasModal" @handleSubmit="handleAreaSubmit" />
</a-spin>
</a-card>
</template>
@ -479,7 +514,12 @@ import { SelectImage, SelectVideo, Ueditor, InputNumberGroup } from '@/component
import GoodsModel from '@/common/model/goods/Index'
import { GoodsType, MultiSpec } from './modules'
import { isEmptyObject } from '@/utils/util'
import { AreasModal } from '@/components/Modal'
const defaultItem = {
key: 0,
region: [],
region_text: [],
}
export default {
components: {
GoodsType,
@ -487,7 +527,8 @@ export default {
SelectVideo,
Ueditor,
InputNumberGroup,
MultiSpec
MultiSpec,
AreasModal
},
data () {
return {
@ -505,7 +546,21 @@ export default {
// ID
goodsId: null,
//
formData: GoodsModel.formData
formData: GoodsModel.formData,
checkList: [],
//
ruleList: [],
//
columns: [
{
title: '销售区域',
dataIndex: 'region_text',
width: '400px',
scopedSlots: { customRender: 'region_text' },
},
],
//
citysCount: null,
}
},
watch: {
@ -543,6 +598,7 @@ export default {
// (form-item)
this.$nextTick(() => {
this.form.setFieldsValue(GoodsModel.getFieldsValue2())
this.ruleList = this.formData.goods.rules?this.formData.goods.rules:[]
this.onForceUpdate()
})
}
@ -593,7 +649,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
//
const { form: { validateFields } } = this
const { form: { validateFields },ruleList } = this
validateFields((errors, values) => {
// tab
if (errors) {
@ -610,6 +666,7 @@ export default {
//
values.specData = MultiSpec.getFromSpecData()
}
values.rules = ruleList
// ID
values.categoryIds = values.categorys.map(item => item.value)
delete values.categorys
@ -655,7 +712,69 @@ export default {
this.isBtnLoading = false
})
.finally(() => this.isLoading = false)
},
//
handleAdd() {
const index = this.ruleList.length
const newItem = { ...defaultItem, key: index }
// id(id)
const excludedCityIds = this.getExcludedCityIds()
if (excludedCityIds.length === this.citysCount) {
this.$message.error('已选择了所有的区域', 0.8)
return false
}
//
this.handleAreasModal('add', index, newItem, excludedCityIds)
},
//
handleEdit(index, item) {
// id(id)
const excludedCityIds = this.getExcludedCityIds()
//
this.handleAreasModal('edit', index, item, excludedCityIds)
},
//
handleAreaSubmit(result) {
const {
custom: { scene, item },
} = result
item.region = result.selectedCityIds
item.region_text = result.selectedText
if (scene === 'add') {
this.ruleList.push(item)
}
},
// id(id)
getExcludedCityIds() {
const excludedCityIds = []
this.ruleList.forEach((item) => {
item.region.forEach((cityId) => {
excludedCityIds.push(cityId)
})
})
return excludedCityIds
},
//
handleAreasModal(scene, index, item, excludedCityIds) {
this.$refs.AreasModal.handle({ scene, index, item }, item.region, excludedCityIds)
},
//
handleDelete(index) {
const app = this
const modal = this.$confirm({
title: '您确定要删除该记录吗?',
onOk() {
app.ruleList.splice(index, 1)
modal.destroy()
},
})
},
}
}
@ -663,4 +782,21 @@ export default {
</script>
<style lang="less" scoped>
@import './style.less';
.table-rules {
.operation {
text-align: right;
a {
font-size: @font-size-base;
margin-left: 6px;
}
}
.content {
color: #505050;
white-space: normal;
.city-name {
font-size: 12.5px;
color: #7b7b7b;
}
}
}
</style>

@ -290,8 +290,13 @@ export default {
return false
}
console.log(goodsId, item)
this.getGoodsDetail(goodsId).then(res => {
const queryGoodsId = this.$route.query.goodsId
if (res.spec_type === 20 && queryGoodsId !== goodsId) {
this.$message.error('您选择的商品是多规格商品', 2)
return false
}
const sku = res.skuList[0]
item.goods_price = sku.goods_price
item.cost_price = sku.cost_price
@ -319,7 +324,7 @@ export default {
<style lang="less" scoped>
//
.spec-group {
width: 895px;
width: 1100px;
margin-bottom: 15px;
line-height: normal;
@ -427,7 +432,7 @@ export default {
// sku
.sku-list {
width: 895px;
width: 1100px;
/deep/.ant-table-thead > tr > th,
/deep/.ant-table-tbody > tr > td {
white-space: nowrap;

Loading…
Cancel
Save