diff --git a/src/components/dashboard/PlanSection.vue b/src/components/dashboard/PlanSection.vue
index 69669fd..9f06709 100644
--- a/src/components/dashboard/PlanSection.vue
+++ b/src/components/dashboard/PlanSection.vue
@@ -67,27 +67,27 @@
-
+
{{ formatNumber(taskTrendData.totalNum) }}
{{ t('dashboard.totalTask') }}
-
+
{{ formatNumber(taskTrendData.issuedNum) }}
{{ t('dashboard.issuedNum') }}
-
+
{{ formatNumber(taskTrendData.partialScheduledNum) }}
{{ t('dashboard.partialScheduledNum') }}
-
+
{{ formatNumber(taskTrendData.waitingProductionNum) }}
{{ t('dashboard.waitingProduction') }}
-
+
{{ formatNumber(taskTrendData.producingNum) }}
{{ t('dashboard.producing') }}
-
+
{{ formatNumber(taskTrendData.completedNum) }}
{{ t('dashboard.completed') }}
@@ -473,6 +473,13 @@ function viewMore() {
}
}
+function viewTaskList(status) {
+ const url = status
+ ? `/pages_function/pages/taskList/index?status=${status}`
+ : '/pages_function/pages/taskList/index'
+ uni.navigateTo({ url })
+}
+
function loadData() {
if (currentFilter.value === 'task') {
loadTaskTrendData()
@@ -623,6 +630,10 @@ defineExpose({ loadData })
&:last-child {
margin-right: 0;
}
+
+ &:active {
+ background: #e8ecf0;
+ }
}
.trend-stat-value {
diff --git a/src/components/dashboard/StatsSection.vue b/src/components/dashboard/StatsSection.vue
index b9ce5ba..bce7abc 100644
--- a/src/components/dashboard/StatsSection.vue
+++ b/src/components/dashboard/StatsSection.vue
@@ -1,45 +1,61 @@
{{ t('dashboard.productionOverview') }}
-
-
- {{ formatNumber(stat.value) }}
- {{ t(`dashboard.${stat.labelKey}`) }}
+
+
+
+ {{ formatNumber(stat.value) }}
+ {{ stat.label }}
+
-
+
\ No newline at end of file
diff --git a/src/locales/en-US.js b/src/locales/en-US.js
index 6451450..7009d94 100644
--- a/src/locales/en-US.js
+++ b/src/locales/en-US.js
@@ -117,9 +117,14 @@ export default {
selectDeviceHint: 'Please select a device to view trend'
},
taskList: {
+ filter: 'Filter',
+ code: 'Task Code',
+ status: 'Status',
taskType: 'Task Type',
orderDate: 'Order Date',
deliveryDate: 'Delivery Date',
+ remark: 'Remark',
+ createTime: 'Create Time',
totalNumber: 'Total',
planNumber: 'Planned',
unPlanNumber: 'Unplanned',
@@ -162,6 +167,7 @@ export default {
uploadImageFailed: 'Image upload failed',
yes: 'Yes',
no: 'No',
+ all: 'All',
noMore: 'No more data',
confirmTitle: 'Confirm'
},
diff --git a/src/locales/zh-CN.js b/src/locales/zh-CN.js
index f5372f9..930afe7 100644
--- a/src/locales/zh-CN.js
+++ b/src/locales/zh-CN.js
@@ -117,9 +117,14 @@ export default {
selectDeviceHint: '请选择设备查看趋势'
},
taskList: {
+ filter: '筛选条件',
+ code: '任务单编码',
+ status: '状态',
taskType: '任务类型',
orderDate: '下单日期',
deliveryDate: '交付日期',
+ remark: '备注',
+ createTime: '创建时间',
totalNumber: '总数量',
planNumber: '已排产',
unPlanNumber: '未排产',
@@ -162,6 +167,7 @@ export default {
uploadImageFailed: '图片上传失败',
yes: '是',
no: '否',
+ all: '全部',
noMore: '没有更多数据了',
confirmTitle: '提示'
},
diff --git a/src/pages_function/pages/taskList/index.vue b/src/pages_function/pages/taskList/index.vue
index 68dc5a1..7897d5e 100644
--- a/src/pages_function/pages/taskList/index.vue
+++ b/src/pages_function/pages/taskList/index.vue
@@ -1,12 +1,58 @@
+
+
+ {{ t('taskList.filter') }}
+ {{ showFilter ? '▲' : '▼' }}
+
+
+
+
+ {{ t('taskList.code') }}
+
+
+
+ {{ t('taskList.status') }}
+
+
+ {{ statusLabel || t('taskList.status') }}
+ ▼
+
+
+
+
+ {{ t('taskList.orderDate') }}
+
+
+
+ {{ t('taskList.deliveryDate') }}
+
+
+
+ {{ t('taskList.remark') }}
+
+
+
+ {{ t('taskList.createTime') }}
+
+
+
+
+ {{ t('functionCommon.cancel') }}
+
+
+ {{ t('functionCommon.search') }}
+
+
+
-
+
@@ -56,13 +102,34 @@