|
@@ -486,6 +486,7 @@
|
|
|
import { parameterGetByCode } from '@/api/main/index.js';
|
|
import { parameterGetByCode } from '@/api/main/index.js';
|
|
|
import { getSummaries } from '@/utils/util.js';
|
|
import { getSummaries } from '@/utils/util.js';
|
|
|
import { getBatchList } from '@/api/wms';
|
|
import { getBatchList } from '@/api/wms';
|
|
|
|
|
+ import Vue from 'vue';
|
|
|
|
|
|
|
|
export default {
|
|
export default {
|
|
|
mixins: [dictMixins, getDynamicsColumns, tabMixins],
|
|
mixins: [dictMixins, getDynamicsColumns, tabMixins],
|
|
@@ -514,6 +515,10 @@
|
|
|
},
|
|
},
|
|
|
isTotalCount: {
|
|
isTotalCount: {
|
|
|
default: 0
|
|
default: 0
|
|
|
|
|
+ },
|
|
|
|
|
+ isReturnGoodsCreate: {
|
|
|
|
|
+ type: Boolean,
|
|
|
|
|
+ default: false
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
components: {
|
|
components: {
|
|
@@ -1527,7 +1532,7 @@
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
setValue(data) {
|
|
setValue(data) {
|
|
|
- console.log('setValue~~~~~~', data);
|
|
|
|
|
|
|
+ console.log('setValue~~~~~~', data, this.sourceType);
|
|
|
let indexS = [];
|
|
let indexS = [];
|
|
|
data.forEach((item, index) => {
|
|
data.forEach((item, index) => {
|
|
|
if (item.modelKey) {
|
|
if (item.modelKey) {
|
|
@@ -1537,9 +1542,36 @@
|
|
|
this.$set(data[index], 'colorKey', item.colorKey);
|
|
this.$set(data[index], 'colorKey', item.colorKey);
|
|
|
}
|
|
}
|
|
|
item.receiveTotalWeight = item.receiveTotalWeight || 0;
|
|
item.receiveTotalWeight = item.receiveTotalWeight || 0;
|
|
|
-
|
|
|
|
|
- // item.saleCount = item.notGenerateSendCount || item.saleCount;
|
|
|
|
|
- // item.totalCount = item.saleCount || item.totalCount;
|
|
|
|
|
|
|
+ // console.log('item~~~~', item, this.sourceType);
|
|
|
|
|
+ // if(!this.isReturnGoodsCreate) {
|
|
|
|
|
+ // console.log('isReturnGoodsCreate', this.isReturnGoodsCreate)
|
|
|
|
|
+ // item.totalCount = item.notGenerateSendCount || item.totalCount;
|
|
|
|
|
+ // // item.saleCount = item.notGenerateSendCount || item.saleCount;
|
|
|
|
|
+ // let total = item.totalCount || 0;
|
|
|
|
|
+ // let _endIndex = 0; //计算单重需要
|
|
|
|
|
+ // if (item.packageDispositionList) {
|
|
|
|
|
+ // let endIndex = item.packageDispositionList.findIndex(
|
|
|
|
|
+ // (ite) => item.saleUnitId == ite.id
|
|
|
|
|
+ // );
|
|
|
|
|
+ // _endIndex = endIndex;
|
|
|
|
|
+ // let packageData = item.packageDispositionList.find(
|
|
|
|
|
+ // (ite) => item.saleUnitId== ite.id
|
|
|
|
|
+ // );
|
|
|
|
|
+ // item.saleUnitId = packageData?.conversionUnit;
|
|
|
|
|
+ // if (item.weightUnit == item.measuringUnit && item.singleWeight) {
|
|
|
|
|
+ // item.packageDispositionList[1].packageCell = item.singleWeight;
|
|
|
|
|
+ // }
|
|
|
|
|
+ // for (; 0 < endIndex; endIndex--) {
|
|
|
|
|
+ // total = Vue.prototype.$math.format(
|
|
|
|
|
+ // total / item.packageDispositionList[endIndex].packageCell,
|
|
|
|
|
+ // 14
|
|
|
|
|
+ // );
|
|
|
|
|
+ // }
|
|
|
|
|
+ // }
|
|
|
|
|
+ // item.saleCount = total;
|
|
|
|
|
+ // }
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
// this.changeCount(item, index, false);
|
|
// this.changeCount(item, index, false);
|
|
|
|
|
|
|
|
if (item.weightUnit == item.measuringUnit) {
|
|
if (item.weightUnit == item.measuringUnit) {
|