|
|
@@ -316,7 +316,6 @@
|
|
|
</el-row>
|
|
|
<el-tabs v-model="activeName">
|
|
|
<el-tab-pane label="月销售目标合并明细" name="monthGoalMergeDetails">
|
|
|
- <!-- v-loading="loading"-->
|
|
|
<el-table v-loading="loading" :data="monthGoalMergeDetailsList" @selection-change="handleSelectionChange">
|
|
|
<el-table-column type="selection" width="55" align="center" fixed />
|
|
|
<el-table-column label="销售组织" align="center" prop="saleOrg" width="180">
|
|
|
@@ -665,6 +664,7 @@ export default {
|
|
|
/** 新增按钮操作 */
|
|
|
handleAdd() {
|
|
|
this.reset();
|
|
|
+ this.monthGoalMergeDetailsList = []
|
|
|
this.open = true;
|
|
|
this.title = "添加月销售目标合并";
|
|
|
},
|
|
|
@@ -696,6 +696,7 @@ export default {
|
|
|
const id = row.id || this.ids
|
|
|
getMonthGoalMerge(id).then(response => {
|
|
|
this.form = response.data;
|
|
|
+ this.monthGoalMergeDetailsList = this.form.monthMergeDetailsList
|
|
|
this.open = true;
|
|
|
this.title = "修改月销售目标合并";
|
|
|
});
|
|
|
@@ -953,11 +954,13 @@ export default {
|
|
|
},
|
|
|
// 计算主表合计
|
|
|
computeTotal() {
|
|
|
+ console.log(this.monthGoalMergeDetailsList);
|
|
|
let list = this.monthGoalMergeDetailsList
|
|
|
let sum = 0
|
|
|
for (const listElement of list) {
|
|
|
sum = (sum * 1000000 + listElement.goalValue * 1000000) / 1000000
|
|
|
}
|
|
|
+ console.log(sum);
|
|
|
this.form.goalSum = sum
|
|
|
},
|
|
|
// 合并数据
|
|
|
@@ -988,7 +991,6 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
let query = { classify: classify, classifyValue: classifyValue }
|
|
|
- console.log(query);
|
|
|
mergeMonthSaleMergeDetails(query).then(response => {
|
|
|
console.log(response);
|
|
|
this.monthGoalMergeDetailsList = response.data.monthGoalMergeDetails
|
002637