备货单 添加预览 跟进列表分页 审批记录显示问题处理

src/views/admin/approval/approval_edit.vue

@@ -638,10 +638,25 @@
             if (c.type === 'initiator_leader') {
               group.users = []
             } else if (c.value) {
-              group.users = String(c.value)
+              // group.users = String(c.value)
+              //   .split(',')
+              //   .map((v) => Number((v || '').trim()))
+              //   .filter((n) => !Number.isNaN(n))
+              const values = String(c.value)
                 .split(',')
-                .map((v) => Number((v || '').trim()))
-                .filter((n) => !Number.isNaN(n))
+                .map((v) => (v || '').trim())
+                .filter(Boolean)
+              // 判断是否为纯数字ID
+              const isNumericIds = values.every(
+                (v) => !Number.isNaN(Number(v)) && Number.isInteger(Number(v))
+              )
+              if (isNumericIds) {
+                // 如果是数字ID，转换为数字数组
+                group.users = values.map((v) => Number(v))
+              } else {
+                // 如果是字符串名称，保持为字符串数组
+                group.users = values
+              }
             }
             node.ccGroups.push(group)
           }

src/views/admin/approval/stocking_auth_detil.vue

@@ -242,7 +242,7 @@
   const processFiles = (files: any[], type: string) => {
     if (!files || !Array.isArray(files)) return []
     return files.map((file: any) => ({
-      name: `${type}文件`,
+      name: file.original_name,
       url: file.file_full_url || file.file_url,
       file_name: file.file_url
     }))

src/views/admin/procurement/purchase_order.vue

@@ -937,6 +937,8 @@
         pending: h?.status != 'approved' && h?.status != 'rejected' && h?.status != 'submitted',
         comment: h?.comment || h?.remark || ''
       }))
+    } else {
+      approvalRecords.value = []
     }
     timelineDialogVisible.value = true
   }

src/views/admin/stock/final_list_admin.vue

@@ -335,7 +335,7 @@
   const processFiles = (files: any[], type: string) => {
     if (!files || !Array.isArray(files)) return []
     return files.map((file: any) => ({
-      name: `${type}文件`,
+      name: file.original_name,
       url: file.file_full_url || file.file_url,
       file_name: file.file_url
     }))
@@ -499,6 +499,8 @@
         pending: h?.status != 'approved' && h?.status != 'rejected' && h?.status != 'submitted',
         comment: h?.comment || h?.remark || ''
       }))
+    } else {
+      approvalRecords.value = []
     }
     timelineDialogVisible.value = true
   }

src/views/admin/stock/stocking_list_admin.vue

@@ -275,7 +275,7 @@
   const processFiles = (files: any[], type: string) => {
     if (!files || !Array.isArray(files)) return []
     return files.map((file: any) => ({
-      name: `${type}文件`,
+      name: file.original_name,
       url: file.file_full_url || file.file_url,
       file_name: file.file_url
     }))
@@ -499,6 +499,8 @@
         pending: h?.status != 'approved' && h?.status != 'rejected' && h?.status != 'submitted',
         comment: h?.comment || h?.remark || ''
       }))
+    } else {
+      approvalRecords.value = []
     }
     timelineDialogVisible.value = true
   }

src/views/admin/user/index.vue

@@ -60,6 +60,7 @@
           <el-table-column prop="name" label="名字" align="center" />
           <el-table-column prop="phone" label="电话" align="center" />
           <el-table-column prop="email" label="邮箱" align="center" />
+          <el-table-column prop="report_to_name" label="直属上级" align="center" />
           <el-table-column prop="corp_name" label="所属公司" align="center" />
           <el-table-column prop="follow" label="状态" align="center">
             <template #default="scope">