|
|
|
|
@ -21,7 +21,7 @@ |
|
|
|
|
<el-row v-show="currentTab === 0" :gutter="24"> |
|
|
|
|
<!-- 商品信息--> |
|
|
|
|
<el-col v-bind="grid2"> |
|
|
|
|
<el-form-item label="商品分类：" prop="categorys" :rules="[{ required: true, message: '请选择商品分类', trigger: ['change'] }]"> |
|
|
|
|
<el-form-item label="商品分类：" prop="categorys" :rules="[{ required: true, message: '请选择商品分类', trigger: ['blur'] }]"> |
|
|
|
|
<el-cascader |
|
|
|
|
@change="cascaderChange" |
|
|
|
|
v-model="formValidate.categorys" |
|
|
|
|
@ -35,7 +35,7 @@ |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col v-bind="grid2"> |
|
|
|
|
<el-form-item label="商品名称：" prop="productName" :rules="[{ required: true, message: '请输入商品名称', trigger: ['change'] }]"> |
|
|
|
|
<el-form-item label="商品名称：" prop="productName" :rules="[{ required: true, message: '请输入商品名称', trigger: ['blur'] }]"> |
|
|
|
|
<el-input v-model="formValidate.productName" maxlength="249" placeholder="请输入商品名称" :disabled="isDisabled" /> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
@ -45,7 +45,7 @@ |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col v-bind="grid2"> |
|
|
|
|
<el-form-item label="商品品牌：" prop="brandId" :rules="[{ required: true, message: '请选择商品品牌', trigger: ['change'] }]"> |
|
|
|
|
<el-form-item label="商品品牌：" prop="brandId" :rules="[{ required: true, message: '请选择商品品牌', trigger: ['blur'] }]"> |
|
|
|
|
<el-select style="width: 100%;" v-model="formValidate.brandId" placeholder="请选择"> |
|
|
|
|
<el-option v-for="item in brandOptions" :key="item.id" :label="item.brandName" :value="item.id"> </el-option> |
|
|
|
|
</el-select> |
|
|
|
|
@ -57,12 +57,12 @@ |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col v-bind="grid2"> |
|
|
|
|
<el-form-item label="商品售价" prop="price" :rules="[{ required: true, message: '请输入商品售价', trigger: ['change'] }]"> |
|
|
|
|
<el-form-item label="商品售价" prop="price" :rules="[{ required: true, message: '请输入商品售价', trigger: ['blur'] }]"> |
|
|
|
|
<el-input v-model="formValidate.price" maxlength="249" type="number" placeholder="请输入商品售价" :disabled="isDisabled" /> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col v-bind="grid2"> |
|
|
|
|
<el-form-item label="商品类型：" prop="productType" :rules="[{ required: true, message: '请选择商品类型', trigger: ['change'] }]"> |
|
|
|
|
<el-form-item label="商品类型：" prop="productType" :rules="[{ required: true, message: '请选择商品类型', trigger: ['blur'] }]"> |
|
|
|
|
<el-select style="width: 100%;" v-model="formValidate.productType" placeholder="请选择商品类型"> |
|
|
|
|
<el-option label="店铺商品" value="2"> </el-option> |
|
|
|
|
<el-option label="平台商品" value="1"> </el-option> |
|
|
|
|
@ -76,7 +76,7 @@ |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> --> |
|
|
|
|
<el-col v-bind="grid2"> |
|
|
|
|
<el-form-item label="自提油站" prop="siteIds" :rules="[{ validator: validateSiteIds, trigger: ['change'] }]"> |
|
|
|
|
<el-form-item label="自提油站" prop="siteIds"> |
|
|
|
|
<el-tag |
|
|
|
|
style="margin-left: 10px;" |
|
|
|
|
:key="tagIndex" |
|
|
|
|
@ -125,7 +125,11 @@ |
|
|
|
|
</el-col> --> |
|
|
|
|
<!-- 多规格添加--> |
|
|
|
|
<el-col v-if="!isDisabled" :span="24" class="noForm"> |
|
|
|
|
<el-form-item label="选择规格：" prop="attributesTypeId" :rules="[{ required: true, message: '请选择规格', trigger: ['blur'] }]"> |
|
|
|
|
<el-form-item |
|
|
|
|
label="选择规格：" |
|
|
|
|
prop="attributesTypeId" |
|
|
|
|
:rules="[{ required: true, message: '请选择规格', trigger: ['blur'] }]" |
|
|
|
|
> |
|
|
|
|
<div class="acea-row"> |
|
|
|
|
<el-select v-model="formValidate.attributesTypeId"> |
|
|
|
|
<el-option v-for="item in ruleList" :key="item.id" :label="item.name" :value="item.id" /> |
|
|
|
|
@ -197,15 +201,7 @@ |
|
|
|
|
<el-button type="default" @click="showAllSku()" :disabled="isDisabled">展示</el-button> |
|
|
|
|
</el-form-item> --> |
|
|
|
|
<!-- 多规格表格--> |
|
|
|
|
<el-form-item |
|
|
|
|
v-if="formValidate.attr.length > 0" |
|
|
|
|
label="商品属性：" |
|
|
|
|
class="labeltop" |
|
|
|
|
:class="isDisabled ? 'disLabel' : 'disLabelmoren'" |
|
|
|
|
prop="attr" |
|
|
|
|
:rules="[{ validator: validateAttr, trigger: ['change'] }]" |
|
|
|
|
> |
|
|
|
|
<!-- :rules="[{ validator: validateAttr, trigger: ['blur'] }]" --> |
|
|
|
|
<el-form-item v-if="formValidate.attr.length > 0" label="商品属性：" class="labeltop" :class="isDisabled ? 'disLabel' : 'disLabelmoren'"> |
|
|
|
|
<el-table :data="ManyAttrValue" border class="tabNumWidth" size="mini"> |
|
|
|
|
<template v-if="manyTabDate"> |
|
|
|
|
<el-table-column v-for="item in manyTabDate" :key="item" align="center" :label="item" min-width="80"> |
|
|
|
|
@ -332,13 +328,7 @@ |
|
|
|
|
</el-card> |
|
|
|
|
<CreatTemplates ref="addTemplates" @getList="getShippingList" /> |
|
|
|
|
<el-dialog width="80%" title="选择油站" :visible.sync="isOilStationSelection"> |
|
|
|
|
<OilStationSelection |
|
|
|
|
:product-id="this.$route.query.id" |
|
|
|
|
ref="selectSites" |
|
|
|
|
:OilStationSelectionList="OilStationSelectionList" |
|
|
|
|
@submit="oilStationSelectionSubmit" |
|
|
|
|
> |
|
|
|
|
</OilStationSelection> |
|
|
|
|
<OilStationSelection :product-id="this.$route.query.id" ref="selectSites" :OilStationSelectionList="OilStationSelectionList" @submit="oilStationSelectionSubmit"> </OilStationSelection> |
|
|
|
|
</el-dialog> |
|
|
|
|
</div> |
|
|
|
|
</template> |
|
|
|
|
@ -417,30 +407,7 @@ export default { |
|
|
|
|
name: 'ProductProductAdd', |
|
|
|
|
components: { Templates, CreatTemplates, Tinymce, CustomUpload, OilStationSelection }, |
|
|
|
|
data() { |
|
|
|
|
const validateSiteIds = (rule, value, callback) => { |
|
|
|
|
let siteIds = this.OilStationSelectionList.map(item => item.siteId) |
|
|
|
|
if (siteIds.length == 0) { |
|
|
|
|
callback('请选择油站') |
|
|
|
|
} |
|
|
|
|
callback() |
|
|
|
|
} |
|
|
|
|
const validateAttr = (rule, value, callback) => { |
|
|
|
|
// SKU编号，即"skuNum"，不需要手填，提交后会自动生成，因此此处略过校验 |
|
|
|
|
let length = this.attrValue.length - 1 |
|
|
|
|
let isCan = this.ManyAttrValue.every(item => { |
|
|
|
|
// 此处返回已填的值 通过长度来判断是否都填了 |
|
|
|
|
let _length = this.attrValue.filter(_item => { |
|
|
|
|
let key = _item.value |
|
|
|
|
if (key != 'skuNum' && item[key]) return _item |
|
|
|
|
}).length |
|
|
|
|
return length != _length |
|
|
|
|
}) |
|
|
|
|
if (isCan) callback('商品属性不可存在空') |
|
|
|
|
callback() |
|
|
|
|
} |
|
|
|
|
return { |
|
|
|
|
validateSiteIds, |
|
|
|
|
validateAttr, |
|
|
|
|
loading: false, |
|
|
|
|
OilStationSelectionList: [], |
|
|
|
|
isOilStationSelection: false, |
|
|
|
|
@ -465,7 +432,7 @@ export default { |
|
|
|
|
shippingList: [], // 运费模板 |
|
|
|
|
formThead: Object.assign({}, objTitle), |
|
|
|
|
formValidate: { |
|
|
|
|
recommendOrNewMark: '', |
|
|
|
|
recommendOrNewMark: '1', |
|
|
|
|
productStatus: '1', |
|
|
|
|
attr: [], |
|
|
|
|
productDetail: '' |
|
|
|
|
@ -562,6 +529,7 @@ export default { |
|
|
|
|
{ |
|
|
|
|
label: 'SKU编号', |
|
|
|
|
name: 'SKU编号', |
|
|
|
|
|
|
|
|
|
value: 'skuNum' |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
@ -584,11 +552,11 @@ export default { |
|
|
|
|
if (from.path == '/productList' && to.params.id) { |
|
|
|
|
this.chenkId() |
|
|
|
|
} |
|
|
|
|
// console.log(from.path) //从哪来 |
|
|
|
|
// console.log(to.path, to.params) //到哪去 |
|
|
|
|
console.log(from.path) //从哪来 |
|
|
|
|
console.log(to.path, to.params) //到哪去 |
|
|
|
|
}, |
|
|
|
|
// 'formValidate.content': function(n) {}, |
|
|
|
|
// ManyAttrValue(n) {}, |
|
|
|
|
'formValidate.content': function(n) { }, |
|
|
|
|
ManyAttrValue(n) {}, |
|
|
|
|
'formValidate.attr': { |
|
|
|
|
handler: function(val,o) { |
|
|
|
|
if (this.isAttr) this.watCh(val,o) //重要！！！ |
|
|
|
|
@ -605,7 +573,7 @@ export default { |
|
|
|
|
}, |
|
|
|
|
mounted() {}, |
|
|
|
|
deactivated() { |
|
|
|
|
this.$destroy() |
|
|
|
|
this.$destroy(); |
|
|
|
|
}, |
|
|
|
|
methods: { |
|
|
|
|
async chenkId() { |
|
|
|
|
@ -619,13 +587,13 @@ export default { |
|
|
|
|
return productApi.productAddGetSites(id) |
|
|
|
|
}) |
|
|
|
|
).then(res => { |
|
|
|
|
// console.log(res, 'productAddGetSites') |
|
|
|
|
console.log(res, 'productAddGetSites') |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
async inverseAnalysis(data) { |
|
|
|
|
let { categoryOneId, categoryTwoId } = data |
|
|
|
|
let categorys = [categoryOneId, categoryTwoId] |
|
|
|
|
this.OilStationSelectionList = data.siteInfos |
|
|
|
|
let { categoryOneId, categoryTwoId } = data; |
|
|
|
|
let categorys = [categoryOneId, categoryTwoId]; |
|
|
|
|
this.OilStationSelectionList = data.siteInfos; |
|
|
|
|
this.formValidate = { |
|
|
|
|
...this.formValidate, |
|
|
|
|
categorys, |
|
|
|
|
@ -637,11 +605,9 @@ export default { |
|
|
|
|
// }) |
|
|
|
|
this.$refs.CustomUpload.fileList = [...this.formValidate.images.filter(item => item.mainMark == '1')] |
|
|
|
|
this.$refs.CustomLBUpload.fileList = [...this.formValidate.images.filter(item => item.mainMark != '1')] |
|
|
|
|
this.formValidate.recommendOrNewMark = data.newMark == '1' ? '1' : '2' |
|
|
|
|
await this.confirm() |
|
|
|
|
this.$nextTick(() => { |
|
|
|
|
this.formValidate.attr = this.formValidate.attr |
|
|
|
|
.map(item => { |
|
|
|
|
this.formValidate.attr = this.formValidate.attr.map(item => { |
|
|
|
|
let align = this.formValidate.checkedList.find(i => item.id == i.attributeId) |
|
|
|
|
if (align) { |
|
|
|
|
return { |
|
|
|
|
@ -654,11 +620,10 @@ export default { |
|
|
|
|
} else { |
|
|
|
|
return null |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
.filter(item => item) |
|
|
|
|
}).filter(item => item); |
|
|
|
|
setTimeout(() => { |
|
|
|
|
this.ManyAttrValue.forEach((item, index) => { |
|
|
|
|
let data = this.formValidate.stockList.find(i => i.attributeJson == JSON.stringify(item.data)) |
|
|
|
|
let data = this.formValidate.stockList.find(i => i.attributeJson == JSON.stringify(item.data)); |
|
|
|
|
if (data) { |
|
|
|
|
Object.assign(item, data,{delect:false}) |
|
|
|
|
}else{ |
|
|
|
|
@ -677,12 +642,12 @@ export default { |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
setPreferred(setPreferred) { |
|
|
|
|
// console.log(setPreferred, 'setPreferred') |
|
|
|
|
console.log(setPreferred, 'setPreferred') |
|
|
|
|
}, |
|
|
|
|
delectOilStationSelectionList(e, index) { |
|
|
|
|
this.OilStationSelectionList.splice(index, 1) |
|
|
|
|
if (this.$refs.selectSites&&this.$refs.selectSites.checkedSites){ |
|
|
|
|
this.$refs.selectSites.checkedSites = this.$refs.selectSites.checkedSites.filter(site => e.siteId !== site.siteId) |
|
|
|
|
this.$refs.selectSites.checkedSites = this.$refs.selectSites.checkedSites.filter(site => e.siteId !== site.siteId); |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
oilStationSelectionSubmit(e) { |
|
|
|
|
@ -698,7 +663,7 @@ export default { |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
cascaderChange(e) { |
|
|
|
|
// console.log(e, 'cascaderChange') |
|
|
|
|
console.log(e, 'cascaderChange') |
|
|
|
|
}, |
|
|
|
|
// 校验输入框不能输入0，保留2位小数，库存为正整数 |
|
|
|
|
keyupEvent(key, val, index, num) { |
|
|
|
|
@ -772,17 +737,15 @@ export default { |
|
|
|
|
arr.push(val[i].sku) |
|
|
|
|
this.manyTabDate.push(val[i].sku.name) |
|
|
|
|
} |
|
|
|
|
console.log('this.manyTabDate', this.manyTabDate) |
|
|
|
|
// console.log('arr', arr) |
|
|
|
|
this.ManyAttrValue = arr.reduce( |
|
|
|
|
(prev, cur) => { |
|
|
|
|
(a, b, c) => { |
|
|
|
|
let res = [] |
|
|
|
|
prev.map(item => { |
|
|
|
|
cur.value.map(_item => { |
|
|
|
|
a.map(x => { |
|
|
|
|
b.value.map(y => { |
|
|
|
|
res.push({ |
|
|
|
|
...item, |
|
|
|
|
[cur.name]: _item, |
|
|
|
|
data: Object.assign({}, item.data || {}, { [cur.name]: _item }), |
|
|
|
|
...x, |
|
|
|
|
[b.name]: y, |
|
|
|
|
data: Object.assign({}, x.data || {}, { [b.name]: y }), |
|
|
|
|
...Object.fromEntries( |
|
|
|
|
this.attrValue.map(item => { |
|
|
|
|
return [item.value, ''] |
|
|
|
|
@ -794,8 +757,8 @@ export default { |
|
|
|
|
return res |
|
|
|
|
}, |
|
|
|
|
[{}] |
|
|
|
|
) |
|
|
|
|
console.log(this.ManyAttrValue, 'this.ManyAttrValue ') |
|
|
|
|
); |
|
|
|
|
console.log(this.ManyAttrValue ,"this.ManyAttrValue ") |
|
|
|
|
}, |
|
|
|
|
attrFormat(arr) { |
|
|
|
|
let data = [] |
|
|
|
|
@ -897,9 +860,7 @@ export default { |
|
|
|
|
} |
|
|
|
|
await this.productGetRule() |
|
|
|
|
this.formValidate.attr = JSON.parse(JSON.stringify(this.ruleList.find(item => item.id == this.formValidate.attributesTypeId).attributesList)) |
|
|
|
|
// console.log('this.formValidate.attr ', this.formValidate.attr) |
|
|
|
|
} |
|
|
|
|
// console.log('this.attrValue', this.attrValue) |
|
|
|
|
}, |
|
|
|
|
// 商品分类； |
|
|
|
|
async getCategorySelect() { |
|
|
|
|
@ -979,7 +940,7 @@ export default { |
|
|
|
|
batchAdd() { |
|
|
|
|
// if (!this.oneFormBatch[0].pic || !this.oneFormBatch[0].price || !this.oneFormBatch[0].cost || !this.oneFormBatch[0].ot_price || |
|
|
|
|
// !this.oneFormBatch[0].stock || !this.oneFormBatch[0].bar_code) return this.$Message.warning('请填写完整的批量设置内容！'); |
|
|
|
|
// console.log(this.ManyAttrValue, this.oneFormBatch, ' this.ManyAttrValue') |
|
|
|
|
console.log(this.ManyAttrValue, this.oneFormBatch, ' this.ManyAttrValue') |
|
|
|
|
this.ManyAttrValue.forEach(item => { |
|
|
|
|
Object.assign(item, this.oneFormBatch[0]) |
|
|
|
|
}) |
|
|
|
|
@ -1011,6 +972,7 @@ export default { |
|
|
|
|
} else { |
|
|
|
|
item.splice(index, 1) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
// 添加规则名称 |
|
|
|
|
createAttrName() { |
|
|
|
|
@ -1222,7 +1184,7 @@ export default { |
|
|
|
|
if (this.currentTab-- < 0) this.currentTab = 0 |
|
|
|
|
}, |
|
|
|
|
handleSubmitNest(name) { |
|
|
|
|
// console.log(this.formValidate, 'handleSubmitNest') |
|
|
|
|
console.log(this.formValidate,"handleSubmitNest") |
|
|
|
|
if (this.formValidate.attr<1){ |
|
|
|
|
this.$message.error('规格属性不能为空') |
|
|
|
|
return |
|
|
|
|
@ -1231,17 +1193,17 @@ export default { |
|
|
|
|
if (valid) { |
|
|
|
|
if (this.currentTab++ > 2) this.currentTab = 0 |
|
|
|
|
} else { |
|
|
|
|
// if ( |
|
|
|
|
// !this.formValidate.store_name || |
|
|
|
|
// !this.formValidate.cate_id || |
|
|
|
|
// !this.formValidate.keyword || |
|
|
|
|
// !this.formValidate.unit_name || |
|
|
|
|
// !this.formValidate.store_info || |
|
|
|
|
// !this.formValidate.image || |
|
|
|
|
// !this.formValidate.slider_image |
|
|
|
|
// ) { |
|
|
|
|
// this.$message.warning('请填写完整商品信息！') |
|
|
|
|
// } |
|
|
|
|
if ( |
|
|
|
|
!this.formValidate.store_name || |
|
|
|
|
!this.formValidate.cate_id || |
|
|
|
|
!this.formValidate.keyword || |
|
|
|
|
!this.formValidate.unit_name || |
|
|
|
|
!this.formValidate.store_info || |
|
|
|
|
!this.formValidate.image || |
|
|
|
|
!this.formValidate.slider_image |
|
|
|
|
) { |
|
|
|
|
this.$message.warning('请填写完整商品信息！') |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
@ -1253,10 +1215,10 @@ export default { |
|
|
|
|
let [categoryOneId, categoryTwoId] = this.formValidate.categorys |
|
|
|
|
let isRecommendOrNewMark = this.formValidate.recommendOrNewMark == '1' ? 'newMark' : 'recommend' |
|
|
|
|
let siteIds = this.OilStationSelectionList.map(item => item.siteId) |
|
|
|
|
// if (siteIds.length == 0) { |
|
|
|
|
// this.$message.error('请选择油站') |
|
|
|
|
// return |
|
|
|
|
// } |
|
|
|
|
if(siteIds.length==0){ |
|
|
|
|
this.$message.error('请选择油站') |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
let checkedList = this.formValidate.attr.map(item => { |
|
|
|
|
let attributeId = item.id |
|
|
|
|
let checked = item.sku.value.join(',') |
|
|
|
|
@ -1299,7 +1261,6 @@ export default { |
|
|
|
|
if (res.code == 20000) { |
|
|
|
|
this.$message.success('操作成功') |
|
|
|
|
setTimeout(() => { |
|
|
|
|
this.$bus.$emit('productRefresh') |
|
|
|
|
this.$router.push({ path: 'productList', query: { refresh: true }}) |
|
|
|
|
// this.$destroy() |
|
|
|
|
}, 1000) |
|
|
|
|
|
