|
|
@@ -85,6 +85,7 @@
|
|
|
<span style="font-size: 16px">待结算打包快递金额</span>
|
|
|
<div style="margin-top: 5px">
|
|
|
<span v-if="stat.settleLaborAmount" style="color: green; font-weight: bold;font-size: 20px;">+ ¥{{parseFloat(stat.settleLaborAmount).toFixed(2)}}</span>
|
|
|
+ <span v-else-if="stat.settleDeliveryAmount" style="color: green; font-weight: bold;font-size: 20px;">+ ¥{{parseFloat(stat.settleLaborAmount + stat.settleDeliveryAmount).toFixed(2)}}</span>
|
|
|
<span v-else style="color: green; font-weight: bold;font-size: 20px;">+ ¥0</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -185,7 +186,7 @@
|
|
|
label="打包快递结算金额(按件2.55元)"
|
|
|
prop="settleLaborAmount">
|
|
|
<template slot-scope="scope">
|
|
|
- <span style="color: green; font-weight: bold;font-size: 16px">+{{scope.row.settleLaborAmount }}</span>
|
|
|
+ <span style="color: green; font-weight: bold;font-size: 16px">+{{scope.row.settleLaborAmount + scope.row.settleDeliveryAmount }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -286,6 +287,12 @@
|
|
|
class="default-btn text-btn"
|
|
|
@click="syncSettlement(scope.row)">更新</div>
|
|
|
<br/>
|
|
|
+ <div
|
|
|
+ v-if="shopId == 1"
|
|
|
+ class="default-btn text-btn"
|
|
|
+ style="color: red"
|
|
|
+ @click="deleteSettlement(scope.row)">删除</div>
|
|
|
+ <br/>
|
|
|
<div
|
|
|
v-if="shopId == 1"
|
|
|
style="margin: 0 0"
|
|
|
@@ -404,6 +411,20 @@
|
|
|
},
|
|
|
},
|
|
|
methods: {
|
|
|
+ deleteSettlement(row){
|
|
|
+ this.$http({
|
|
|
+ url: this.$http.adornUrl('/printSettlement/thirdPrintSettlement/'+ row.thirdSettleId),
|
|
|
+ method: 'delete',
|
|
|
+ data: this.$http.adornData({})
|
|
|
+ }).then(({data}) => {
|
|
|
+ if(data){
|
|
|
+ this.$message.success("删除成功");
|
|
|
+ }else{
|
|
|
+ this.$message.error("删除失败");
|
|
|
+ }
|
|
|
+ }).catch((error) => {
|
|
|
+ })
|
|
|
+ },
|
|
|
getStat(){
|
|
|
this.$http({
|
|
|
url: this.$http.adornUrl('/printSettlement/thirdPrintSettlement/stat'),
|
