|
@@ -61,6 +61,7 @@
|
|
|
import productList from '@/views/saleManage/saleOrder/invoice/components/product-list.vue';
|
|
import productList from '@/views/saleManage/saleOrder/invoice/components/product-list.vue';
|
|
|
import tabMixins from '@/mixins/tableColumnsMixin';
|
|
import tabMixins from '@/mixins/tableColumnsMixin';
|
|
|
import { reduce } from 'lodash';
|
|
import { reduce } from 'lodash';
|
|
|
|
|
+ import { formatPrice } from '@/BIZComponents/setProduct.js';
|
|
|
|
|
|
|
|
export default {
|
|
export default {
|
|
|
mixins: [dictMixins, tabMixins],
|
|
mixins: [dictMixins, tabMixins],
|
|
@@ -268,7 +269,7 @@
|
|
|
this.$set(
|
|
this.$set(
|
|
|
this.form.datasource[index],
|
|
this.form.datasource[index],
|
|
|
'adjustPrice',
|
|
'adjustPrice',
|
|
|
- row.priceDifference ? row.price + Number(row.priceDifference) : row.price
|
|
|
|
|
|
|
+ row.priceDifference ? formatPrice(+row.price + Number(row.priceDifference)) : row.price
|
|
|
);
|
|
);
|
|
|
// 改变相关数据
|
|
// 改变相关数据
|
|
|
this.$set(
|
|
this.$set(
|
|
@@ -286,24 +287,10 @@
|
|
|
//改变数量
|
|
//改变数量
|
|
|
changeCount(row, countObj) {
|
|
changeCount(row, countObj) {
|
|
|
|
|
|
|
|
- // let total = row['quantity'] || 0;
|
|
|
|
|
let data = row;
|
|
let data = row;
|
|
|
- // if (row.packageDispositionList) {
|
|
|
|
|
- // let endIndex = row.packageDispositionList.findIndex(
|
|
|
|
|
- // (ite) => row[countObj.unitIdKey] == ite.id
|
|
|
|
|
- // );
|
|
|
|
|
- // for (; 0 < endIndex; endIndex--) {
|
|
|
|
|
- // total = Vue.prototype.$math.format(
|
|
|
|
|
- // row.packageDispositionList[endIndex].packageCell * total,
|
|
|
|
|
- // 14
|
|
|
|
|
- // );
|
|
|
|
|
- // }
|
|
|
|
|
- // }
|
|
|
|
|
-
|
|
|
|
|
- // data['totalCount'] = total;
|
|
|
|
|
|
|
+
|
|
|
data['adjustDiscountPrice'] = data.adjustPrice;
|
|
data['adjustDiscountPrice'] = data.adjustPrice;
|
|
|
|
|
|
|
|
-
|
|
|
|
|
if (row['quantity'] && row.adjustPrice) {
|
|
if (row['quantity'] && row.adjustPrice) {
|
|
|
data['adjustAmount'] = row['quantity'] * row.adjustPrice;
|
|
data['adjustAmount'] = row['quantity'] * row.adjustPrice;
|
|
|
data['adjustDiscountAmount'] = data.adjustAmount;
|
|
data['adjustDiscountAmount'] = data.adjustAmount;
|
|
@@ -417,14 +404,14 @@
|
|
|
|
|
|
|
|
// let num =
|
|
// let num =
|
|
|
// Number(this.form.adjustDiscountAmount) * (Number(row.adjustDiscountAmount) /Number(this.allPrice));
|
|
// Number(this.form.adjustDiscountAmount) * (Number(row.adjustDiscountAmount) /Number(this.allPrice));
|
|
|
- return isNaN(num) ? '' : num.toFixed(2);
|
|
|
|
|
|
|
+ return isNaN(num) ? '' : formatPrice(num);
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
//获取折让合计
|
|
//获取折让合计
|
|
|
getDiscountTotalPrice(row) {
|
|
getDiscountTotalPrice(row) {
|
|
|
let num = 0;
|
|
let num = 0;
|
|
|
num = Number(row.adjustDiscountPrice) * Number(row.quantity);
|
|
num = Number(row.adjustDiscountPrice) * Number(row.quantity);
|
|
|
- return isNaN(num) ? '' : num.toFixed(2);
|
|
|
|
|
|
|
+ return isNaN(num) ? '' : formatPrice(num);
|
|
|
},
|
|
},
|
|
|
getTotalCount(row) {
|
|
getTotalCount(row) {
|
|
|
let num = 0;
|
|
let num = 0;
|
|
@@ -434,7 +421,7 @@
|
|
|
num += Number(item.totalCount);
|
|
num += Number(item.totalCount);
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- return num;
|
|
|
|
|
|
|
+ return formatPrice(num);
|
|
|
},
|
|
},
|
|
|
// 返回列表数据
|
|
// 返回列表数据
|
|
|
getTableValue() {
|
|
getTableValue() {
|