diff --git a/components/commonTimeSelect.vue b/components/commonTimeSelect.vue index 3e30741..0862878 100644 --- a/components/commonTimeSelect.vue +++ b/components/commonTimeSelect.vue @@ -25,7 +25,7 @@ default: () => [ // 基础范围 { - label: "今日", + label: "本日", value: "day", mode: ['basic', 'all'] }, diff --git a/pages-business/staffStatistics/assets/banner.png b/pages-business/staffStatistics/assets/banner.png new file mode 100644 index 0000000..a9b73dd Binary files /dev/null and b/pages-business/staffStatistics/assets/banner.png differ diff --git a/pages-business/staffStatistics/assets/icon_tap.png b/pages-business/staffStatistics/assets/icon_tap.png new file mode 100644 index 0000000..0a69a0d Binary files /dev/null and b/pages-business/staffStatistics/assets/icon_tap.png differ diff --git a/pages-business/staffStatistics/assets/name.png b/pages-business/staffStatistics/assets/name.png new file mode 100644 index 0000000..0caaf82 Binary files /dev/null and b/pages-business/staffStatistics/assets/name.png differ diff --git a/pages-business/staffStatistics/assets/top1.png b/pages-business/staffStatistics/assets/top1.png new file mode 100644 index 0000000..89759c4 Binary files /dev/null and b/pages-business/staffStatistics/assets/top1.png differ diff --git a/pages-business/staffStatistics/assets/top2.png b/pages-business/staffStatistics/assets/top2.png new file mode 100644 index 0000000..2aa8c4e Binary files /dev/null and b/pages-business/staffStatistics/assets/top2.png differ diff --git a/pages-business/staffStatistics/assets/top3.png b/pages-business/staffStatistics/assets/top3.png new file mode 100644 index 0000000..5c21777 Binary files /dev/null and b/pages-business/staffStatistics/assets/top3.png differ diff --git a/pages-business/staffStatistics/index.vue b/pages-business/staffStatistics/index.vue new file mode 100644 index 0000000..a749e44 --- /dev/null +++ b/pages-business/staffStatistics/index.vue @@ -0,0 +1,544 @@ + + + \ No newline at end of file diff --git a/pages-business/staffStatistics/staffStatistics.vue b/pages-business/staffStatistics/staffStatistics.vue index 0739a7b..4a9fb45 100644 --- a/pages-business/staffStatistics/staffStatistics.vue +++ b/pages-business/staffStatistics/staffStatistics.vue @@ -4,7 +4,7 @@ - 详情页 + 班组统计 @@ -34,10 +34,24 @@ - - + + + 接单数量 {{item.count}} + + + + + 合格数量 {{item.zjCount}} + + + + 返工数量 {{item.nfpgCount}} + + + - + {{ sKey.total }}台次 @@ -217,16 +231,11 @@ /** * 列表 */ - goList(selectType, repairType, workType) { - if (repairType) { - uni.navigateTo({ - url: `/pages-business/statistics/statistics?selectType=${selectType}&repairType=${repairType}&workType=${workType}&dateRange=${JSON.stringify(this.queryParams.dateRange)}` - }) - } else { - uni.navigateTo({ - url: `/pages-business/statistics/statistics?selectType=${selectType}&dateRange=${JSON.stringify(this.queryParams.dateRange)}&workType=${workType}` - }) - } + goList(workType, workName) { + console.log('执行跳转'); + uni.navigateTo({ + url: `/pages-business/staffStatistics/index?workType=${workType}&workName=${workName}&dateRange=${JSON.stringify(this.queryParams.dateRange)}` + }) }, goListByPayStatus(payStatus) { uni.navigateTo({ diff --git a/pages-home/home/home.vue b/pages-home/home/home.vue index b0ee49a..6a4d11f 100644 --- a/pages-home/home/home.vue +++ b/pages-home/home/home.vue @@ -40,7 +40,7 @@ 配件统计 - + 班组统计 diff --git a/pages-order/addOrder/addOrder.vue b/pages-order/addOrder/addOrder.vue index 4360731..a5fa792 100644 --- a/pages-order/addOrder/addOrder.vue +++ b/pages-order/addOrder/addOrder.vue @@ -678,6 +678,7 @@ } }).then(res => { this.busiAndCusList = handleTree(res.data, 'id', 'pid') + console.log('busiAndCusList', this.busiAndCusList); }) }, onBusiAndCuschange(e) { diff --git a/pages.json b/pages.json index 650b267..558cb87 100644 --- a/pages.json +++ b/pages.json @@ -403,6 +403,12 @@ { "navigationBarTitleText" : "" } + }, + { + "path": "staffStatistics/index", + "style": { + "navigationBarTitleText": "" + } } ] } diff --git a/static/images/staffStatistics.png b/static/images/staffStatistics.png new file mode 100644 index 0000000..86fff98 Binary files /dev/null and b/static/images/staffStatistics.png differ