|
|
@@ -109,6 +109,18 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="单据状态" prop="documentStatus">
|
|
|
+ <el-select v-model="queryParams.documentStatus" placeholder="请选择">
|
|
|
+ <el-option
|
|
|
+ v-for="item in [{value: '未提交', label: '未提交'}, {value: '审核中', label: '审核中'}, {value: '已审核', label: '已审核'}]"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
|
|
|
@@ -386,7 +398,7 @@
|
|
|
</el-select>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="合计" align="center" prop="goalSum" width="180">
|
|
|
+ <el-table-column label="合计" align="center" prop="totalGoal" width="180">
|
|
|
<template slot-scope="scope">
|
|
|
<el-input v-model="annualSaleGoalMergeDetailsList[scope.$index].totalGoal" disabled></el-input>
|
|
|
</template>
|
|
|
@@ -483,7 +495,7 @@
|
|
|
</el-popover-select-v2>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="合计" align="center" prop="goalSum" width="180">
|
|
|
+ <el-table-column label="合计" align="center" prop="totalGoal" width="180">
|
|
|
<template slot-scope="scope">
|
|
|
<el-input v-model="areaDetailList[scope.$index].totalGoal" disabled></el-input>
|
|
|
</template>
|
|
|
@@ -580,7 +592,7 @@
|
|
|
</el-popover-select-v2>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="合计" align="center" prop="goalSum" width="180">
|
|
|
+ <el-table-column label="合计" align="center" prop="totalGoal" width="180">
|
|
|
<template slot-scope="scope">
|
|
|
<el-input v-model="customerDetailList[scope.$index].totalGoal" disabled></el-input>
|
|
|
</template>
|
|
|
@@ -1374,6 +1386,18 @@ export default {
|
|
|
if (map.has(key)) {
|
|
|
const existingObj = map.get(key)
|
|
|
existingObj.totalGoal += obj.totalGoal
|
|
|
+ existingObj.januaryGoal += obj.januaryGoal
|
|
|
+ existingObj.februaryGoal += obj.februaryGoal
|
|
|
+ existingObj.marchGoal += obj.marchGoal
|
|
|
+ existingObj.aprilGoal += obj.aprilGoal
|
|
|
+ existingObj.mayGoal += obj.mayGoal
|
|
|
+ existingObj.juneGoal += obj.juneGoal
|
|
|
+ existingObj.julyGoal += obj.julyGoal
|
|
|
+ existingObj.augustGoal += obj.augustGoal
|
|
|
+ existingObj.septemberGoal += obj.septemberGoal
|
|
|
+ existingObj.octoberGoal += obj.octoberGoal
|
|
|
+ existingObj.novemberGoal += obj.novemberGoal
|
|
|
+ existingObj.decemberGoal += obj.decemberGoal
|
|
|
} else {
|
|
|
map.set(key, { ...obj })
|
|
|
}
|
002637