From d4e039545c9e97347223eb415fbba85ee01bc263 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期六, 11 四月 2026 10:10:14 +0800
Subject: [PATCH] #页面优化

---
 rsf-design/src/views/manager/task/taskPage.helpers.js |   88 ++++++++++++++++++++++++++++++++-----------
 1 files changed, 65 insertions(+), 23 deletions(-)

diff --git a/rsf-design/src/views/manager/task/taskPage.helpers.js b/rsf-design/src/views/manager/task/taskPage.helpers.js
index 0fa5bda..58cae51 100644
--- a/rsf-design/src/views/manager/task/taskPage.helpers.js
+++ b/rsf-design/src/views/manager/task/taskPage.helpers.js
@@ -1,4 +1,5 @@
 import { ElMessageBox } from 'element-plus'
+import { $t } from '@/locales'
 
 function normalizeText(value) {
   return String(value ?? '').trim()
@@ -41,6 +42,7 @@
 export function normalizeTaskRow(record = {}) {
   return {
     ...record,
+    taskId: record.id ?? '--',
     taskCode: record.taskCode || '-',
     taskStatusLabel: record['taskStatus$'] || '-',
     taskTypeLabel: record['taskType$'] || '-',
@@ -52,10 +54,19 @@
     barcode: record.barcode || '-',
     robotCode: record.robotCode || '-',
     sort: normalizeNumber(record.sort),
+    exceStatusText: record['exceStatus$'] || record.exceStatus || '-',
+    expDesc: record.expDesc || '-',
+    expCode: record.expCode || '-',
+    startTimeText: record['startTime$'] || record.startTime || '-',
+    endTimeText: record['endTime$'] || record.endTime || '-',
+    createByText: record['createBy$'] || record.createByText || record.createBy || '-',
     statusText: record['status$'] || '-',
+    memo: record.memo || '-',
     updateTimeText: record['updateTime$'] || record.updateTime || '-',
     createTimeText: record['createTime$'] || record.createTime || '-',
-    canComplete: record.canComplete === true
+    updateByText: record['updateBy$'] || record.updateByText || record.updateBy || '-',
+    canComplete: record.canComplete === true,
+    canCancel: record.canCancel === true
   }
 }
 
@@ -64,15 +75,25 @@
     ...record,
     orderTypeLabel: record['orderType$'] || '-',
     wkTypeLabel: record['wkType$'] || '-',
+    platOrderCode: record.platOrderCode || '-',
     platWorkCode: record.platWorkCode || '-',
     platItemId: record.platItemId || '-',
+    projectCode: record.projectCode || '-',
     matnrCode: record.matnrCode || '-',
     maktx: record.maktx || '-',
     batch: record.batch || '-',
     unit: record.unit || '-',
     anfme: normalizeNumber(record.anfme),
-    updateByText: record['updateBy$'] || '-',
-    updateTimeText: record['updateTime$'] || record.updateTime || '-'
+    workQty: normalizeNumber(record.workQty),
+    qty: normalizeNumber(record.qty),
+    spec: record.spec || '-',
+    model: record.model || '-',
+    createByText: record['createBy$'] || record.createByText || record.createBy || '-',
+    createTimeText: record['createTime$'] || record.createTime || '-',
+    updateByText: record['updateBy$'] || record.updateByText || record.updateBy || '-',
+    updateTimeText: record['updateTime$'] || record.updateTime || '-',
+    statusText: record['status$'] || record.status || '-',
+    memo: record.memo || '-'
   }
 }
 
@@ -84,18 +105,31 @@
   return Number(row.taskStatus) === 199 && Number(row.taskType) === 103
 }
 
+export function canTopTask(row = {}) {
+  const taskStatus = Number(row.taskStatus)
+  const taskType = Number(row.taskType)
+  const allowedStatuses = [1, 101]
+  const allowedTypes = [1, 101, 10, 103, 11]
+  return allowedStatuses.includes(taskStatus) && allowedTypes.includes(taskType)
+}
+
 export function getTaskActionList(row = {}) {
   return [
     {
       key: 'view',
-      label: '鏌ョ湅璇︽儏',
+      label: $t('pages.task.actions.view'),
       icon: 'ri:eye-line'
+    },
+    {
+      key: 'flowStep',
+      label: $t('pages.task.actions.flowStep'),
+      icon: 'ri:node-tree'
     },
     ...(row.canComplete
       ? [
           {
             key: 'complete',
-            label: '瀹屾垚浠诲姟',
+            label: $t('pages.task.actions.complete'),
             icon: 'ri:checkbox-circle-line',
             auth: 'update'
           }
@@ -105,7 +139,7 @@
       ? [
           {
             key: 'check',
-            label: '鐩樼偣鍑哄簱',
+            label: $t('pages.task.actions.check'),
             icon: 'ri:file-check-line',
             auth: 'update'
           }
@@ -115,32 +149,40 @@
       ? [
           {
             key: 'pick',
-            label: '鎷ｆ枡鍑哄簱',
+            label: $t('pages.task.actions.pick'),
             icon: 'ri:paint-line',
             auth: 'update'
           }
         ]
       : []),
-    {
-      key: 'top',
-      label: '浠诲姟缃《',
-      icon: 'ri:pushpin-line',
-      auth: 'update'
-    },
-    {
-      key: 'remove',
-      label: '鍙栨秷浠诲姟',
-      icon: 'ri:close-circle-line',
-      color: '#f56c6c',
-      auth: 'delete'
-    }
+    ...(canTopTask(row)
+      ? [
+          {
+            key: 'top',
+            label: $t('pages.task.actions.top'),
+            icon: 'ri:pushpin-line',
+            auth: 'update'
+          }
+        ]
+      : []),
+    ...(row.canCancel
+      ? [
+          {
+            key: 'remove',
+            label: $t('pages.task.actions.remove'),
+            icon: 'ri:close-circle-line',
+            color: '#f56c6c',
+            auth: 'delete'
+          }
+        ]
+      : [])
   ]
 }
 
 export async function confirmTaskAction(message) {
-  await ElMessageBox.confirm(message, '鎻愮ず', {
+  await ElMessageBox.confirm(message, $t('crud.confirm.deleteTitle'), {
     type: 'warning',
-    confirmButtonText: '纭畾',
-    cancelButtonText: '鍙栨秷'
+    confirmButtonText: $t('common.confirm'),
+    cancelButtonText: $t('common.cancel')
   })
 }

--
Gitblit v1.9.1