diff --git a/src/api/oa/erp/tempTask/index.ts b/src/api/oa/erp/tempTask/index.ts
index 8f81d04..7df7bdc 100644
--- a/src/api/oa/erp/tempTask/index.ts
+++ b/src/api/oa/erp/tempTask/index.ts
@@ -40,7 +40,15 @@ export const delTempTask = (tempTaskId: string | number | Array<string | number>
   });
 };
 
-export const submitTempTask = (data: TempTaskForm): AxiosPromise<TempTaskVO> => {
+export const getTempTaskList = (query?: TempTaskQuery): AxiosPromise<TempTaskVO[]> => {
+  return request({
+    url: '/oa/erp/tempTask/getErpTempTaskList',
+    method: 'get',
+    params: query
+  });
+};
+
+export const tempTaskSubmitAndFlowStart = (data: TempTaskForm): AxiosPromise<TempTaskVO> => {
   return request({
     url: '/oa/erp/tempTask/submit',
     method: 'post',
@@ -56,14 +64,14 @@ export const closeTempTask = (data: TempTaskForm) => {
   });
 };
 
-export const listTempTaskChanges = (tempTaskId: string | number): AxiosPromise<TempTaskChangeVO[]> => {
+export const listTempTaskChange = (tempTaskId: string | number): AxiosPromise<TempTaskChangeVO[]> => {
   return request({
     url: `/oa/erp/tempTask/${tempTaskId}/changes`,
     method: 'get'
   });
 };
 
-export const saveTempTaskChange = (data: TempTaskChangeForm) => {
+export const addTempTaskChange = (data: TempTaskChangeForm) => {
   return request({
     url: '/oa/erp/tempTask/change',
     method: 'post',
@@ -78,11 +86,3 @@ export const approveTempTaskChange = (data: TempTaskChangeForm) => {
     data
   });
 };
-
-export const getErpTempTaskList = (query?: TempTaskQuery): AxiosPromise<TempTaskVO[]> => {
-  return request({
-    url: '/oa/erp/tempTask/getErpTempTaskList',
-    method: 'get',
-    params: query
-  });
-};
diff --git a/src/api/oa/erp/tempTask/types.ts b/src/api/oa/erp/tempTask/types.ts
index c3af6b4..dfde96d 100644
--- a/src/api/oa/erp/tempTask/types.ts
+++ b/src/api/oa/erp/tempTask/types.ts
@@ -1,11 +1,11 @@
 export interface TempTaskVO {
   tempTaskId: string | number;
-  tempTaskCode?: string;
+  tempTaskCode: string;
   taskTitle?: string;
-  taskDesc?: string;
+  taskDesc: string;
   priority?: string;
   urgentReason?: string;
-  requireTime?: string;
+  requireTime: string;
   confirmFinishTime?: string;
   actualStartTime?: string;
   actualFinishTime?: string;
@@ -87,6 +87,8 @@ export interface TempTaskForm extends BaseEntity {
   ccUserIds?: string;
   ossId?: string;
   remark?: string;
+  changeCount?: number;
+  pendingChangeCount?: number;
   flowCode?: string;
   variables?: Record<string, unknown>;
   bizExt?: Record<string, unknown>;
@@ -98,16 +100,21 @@ export interface TempTaskQuery extends PageQuery {
   taskDesc?: string;
   priority?: string;
   projectId?: string | number;
+  projectCode?: string;
   projectName?: string;
   requesterId?: string | number;
   requesterName?: string;
+  requestDeptId?: string | number;
+  requestDeptName?: string;
   dispatcherId?: string | number;
   dispatcherName?: string;
-  softwareLeaderId?: string | number;
-  softwareLeaderName?: string;
   assigneeId?: string | number;
   assigneeName?: string;
   finishResult?: string;
+  terminateReason?: string;
+  relatedTaskId?: string | number;
+  relatedTaskCode?: string;
+  relateReason?: string;
   taskStatus?: string;
   flowStatus?: string;
   params?: Record<string, unknown>;
@@ -117,8 +124,8 @@ export interface TempTaskChangeVO {
   changeId: string | number;
   tempTaskId: string | number;
   tempTaskCode?: string;
-  changeType?: string;
-  changeReason?: string;
+  changeType: string;
+  changeReason: string;
   beforeContent?: string;
   afterContent?: string;
   workloadEffect?: string;
@@ -146,6 +153,12 @@ export interface TempTaskChangeForm extends BaseEntity {
   workloadEffect?: string;
   timeEffect?: string;
   scopeEffect?: string;
+  changeUserId?: string | number;
+  changeUserName?: string;
   approveResult?: string;
+  approverId?: string | number;
+  approverName?: string;
   approveComment?: string;
+  approveTime?: string;
+  flowStatus?: string;
 }
diff --git a/src/views/oa/erp/tempTask/edit.vue b/src/views/oa/erp/tempTask/edit.vue
index 1935b76..9db6451 100644
--- a/src/views/oa/erp/tempTask/edit.vue
+++ b/src/views/oa/erp/tempTask/edit.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="p-2" v-loading="pageLoading">
     <approvalButton
-      class="mb-4"
+      class="mb-3"
       @submitForm="submitForm"
       @approvalVerifyOpen="approvalVerifyOpen"
       @handleApprovalRecord="handleApprovalRecord"
@@ -10,23 +10,21 @@
       :status="form.flowStatus as any"
       :pageType="pageType"
       :mode="false"
-    />
+    >
+      <el-button v-if="canCloseTask" type="success" icon="CircleCheck" @click="openCloseDialog" v-hasPermi="['oa:erp:tempTask:close']"
+        >关闭任务</el-button
+      >
+      <el-button v-if="canCreateChange" type="warning" icon="EditPen" @click="openChangeDialog" v-hasPermi="['oa:erp:tempTask:change']"
+        >发起变更</el-button
+      >
+    </approvalButton>
 
-    <el-card shadow="never" class="mb-4">
-      <template #header>
-        <div class="card-header">
-          <span>临时任务</span>
-          <div v-if="form.tempTaskId" class="header-actions">
-            <el-button type="warning" icon="RefreshRight" @click="openChangeDialog" v-hasPermi="['oa:erp:tempTask:change']">发起变更</el-button>
-            <el-button type="danger" icon="CircleClose" @click="openCloseDialog" v-hasPermi="['oa:erp:tempTask:close']">关闭任务</el-button>
-          </div>
-        </div>
-      </template>
+    <el-card shadow="never" class="mb-3">
       <el-form ref="tempTaskFormRef" :model="form" :rules="rules" label-width="120px" :disabled="isReadOnly">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="任务编号" prop="tempTaskCode">
-              <el-input v-model="form.tempTaskCode" placeholder="保存后自动生成" disabled />
+              <el-input v-model="form.tempTaskCode" placeholder="后端自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -36,108 +34,101 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="任务描述" prop="taskDesc">
-              <el-input v-model="form.taskDesc" type="textarea" :rows="4" placeholder="请输入任务描述" />
+              <el-input v-model="form.taskDesc" type="textarea" :rows="4" placeholder="请输入临时任务描述" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="优先级" prop="priority">
               <el-select v-model="form.priority" placeholder="请选择优先级" clearable>
                 <el-option v-for="dict in temp_task_priority" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="需求时间" prop="requireTime">
-              <el-date-picker
-                v-model="form.requireTime"
-                type="datetime"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="请选择需求时间"
-                class="w-full"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col v-if="form.priority === '3' || form.priority === '4'" :span="24">
+          <el-col :span="16">
             <el-form-item label="紧急原因" prop="urgentReason">
-              <el-input v-model="form.urgentReason" type="textarea" :rows="2" placeholder="紧急/特急必须填写原因" />
+              <el-input v-model="form.urgentReason" placeholder="紧急/特急必须填写" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="主报工项目" prop="projectName">
-              <el-input v-model="form.projectName" placeholder="请选择项目" readonly>
-                <template #append>
-                  <el-button icon="Search" @click="openProjectSelect" />
-                </template>
-              </el-input>
+          <el-col :span="8">
+            <el-form-item label="需求时间" prop="requireTime">
+              <el-date-picker v-model="form.requireTime" type="date" value-format="YYYY-MM-DD" clearable placeholder="请选择需求时间" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="项目编号" prop="projectCode">
-              <el-input v-model="form.projectCode" placeholder="选择项目后自动填充" disabled />
+          <el-col :span="8">
+            <el-form-item label="确认完成时间" prop="confirmFinishTime">
+              <el-date-picker v-model="form.confirmFinishTime" type="date" value-format="YYYY-MM-DD" clearable placeholder="领导确认后填写" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="指派人" prop="dispatcherName">
-              <el-input v-model="form.dispatcherName" placeholder="可选，选择后先走指派确认" readonly>
-                <template #append>
-                  <el-button icon="User" @click="openUserSelect('dispatcher')" />
-                </template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="软件部领导" prop="softwareLeaderName">
-              <el-input v-model="form.softwareLeaderName" placeholder="请选择软件部领导" readonly>
-                <template #append>
-                  <el-button icon="User" @click="openUserSelect('leader')" />
-                </template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="主执行人" prop="assigneeName">
-              <el-input v-model="form.assigneeName" placeholder="领导审核确定" readonly>
-                <template #append>
-                  <el-button icon="User" @click="openUserSelect('assignee')" />
-                </template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="预计工时" prop="estimateWorkload">
-              <el-input-number v-model="form.estimateWorkload" :min="0" :step="0.5" :precision="1" class="w-full" />
+              <el-input-number v-model="form.estimateWorkload" :min="0" :step="0.5" :precision="1" controls-position="right" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="确认完成" prop="confirmFinishTime">
-              <el-date-picker
-                v-model="form.confirmFinishTime"
-                type="datetime"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="领导确认完成时间"
-                class="w-full"
-              />
+            <el-form-item label="主报工项目" prop="projectCode">
+              <el-input v-model="form.projectCode" placeholder="请选择项目" readonly>
+                <template #suffix>
+                  <el-icon class="cursor-pointer" @click="openProjectSelect"><Search /></el-icon>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="实际开始" prop="actualStartTime">
-              <el-date-picker
-                v-model="form.actualStartTime"
-                type="datetime"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="只记录周期，不推算工时"
-                class="w-full"
-              />
+            <el-form-item label="项目名称" prop="projectName">
+              <el-input v-model="form.projectName" disabled placeholder="选择项目后自动填充" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="发起人" prop="requesterName">
+              <el-input v-model="form.requesterName" disabled placeholder="后端按当前用户回填" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="发起部门" prop="requestDeptName">
+              <el-input v-model="form.requestDeptName" disabled placeholder="后端按当前部门回填" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="业务状态" prop="taskStatus">
+              <el-select v-model="form.taskStatus" disabled>
+                <el-option v-for="dict in temp_task_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="指派人" prop="dispatcherName">
+              <el-input v-model="form.dispatcherName" readonly placeholder="请选择指派人">
+                <template #suffix>
+                  <el-icon class="cursor-pointer" @click="openUserSelect('dispatcher')"><Search /></el-icon>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="软件部领导" prop="softwareLeaderName">
+              <el-input v-model="form.softwareLeaderName" readonly placeholder="请选择软件部领导">
+                <template #suffix>
+                  <el-icon class="cursor-pointer" @click="openUserSelect('leader')"><Search /></el-icon>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="主执行人" prop="assigneeName">
+              <el-input v-model="form.assigneeName" readonly placeholder="请选择主执行人">
+                <template #suffix>
+                  <el-icon class="cursor-pointer" @click="openUserSelect('assignee')"><Search /></el-icon>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="关联原任务" prop="relatedTaskCode">
-              <el-input v-model="form.relatedTaskCode" placeholder="输入已结束原任务编号" clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="原任务ID" prop="relatedTaskId">
-              <el-input v-model="form.relatedTaskId" placeholder="关联原任务ID" clearable />
+              <el-input v-model="form.relatedTaskCode" readonly placeholder="关闭后延续/返工时选择">
+                <template #append>
+                  <el-button icon="Search" @click="openRelatedTaskDialog" />
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -147,14 +138,26 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="关联说明" prop="relateRemark">
+              <el-input v-model="form.relateRemark" type="textarea" :rows="2" placeholder="请输入关联说明" />
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="附件" prop="ossId">
-              <file-upload v-model="form.ossId" :disabled="isReadOnly" />
+              <FileUpload
+                v-model="ossIdString"
+                :limit="5"
+                :file-size="20"
+                :file-type="['png', 'jpg', 'jpeg', 'doc', 'docx', 'pdf', 'xls', 'xlsx', 'txt']"
+                :disabled="isReadOnly"
+                :is-show-tip="true"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" :rows="2" placeholder="请输入备注" />
+              <el-input v-model="form.remark" type="textarea" :rows="3" placeholder="请输入备注" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -163,169 +166,255 @@
 
     <el-card v-if="form.tempTaskId" shadow="never">
       <template #header>
-        <span>变更历史</span>
+        <div class="flex justify-between items-center">
+          <span>变更历史</span>
+          <el-button
+            v-if="canCreateChange"
+            type="warning"
+            plain
+            icon="EditPen"
+            size="small"
+            @click="openChangeDialog"
+            v-hasPermi="['oa:erp:tempTask:change']"
+          >
+            发起变更
+          </el-button>
+        </div>
       </template>
       <el-table :data="changeList" border>
-        <el-table-column type="index" label="序号" width="60" align="center" />
-        <el-table-column label="变更类型" prop="changeType" width="130" align="center">
+        <el-table-column type="index" label="序号" width="70" align="center" />
+        <el-table-column label="变更类型" prop="changeType" width="120" align="center">
           <template #default="scope">
             <dict-tag :options="temp_task_change_type" :value="scope.row.changeType" />
           </template>
         </el-table-column>
-        <el-table-column label="变更原因" prop="changeReason" min-width="160" show-overflow-tooltip />
-        <el-table-column label="变更前" prop="beforeContent" min-width="160" show-overflow-tooltip />
-        <el-table-column label="变更后" prop="afterContent" min-width="160" show-overflow-tooltip />
-        <el-table-column label="工时影响" prop="workloadEffect" min-width="120" show-overflow-tooltip />
-        <el-table-column label="时间影响" prop="timeEffect" min-width="120" show-overflow-tooltip />
+        <el-table-column label="变更原因" prop="changeReason" min-width="180" show-overflow-tooltip align="center" />
+        <el-table-column label="变更前" prop="beforeContent" min-width="160" show-overflow-tooltip align="center">
+          <template #default="scope">
+            <span>{{ formatChangeContent(scope.row.beforeContent) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="变更后" prop="afterContent" min-width="160" show-overflow-tooltip align="center">
+          <template #default="scope">
+            <span>{{ formatChangeContent(scope.row.afterContent) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="工时影响" prop="workloadEffect" min-width="140" show-overflow-tooltip align="center" />
+        <el-table-column label="时间影响" prop="timeEffect" min-width="140" show-overflow-tooltip align="center" />
         <el-table-column label="审批结论" prop="approveResult" width="120" align="center">
           <template #default="scope">
             <dict-tag :options="temp_task_change_result" :value="scope.row.approveResult" />
           </template>
         </el-table-column>
-        <el-table-column label="流程状态" prop="flowStatus" width="110" align="center">
+        <el-table-column label="审批状态" prop="flowStatus" width="110" align="center">
           <template #default="scope">
             <dict-tag :options="wf_business_status" :value="scope.row.flowStatus" />
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="90" align="center">
+        <el-table-column label="操作" width="90" fixed="right" align="center">
           <template #default="scope">
             <el-button
               v-if="!scope.row.approveResult"
               link
               type="primary"
-              @click="openApproveDialog(scope.row)"
+              @click="openApproveChangeDialog(scope.row)"
               v-hasPermi="['oa:erp:tempTask:changeApprove']"
-              >审批</el-button
             >
+              审批
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
     </el-card>
 
-    <el-dialog v-model="changeDialog.visible" title="发起变更" width="760px" append-to-body>
-      <el-form ref="changeFormRef" :model="changeForm" :rules="changeRules" label-width="110px">
+    <el-dialog v-model="closeDialog.visible" title="关闭临时任务" width="720px" append-to-body>
+      <el-form ref="closeFormRef" :model="closeForm" :rules="closeRules" label-width="120px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="实际开始时间" prop="actualStartTime">
+              <el-date-picker v-model="closeForm.actualStartTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="实际消耗工时" prop="actualWorkload">
+              <el-input-number v-model="closeForm.actualWorkload" :min="0" :step="0.5" :precision="1" controls-position="right" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="完成结果" prop="finishResult">
+              <el-select v-model="closeForm.finishResult" placeholder="请选择完成结果">
+                <el-option v-for="dict in temp_task_finish_result" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="终止原因" prop="terminateReason">
+              <el-select v-model="closeForm.terminateReason" placeholder="不执行/终止时必填" clearable>
+                <el-option v-for="dict in temp_task_terminate_reason" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="完成说明" prop="finishRemark">
+              <el-input v-model="closeForm.finishRemark" type="textarea" :rows="4" placeholder="请输入完成说明" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <el-button @click="closeDialog.visible = false">取消</el-button>
+        <el-button type="primary" :loading="buttonLoading" @click="handleCloseTask">确定关闭</el-button>
+      </template>
+    </el-dialog>
+
+    <el-dialog v-model="changeDialog.visible" :title="changeDialog.title" width="760px" append-to-body>
+      <el-form ref="changeFormRef" :model="changeForm" :rules="changeRules" label-width="120px">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="变更类型" prop="changeType">
-              <el-select v-model="changeForm.changeType" placeholder="请选择变更类型">
+              <el-select v-model="changeForm.changeType" placeholder="请选择变更类型" :disabled="changeApproveMode" @change="handleChangeTypeChange">
                 <el-option v-for="dict in temp_task_change_type" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12" v-if="changeApproveMode">
+            <el-form-item label="审批结论" prop="approveResult">
+              <el-select v-model="changeForm.approveResult" placeholder="请选择审批结论">
+                <el-option v-for="dict in temp_task_change_result" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="变更原因" prop="changeReason">
-              <el-input v-model="changeForm.changeReason" type="textarea" :rows="2" placeholder="请输入变更原因" />
+              <el-input v-model="changeForm.changeReason" type="textarea" :rows="3" :disabled="changeApproveMode" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="变更前" prop="beforeContent">
-              <el-input v-model="changeForm.beforeContent" type="textarea" :rows="3" />
+              <el-input
+                v-if="isStructuredChange"
+                :model-value="formatChangeContent(changeForm.beforeContent)"
+                disabled
+                placeholder="选择变更类型后自动带出"
+              />
+              <el-input v-else v-model="changeForm.beforeContent" type="textarea" :rows="3" :disabled="changeApproveMode" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="变更后" prop="afterContent">
-              <el-input v-model="changeForm.afterContent" type="textarea" :rows="3" />
+              <el-input
+                v-if="changeForm.changeType === '4'"
+                :model-value="formatChangeContent(changeForm.afterContent)"
+                readonly
+                :disabled="changeApproveMode"
+                placeholder="请选择新的主执行人"
+              >
+                <template #suffix>
+                  <el-icon v-if="!changeApproveMode" class="cursor-pointer" @click="openUserSelect('changeAssignee')"><Search /></el-icon>
+                </template>
+              </el-input>
+              <el-input
+                v-else-if="changeForm.changeType === '5'"
+                :model-value="formatChangeContent(changeForm.afterContent)"
+                readonly
+                :disabled="changeApproveMode"
+                placeholder="请选择新的主报工项目"
+              >
+                <template #suffix>
+                  <el-icon v-if="!changeApproveMode" class="cursor-pointer" @click="openProjectSelect('changeProject')"><Search /></el-icon>
+                </template>
+              </el-input>
+              <el-input v-else v-model="changeForm.afterContent" type="textarea" :rows="3" :disabled="changeApproveMode" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="工时影响" prop="workloadEffect">
-              <el-input v-model="changeForm.workloadEffect" placeholder="例如：预计工时调整为 8" />
+              <el-input v-model="changeForm.workloadEffect" type="textarea" :rows="2" :disabled="changeApproveMode" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="时间影响" prop="timeEffect">
-              <el-input v-model="changeForm.timeEffect" placeholder="请输入时间影响" />
+              <el-input v-model="changeForm.timeEffect" type="textarea" :rows="2" :disabled="changeApproveMode" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="执行影响" prop="scopeEffect">
-              <el-input v-model="changeForm.scopeEffect" type="textarea" :rows="2" />
+              <el-input v-model="changeForm.scopeEffect" type="textarea" :rows="2" :disabled="changeApproveMode" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="changeApproveMode">
+            <el-form-item label="审批意见" prop="approveComment">
+              <el-input v-model="changeForm.approveComment" type="textarea" :rows="3" />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <template #footer>
         <el-button @click="changeDialog.visible = false">取消</el-button>
-        <el-button type="primary" :loading="buttonLoading" @click="submitChange">确定</el-button>
+        <el-button type="primary" :loading="buttonLoading" @click="handleSubmitChange">{{
+          changeApproveMode ? '提交审批结论' : '保存变更'
+        }}</el-button>
       </template>
     </el-dialog>
 
-    <el-dialog v-model="approveDialog.visible" title="变更审批" width="560px" append-to-body>
-      <el-form ref="approveFormRef" :model="approveForm" :rules="approveRules" label-width="100px">
-        <el-form-item label="审批结论" prop="approveResult">
-          <el-select v-model="approveForm.approveResult" placeholder="请选择审批结论">
-            <el-option v-for="dict in temp_task_change_result" :key="dict.value" :label="dict.label" :value="dict.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="审批意见" prop="approveComment">
-          <el-input v-model="approveForm.approveComment" type="textarea" :rows="3" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <el-button @click="approveDialog.visible = false">取消</el-button>
-        <el-button type="primary" :loading="buttonLoading" @click="submitApprove">确定</el-button>
-      </template>
-    </el-dialog>
-
-    <el-dialog v-model="closeDialog.visible" title="关闭临时任务" width="680px" append-to-body>
-      <el-form ref="closeFormRef" :model="closeForm" :rules="closeRules" label-width="120px">
-        <el-form-item label="实际消耗工时" prop="actualWorkload">
-          <el-input-number v-model="closeForm.actualWorkload" :min="0" :step="0.5" :precision="1" class="w-full" />
-        </el-form-item>
-        <el-form-item label="完成结果" prop="finishResult">
-          <el-select v-model="closeForm.finishResult" placeholder="请选择完成结果">
-            <el-option v-for="dict in temp_task_finish_result" :key="dict.value" :label="dict.label" :value="dict.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item v-if="closeForm.finishResult === '2' || closeForm.finishResult === '3'" label="终止原因" prop="terminateReason">
-          <el-select v-model="closeForm.terminateReason" placeholder="请选择终止原因">
-            <el-option v-for="dict in temp_task_terminate_reason" :key="dict.value" :label="dict.label" :value="dict.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="完成说明" prop="finishRemark">
-          <el-input v-model="closeForm.finishRemark" type="textarea" :rows="4" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <el-button @click="closeDialog.visible = false">取消</el-button>
-        <el-button type="primary" :loading="buttonLoading" @click="submitClose">确定</el-button>
-      </template>
+    <el-dialog v-model="relatedDialog.visible" title="选择已结束原任务" width="900px" append-to-body>
+      <el-table v-loading="relatedDialog.loading" :data="relatedTaskList" border @row-dblclick="selectRelatedTask">
+        <el-table-column type="index" label="序号" width="70" align="center" />
+        <el-table-column label="任务编号" prop="tempTaskCode" width="150" align="center" />
+        <el-table-column label="任务描述" prop="taskDesc" min-width="220" show-overflow-tooltip align="center" />
+        <el-table-column label="完成结果" prop="finishResult" width="130" align="center">
+          <template #default="scope">
+            <dict-tag :options="temp_task_finish_result" :value="scope.row.finishResult" />
+          </template>
+        </el-table-column>
+        <el-table-column label="关闭时间" prop="actualFinishTime" width="160" align="center" />
+        <el-table-column label="操作" width="90" align="center">
+          <template #default="scope">
+            <el-button link type="primary" @click="selectRelatedTask(scope.row)">选择</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
     </el-dialog>
 
     <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
     <approvalRecord ref="approvalRecordRef" />
     <ProjectSelect ref="projectSelectRef" :multiple="false" @confirm-call-back="handleProjectSelect" />
-    <UserSelect ref="userSelectRef" :multiple="false" @confirm-call-back="handleUserSelect" />
+    <UserSelect ref="userSelectRef" :multiple="userSelectMode === 'cc'" @confirm-call-back="handleUserSelect" />
   </div>
 </template>
 
 <script setup name="TempTaskEdit" lang="ts">
-import { FlowCodeEnum } from '@/enums/OAEnum';
 import {
   addTempTask,
+  addTempTaskChange,
   approveTempTaskChange,
   closeTempTask,
   getTempTask,
-  listTempTaskChanges,
-  saveTempTaskChange,
-  submitTempTask,
+  getTempTaskList,
+  listTempTaskChange,
+  tempTaskSubmitAndFlowStart,
   updateTempTask
 } from '@/api/oa/erp/tempTask';
-import { TempTaskChangeForm, TempTaskChangeVO, TempTaskForm } from '@/api/oa/erp/tempTask/types';
+import type { TempTaskChangeForm, TempTaskChangeVO, TempTaskForm, TempTaskVO } from '@/api/oa/erp/tempTask/types';
+import type { ProjectInfoVO } from '@/api/oa/erp/projectInfo/types';
+import { FlowCodeEnum } from '@/enums/OAEnum';
+import ApprovalButton from '@/components/Process/approvalButton.vue';
 import SubmitVerify from '@/components/Process/submitVerify.vue';
 import ApprovalRecord from '@/components/Process/approvalRecord.vue';
-import ApprovalButton from '@/components/Process/approvalButton.vue';
 import ProjectSelect from '@/components/ProjectSelect/index.vue';
 import UserSelect from '@/components/UserSelect/index.vue';
-import type { ProjectInfoVO } from '@/api/oa/erp/projectInfo/types';
-import type { UserVO } from '@/api/system/user/types';
+import FileUpload from '@/components/FileUpload/index.vue';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+type UserSelectMode = 'dispatcher' | 'leader' | 'assignee' | 'cc' | 'changeAssignee';
+type ProjectSelectMode = 'main' | 'changeProject';
+
+const { proxy } = getCurrentInstance() as any;
 const route = useRoute();
 const router = useRouter();
 
 const {
   temp_task_priority,
+  temp_task_status,
   temp_task_finish_result,
   temp_task_terminate_reason,
   temp_task_relate_reason,
@@ -335,6 +424,7 @@ const {
 } = toRefs<any>(
   proxy?.useDict(
     'temp_task_priority',
+    'temp_task_status',
     'temp_task_finish_result',
     'temp_task_terminate_reason',
     'temp_task_relate_reason',
@@ -344,21 +434,22 @@ const {
   )
 );
 
-const pageType = ref<string>((route.query.type as string) || 'add');
-const isReadOnly = computed(() => pageType.value === 'view');
 const pageLoading = ref(false);
 const buttonLoading = ref(false);
+const pageType = ref<string>((route.query.type as string) || 'add');
 const tempTaskFormRef = ref<ElFormInstance>();
-const changeFormRef = ref<ElFormInstance>();
-const approveFormRef = ref<ElFormInstance>();
 const closeFormRef = ref<ElFormInstance>();
+const changeFormRef = ref<ElFormInstance>();
 const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
 const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
 const projectSelectRef = ref<InstanceType<typeof ProjectSelect>>();
 const userSelectRef = ref<InstanceType<typeof UserSelect>>();
+
+const userSelectMode = ref<UserSelectMode>('dispatcher');
+const projectSelectMode = ref<ProjectSelectMode>('main');
 const taskVariables = ref<Record<string, unknown>>({});
 const changeList = ref<TempTaskChangeVO[]>([]);
-const userSelectTarget = ref<'dispatcher' | 'leader' | 'assignee'>('dispatcher');
+const relatedTaskList = ref<TempTaskVO[]>([]);
 
 const initFormData: TempTaskForm = {
   tempTaskId: undefined,
@@ -370,11 +461,14 @@ const initFormData: TempTaskForm = {
   requireTime: undefined,
   confirmFinishTime: undefined,
   actualStartTime: undefined,
+  actualFinishTime: undefined,
   projectId: undefined,
   projectCode: undefined,
   projectName: undefined,
   pmId: undefined,
   pmName: undefined,
+  contractId: undefined,
+  contractCode: undefined,
   requesterId: undefined,
   requesterName: undefined,
   requestDeptId: undefined,
@@ -393,153 +487,422 @@ const initFormData: TempTaskForm = {
   relatedTaskId: undefined,
   relatedTaskCode: undefined,
   relateReason: undefined,
+  relateRemark: undefined,
   taskStatus: '1',
   flowStatus: 'draft',
   ccUserIds: undefined,
   ossId: undefined,
-  remark: undefined
+  remark: undefined,
+  flowCode: FlowCodeEnum.TEMP_TASK_CODE,
+  variables: {},
+  bizExt: {}
 };
 
 const form = ref<TempTaskForm>({ ...initFormData });
-const rules = {
+
+const rules: ElFormRules = {
   taskDesc: [{ required: true, message: '任务描述不能为空', trigger: 'blur' }],
   requireTime: [{ required: true, message: '需求时间不能为空', trigger: 'change' }],
   priority: [{ required: true, message: '优先级不能为空', trigger: 'change' }],
   urgentReason: [
     {
-      validator: (_rule: unknown, value: string, callback: (error?: Error) => void) => {
-        if ((form.value.priority === '3' || form.value.priority === '4') && !value) {
-          callback(new Error('紧急/特急必须填写紧急原因'));
-          return;
+      validator: (_rule, value, callback) => {
+        if (['3', '4'].includes(form.value.priority || '') && !value) {
+          callback(new Error('优先级为紧急/特急时必须填写紧急原因'));
+        } else {
+          callback();
         }
-        callback();
       },
       trigger: 'blur'
     }
+  ],
+  relateReason: [
+    {
+      validator: (_rule, value, callback) => {
+        if (form.value.relatedTaskId && !value) {
+          callback(new Error('关联原任务时必须选择关联原因'));
+        } else {
+          callback();
+        }
+      },
+      trigger: 'change'
+    }
   ]
 };
 
-const changeDialog = reactive({ visible: false });
-const changeForm = ref<TempTaskChangeForm>({});
-const changeRules = {
-  changeType: [{ required: true, message: '变更类型不能为空', trigger: 'change' }],
-  changeReason: [{ required: true, message: '变更原因不能为空', trigger: 'blur' }]
-};
-
-const approveDialog = reactive({ visible: false });
-const approveForm = ref<TempTaskChangeForm>({});
-const approveRules = {
-  approveResult: [{ required: true, message: '审批结论不能为空', trigger: 'change' }]
-};
-
 const closeDialog = reactive({ visible: false });
 const closeForm = ref<TempTaskForm>({});
-const closeRules = {
+const closeRules: ElFormRules = {
   actualWorkload: [{ required: true, message: '实际消耗工时不能为空', trigger: 'blur' }],
   finishResult: [{ required: true, message: '完成结果不能为空', trigger: 'change' }],
-  terminateReason: [
+  finishRemark: [{ required: true, message: '完成说明不能为空', trigger: 'blur' }]
+};
+
+const changeDialog = reactive({ visible: false, title: '发起变更' });
+const changeApproveMode = ref(false);
+const changeForm = ref<TempTaskChangeForm>({});
+const changeRules: ElFormRules = {
+  changeType: [{ required: true, message: '变更类型不能为空', trigger: 'change' }],
+  changeReason: [{ required: true, message: '变更原因不能为空', trigger: 'blur' }],
+  afterContent: [
     {
-      validator: (_rule: unknown, value: string, callback: (error?: Error) => void) => {
-        if ((closeForm.value.finishResult === '2' || closeForm.value.finishResult === '3') && !value) {
-          callback(new Error('终止类完成结果必须选择终止原因'));
-          return;
+      validator: (_rule, value, callback) => {
+        if (!changeApproveMode.value && ['1', '2', '3', '4', '5'].includes(changeForm.value.changeType || '') && !value) {
+          callback(new Error('变更后内容不能为空'));
+        } else {
+          callback();
         }
-        callback();
       },
       trigger: 'change'
     }
   ],
-  finishRemark: [{ required: true, message: '完成说明不能为空', trigger: 'blur' }]
+  approveResult: [{ required: true, message: '审批结论不能为空', trigger: 'change' }]
 };
 
-const resetForm = () => {
-  form.value = { ...initFormData };
+const relatedDialog = reactive({ visible: false, loading: false });
+
+const isReadOnly = computed(() => pageType.value === 'view' || pageType.value === 'approval');
+const canCloseTask = computed(
+  () => !!form.value.tempTaskId && !form.value.finishResult && pageType.value !== 'view' && form.value.taskStatus === '2'
+);
+const canCreateChange = computed(() => !!form.value.tempTaskId && !form.value.finishResult && form.value.taskStatus === '2');
+const isStructuredChange = computed(() => ['4', '5'].includes(changeForm.value.changeType || ''));
+
+const ossIdString = computed({
+  get() {
+    return form.value.ossId ? String(form.value.ossId) : '';
+  },
+  set(val: string) {
+    form.value.ossId = val || undefined;
+  }
+});
+
+const openProjectSelect = (mode: ProjectSelectMode = 'main') => {
+  if (mode === 'main' && isReadOnly.value) {
+    return;
+  }
+  if (mode === 'changeProject' && changeApproveMode.value) {
+    return;
+  }
+  projectSelectMode.value = mode;
+  projectSelectRef.value?.open();
 };
 
-const loadChanges = async () => {
+const handleProjectSelect = (data: ProjectInfoVO[]) => {
+  const project = data?.[0];
+  if (!project) {
+    return;
+  }
+  if (projectSelectMode.value === 'changeProject') {
+    changeForm.value.afterContent = serializeChangeContent({
+      projectId: project.projectId,
+      projectCode: project.projectCode,
+      projectName: project.projectName,
+      pmId: project.managerId,
+      pmName: (project as any).managerName
+    });
+    return;
+  }
+  form.value.projectId = project.projectId;
+  form.value.projectCode = project.projectCode;
+  form.value.projectName = project.projectName;
+  form.value.pmId = project.managerId;
+  form.value.pmName = (project as any).managerName;
+};
+
+const openUserSelect = (mode: UserSelectMode) => {
+  if (mode !== 'changeAssignee' && isReadOnly.value) {
+    return;
+  }
+  if (mode === 'changeAssignee' && changeApproveMode.value) {
+    return;
+  }
+  userSelectMode.value = mode;
+  userSelectRef.value?.open();
+};
+
+const handleUserSelect = (users: Array<Record<string, any>>) => {
+  const selected = users?.[0];
+  if (!selected) {
+    return;
+  }
+  const userId = selected.userId;
+  const name = selected.nickName || selected.userName;
+  if (userSelectMode.value === 'dispatcher') {
+    form.value.dispatcherId = userId;
+    form.value.dispatcherName = name;
+  } else if (userSelectMode.value === 'leader') {
+    form.value.softwareLeaderId = userId;
+    form.value.softwareLeaderName = name;
+  } else if (userSelectMode.value === 'assignee') {
+    form.value.assigneeId = userId;
+    form.value.assigneeName = name;
+  } else if (userSelectMode.value === 'changeAssignee') {
+    changeForm.value.afterContent = serializeChangeContent({
+      assigneeId: userId,
+      assigneeName: name
+    });
+  } else {
+    form.value.ccUserIds = users.map((item) => item.userId).join(',');
+  }
+};
+
+const serializeChangeContent = (content: Record<string, unknown>) => {
+  return JSON.stringify(content);
+};
+
+const parseChangeContent = (content?: string) => {
+  if (!content) {
+    return undefined;
+  }
+  const text = String(content).trim();
+  if (!text.startsWith('{')) {
+    return undefined;
+  }
+  try {
+    return JSON.parse(text) as Record<string, any>;
+  } catch {
+    return undefined;
+  }
+};
+
+const formatChangeContent = (content?: string) => {
+  const parsed = parseChangeContent(content);
+  if (!parsed) {
+    return content || '';
+  }
+  if (parsed.assigneeName) {
+    return parsed.assigneeName;
+  }
+  if (parsed.projectCode || parsed.projectName) {
+    return [parsed.projectCode, parsed.projectName].filter(Boolean).join(' / ');
+  }
+  return parsed.label || parsed.name || parsed.value || '';
+};
+
+const handleChangeTypeChange = () => {
+  if (changeApproveMode.value) {
+    return;
+  }
+  changeForm.value.beforeContent = buildCurrentChangeContent(changeForm.value.changeType);
+  changeForm.value.afterContent = undefined;
+};
+
+const buildCurrentChangeContent = (changeType?: string) => {
+  if (changeType === '1') {
+    return form.value.taskDesc;
+  }
+  if (changeType === '2') {
+    return form.value.estimateWorkload == null ? undefined : String(form.value.estimateWorkload);
+  }
+  if (changeType === '3') {
+    return form.value.confirmFinishTime;
+  }
+  if (changeType === '4') {
+    return serializeChangeContent({
+      assigneeId: form.value.assigneeId,
+      assigneeName: form.value.assigneeName
+    });
+  }
+  if (changeType === '5') {
+    return serializeChangeContent({
+      projectId: form.value.projectId,
+      projectCode: form.value.projectCode,
+      projectName: form.value.projectName,
+      pmId: form.value.pmId,
+      pmName: form.value.pmName
+    });
+  }
+  return undefined;
+};
+
+const loadDetail = async (id: string | number) => {
+  const res = await getTempTask(id);
+  form.value = {
+    ...initFormData,
+    ...res.data,
+    flowCode: FlowCodeEnum.TEMP_TASK_CODE
+  };
+  await loadChangeList();
+};
+
+const loadChangeList = async () => {
   if (!form.value.tempTaskId) {
     changeList.value = [];
     return;
   }
-  const res = await listTempTaskChanges(form.value.tempTaskId);
+  const res = await listTempTaskChange(form.value.tempTaskId);
   changeList.value = res.data || [];
 };
 
-const loadDetail = async (id?: string | number) => {
-  resetForm();
-  if (!id) {
-    return;
-  }
-  const res = await getTempTask(id);
-  Object.assign(form.value, res.data || {});
-  await loadChanges();
-};
-
-const buildPayload = (): TempTaskForm => {
-  return {
-    ...form.value,
-    flowCode: FlowCodeEnum.TEMP_TASK_CODE,
-    variables: {
-      has_dispatcher: form.value.dispatcherId ? '1' : '0',
-      extra_approval_required: '0',
-      has_change: '0',
-      dispatcherId: form.value.dispatcherId,
-      requesterId: form.value.requesterId,
-      softwareLeaderId: form.value.softwareLeaderId,
-      assigneeId: form.value.assigneeId,
-      taskTitle: form.value.taskTitle,
-      taskDesc: form.value.taskDesc,
-      projectId: form.value.projectId,
-      contractId: form.value.contractId,
-      priority: form.value.priority,
-      urgentReason: form.value.urgentReason,
-      requireTime: form.value.requireTime,
-      estimateWorkload: form.value.estimateWorkload,
-      confirmFinishTime: form.value.confirmFinishTime,
-      actualStartTime: form.value.actualStartTime,
-      actualWorkload: form.value.actualWorkload,
-      finishResult: form.value.finishResult,
-      terminateReason: form.value.terminateReason,
-      finishRemark: form.value.finishRemark,
-      ccUserIds: form.value.ccUserIds
-    },
-    bizExt: {
-      businessId: form.value.tempTaskId,
-      businessCode: form.value.tempTaskCode,
-      businessTitle: `${form.value.tempTaskCode || '临时任务'}-${form.value.taskDesc || form.value.taskTitle || ''}`
+const buildVariables = () => {
+  taskVariables.value = {
+    ignore: true,
+    has_dispatcher: form.value.dispatcherId ? '1' : '0',
+    extra_approval_required: (form.value.variables as Record<string, unknown>)?.extra_approval_required || '0',
+    has_change: (form.value.pendingChangeCount || 0) > 0 ? '1' : '0',
+    dispatcherId: form.value.dispatcherId,
+    requesterId: form.value.requesterId,
+    requestDeptId: form.value.requestDeptId,
+    softwareLeaderId: form.value.softwareLeaderId,
+    assigneeId: form.value.assigneeId,
+    ccUserIds: form.value.ccUserIds,
+    taskTitle: form.value.taskTitle,
+    taskDesc: form.value.taskDesc,
+    priority: form.value.priority,
+    urgentReason: form.value.urgentReason,
+    requireTime: form.value.requireTime,
+    confirmFinishTime: form.value.confirmFinishTime,
+    projectId: form.value.projectId,
+    contractId: form.value.contractId,
+    estimateWorkload: form.value.estimateWorkload,
+    actualWorkload: form.value.actualWorkload,
+    actualStartTime: form.value.actualStartTime,
+    finishResult: form.value.finishResult,
+    terminateReason: form.value.terminateReason,
+    finishRemark: form.value.finishRemark
+  };
+  Object.keys(taskVariables.value).forEach((key) => {
+    if (taskVariables.value[key] === undefined || taskVariables.value[key] === null || taskVariables.value[key] === '') {
+      delete taskVariables.value[key];
     }
+  });
+  form.value.variables = { ...taskVariables.value };
+  form.value.bizExt = {
+    businessId: form.value.tempTaskId,
+    businessCode: form.value.tempTaskCode,
+    businessTitle: `${form.value.tempTaskCode || '临时任务'}-${form.value.taskDesc || form.value.taskTitle || ''}`
   };
 };
 
+const validateMainForm = async () => {
+  if (!tempTaskFormRef.value) {
+    return true;
+  }
+  return await tempTaskFormRef.value.validate().catch(() => false);
+};
+
 const submitForm = async (status: string) => {
-  await tempTaskFormRef.value?.validate();
-  if (status !== 'draft' && !form.value.softwareLeaderId) {
-    proxy?.$modal.msgError('提交审批前必须选择软件部领导');
+  const valid = await validateMainForm();
+  if (!valid) {
     return;
   }
   buttonLoading.value = true;
   try {
-    const payload = buildPayload();
+    buildVariables();
     if (status !== 'draft') {
-      const res = await submitTempTask(payload);
-      Object.assign(form.value, res.data || {});
-      proxy?.$modal.msgSuccess('提交成功');
-    } else if (payload.tempTaskId) {
-      await updateTempTask(payload);
-      proxy?.$modal.msgSuccess('暂存成功');
+      const res = await tempTaskSubmitAndFlowStart(form.value);
+      form.value = { ...initFormData, ...res.data, flowCode: FlowCodeEnum.TEMP_TASK_CODE };
+      proxy?.$modal.msgSuccess('操作成功');
     } else {
-      await addTempTask(payload);
+      form.value.taskStatus = '1';
+      form.value.flowStatus = 'draft';
+      if (form.value.tempTaskId) {
+        await updateTempTask(form.value);
+      } else {
+        await addTempTask(form.value);
+      }
       proxy?.$modal.msgSuccess('暂存成功');
     }
-    proxy?.$tab.closePage();
+    proxy?.$tab.closePage(route);
     router.go(-1);
   } finally {
     buttonLoading.value = false;
   }
 };
 
+const openCloseDialog = () => {
+  closeForm.value = {
+    tempTaskId: form.value.tempTaskId,
+    actualStartTime: form.value.actualStartTime,
+    actualWorkload: form.value.actualWorkload,
+    finishResult: form.value.finishResult,
+    terminateReason: form.value.terminateReason,
+    finishRemark: form.value.finishRemark
+  };
+  closeDialog.visible = true;
+};
+
+const handleCloseTask = async () => {
+  const valid = await closeFormRef.value?.validate().catch(() => false);
+  if (!valid) {
+    return;
+  }
+  buttonLoading.value = true;
+  try {
+    await closeTempTask(closeForm.value);
+    proxy?.$modal.msgSuccess('关闭成功，请继续完成当前流程节点审批');
+    closeDialog.visible = false;
+    if (form.value.tempTaskId) {
+      await loadDetail(form.value.tempTaskId);
+    }
+  } finally {
+    buttonLoading.value = false;
+  }
+};
+
+const openChangeDialog = () => {
+  changeApproveMode.value = false;
+  changeDialog.title = '发起变更';
+  changeForm.value = {
+    tempTaskId: form.value.tempTaskId,
+    tempTaskCode: form.value.tempTaskCode
+  };
+  changeDialog.visible = true;
+};
+
+const openApproveChangeDialog = (row: TempTaskChangeVO) => {
+  changeApproveMode.value = true;
+  changeDialog.title = '审批变更';
+  changeForm.value = { ...row };
+  changeDialog.visible = true;
+};
+
+const handleSubmitChange = async () => {
+  const valid = await changeFormRef.value?.validate().catch(() => false);
+  if (!valid) {
+    return;
+  }
+  buttonLoading.value = true;
+  try {
+    if (changeApproveMode.value) {
+      await approveTempTaskChange(changeForm.value);
+    } else {
+      await addTempTaskChange(changeForm.value);
+    }
+    proxy?.$modal.msgSuccess('操作成功');
+    changeDialog.visible = false;
+    await loadChangeList();
+    if (form.value.tempTaskId) {
+      await loadDetail(form.value.tempTaskId);
+    }
+  } finally {
+    buttonLoading.value = false;
+  }
+};
+
+const openRelatedTaskDialog = async () => {
+  if (isReadOnly.value) {
+    return;
+  }
+  relatedDialog.visible = true;
+  relatedDialog.loading = true;
+  try {
+    const res = await getTempTaskList({ taskStatus: '3', pageNum: 1, pageSize: 50 });
+    relatedTaskList.value = res.data || [];
+  } finally {
+    relatedDialog.loading = false;
+  }
+};
+
+const selectRelatedTask = (row: TempTaskVO) => {
+  form.value.relatedTaskId = row.tempTaskId;
+  form.value.relatedTaskCode = row.tempTaskCode;
+  relatedDialog.visible = false;
+};
+
 const approvalVerifyOpen = async () => {
-  taskVariables.value = buildPayload().variables || {};
+  buildVariables();
   const taskId = route.query.taskId as string;
   if (taskId) {
     await submitVerifyRef.value?.openDialog(taskId);
@@ -557,141 +920,16 @@ const submitCallback = async () => {
   router.go(-1);
 };
 
-const openProjectSelect = () => {
-  if (!isReadOnly.value) {
-    projectSelectRef.value?.open();
-  }
-};
-
-const handleProjectSelect = (data: ProjectInfoVO[]) => {
-  if (!data?.length) {
-    return;
-  }
-  const project = data[0];
-  form.value.projectId = project.projectId;
-  form.value.projectCode = project.projectCode;
-  form.value.projectName = project.projectName;
-  form.value.pmId = project.managerId;
-  form.value.pmName = project.managerName;
-};
-
-const openUserSelect = (target: 'dispatcher' | 'leader' | 'assignee') => {
-  if (isReadOnly.value) {
-    return;
-  }
-  userSelectTarget.value = target;
-  userSelectRef.value?.open();
-};
-
-const handleUserSelect = (users: UserVO[]) => {
-  const user = users?.[0];
-  if (!user) {
-    return;
-  }
-  if (userSelectTarget.value === 'dispatcher') {
-    form.value.dispatcherId = user.userId;
-    form.value.dispatcherName = user.nickName;
-  } else if (userSelectTarget.value === 'leader') {
-    form.value.softwareLeaderId = user.userId;
-    form.value.softwareLeaderName = user.nickName;
-  } else {
-    form.value.assigneeId = user.userId;
-    form.value.assigneeName = user.nickName;
-  }
-};
-
-const openChangeDialog = () => {
-  changeForm.value = {
-    tempTaskId: form.value.tempTaskId,
-    tempTaskCode: form.value.tempTaskCode,
-    beforeContent: form.value.taskDesc
-  };
-  changeDialog.visible = true;
-};
-
-const submitChange = async () => {
-  await changeFormRef.value?.validate();
-  buttonLoading.value = true;
-  try {
-    await saveTempTaskChange(changeForm.value);
-    proxy?.$modal.msgSuccess('变更已提交');
-    changeDialog.visible = false;
-    await loadChanges();
-  } finally {
-    buttonLoading.value = false;
-  }
-};
-
-const openApproveDialog = (row: TempTaskChangeVO) => {
-  approveForm.value = {
-    changeId: row.changeId,
-    approveResult: undefined,
-    approveComment: undefined
-  };
-  approveDialog.visible = true;
-};
-
-const submitApprove = async () => {
-  await approveFormRef.value?.validate();
-  buttonLoading.value = true;
-  try {
-    await approveTempTaskChange(approveForm.value);
-    proxy?.$modal.msgSuccess('审批成功');
-    approveDialog.visible = false;
-    await loadDetail(form.value.tempTaskId);
-  } finally {
-    buttonLoading.value = false;
-  }
-};
-
-const openCloseDialog = () => {
-  closeForm.value = {
-    tempTaskId: form.value.tempTaskId,
-    actualWorkload: form.value.actualWorkload,
-    finishResult: form.value.finishResult,
-    terminateReason: form.value.terminateReason,
-    finishRemark: form.value.finishRemark
-  };
-  closeDialog.visible = true;
-};
-
-const submitClose = async () => {
-  await closeFormRef.value?.validate();
-  buttonLoading.value = true;
-  try {
-    await closeTempTask(closeForm.value);
-    proxy?.$modal.msgSuccess('关闭成功');
-    closeDialog.visible = false;
-    proxy?.$tab.closePage();
-    router.go(-1);
-  } finally {
-    buttonLoading.value = false;
-  }
-};
-
 onMounted(async () => {
   pageLoading.value = true;
   try {
     pageType.value = (route.query.type as string) || 'add';
-    await loadDetail(route.query.id as string | number | undefined);
-    if (pageType.value === 'change' && form.value.tempTaskId) {
-      openChangeDialog();
-    }
-    if (pageType.value === 'close' && form.value.tempTaskId) {
-      openCloseDialog();
+    const id = route.query.id as string | number | undefined;
+    if (id) {
+      await loadDetail(id);
     }
   } finally {
     pageLoading.value = false;
   }
 });
 </script>
-
-<style scoped>
-.card-header,
-.header-actions {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 12px;
-}
-</style>
diff --git a/src/views/oa/erp/tempTask/index.vue b/src/views/oa/erp/tempTask/index.vue
index ac13b3a..0342693 100644
--- a/src/views/oa/erp/tempTask/index.vue
+++ b/src/views/oa/erp/tempTask/index.vue
@@ -15,6 +15,13 @@
                 <el-option v-for="dict in temp_task_priority" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
+            <el-form-item label="项目" prop="projectName">
+              <el-input v-model="queryParams.projectName" placeholder="请选择项目" clearable readonly>
+                <template #suffix>
+                  <el-icon class="cursor-pointer" @click="openProjectSelect"><Search /></el-icon>
+                </template>
+              </el-input>
+            </el-form-item>
             <el-form-item label="发起人" prop="requesterName">
               <el-input v-model="queryParams.requesterName" placeholder="请输入发起人" clearable @keyup.enter="handleQuery" />
             </el-form-item>
@@ -24,8 +31,10 @@
             <el-form-item label="执行人" prop="assigneeName">
               <el-input v-model="queryParams.assigneeName" placeholder="请输入执行人" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="项目" prop="projectName">
-              <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="业务状态" prop="taskStatus">
+              <el-select v-model="queryParams.taskStatus" placeholder="请选择业务状态" clearable>
+                <el-option v-for="dict in temp_task_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
             </el-form-item>
             <el-form-item label="完成结果" prop="finishResult">
               <el-select v-model="queryParams.finishResult" placeholder="请选择完成结果" clearable>
@@ -43,93 +52,109 @@
 
     <el-card shadow="never">
       <template #header>
-        <div class="toolbar-row">
-          <div>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oa:erp:tempTask:add']">新增</el-button>
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['oa:erp:tempTask:edit']"
-              >修改</el-button
-            >
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['oa:erp:tempTask:remove']"
-              >删除</el-button
-            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['oa:erp:tempTask:edit']">
+              修改
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['oa:erp:tempTask:remove']">
+              删除
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa:erp:tempTask:export']">导出</el-button>
-          </div>
+          </el-col>
           <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList" />
-        </div>
+        </el-row>
       </template>
 
       <el-tabs v-model="activeTab" class="mb-2" @tab-change="handleTabChange">
+        <el-tab-pane label="全部" name="all" />
         <el-tab-pane label="草稿" name="draft" />
         <el-tab-pane label="在办/未关闭" name="running" />
         <el-tab-pane label="已结束" name="finished" />
-        <el-tab-pane label="全部" name="all" />
       </el-tabs>
 
       <el-table v-loading="loading" border :data="tempTaskList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="45" align="center" />
-        <el-table-column type="index" label="序号" width="60" align="center" />
-        <el-table-column label="任务编号" prop="tempTaskCode" min-width="150" show-overflow-tooltip v-if="columns[0].visible" />
-        <el-table-column label="任务描述" prop="taskDesc" min-width="220" show-overflow-tooltip v-if="columns[1].visible" />
-        <el-table-column label="优先级" prop="priority" width="90" align="center" v-if="columns[2].visible">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column type="index" label="序号" width="70" align="center" v-if="columns[0].visible" />
+        <el-table-column label="任务编号" prop="tempTaskCode" min-width="150" align="center" v-if="columns[1].visible" />
+        <el-table-column label="任务标题" prop="taskTitle" min-width="160" show-overflow-tooltip align="center" v-if="columns[2].visible" />
+        <el-table-column label="任务描述" prop="taskDesc" min-width="220" show-overflow-tooltip align="center" v-if="columns[3].visible" />
+        <el-table-column label="优先级" prop="priority" width="90" align="center" v-if="columns[4].visible">
           <template #default="scope">
             <dict-tag :options="temp_task_priority" :value="scope.row.priority" />
           </template>
         </el-table-column>
-        <el-table-column label="发起人" prop="requesterName" width="110" align="center" v-if="columns[3].visible" />
-        <el-table-column label="发起部门" prop="requestDeptName" min-width="130" show-overflow-tooltip v-if="columns[4].visible" />
-        <el-table-column label="指派人" prop="dispatcherName" width="110" align="center" v-if="columns[5].visible" />
-        <el-table-column label="执行人" prop="assigneeName" width="110" align="center" v-if="columns[6].visible" />
-        <el-table-column label="项目" prop="projectName" min-width="160" show-overflow-tooltip v-if="columns[7].visible" />
-        <el-table-column label="需求时间" prop="requireTime" width="160" align="center" v-if="columns[8].visible">
+        <el-table-column label="需求时间" prop="requireTime" width="150" align="center" v-if="columns[5].visible">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.requireTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+            <span>{{ parseTime(scope.row.requireTime, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="确认完成" prop="confirmFinishTime" width="160" align="center" v-if="columns[9].visible">
+        <el-table-column label="确认完成时间" prop="confirmFinishTime" width="150" align="center" v-if="columns[6].visible">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.confirmFinishTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+            <span>{{ parseTime(scope.row.confirmFinishTime, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="预计工时" prop="estimateWorkload" width="100" align="right" v-if="columns[10].visible" />
-        <el-table-column label="实际工时" prop="actualWorkload" width="100" align="right" v-if="columns[11].visible" />
-        <el-table-column label="业务状态" prop="taskStatus" width="100" align="center" v-if="columns[12].visible">
+        <el-table-column label="项目编号" prop="projectCode" width="140" align="center" v-if="columns[7].visible" />
+        <el-table-column label="项目名称" prop="projectName" min-width="170" show-overflow-tooltip align="center" v-if="columns[8].visible" />
+        <el-table-column label="发起人" prop="requesterName" width="100" align="center" v-if="columns[9].visible" />
+        <el-table-column label="发起部门" prop="requestDeptName" width="130" align="center" v-if="columns[10].visible" />
+        <el-table-column label="指派人" prop="dispatcherName" width="100" align="center" v-if="columns[11].visible" />
+        <el-table-column label="软件部领导" prop="softwareLeaderName" width="120" align="center" v-if="columns[12].visible" />
+        <el-table-column label="主执行人" prop="assigneeName" width="110" align="center" v-if="columns[13].visible" />
+        <el-table-column label="预计工时" prop="estimateWorkload" width="100" align="center" v-if="columns[14].visible" />
+        <el-table-column label="实际工时" prop="actualWorkload" width="100" align="center" v-if="columns[15].visible" />
+        <el-table-column label="业务状态" prop="taskStatus" width="100" align="center" v-if="columns[16].visible">
           <template #default="scope">
             <dict-tag :options="temp_task_status" :value="scope.row.taskStatus" />
           </template>
         </el-table-column>
-        <el-table-column label="流程状态" prop="flowStatus" width="110" align="center" v-if="columns[13].visible">
+        <el-table-column label="流程状态" prop="flowStatus" width="100" align="center" v-if="columns[17].visible">
           <template #default="scope">
             <dict-tag :options="wf_business_status" :value="scope.row.flowStatus" />
           </template>
         </el-table-column>
-        <el-table-column label="完成结果" prop="finishResult" width="130" align="center" v-if="columns[14].visible">
+        <el-table-column label="完成结果" prop="finishResult" width="130" align="center" v-if="columns[18].visible">
           <template #default="scope">
             <dict-tag :options="temp_task_finish_result" :value="scope.row.finishResult" />
           </template>
         </el-table-column>
-        <el-table-column label="变更" width="90" align="center" v-if="columns[15].visible">
+        <el-table-column label="待审批变更" prop="pendingChangeCount" width="110" align="center" v-if="columns[19].visible" />
+        <el-table-column label="创建时间" prop="createTime" width="160" align="center" v-if="columns[20].visible">
           <template #default="scope">
-            <el-tag :type="scope.row.pendingChangeCount > 0 ? 'warning' : 'info'">
-              {{ scope.row.pendingChangeCount || 0 }}/{{ scope.row.changeCount || 0 }}
-            </el-tag>
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" width="220" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" fixed="right" width="190" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="查看" placement="top">
               <el-button link type="primary" icon="View" @click="handleView(scope.row)" />
             </el-tooltip>
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa:erp:tempTask:edit']" />
+              <el-button
+                v-if="canEdit(scope.row)"
+                link
+                type="primary"
+                icon="Edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['oa:erp:tempTask:edit']"
+              />
             </el-tooltip>
-            <el-tooltip content="提交" placement="top">
-              <el-button link type="success" icon="Promotion" @click="handleSubmit(scope.row)" v-hasPermi="['oa:erp:tempTask:submit']" />
-            </el-tooltip>
-            <el-tooltip content="变更" placement="top">
-              <el-button link type="warning" icon="RefreshRight" @click="handleChange(scope.row)" v-hasPermi="['oa:erp:tempTask:change']" />
-            </el-tooltip>
-            <el-tooltip content="关闭" placement="top">
-              <el-button link type="danger" icon="CircleClose" @click="handleClose(scope.row)" v-hasPermi="['oa:erp:tempTask:close']" />
+            <el-tooltip content="删除" placement="top">
+              <el-button
+                v-if="canEdit(scope.row)"
+                link
+                type="primary"
+                icon="Delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['oa:erp:tempTask:remove']"
+              />
             </el-tooltip>
           </template>
         </el-table-column>
@@ -137,17 +162,30 @@
 
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
+
+    <ProjectSelect ref="projectSelectRef" :multiple="false" @confirm-call-back="handleProjectSelect" />
   </div>
 </template>
 
 <script setup name="TempTask" lang="ts">
-import { delTempTask, listTempTask, submitTempTask } from '@/api/oa/erp/tempTask';
-import { TempTaskQuery, TempTaskVO } from '@/api/oa/erp/tempTask/types';
-import { FlowCodeEnum } from '@/enums/OAEnum';
+import { delTempTask, listTempTask } from '@/api/oa/erp/tempTask';
+import type { TempTaskQuery, TempTaskVO } from '@/api/oa/erp/tempTask/types';
+import ProjectSelect from '@/components/ProjectSelect/index.vue';
+import type { ProjectInfoVO } from '@/api/oa/erp/projectInfo/types';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { proxy } = getCurrentInstance() as any;
 const router = useRouter();
 
+const parseTime = (time?: string, pattern?: string) => {
+  if (!time) {
+    return '';
+  }
+  if (proxy?.parseTime) {
+    return proxy.parseTime(time, pattern);
+  }
+  return String(time).replace('T', ' ').slice(0, 16);
+};
+
 const { temp_task_priority, temp_task_status, temp_task_finish_result, wf_business_status } = toRefs<any>(
   proxy?.useDict('temp_task_priority', 'temp_task_status', 'temp_task_finish_result', 'wf_business_status')
 );
@@ -159,26 +197,33 @@ const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const activeTab = ref('running');
+const activeTab = ref('all');
+
 const queryFormRef = ref<ElFormInstance>();
+const projectSelectRef = ref<InstanceType<typeof ProjectSelect>>();
 
 const columns = ref<FieldOption[]>([
-  { key: 0, label: '任务编号', visible: true },
-  { key: 1, label: '任务描述', visible: true },
-  { key: 2, label: '优先级', visible: true },
-  { key: 3, label: '发起人', visible: true },
-  { key: 4, label: '发起部门', visible: true },
-  { key: 5, label: '指派人', visible: true },
-  { key: 6, label: '执行人', visible: true },
-  { key: 7, label: '项目', visible: true },
-  { key: 8, label: '需求时间', visible: true },
-  { key: 9, label: '确认完成', visible: true },
-  { key: 10, label: '预计工时', visible: true },
-  { key: 11, label: '实际工时', visible: true },
-  { key: 12, label: '业务状态', visible: true },
-  { key: 13, label: '流程状态', visible: true },
-  { key: 14, label: '完成结果', visible: true },
-  { key: 15, label: '变更', visible: true }
+  { key: 0, label: '序号', visible: true },
+  { key: 1, label: '任务编号', visible: true },
+  { key: 2, label: '任务标题', visible: true },
+  { key: 3, label: '任务描述', visible: true },
+  { key: 4, label: '优先级', visible: true },
+  { key: 5, label: '需求时间', visible: true },
+  { key: 6, label: '确认完成时间', visible: true },
+  { key: 7, label: '项目编号', visible: true },
+  { key: 8, label: '项目名称', visible: true },
+  { key: 9, label: '发起人', visible: true },
+  { key: 10, label: '发起部门', visible: true },
+  { key: 11, label: '指派人', visible: true },
+  { key: 12, label: '软件部领导', visible: true },
+  { key: 13, label: '主执行人', visible: true },
+  { key: 14, label: '预计工时', visible: true },
+  { key: 15, label: '实际工时', visible: true },
+  { key: 16, label: '业务状态', visible: true },
+  { key: 17, label: '流程状态', visible: true },
+  { key: 18, label: '完成结果', visible: true },
+  { key: 19, label: '待审批变更', visible: true },
+  { key: 20, label: '创建时间', visible: true }
 ]);
 
 const queryParams = ref<TempTaskQuery>({
@@ -187,38 +232,38 @@ const queryParams = ref<TempTaskQuery>({
   tempTaskCode: undefined,
   taskDesc: undefined,
   priority: undefined,
+  projectId: undefined,
+  projectName: undefined,
   requesterName: undefined,
   dispatcherName: undefined,
   assigneeName: undefined,
-  projectName: undefined,
+  taskStatus: undefined,
+  flowStatus: undefined,
   finishResult: undefined,
-  taskStatus: '2',
   params: {}
 });
 
-const applyTabQuery = () => {
-  queryParams.value.taskStatus = undefined;
-  queryParams.value.flowStatus = undefined;
-  queryParams.value.finishResult = undefined;
+const applyTabFilter = () => {
   if (activeTab.value === 'draft') {
     queryParams.value.taskStatus = '1';
+    queryParams.value.finishResult = undefined;
   } else if (activeTab.value === 'running') {
     queryParams.value.taskStatus = '2';
+    queryParams.value.finishResult = undefined;
   } else if (activeTab.value === 'finished') {
     queryParams.value.taskStatus = '3';
+  } else {
+    queryParams.value.taskStatus = undefined;
+    queryParams.value.finishResult = undefined;
   }
 };
 
 const getList = async () => {
   loading.value = true;
-  try {
-    applyTabQuery();
-    const res = await listTempTask(queryParams.value);
-    tempTaskList.value = res.rows || [];
-    total.value = res.total || 0;
-  } finally {
-    loading.value = false;
-  }
+  applyTabFilter();
+  const res = await listTempTask(queryParams.value).finally(() => (loading.value = false));
+  tempTaskList.value = res.rows;
+  total.value = res.total;
 };
 
 const handleQuery = () => {
@@ -228,6 +273,8 @@ const handleQuery = () => {
 
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
+  queryParams.value.projectId = undefined;
+  queryParams.value.projectName = undefined;
   handleQuery();
 };
 
@@ -241,12 +288,30 @@ const handleSelectionChange = (selection: TempTaskVO[]) => {
   multiple.value = !selection.length;
 };
 
+const openProjectSelect = () => {
+  projectSelectRef.value?.open();
+};
+
+const handleProjectSelect = (data: ProjectInfoVO[]) => {
+  const project = data?.[0];
+  if (!project) {
+    return;
+  }
+  queryParams.value.projectId = project.projectId;
+  queryParams.value.projectCode = project.projectCode;
+  queryParams.value.projectName = project.projectName;
+};
+
+const canEdit = (row: TempTaskVO) => {
+  return !row.finishResult && ['draft', 'back', 'cancel'].includes(row.flowStatus || '');
+};
+
 const openEditPage = (type: string, id?: string | number) => {
   router.push({
     path: '/oa/erp/tempTask/edit',
     query: {
-      id,
-      type
+      type,
+      ...(id ? { id } : {})
     }
   });
 };
@@ -260,25 +325,10 @@ const handleView = (row: TempTaskVO) => {
 };
 
 const handleUpdate = (row?: TempTaskVO) => {
-  openEditPage('update', row?.tempTaskId || ids.value[0]);
-};
-
-const handleChange = (row: TempTaskVO) => {
-  openEditPage('change', row.tempTaskId);
-};
-
-const handleClose = (row: TempTaskVO) => {
-  openEditPage('close', row.tempTaskId);
-};
-
-const handleSubmit = async (row: TempTaskVO) => {
-  await proxy?.$modal.confirm(`是否确认提交临时任务"${row.tempTaskCode || row.taskTitle}"审批？`);
-  await submitTempTask({
-    ...row,
-    flowCode: FlowCodeEnum.TEMP_TASK_CODE
-  });
-  proxy?.$modal.msgSuccess('提交成功');
-  await getList();
+  const id = row?.tempTaskId || ids.value[0];
+  if (id) {
+    openEditPage('update', id);
+  }
 };
 
 const handleDelete = async (row?: TempTaskVO) => {
@@ -290,19 +340,16 @@ const handleDelete = async (row?: TempTaskVO) => {
 };
 
 const handleExport = () => {
-  proxy?.download('oa/erp/tempTask/export', { ...queryParams.value }, `tempTask_${new Date().getTime()}.xlsx`);
+  proxy?.download(
+    'oa/erp/tempTask/export',
+    {
+      ...queryParams.value
+    },
+    `tempTask_${new Date().getTime()}.xlsx`
+  );
 };
 
 onMounted(() => {
   getList();
 });
 </script>
-
-<style scoped>
-.toolbar-row {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 12px;
-}
-</style>
diff --git a/src/views/oa/erp/tempTask/report.vue b/src/views/oa/erp/tempTask/report.vue
new file mode 100644
index 0000000..86682ed
--- /dev/null
+++ b/src/views/oa/erp/tempTask/report.vue
@@ -0,0 +1,286 @@
+<template>
+  <div class="p-2">
+    <el-card shadow="never" class="mb-3">
+      <el-form :model="queryParams" :inline="true" label-width="90px">
+        <el-form-item label="关闭月份">
+          <el-date-picker
+            v-model="finishMonth"
+            type="month"
+            value-format="YYYY-MM"
+            placeholder="请选择月份"
+            clearable
+            @change="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="执行人">
+          <el-input v-model="queryParams.assigneeName" placeholder="请输入执行人" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="项目">
+          <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="发起部门">
+          <el-input v-model="queryParams.requestDeptName" placeholder="请输入发起部门" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="完成结果">
+          <el-select v-model="queryParams.finishResult" placeholder="请选择完成结果" clearable>
+            <el-option v-for="dict in temp_task_finish_result" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa:erp:tempTask:export']">导出明细</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <div class="metric-grid mb-3">
+      <el-card v-for="item in metrics" :key="item.label" shadow="never">
+        <div class="metric-label">{{ item.label }}</div>
+        <div class="metric-value">{{ item.value }}</div>
+      </el-card>
+    </div>
+
+    <el-card shadow="never">
+      <el-tabs v-model="activeDimension">
+        <el-tab-pane label="按人员" name="assignee" />
+        <el-tab-pane label="按项目" name="project" />
+        <el-tab-pane label="按发起部门" name="dept" />
+        <el-tab-pane label="按完成结果" name="result" />
+        <el-tab-pane label="按关联链" name="chain" />
+      </el-tabs>
+
+      <el-table v-loading="loading" :data="activeRows" border>
+        <el-table-column type="index" label="序号" width="70" align="center" />
+        <el-table-column :label="dimensionLabel" prop="name" min-width="220" show-overflow-tooltip align="center" />
+        <el-table-column label="任务数" prop="count" width="100" align="center" />
+        <el-table-column label="实际工时" prop="workload" width="120" align="center" />
+        <el-table-column label="平均工时" prop="avgWorkload" width="120" align="center" />
+        <el-table-column label="已完成" prop="finishedCount" width="100" align="center" />
+        <el-table-column label="不执行/终止" prop="terminatedCount" width="120" align="center" />
+        <el-table-column label="部分完成后终止" prop="partialTerminatedCount" width="140" align="center" />
+      </el-table>
+
+      <el-divider />
+
+      <el-table :data="detailRows" border>
+        <el-table-column type="index" label="序号" width="70" align="center" />
+        <el-table-column label="任务编号" prop="tempTaskCode" width="150" align="center" />
+        <el-table-column label="任务描述" prop="taskDesc" min-width="240" show-overflow-tooltip align="center" />
+        <el-table-column label="主执行人" prop="assigneeName" width="110" align="center" />
+        <el-table-column label="项目名称" prop="projectName" min-width="170" show-overflow-tooltip align="center" />
+        <el-table-column label="发起部门" prop="requestDeptName" width="130" align="center" />
+        <el-table-column label="完成结果" prop="finishResult" width="130" align="center">
+          <template #default="scope">
+            <dict-tag :options="temp_task_finish_result" :value="scope.row.finishResult" />
+          </template>
+        </el-table-column>
+        <el-table-column label="实际工时" prop="actualWorkload" width="100" align="center" />
+        <el-table-column label="关闭时间" prop="actualFinishTime" width="160" align="center">
+          <template #default="scope">
+            <span>{{ formatDateTime(scope.row.actualFinishTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="关联原任务" prop="relatedTaskCode" width="150" align="center" />
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<script setup name="TempTaskReport" lang="ts">
+import { listTempTask } from '@/api/oa/erp/tempTask';
+import type { TempTaskQuery, TempTaskVO } from '@/api/oa/erp/tempTask/types';
+
+interface AggregateRow {
+  name: string;
+  count: number;
+  workload: number;
+  avgWorkload: number;
+  finishedCount: number;
+  terminatedCount: number;
+  partialTerminatedCount: number;
+}
+
+const { proxy } = getCurrentInstance() as any;
+const { temp_task_finish_result } = toRefs<any>(proxy?.useDict('temp_task_finish_result'));
+
+const loading = ref(false);
+const activeDimension = ref('assignee');
+const currentMonth = () => {
+  const now = new Date();
+  return `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}`;
+};
+const finishMonth = ref(currentMonth());
+const detailRows = ref<TempTaskVO[]>([]);
+const runningTotal = ref(0);
+
+const queryParams = ref<TempTaskQuery>({
+  pageNum: 1,
+  pageSize: 1000,
+  taskStatus: '3',
+  finishResult: undefined,
+  assigneeName: undefined,
+  projectName: undefined,
+  requestDeptName: undefined,
+  params: {}
+});
+
+const monthRange = computed(() => {
+  if (!finishMonth.value) {
+    return {};
+  }
+  const [year, month] = finishMonth.value.split('-').map(Number);
+  const end = new Date(year, month, 0);
+  return {
+    beginActualFinishTime: `${finishMonth.value}-01 00:00:00`,
+    endActualFinishTime: `${finishMonth.value}-${String(end.getDate()).padStart(2, '0')} 23:59:59`
+  };
+});
+
+const filteredRows = computed(() => {
+  return detailRows.value.filter((row) => row.finishResult && row.actualFinishTime);
+});
+
+const totalWorkload = computed(() => sumWorkload(filteredRows.value));
+
+const metrics = computed(() => [
+  { label: '闭环任务数', value: filteredRows.value.length },
+  { label: '实际工时合计', value: formatNumber(totalWorkload.value) },
+  { label: '单任务平均工时', value: formatNumber(filteredRows.value.length ? totalWorkload.value / filteredRows.value.length : 0) },
+  { label: '未关闭任务数', value: runningTotal.value }
+]);
+
+const dimensionLabel = computed(() => {
+  const labelMap: Record<string, string> = {
+    assignee: '主执行人',
+    project: '项目',
+    dept: '发起部门',
+    result: '完成结果',
+    chain: '关联链'
+  };
+  return labelMap[activeDimension.value] || '维度';
+});
+
+const activeRows = computed(() => {
+  const fieldMap: Record<string, (row: TempTaskVO) => string> = {
+    assignee: (row) => row.assigneeName || '未填写执行人',
+    project: (row) => row.projectName || row.projectCode || '未绑定项目',
+    dept: (row) => row.requestDeptName || '未填写部门',
+    result: (row) => getFinishResultLabel(row.finishResult),
+    chain: (row) => row.relatedTaskCode || row.tempTaskCode || '未形成关联链'
+  };
+  return aggregateBy(filteredRows.value, fieldMap[activeDimension.value]);
+});
+
+const getFinishResultLabel = (value?: string) => {
+  const dictList = unref(temp_task_finish_result) || [];
+  const target = dictList.find((item: any) => item.value === value);
+  return target?.label || value || '未填写完成结果';
+};
+
+const sumWorkload = (rows: TempTaskVO[]) => {
+  return rows.reduce((sum, row) => sum + Number(row.actualWorkload || 0), 0);
+};
+
+const formatNumber = (value: number) => {
+  return Number(value.toFixed(2));
+};
+
+const formatDateTime = (value?: string) => {
+  if (!value) {
+    return '';
+  }
+  return String(value).replace('T', ' ').slice(0, 16);
+};
+
+const aggregateBy = (rows: TempTaskVO[], keyGetter: (row: TempTaskVO) => string) => {
+  const result = new Map<string, AggregateRow>();
+  rows.forEach((row) => {
+    const key = keyGetter(row);
+    const current =
+      result.get(key) ||
+      ({
+        name: key,
+        count: 0,
+        workload: 0,
+        avgWorkload: 0,
+        finishedCount: 0,
+        terminatedCount: 0,
+        partialTerminatedCount: 0
+      } as AggregateRow);
+    current.count += 1;
+    current.workload += Number(row.actualWorkload || 0);
+    if (row.finishResult === '1') {
+      current.finishedCount += 1;
+    } else if (row.finishResult === '2') {
+      current.terminatedCount += 1;
+    } else if (row.finishResult === '3') {
+      current.partialTerminatedCount += 1;
+    }
+    current.avgWorkload = current.count ? formatNumber(current.workload / current.count) : 0;
+    current.workload = formatNumber(current.workload);
+    result.set(key, current);
+  });
+  return Array.from(result.values()).sort((a, b) => b.workload - a.workload);
+};
+
+const buildQuery = () => {
+  queryParams.value.params = { ...monthRange.value };
+  return { ...queryParams.value };
+};
+
+const getList = async () => {
+  loading.value = true;
+  try {
+    const res: any = await listTempTask(buildQuery());
+    detailRows.value = res.rows || [];
+    const runningRes: any = await listTempTask({ pageNum: 1, pageSize: 1, taskStatus: '2' });
+    runningTotal.value = runningRes.total || 0;
+  } finally {
+    loading.value = false;
+  }
+};
+
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+const resetQuery = () => {
+  finishMonth.value = currentMonth();
+  queryParams.value.assigneeName = undefined;
+  queryParams.value.projectName = undefined;
+  queryParams.value.requestDeptName = undefined;
+  queryParams.value.finishResult = undefined;
+  handleQuery();
+};
+
+const handleExport = () => {
+  proxy?.download('oa/erp/tempTask/export', buildQuery(), `tempTask_report_${new Date().getTime()}.xlsx`);
+};
+
+onMounted(() => {
+  getList();
+});
+</script>
+
+<style scoped>
+.metric-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
+  gap: 12px;
+}
+
+.metric-label {
+  color: var(--el-text-color-secondary);
+  font-size: 13px;
+}
+
+.metric-value {
+  margin-top: 8px;
+  color: var(--el-text-color-primary);
+  font-size: 26px;
+  font-weight: 600;
+  line-height: 1;
+}
+</style>