From a3dd00645fdfeea67994fde6631d4cb8cec4e1ec Mon Sep 17 00:00:00 2001
From: ljx <15723110242@139.com>
Date: Wed, 10 Sep 2025 19:34:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/materials/materialReceive/types.ts    | 18 ++++-----
 src/api/workflow/task/types.ts                |  1 +
 src/api/workflow/workflowCommon/index.ts      |  3 +-
 src/api/workflow/workflowCommon/types.ts      |  1 +
 src/components/Process/approvalButton.vue     | 26 +++++++------
 .../biddingLimit/indexEdit.vue                |  7 ++--
 src/views/contract/bidCost/indexEdit.vue      |  1 +
 src/views/contract/limitPrice/indexEdit.vue   |  8 ++--
 src/views/cory/template/indexEdit.vue         |  1 +
 src/views/cory/workMessage/indexEdit.vue      |  1 +
 src/views/design/Professional/indexEdit.vue   |  1 +
 .../design/billofQuantities/indexEdit0.vue    |  1 +
 .../design/billofQuantities/indexEdit1.vue    |  1 +
 .../design/billofQuantities/indexEdit2.vue    |  1 +
 .../design/billofQuantities/indexEdit3.vue    |  1 +
 src/views/design/condition/indexEdit.vue      |  1 +
 src/views/design/designChange/indexEdit.vue   |  1 +
 src/views/design/drawing/indexEdit.vue        |  1 +
 src/views/design/drawingreview/indexEdit.vue  |  1 +
 src/views/design/prelimScheme/indexEdit.vue   |  1 +
 src/views/design/received/indexEdit.vue       |  1 +
 src/views/design/scheme/indexEdit.vue         |  1 +
 src/views/design/specialScheme/indexEdit.vue  |  1 +
 .../design/technicalStandard/indexEdit.vue    |  1 +
 .../design/volumeCatalog/blueprintEdit.vue    |  3 +-
 src/views/design/volumeCatalog/indexEdit.vue  |  1 +
 src/views/materials/batchPlan/indexEdit.vue   | 39 ++++++++++++-------
 .../materials/cailiaoshebei/indexEdit.vue     |  1 +
 .../materialReceive/index.vue                 | 24 ++++++++++++
 .../materials/orderEquipment/indexEdit.vue    |  1 +
 .../overallPlanMaterialSupply/indexEdit.vue   |  9 ++++-
 src/views/materials/purchaseDoc/indexEdit.vue |  1 +
 .../materials/suppliesprice/indexEdit.vue     |  1 +
 src/views/out/constructionValue/indexEdit.vue |  1 +
 src/views/out/designCompletion/indexEdit.vue  |  1 +
 src/views/out/monthPlan/indexEdit.vue         |  1 +
 src/views/tender/bidd/indexEdit.vue           |  8 ++--
 src/views/tender/bidd/indexEdit2.vue          |  6 ++-
 src/views/tender/supplierInput/indexEdit.vue  |  1 +
 src/views/workflows/leave/leaveEdit.vue       |  1 +
 src/views/workflows/task/allTaskWaiting.vue   |  1 +
 src/views/workflows/task/myDocument.vue       |  4 +-
 src/views/workflows/task/taskCopyList.vue     |  6 ++-
 src/views/workflows/task/taskFinish.vue       |  6 ++-
 src/views/workflows/task/taskWaiting.vue      |  4 +-
 45 files changed, 146 insertions(+), 55 deletions(-)

diff --git a/src/api/materials/materialReceive/types.ts b/src/api/materials/materialReceive/types.ts
index bcd7850..c277afc 100644
--- a/src/api/materials/materialReceive/types.ts
+++ b/src/api/materials/materialReceive/types.ts
@@ -53,7 +53,6 @@ export interface MaterialReceiveVO {
    * 备注
    */
   remark: string;
-
 }
 
 export interface MaterialReceiveForm extends BaseEntity {
@@ -156,11 +155,13 @@ export interface MaterialReceiveForm extends BaseEntity {
    * 备注
    */
   remark?: string;
-
+  /**
+   * 附件
+   */
+  attachmentId?: string | number;
 }
 
 export interface MaterialReceiveQuery extends PageQuery {
-
   /**
    * 项目id
    */
@@ -201,11 +202,8 @@ export interface MaterialReceiveQuery extends PageQuery {
    */
   supplierUnit?: string;
 
-    /**
-     * 日期范围参数
-     */
-    params?: any;
+  /**
+   * 日期范围参数
+   */
+  params?: any;
 }
-
-
-
diff --git a/src/api/workflow/task/types.ts b/src/api/workflow/task/types.ts
index 8698eff..2ea0534 100644
--- a/src/api/workflow/task/types.ts
+++ b/src/api/workflow/task/types.ts
@@ -31,6 +31,7 @@ export interface FlowTaskVO {
   version?: string;
   applyNode?: boolean;
   buttonList?: buttonList[];
+  projectName?: string;
 }
 
 export interface buttonList {
diff --git a/src/api/workflow/workflowCommon/index.ts b/src/api/workflow/workflowCommon/index.ts
index 254e520..d74d7b8 100644
--- a/src/api/workflow/workflowCommon/index.ts
+++ b/src/api/workflow/workflowCommon/index.ts
@@ -12,7 +12,8 @@ export default {
         businessId: routerJumpVo.businessId,
         type: routerJumpVo.type,
         planMonth: routerJumpVo.planMonth,
-        taskId: routerJumpVo.taskId
+        taskId: routerJumpVo.taskId,
+        projectName: routerJumpVo.projectName
       }
     });
   }
