|
@@ -21,7 +21,7 @@
|
|
|
|
|
|
<script>
|
|
|
import { getToken } from "@/util/auth";
|
|
|
-import { getList } from "@/api/statisticAnalysis/salesDetails"
|
|
|
+import { getList } from "@/api/statisticAnalysis/taskStatistics"
|
|
|
|
|
|
export default {
|
|
|
name: "index",
|
|
@@ -55,16 +55,13 @@ export default {
|
|
|
column: [
|
|
|
{
|
|
|
label: "承做人",
|
|
|
- prop: "userid",
|
|
|
+ prop: "userName",
|
|
|
overHidden: true,
|
|
|
- search: true,
|
|
|
- formatter: row => {
|
|
|
- return row.userName;
|
|
|
- }
|
|
|
+ search: true
|
|
|
},
|
|
|
{
|
|
|
label: "日期",
|
|
|
- prop: "careteTime",
|
|
|
+ prop: "actualDate",
|
|
|
type: "datetime",
|
|
|
format: 'yyyy-MM-dd',
|
|
|
valueFormat: 'yyyy-MM-dd HH:mm:ss',
|
|
@@ -75,17 +72,17 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
label: "客户名称",
|
|
|
- prop: "cordName",
|
|
|
+ prop: "cornName",
|
|
|
overHidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "任务名称",
|
|
|
- prop: "taskName",
|
|
|
+ prop: "pname",
|
|
|
overHidden: true,
|
|
|
},
|
|
|
{
|
|
|
label: "提成金额",
|
|
|
- prop: "commissionAmount",
|
|
|
+ prop: "commission",
|
|
|
overHidden: true
|
|
|
}
|
|
|
]
|
|
@@ -116,15 +113,13 @@ export default {
|
|
|
this.page.pageSize = val;
|
|
|
},
|
|
|
onLoad(page, params) {
|
|
|
- if (this.search.careteTime && this.search.careteTime.length > 0) {
|
|
|
- params = {
|
|
|
- ...params,
|
|
|
- beginCreateTime: this.search.careteTime[0],
|
|
|
- endCreateTime: this.search.careteTime[1]
|
|
|
- };
|
|
|
+ let data = this.deepClone(Object.assign({}, params, this.search));
|
|
|
+ if (data.actualDate) {
|
|
|
+ data.beginStartTime = data.actualDate[0]
|
|
|
+ data.beginEndTime = data.actualDate[1]
|
|
|
+ delete data.actualDate
|
|
|
}
|
|
|
- let data = this.deepClone(Object.assign(params, this.search));
|
|
|
- delete data.careteTime;
|
|
|
+ data.branch = "Y"
|
|
|
this.loading = true;
|
|
|
getList(
|
|
|
page.currentPage,
|