|
@@ -27,15 +27,15 @@
|
|
|
<view v-for="(item, index) in profile.list" :key="index" class="sale-item">
|
|
<view v-for="(item, index) in profile.list" :key="index" class="sale-item">
|
|
|
<view class="sale-item-name">{{item.customName?item.customName:'-'}}</view>
|
|
<view class="sale-item-name">{{item.customName?item.customName:'-'}}</view>
|
|
|
<t-tr>
|
|
<t-tr>
|
|
|
- <t-td><view class="sale-cell">{{parseFloat(item.num)}}</view></t-td>
|
|
|
|
|
- <t-td><view class="sale-cell">{{item.count?parseFloat(item.count):0}}</view></t-td>
|
|
|
|
|
|
|
+ <t-td><view class="sale-cell">{{parseFloat(item.num)}}笔</view></t-td>
|
|
|
|
|
+ <t-td><view class="sale-cell">{{item.count?parseFloat(item.count):0}}扎</view></t-td>
|
|
|
<t-td><view class="sale-cell">¥{{parseFloat(item.amount)}}</view></t-td>
|
|
<t-td><view class="sale-cell">¥{{parseFloat(item.amount)}}</view></t-td>
|
|
|
<t-td><view class="sale-cell">¥{{parseFloat(item.cost)}}</view></t-td>
|
|
<t-td><view class="sale-cell">¥{{parseFloat(item.cost)}}</view></t-td>
|
|
|
<t-td><view class="sale-cell">¥{{parseFloat(item.profit)}}</view></t-td>
|
|
<t-td><view class="sale-cell">¥{{parseFloat(item.profit)}}</view></t-td>
|
|
|
</t-tr>
|
|
</t-tr>
|
|
|
</view>
|
|
</view>
|
|
|
</block>
|
|
</block>
|
|
|
- <t-tr><t-td><view class="sale-total">{{profile.totalNum||0}}笔¥{{profile.totalAmount||0}} 成本¥{{ profile.totalCost||0 }} 利润¥{{ profile.totalProfit||0 }}</view></t-td></t-tr>
|
|
|
|
|
|
|
+ <t-tr><t-td><view class="sale-total">{{profile.totalNum||0}}笔 {{totalCount}}扎 收入¥{{profile.totalAmount||0}} 成本¥{{ profile.totalCost||0 }} 利润¥{{ profile.totalProfit||0 }}</view></t-td></t-tr>
|
|
|
</t-table>
|
|
</t-table>
|
|
|
</block>
|
|
</block>
|
|
|
</view>
|
|
</view>
|
|
@@ -59,7 +59,22 @@ import {mapActions, mapGetters} from "vuex";
|
|
|
export default {
|
|
export default {
|
|
|
components: { AppWrapperEmpty,ShopSelect,AppSearchModule,DateSelect },
|
|
components: { AppWrapperEmpty,ShopSelect,AppSearchModule,DateSelect },
|
|
|
mixins: [list],
|
|
mixins: [list],
|
|
|
- computed: { ...mapGetters(["getDictionariesInfo","getLoginInfo"]) },
|
|
|
|
|
|
|
+ computed: {
|
|
|
|
|
+ ...mapGetters(["getDictionariesInfo","getLoginInfo"]),
|
|
|
|
|
+ // 底部总扎数:优先用接口 totalCount(含隔天售后扣减),没有则按各客户 count 汇总
|
|
|
|
|
+ totalCount() {
|
|
|
|
|
+ const profile = this.profile || {}
|
|
|
|
|
+ if (profile.totalCount != null && profile.totalCount !== '') {
|
|
|
|
|
+ return parseFloat(profile.totalCount) || 0
|
|
|
|
|
+ }
|
|
|
|
|
+ const list = profile.list || []
|
|
|
|
|
+ let sum = 0
|
|
|
|
|
+ list.forEach(item => {
|
|
|
|
|
+ sum += parseFloat(item.count) || 0
|
|
|
|
|
+ })
|
|
|
|
|
+ return parseFloat(sum.toFixed(2)) || 0
|
|
|
|
|
+ }
|
|
|
|
|
+ },
|
|
|
data() {
|
|
data() {
|
|
|
return {
|
|
return {
|
|
|
params:{
|
|
params:{
|