wangmingchuan
/
yanzong_vue_admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新的需求

Browse Source
main
fanfan 10 months ago
parent 50a4028c2f
commit ee1876f777
3 changed files with 158 additions and 109 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      src/common/model/goods/Index.js
  2. 217
      src/views/dataCenter/goods/Create.vue
  3. 47
      src/views/dataCenter/goods/Update.vue

3
src/common/model/goods/Index.js
Unescape View File

@ -95,7 +95,8 @@ export default {
'status', 'spec_type', 'deduct_stock_type', 'is_restrict', 'content',
'selling_point', 'serviceIds', 'sales_initial', 'is_points_gift',
'is_points_discount', 'is_enable_grade', 'is_alone_grade', 'is_ind_dealer',
'dealer_money_type', 'first_money', 'second_money', 'third_money','specific_value'
'dealer_money_type', 'first_money', 'second_money', 'third_money','specific_value',
'cmmdty_model','is_check','is_pool','is_sale','delivery_time'
])
return {
...goodsFormData,

217
src/views/dataCenter/goods/Create.vue
Unescape View File

@ -24,6 +24,12 @@
v-decorator="['goods_name', { rules: [{ required: true, min: 2, message: '请输入至少2个字符' }] }]"
/>
</a-form-item>
<a-form-item label="商品型号" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input
placeholder="请输入商品型号"
v-decorator="['cmmdty_model', { rules: [{ required: true, min: 2, message: '请输入至少2个字符' }] }]"
/>
</a-form-item>
<a-form-item label="商品分类" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-tree-select
placeholder="请选择商品分类"
@ -51,7 +57,6 @@
v-decorator="['imagesIds', { rules: [{ required: true, message: '请至少上传1张商品图片' }] }]"
/>
</a-form-item>
<!-- <a-form-item label="是否大牌正品" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-radio-group
v-decorator="['is_brand', { initialValue: 0, rules: [{ required: true }] }]"
@ -137,29 +142,39 @@
<a href="javascript:;" @click="onReloadDeliveryList">刷新</a>
</div>
</a-form-item> -->
<a-form-item label="发货时效" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-radio-group v-decorator="['delivery_time', { initialValue: 0, rules: [{ required: true }] }]">
<a-radio :value="0">24小时</a-radio>
<a-radio :value="1">48小时</a-radio>
<a-radio :value="2">72小时</a-radio>
<a-radio :value="3">7天内</a-radio>
<a-radio :value="4">15天内</a-radio>
<a-radio :value="5">30天内</a-radio>
<a-radio :value="6">45天内</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item label="是否审单" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-radio-group v-decorator="['is_check', { 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_pool', { initialValue: 0, rules: [{ required: true }] }]"
>
<a-radio-group v-decorator="['is_pool', { initialValue: 0, rules: [{ required: true }] }]">
<a-radio :value="0">待处理</a-radio>
<a-radio :value="1">已入池</a-radio>
<a-radio :value="2">未入池</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-radio-group
v-decorator="['is_sale', { initialValue: 0, rules: [{ required: true }] }]"
>
<a-radio-group v-decorator="['is_sale', { initialValue: 0, rules: [{ required: true }] }]">
<a-radio :value="0">停售</a-radio>
<a-radio :value="1">在售</a-radio>
<a-radio :value="2">无货</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>
@ -175,10 +190,7 @@
</a-radio-group>
</a-form-item>
<a-form-item label="规格值" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input
placeholder="多个规格值，以英文分号分隔"
v-decorator="['specific_value']"
/>
<a-input placeholder="多个规格值，以英文分号分隔" v-decorator="['specific_value']" />
</a-form-item>
<!-- 多规格的表单内容 -->
<div v-show="form.getFieldValue('spec_type') == 20">
@ -195,16 +207,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>
@ -217,7 +227,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>
@ -229,7 +242,10 @@
>
<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>
@ -280,10 +296,8 @@
<!-- 商品详情 -->
<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: '商品详情不能为空' }] }]"
/>
<a-form-item label="商品详情" :labelCol="labelCol" :wrapperCol="{ span: 16 }">
<Ueditor v-decorator="['content', { rules: [{ required: true, message: '商品详情不能为空' }] }]" />
</a-form-item>
</div>
@ -313,18 +327,16 @@
>
<a-input placeholder="请输入商品卖点" v-decorator="['selling_point']" />
</a-form-item>
<a-form-item label="服务与承诺" :labelCol="labelCol" :wrapperCol="wrapperCol" style="display: none;">
<a-form-item label="服务与承诺" :labelCol="labelCol" :wrapperCol="wrapperCol" style="display: none">
<a-select
v-if="formData.serviceList"
mode="multiple"
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>
@ -337,10 +349,10 @@
:wrapperCol="wrapperCol"
extra="用户端展示的销量 = 初始销量 + 实际销量"
>
<a-input-number v-decorator="['sales_initial', { initialValue: 0}]" />
<a-input-number v-decorator="['sales_initial', { initialValue: 0 }]" />
</a-form-item>
<div >
<div>
<a-divider orientation="left">销售区域</a-divider>
<a-form-item label="销售区域" :labelCol="labelCol" :wrapperCol="{ span: 15 }">
<a-table
@ -358,11 +370,9 @@
<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 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>
@ -374,11 +384,11 @@
</p>
</template>
</a-table>
<a-button icon="environment" v-if="ruleList.length==0" @click="handleAdd">点击添加销售区域</a-button>
<a-button icon="environment" v-if="ruleList.length == 0" @click="handleAdd">点击添加销售区域</a-button>
</a-form-item>
</div>
<div style="display: none;">
<div style="display: none">
<a-divider orientation="left">积分设置</a-divider>
<a-form-item
label="积分赠送"
@ -386,9 +396,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>
@ -399,16 +407,14 @@
: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>
</a-form-item>
</div>
<div style="display: none;">
<div style="display: none">
<a-divider orientation="left">会员折扣设置</a-divider>
<a-form-item
label="会员折扣"
@ -444,23 +450,26 @@
: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>
</div>
<div style="display: none;">
<div style="display: none">
<a-divider orientation="left">分销设置</a-divider>
<a-form-item label="分销佣金" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-radio-group
@ -525,7 +534,7 @@ const defaultItem = {
// additional: 0,
// additional_fee: 0,
region: [],
region_text: []
region_text: [],
}
export default {
@ -536,9 +545,9 @@ export default {
Ueditor,
InputNumberGroup,
MultiSpec,
AreasModal
AreasModal,
},
data () {
data() {
return {
// 默认的标签索引
tabKey: 0,
@ -559,8 +568,8 @@ export default {
title: '销售区域',
dataIndex: 'region_text',
width: '400px',
scopedSlots: { customRender: 'region_text' }
}
scopedSlots: { customRender: 'region_text' },
},
// {
// title: '首件 (个)',
// dataIndex: 'first',
@ -587,42 +596,41 @@ export default {
// 计费方式
method: 10,
// 城市总数
citysCount: null
citysCount: null,
}
},
// 初始化数据
created () {
created() {
this.isLoading = true
// 获取form所需的数据
GoodsModel.getFromData()
.then(() => {
this.isLoading = false
})
GoodsModel.getFromData().then(() => {
this.isLoading = false
})
// 城市总数
Region.getCitysCount().then(count => {
Region.getCitysCount().then((count) => {
this.citysCount = count
})
},
methods: {
// 手动强制更新页面
onForceUpdate (bool = false) {
onForceUpdate(bool = false) {
this.$forceUpdate()
// bool为true时再执行一次 $forceUpdate, 特殊情况下需执行两次，原因如下：
// 第一次执行 $forceUpdate时, 新元素绑定v-decorator无法获取到form.getFieldValue
bool && setTimeout(() => {
this.$forceUpdate()
}, 10)
bool &&
setTimeout(() => {
this.$forceUpdate()
}, 10)
},
// 切换tab选项卡
handleTabs (key) {
handleTabs(key) {
this.tabKey = key
},
// 刷新分类列表
onReloadCategoryList () {
onReloadCategoryList() {
this.isLoading = true
GoodsModel.getCategoryList().then(() => {
this.isLoading = false
@ -630,7 +638,7 @@ export default {
},
// 刷新服务与承诺列表
onReloadServiceList () {
onReloadServiceList() {
this.isLoading = true
GoodsModel.getServiceList().then(() => {
this.isLoading = false
@ -638,7 +646,7 @@ export default {
},
// 刷新配送模板列表
onReloadDeliveryList () {
onReloadDeliveryList() {
this.isLoading = true
GoodsModel.getDeliveryList().then(() => {
this.isLoading = false
@ -646,10 +654,13 @@ export default {
},
// 确认按钮
handleSubmit (e) {
handleSubmit(e) {
e.preventDefault()
// 表单验证
const { form: { validateFields }, ruleList } = this
const {
form: { validateFields },
ruleList,
} = this
validateFields((errors, values) => {
// 定位到错误的tab选项卡
if (errors) {
@ -667,7 +678,7 @@ export default {
values.specData = MultiSpec.getFromSpecData()
}
// 整理商品分类ID集
values.categoryIds = values.categorys.map(item => item.value)
values.categoryIds = values.categorys.map((item) => item.value)
delete values.categorys
// 提交到后端api
values.rules = ruleList
@ -677,14 +688,14 @@ export default {
},
// 定位到错误的tab选项卡
onTargetTabError (errors) {
onTargetTabError(errors) {
// 表单字段与tabKey对应关系
// 只需要必填字段就可
const tabsFieldsMap = [
['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) {
@ -696,11 +707,11 @@ export default {
},
// 提交到后端api
onFormSubmit (values) {
onFormSubmit(values) {
this.isLoading = true
this.isBtnLoading = true
GoodsApi.add({ form: values })
.then(result => {
.then((result) => {
// 显示提示信息
this.$message.success(result.message, 1.5)
// 跳转到列表页
@ -711,11 +722,11 @@ export default {
.catch(() => {
this.isBtnLoading = false
})
.finally(() => this.isLoading = false)
.finally(() => (this.isLoading = false))
},
// 新增记录
handleAdd () {
handleAdd() {
const index = this.ruleList.length
const newItem = { ...defaultItem, key: index }
// 排除的城市id集(已存在的城市id集)
@ -729,7 +740,7 @@ export default {
},
// 编辑记录
handleEdit (index, item) {
handleEdit(index, item) {
// 排除的城市id集(已存在的城市id集)
const excludedCityIds = this.getExcludedCityIds()
// 显示选择地区对话框
@ -737,8 +748,10 @@ export default {
},
// 选择地区后的回调
handleAreaSubmit (result) {
const { custom: { scene, item } } = result
handleAreaSubmit(result) {
const {
custom: { scene, item },
} = result
item.region = result.selectedCityIds
item.region_text = result.selectedText
if (scene === 'add') {
@ -747,10 +760,10 @@ export default {
},
// 排除的城市id集(已存在的城市id集)
getExcludedCityIds () {
getExcludedCityIds() {
const excludedCityIds = []
this.ruleList.forEach(item => {
item.region.forEach(cityId => {
this.ruleList.forEach((item) => {
item.region.forEach((cityId) => {
excludedCityIds.push(cityId)
})
})
@ -758,25 +771,23 @@ export default {
},
// 显示选择地区对话框
handleAreasModal (scene, index, item, excludedCityIds) {
handleAreasModal(scene, index, item, excludedCityIds) {
this.$refs.AreasModal.handle({ scene, index, item }, item.region, excludedCityIds)
},
// 删除记录
handleDelete (index) {
// 删除记录
handleDelete(index) {
const app = this
const modal = this.$confirm({
title: '您确定要删除该记录吗?',
onOk () {
onOk() {
app.ruleList.splice(index, 1)
modal.destroy()
}
},
})
}
}
},
},
}
</script>
<style lang="less" scoped>
@import './style.less';

47
src/views/dataCenter/goods/Update.vue
Unescape View File

@ -25,6 +25,12 @@
v-decorator="['goods_name', { rules: [{ required: true, min: 2, message: '请输入至少2个字符' }] }]"
/>
</a-form-item>
<a-form-item label="商品型号" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input
placeholder="请输入商品型号"
v-decorator="['cmmdty_model', { rules: [{ required: true, min: 2, message: '请输入至少2个字符' }] }]"
/>
</a-form-item>
<a-form-item label="商品分类" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-tree-select
placeholder="请选择商品分类"
@ -139,11 +145,45 @@
<a href="javascript:;" @click="onReloadDeliveryList">刷新</a>
</div>
</a-form-item> -->
<a-form-item label="商品状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
<!-- <a-form-item label="商品状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
<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">
<a-radio-group v-decorator="['delivery_time', { initialValue: 0, rules: [{ required: true }] }]">
<a-radio :value="0">24小时</a-radio>
<a-radio :value="1">48小时</a-radio>
<a-radio :value="2">72小时</a-radio>
<a-radio :value="3">7天内</a-radio>
<a-radio :value="4">15天内</a-radio>
<a-radio :value="5">30天内</a-radio>
<a-radio :value="6">45天内</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item label="是否审单" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-radio-group v-decorator="['is_check', { 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_pool', { initialValue: 0, rules: [{ required: true }] }]">
<a-radio :value="0">待处理</a-radio>
<a-radio :value="1">已入池</a-radio>
<a-radio :value="2">未入池</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-radio-group v-decorator="['is_sale', { initialValue: 0, rules: [{ required: true }] }]">
<a-radio :value="0">停售</a-radio>
<a-radio :value="1">在售</a-radio>
<a-radio :value="2">无货</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-form-item>
<a-form-item label="商品排序" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="数字越小越靠前">
<a-input-number :min="0" v-decorator="['sort', { initialValue: 100, rules: [{ required: true }] }]" />
@ -165,10 +205,7 @@
</p>
</a-form-item>
<a-form-item label="规格值" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input
placeholder="多个规格值，以英文分号分隔"
v-decorator="['specific_value']"
/>
<a-input placeholder="多个规格值，以英文分号分隔" v-decorator="['specific_value']" />
</a-form-item>
<!-- 多规格的表单内容 -->
<div v-if="form.getFieldValue('spec_type') == 20">

Write Preview
Loading…
Cancel
Save