xiaozhiyong/refinery-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
xiaozhiyong
2023-05-29 17:38:25 +08:00
parent a68db2dae3
commit 4da9e42eba
2 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/order/components/confirmSubmit.vue
View File

@@ -64,7 +64,7 @@
<template slot-scope="{ row }"> {{ row.floorPrice }}元 </template> <template slot-scope="{ row }"> {{ row.floorPrice }}元 </template>
</el-table-column> </el-table-column>
<el-table-column label="成本总金额"> <el-table-column label="成本总金额">
<template slot-scope="{ row }"> {{ (row.floorPrice * row.preQuantity) | toNumberFixed }}元 </template> <template slot-scope="{ row }"> {{ row.preCostAmount | toNumberFixed }}元 </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</template> </template>
@@ -150,20 +150,22 @@ export default {
if (salePrice && floorPrice && preQuantity && preAmount) { if (salePrice && floorPrice && preQuantity && preAmount) {
let strategyArr = [ let strategyArr = [
// 原策略 // 原策略
{ salePrice: salePrice, floorPrice: floorPrice, preQuantity: preQuantity, preAmount: preAmount }, { salePrice, floorPrice: floorPrice, preQuantity: preQuantity, preAmount, preCostAmount: +floorPrice * +preQuantity },
// 以提货量为准 // 以提货量为准
{ {
salePrice: this.newSalePrice, salePrice: this.newSalePrice,
floorPrice: this.newCostPrice, floorPrice: this.newCostPrice,
preQuantity: preQuantity, preQuantity,
preAmount: +this.newSalePrice * +preQuantity preAmount: +this.newSalePrice * +preQuantity,
preCostAmount: +floorPrice * +preQuantity
}, },
// 以订单金额为准 // 以订单金额为准
{ {
salePrice: this.newSalePrice, salePrice: this.newSalePrice,
floorPrice: this.newCostPrice, floorPrice: this.newCostPrice,
preQuantity: +preAmount / +this.newSalePrice, preQuantity: +preAmount / +this.newSalePrice,
preAmount: preAmount preAmount,
preCostAmount: +floorPrice * +preQuantity
} }
] ]
strategyArr.forEach((item, index) => { strategyArr.forEach((item, index) => {

25
src/views/order/index.vue
View File

@@ -116,9 +116,10 @@
<el-link slot="reference" type="primary" :underline="false">订单锁定</el-link> <el-link slot="reference" type="primary" :underline="false">订单锁定</el-link>
</el-popconfirm> </el-popconfirm>
<el-popconfirm v-if="row.orderStatus == 'ORDER_LOCKED'" title="是否确认下单？" icon-color="red" @confirm="confirmSubmit(row)"> <!-- <el-popconfirm v-if="row.orderStatus == 'ORDER_LOCKED'" title="是否确认下单？" icon-color="red" @confirm="confirmSubmit(row)">
<el-link slot="reference" type="primary" :underline="false">下单确认</el-link> </el-popconfirm> -->
</el-popconfirm>
<el-link v-if="row.orderStatus == 'ORDER_LOCKED'" type="primary" :underline="false" @click="confirmSubmit(row)">下单确认</el-link>
<el-popconfirm <el-popconfirm
:title="row.orderStatus == 'SUBMITED' || row.orderStatus == 'ORDER_LOCKED' ? '是否确认取消订单？' : '是否确认退款？'" :title="row.orderStatus == 'SUBMITED' || row.orderStatus == 'ORDER_LOCKED' ? '是否确认取消订单？' : '是否确认退款？'"
@@ -395,16 +396,16 @@ export default {
}, },
// 下单确认 // 下单确认
confirmSubmit(row) { confirmSubmit(row) {
// this.controlWindows.addInfo = row this.controlWindows.addInfo = row
// this.controlWindows.confirmSubmit = true this.controlWindows.confirmSubmit = true
order.orderSuccess({ id: row.id }).then(res => { // order.orderSuccess({ id: row.id }).then(res => {
if (res.code == 20000) { // if (res.code == 20000) {
this.$message.success(res.msg) // this.$message.success(res.msg)
// this.closeWindow() // // this.closeWindow()
this.getByPage() // this.getByPage()
} // }
}) // })
}, },
//启用禁用 //启用禁用
switchTrigger(val, row) { switchTrigger(val, row) {