diff --git a/src/api/workflow/workflowCommon/types.ts b/src/api/workflow/workflowCommon/types.ts
index 3e7a71d..5b54a55 100644
--- a/src/api/workflow/workflowCommon/types.ts
+++ b/src/api/workflow/workflowCommon/types.ts
@@ -4,6 +4,7 @@ export interface RouterJumpVo {
   type: string;
   formCustom: string;
   formPath: string;
+  projectName?: string;
 }
 
 export interface StartProcessBo {
diff --git a/src/components/Process/approvalButton.vue b/src/components/Process/approvalButton.vue
index 545e96a..bccde71 100644
--- a/src/components/Process/approvalButton.vue
+++ b/src/components/Process/approvalButton.vue
@@ -1,15 +1,18 @@
 <template>
-  <div style="display: flex; justify-content: space-between">
-    <div>
-      <el-button v-if="submitButtonShow" :loading="props.buttonLoading" type="info" @click="submitForm('draft')">暂存</el-button>
-      <el-button v-if="submitButtonShow" :loading="props.buttonLoading" type="primary" @click="submitForm('submit')">提 交</el-button>
-      <el-button v-if="approvalButtonShow" :loading="props.buttonLoading" type="primary" @click="approvalVerifyOpen">审批</el-button>
-      <el-button v-if="props.id && props.status !== 'draft'" type="primary" @click="handleApprovalRecord">流程进度</el-button>
-      <slot />
-    </div>
-    <div>
-      <el-button style="float: right" @click="goBack()">返回</el-button>
+  <div>
+    <div style="display: flex; justify-content: space-between">
+      <div>
+        <el-button v-if="submitButtonShow" :loading="props.buttonLoading" type="info" @click="submitForm('draft')">暂存</el-button>
+        <el-button v-if="submitButtonShow" :loading="props.buttonLoading" type="primary" @click="submitForm('submit')">提 交</el-button>
+        <el-button v-if="approvalButtonShow" :loading="props.buttonLoading" type="primary" @click="approvalVerifyOpen">审批</el-button>
+        <el-button v-if="props.id && props.status !== 'draft'" type="primary" @click="handleApprovalRecord">流程进度</el-button>
+        <slot />
+      </div>
+      <div>
+        <el-button style="float: right" @click="goBack()">返回</el-button>
+      </div>
     </div>
+    <h3 v-if="props.projectName" class="text-lg font-semibold text-gray-800">项目名称：{{ props.projectName }}</h3>
   </div>
 </template>
 <script setup lang="ts">
@@ -22,7 +25,8 @@ const props = defineProps({
   status: propTypes.string.def(''),
   pageType: propTypes.string.def(''),
   buttonLoading: propTypes.bool.def(false),
-  id: propTypes.string.def('') || propTypes.number.def()
+  id: propTypes.string.def('') || propTypes.number.def(),
+  projectName: propTypes.string.def('')
 });
 const emits = defineEmits(['submitForm', 'approvalVerifyOpen', 'handleApprovalRecord']);
 //暂存，提交
diff --git a/src/views/biddingManagemen/biddingLimit/indexEdit.vue b/src/views/biddingManagemen/biddingLimit/indexEdit.vue
index 9e268ce..6cb4ad4 100644
--- a/src/views/biddingManagemen/biddingLimit/indexEdit.vue
+++ b/src/views/biddingManagemen/biddingLimit/indexEdit.vue
@@ -167,7 +167,7 @@ const reset = () => {
   form.value = { ...initFormData };
   leaveFormRef.value?.resetFields();
 };
-
+const projectId = ref('');
 /** 获取详情 */
 const getInfo = () => {
   loading.value = true;
@@ -175,6 +175,7 @@ const getInfo = () => {
   nextTick(async () => {
     const res = await getVersionDetail(routeParams.value.id);
     console.log(res);
+    projectId.value = res.data.projectId;
     Object.assign(form.value, res.data);
     loading.value = false;
     buttonLoading.value = false;
@@ -186,7 +187,7 @@ const sheets = ref([]);
 const getSheetName = async () => {
   try {
     const params = {
-      projectId: currentProject.value?.id,
+      projectId: projectId.value,
       versions: form.value.versions
     };
     const res = await sheetList(params);
@@ -208,7 +209,7 @@ const tableData = ref([]);
 //获取列表
 const getListTable = async () => {
   const res = await getTreeLimit({
-    projectId: currentProject.value?.id,
+    projectId: projectId.value,
     versions: form.value.versions,
     sheet: form.value.sheet,
     type: '0'
diff --git a/src/views/contract/bidCost/indexEdit.vue b/src/views/contract/bidCost/indexEdit.vue
index f97c080..fdce4c9 100644
--- a/src/views/contract/bidCost/indexEdit.vue
+++ b/src/views/contract/bidCost/indexEdit.vue
@@ -11,6 +11,7 @@
           :id="form.id"
           :status="form.status"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
       <!-- 表单区域 -->
diff --git a/src/views/contract/limitPrice/indexEdit.vue b/src/views/contract/limitPrice/indexEdit.vue
index 4665f32..2e7a054 100644
--- a/src/views/contract/limitPrice/indexEdit.vue
+++ b/src/views/contract/limitPrice/indexEdit.vue
@@ -11,6 +11,7 @@
           :id="form.versions"
           :status="form.status"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
       <!-- 表单区域 -->
@@ -162,7 +163,7 @@ const reset = () => {
   form.value = { ...initFormData };
   leaveFormRef.value?.resetFields();
 };
-
+const projectId = ref('');
 /** 获取详情 */
 const getInfo = () => {
   loading.value = true;
@@ -170,6 +171,7 @@ const getInfo = () => {
   nextTick(async () => {
     const res = await getVersionDetails(routeParams.value.id);
     console.log(res);
+    projectId.value = res.data.projectId;
     Object.assign(form.value, res.data);
     loading.value = false;
     buttonLoading.value = false;
@@ -181,7 +183,7 @@ const sheets = ref([]);
 const getSheetName = async () => {
   try {
     const params = {
-      projectId: currentProject.value?.id,
+      projectId: projectId.value,
       versions: form.value.versions
     };
     const res = await sheetList(params);
@@ -201,7 +203,7 @@ const changeSheet = () => {
 //获取列表
 const getListTable = async () => {
   const res = await listBillofquantitiesLimitList({
-    projectId: currentProject.value?.id,
+    projectId: projectId.value,
     versions: form.value.versions,
     sheet: form.value.sheet
   });
diff --git a/src/views/cory/template/indexEdit.vue b/src/views/cory/template/indexEdit.vue
index bc55402..8d30b01 100644
--- a/src/views/cory/template/indexEdit.vue
+++ b/src/views/cory/template/indexEdit.vue
@@ -11,6 +11,7 @@
           :id="form.id"
           :status="form.status"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
 
diff --git a/src/views/cory/workMessage/indexEdit.vue b/src/views/cory/workMessage/indexEdit.vue
index c04c34b..8ddcc56 100644
--- a/src/views/cory/workMessage/indexEdit.vue
+++ b/src/views/cory/workMessage/indexEdit.vue
@@ -11,6 +11,7 @@
           :id="form.id"
           :status="form.status"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
 
diff --git a/src/views/design/Professional/indexEdit.vue b/src/views/design/Professional/indexEdit.vue
index ffa705e..33a8055 100644
--- a/src/views/design/Professional/indexEdit.vue
+++ b/src/views/design/Professional/indexEdit.vue
@@ -11,6 +11,7 @@
           :id="form.id"
           :status="form.status"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
       <!-- 表单区域 -->
diff --git a/src/views/design/billofQuantities/indexEdit0.vue b/src/views/design/billofQuantities/indexEdit0.vue
index 993d64f..3bf713e 100644
--- a/src/views/design/billofQuantities/indexEdit0.vue
+++ b/src/views/design/billofQuantities/indexEdit0.vue
@@ -11,6 +11,7 @@
           :id="form.versions"
           :status="form.status"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
       <!-- 表单区域 -->
diff --git a/src/views/design/billofQuantities/indexEdit1.vue b/src/views/design/billofQuantities/indexEdit1.vue
index 97076a8..a976575 100644
--- a/src/views/design/billofQuantities/indexEdit1.vue
+++ b/src/views/design/billofQuantities/indexEdit1.vue
@@ -11,6 +11,7 @@
           :id="form.versions"
           :status="form.status"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
       <!-- 表单区域 -->
diff --git a/src/views/design/billofQuantities/indexEdit2.vue b/src/views/design/billofQuantities/indexEdit2.vue
index c4b1ed9..52b28c4 100644
--- a/src/views/design/billofQuantities/indexEdit2.vue
+++ b/src/views/design/billofQuantities/indexEdit2.vue
@@ -11,6 +11,7 @@
           :id="form.versions"
           :status="form.status"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
       <!-- 表单区域 -->
diff --git a/src/views/design/billofQuantities/indexEdit3.vue b/src/views/design/billofQuantities/indexEdit3.vue
index 094df79..bf820fa 100644
--- a/src/views/design/billofQuantities/indexEdit3.vue
+++ b/src/views/design/billofQuantities/indexEdit3.vue
@@ -11,6 +11,7 @@
           :id="form.versions"
           :status="form.status"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
       <!-- 表单区域 -->
diff --git a/src/views/design/condition/indexEdit.vue b/src/views/design/condition/indexEdit.vue
index bce10c7..86884ca 100644
--- a/src/views/design/condition/indexEdit.vue
+++ b/src/views/design/condition/indexEdit.vue
@@ -11,6 +11,7 @@
           :id="form.id"
           :status="form.status"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
       <!-- 表单区域 -->
diff --git a/src/views/design/designChange/indexEdit.vue b/src/views/design/designChange/indexEdit.vue
index 7e0c7e5..8774de4 100644
--- a/src/views/design/designChange/indexEdit.vue
+++ b/src/views/design/designChange/indexEdit.vue
@@ -11,6 +11,7 @@
           :id="form.id"
           :status="form.status"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
       <!-- 表单区域 -->
diff --git a/src/views/design/drawing/indexEdit.vue b/src/views/design/drawing/indexEdit.vue
index 53ab0ec..5b09590 100644
--- a/src/views/design/drawing/indexEdit.vue
+++ b/src/views/design/drawing/indexEdit.vue
@@ -11,6 +11,7 @@
           :id="form.id"
           :status="form.status"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
       <!-- 表单区域 -->
diff --git a/src/views/design/drawingreview/indexEdit.vue b/src/views/design/drawingreview/indexEdit.vue
index fbf54dc..00e1b9a 100644
--- a/src/views/design/drawingreview/indexEdit.vue
+++ b/src/views/design/drawingreview/indexEdit.vue
@@ -11,6 +11,7 @@
           :id="form.design"
           :status="form.auditStatus"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
       <!-- 表单区域 -->
diff --git a/src/views/design/prelimScheme/indexEdit.vue b/src/views/design/prelimScheme/indexEdit.vue
index fc190bf..4784d13 100644
--- a/src/views/design/prelimScheme/indexEdit.vue
+++ b/src/views/design/prelimScheme/indexEdit.vue
@@ -11,6 +11,7 @@
           :id="form.id"
           :status="form.status"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
 
diff --git a/src/views/design/received/indexEdit.vue b/src/views/design/received/indexEdit.vue
index 6b144fa..ab8fb99 100644
--- a/src/views/design/received/indexEdit.vue
+++ b/src/views/design/received/indexEdit.vue
@@ -11,6 +11,7 @@
           :id="form.id"
           :status="form.status"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
       <!-- 表单区域 -->
diff --git a/src/views/design/scheme/indexEdit.vue b/src/views/design/scheme/indexEdit.vue
index a5cac2d..1e5df4f 100644
--- a/src/views/design/scheme/indexEdit.vue
+++ b/src/views/design/scheme/indexEdit.vue
@@ -11,6 +11,7 @@
           :id="form.id"
           :status="form.status"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
 
diff --git a/src/views/design/specialScheme/indexEdit.vue b/src/views/design/specialScheme/indexEdit.vue
index ab759e6..4eaad77 100644
--- a/src/views/design/specialScheme/indexEdit.vue
+++ b/src/views/design/specialScheme/indexEdit.vue
@@ -11,6 +11,7 @@
           :id="form.id"
           :status="form.status"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
 
diff --git a/src/views/design/technicalStandard/indexEdit.vue b/src/views/design/technicalStandard/indexEdit.vue
index 365257f..a329899 100644
--- a/src/views/design/technicalStandard/indexEdit.vue
+++ b/src/views/design/technicalStandard/indexEdit.vue
@@ -11,6 +11,7 @@
           :id="form.id"
           :status="form.status"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
       <!-- 表单区域 -->
diff --git a/src/views/design/volumeCatalog/blueprintEdit.vue b/src/views/design/volumeCatalog/blueprintEdit.vue
index 41a4d6d..8be80ca 100644
--- a/src/views/design/volumeCatalog/blueprintEdit.vue
+++ b/src/views/design/volumeCatalog/blueprintEdit.vue
@@ -11,6 +11,7 @@
           :id="form.id"
           :status="form.auditStatus"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
       <!-- 表单区域 -->
@@ -205,7 +206,7 @@ const approvalVerifyOpen = async () => {
   // 图纸评审验证 判断是否需要设计验证
   if (form.value.isWindow) {
     console.log(routeParams.value.businessId);
-    
+
     submitVerifyRef.value.openDialog(routeParams.value.taskId, true, routeParams.value.businessId);
   } else {
     submitVerifyRef.value.openDialog(routeParams.value.taskId);
diff --git a/src/views/design/volumeCatalog/indexEdit.vue b/src/views/design/volumeCatalog/indexEdit.vue
index 095104c..33d1068 100644
--- a/src/views/design/volumeCatalog/indexEdit.vue
+++ b/src/views/design/volumeCatalog/indexEdit.vue
@@ -11,6 +11,7 @@
           :id="form.id"
           :status="form.auditStatus"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
       <!-- 表单区域 -->
diff --git a/src/views/materials/batchPlan/indexEdit.vue b/src/views/materials/batchPlan/indexEdit.vue
index 8e3a50d..a745ba4 100644
--- a/src/views/materials/batchPlan/indexEdit.vue
+++ b/src/views/materials/batchPlan/indexEdit.vue
@@ -3,13 +3,19 @@
     <div class="max-w-4xl mx-auto">
       <!-- 顶部按钮区域 -->
       <el-card class="mb-4 rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md">
-        <approvalButton @submitForm="submitForm" @approvalVerifyOpen="approvalVerifyOpen"
-          @handleApprovalRecord="handleApprovalRecord" :buttonLoading="buttonLoading" :id="form.mrpBaseBo.id"
-          :status="form.mrpBaseBo.status" :pageType="routeParams.type" />
+        <approvalButton
+          @submitForm="submitForm"
+          @approvalVerifyOpen="approvalVerifyOpen"
+          @handleApprovalRecord="handleApprovalRecord"
+          :buttonLoading="buttonLoading"
+          :id="form.mrpBaseBo.id"
+          :status="form.mrpBaseBo.status"
+          :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
+        />
       </el-card>
       <!-- 表单区域 -->
-      <el-card
-        class="rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md overflow-hidden">
+      <el-card class="rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md overflow-hidden">
         <div class="p-4 bg-gradient-to-r from-blue-50 to-indigo-50 border-b border-gray-100">
           <h3 class="text-lg font-semibold text-gray-800">物资设备批次需求计划</h3>
           <el-row :gutter="20">
@@ -20,8 +26,7 @@
             </el-col>
             <el-col :span="8" :offset="0">
               <el-form-item label="编制日期" prop="mrpBaseBo.preparedDate">
-                <el-date-picker v-model="form.mrpBaseBo.preparedDate" type="date" value-format="YYYY-MM-DD" disabled
-                  placeholder="请选择编制日期" />
+                <el-date-picker v-model="form.mrpBaseBo.preparedDate" type="date" value-format="YYYY-MM-DD" disabled placeholder="请选择编制日期" />
               </el-form-item>
             </el-col>
             <el-col :span="8" :offset="0">
@@ -50,8 +55,14 @@
       <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
       <approvalRecord ref="approvalRecordRef"></approvalRecord>
       <!-- 流程选择对话框 -->
-      <el-dialog draggable v-model="dialogVisible.visible" :title="dialogVisible.title" :before-close="handleClose"
-        width="500" class="rounded-lg shadow-lg">
+      <el-dialog
+        draggable
+        v-model="dialogVisible.visible"
+        :title="dialogVisible.title"
+        :before-close="handleClose"
+        width="500"
+        class="rounded-lg shadow-lg"
+      >
         <div class="p-4">
           <p class="text-gray-600 mb-4">请选择要启动的流程：</p>
           <el-select v-model="flowCode" placeholder="请选择流程" style="width: 100%">
@@ -60,10 +71,12 @@
         </div>
         <template #footer>
           <div class="dialog-footer p-4 border-t border-gray-100 flex justify-end space-x-3">
-            <el-button @click="handleClose"
-              class="px-4 py-2 border border-gray-300 rounded-md text-gray-700 hover:bg-gray-50 transition-colors">取消</el-button>
-            <el-button type="primary" @click="submitFlow()"
-              class="px-4 py-2 bg-primary text-white rounded-md hover:bg-primary/90 transition-colors">确认</el-button>
+            <el-button @click="handleClose" class="px-4 py-2 border border-gray-300 rounded-md text-gray-700 hover:bg-gray-50 transition-colors"
+              >取消</el-button
+            >
+            <el-button type="primary" @click="submitFlow()" class="px-4 py-2 bg-primary text-white rounded-md hover:bg-primary/90 transition-colors"
+              >确认</el-button
+            >
           </div>
         </template>
       </el-dialog>
diff --git a/src/views/materials/cailiaoshebei/indexEdit.vue b/src/views/materials/cailiaoshebei/indexEdit.vue
index 91dd128..b024a23 100644
--- a/src/views/materials/cailiaoshebei/indexEdit.vue
+++ b/src/views/materials/cailiaoshebei/indexEdit.vue
@@ -11,6 +11,7 @@
           :id="form.id"
           :status="form.approvalDesign"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
       <!-- 表单区域 -->
diff --git a/src/views/materials/materialsEquipment/materialReceive/index.vue b/src/views/materials/materialsEquipment/materialReceive/index.vue
index 90f6d3d..ed4f7f5 100644
--- a/src/views/materials/materialsEquipment/materialReceive/index.vue
+++ b/src/views/materials/materialsEquipment/materialReceive/index.vue
@@ -70,6 +70,13 @@
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="附件" align="center" prop="attachmentName">
+          <template #default="scope">
+            <el-button :href="scope.row.attachmentName" link type="primary" @click="downloadAttachment(scope.row)">{{
+              scope.row.attachmentName
+            }}</el-button>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" min-width="120" fixed="right">
           <template #default="scope">
             <!-- <el-button link type="primary" icon="edit" @click="handleUpdate(scope.row)" v-hasPermi="['materials:materialReceive:edit']"
@@ -254,6 +261,11 @@
               <file-upload :isShowTip="false" :fileType="['pdf', 'png', 'jpg', 'jpeg']" v-model="form.licenseCountFileId" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="附件" prop="attachmentId">
+              <file-upload :isShowTip="false" :fileType="['pdf', 'png', 'jpg', 'jpeg', 'zip']" v-model="form.attachmentId" />
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <span style="color: #ff0000ab; margin-bottom: 10px; display: block">注意：pdf/png/jpg/jpeg格式文件</span>
           </el-col>
@@ -351,6 +363,7 @@ const getInitFormData = (): MaterialReceiveForm => {
     techDocCountFileId: undefined,
     licenseCount: undefined,
     licenseCountFileId: undefined,
+    attachmentId: undefined,
     storageType: '1',
     remark: undefined,
     docId: undefined,
@@ -538,6 +551,17 @@ const handleUpdate = async (row?: MaterialReceiveVO) => {
     proxy?.$modal.msgError('获取详情失败');
   }
 };
+//下载附件
+const downloadAttachment = (row: any) => {
+  if (row.attachmentUrl) {
+    const link = document.createElement('a');
+    link.href = row.attachmentUrl;
+    link.download = row.fileName || 'download';
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+  }
+};
 
 /** 提交按钮 */
 const submitForm = () => {
diff --git a/src/views/materials/orderEquipment/indexEdit.vue b/src/views/materials/orderEquipment/indexEdit.vue
index fc1c9e5..19034d4 100644
--- a/src/views/materials/orderEquipment/indexEdit.vue
+++ b/src/views/materials/orderEquipment/indexEdit.vue
@@ -11,6 +11,7 @@
           :id="form.id"
           :status="form.approvalOrder"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
       <!-- 表单区域 -->
diff --git a/src/views/materials/overallPlanMaterialSupply/indexEdit.vue b/src/views/materials/overallPlanMaterialSupply/indexEdit.vue
index 0781865..cb25c50 100644
--- a/src/views/materials/overallPlanMaterialSupply/indexEdit.vue
+++ b/src/views/materials/overallPlanMaterialSupply/indexEdit.vue
@@ -11,6 +11,7 @@
           :id="form.id"
           :status="form.status"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
       <!-- 表单区域 -->
@@ -319,7 +320,9 @@ onMounted(() => {
   .el-input__inner,
   .el-select .el-input__inner {
     border-radius: 4px;
-    transition: border-color 0.2s, box-shadow 0.2s;
+    transition:
+      border-color 0.2s,
+      box-shadow 0.2s;
 
     &:focus {
       border-color: var(--primary-light);
@@ -329,7 +332,9 @@ onMounted(() => {
 
   .el-textarea__inner {
     border-radius: 4px;
-    transition: border-color 0.2s, box-shadow 0.2s;
+    transition:
+      border-color 0.2s,
+      box-shadow 0.2s;
 
     &:focus {
       border-color: var(--primary-light);
diff --git a/src/views/materials/purchaseDoc/indexEdit.vue b/src/views/materials/purchaseDoc/indexEdit.vue
index 62555ad..dddfb43 100644
--- a/src/views/materials/purchaseDoc/indexEdit.vue
+++ b/src/views/materials/purchaseDoc/indexEdit.vue
@@ -11,6 +11,7 @@
           :id="form.id"
           :status="form.status"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
 
diff --git a/src/views/materials/suppliesprice/indexEdit.vue b/src/views/materials/suppliesprice/indexEdit.vue
index 9a13997..a34432f 100644
--- a/src/views/materials/suppliesprice/indexEdit.vue
+++ b/src/views/materials/suppliesprice/indexEdit.vue
@@ -11,6 +11,7 @@
           :id="form.id"
           :status="form.approvalPlan"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
       <!-- 表单区域 -->
diff --git a/src/views/out/constructionValue/indexEdit.vue b/src/views/out/constructionValue/indexEdit.vue
index 6baeeac..34761ab 100644
--- a/src/views/out/constructionValue/indexEdit.vue
+++ b/src/views/out/constructionValue/indexEdit.vue
@@ -11,6 +11,7 @@
           :id="form.id"
           :status="form.auditStatus"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
       <!-- 表单区域 -->
diff --git a/src/views/out/designCompletion/indexEdit.vue b/src/views/out/designCompletion/indexEdit.vue
index 5fbc3bb..159c304 100644
--- a/src/views/out/designCompletion/indexEdit.vue
+++ b/src/views/out/designCompletion/indexEdit.vue
@@ -11,6 +11,7 @@
           :id="form.id"
           :status="form.completeAuditStatus"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
       <!-- 表单区域 -->
diff --git a/src/views/out/monthPlan/indexEdit.vue b/src/views/out/monthPlan/indexEdit.vue
index 0456285..95bf384 100644
--- a/src/views/out/monthPlan/indexEdit.vue
+++ b/src/views/out/monthPlan/indexEdit.vue
@@ -11,6 +11,7 @@
           :id="form[0]?.id"
           :status="form[0]?.planAuditStatus"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
       <!-- 表单区域 -->
diff --git a/src/views/tender/bidd/indexEdit.vue b/src/views/tender/bidd/indexEdit.vue
index a0b456c..b6f460d 100644
--- a/src/views/tender/bidd/indexEdit.vue
+++ b/src/views/tender/bidd/indexEdit.vue
@@ -11,6 +11,7 @@
           :id="form.versions"
           :status="form.status"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
       <!-- 表单区域 -->
@@ -162,7 +163,7 @@ const { form, rules, tableData } = toRefs(data);
 //   form.value = { ...initFormData };
 //   leaveFormRef.value?.resetFields();
 // };
-
+const projectId = ref('');
 /** 获取详情 */
 const getInfo = () => {
   loading.value = true;
@@ -170,6 +171,7 @@ const getInfo = () => {
   nextTick(async () => {
     const res = await getVersionDetail(routeParams.value.id);
     console.log(res);
+    projectId.value = res.data.projectId;
     Object.assign(form.value, res.data);
     loading.value = false;
     buttonLoading.value = false;
@@ -181,7 +183,7 @@ const sheets = ref([]);
 const getSheetName = async () => {
   try {
     const params = {
-      projectId: currentProject.value?.id,
+      projectId: projectId.value,
       versions: form.value.versions
     };
     const res = await sheetList(params);
@@ -201,7 +203,7 @@ const changeSheet = () => {
 //获取列表
 const getListTable = async () => {
   const res = await getTableList({
-    projectId: currentProject.value?.id,
+    projectId: projectId.value,
     versions: form.value.versions,
     sheet: form.value.sheet,
     type: '2'
diff --git a/src/views/tender/bidd/indexEdit2.vue b/src/views/tender/bidd/indexEdit2.vue
index 9b7e46c..35741f6 100644
--- a/src/views/tender/bidd/indexEdit2.vue
+++ b/src/views/tender/bidd/indexEdit2.vue
@@ -11,6 +11,7 @@
           :id="form.versions"
           :status="form.status"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
       <!-- 表单区域 -->
@@ -162,7 +163,7 @@ const { form, rules, tableData } = toRefs(data);
 //   form.value = { ...initFormData };
 //   leaveFormRef.value?.resetFields();
 // };
-
+const projectId = ref('');
 /** 获取详情 */
 const getInfo = () => {
   loading.value = true;
@@ -170,6 +171,7 @@ const getInfo = () => {
   nextTick(async () => {
     const res = await getVersionDetail(routeParams.value.id);
     console.log(res);
+    projectId.value = res.data.projectId;
     Object.assign(form.value, res.data);
     loading.value = false;
     buttonLoading.value = false;
@@ -201,7 +203,7 @@ const changeSheet = () => {
 //获取列表
 const getListTable = async () => {
   const res = await getTableList({
-    projectId: currentProject.value?.id,
+    projectId: projectId.value,
     versions: form.value.versions,
     // sheet: form.value.sheet,
     type: '3'
diff --git a/src/views/tender/supplierInput/indexEdit.vue b/src/views/tender/supplierInput/indexEdit.vue
index 4429c53..53745b5 100644
--- a/src/views/tender/supplierInput/indexEdit.vue
+++ b/src/views/tender/supplierInput/indexEdit.vue
@@ -11,6 +11,7 @@
           :id="form.id"
           :status="form.state"
           :pageType="routeParams.type"
+          :projectName="routeParams.projectName"
         />
       </el-card>
       <!-- 表单区域 -->
diff --git a/src/views/workflows/leave/leaveEdit.vue b/src/views/workflows/leave/leaveEdit.vue
index c570a92..fd55623 100644
--- a/src/views/workflows/leave/leaveEdit.vue
+++ b/src/views/workflows/leave/leaveEdit.vue
@@ -9,6 +9,7 @@
         :id="form.id"
         :status="form.status"
         :pageType="routeParams.type"
+        :projectName="routeParams.projectName"
       />
     </el-card>
     <el-card shadow="never" style="height: 78vh; overflow-y: auto">
diff --git a/src/views/workflows/task/allTaskWaiting.vue b/src/views/workflows/task/allTaskWaiting.vue
index 7e86835..2c56e4d 100644
--- a/src/views/workflows/task/allTaskWaiting.vue
+++ b/src/views/workflows/task/allTaskWaiting.vue
@@ -38,6 +38,7 @@
         <el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
+          <el-table-column align="center" prop="projectName" label="项目名称" :show-overflow-tooltip="true"></el-table-column>
           <el-table-column :show-overflow-tooltip="true" prop="flowName" align="center" label="流程名称"></el-table-column>
           <el-table-column align="center" prop="categoryName" label="流程分类"></el-table-column>
           <el-table-column align="center" prop="version" label="版本号" width="90">
diff --git a/src/views/workflows/task/myDocument.vue b/src/views/workflows/task/myDocument.vue
index c4be9ca..51e0f19 100644
--- a/src/views/workflows/task/myDocument.vue
+++ b/src/views/workflows/task/myDocument.vue
@@ -49,6 +49,7 @@
 
           <el-table v-loading="loading" border :data="processInstanceList" @selection-change="handleSelectionChange">
             <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
+            <el-table-column align="center" prop="projectName" label="项目名称" :show-overflow-tooltip="true"></el-table-column>
             <el-table-column v-if="false" align="center" prop="id" label="id"></el-table-column>
             <el-table-column :show-overflow-tooltip="true" prop="flowName" align="center" label="流程名称"> </el-table-column>
             <!-- <el-table-column align="center" prop="flowCode" label="流程定义编码"></el-table-column> -->
@@ -248,7 +249,8 @@ const handleOpen = async (row, type) => {
     taskId: row.id,
     type: type,
     formCustom: row.formCustom,
-    formPath: row.formPath
+    formPath: row.formPath,
+    projectName: row.projectName
   });
   workflowCommon.routerJump(routerJumpVo, proxy);
 };
diff --git a/src/views/workflows/task/taskCopyList.vue b/src/views/workflows/task/taskCopyList.vue
index 4b776c5..10ca35d 100644
--- a/src/views/workflows/task/taskCopyList.vue
+++ b/src/views/workflows/task/taskCopyList.vue
@@ -33,6 +33,7 @@
       <el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
+        <el-table-column align="center" prop="projectName" label="项目名称" :show-overflow-tooltip="true"></el-table-column>
         <el-table-column :show-overflow-tooltip="true" prop="flowName" align="center" label="流程名称"></el-table-column>
         <el-table-column align="center" prop="categoryName" label="流程分类"></el-table-column>
         <el-table-column align="center" prop="nodeName" label="任务名称"></el-table-column>
@@ -44,7 +45,7 @@
         <el-table-column align="center" prop="updateTime" label="更新时间" width="150"></el-table-column>
         <el-table-column label="操作" align="center" width="200">
           <template #default="scope">
-            <el-button type="primary"  icon="View" @click="handleView(scope.row)">查看</el-button>
+            <el-button type="primary" icon="View" @click="handleView(scope.row)">查看</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -131,7 +132,8 @@ const handleView = (row) => {
     taskId: row.id,
     type: 'view',
     formCustom: row.formCustom,
-    formPath: row.formPath
+    formPath: row.formPath,
+    projectName: row.projectName
   });
   workflowCommon.routerJump(routerJumpVo, proxy);
 };
diff --git a/src/views/workflows/task/taskFinish.vue b/src/views/workflows/task/taskFinish.vue
index 87a05dc..f667764 100644
--- a/src/views/workflows/task/taskFinish.vue
+++ b/src/views/workflows/task/taskFinish.vue
@@ -37,6 +37,7 @@
 
       <el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange">
         <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
+        <el-table-column align="center" prop="projectName" label="项目名称" :show-overflow-tooltip="true"></el-table-column>
         <el-table-column align="center" prop="flowName" label="流程名称"></el-table-column>
         <el-table-column align="center" prop="categoryName" label="流程分类"></el-table-column>
         <el-table-column align="center" prop="version" label="版本号" width="90">
@@ -64,7 +65,7 @@
         <el-table-column align="center" prop="createTime" label="创建时间" width="160"></el-table-column>
         <el-table-column label="操作" align="center" width="200">
           <template #default="scope">
-            <el-button type="primary" link  icon="View" @click="handleView(scope.row)">查看</el-button>
+            <el-button type="primary" link icon="View" @click="handleView(scope.row)">查看</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -164,7 +165,8 @@ const handleView = (row: FlowTaskVO) => {
     taskId: row.id,
     type: 'view',
     formCustom: row.formCustom,
-    formPath: row.formPath
+    formPath: row.formPath,
+    projectName: row.projectName
   });
   workflowCommon.routerJump(routerJumpVo, proxy);
 };
diff --git a/src/views/workflows/task/taskWaiting.vue b/src/views/workflows/task/taskWaiting.vue
index a53bf3c..6d5d29c 100644
--- a/src/views/workflows/task/taskWaiting.vue
+++ b/src/views/workflows/task/taskWaiting.vue
@@ -36,6 +36,7 @@
       </template>
       <el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange">
         <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
+        <el-table-column align="center" prop="projectName" label="项目名称" :show-overflow-tooltip="true"></el-table-column>
         <el-table-column :show-overflow-tooltip="true" prop="flowName" align="center" label="流程名称"></el-table-column>
         <el-table-column align="center" prop="categoryName" label="流程分类"></el-table-column>
         <el-table-column align="center" prop="nodeName" label="任务名称"></el-table-column>
@@ -167,7 +168,8 @@ const handleOpen = async (row: FlowTaskVO) => {
     type: 'approval',
     formCustom: row.formCustom,
     planMonth: row.businessId.split('_')[1],
-    formPath: row.formPath
+    formPath: row.formPath,
+    projectName: row.projectName
   });
   workflowCommon.routerJump(routerJumpVo, proxy);
 };