mkm/shop-mer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
weipengfei 2024-02-01 14:35:59 +08:00
parent 05bf13f861
commit 4c4ebc87d2
2 changed files with 67 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/filters/commFilter.js
View File

@ -296,7 +296,13 @@ export function transactionTypeFilter(type) {
'commission_to_platform_refund': '退回平台手续费', 'commission_to_platform_refund': '退回平台手续费',
'commission_to_service_team_refund': '退回平台佣金', 'commission_to_service_team_refund': '退回平台佣金',
'commission_to_village_refund': '退回平台佣金', 'commission_to_village_refund': '退回平台佣金',
'commission_to_town_refund': '退回平台佣金' 'commission_to_town_refund': '退回平台佣金',
'commission_to_store': '提货店铺佣金',
'commission_to_courier': '配送员佣金',
'commission_to_promoter': '直推首单佣金',
'commission_to_store_refund': '提货店铺佣金退款',
'commission_to_courier_refund': '配送员佣金退款',
'commission_to_promoter_refund': '直推首单佣金退款',
} }
return typeMap[type] return typeMap[type]

108
src/views/product/addProduct/index.vue
View File

@ -639,7 +639,7 @@
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<el-table-column <!-- <el-table-column
key="single_price_ss" key="single_price_ss"
v-if="$store.state.user.merchantType.type_code == 'TypeSupplyChain'" v-if="$store.state.user.merchantType.type_code == 'TypeSupplyChain'"
align="center" align="center"
@ -655,12 +655,12 @@
key="single_procure_price_ss" key="single_procure_price_ss"
align="center" align="center"
label="单个批发价" label="单个批发价"
min-width="80" min-width="100"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.single_procure_price }}</span> <span>{{ scope.row.single_procure_price }}</span>
</template> </template>
</el-table-column> </el-table-column> -->
</el-table> </el-table>
</el-form-item> </el-form-item>
<!-- 多规格表格--> <!-- 多规格表格-->
@ -789,7 +789,7 @@
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<el-table-column <!-- <el-table-column
key="single_price_dd" key="single_price_dd"
v-if="$store.state.user.merchantType.type_code == 'TypeSupplyChain'" v-if="$store.state.user.merchantType.type_code == 'TypeSupplyChain'"
align="center" align="center"
@ -805,12 +805,12 @@
key="single_procure_price_dd" key="single_procure_price_dd"
align="center" align="center"
label="单个批发价" label="单个批发价"
min-width="80" min-width="100"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.single_procure_price }}</span> <span>{{ scope.row.single_procure_price }}</span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column <el-table-column
key="3" key="3"
align="center" align="center"
@ -1334,15 +1334,17 @@ const defaultObj = {
{ {
image: '', image: '',
price: null, price: null,
cost: null,
ot_price: null,
procure_price: null, procure_price: null,
single_number: null, single_number: null,
single_price: null,
single_procure_price: null,
svip_price: null, svip_price: null,
stock: null, stock: null,
bar_code: '', bar_code: '',
weight: null, cost: null,
volume: null ot_price: null,
// weight: null,
// volume: null
} }
], ],
attr: [], attr: [],
@ -1364,18 +1366,18 @@ const objTitle = {
price: { price: {
title: '零售价' title: '零售价'
}, },
cost: {
title: '成本价'
},
ot_price: {
title: '市场价'
},
procure_price: { procure_price: {
title: '批发价' title: '批发价'
}, },
single_number: { single_number: {
title: '单件数量' title: '单件数量'
}, },
single_price: {
title: '单个售价'
},
single_procure_price:{
title: '单个批发价'
},
svip_price: { svip_price: {
title: '付费会员价' title: '付费会员价'
}, },
@ -1385,12 +1387,18 @@ const objTitle = {
bar_code: { bar_code: {
title: '商品条码' title: '商品条码'
}, },
weight: { cost: {
title: '重量（KG）' title: '成本价'
}, },
volume: { ot_price: {
title: '体积(m³)' title: '市场价'
} },
// weight: {
// title: '重量（KG）'
// },
// volume: {
// title: '体积(m³)'
// }
} }
const proOptions = [{ name: '店铺推荐', value: 'is_good' }] const proOptions = [{ name: '店铺推荐', value: 'is_good' }]
export default { export default {
@ -1597,14 +1605,16 @@ export default {
// attrVal 商品规格内的字段设置 // attrVal 商品规格内的字段设置
attrVal: { attrVal: {
price: null, price: null,
cost: null,
ot_price: null,
procure_price: null, procure_price: null,
single_number: null, single_number: null,
single_price: null,
single_procure_price: null,
stock: null, stock: null,
bar_code: '', bar_code: '',
weight: null, cost: null,
volume: null ot_price: null,
// weight: null,
// volume: null
}, },
open_svip: false, open_svip: false,
svip_rate: 0, svip_rate: 0,
@ -1885,12 +1895,12 @@ export default {
const rep4 = { const rep4 = {
image: '', image: '',
price: 0, price: 0,
cost: 0,
ot_price: 0,
stock: 0, stock: 0,
bar_code: '', bar_code: '',
weight: 0, cost: 0,
volume: 0, ot_price: 0,
// weight: 0,
// volume: 0,
brokerage: 0, brokerage: 0,
brokerage_two: 0 brokerage_two: 0
} }
@ -1919,12 +1929,12 @@ export default {
res[kk] = { res[kk] = {
image: '', image: '',
price: 0, price: 0,
cost: 0,
ot_price: 0,
stock: 0, stock: 0,
bar_code: '', bar_code: '',
weight: 0, cost: 0,
volume: 0, ot_price: 0,
// weight: 0,
// volume: 0,
brokerage: 0, brokerage: 0,
brokerage_two: 0, brokerage_two: 0,
detail: { [v['value']]: vv } detail: { [v['value']]: vv }
@ -2134,13 +2144,13 @@ export default {
if (item == 1 || item == 2) { if (item == 1 || item == 2) {
this.attrVal = { this.attrVal = {
price: null, price: null,
cost: null,
ot_price: null,
svip_price: null, svip_price: null,
stock: null, stock: null,
bar_code: '', bar_code: '',
weight: null, cost: null,
volume: null ot_price: null,
// weight: null,
// volume: null
} }
this.OneattrValue[0]['svip_price'] = this.OneattrValue[0]['price'] this.OneattrValue[0]['svip_price'] = this.OneattrValue[0]['price']
? this.accMul(this.OneattrValue[0]['price'], this.svip_rate) ? this.accMul(this.OneattrValue[0]['price'], this.svip_rate)
@ -2153,12 +2163,12 @@ export default {
} else { } else {
this.attrVal = { this.attrVal = {
price: null, price: null,
cost: null,
ot_price: null,
stock: null, stock: null,
bar_code: '', bar_code: '',
weight: null, cost: null,
volume: null ot_price: null,
// weight: null,
// volume: null
} }
} }
}, },
@ -2198,8 +2208,8 @@ export default {
if (this.oneFormBatch[0].svip_price != null) this.$set(val, 'svip_price', this.oneFormBatch[0].svip_price) if (this.oneFormBatch[0].svip_price != null) this.$set(val, 'svip_price', this.oneFormBatch[0].svip_price)
if (this.oneFormBatch[0].stock != null) this.$set(val, 'stock', this.oneFormBatch[0].stock) if (this.oneFormBatch[0].stock != null) this.$set(val, 'stock', this.oneFormBatch[0].stock)
if (this.oneFormBatch[0].bar_code != null) this.$set(val, 'bar_code', this.oneFormBatch[0].bar_code) if (this.oneFormBatch[0].bar_code != null) this.$set(val, 'bar_code', this.oneFormBatch[0].bar_code)
if (this.oneFormBatch[0].weight != null) this.$set(val, 'weight', this.oneFormBatch[0].weight) // if (this.oneFormBatch[0].weight != null) this.$set(val, 'weight', this.oneFormBatch[0].weight)
if (this.oneFormBatch[0].volume != null) this.$set(val, 'volume', this.oneFormBatch[0].volume) // if (this.oneFormBatch[0].volume != null) this.$set(val, 'volume', this.oneFormBatch[0].volume)
if (this.oneFormBatch[0].extension_one != null) this.$set(val, 'extension_one', this.oneFormBatch[0].extension_one) if (this.oneFormBatch[0].extension_one != null) this.$set(val, 'extension_one', this.oneFormBatch[0].extension_one)
if (this.oneFormBatch[0].extension_two != null) this.$set(val, 'extension_two', this.oneFormBatch[0].extension_two) if (this.oneFormBatch[0].extension_two != null) this.$set(val, 'extension_two', this.oneFormBatch[0].extension_two)
} }
@ -2331,13 +2341,13 @@ export default {
if (info.svip_price_type != 0) if (info.svip_price_type != 0)
this.attrVal = { this.attrVal = {
price: null, price: null,
cost: null,
ot_price: null,
svip_price: null, svip_price: null,
stock: null, stock: null,
bar_code: "", bar_code: "",
weight: null, cost: null,
volume: null ot_price: null,
// weight: null,
// volume: null
}; };
if (this.formValidate.extend.length != 0) { if (this.formValidate.extend.length != 0) {
this.customBtn = 1; this.customBtn = 1;
@ -2442,6 +2452,8 @@ export default {
price: false, price: false,
procure_price: false, procure_price: false,
single_number: false, single_number: false,
single_price: null,
single_procure_price: null,
} }
this.formValidate.attrValue.forEach(e => { this.formValidate.attrValue.forEach(e => {
if (!e.price || e.price == 0) priceObj.price = true; if (!e.price || e.price == 0) priceObj.price = true;
@ -2449,7 +2461,7 @@ export default {
}) })
if (priceObj.price) return Message.error('零售价不能为小于等于0'); if (priceObj.price) return Message.error('零售价不能为小于等于0');
if (priceObj.procure_price && this.$store.state.user.merchantType.type_code == 'TypeSupplyChain') return Message.error('批发价不能为小于等于0'); if (priceObj.procure_price && this.$store.state.user.merchantType.type_code == 'TypeSupplyChain') return Message.error('批发价不能为小于等于0');
if (priceObj.single_number && this.$store.state.user.merchantType.type_code == 'TypeSupplyChain') return Message.error('单件数量不能为小于等于0'); // if (priceObj.single_number && this.$store.state.user.merchantType.type_code == 'TypeSupplyChain') return Message.error('单件数量不能为小于等于0');
this.$refs[name].validate(valid => { this.$refs[name].validate(valid => {
if (valid) { if (valid) {
this.validateAttr(); this.validateAttr();