edit
This commit is contained in:
parent
a08a4f4fa4
commit
9b78b8842f
|
@ -16,7 +16,11 @@ export const setCookies = (key, val, cookieExpires) => {
|
||||||
export const getCookies = key => {
|
export const getCookies = key => {
|
||||||
return Cookies.get(key);
|
return Cookies.get(key);
|
||||||
};
|
};
|
||||||
|
// 保留两位小数;
|
||||||
|
// num
|
||||||
|
export function toFixedNoRounding(num) {
|
||||||
|
return Math.floor(num * 100) / 100;
|
||||||
|
}
|
||||||
export const removeCookies = key => {
|
export const removeCookies = key => {
|
||||||
return Cookies.remove(key);
|
return Cookies.remove(key);
|
||||||
};
|
};
|
||||||
|
|
|
@ -2074,7 +2074,7 @@ import { getToken } from '@/utils/auth'
|
||||||
import taoBao from './taoBao'
|
import taoBao from './taoBao'
|
||||||
import copyRecord from './copyRecord'
|
import copyRecord from './copyRecord'
|
||||||
import addCarMy from './addCarMy'
|
import addCarMy from './addCarMy'
|
||||||
|
import { toFixedNoRounding } from '@/utils/util'
|
||||||
const defaultObj = {
|
const defaultObj = {
|
||||||
image: '',
|
image: '',
|
||||||
refund_switch: 1,
|
refund_switch: 1,
|
||||||
|
@ -2716,7 +2716,7 @@ export default {
|
||||||
},
|
},
|
||||||
// 占比值变化处理
|
// 占比值变化处理
|
||||||
proportionChange(val,i,e){
|
proportionChange(val,i,e){
|
||||||
val.cost = (val.price * e).toFixed(2)
|
val.cost = toFixedNoRounding(val.price * e)
|
||||||
let obj = this.proportionList.find(item=>item.value==e)
|
let obj = this.proportionList.find(item=>item.value==e)
|
||||||
val.coupon = Math.floor(val.price*obj.coupon)
|
val.coupon = Math.floor(val.price*obj.coupon)
|
||||||
val.growth = Math.floor(val.price*obj.growth)
|
val.growth = Math.floor(val.price*obj.growth)
|
||||||
|
@ -2724,11 +2724,11 @@ export default {
|
||||||
// 规格值变化
|
// 规格值变化
|
||||||
handleCost(val,i,e,type){
|
handleCost(val,i,e,type){
|
||||||
if(type == 'batchAdd'){
|
if(type == 'batchAdd'){
|
||||||
i=='price'?val.cost = (val.price * 0.6).toFixed(2):''
|
i=='price'?val.cost = toFixedNoRounding(val.price * 0.6):''
|
||||||
}
|
}
|
||||||
if(i=='price'){
|
if(i=='price'){
|
||||||
val.price=val.price.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')
|
val.price=val.price.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')
|
||||||
val.cost = (e * val.proportion).toFixed(2)
|
val.cost = toFixedNoRounding(e * val.proportion)
|
||||||
|
|
||||||
let obj = this.proportionList.find(item=>item.value==val.proportion)
|
let obj = this.proportionList.find(item=>item.value==val.proportion)
|
||||||
val.coupon = Math.floor(val.price*obj.coupon)
|
val.coupon = Math.floor(val.price*obj.coupon)
|
||||||
|
|
|
@ -165,7 +165,7 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120">
|
<el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="80">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<a
|
<a
|
||||||
v-if="formThead[iii].title == '依据链接'"
|
v-if="formThead[iii].title == '依据链接'"
|
||||||
|
@ -204,7 +204,7 @@
|
||||||
<div class="pictrue tabPic"><img :src="scope.row.image" style="width: 36px; height: 36px; border-radius: 4px;"></div>
|
<div class="pictrue tabPic"><img :src="scope.row.image" style="width: 36px; height: 36px; border-radius: 4px;"></div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="100">
|
<el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="80">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<a
|
<a
|
||||||
v-if="formThead[iii].title == '依据链接'"
|
v-if="formThead[iii].title == '依据链接'"
|
||||||
|
@ -738,6 +738,8 @@ const defaultObj = {
|
||||||
image: '',
|
image: '',
|
||||||
price: null,
|
price: null,
|
||||||
svip_price: null,
|
svip_price: null,
|
||||||
|
proportion:'0.6',
|
||||||
|
coupon:'',
|
||||||
cost: null,
|
cost: null,
|
||||||
ot_price: null,
|
ot_price: null,
|
||||||
stock: null,
|
stock: null,
|
||||||
|
@ -769,6 +771,12 @@ const objTitle = {
|
||||||
stock: {
|
stock: {
|
||||||
title: '库存'
|
title: '库存'
|
||||||
},
|
},
|
||||||
|
proportion: {
|
||||||
|
title: '占比'
|
||||||
|
},
|
||||||
|
coupon:{
|
||||||
|
title:'抵扣卷'
|
||||||
|
},
|
||||||
bar_code: {
|
bar_code: {
|
||||||
title: '商品编号'
|
title: '商品编号'
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue