From 4e1bef2888af2c13df68bb4b7bb36a91cd2d61a7 Mon Sep 17 00:00:00 2001
From: duxuekai <461371455@qq.com>
Date: Fri, 29 May 2026 10:21:42 +0800
Subject: [PATCH] fix

---
 src/api/demo/data.js                          |   9 +
 .../batch-modify-responsible-modal.vue        | 340 ++++---
 .../custom-page/checkPersonPermission.vue     |   2 +-
 .../custom-page/engineDetail.vue              | 865 +++++++++++++-----
 .../custom-page/managerData.vue               |  19 +-
 .../custom-page/model-query.vue               |  55 +-
 .../custom-page/myDone.vue                    |   1 +
 .../custom-page/otherEnginedata.vue           |  16 +-
 .../custom-page/permissionManagement.vue      |  44 +-
 .../custom-page/selfEnginedata.vue            |  16 +-
 .../apaas-custom-mydemo/custom-page/todo.vue  |   1 +
 11 files changed, 947 insertions(+), 421 deletions(-)

diff --git a/src/api/demo/data.js b/src/api/demo/data.js
index fa45178..4541d14 100644
--- a/src/api/demo/data.js
+++ b/src/api/demo/data.js
@@ -54,6 +54,15 @@ export default {
     url: '/custom/engineParamDetailPojo/selectParamListAndModelForFilledBy',
     method: 'get'
   },
+  GET_ENGINE_TABLE_DETAIL_FOR_FILLED_BY_HISTORY: {
+    url: '/custom/engineParamDetailPojo/selectParamListAndModelForFilledByHistory',
+    method: 'get'
+  },
+  // 责任人分发填写人时获取参数树（传参与 GET_ENGINE_TABLE_DETAIL 相同，userID 为责任人 ID）
+  GET_ENGINE_TABLE_DETAIL_FOR_RESPONSIBLE_PERSON: {
+    url: '/custom/engineParamDetailPojo/selectParamListAndModelForResponsiblePerson',
+    method: 'get'
+  },
   GET_NEW_MODEL_VERSION: {
     url: '/custom/dataEntryEngineModel/synchronizeParams',
     method: 'get'
diff --git a/src/custom/apaas-custom-mydemo/custom-page/batch-modify-responsible-modal.vue b/src/custom/apaas-custom-mydemo/custom-page/batch-modify-responsible-modal.vue
index 3bc633b..9c4d490 100644
--- a/src/custom/apaas-custom-mydemo/custom-page/batch-modify-responsible-modal.vue
+++ b/src/custom/apaas-custom-mydemo/custom-page/batch-modify-responsible-modal.vue
@@ -16,8 +16,10 @@
           <el-form-item label="子系统:" prop="subsystem">
             <el-select
               v-model="formData.subsystem"
-              placeholder="请选择子系统"
+              :placeholder="dispatchType === 'update_param' ? '请选择子系统（可多选）' : '请选择子系统'"
               clearable
+              :multiple="dispatchType === 'update_param'"
+              collapse-tags
               style="width: 100%"
               @change="handleSubsystemChange"
             >
@@ -31,7 +33,7 @@
               clearable
               multiple
               style="width: 100%"
-              :disabled="!formData.subsystem"
+              :disabled="!hasSelectedSubsystem"
               @change="handlePartsNameChange"
             >
               <el-option
@@ -42,20 +44,13 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="部门:" prop="department">
+          <el-form-item v-if="dispatchType !== 'update_param'" label="部门:" prop="department">
             <el-select
               v-model="formData.department"
               placeholder="请选择部门"
               clearable
               style="width: 100%"
-              :disabled="
-                dispatchType === 'update_param'
-                  ? !formData.subsystem ||
-                    !formData.partsName ||
-                    !Array.isArray(formData.partsName) ||
-                    formData.partsName.length === 0
-                  : !formData.subsystem
-              "
+              :disabled="!formData.subsystem"
               @change="handleDepartmentChange"
             >
               <el-option
@@ -88,7 +83,7 @@
               "
               style="width: 100%"
               clearable
-              :disabled="!formData.department"
+              :disabled="dispatchType !== 'update_param' && !formData.department"
               filterable
               remote
               :remote-method="handleRemoteSearch"
@@ -125,6 +120,9 @@
 
 <script>
 import api from '@/api'
+
+const WHOLE_ENGINE_PARAMS_LEGACY_KEYS = ['整车参数', '发动机基本信息']
+
 export default {
   name: 'BatchModifyResponsibleModal',
   props: {
@@ -151,6 +149,21 @@ export default {
     currentVersionId: {
       type: String,
       default: ''
+    },
+    // 由父组件 engineDetail 传入，解析部门 departmentId（含中轻/中重动力平台映射）
+    resolveDepartmentId: {
+      type: Function,
+      default: null
+    },
+    // 左侧参数树第一级（项目名称），用于匹配责任人/填写人
+    projectPartsName: {
+      type: String,
+      default: ''
+    },
+    // 左侧参数树展示的子系统名称列表
+    treeSubsystemNames: {
+      type: Array,
+      default: () => []
     }
   },
   data() {
@@ -174,6 +187,7 @@ export default {
       availablePartsNames: [], // 根据子系统筛选出的零部件名称列表（仅用于批量修改填写人）
       availableDepartments: [], // 根据子系统筛选出的部门列表
       allManagerData: [], // 所有责任人数据（用于查找现责任人和部门）
+      allFillerData: [], // 所有填写人数据（用于查找现填写人）
       departmentTreeData: [], // 部门树数据（用于根据部门名称查找部门ID）
       userOptions: [], // 人员选项列表
       userLoading: false // 人员搜索loading状态
@@ -183,9 +197,16 @@ export default {
     modalTitle() {
       return this.dispatchType === 'update_param' ? '批量修改填写人' : '批量修改责任人'
     },
+    hasSelectedSubsystem() {
+      if (this.dispatchType === 'update_param') {
+        return (
+          Array.isArray(this.formData.subsystem) && this.formData.subsystem.length > 0
+        )
+      }
+      return !!this.formData.subsystem
+    },
     formRules() {
       const rules = {
-        subsystem: [{ required: true, message: '请选择子系统', trigger: 'change' }],
         userId: [
           {
             required: true,
@@ -194,10 +215,16 @@ export default {
           }
         ]
       }
-      // 添加部门验证（两种模式都需要）
-      rules.department = [{ required: true, message: '请选择部门', trigger: 'change' }]
-      // 如果是批量修改填写人，添加零部件名称验证
       if (this.dispatchType === 'update_param') {
+        rules.subsystem = [
+          {
+            required: true,
+            type: 'array',
+            min: 1,
+            message: '请至少选择一个子系统',
+            trigger: 'change'
+          }
+        ]
         rules.partsName = [
           {
             required: true,
@@ -207,6 +234,9 @@ export default {
             trigger: 'change'
           }
         ]
+      } else {
+        rules.subsystem = [{ required: true, message: '请选择子系统', trigger: 'change' }]
+        rules.department = [{ required: true, message: '请选择部门', trigger: 'change' }]
       }
       return rules
     }
@@ -228,10 +258,26 @@ export default {
       // 否则显示全部
       return normalizedDept
     },
+    getEmptySubsystemValue() {
+      return this.dispatchType === 'update_param' ? [] : ''
+    },
+    getSelectedSubsystems() {
+      if (this.dispatchType === 'update_param') {
+        return Array.isArray(this.formData.subsystem) ? this.formData.subsystem : []
+      }
+      return this.formData.subsystem ? [this.formData.subsystem] : []
+    },
+    isParamSubsystemMatched(paramSubsystemName, selectedSubsystems) {
+      const subsystems = selectedSubsystems || this.getSelectedSubsystems()
+      if (!subsystems.length) {
+        return false
+      }
+      return subsystems.some((name) => this.isSubsystemNameMatch(paramSubsystemName, name))
+    },
     showModal() {
       // 重置表单数据
       this.formData = {
-        subsystem: '',
+        subsystem: this.getEmptySubsystemValue(),
         partsName: [],
         department: '',
         currentResponsibleId: '',
@@ -264,7 +310,7 @@ export default {
     closeModal() {
       this.visible = false
       this.formData = {
-        subsystem: '',
+        subsystem: this.getEmptySubsystemValue(),
         partsName: [],
         department: '',
         currentResponsibleId: '',
@@ -289,25 +335,65 @@ export default {
       }
       this.$request(request)
         .asyncThen((resp) => {
-          if (resp && resp.data) {
-            this.subsystemList = resp.data
-          } else {
-            this.subsystemList = []
-          }
+          const apiList = resp && resp.data ? resp.data : []
+          this.filterSubsystemListByTree(apiList)
         })
         .asyncErrorCatch((err) => {
           console.error('加载子系统列表失败:', err)
           this.subsystemList = []
         })
     },
+    // 子系统名称是否匹配（兼容整车参数/发动机基本信息）
+    isSubsystemNameMatch(nameA, nameB) {
+      if (!nameA || !nameB) {
+        return false
+      }
+      if (nameA === nameB) {
+        return true
+      }
+      return (
+        WHOLE_ENGINE_PARAMS_LEGACY_KEYS.includes(nameA) &&
+        WHOLE_ENGINE_PARAMS_LEGACY_KEYS.includes(nameB)
+      )
+    },
+    // 根据左侧树展示的子系统，从接口返回的列表中删减
+    filterSubsystemListByTree(apiList) {
+      const list = Array.isArray(apiList) ? apiList : []
+      const treeNames = (this.treeSubsystemNames || []).filter(Boolean)
+      if (!treeNames.length) {
+        this.subsystemList = list
+        return
+      }
+      const filtered = []
+      list.forEach((apiName) => {
+        const matchedTreeName = treeNames.find((treeName) =>
+          this.isSubsystemNameMatch(apiName, treeName)
+        )
+        if (matchedTreeName && !filtered.includes(matchedTreeName)) {
+          filtered.push(matchedTreeName)
+        }
+      })
+      this.subsystemList = filtered
+    },
+    // 是否匹配当前项目名称（partsName）
+    isProjectPartsNameMatch(item) {
+      if (!this.projectPartsName || !item) {
+        return true
+      }
+      return (item.partsName || '') === this.projectPartsName
+    },
     // 加载所有责任人数据（用于查找现责任人和部门）
     loadAllManagerData() {
+      const params = {
+        pageNumber: 1,
+        pageSize: 9999 // 获取所有数据
+      }
+      if (this.projectPartsName) {
+        params.partsName = this.projectPartsName
+      }
       const request = {
         ...api.GET_MANAGER_DATA,
-        params: {
-          pageNumber: 1,
-          pageSize: 9999 // 获取所有数据
-        },
+        params,
         disableSuccessMsg: true
       }
       this.$request(request)
@@ -323,8 +409,35 @@ export default {
           this.allManagerData = []
         })
     },
+    // 加载所有填写人数据（用于查找现填写人）
+    loadAllFillerData() {
+      const params = {
+        pageNumber: 1,
+        pageSize: 9999
+      }
+      if (this.projectPartsName) {
+        params.partsName = this.projectPartsName
+      }
+      const request = {
+        ...api.GET_FILLER_DATA,
+        params,
+        disableSuccessMsg: true
+      }
+      this.$request(request)
+        .asyncThen((resp) => {
+          if (resp && resp.data) {
+            this.allFillerData = resp.data.result || []
+          } else {
+            this.allFillerData = []
+          }
+        })
+        .asyncErrorCatch((err) => {
+          console.error('加载填写人数据失败:', err)
+          this.allFillerData = []
+        })
+    },
     // 处理子系统选择变化
-    handleSubsystemChange(subsystem) {
+    handleSubsystemChange() {
       // 清空零部件名称、部门和现责任人/现填写人
       this.formData.partsName = []
       this.formData.department = ''
@@ -339,113 +452,54 @@ export default {
       this.availablePartsNames = []
       this.availableDepartments = []
       this.userOptions = []
-      // 根据子系统筛选零部件名称和部门列表
-      if (subsystem) {
-        const currentVersionData = this.versionData[this.currentVersionId] || {}
-        const partsNameSet = new Set()
-        const departmentSet = new Set()
 
-        // 遍历所有零部件名称（partsName）
-        Object.keys(currentVersionData).forEach((partsName) => {
-          const params = currentVersionData[partsName] || []
-          // 遍历该零部件下的所有参数
-          params.forEach((param) => {
-            // 检查参数是否属于选中的子系统
-            if (param.subsystemName === subsystem) {
-              // 如果是批量修改填写人，收集零部件名称（包括 /）
-              if (this.dispatchType === 'update_param') {
-                const paramPartsName = param.partsName || partsName
-                if (paramPartsName) {
-                  partsNameSet.add(paramPartsName)
-                }
-              }
-              // 收集部门名称（两种模式都需要）
-              if (param.department) {
-                departmentSet.add(param.department)
-              }
-            }
-          })
-        })
-
-        // 如果是批量修改填写人，设置零部件名称列表（添加 / 作为默认项）
-        if (this.dispatchType === 'update_param') {
-          const partsNamesArray = Array.from(partsNameSet).sort()
-          // 如果 / 不在列表中，添加到开头
-          if (!partsNamesArray.includes('/')) {
-            partsNamesArray.unshift('/')
-          }
-          this.availablePartsNames = partsNamesArray
-          // 对于批量修改填写人，部门列表应该在选择了零部件名称之后才筛选
-          this.availableDepartments = []
-        } else {
-          // 批量修改责任人：设置部门列表（转换为数组格式）
-          this.availableDepartments = Array.from(departmentSet).map((dept) => ({
-            department: dept
-          }))
-        }
-      } else {
+      const selectedSubsystems = this.getSelectedSubsystems()
+      if (!selectedSubsystems.length) {
         this.availablePartsNames = []
         this.availableDepartments = []
-      }
-    },
-    // 处理零部件名称选择变化（仅用于批量修改填写人）
-    handlePartsNameChange(partsNames) {
-      // partsNames 现在是数组
-      // 清空部门、现填写人和新填写人
-      this.formData.department = ''
-      this.formData.currentFillerId = ''
-      this.formData.currentFillerName = ''
-      this.formData.userId = ''
-      this.formData.userNumber = ''
-      this.formData.username = ''
-      this.availableDepartments = []
-      this.userOptions = []
-      // 根据子系统和零部件名称筛选部门列表
-      if (
-        partsNames &&
-        Array.isArray(partsNames) &&
-        partsNames.length > 0 &&
-        this.formData.subsystem
-      ) {
-        this.filterDepartmentsByPartsName()
-      }
-    },
-    // 根据子系统和零部件名称筛选部门列表（仅用于批量修改填写人）
-    filterDepartmentsByPartsName() {
-      if (
-        !this.formData.subsystem ||
-        !this.formData.partsName ||
-        !Array.isArray(this.formData.partsName) ||
-        this.formData.partsName.length === 0
-      ) {
-        this.availableDepartments = []
         return
       }
 
       const currentVersionData = this.versionData[this.currentVersionId] || {}
+      const partsNameSet = new Set()
       const departmentSet = new Set()
 
-      // 遍历所有零部件名称（partsName）
-      Object.keys(currentVersionData).forEach((dataPartsName) => {
-        const params = currentVersionData[dataPartsName] || []
-        // 遍历该零部件下的所有参数
+      Object.keys(currentVersionData).forEach((partsName) => {
+        const params = currentVersionData[partsName] || []
         params.forEach((param) => {
-          // 检查参数是否属于选中的子系统和任意一个选中的零部件名称
-          const paramPartsName = param.partsName || dataPartsName
-          if (
-            param.subsystemName === this.formData.subsystem &&
-            this.formData.partsName.includes(paramPartsName) &&
-            param.department
-          ) {
+          if (!this.isParamSubsystemMatched(param.subsystemName, selectedSubsystems)) {
+            return
+          }
+          if (this.dispatchType === 'update_param') {
+            const paramPartsName = param.partsName || partsName
+            if (paramPartsName) {
+              partsNameSet.add(paramPartsName)
+            }
+          }
+          if (param.department) {
             departmentSet.add(param.department)
           }
         })
       })
 
-      // 转换为数组格式
-      this.availableDepartments = Array.from(departmentSet).map((dept) => ({
-        department: dept
-      }))
+      if (this.dispatchType === 'update_param') {
+        const partsNamesArray = Array.from(partsNameSet).sort()
+        if (!partsNamesArray.includes('/')) {
+          partsNamesArray.unshift('/')
+        }
+        this.availablePartsNames = partsNamesArray
+      } else {
+        this.availableDepartments = Array.from(departmentSet).map((dept) => ({
+          department: dept
+        }))
+      }
+    },
+    // 处理零部件名称选择变化（仅用于批量修改填写人）
+    handlePartsNameChange() {
+      this.formData.userId = ''
+      this.formData.userNumber = ''
+      this.formData.username = ''
+      this.userOptions = []
     },
     // 处理部门选择变化
     handleDepartmentChange(department) {
@@ -457,7 +511,6 @@ export default {
       this.formData.userNumber = ''
       this.formData.username = ''
       this.userOptions = []
-      // 如果是批量修改填写人，不需要查找现填写人
       if (this.dispatchType === 'update_param') {
         return
       }
@@ -466,7 +519,13 @@ export default {
         const matchedItem = this.allManagerData.find((item) => {
           // 检查子系统是否匹配
           const itemSubsystems = item.subsystem ? item.subsystem.split(',') : []
-          return itemSubsystems.includes(this.formData.subsystem) && item.department === department
+          return (
+            itemSubsystems.some((name) =>
+              this.isSubsystemNameMatch(name.trim(), this.formData.subsystem)
+            ) &&
+            item.department === department &&
+            this.isProjectPartsNameMatch(item)
+          )
         })
         if (matchedItem) {
           // 找到现责任人
@@ -483,8 +542,7 @@ export default {
     },
     // 远程搜索责任人/填写人
     handleRemoteSearch(query) {
-      // 两种模式都需要检查部门
-      if (!this.formData.department) {
+      if (this.dispatchType !== 'update_param' && !this.formData.department) {
         this.userOptions = []
         return
       }
@@ -584,15 +642,6 @@ export default {
     handleSubmit() {
       this.$refs.form.validate((valid) => {
         if (valid) {
-          // 验证必填字段
-          if (!this.formData.subsystem) {
-            this.$message.warning('请选择子系统')
-            return
-          }
-          if (!this.formData.department) {
-            this.$message.warning('请选择部门')
-            return
-          }
           if (!this.formData.userId) {
             const fieldName = this.dispatchType === 'update_param' ? '人员' : '责任人'
             this.$message.warning(`请选择${fieldName}`)
@@ -601,7 +650,11 @@ export default {
 
           // 如果是批量修改填写人，不调用接口，直接触发确认事件
           if (this.dispatchType === 'update_param') {
-            // 验证零部件名称
+            const selectedSubsystems = this.getSelectedSubsystems()
+            if (!selectedSubsystems.length) {
+              this.$message.warning('请至少选择一个子系统')
+              return
+            }
             if (
               !this.formData.partsName ||
               !Array.isArray(this.formData.partsName) ||
@@ -610,14 +663,11 @@ export default {
               this.$message.warning('请至少选择一个零部件名称')
               return
             }
-            // 确保所有必要参数都有值
-            // 如果 userNumber 为空，使用 userId 作为 userNumber（降级处理）
             const confirmData = {
-              subsystem: this.formData.subsystem,
-              partsName: this.formData.partsName, // 现在是数组
-              department: this.formData.department,
-              userId: this.formData.userId, // 确保传递userId
-              userNumber: this.formData.userNumber || this.formData.userId, // 如果没有 userNumber，使用 userId
+              subsystem: selectedSubsystems,
+              partsName: this.formData.partsName,
+              userId: this.formData.userId,
+              userNumber: this.formData.userNumber || this.formData.userId,
               username: this.formData.username || ''
             }
             console.log('批量修改填写人 - 提交数据:', confirmData)
@@ -658,6 +708,7 @@ export default {
                 departmentId: this.getDepartmentIdByDepartment(this.formData.department),
                 department: this.formData.department,
                 subsystem: this.formData.subsystem,
+                partsName: this.projectPartsName || '',
                 userId: this.formData.userId, // 使用 userNumber
                 rowId: this.formData.rowId
               },
@@ -697,6 +748,7 @@ export default {
                 departmentId: this.getDepartmentIdByDepartment(this.formData.department),
                 department: this.formData.department,
                 subsystem: this.formData.subsystem,
+                partsName: this.projectPartsName || '',
                 userId: this.formData.userId
               },
               disableSuccessMsg: true
@@ -764,6 +816,12 @@ export default {
     },
     // 根据部门名称获取部门ID（从部门树中查找）
     getDepartmentIdByDepartment(department) {
+      if (typeof this.resolveDepartmentId === 'function') {
+        const resolvedId = this.resolveDepartmentId(department)
+        if (resolvedId) {
+          return resolvedId
+        }
+      }
       if (!department || !this.departmentTreeData || this.departmentTreeData.length === 0) {
         // 如果部门树没有加载，尝试从 allManagerData 中查找
         if (this.allManagerData && this.allManagerData.length > 0) {
diff --git a/src/custom/apaas-custom-mydemo/custom-page/checkPersonPermission.vue b/src/custom/apaas-custom-mydemo/custom-page/checkPersonPermission.vue
index 335c0f3..b27629c 100644
--- a/src/custom/apaas-custom-mydemo/custom-page/checkPersonPermission.vue
+++ b/src/custom/apaas-custom-mydemo/custom-page/checkPersonPermission.vue
@@ -463,7 +463,7 @@ export default {
       -webkit-box-flex: 1;
       -ms-flex: 1;
       flex: 1;
-      font-size: 12px;
+      font-size: 18px;
     }
   }
 
diff --git a/src/custom/apaas-custom-mydemo/custom-page/engineDetail.vue b/src/custom/apaas-custom-mydemo/custom-page/engineDetail.vue
index c12bd0c..a1e6bad 100644
--- a/src/custom/apaas-custom-mydemo/custom-page/engineDetail.vue
+++ b/src/custom/apaas-custom-mydemo/custom-page/engineDetail.vue
@@ -30,7 +30,7 @@
             size="small"
             :loading="rejecting"
             @click="handleReject"
-            >拒绝</el-button
+            >退回</el-button
           >
           <el-button size="small" @click="handleBatchModifyResponsible">
             {{ dispatchType === 'update_param' ? '批量修改填写人' : '批量修改责任人' }}
@@ -90,7 +90,9 @@
             accept=".xlsx,.xls"
             @change="handleFileChange"
           />
-          <template v-if="!isEditMode && !isEditDeptMode && !isJustCheckMode && (!detail || detail.distributeStatus !== '已完成')">
+          <template
+            v-if="!isEditMode && !isEditDeptMode && !isJustCheckMode && canShowTodoHeaderOperations"
+          >
             <el-button v-if="hasAnyEditPermission()" size="small" @click="handleEdit"
               >编辑</el-button
             >
@@ -99,7 +101,7 @@
               size="small"
               :loading="rejecting"
               @click="handleReject"
-              >拒绝</el-button
+              >退回</el-button
             >
             <el-button
               v-if="shouldShowResendButton"
@@ -188,9 +190,8 @@
           </span>
         </el-tree>
       </div>
-
       <div class="right-content">
-        <!-- 整车参数表格 -->
+        <!-- 发动机基本信息表格 -->
         <template v-for="(sectionData, sectionKey) in wholeEngineParamsData">
           <div v-if="isWholeEngineParamsSelected" class="section" :key="sectionKey">
             <div class="section-title">{{ sectionKey }}</div>
@@ -444,7 +445,7 @@
                   <td class="col-engine-model-name">{{ item.engineModelName || '-' }}</td>
                   <td class="col-subsystem-name">{{ item.subsystemName || '-' }}</td>
                   <td class="col-parameter-type">{{
-                    (item.partsName === '/' ? item.subsystemName : item.partsName) || '-'
+                    (item.parameterType === '/' ? item.parameterType : item.parameterType) || '-'
                   }}</td>
                   <td class="col-parts-name">{{
                     (item.partsName === '/' ? item.subsystemName : item.partsName) || '-'
@@ -554,6 +555,9 @@
       :dispatch-type="dispatchType"
       :version-data="versionData"
       :current-version-id="currentVersionId"
+      :resolve-department-id="resolveDepartmentId"
+      :project-parts-name="treeFirstLevelPartsName"
+      :tree-subsystem-names="treeSubsystemNames"
       @confirm="handleBatchModifyConfirm"
       @refresh-responsible-persons="loadResponsiblePersons"
     />
@@ -683,7 +687,11 @@
 <script>
 import api from '@/api'
 import BatchModifyResponsibleModal from './batch-modify-responsible-modal.vue'
-import { getUserId } from '@/utils'
+import { getUserId, getUserName } from '@/utils'
+
+/** 整车参数展示名称（接口可能仍返回「整车参数」） */
+const WHOLE_ENGINE_PARAMS_NAME = '发动机基本信息'
+const WHOLE_ENGINE_PARAMS_LEGACY_KEYS = ['整车参数', WHOLE_ENGINE_PARAMS_NAME]
 
 export default {
   name: 'EngineDetail',
@@ -738,6 +746,11 @@ export default {
       type: Boolean,
       default: false
     },
+    // 从我的已办进入
+    fromDone: {
+      type: Boolean,
+      default: false
+    },
     // 机型详情信息（包含 modelName 和 projectNumber）
     detail: {
       type: Object,
@@ -758,7 +771,8 @@ export default {
       dispatchOriginalData: null, // 保存分发模式下的原始数据，用于比较责任人变化
       savedCheckedKeys: [], // 保存编辑前的选中节点
       savedDefaultExpandedKeys: [], // 保存编辑前的展开节点
-      departmentList: [], // 部门列表
+      departmentList: [], // 部门列表（扁平）
+      departmentTreeData: [], // 部门树（用于解析 departmentId）
       deptLoading: false, // 部门搜索loading状态
       deptSearchText: '', // 部门搜索文本
       // 批量修改部门相关
@@ -785,6 +799,7 @@ export default {
       fillerPersons: [], // 填写人列表（从 GET_FILLER_DATA 接口获取）
       fillerUserOptions: {}, // 填写人选项（按行存储，key: rowId, value: [userOptions]）
       fillerUserLoading: false, // 填写人搜索loading状态
+      dispatchParamDraftCache: {}, // 分发模式下暂存用户修改的责任人/填写人，避免隐藏子系统后丢失
       // 竞品发动机：修改全部填写人/责任人（只选人）
       replaceAllPersonDialogVisible: false,
       replaceAllPersonSubmitting: false,
@@ -921,6 +936,86 @@ export default {
         !this.isEditDeptMode
       )
     },
+    // 待办「编制」环节且当前处理人为登录用户时，参数树走填写人接口（与 selectParamListAndModelForFilledBy 一致）
+    useFilledByTableDetailApi() {
+      if (this.filledBy) {
+        return true
+      }
+      if (!this.fromTodo || !this.detail) {
+        return false
+      }
+      const node = String(this.detail.currentNode || '').trim()
+      if (node !== '编制') {
+        return false
+      }
+      const myId = String(getUserId() || '')
+      const ownerId =
+        this.detail.ownerId != null && this.detail.ownerId !== ''
+          ? String(this.detail.ownerId)
+          : ''
+      if (myId && ownerId && ownerId === myId) {
+        return true
+      }
+      const proc = String(this.detail.currentProcessor || '').trim()
+      if (!proc) {
+        return false
+      }
+      const u = this.userInfo
+      if (u) {
+        const n1 = String(u.userName || '').trim()
+        const n2 = String(u.username || '').trim()
+        if ((n1 && n1 === proc) || (n2 && n2 === proc)) {
+          return true
+        }
+      }
+      const stored = getUserName()
+      if (stored && String(stored).trim() === proc) {
+        return true
+      }
+      return false
+    },
+    // 责任人分发填写人（管理员分发填写人）时走专用参数树接口
+    useResponsiblePersonTableDetailApi() {
+      return this.isDispatchMode && this.dispatchType === 'update_param'
+    },
+    // 参数树/机型详情接口：已办走历史接口，责任人分发填写人走 ForResponsiblePerson，待办填写人走 ForFilledBy，其余走默认
+    tableDetailApi() {
+      if (this.fromDone) {
+        return api.GET_ENGINE_TABLE_DETAIL_FOR_FILLED_BY_HISTORY
+      }
+      if (this.useResponsiblePersonTableDetailApi) {
+        return api.GET_ENGINE_TABLE_DETAIL_FOR_RESPONSIBLE_PERSON
+      }
+      if (this.useFilledByTableDetailApi) {
+        return api.GET_ENGINE_TABLE_DETAIL_FOR_FILLED_BY
+      }
+      return api.GET_ENGINE_TABLE_DETAIL
+    },
+    // 左侧参数树第一级节点名称，用于 GET_MANAGER_DATA 的 partsName 参数及匹配
+    treeFirstLevelPartsName() {
+      const label = this.getRootLabel()
+      if (!label || label === '机型详情') {
+        return ''
+      }
+      return label
+    },
+    // 左侧参数树第二级节点（子系统）名称，与树展示保持一致
+    treeSubsystemNames() {
+      const names = []
+      if (!this.treeData || !this.treeData.length) {
+        return names
+      }
+      this.treeData.forEach((firstLevelNode) => {
+        const children = firstLevelNode.children || []
+        children.forEach((secondLevelNode) => {
+          const label = secondLevelNode && secondLevelNode.label
+          if (label && !names.includes(label)) {
+            names.push(label)
+          }
+        })
+      })
+      return names
+    },
     // 判断是否是查看模式（justCheck）
     isJustCheckMode() {
       return this.dispatchType === 'justCheck'
@@ -963,7 +1058,7 @@ export default {
       // 检查是否有选中的节点是"整车参数"
       return this.checkedKeys.some((nodeId) => {
         const nodeInfo = this.nodeMap[nodeId]
-        return nodeInfo && nodeInfo.isWholeEngineParams && nodeInfo.label === '整车参数'
+        return nodeInfo && nodeInfo.isWholeEngineParams
       })
     },
     // 将整车参数转换为参数格式
@@ -988,16 +1083,16 @@ export default {
         }
         return {
           parameterName: parameterName,
-          partsName: '整车参数',
+          partsName: WHOLE_ENGINE_PARAMS_NAME,
           parameterValue: parameterValue,
           unit: '-',
           department: '平台部',
-          subsystemName: '整车参数'
+          subsystemName: WHOLE_ENGINE_PARAMS_NAME
         }
       })
       // 返回按参数类型分组的格式，与其他子系统参数保持一致
       return {
-        整车参数: params
+        [WHOLE_ENGINE_PARAMS_NAME]: params
       }
     },
     // 竞品发动机入口判断：整机参数中是否存在“生产日期”参数
@@ -1070,56 +1165,65 @@ export default {
       // 或者如果 canResend 为 true，也显示
       return this.canResend || false
     },
-    // 判断是否应该显示"拒绝"按钮
+    // 是否为填写人待办入口（数据维护 / 传递 filledBy）
+    isFillerTodoEntry() {
+      if (this.filledBy) {
+        return true
+      }
+      return (
+        this.fromTodo &&
+        this.detail &&
+        String(this.detail.dataType || '') === '数据维护' &&
+        !this.isDispatchMode
+      )
+    },
+    // 非填写人待办是否展示头部操作区（编辑、退回等）
+    canShowTodoHeaderOperations() {
+      if (this.isFillerTodoEntry) {
+        return true
+      }
+      return !this.detail || this.detail.distributeStatus !== '已完成'
+    },
+    // 判断是否应该显示"退回"按钮（责任人、填写人待办均可用）
     shouldShowRejectButton() {
-      // 必须有 todoId 才显示拒绝按钮
-      if (!this.todoId) {
+      const todoId = this.todoId || this.detail?.todoId || this.detail?.id
+      if (!todoId) {
         return false
       }
 
-      // 检查是否存在已分发的数据
+      // 填写人待办：已分发给自己填写仍允许退回
+      if (this.isFillerTodoEntry) {
+        return true
+      }
+
       const currentData = this.versionData[this.currentVersionId] || {}
       let hasDistributedData = false
 
-      // 遍历所有数据，检查是否有已分发的项
       Object.keys(currentData).forEach((partsName) => {
         const params = currentData[partsName] || []
         params.forEach((param) => {
           if (this.isDispatchMode) {
-            // 分发模式下，根据分发类型检查
             if (this.dispatchType === 'update_param') {
-              // 分发填写人模式：检查 isDistributedFilled
               if (param.isDistributedFilled === 1) {
                 hasDistributedData = true
               }
-            } else {
-              // 分发责任人模式：检查 isDistributedRes
-              if (param.isDistributedRes === 1) {
-                hasDistributedData = true
-              }
-            }
-          } else {
-            // 非分发模式下，检查是否有任何已分发的项
-            if (param.isDistributedRes === 1 || param.isDistributedFilled === 1) {
+            } else if (param.isDistributedRes === 1) {
               hasDistributedData = true
             }
+          } else if (param.isDistributedRes === 1 || param.isDistributedFilled === 1) {
+            hasDistributedData = true
           }
         })
       })
 
-      // 如果存在已分发的数据，不显示拒绝按钮
       if (hasDistributedData) {
         return false
       }
 
-      // 分发模式下显示拒绝按钮
+      // 分发责任人 / 管理员分发填写人
       if (this.isDispatchMode) {
         return true
       }
-      // 非分发模式下，如果是填写参数页面（有 filledBy），显示拒绝按钮
-      if (!this.isDispatchMode && this.filledBy) {
-        return true
-      }
       return false
     },
     // 发起审批状态下的创建人
@@ -1203,6 +1307,13 @@ export default {
       // 当退出分发模式时，清空原始数据
       if (!newVal) {
         this.dispatchOriginalData = null
+        this.dispatchParamDraftCache = {}
+      }
+    },
+    treeFirstLevelPartsName(newVal, oldVal) {
+      if (newVal && newVal !== oldVal && !this.isCompetitiveEngineEntry) {
+        this.loadResponsiblePersons()
+        this.loadFillerPersons()
       }
     }
   },
@@ -1444,7 +1555,6 @@ export default {
         if (!Array.isArray(permissionData)) {
           return false
         }
-
         // 查找匹配的权限：permissionPath 中间部分匹配子系统名称
         // permissionPath 格式：玉柴发动机数据/点火子系统/火花塞
         const matchedPermissions = permissionData.filter((perm) => {
@@ -1489,6 +1599,10 @@ export default {
     // subsystemName: 子系统名称
     // partsName: 零部件名称
     hasParameterEditPermission(parameterName, subsystemName = null, partsName = null) {
+      // 与顶部「编辑」按钮一致：具备该权限则整表参数值均可编辑，不再按行拆细粒度
+      if (this.hasAnyEditPermission()) {
+        return true
+      }
       // 第一种：isAdmin 值为 1 的，全部可以编辑
       if (this.hasAdminPermission()) {
         return true
@@ -1621,6 +1735,14 @@ export default {
     },
     // 检查是否有任意子系统的编辑权限（与参数编辑权限使用相同的逻辑）
     hasAnyEditPermission() {
+      // 从待办进入且类型为「数据维护」：直接视为具备编辑权限（用于展示编辑等按钮）
+      if (
+        this.fromTodo &&
+        this.detail &&
+        String(this.detail.dataType || '') === '数据维护'
+      ) {
+        return true
+      }
       // 第一种：isAdmin 值为 1 的，全部可以编辑
       if (this.hasAdminPermission()) {
         return true
@@ -1666,32 +1788,71 @@ export default {
         return false
       }
     },
+    // 责任人是否匹配左侧树第一级（partsName）
+    isResponsiblePersonProjectMatch(person) {
+      const treePartsName = this.treeFirstLevelPartsName
+      if (!treePartsName || !person) {
+        return true
+      }
+      return (person.partsName || '') === treePartsName
+    },
+    // 根据子系统、部门匹配责任人
+    isResponsiblePersonSubsystemDeptMatch(person, subsystemName, department) {
+      if (!person) {
+        return false
+      }
+      let subsystemMatch = false
+      if (subsystemName && person.subsystem) {
+        const personSubsystems = person.subsystem.split(',').map((s) => s.trim())
+        subsystemMatch = personSubsystems.includes(subsystemName)
+      } else if (!subsystemName && !person.subsystem) {
+        subsystemMatch = true
+      }
+
+      let departmentMatch = false
+      if (department && person.department) {
+        const normalizedParamDept = department.replace(/·/g, '-')
+        const normalizedPersonDept = person.department.replace(/·/g, '-')
+        departmentMatch =
+          normalizedPersonDept === normalizedParamDept ||
+          normalizedPersonDept.startsWith(normalizedParamDept + '-')
+      } else if (!department && !person.department) {
+        departmentMatch = true
+      }
+
+      return subsystemMatch && departmentMatch
+    },
     // 加载责任人列表（从 GET_MANAGER_DATA 接口获取）
     loadResponsiblePersons() {
-      if(this.isCompetitiveEngineEntry) {
-        
-      }else{
-        const request = {
+      if (this.isCompetitiveEngineEntry) {
+        this.responsiblePersons = []
+        return Promise.resolve()
+      }
+      const params = {
+        pageNumber: 1,
+        pageSize: 9999 // 获取所有数据
+      }
+      const treePartsName = this.treeFirstLevelPartsName
+      if (treePartsName) {
+        params.partsName = treePartsName
+      }
+      const request = {
         ...api.GET_MANAGER_DATA,
-        params: {
-          pageNumber: 1,
-          pageSize: 9999 // 获取所有数据
-        },
+        params,
         disableSuccessMsg: true
       }
       return this.$request(request)
         .asyncThen((resp) => {
-          // 处理返回数据，支持不同的数据结构
           if (resp && resp.data) {
             const result = resp.data.result || []
-            // 处理返回数据，转换为统一格式
             this.responsiblePersons = result.map((item) => ({
-              id: item.userId || item.id, // 优先使用 userId
+              id: item.userId || item.id,
               userId: item.userId || item.userNumber || '',
               userNumber: item.userNumber || item.userId || '',
               userName: item.username || '',
               department: item.department || '',
-              subsystem: item.subsystem || ''
+              subsystem: item.subsystem || '',
+              partsName: item.partsName || ''
             }))
           } else {
             this.responsiblePersons = []
@@ -1701,17 +1862,28 @@ export default {
           console.error('加载责任人列表失败:', err)
           this.responsiblePersons = []
         })
+    },
+    // 填写人是否匹配左侧树第一级（项目名称 / partsName）
+    isFillerPersonProjectMatch(person) {
+      const treePartsName = this.treeFirstLevelPartsName
+      if (!treePartsName || !person) {
+        return true
       }
-      
+      return (person.partsName || '') === treePartsName
     },
     // 加载填写人列表（从 GET_FILLER_DATA 接口获取）
     loadFillerPersons() {
+      const params = {
+        pageNumber: 1,
+        pageSize: 9999 // 获取所有数据
+      }
+      const treePartsName = this.treeFirstLevelPartsName
+      if (treePartsName) {
+        params.partsName = treePartsName
+      }
       const request = {
         ...api.GET_FILLER_DATA,
-        params: {
-          pageNumber: 1,
-          pageSize: 9999 // 获取所有数据
-        },
+        params,
         disableSuccessMsg: true
       }
       this.$request(request)
@@ -1721,12 +1893,13 @@ export default {
             const result = resp.data.result || []
             // 处理返回数据，转换为统一格式
             this.fillerPersons = result.map((item) => ({
-              id: item.userId || item.userNumber || '', // 优先使用 userId
+              id: item.userId || item.userNumber || '',
               userId: item.userId || item.userNumber || '',
               userNumber: item.userNumber || item.userId || '',
               userName: item.username || '',
               department: item.department || '',
-              subsystem: item.subsystem || ''
+              subsystem: item.subsystem || '',
+              partsName: item.partsName || ''
             }))
           } else {
             this.fillerPersons = []
@@ -1739,15 +1912,16 @@ export default {
     },
     // 根据部门和子系统过滤责任人列表
     getFilteredResponsiblePersons(department, subsystem) {
-      if (!department && !subsystem) {
-        return this.responsiblePersons
-      }
       return this.responsiblePersons.filter((person) => {
-        // 如果提供了部门，必须匹配
+        if (!this.isResponsiblePersonProjectMatch(person)) {
+          return false
+        }
+        if (!department && !subsystem) {
+          return true
+        }
         if (department && person.department !== department) {
           return false
         }
-        // 如果提供了子系统，必须匹配（subsystem 可能是逗号分隔的字符串）
         if (subsystem) {
           const personSubsystems = person.subsystem ? person.subsystem.split(',') : []
           if (!personSubsystems.includes(subsystem)) {
@@ -1759,15 +1933,16 @@ export default {
     },
     // 根据部门和子系统过滤填写人列表（保留以兼容旧代码，但不再使用）
     getFilteredFillerPersons(department, subsystem) {
-      if (!department && !subsystem) {
-        return this.fillerPersons
-      }
       return this.fillerPersons.filter((person) => {
-        // 如果提供了部门，必须匹配
+        if (!this.isFillerPersonProjectMatch(person)) {
+          return false
+        }
+        if (!department && !subsystem) {
+          return true
+        }
         if (department && person.department !== department) {
           return false
         }
-        // 如果提供了子系统，必须匹配（subsystem 可能是逗号分隔的字符串）
         if (subsystem) {
           const personSubsystems = person.subsystem ? person.subsystem.split(',') : []
           if (!personSubsystems.includes(subsystem)) {
@@ -1782,6 +1957,101 @@ export default {
       const rowId = row.id || `${row.subsystemName}-${row.parameterName}`
       return this.fillerUserOptions[rowId] || []
     },
+    // 分发模式参数暂存 key
+    getParamDraftKey(param) {
+      if (!param) {
+        return ''
+      }
+      if (param.id != null && param.id !== '') {
+        return String(param.id)
+      }
+      return `${param.subsystemName || ''}-${param.parameterName || ''}`
+    },
+    // 将填写人选项写入 fillerUserOptions，供 el-select 反显
+    restoreFillerUserOption(rowId, fillerOption) {
+      if (!rowId || !fillerOption || !fillerOption.userId) {
+        return
+      }
+      if (!this.fillerUserOptions[rowId]) {
+        this.$set(this.fillerUserOptions, rowId, [])
+      }
+      const existingIndex = this.fillerUserOptions[rowId].findIndex(
+        (opt) => opt.userId === fillerOption.userId
+      )
+      if (existingIndex >= 0) {
+        this.$set(this.fillerUserOptions[rowId], existingIndex, fillerOption)
+      } else {
+        this.fillerUserOptions[rowId].push(fillerOption)
+      }
+    },
+    // 保存分发模式下用户对责任人/填写人的修改
+    saveDispatchParamDraft(param) {
+      if (!this.isDispatchMode || !param) {
+        return
+      }
+      const key = this.getParamDraftKey(param)
+      if (!key) {
+        return
+      }
+      const draft = { ...(this.dispatchParamDraftCache[key] || {}) }
+      if (this.dispatchType === 'update_param') {
+        if (param.filledByUserId || param.filledBy) {
+          draft.filledBy = param.filledBy
+          draft.filledByUserId = param.filledByUserId
+          draft.filledByName = param.filledByName || ''
+          const rowId = key
+          const selectedOption = (this.fillerUserOptions[rowId] || []).find(
+            (opt) => opt.userId === param.filledByUserId
+          )
+          if (selectedOption) {
+            draft.fillerOption = { ...selectedOption }
+          } else if (draft.filledByName) {
+            draft.fillerOption = {
+              userId: param.filledByUserId,
+              username: draft.filledByName,
+              userNumber: param.filledByUserId
+            }
+          }
+        }
+      } else if (param.resPersonId || param.owner) {
+        draft.resPersonId = param.resPersonId
+        draft.owner = param.owner
+      }
+      if (Object.keys(draft).length > 0) {
+        this.$set(this.dispatchParamDraftCache, key, draft)
+      }
+    },
+    // 合并暂存数据到参数行，并恢复填写人下拉选项
+    applyDispatchParamDraft(paramData) {
+      if (!this.isDispatchMode || !paramData) {
+        return paramData
+      }
+      const key = this.getParamDraftKey(paramData)
+      const draft = this.dispatchParamDraftCache[key]
+      if (!draft) {
+        return paramData
+      }
+      const merged = { ...paramData }
+      if (draft.resPersonId !== undefined) {
+        merged.resPersonId = draft.resPersonId
+      }
+      if (draft.owner !== undefined) {
+        merged.owner = draft.owner
+      }
+      if (draft.filledBy !== undefined) {
+        merged.filledBy = draft.filledBy
+      }
+      if (draft.filledByUserId !== undefined) {
+        merged.filledByUserId = draft.filledByUserId
+      }
+      if (draft.filledByName !== undefined) {
+        merged.filledByName = draft.filledByName
+      }
+      if (draft.fillerOption && merged.filledByUserId) {
+        this.restoreFillerUserOption(key, draft.fillerOption)
+      }
+      return merged
+    },
     // 远程搜索填写人
     handleFillerRemoteSearch(query, row) {
       const rowId = row.id || `${row.subsystemName}-${row.parameterName}`
@@ -1871,13 +2141,26 @@ export default {
       // selectedUserId 是选中的 userId（因为 el-option 的 value 是 person.userId）
       // v-model 已经自动更新了 row.filledByUserId（存储的是 userId）
       // filledBy 字段也使用 userId（用于提交）
+      const rowId = row.id || `${row.subsystemName}-${row.parameterName}`
       if (selectedUserId) {
-        // filledBy 字段存储 userId（用于提交）
         row.filledBy = selectedUserId
+        const selectedOption = (this.fillerUserOptions[rowId] || []).find(
+          (opt) => opt.userId === selectedUserId
+        )
+        if (selectedOption) {
+          row.filledByName = selectedOption.username || ''
+        }
       } else {
         row.filledBy = ''
         row.filledByUserId = ''
+        row.filledByName = ''
+        const key = this.getParamDraftKey(row)
+        if (key && this.dispatchParamDraftCache[key]) {
+          this.$delete(this.dispatchParamDraftCache, key)
+        }
+        return
       }
+      this.saveDispatchParamDraft(row)
     },
     // 根据部门过滤人员列表（保留以兼容旧代码）
     getFilteredPersonsByDepartment(department) {
@@ -2437,10 +2720,11 @@ export default {
             const originalDept = originalParam.department || ''
 
             if (currentDept !== originalDept) {
-              // 有修改，添加到 deptChangeData
+              const departmentId = this.resolveDepartmentId(currentDept)
               deptChangeData.push({
                 paramId: currentParam.id || currentParam.parameterId,
-                department: currentDept
+                department: currentDept,
+                departmentId: departmentId || ''
               })
             }
           }
@@ -2526,11 +2810,13 @@ export default {
           if (resp && resp.data) {
             result = Array.isArray(resp.data) ? resp.data : (resp.data.data || [])
           }
+          this.departmentTreeData = result
           // 格式化数据，确保每个节点都有 id 和 name 字段
           this.departmentList = this.formatDepartmentListData(result)
         })
         .asyncErrorCatch((err) => {
           console.error('加载部门列表失败:', err)
+          this.departmentTreeData = []
           this.departmentList = []
         })
     },
@@ -2664,22 +2950,22 @@ export default {
             return
           }
           
-          // 获取当前版本数据
+          const departmentId = this.resolveDepartmentId(department)
           const currentData = this.versionData[this.currentVersionId] || {}
           let updateCount = 0
-          
-          // 遍历所有零部件名称
+
           Object.keys(currentData).forEach((dataPartsName) => {
             const params = currentData[dataPartsName] || []
             params.forEach((param) => {
               const paramPartsName = param.partsName || dataPartsName
-              // 检查是否匹配选中的子系统和零部件名称
               if (
                 param.subsystemName === subsystem &&
                 partsName.includes(paramPartsName)
               ) {
-                // 更新部门
                 this.$set(param, 'department', department)
+                if (departmentId) {
+                  this.$set(param, 'departmentId', departmentId)
+                }
                 updateCount++
               }
             })
@@ -2855,19 +3141,8 @@ export default {
               this.$set(currentData[dataPartsName], index, param)
 
               const rowId = param.id || `${param.subsystemName}-${param.parameterName}`
-              if (!this.fillerUserOptions[rowId]) {
-                this.$set(this.fillerUserOptions, rowId, [])
-              }
-              const existingOption = this.fillerUserOptions[rowId].find(
-                (opt) => opt.userId === userId || opt.userNumber === userNumber
-              )
-              if (!existingOption) {
-                this.fillerUserOptions[rowId].push(fillerOption)
-              } else {
-                existingOption.userId = userId
-                existingOption.userNumber = userNumber || userId
-                existingOption.username = username || existingOption.username || ''
-              }
+              this.restoreFillerUserOption(rowId, fillerOption)
+              this.saveDispatchParamDraft(param)
 
               updateCount++
             })
@@ -2882,6 +3157,7 @@ export default {
               param.resPersonId = userId
               param.owner = username || param.owner || ''
               this.$set(currentData[dataPartsName], index, param)
+              this.saveDispatchParamDraft(param)
               updateCount++
             })
           })
@@ -2910,24 +3186,17 @@ export default {
 
       // 如果是批量修改填写人，直接更新页面数据
       if (this.dispatchType === 'update_param') {
-        const { subsystem, partsName, department, userId, userNumber, username } = change
-        console.log(
-          change,
-          'change',
-          subsystem,
-          partsName,
-          department,
-          userId,
-          userNumber,
-          username
-        )
-        // partsName 现在是数组
+        const { subsystem, partsName, userId, userNumber, username } = change
+        const selectedSubsystems = Array.isArray(subsystem)
+          ? subsystem
+          : subsystem
+            ? [subsystem]
+            : []
         if (
-          !subsystem ||
+          !selectedSubsystems.length ||
           !partsName ||
           !Array.isArray(partsName) ||
           partsName.length === 0 ||
-          !department ||
           !userId
         ) {
           this.$message({
@@ -2941,57 +3210,37 @@ export default {
         const currentData = this.versionData[this.currentVersionId] || {}
         let updateCount = 0
 
-        // 构建填写人选项信息（用于填充 fillerUserOptions）
-        // 如果 userNumber 为空，使用 userId 作为 userNumber（降级处理）
         const fillerOption = {
           userId: userId,
           username: username || '',
           userNumber: userNumber || userId
         }
 
-        // 遍历所有零部件名称（partsName）
         Object.keys(currentData).forEach((dataPartsName) => {
           const params = currentData[dataPartsName] || []
-          // 遍历该零部件下的所有参数
           params.forEach((param, index) => {
-            // 获取参数的零部件名称（优先使用param.partsName，否则使用dataPartsName）
             const paramPartsName = param.partsName || dataPartsName
-
-            // 检查参数是否匹配子系统、零部件名称（数组）和部门
-            // 当 partsName 数组中包含 '/' 时，匹配所有子系统为选中子系统且 partsName 为 '/' 的参数
-            // 当 partsName 数组中包含其他值时，匹配对应的零部件名称
+            const subsystemMatched = selectedSubsystems.some((name) =>
+              this.isSubsystemNameMatch(param.subsystemName, name)
+            )
             // 已分发的填写人不能修改（isDistributedFilled === 1）
             if (
-              param.subsystemName === subsystem &&
+              subsystemMatched &&
               partsName.includes(paramPartsName) &&
-              param.department === department &&
               param.isDistributedFilled !== 1
             ) {
               // 更新填写人信息
               param.filledBy = userId // 填写人ID（userId，用于提交）
               param.filledByUserId = userId // 填写人userId（用于 el-select 的 v-model）
+              param.filledByName = username || param.filledByName || ''
 
               // 使用 Vue.set 确保响应式更新
               this.$set(currentData[dataPartsName], index, param)
 
               // 更新该行的填写人选项，确保选择框能正确显示
               const rowId = param.id || `${param.subsystemName}-${param.parameterName}`
-              if (!this.fillerUserOptions[rowId]) {
-                this.$set(this.fillerUserOptions, rowId, [])
-              }
-              // 检查是否已存在该填写人选项
-              const existingOption = this.fillerUserOptions[rowId].find(
-                (opt) => opt.userId === userId || opt.userNumber === userNumber
-              )
-              if (!existingOption) {
-                // 如果不存在，添加到选项中
-                this.fillerUserOptions[rowId].push(fillerOption)
-              } else {
-                // 如果已存在，更新信息
-                existingOption.userId = userId
-                existingOption.userNumber = userNumber || userId
-                existingOption.username = username || existingOption.username || ''
-              }
+              this.restoreFillerUserOption(rowId, fillerOption)
+              this.saveDispatchParamDraft(param)
 
               updateCount++
             }
@@ -3034,6 +3283,9 @@ export default {
         if (!ownerName && Array.isArray(this.responsiblePersons) && this.responsiblePersons.length > 0) {
           const newResponsiblePersonId = change.newResponsiblePersonId
           const matchedPerson = this.responsiblePersons.find((p) => {
+            if (!this.isResponsiblePersonProjectMatch(p)) {
+              return false
+            }
             const pid = p.userId || p.id || p.userNumber
             return (
               pid === userId ||
@@ -3061,6 +3313,7 @@ export default {
                 owner: ownerName || param.owner || ''
               }
               this.$set(currentData[partsName], index, newParam)
+              this.saveDispatchParamDraft(newParam)
               updatedCount++
             }
           })
@@ -3225,6 +3478,29 @@ export default {
           this.dispatchLoading = false
         })
     },
+    // 待办进入时，为 selectParamListAndModel 等参数树接口附加 approvalId
+    appendApprovalIdForTodoRequest(params = {}) {
+      const requestParams = { ...params }
+      if (this.fromTodo) {
+        const approvalId = this.todoId || this.detail?.todoId || this.detail?.approvalId
+        if (approvalId) {
+          requestParams.approvalId = approvalId
+        }
+      }
+      return requestParams
+    },
+    // 构建参数树/机型详情接口请求参数
+    buildTableDetailRequestParams(extra = {}) {
+      const params = {
+        modelID: this.detail.id,
+        parameterVersion: this.currentVersionId || 1,
+        ...extra
+      }
+      if (this.useResponsiblePersonTableDetailApi) {
+        params.userID = this.responsiblePersonId || getUserId()
+      }
+      return this.appendApprovalIdForTodoRequest(params)
+    },
     // 加载机型详情信息
     loadEngineDetailInfo() {
       // if (!this.currentEngineModelID) {
@@ -3233,21 +3509,19 @@ export default {
       // 这里可以根据实际接口获取机型详情信息
       // 暂时使用 props 中的 detail 或 model
       console.log(this.detail, 'this.detail', this.detail.id)
-      const tableDetailApi = this.filledBy
-        ? api.GET_ENGINE_TABLE_DETAIL_FOR_FILLED_BY
-        : api.GET_ENGINE_TABLE_DETAIL
       const request = {
-        ...tableDetailApi,
-        params: {
-          modelID: this.detail.id,
-          parameterVersion: this.currentVersionId || 1 // 默认版本为1
-        },
+        ...this.tableDetailApi,
+        params: this.buildTableDetailRequestParams(),
         disableSuccessMsg: true
       }
       this.$request(request)
         .asyncThen((resp) => {
           if (resp && resp.data) {
             this.engineDetailInfo = resp.data
+            if (!this.isCompetitiveEngineEntry && this.treeFirstLevelPartsName) {
+              this.loadResponsiblePersons()
+              this.loadFillerPersons()
+            }
           }
         })
         .asyncErrorCatch((err) => {
@@ -3265,16 +3539,11 @@ export default {
         return
       }
       this.isTreeAndContentLoading = true
-      const tableDetailApi = this.filledBy
-        ? api.GET_ENGINE_TABLE_DETAIL_FOR_FILLED_BY
-        : api.GET_ENGINE_TABLE_DETAIL
       const request = {
-        ...tableDetailApi,
-        params: {
-          modelID: this.detail.id,
-          userID: getUserId(),
-          parameterVersion: this.currentVersionId || 1 // 默认版本为1
-        },
+        ...this.tableDetailApi,
+        params: this.buildTableDetailRequestParams({
+          userID: getUserId()
+        }),
         disableSuccessMsg: true
       }
       this.$request(request)
@@ -3287,6 +3556,10 @@ export default {
             // 保存"整车参数"的原始第三级数据
             this.saveWholeEngineParamsData(data)
             this.treeData = this.convertThreeLevelTree(data)
+            if (!this.isCompetitiveEngineEntry && this.treeFirstLevelPartsName) {
+              this.loadResponsiblePersons()
+              this.loadFillerPersons()
+            }
             // 设置默认展开：展开一级和二级节点，收起第三级节点
             const firstLevelKeys = this.getFirstLevelNodeKeys(this.treeData)
             const secondLevelKeys = this.getSecondLevelNodeKeys(this.treeData)
@@ -3358,16 +3631,42 @@ export default {
       Object.keys(data).forEach((firstLevelKey) => {
         const secondLevelData = data[firstLevelKey]
         if (typeof secondLevelData === 'object' && !Array.isArray(secondLevelData)) {
-          // 查找"整车参数"的第三级数据
-          if (secondLevelData['整车参数'] && Array.isArray(secondLevelData['整车参数'])) {
-            // 保存"整车参数"的第三级数据（数组格式）
-            this.wholeEngineParamsRawData = secondLevelData['整车参数'].filter(
+          const rawParams = this.getWholeEngineParamsArrayFromSecondLevel(secondLevelData)
+          if (rawParams) {
+            this.wholeEngineParamsRawData = rawParams.filter(
               (paramName) => paramName && paramName !== '/'
             )
           }
         }
       })
     },
+    isWholeEngineSubsystemName(name) {
+      return WHOLE_ENGINE_PARAMS_LEGACY_KEYS.includes(name)
+    },
+    isSubsystemNameMatch(nameA, nameB) {
+      if (!nameA || !nameB) {
+        return false
+      }
+      if (nameA === nameB) {
+        return true
+      }
+      return (
+        WHOLE_ENGINE_PARAMS_LEGACY_KEYS.includes(nameA) &&
+        WHOLE_ENGINE_PARAMS_LEGACY_KEYS.includes(nameB)
+      )
+    },
+    getWholeEngineParamsArrayFromSecondLevel(secondLevelData) {
+      if (!secondLevelData || typeof secondLevelData !== 'object') {
+        return null
+      }
+      for (let i = 0; i < WHOLE_ENGINE_PARAMS_LEGACY_KEYS.length; i++) {
+        const key = WHOLE_ENGINE_PARAMS_LEGACY_KEYS[i]
+        if (Array.isArray(secondLevelData[key])) {
+          return secondLevelData[key]
+        }
+      }
+      return null
+    },
     // 将三级树结构转换为树形数据
     // 输入格式: { "第一级key": { "第二级子系统名": ["第三级参数名1", "第三级参数名2", ...] } }
     convertThreeLevelTree(data) {
@@ -3396,7 +3695,10 @@ export default {
           // 遍历第二级（子系统名称，如 "整车参数"、"起动子系统"）
           Object.keys(secondLevelData).forEach((subsystemName, secondIdx) => {
             const secondLevelId = `${firstLevelId}-${secondIdx}`
-            const isWholeEngineParams = subsystemName === '整车参数'
+            const isWholeEngineParams = this.isWholeEngineSubsystemName(subsystemName)
+            const displaySubsystemName = isWholeEngineParams
+              ? WHOLE_ENGINE_PARAMS_NAME
+              : subsystemName
 
             const thirdLevelParams = secondLevelData[subsystemName] || []
             const thirdLevelChildren = []
@@ -3420,7 +3722,7 @@ export default {
                     // 保存第三级节点映射
                     this.nodeMap[thirdLevelId] = {
                       label: paramName,
-                      parentLabel: subsystemName,
+                      parentLabel: displaySubsystemName,
                       isParent: false
                     }
                   }
@@ -3430,7 +3732,7 @@ export default {
 
             const secondLevelNode = {
               id: secondLevelId,
-              label: subsystemName,
+              label: displaySubsystemName,
               tip: '',
               children: thirdLevelChildren
             }
@@ -3439,10 +3741,10 @@ export default {
 
             // 保存第二级节点映射
             this.nodeMap[secondLevelId] = {
-              label: subsystemName,
+              label: displaySubsystemName,
               parentLabel: firstLevelKey,
               isParent: true,
-              isWholeEngineParams: isWholeEngineParams // 标记"整车参数"节点
+              isWholeEngineParams: isWholeEngineParams
             }
           })
         }
@@ -3783,7 +4085,7 @@ export default {
           // 如果是第三级节点（参数名称），添加父级（子系统）和参数名称
           // 注意：第三级节点的 parentLabel 是子系统名称
           // 检查父级是否是"整车参数"
-          if (nodeInfo.parentLabel === '整车参数') {
+          if (this.isWholeEngineSubsystemName(nodeInfo.parentLabel)) {
             return
           }
           if (nodeInfo.parentLabel && !processedSubsystems.has(nodeInfo.parentLabel)) {
@@ -3817,13 +4119,18 @@ export default {
       //   return
       // }
 
+      const approvalId = this.todoId || this.detail?.todoId || this.detail?.approvalId
+      const flowId = this.flowId || this.detail?.flowId
+
       // 构建请求配置，使用 $axios 直接请求以支持 blob 响应
       const requestConfig = {
         url: api.EXPORT_TEMPLATE.url,
         method: api.EXPORT_TEMPLATE.method,
         params: {
           engineModelID: this.detail.id,
-          userId: getUserId()
+          userId: getUserId(),
+          ...(approvalId ? { approvalId } : {}),
+          ...(flowId ? { flowId } : {})
         },
         responseType: 'blob' // 设置响应类型为 blob
       }
@@ -4029,6 +4336,11 @@ export default {
         params.isRes = 1
       }
 
+      const approvalId = this.todoId || this.detail?.todoId || this.detail?.approvalId
+      if (approvalId) {
+        params.approvalId = approvalId
+      }
+
       const subsystemPartBatches = this.chunkSubsystemParts(params.subsystemParts, 60)
       const requestTasks = subsystemPartBatches.map((subsystemParts) => {
         return this.requestEngineDetailBatch({
@@ -4195,39 +4507,24 @@ export default {
           // 从 GET_MANAGER_DATA 的返回值中查找匹配的责任人
           let owner = item.owner || item.responsiblePerson || item.responsiblePersonName || ''
           let finalResPersonId = resPersonId
+          const draftKey = this.getParamDraftKey({
+            id: item.id,
+            subsystemName,
+            parameterName
+          })
+          const paramDraft = this.isDispatchMode ? this.dispatchParamDraftCache[draftKey] : null
 
-          // 从责任人列表中查找匹配的责任人（根据子系统和部门）
-          if (this.responsiblePersons && this.responsiblePersons.length > 0) {
+          // 从责任人列表中查找匹配的责任人（根据子系统和部门）；已有暂存则不覆盖
+          if (
+            this.responsiblePersons &&
+            this.responsiblePersons.length > 0 &&
+            !(paramDraft && (paramDraft.owner || paramDraft.resPersonId))
+          ) {
             const matchedPerson = this.responsiblePersons.find((person) => {
-              // 检查子系统是否匹配：子系统必须完全一致
-              let subsystemMatch = false
-              if (subsystemName && person.subsystem) {
-                // 如果责任人的 subsystem 是逗号分隔的字符串，检查是否包含参数的子系统
-                const personSubsystems = person.subsystem.split(',').map((s) => s.trim())
-                subsystemMatch = personSubsystems.includes(subsystemName)
-              } else if (!subsystemName && !person.subsystem) {
-                // 如果都没有子系统，也算匹配
-                subsystemMatch = true
-              }
-
-              // 检查部门是否匹配：参数的部门要包括在责任人的部门中（部门路径匹配）
-              let departmentMatch = false
-              if (department && person.department) {
-                // 标准化部门路径（将 · 替换为 -）
-                const normalizedParamDept = department.replace(/·/g, '-')
-                const normalizedPersonDept = person.department.replace(/·/g, '-')
-                // 参数的部门要包括在责任人的部门中（即责任人的部门是参数的部门的父路径或相同路径）
-                // 例如：参数部门 "A-B-C"，责任人部门 "A-B-C-D" 或 "A-B-C" 都匹配
-                // 但责任人部门 "A-B" 不匹配
-                departmentMatch =
-                  normalizedPersonDept === normalizedParamDept ||
-                  normalizedPersonDept.startsWith(normalizedParamDept + '-')
-              } else if (!department && !person.department) {
-                // 如果都没有部门，也算匹配
-                departmentMatch = true
-              }
-
-              return subsystemMatch && departmentMatch
+              return (
+                this.isResponsiblePersonProjectMatch(person) &&
+                this.isResponsiblePersonSubsystemDeptMatch(person, subsystemName, department)
+              )
             })
 
             if (matchedPerson) {
@@ -4261,36 +4558,33 @@ export default {
             isDistributedFilled: item.isDistributedFilled || 0 // 是否已分发填写人（1表示已分发，0表示未分发）
           }
 
+          const mergedParamData = this.applyDispatchParamDraft(paramData)
+
           // 如果存在 filler 对象且有 filledByUserId，将填写人信息添加到 fillerUserOptions 中
-          if (item.filler && item.filler.id && filledByUserId) {
-            const rowId = paramData.id || `${paramData.subsystemName}-${paramData.parameterName}`
-            if (!this.fillerUserOptions[rowId]) {
-              this.$set(this.fillerUserOptions, rowId, [])
-            }
-            // 检查是否已存在该填写人选项
-            const existingOptionIndex = this.fillerUserOptions[rowId].findIndex(
-              (opt) => opt.userId === filledByUserId
-            )
+          if (item.filler && item.filler.id && mergedParamData.filledByUserId) {
+            const rowId =
+              mergedParamData.id ||
+              `${mergedParamData.subsystemName}-${mergedParamData.parameterName}`
             const fillerOption = {
-              userId: filledByUserId,
-              username: fillerUsername || item.filler.username || '',
-              userNumber: item.filler.userNumber || item.filler.userId || filledByUserId
-            }
-            if (existingOptionIndex >= 0) {
-              // 如果已存在，更新信息
-              this.$set(this.fillerUserOptions[rowId], existingOptionIndex, fillerOption)
-            } else {
-              // 如果不存在，添加到选项中
-              this.fillerUserOptions[rowId].push(fillerOption)
+              userId: mergedParamData.filledByUserId,
+              username:
+                mergedParamData.filledByName || fillerUsername || item.filler.username || '',
+              userNumber:
+                item.filler.userNumber || item.filler.userId || mergedParamData.filledByUserId
             }
+            this.restoreFillerUserOption(rowId, fillerOption)
           }
 
           if (existingIndex >= 0) {
             // 如果已存在，使用 Vue.set 更新数据
-            this.$set(this.versionData[this.currentVersionId][groupKey], existingIndex, paramData)
+            this.$set(
+              this.versionData[this.currentVersionId][groupKey],
+              existingIndex,
+              mergedParamData
+            )
           } else {
             // 如果不存在，添加新数据
-            this.versionData[this.currentVersionId][groupKey].push(paramData)
+            this.versionData[this.currentVersionId][groupKey].push(mergedParamData)
           }
         })
       })
@@ -4346,7 +4640,7 @@ export default {
         // 重置表单数据，设置流程主题默认值
         const productModel = this.detail?.modelName || '产品型号'
         // 从整车参数中获取状态代号的值
-        const wholeEngineParams = this.wholeEngineParamsData['整车参数'] || []
+        const wholeEngineParams = this.wholeEngineParamsData[WHOLE_ENGINE_PARAMS_NAME] || []
         const statusCodeParam = wholeEngineParams.find(param => param.parameterName === '状态代号' || param.parameterName === '产品代号')
         const statusCode = statusCodeParam?.parameterValue || this.detail?.productNumber || '状态代号'
         console.log('statusCode', statusCode,statusCodeParam)
@@ -4474,7 +4768,7 @@ export default {
             this.isApprovalMode = true
             // 重置表单数据，设置流程主题默认值
             const productModel = this.detail?.modelName || '产品型号'
-            const wholeEngineParams = this.wholeEngineParamsData['整车参数'] || []
+            const wholeEngineParams = this.wholeEngineParamsData[WHOLE_ENGINE_PARAMS_NAME] || []
             const statusCodeParam = wholeEngineParams.find(param => param.parameterName === '状态代号' || param.parameterName === '产品代号')
             const statusCode = statusCodeParam?.parameterValue || this.detail?.productNumber || '状态代号'
             console.log('statusCode', statusCode,statusCodeParam)
@@ -4621,14 +4915,15 @@ export default {
           this.canResend = false
         })
     },
-    // 处理拒绝按钮点击
+    // 处理退回按钮点击（责任人、填写人）
     handleReject() {
-      if (!this.todoId) {
-        this.$message.error('缺少待办ID，无法执行拒绝操作')
+      const todoId = this.todoId || this.detail?.todoId || this.detail?.id
+      if (!todoId) {
+        this.$message.error('缺少待办ID，无法执行退回操作')
         return
       }
 
-      this.$confirm('确定要拒绝此任务吗？', '提示', {
+      this.$confirm('确定要退回此任务吗？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -4636,16 +4931,19 @@ export default {
         .then(() => {
           this.rejecting = true
           const params = {
-            todoId: this.todoId
+            todoId
           }
+          const currentUserId = getUserId()
 
-          // 根据状态判断传参
           if (this.isDispatchMode && this.dispatchType === 'update_param') {
-            // 分发填写人页面，传 responsiblePersonId
-            params.responsiblePersonId = getUserId()
-          } else if (!this.isDispatchMode && this.filledBy) {
-            // 填写人填写参数状态，传 fillerId
-            params.fillerId = getUserId()
+            // 管理员分发填写人：传责任人 ID
+            params.responsiblePersonId = this.responsiblePersonId || currentUserId
+          } else if (this.isDispatchMode && this.dispatchType === 'todo') {
+            // 分发责任人：传责任人 ID
+            params.resPersonId = currentUserId
+          } else if (this.isFillerTodoEntry) {
+            // 填写人填写参数：传填写人 ID
+            params.fillerId = this.filledBy || currentUserId
           }
 
           const request = {
@@ -4656,27 +4954,23 @@ export default {
           this.$request(request)
             .asyncThen((resp) => {
               this.$message({
-                message: '拒绝成功',
+                message: '退回成功',
                 type: 'success'
               })
               this.rejecting = false
-              // 通知父组件刷新数据
               this.$emit('refresh')
-              // 返回上一页
               this.handleBack()
             })
             .asyncErrorCatch((err) => {
-              console.error('拒绝失败:', err)
+              console.error('退回失败:', err)
               this.$message({
-                message: err.message || '拒绝失败，请重试',
+                message: err.message || '退回失败，请重试',
                 type: 'error'
               })
               this.rejecting = false
             })
         })
-        .catch(() => {
-          // 取消操作
-        })
+        .catch(() => {})
     },
     // 执行直送操作
     executeResend() {
@@ -5182,6 +5476,71 @@ export default {
       // selectedIds 是选中的 id 数组，格式: ['id1', 'id2', ...]
       // v-model 已经自动更新了 step.handlers 为 id 数组
     },
+    // 是否为需映射至「中轻动力平台部」的部门（中轻 / 中重动力平台）
+    isZQOrZZPowerPlatformDept(department) {
+      if (!department) {
+        return false
+      }
+      const normalized = String(department).replace(/·/g, '-')
+      const displayName = this.formatDepartmentDisplay(normalized)
+      const aliasNames = ['中轻', '中重动力平台']
+      return aliasNames.some(
+        (alias) =>
+          displayName === alias ||
+          normalized === alias ||
+          normalized.endsWith(`-${alias}`)
+      )
+    },
+    // 根据部门名称在部门树/列表中查找 departmentId
+    findDepartmentIdByName(departmentName) {
+      if (!departmentName) {
+        return ''
+      }
+      const normalized = String(departmentName).replace(/·/g, '-')
+      const findInTree = (nodes, targetName) => {
+        if (!Array.isArray(nodes)) {
+          return ''
+        }
+        for (const node of nodes) {
+          const nodeName = node.name || node.label || ''
+          if (nodeName === targetName || nodeName === normalized) {
+            return node.id || ''
+          }
+          if (node.children && node.children.length > 0) {
+            const childId = findInTree(node.children, targetName)
+            if (childId) {
+              return childId
+            }
+          }
+        }
+        return ''
+      }
+      const treeId = findInTree(this.departmentTreeData, normalized)
+      if (treeId) {
+        return treeId
+      }
+      const displayName = this.formatDepartmentDisplay(normalized)
+      const flatMatch = (this.departmentList || []).find(
+        (dept) =>
+          dept.name === normalized ||
+          dept.name === departmentName ||
+          dept.name === displayName
+      )
+      return flatMatch ? flatMatch.id || '' : ''
+    },
+    // 解析部门对应的 departmentId（中轻/中重动力平台 → 中轻动力平台部）
+    resolveDepartmentId(department) {
+      if (!department) {
+        return ''
+      }
+      if (this.isZQOrZZPowerPlatformDept(department)) {
+        const targetId = this.findDepartmentIdByName('中轻动力平台部')
+        if (targetId) {
+          return targetId
+        }
+      }
+      return this.findDepartmentIdByName(department)
+    },
     // 格式化部门显示：只显示最后一个节点
     formatDepartmentDisplay(department) {
       if (!department) {
@@ -5454,70 +5813,70 @@ export default {
 
   .grid-header {
     display: grid;
-    grid-template-columns: minmax(240px, 1fr) 100px 120px 140px 200px 120px;
+    grid-template-columns: 340px 100px 120px 140px 200px 120px;
     background: #f5f7fa;
     border-bottom: 1px solid #ebeef5;
 
     &.without-parameter-source {
-      grid-template-columns: minmax(240px, 1fr) 100px 120px 200px 120px;
+      grid-template-columns: 340px 100px 120px 200px 120px;
     }
 
     &.edit-mode {
-      grid-template-columns: minmax(240px, 1fr) 100px minmax(220px, 1fr) 200px;
+      grid-template-columns: 340px 100px minmax(220px, 1fr) 200px;
 
       &.without-parameter-source {
-        grid-template-columns: minmax(240px, 1fr) 100px minmax(220px, 1fr);
+        grid-template-columns: 340px 100px minmax(220px, 1fr);
       }
     }
 
     &.dispatch-mode {
-      grid-template-columns: minmax(220px, 1fr) 100px 120px 140px 140px 100px 140px;
+      grid-template-columns: 340px 100px 120px 140px 140px 100px 140px;
 
       &.without-parameter-source {
-        grid-template-columns: minmax(220px, 1fr) 100px 120px 140px 100px 140px;
+        grid-template-columns: 340px 100px 120px 140px 100px 140px;
       }
     }
 
     &.dispatch-filler-mode {
-      grid-template-columns: minmax(220px, 1fr) 100px 120px 140px 140px 100px 140px;
+      grid-template-columns: 340px 100px 120px 140px 140px 100px 140px;
 
       &.without-parameter-source {
-        grid-template-columns: minmax(220px, 1fr) 100px 120px 140px 100px 140px;
+        grid-template-columns: 340px 100px 120px 140px 100px 140px;
       }
     }
   }
 
   .grid-row {
     display: grid;
-    grid-template-columns: minmax(240px, 1fr) 100px 120px 140px 200px 120px;
+    grid-template-columns: 340px 100px 120px 140px 200px 120px;
     border-bottom: 1px solid #ebeef5;
     background: #fff;
 
     &.without-parameter-source {
-      grid-template-columns: minmax(240px, 1fr) 100px 120px 200px 120px;
+      grid-template-columns: 340px 100px 120px 200px 120px;
     }
 
     &.edit-mode {
-      grid-template-columns: minmax(240px, 1fr) 100px minmax(220px, 1fr) 200px;
+      grid-template-columns: 340px 100px minmax(220px, 1fr) 200px;
 
       &.without-parameter-source {
-        grid-template-columns: minmax(240px, 1fr) 100px minmax(220px, 1fr);
+        grid-template-columns: 340px 100px minmax(220px, 1fr);
       }
     }
 
     &.dispatch-mode {
-      grid-template-columns: minmax(220px, 1fr) 100px 120px 140px 140px 100px 140px;
+      grid-template-columns: 340px 100px 120px 140px 140px 100px 140px;
 
       &.without-parameter-source {
-        grid-template-columns: minmax(220px, 1fr) 100px 120px 140px 100px 140px;
+        grid-template-columns: 340px 100px 120px 140px 100px 140px;
       }
     }
 
     &.dispatch-filler-mode {
-      grid-template-columns: minmax(220px, 1fr) 100px 120px 140px 140px 100px 140px;
+      grid-template-columns: 340px 100px 120px 140px 140px 100px 140px;
 
       &.without-parameter-source {
-        grid-template-columns: minmax(220px, 1fr) 100px 120px 140px 100px 140px;
+        grid-template-columns: 340px 100px 120px 140px 100px 140px;
       }
     }
   }
@@ -5525,18 +5884,18 @@ export default {
   // 整车参数表格样式（4列：参数名称、单位、参数值、参数计划来源）
   .whole-engine-grid {
     .whole-engine-header {
-      grid-template-columns: minmax(240px, 1fr) 100px minmax(220px, 1fr) 200px;
+      grid-template-columns: 340px 100px minmax(220px, 1fr) 200px;
 
       &.without-parameter-source {
-        grid-template-columns: minmax(240px, 1fr) 100px minmax(220px, 1fr);
+        grid-template-columns: 340px 100px minmax(220px, 1fr);
       }
     }
 
     .whole-engine-row {
-      grid-template-columns: minmax(240px, 1fr) 100px minmax(220px, 1fr) 200px;
+      grid-template-columns: 340px 100px minmax(220px, 1fr) 200px;
 
       &.without-parameter-source {
-        grid-template-columns: minmax(240px, 1fr) 100px minmax(220px, 1fr);
+        grid-template-columns: 340px 100px minmax(220px, 1fr);
       }
     }
   }
@@ -5700,7 +6059,10 @@ export default {
               }
 
               &.col-parameter-name {
-                min-width: 180px;
+                width: 340px;
+                min-width: 340px;
+                max-width: 340px;
+                box-sizing: border-box;
               }
 
               &.col-parameter-value {
@@ -5743,6 +6105,13 @@ export default {
                   border-right: none;
                 }
 
+                &.col-parameter-name {
+                  width: 340px;
+                  min-width: 340px;
+                  max-width: 340px;
+                  box-sizing: border-box;
+                }
+
                 &.col-common {
                   color: #f56c6c;
                 }
diff --git a/src/custom/apaas-custom-mydemo/custom-page/managerData.vue b/src/custom/apaas-custom-mydemo/custom-page/managerData.vue
index 1ed1372..2ba11c7 100644
--- a/src/custom/apaas-custom-mydemo/custom-page/managerData.vue
+++ b/src/custom/apaas-custom-mydemo/custom-page/managerData.vue
@@ -37,6 +37,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="subsystem" label="子系统" align="center" />
+          <el-table-column prop="partsName" label="状态代号" align="center" />
           <el-table-column prop="username" label="责任人" width="250" align="center" />
           <el-table-column v-if="hasEditPermission()" label="操作" width="200" align="center">
             <template slot-scope="scope">
@@ -115,6 +116,15 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="项目名称:" prop="partsName">
+          <el-input
+            v-model="formData.partsName"
+            placeholder="请输入项目名称"
+            clearable
+            maxlength="100"
+            style="width: 100%"
+          />
+        </el-form-item>
         <el-form-item label="责任部门:" prop="department">
           <el-input
             v-model="formData.selectDeptName"
@@ -267,6 +277,7 @@ export default {
       formData: {
         department: '', // 级联选择器绑定的部门ID
         subsystem: '', // 子系统
+        partsName: '', // 项目名称
         responsible: '', // 责任人用户ID（用于提交）
         responsibleName: '', // 责任人姓名（用于自动完成显示）
         selectDeptId: '', // 选中的部门ID（用于搜索责任人）
@@ -278,6 +289,7 @@ export default {
       formRules: {
         department: [{ required: true, message: '请选择责任部门', trigger: 'change' }],
         subsystem: [{ required: true, message: '请输入子系统', trigger: 'blur' }],
+        partsName: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
         responsible: [{ required: true, message: '请选择责任人', trigger: 'change' }]
       },
       subsystemList: [],
@@ -570,6 +582,7 @@ export default {
       this.formData = {
         department: '',
         subsystem: '',
+        partsName: '',
         responsible: '',
         responsibleName: '',
         selectDeptId: '',
@@ -606,6 +619,7 @@ export default {
       this.formData = {
         department: row.departmentId || '', // 级联选择器需要部门ID
         subsystem: row.subsystem || '', // 子系统
+        partsName: row.partsName || '', // 项目名称
         responsible: row.userNumber || row.userId || '', // 责任人 userNumber（用于 el-select 的 value）
         responsibleName: row.username || '', // 责任人姓名（用于显示）
         selectDeptId: row.departmentId || '', // 选中的部门ID（用于搜索责任人）
@@ -627,6 +641,7 @@ export default {
       this.formData = {
         department: '',
         subsystem: '',
+        partsName: '',
         responsible: '',
         responsibleName: '',
         selectDeptId: '',
@@ -661,6 +676,7 @@ export default {
                 subsystem: Array.isArray(this.formData.subsystem)
                   ? this.formData.subsystem.join(',')
                   : this.formData.subsystem,
+                partsName: this.formData.partsName || '',
                 userId: this.formData.userId || this.formData.responsible
               },
               disableSuccessMsg: true
@@ -691,6 +707,7 @@ export default {
                 subsystem: Array.isArray(this.formData.subsystem)
                   ? this.formData.subsystem.join(',')
                   : this.formData.subsystem,
+                partsName: this.formData.partsName || '',
                 userId: this.formData.responsible,
                 rowId: this.formData.rowId
               },
@@ -1330,7 +1347,7 @@ export default {
       -webkit-box-flex: 1;
       -ms-flex: 1;
       flex: 1;
-      font-size: 12px;
+      font-size: 18px;
     }
   }
 
diff --git a/src/custom/apaas-custom-mydemo/custom-page/model-query.vue b/src/custom/apaas-custom-mydemo/custom-page/model-query.vue
index b2cdc59..4d0c979 100644
--- a/src/custom/apaas-custom-mydemo/custom-page/model-query.vue
+++ b/src/custom/apaas-custom-mydemo/custom-page/model-query.vue
@@ -208,7 +208,11 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="handleAddModelDialogClose">取消</el-button>
-        <el-button type="primary" @click="handleConfirmAddModel">
+        <el-button
+          type="primary"
+          :loading="loadingModelDetail"
+          @click="handleConfirmAddModel"
+        >
           确定
         </el-button>
       </span>
@@ -312,6 +316,10 @@ import api from '@/api'
 import { getUserId } from '@/utils'
 import '@/assets/scss/apaas-custom-hello.css'
 
+/** 整车参数展示名称（接口可能仍返回「整车参数」） */
+const WHOLE_ENGINE_PARAMS_NAME = '发动机基本信息'
+const WHOLE_ENGINE_PARAMS_LEGACY_KEYS = ['整车参数', WHOLE_ENGINE_PARAMS_NAME]
+
 export default {
   name: 'ModelQuery',
   data() {
@@ -926,7 +934,7 @@ export default {
       }
 
       // 如果是"整车参数"子系统，且是特定的参数，直接从机型原始数据中获取
-      if (param.subsystemName === '整车参数') {
+      if (this.isWholeEngineSubsystemName(param.subsystemName)) {
         const paramNameToFieldMap = {
           产品型号: 'modelName',
           状态代号: 'productNumber',
@@ -1074,6 +1082,10 @@ export default {
       // }
 
       this.loadingModelDetail = true
+      const minLoadingMs = 1500
+      const minLoadingPromise = new Promise((resolve) => {
+        setTimeout(resolve, minLoadingMs)
+      })
       // 获取当前选中的树节点对应的 subsystemTypes
       const { subsystemTypes } = this.getSelectedSubsystemsAndTypes()
       // 批量加载选中机型的详情
@@ -1098,7 +1110,7 @@ export default {
         return this.loadModelDetail(modelId, model, parameterVersion, subsystemTypes)
       })
 
-      Promise.all(loadPromises)
+      Promise.all([Promise.all(loadPromises), minLoadingPromise])
         .then(() => {
           // this.$message.success('添加机型成功')
           this.handleAddModelDialogClose()
@@ -1530,7 +1542,7 @@ export default {
       const { subsystemTypes } = this.getSelectedSubsystemsAndTypes()
       // 过滤掉"整车参数"子系统，不包含在下载数据中
       const filteredSubsystemTypes = subsystemTypes.filter(
-        (item) => !item.startsWith('整车参数-')
+        (item) => !this.isWholeEngineSubsystemPrefix(item)
       )
 
       // 构建参数ID数组，和"更新常用"中的parameters一样，但不包含整车参数
@@ -1539,7 +1551,7 @@ export default {
       if (saveData && saveData.subsystems && saveData.subsystems.length > 0) {
         saveData.subsystems.forEach((item) => {
           // 如果子系统是"整车参数"，isGlobal为1，否则为0
-          const isGlobal = item.subsystem === '整车参数' ? 1 : 0
+          const isGlobal = this.isWholeEngineSubsystemName(item.subsystem) ? 1 : 0
           item.parameters.forEach((param) => {
             parameters.push({
               parameterId: param.parameterId,
@@ -1659,7 +1671,7 @@ export default {
 
           if (isGlobal) {
             // 如果 isGlobal 为 1，该参数属于"整车参数"子系统
-            targetSubsystemName = '整车参数'
+            targetSubsystemName = WHOLE_ENGINE_PARAMS_NAME
             if (!subsystemPartsMap.has(targetSubsystemName)) {
               subsystemPartsMap.set(targetSubsystemName, new Set())
             }
@@ -1833,7 +1845,7 @@ export default {
           // 检查是否是 isGlobal 为 1 的参数（属于"整车参数"子系统）
           const isGlobal = p.isGlobal === 1 || p.isGlobal === '1'
           // 如果 isGlobal 为 1，该参数属于"整车参数"子系统，否则属于原子系统
-          const targetSubsystemName = isGlobal ? '整车参数' : subsystemName
+          const targetSubsystemName = isGlobal ? WHOLE_ENGINE_PARAMS_NAME : subsystemName
 
           // 优先使用 parameterId，如果没有则使用 parameterName
           const key = p.parameterId || p.parameterName
@@ -2067,7 +2079,7 @@ export default {
       let parameters = []
       saveData.subsystems.forEach((item) => {
         // 如果子系统是"整车参数"，isGlobal为1，否则为0
-        const isGlobal = item.subsystem === '整车参数' ? 1 : 0
+        const isGlobal = this.isWholeEngineSubsystemName(item.subsystem) ? 1 : 0
         item.parameters.forEach((param) => {
           parameters.push({
             parameterId: param.parameterId,
@@ -2162,7 +2174,7 @@ export default {
         let parameters = []
         saveData.subsystems.forEach((item) => {
           // 如果子系统是"整车参数"，isGlobal为1，否则为0
-          const isGlobal = item.subsystem === '整车参数' ? 1 : 0
+          const isGlobal = this.isWholeEngineSubsystemName(item.subsystem) ? 1 : 0
           item.parameters.forEach((param) => {
             parameters.push({
               parameterId: param.parameterId,
@@ -2580,13 +2592,30 @@ export default {
       })
       return keys
     },
-    // 根据接口返回的"整车参数"参数数据构建树结构
+    isWholeEngineSubsystemName(name) {
+      return WHOLE_ENGINE_PARAMS_LEGACY_KEYS.includes(name)
+    },
+    isWholeEngineSubsystemPrefix(item) {
+      if (!item || typeof item !== 'string') {
+        return false
+      }
+      return WHOLE_ENGINE_PARAMS_LEGACY_KEYS.some((key) => item.startsWith(`${key}-`))
+    },
+    getWholeEngineParametersList() {
+      for (let i = 0; i < WHOLE_ENGINE_PARAMS_LEGACY_KEYS.length; i++) {
+        const key = WHOLE_ENGINE_PARAMS_LEGACY_KEYS[i]
+        if (this.allParametersData[key]) {
+          return this.allParametersData[key]
+        }
+      }
+      return []
+    },
+    // 根据接口返回的发动机基本信息参数数据构建树结构
     buildWholeEngineParamsNode() {
-      const subsystemName = '整车参数'
+      const subsystemName = WHOLE_ENGINE_PARAMS_NAME
       const parentId = 'parent-whole-engine-params'
 
-      // 从 allParametersData 中获取"整车参数"的参数列表
-      const parameters = this.allParametersData[subsystemName] || []
+      const parameters = this.getWholeEngineParametersList()
 
       // 提取所有的partsName并去重（过滤掉'/'和空值）
       const partsNameSet = new Set()
diff --git a/src/custom/apaas-custom-mydemo/custom-page/myDone.vue b/src/custom/apaas-custom-mydemo/custom-page/myDone.vue
index 24ce728..b634f64 100644
--- a/src/custom/apaas-custom-mydemo/custom-page/myDone.vue
+++ b/src/custom/apaas-custom-mydemo/custom-page/myDone.vue
@@ -73,6 +73,7 @@
       :dispatch-type="dispatchType"
       :responsible-person-id="responsiblePersonId"
       :filled-by="filledBy"
+      :from-done="true"
       :hide-operations="true"
       class="engine-detail-wrapper"
       @back="handleBackFromDetail"
diff --git a/src/custom/apaas-custom-mydemo/custom-page/otherEnginedata.vue b/src/custom/apaas-custom-mydemo/custom-page/otherEnginedata.vue
index 72f170a..97445ea 100644
--- a/src/custom/apaas-custom-mydemo/custom-page/otherEnginedata.vue
+++ b/src/custom/apaas-custom-mydemo/custom-page/otherEnginedata.vue
@@ -109,16 +109,19 @@
               >
                 查看
               </a>
-              <!-- <span v-if="row.distributeStatus != '部分分发' && hasEngineDataEditPermission() && row.versionNumber === 1" class="link-separator"></span> -->
-              <!-- <a
-                v-if="row.distributeStatus != '部分分发' && hasEngineDataEditPermission() && row.versionNumber === 1"
+              <span
+                v-if="row.distributeStatus === '未分发' && hasEngineDataEditPermission()"
+                class="link-separator"
+              ></span>
+              <a
+                v-if="row.distributeStatus === '未分发' && hasEngineDataEditPermission()"
                 href="javascript:void(0)"
                 class="el-link el-link--primary"
                 style="margin-left: 5px;"
                 @click.stop="handleRowEdit(row)"
               >
                 编辑
-              </a> -->
+              </a>
               <span v-if=" (row.distributeStatus === '未分发' || row.distributeStatus === '部分分发') &&hasEngineDataEditPermission()" class="link-separator"></span>
               <a
                 v-if=" (row.distributeStatus === '未分发' || row.distributeStatus === '部分分发') && hasEngineDataEditPermission()"
@@ -362,7 +365,7 @@ export default {
             label: '操作',
             customSlot: 'options',
             align: 'center',
-            width: '160',
+            width: '200',
             fixed: 'right'
           }
         ],
@@ -782,6 +785,9 @@ export default {
       this.$refs.addEngineModelModal.showModal('竞品')
     },
     handleRowEdit(row) {
+      if (row.distributeStatus !== '未分发') {
+        return
+      }
       this.$refs.addEngineModelModal.showModalForEdit('竞品', row)
     },
     handleAddSuccess() {
diff --git a/src/custom/apaas-custom-mydemo/custom-page/permissionManagement.vue b/src/custom/apaas-custom-mydemo/custom-page/permissionManagement.vue
index 0c94dd7..30b80ae 100644
--- a/src/custom/apaas-custom-mydemo/custom-page/permissionManagement.vue
+++ b/src/custom/apaas-custom-mydemo/custom-page/permissionManagement.vue
@@ -213,6 +213,9 @@
               multiple
               filterable
               remote
+              reserve-keyword
+              collapse-tags
+              :max-collapse-tags="3"
               placeholder="请输入人员姓名进行搜索"
               style="width: 100%"
               clearable
@@ -1769,18 +1772,18 @@ export default {
             )
             // 去重：使用 Map 确保每个 userId 只出现一次
             const optionsMap = new Map()
-            // 先添加已选择的选项
-            selectedOptions.forEach((opt) => {
-              if (opt.userId) {
-                optionsMap.set(opt.userId, opt)
-              }
-            })
-            // 再添加新的搜索结果
+            // 先添加搜索结果，保证匹配项显示在下拉框最前面
             filteredUsers.forEach((user) => {
               if (user.userId && !optionsMap.has(user.userId)) {
                 optionsMap.set(user.userId, user)
               }
             })
+            // 再添加已选择的选项（用于标签反显）
+            selectedOptions.forEach((opt) => {
+              if (opt.userId && !optionsMap.has(opt.userId)) {
+                optionsMap.set(opt.userId, opt)
+              }
+            })
             this.personOptions = Array.from(optionsMap.values())
             this.personSearchLoading = false
             this.currentPersonRequest = null
@@ -2443,6 +2446,33 @@ export default {
 
 // 人员选择下拉框样式（参考 modelDetail.vue）
 ::v-deep .person-select {
+  .el-select__input {
+    display: inline-block !important;
+    visibility: visible !important;
+    opacity: 1 !important;
+    flex: 1;
+    min-width: 80px !important;
+    width: auto !important;
+  }
+
+  .el-select__tags {
+    max-width: calc(100% - 30px);
+    flex-wrap: nowrap;
+  }
+
+  .el-tag {
+    max-width: 90px;
+
+    .el-select__tags-text {
+      max-width: 100%;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      display: inline-block;
+      vertical-align: top;
+    }
+  }
+
   .el-select-dropdown__item {
     display: flex !important;
     justify-content: space-between !important;
diff --git a/src/custom/apaas-custom-mydemo/custom-page/selfEnginedata.vue b/src/custom/apaas-custom-mydemo/custom-page/selfEnginedata.vue
index 3dddc17..8b4d84b 100644
--- a/src/custom/apaas-custom-mydemo/custom-page/selfEnginedata.vue
+++ b/src/custom/apaas-custom-mydemo/custom-page/selfEnginedata.vue
@@ -109,16 +109,19 @@
               >
                 查看
               </a>
-              <!-- <span v-if="row.distributeStatus != '部分分发' && hasEngineDataEditPermission() && row.versionNumber === 1" class="link-separator"></span> -->
-              <!-- <a
-                v-if="row.distributeStatus != '部分分发' && hasEngineDataEditPermission() && row.versionNumber === 1"
+              <span
+                v-if="row.distributeStatus === '未分发' && hasEngineDataEditPermission()"
+                class="link-separator"
+              ></span>
+              <a
+                v-if="row.distributeStatus === '未分发' && hasEngineDataEditPermission()"
                 href="javascript:void(0)"
                 class="el-link el-link--primary"
                 style="margin-left: 5px;"
                 @click.stop="handleRowEdit(row)"
               >
                 编辑
-              </a> -->
+              </a>
               <span v-if=" (row.distributeStatus === '未分发' || row.distributeStatus === '部分分发') &&hasEngineDataEditPermission()" class="link-separator"></span>
               <a
                 v-if=" (row.distributeStatus === '未分发' || row.distributeStatus === '部分分发') && hasEngineDataEditPermission()"
@@ -364,7 +367,7 @@ export default {
             label: '操作',
             customSlot: 'options',
             align: 'center',
-            width: '160',
+            width: '200',
             fixed: 'right'
           }
         ],
@@ -784,6 +787,9 @@ export default {
       this.$refs.addEngineModelModal.showModal('玉柴')
     },
     handleRowEdit(row) {
+      if (row.distributeStatus !== '未分发') {
+        return
+      }
       this.$refs.addEngineModelModal.showModalForEdit('玉柴', row)
     },
     handleAddSuccess() {
diff --git a/src/custom/apaas-custom-mydemo/custom-page/todo.vue b/src/custom/apaas-custom-mydemo/custom-page/todo.vue
index ae39fa5..8d024bf 100644
--- a/src/custom/apaas-custom-mydemo/custom-page/todo.vue
+++ b/src/custom/apaas-custom-mydemo/custom-page/todo.vue
@@ -451,6 +451,7 @@ export default {
         // 如果是"填写发动机参数值"，打开非分发模式（查看模式）
         // 如果是"管理员分发责任人"，打开分发模式且是分发填写人（显示填写人列，调用UPDATE_PARAM接口）
         // 其他情况打开分发模式且是分发责任人
+        // currentNode / ownerId / currentProcessor 会随 row 传入 engineDetail，用于「编制 + 当前处理人为本人」时选择 selectParamListAndModelForFilledBy
         this.currentEngineDetail = { ...row, id: row.modelId, todoId: row.id }
         this.todoId = row.id
         // 填写发动机参数值：非分发模式（只读），传递 filledBy