From 91b7f38f8c607e82ce78f9a813766ff8bbd04266 Mon Sep 17 00:00:00 2001
From: taoge1020 <sendtao@163.com>
Date: Mon, 25 Aug 2025 20:01:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   2 +-
 public/catalog.xlsx                           | Bin 0 -> 10371 bytes
 src/views/design/condition/comm/filePage.vue  |   8 +-
 src/views/design/received/index.vue           | 602 ++++++++++++------
 src/views/design/scheme/indexEdit.vue         |   4 +
 .../design/volumeCatalog/blueprintEdit.vue    |   8 +-
 src/views/design/volumeCatalog/codeDetail.vue |  78 ++-
 src/views/design/volumeCatalog/index.vue      |  21 +
 .../materialReceive/index.vue                 | 458 ++++++++-----
 9 files changed, 765 insertions(+), 416 deletions(-)
 create mode 100644 public/catalog.xlsx

diff --git a/.env.development b/.env.development
index 500d6b0..2ef074f 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ VITE_APP_ENV = 'development'
 
 # 开发环境
 # 李陈杰 209
-VITE_APP_BASE_API = 'http://192.168.110.209:8899'
+VITE_APP_BASE_API = 'http://192.168.110.180:8899'
 # 曾涛
 # VITE_APP_BASE_API = 'http://192.168.110.180:8899'
 # 罗成
diff --git a/public/catalog.xlsx b/public/catalog.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..1cca4665b79f23a62eb39ced46de4a87c96baf4a
GIT binary patch
literal 10371
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

literal 0
HcmV?d00001

diff --git a/src/views/design/condition/comm/filePage.vue b/src/views/design/condition/comm/filePage.vue
index df3d89d..1a69993 100644
--- a/src/views/design/condition/comm/filePage.vue
+++ b/src/views/design/condition/comm/filePage.vue
@@ -17,7 +17,13 @@
       </template>
       <el-table :data="FileList" style="width: 100%" height="64vh">
         <el-table-column type="index" align="center" label="序号" width="180" />
-        <el-table-column prop="fileName" align="center" label="文件名称" />
+        <el-table-column align="center" label="文件名称">
+          <template #default="scope">
+            <el-link :key="scope.row.fileName" :href="scope.row.fileUrl" target="_blank" type="primary" :underline="false">
+              {{ scope.row.fileName }}
+            </el-link>
+          </template>
+        </el-table-column>
         <el-table-column label="流程状态" align="center" prop="status">
           <template #default="scope">
             <dict-tag :options="wf_business_status" :value="scope.row.status" />
diff --git a/src/views/design/received/index.vue b/src/views/design/received/index.vue
index 9d21ddd..88cca58 100644
--- a/src/views/design/received/index.vue
+++ b/src/views/design/received/index.vue
@@ -1,86 +1,172 @@
 <template>
-  <div class="p-6 bg-gray-50">
-    <div
-      class="received mx-auto bg-white rounded-xl shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md">
+  <div class="p-6 bg-gray-50 min-h-screen">
+    <div class="received mx-auto bg-white rounded-xl shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md">
       <!-- 表单标题区域 -->
       <div class="bg-gradient-to-r from-blue-500 to-blue-600 text-white p-6">
         <h2 class="text-2xl font-bold flex items-center"><i class="el-icon-user-circle mr-3"></i>收集资料清单</h2>
         <p class="text-blue-100 mt-2 opacity-90">请填写相关资料信息</p>
       </div>
 
-      <!-- 表单内容区域 -->
-      <el-form ref="mainFormRef" :model="form" :rules="mainRules" label-width="120px" class="p-6">
+      <el-form ref="mainFormRef" :model="form" :rules="mainRules" label-width="120px" class="p-6 md:p-8">
         <!-- 基本信息区域 -->
-        <div class="bg-blue-50 p-4 rounded-lg mb-6">
+        <div class="bg-blue-50 p-4 rounded-lg mb-6 md:mb-8">
           <h3 class="text-lg font-semibold text-blue-700 mb-4">基本信息</h3>
 
-          <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-            <el-form-item label="收资人" prop="userId" class="mb-4">
-              <el-select :disabled="disabledAll" v-model="form.userId" placeholder="请选择收资人"
-                class="w-full transition-all duration-300 border-gray-300 focus:border-blue-400 focus:ring-1 focus:ring-blue-400">
+          <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
+            <el-form-item label="收资人" prop="userId" class="mb-0">
+              <el-select
+                :disabled="disabledAll"
+                v-model="form.userId"
+                placeholder="请选择收资人"
+                class="w-full transition-all duration-300 border-gray-300 focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
+              >
                 <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
               </el-select>
             </el-form-item>
-            <el-form-item label="专业" prop="user_major" class="mb-4">
-              <el-select :disabled="disabledAll" v-model="form.user_major" placeholder="请选择专业"
-                class="transition-all duration-300 border-gray-300"
-                :rules="{ required: true, message: '请选择专业', trigger: 'change' }">
+
+            <el-form-item label="专业" prop="user_major" class="mb-0">
+              <el-select
+                :disabled="disabledAll"
+                v-model="form.user_major"
+                placeholder="请选择专业"
+                class="w-full transition-all duration-300 border-gray-300 focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
+              >
                 <el-option v-for="item in des_user_major" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
 
-            <el-form-item label="电话" prop="phone" class="mb-4">
-              <el-input :disabled="disabledAll" placeholder="请输入电话" v-model="form.phone" autocomplete="off" />
+            <el-form-item label="电话" prop="phone" class="mb-0">
+              <el-input :disabled="disabledAll" placeholder="请输入电话" v-model="form.phone" autocomplete="off" class="w-full" />
             </el-form-item>
 
-            <el-form-item label="邮箱" prop="email" class="mb-4">
-              <el-input :disabled="disabledAll" placeholder="请输入邮箱" v-model="form.email" autocomplete="off" />
+            <el-form-item label="邮箱" prop="email" class="mb-0">
+              <el-input :disabled="disabledAll" placeholder="请输入邮箱" v-model="form.email" autocomplete="off" class="w-full" />
             </el-form-item>
           </div>
         </div>
+
         <!-- 资料文件区域 -->
-        <div class="mb-6">
-          <div class="flex items-center justify-between mb-4">
+        <div class="mb-8">
+          <div class="flex items-center justify-between mb-5">
             <h3 class="text-lg font-semibold text-blue-700">资料文件清单</h3>
-            <el-button type="primary" size="small" @click="addDocumentItem" v-if="!disabledAll" icon="Plus"> 添加资料
+            <el-button type="primary" size="small" @click="addDocumentItem" v-if="!disabledAll" icon="Plus" class="transition-all hover:bg-blue-600">
+              添加资料
             </el-button>
           </div>
-          <el-form ref="documentsFormRef" :model="form" class="space-y-4">
-            <div v-for="(item, index) in form.documents" :key="item.id"
-              class="bg-gray-50 p-4 rounded-lg transition-all duration-200 hover:shadow-sm">
-              <div class="flex justify-between items-start mb-2">
-                <span class="text-sm font-medium text-gray-600">资料 {{ index + 1 }}</span>
-                <el-button type="text" size="small" text-color="#ff4d4f" @click="removeDocumentItem(index)"
-                  icon="el-icon-delete" v-if="form.documents.length > 1 && !disabledAll">
+
+          <!-- 资料列表表单 -->
+          <el-form ref="documentsFormRef" :model="form" class="space-y-5">
+            <div
+              v-for="(item, index) in form.documents"
+              :key="item.id"
+              class="bg-gray-50 p-5 rounded-lg transition-all duration-200 hover:shadow-sm border border-gray-100"
+            >
+              <div class="flex justify-between items-center mb-4 pb-3 border-b border-gray-200">
+                <span class="text-sm font-medium text-gray-700">资料 {{ index + 1 }}</span>
+                <el-button
+                  type="text"
+                  size="small"
+                  text-color="#ff4d4f"
+                  @click="removeDocumentItem(index)"
+                  icon="el-icon-delete"
+                  v-if="form.documents.length > 1 && !disabledAll"
+                  class="transition-all hover:text-red-600"
+                >
                   删除
                 </el-button>
               </div>
-
-              <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-                <el-form-item label="文件目录名称" :prop="`documents.${index}.catalogueName`"
-                  :rules="[{ required: true, message: '请输入文件目录名称', trigger: 'blur' }]" class="mb-4">
-                  <el-input :disabled="disabledAll" placeholder="请输入文件目录名称" v-model="item.catalogueName"
-                    autocomplete="off" />
+              <div class="flex flex-col md:flex-row gap-5 items-stretch">
+                <el-form-item
+                  label="文件目录名称"
+                  :prop="`documents.${index}.catalogueName`"
+                  :rules="[{ required: true, message: '请输入文件目录名称', trigger: 'blur' }]"
+                  class="flex-1 min-w-[280px] mb-0"
+                >
+                  <el-input :disabled="disabledAll" placeholder="请输入文件目录名称" v-model="item.catalogueName" autocomplete="off" class="w-full" />
                 </el-form-item>
-                <el-form-item label="备注" :prop="`documents.${index}.remark`" class="mb-4">
-                  <el-input :disabled="disabledAll" placeholder="请输入备注" v-model="item.remark" autocomplete="off" />
+                <el-form-item
+                  label="人员"
+                  :prop="`documents.${index}.userId`"
+                  :rules="[{ required: true, message: '请选择人员', trigger: 'blur' }]"
+                  class="flex-1 min-w-[220px] mb-0"
+                >
+                  <el-select
+                    :disabled="disabledAll"
+                    v-model="item.userId"
+                    placeholder="请选择人员"
+                    class="w-full transition-all duration-300 border-gray-300 focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
+                  >
+                    <el-option v-for="user in userList" :key="user.userId" :label="user.nickName" :value="user.userId" />
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="备注" :prop="`documents.${index}.remark`" class="flex-1 min-w-[220px] mb-0">
+                  <el-input :disabled="disabledAll" placeholder="请输入备注" v-model="item.remark" autocomplete="off" class="w-full" />
                 </el-form-item>
               </div>
             </div>
           </el-form>
         </div>
-        <!-- 操作按钮区域 -->
-        <div class="flex justify-center gap-4 mt-8">
-          <el-button type="primary" @click="submitForm" v-hasPermi="['design:collect:add']"
-            v-if="!form.id || form.status == 'draft'" size="large">确认提交</el-button>
-          <el-button type="primary" @click="update" v-hasPermi="['design:collect:query']"
-            v-show="form.id && form.status == 'draft'" icon="Edit" size="large">审核</el-button>
-          <el-button type="primary" @click="update" v-hasPermi="['design:collect:query']" v-show="form.status == 'back'"
-            size="large" icon="Edit">重新发起审核</el-button>
-          <el-button type="primary" @click="onView" v-hasPermi="['design:collect:query']"
-            v-show="form.id && form.status != 'draft'" icon="view" size="large">查看流程</el-button>
-          <el-button type="success" v-hasPermi="['design:collect:export']" @click="onLoad"
-            v-show="form.id && form.status != 'draft'" icon="Download" size="large">导出</el-button>
+
+        <!-- 操作按钮区域：居中+间距优化 -->
+        <div class="flex flex-wrap justify-center gap-4 md:gap-6 mt-10">
+          <el-button
+            type="primary"
+            @click="submitForm"
+            v-hasPermi="['design:collect:add']"
+            v-if="!form.id || form.status == 'draft'"
+            size="large"
+            class="px-8 transition-all hover:bg-blue-600"
+          >
+            确认提交
+          </el-button>
+
+          <el-button
+            type="primary"
+            @click="update"
+            v-hasPermi="['design:collect:query']"
+            v-show="form.id && form.status == 'draft'"
+            icon="Edit"
+            size="large"
+            class="px-8 transition-all hover:bg-blue-600"
+          >
+            审核
+          </el-button>
+
+          <el-button
+            type="primary"
+            @click="update"
+            v-hasPermi="['design:collect:query']"
+            v-show="form.status == 'back'"
+            size="large"
+            icon="Edit"
+            class="px-8 transition-all hover:bg-blue-600"
+          >
+            重新发起审核
+          </el-button>
+
+          <el-button
+            type="primary"
+            @click="onView"
+            v-hasPermi="['design:collect:query']"
+            v-show="form.id && form.status != 'draft'"
+            icon="view"
+            size="large"
+            class="px-8 transition-all hover:bg-blue-600"
+          >
+            查看流程
+          </el-button>
+
+          <el-button
+            type="success"
+            v-hasPermi="['design:collect:export']"
+            @click="onLoad"
+            v-show="form.id && form.status != 'draft'"
+            icon="Download"
+            size="large"
+            class="px-8 transition-all hover:bg-green-600"
+          >
+            导出
+          </el-button>
         </div>
       </el-form>
     </div>
@@ -88,51 +174,59 @@
 </template>
 
 <script setup name="DataCollectionForm" lang="ts">
-import { ref, reactive, computed, onMounted } from 'vue';
+import { ref, reactive, computed, onMounted, onUnmounted, watch, getCurrentInstance } from 'vue';
 import { useUserStoreHook } from '@/store/modules/user';
 import { ElMessage, ElLoading } from 'element-plus';
 import { systemUserList } from '@/api/design/appointment';
 import { collectBatch, byProjectId, exportWord } from '@/api/design/received';
 import { getUser } from '@/api/system/user';
-// 用户状态管理
-// 获取用户 store
+import type { ComponentInternalInstance, ElFormInstance } from 'element-plus';
+
+// 全局实例与状态管理
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const userStore = useUserStoreHook();
-// 从 store 中获取当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
 const { des_user_major } = toRefs<any>(proxy?.useDict('des_user_major'));
 const userId = computed(() => userStore.userId);
+
 // 表单引用
-const mainFormRef = ref();
-// 用户列表
-const userList = ref([]);
-const userMap = new Map();
-const disabledAll = ref(false);
-// 表单数据
+const mainFormRef = ref<ElFormInstance>();
+const documentsFormRef = ref<ElFormInstance>();
+
+// 数据定义
+const userList = ref<any[]>([]);
+const userMap = new Map<string, string>(); // 存储用户ID与昵称映射
+const disabledAll = ref(false); // 表单是否全部禁用
+
+// 表单核心数据
 const form = reactive({
   projectId: currentProject.value?.id,
   userId: '', // 收资人
   user_major: '', // 专业
   phone: '', // 电话
   email: '', // 邮箱
-  id: '',
-  status: '',
+  id: '', // 表单ID
+  status: '', // 表单状态
   documents: [
     {
       id: Date.now(),
       catalogueName: '', // 文件目录名称
-      remark: '' // 备注
+      remark: '', // 备注
+      userId: '' // 负责人员
     }
   ] as Array<{
     id: number;
     catalogueName: string;
     remark: string;
+    userId: string;
+    num?: number; // 序号（提交时用）
+    userName?: string; // 人员名称（提交时用）
   }>
 });
 
 // 主表单验证规则
 const mainRules = reactive({
-  userId: [{ required: true, message: '请输入收资人', trigger: 'blur' }],
+  userId: [{ required: true, message: '请选择收资人', trigger: 'blur' }],
   user_major: [{ required: true, message: '请选择专业', trigger: 'change' }],
   phone: [
     { required: true, message: '请输入电话', trigger: 'blur' },
@@ -144,138 +238,160 @@ const mainRules = reactive({
   ]
 });
 
-// 添加资料项
+/** 添加资料项 */
 const addDocumentItem = () => {
   form.documents.push({
-    id: Date.now(),
+    id: Date.now(), // 用时间戳保证ID唯一
     catalogueName: '',
-    remark: ''
+    remark: '',
+    userId: ''
   });
 };
 
-// 删除资料项
+/** 删除资料项 */
 const removeDocumentItem = (index: number) => {
+  if (form.documents.length <= 1) {
+    ElMessage.warning('至少需要保留一条资料记录');
+    return;
+  }
   form.documents.splice(index, 1);
 };
-// 查询数据 再次回显
+
+/** 回显项目对应的表单数据 */
 const byProjectIdAll = async () => {
-  // 调用接口获取数据
-  const res = await byProjectId(currentProject.value?.id);
-  console.log(res);
-  form.documents = [
-    {
-      id: Date.now(),
-      catalogueName: '',
-      remark: ''
-    }
-  ];
-  disabledAll.value = false;
-  if (res.code === 200 && res.data) {
-    const data = res.data;
-    // 回显基本信息
-    form.userId = data.userId || '';
-    form.user_major = data.userMajor || '';
-    form.phone = data.phone || '';
-    form.email = data.email || '';
-    form.id = data.id || '';
-    form.status = data.status || '';
-    if (form.status == 'finish') {
-      // 表单全部禁用
-      disabledAll.value = true;
-    }
-    // 回显资料文件列表
-    if (data.catalogueList && data.catalogueList.length > 0) {
-      // 清空现有列表
-      form.documents = [];
-      // 填充新数据
-      data.catalogueList.forEach((item: any, index: number) => {
-        form.documents.push({
-          id: item.id || Date.now() + index, // 确保id唯一
-          catalogueName: item.catalogueName || '',
-          remark: item.remark || ''
-        });
-      });
-    } else {
-      console.log(11111111);
-
-      // 如果没有资料，保持一个空项
-      form.documents = [
-        {
-          id: Date.now(),
-          catalogueName: '',
-          remark: ''
-        }
-      ];
-      console.log(form.documents);
-
-
-    }
-  }
-};
-// 提交表单
-const submitForm = async () => {
-  if (!mainFormRef.value) return;
   try {
-    const valid = await mainFormRef.value.validate();
-    if (valid) {
-      // 这里可以添加提交逻辑
-      form.documents.map((item, i) => {
-        item.num = i + 1;
-      });
-      let body = {
-        desCollectBo: {
-          projectId: currentProject.value?.id,
-          userId: form.userId, // 收资人
-          userMajor: form.user_major, // 专业
-          id: form.id,
-          phone: form.phone, // 电话
-          email: form.email, // 邮箱
-          userName: userMap.get(form.userId)
-        },
-        catalogueList: form.documents
-      };
-      let res = await collectBatch(body);
-      if (res.code == 200) {
-        byProjectIdAll();
-        ElMessage.success('表单提交成功');
-      } else {
-        ElMessage.success(res.msg);
+    const res = await byProjectId(currentProject.value?.id);
+    // 重置表单默认值
+    form.documents = [
+      {
+        id: Date.now(),
+        catalogueName: '',
+        remark: '',
+        userId: ''
+      }
+    ];
+    disabledAll.value = false;
+
+    if (res.code == 200 && res.data) {
+      const data = res.data;
+      // 回显基本信息
+      form.userId = data.userId || '';
+      form.user_major = data.userMajor || '';
+      form.phone = data.phone || '';
+      form.email = data.email || '';
+      form.id = data.id || '';
+      form.status = data.status || '';
+
+      // 已完成状态禁用所有输入
+      if (form.status === 'finish') {
+        disabledAll.value = true;
+      }
+
+      // 回显资料列表
+      if (data.catalogueList && data.catalogueList.length > 0) {
+        form.documents = data.catalogueList.map((item: any, index: number) => ({
+          id: item.id || Date.now() + index, // 确保ID唯一
+          catalogueName: item.catalogueName || '',
+          remark: item.remark || '',
+          userId: item.userId || ''
+        }));
       }
     }
+    console.log(form);
   } catch (error) {
-    ElMessage.error('请完善表单信息后再提交');
+    ElMessage.error('获取表单数据失败，请刷新重试');
+    console.error('数据回显错误：', error);
   }
 };
-// 重置表单
+
+/** 提交表单 */
+const submitForm = async () => {
+  if (!mainFormRef.value) return;
+
+  try {
+    // 先验证主表单
+    await mainFormRef.value.validate();
+    // 再验证资料列表表单（如果存在）
+    if (documentsFormRef.value) {
+      await documentsFormRef.value.validate();
+    }
+
+    // 处理提交数据（补充序号和人员名称）
+    const submitDocuments = form.documents.map((item, i) => ({
+      ...item,
+      num: i + 1,
+      userName: userMap.get(item.userId) || ''
+    }));
+
+    const submitData = {
+      desCollectBo: {
+        projectId: currentProject.value?.id,
+        userId: form.userId,
+        userMajor: form.user_major,
+        id: form.id,
+        phone: form.phone,
+        email: form.email,
+        userName: userMap.get(form.userId) || ''
+      },
+      catalogueList: submitDocuments
+    };
+
+    // 调用接口提交
+    const res = await collectBatch(submitData);
+    if (res.code === 200) {
+      ElMessage.success('表单提交成功');
+      byProjectIdAll(); // 重新拉取最新数据
+    } else {
+      ElMessage.warning(res.msg || '提交失败，请重试');
+    }
+  } catch (error) {
+    ElMessage.error('请完善表单必填信息后再提交');
+    console.error('表单验证失败：', error);
+  }
+};
+
+/** 重置表单 */
 const resetForm = () => {
   if (mainFormRef.value) {
     mainFormRef.value.resetFields();
+    // form表单数据重置
+    form.userId = '';
+    form.user_major = '';
+    form.phone = '';
+    form.email = '';
+    form.id = '';
+    form.status = '';
   }
-  // 重置资料列表，保留一个空项
+  // 重置资料列表为1条空记录
   form.documents = [
     {
       id: Date.now(),
       catalogueName: '',
-      remark: ''
+      remark: '',
+      userId: ''
     }
   ];
 };
-/** 查询当前部门的所有用户 */
-const getDeptAllUser = async (deptId: any) => {
+
+/** 获取当前部门的所有用户 */
+const getDeptAllUser = async (deptId: string | number) => {
   try {
     const res = await systemUserList({ deptId });
-    // 实际项目中使用接口返回的数据
-    userList.value = res.rows;
+    userList.value = res.rows || [];
+    // 构建用户ID-昵称映射
     userList.value.forEach((user) => {
       userMap.set(user.userId, user.nickName);
     });
   } catch (error) {
-    ElMessage.error('获取用户列表失败');
+    ElMessage.error('获取用户列表失败，请刷新重试');
+    console.error('用户列表获取错误：', error);
   }
 };
+
+/** 跳转审核页面 */
 const update = () => {
-  proxy.$tab.closePage(proxy.$route);
-  proxy.$router.push({
+  proxy?.$tab.closePage(proxy?.$route);
+  proxy?.$router.push({
     path: `/approval/received/indexEdit`,
     query: {
       id: form.id,
@@ -283,9 +399,11 @@ const update = () => {
     }
   });
 };
+
+/** 跳转流程查看页面 */
 const onView = () => {
-  proxy.$tab.closePage(proxy.$route);
-  proxy.$router.push({
+  proxy?.$tab.closePage(proxy?.$route);
+  proxy?.$router.push({
     path: `/approval/received/indexEdit`,
     query: {
       id: form.id,
@@ -293,96 +411,158 @@ const onView = () => {
     }
   });
 };
-/** 获取当前用户详情 */
+
+/** 获取当前用户详情（回显个人信息） */
 const getUserDetail = async () => {
   try {
     const res = await getUser(userId.value);
-    // userInfo.value = res.data.user;
-    form.userId = res.data.user.userId;
-    form.phone = res.data.user.phonenumber;
-    form.email = res.data.user.email;
+    if (res.data?.user) {
+      form.userId = res.data.user.userId;
+      form.phone = res.data.user.phonenumber || '';
+      form.email = res.data.user.email || '';
+    }
   } catch (err) {
-    ElMessage.error('获取用户信息失败');
+    ElMessage.error('获取个人信息失败，部分字段需手动填写');
+    console.error('用户详情获取错误：', err);
   }
 };
 
-// 页面挂载时初始化数据
-onMounted(() => {
-  // 可以在这里添加初始化逻辑
-  getUserDetail();
-  getDeptAllUser(userStore.deptId).then(() => {
-    byProjectIdAll();
-  });
-
-});
+/** 导出文件 */
 const onLoad = async () => {
-  // 导出接口
-  proxy?.download(
-    'design/collect/exportWord',
-    {
-      id: form.id
-    },
-    `收资清单.zip`
-  );
+  if (!form.id) {
+    ElMessage.warning('请先保存表单再导出');
+    return;
+  }
+  try {
+    proxy?.download('design/collect/exportWord', { id: form.id }, `收资清单_${new Date().getTime()}.zip`);
+  } catch (error) {
+    ElMessage.error('导出失败，请重试');
+    console.error('文件导出错误：', error);
+  }
 };
-//监听项目id刷新数据
-const listeningProject = watch(
-  () => currentProject.value?.id,
-  (nid, oid) => {
-    getUserDetail();
+
+/** 页面挂载初始化 */
+onMounted(() => {
+  // 先获取当前用户信息，再获取部门用户列表，最后回显表单数据
+  getUserDetail().then(() => {
     getDeptAllUser(userStore.deptId).then(() => {
       byProjectIdAll();
     });
+  });
+});
+
+/** 监听项目切换，刷新数据 */
+const listeningProject = watch(
+  () => currentProject.value?.id,
+  (newId, oldId) => {
+    if (newId !== oldId) {
+      resetForm();
+      form.projectId = newId;
+      getUserDetail().then(() => {
+        getDeptAllUser(userStore.deptId).then(() => {
+          byProjectIdAll();
+        });
+      });
+    }
   }
 );
 
+/** 页面卸载清理监听 */
 onUnmounted(() => {
   listeningProject();
 });
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
+// 主容器样式
 .received {
-  width: 90%;
-  max-width: 1000px;
+  width: 95%;
+  max-width: 1200px;
+  margin-top: 20px;
+  margin-bottom: 40px;
 }
 
-// 全局样式调整，使界面更柔和
+// 自定义滚动条（优化长列表体验）
+::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+}
+::-webkit-scrollbar-thumb {
+  background-color: #e5e7eb;
+  border-radius: 4px;
+}
+::-webkit-scrollbar-thumb:hover {
+  background-color: #d1d5db;
+}
+
+// Element 组件样式覆盖（统一风格）
 ::v-deep .el-input__inner,
-::v-deep .el-select__input {
-  border-radius: 6px;
-  border-color: #dcdfe6;
-  transition: all 0.2s ease;
+::v-deep .el-select__input,
+::v-deep .el-select-dropdown__item {
+  border-radius: 6px !important;
+  border-color: #dcdfe6 !important;
+  transition: all 0.2s ease !important;
 }
 
 ::v-deep .el-input__inner:focus,
 ::v-deep .el-select__input:focus {
-  border-color: #409eff;
-  box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.2);
+  border-color: #409eff !important;
+  box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.2) !important;
+  outline: none !important;
 }
 
-::v-deep .el-button {
-  border-radius: 6px;
-  transition: all 0.2s ease;
+::v-deep .el-form-item {
+  margin-bottom: 0 !important;
 }
 
 ::v-deep .el-form-item__label {
-  font-weight: 500;
-  color: #606266;
+  font-weight: 500 !important;
+  color: #606266 !important;
+  padding-right: 12px !important;
 }
 
-// 响应式调整
-@media (max-width: 768px) {
-  .received {
-    width: 95%;
-  }
+::v-deep .el-button--primary {
+  background-color: #409eff !important;
+  border-color: #409eff !important;
+}
 
-  ::v-deep .el-form-item {
-    margin-bottom: 16px;
+::v-deep .el-button--primary:hover {
+  background-color: #3390e0 !important;
+  border-color: #3390e0 !important;
+}
+
+::v-deep .el-button--success {
+  background-color: #52c41a !important;
+  border-color: #52c41a !important;
+}
+
+::v-deep .el-button--success:hover {
+  background-color: #47b811 !important;
+  border-color: #47b811 !important;
+}
+
+// 响应式适配（小屏幕调整）
+@media (max-width: 768px) {
+  .p-6.md\:p-8 {
+    padding: 4px !important;
   }
 
   ::v-deep .el-form-item__label {
-    width: 100px;
+    width: 100px !important;
+    font-size: 14px !important;
+  }
+
+  .flex.flex-col.md\:flex-row.gap-5 {
+    gap: 3px !important;
+  }
+
+  .el-button--large {
+    padding: 8px 16px !important;
+    font-size: 14px !important;
+  }
+
+  .bg-blue-50.p-4 {
+    padding: 15px !important;
   }
 }
 </style>
diff --git a/src/views/design/scheme/indexEdit.vue b/src/views/design/scheme/indexEdit.vue
index 58aa419..71acf83 100644
--- a/src/views/design/scheme/indexEdit.vue
+++ b/src/views/design/scheme/indexEdit.vue
@@ -31,7 +31,11 @@
           >
             <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
               <el-form-item label="设计方案" prop="fileUrl" class="mb-2">
+                <el-link v-if="form.fileUrl" :href="form.fileUrl" target="_blank" type="primary" :underline="false">
+                  {{ form.fileName }}
+                </el-link>
                 <file-upload
+                  v-else
                   :limit="1"
                   :fileType="['pdf']"
                   :fileSize="100"
diff --git a/src/views/design/volumeCatalog/blueprintEdit.vue b/src/views/design/volumeCatalog/blueprintEdit.vue
index 2e4a053..3f3845e 100644
--- a/src/views/design/volumeCatalog/blueprintEdit.vue
+++ b/src/views/design/volumeCatalog/blueprintEdit.vue
@@ -29,7 +29,10 @@
               class="space-y-4"
             >
               <el-form-item label="图纸文件" prop="fileId" class="mb-2 md:col-span-2">
-                <el-input v-model="form.fileName" disabled placeholder="图纸名称" />
+                <el-link v-if="form.fileUrl" :href="form.fileUrl" target="_blank" type="primary" :underline="false">
+                  {{ form.fileName }}
+                </el-link>
+                <!-- <el-input v-model="form.fileName" disabled placeholder="图纸名称" /> -->
               </el-form-item>
             </el-form>
           </div>
@@ -123,7 +126,8 @@ const initFormData = {
   fileUrl: undefined,
   status: undefined,
   originalName: undefined,
-  fileVoList: []
+  fileVoList: [],
+  auditStatus: undefined
 };
 const data = reactive({
   form: { ...initFormData },
diff --git a/src/views/design/volumeCatalog/codeDetail.vue b/src/views/design/volumeCatalog/codeDetail.vue
index 8086d16..b4c063f 100644
--- a/src/views/design/volumeCatalog/codeDetail.vue
+++ b/src/views/design/volumeCatalog/codeDetail.vue
@@ -75,44 +75,6 @@
             资料名称: {{ info.projectName || '未定义' }} | 卷册号: {{ info.volumeNumber || '未定义' }}
           </p>
         </div>
-
-        <!-- 基本信息区域 - 缩小间隔，增强label与内容区分 -->
-        <div class="p-3 md:p-4 border-b border-gray-100 dark:border-gray-700/50">
-          <h3 class="text-base md:text-lg font-semibold mb-2 flex items-center text-gray-800 dark:text-gray-200">
-            <el-icon style="margin-right: 10px" :size="24" color="#409EFF">
-              <Document />
-            </el-icon>
-
-            基本信息
-          </h3>
-
-          <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-2 md:gap-3">
-            <InfoItem label="项目名称" value="projectName" :data="info" />
-            <InfoItem label="资料名称" value="documentName" :data="info" />
-            <InfoItem label="卷册号" value="volumeNumber" :data="info" />
-            <InfoItem label="设计子项名称" value="designSubitem" :data="info" />
-            <InfoItem label="专业名称" value="specialtyName" :data="info" />
-            <InfoItem label="文件格式" value="fileType" :data="info" />
-          </div>
-        </div>
-
-        <!-- 人员信息区域 -->
-        <div class="p-3 md:p-4 border-b border-gray-100 dark:border-gray-700/50">
-          <h3 class="text-base md:text-lg font-semibold mb-2 flex items-center text-gray-800 dark:text-gray-200">
-            <el-icon style="margin-right: 10px" :size="24" color="#409EFF">
-              <Document />
-            </el-icon>
-            人员信息
-          </h3>
-
-          <div class="grid grid-cols-1 md:grid-cols-2 gap-2 md:gap-3">
-            <InfoItem label="负责人" value="principal" :data="info" />
-            <InfoItem label="设计人员" value="principalName" :data="info" />
-            <InfoItem label="审核人员" value="reviewerName" :data="info" />
-            <InfoItem label="创建时间" value="createTime" :data="info" />
-          </div>
-        </div>
-
         <!-- 状态信息区域 -->
         <div class="p-3 md:p-4">
           <h3 class="text-base md:text-lg font-semibold mb-2 flex items-center text-gray-800 dark:text-gray-200">
@@ -150,13 +112,13 @@
               </div>
             </div>
 
-            <div class="info-item">
+            <!-- <div class="info-item">
               <span class="info-label">文件大小</span>
               <div class="info-value mt-0.5 flex items-center">
                 <i class="fa fa-hdd-o text-gray-400 dark:text-gray-500 mr-1.5"></i>
                 {{ info.fileSize || '未知' }}
               </div>
-            </div>
+            </div> -->
 
             <div class="info-item">
               <span class="info-label">更新时间</span>
@@ -189,6 +151,42 @@
             </div>
           </div>
         </div>
+        <!-- 基本信息区域 - 缩小间隔，增强label与内容区分 -->
+        <div class="p-3 md:p-4 border-b border-gray-100 dark:border-gray-700/50">
+          <h3 class="text-base md:text-lg font-semibold mb-2 flex items-center text-gray-800 dark:text-gray-200">
+            <el-icon style="margin-right: 10px" :size="24" color="#409EFF">
+              <Document />
+            </el-icon>
+
+            基本信息
+          </h3>
+
+          <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-2 md:gap-3">
+            <InfoItem label="项目名称" value="projectName" :data="info" />
+            <InfoItem label="资料名称" value="documentName" :data="info" />
+            <InfoItem label="卷册号" value="volumeNumber" :data="info" />
+            <InfoItem label="设计子项名称" value="designSubitem" :data="info" />
+            <InfoItem label="专业名称" value="specialtyName" :data="info" />
+            <InfoItem label="文件格式" value="fileType" :data="info" />
+          </div>
+        </div>
+
+        <!-- 人员信息区域 -->
+        <div class="p-3 md:p-4 border-b border-gray-100 dark:border-gray-700/50">
+          <h3 class="text-base md:text-lg font-semibold mb-2 flex items-center text-gray-800 dark:text-gray-200">
+            <el-icon style="margin-right: 10px" :size="24" color="#409EFF">
+              <Document />
+            </el-icon>
+            人员信息
+          </h3>
+
+          <div class="grid grid-cols-1 md:grid-cols-2 gap-2 md:gap-3">
+            <InfoItem label="负责人" value="principal" :data="info" />
+            <InfoItem label="设计人员" value="principalName" :data="info" />
+            <InfoItem label="审核人员" value="reviewerName" :data="info" />
+            <InfoItem label="创建时间" value="createTime" :data="info" />
+          </div>
+        </div>
       </div>
     </main>
 
diff --git a/src/views/design/volumeCatalog/index.vue b/src/views/design/volumeCatalog/index.vue
index ac55b85..c3e1c65 100644
--- a/src/views/design/volumeCatalog/index.vue
+++ b/src/views/design/volumeCatalog/index.vue
@@ -42,6 +42,9 @@
               <el-button type="warning" plain icon="Upload">导入</el-button>
             </file-upload>
           </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Download" @click="exportFile">导出模版</el-button>
+          </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
@@ -607,6 +610,24 @@ const getVolumeFileList = async (type) => {
     fileList.value = res.rows;
   }
 };
+const exportFile = () => {
+  // 导出模版文件
+  try {
+    // 创建a标签
+    const link = document.createElement('a');
+    // 设置PDF文件路径 - 相对于public目录
+    link.href = '/catalog.xlsx';
+    // 设置下载后的文件名
+    link.download = '设计出图计划导入模版.xlsx';
+    // 触发点击
+    document.body.appendChild(link);
+    link.click();
+    // 清理
+    document.body.removeChild(link);
+  } catch (error) {
+    alert('下载失败，请重试');
+  }
+};
 // 切换
 const handleClick = (val) => {
   getVolumeFileList(val.props.name);
diff --git a/src/views/materials/materialsEquipment/materialReceive/index.vue b/src/views/materials/materialsEquipment/materialReceive/index.vue
index ab997cf..d7c1b27 100644
--- a/src/views/materials/materialsEquipment/materialReceive/index.vue
+++ b/src/views/materials/materialsEquipment/materialReceive/index.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
-      :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
@@ -12,8 +11,7 @@
               <el-input v-model="queryParams.projectName" placeholder="请输入工程名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="材料名称" prop="materialName">
-              <el-input v-model="queryParams.materialName" placeholder="请输入设备材料名称" clearable
-                @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.materialName" placeholder="请输入设备材料名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="合同名称" prop="contractName">
               <el-input v-model="queryParams.contractName" placeholder="请输入合同名称" clearable @keyup.enter="handleQuery" />
@@ -25,11 +23,8 @@
               <el-input v-model="queryParams.supplierUnit" placeholder="请输入供货单位" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" v-hasPermi="['materials:materialReceive:list']" icon="Search"
-                @click="handleQuery">搜索</el-button>
-
-              <el-button icon="Refresh" v-hasPermi="['materials:materialReceive:list']"
-                @click="resetQuery">重置</el-button>
+              <el-button type="primary" v-hasPermi="['materials:materialReceive:list']" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" v-hasPermi="['materials:materialReceive:list']" @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-form>
         </el-card>
@@ -40,12 +35,18 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd"
-              v-hasPermi="['materials:materialReceive:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['materials:materialReceive:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
-              v-hasPermi="['materials:materialReceive:remove']">删除</el-button>
+            <el-button
+              type="danger"
+              plain
+              icon="Delete"
+              :disabled="multiple"
+              @click="handleDelete()"
+              v-hasPermi="['materials:materialReceive:remove']"
+              >删除</el-button
+            >
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -68,22 +69,23 @@
         <el-table-column label="操作" align="center" 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)"
-                v-hasPermi="['materials:materialReceive:query']"></el-button>
+              <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['materials:materialReceive:query']"></el-button>
             </el-tooltip>
-            <!-- <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['materials:materialReceive:edit']"></el-button>
-            </el-tooltip> -->
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-                v-hasPermi="['materials:materialReceive:remove']"></el-button>
+              <el-button
+                link
+                type="primary"
+                icon="Delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['materials:materialReceive:remove']"
+              ></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-        v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
+
     <!-- 添加或修改物料接收单对话框 -->
     <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="800px" append-to-body>
       <el-form ref="materialReceiveFormRef" :model="form" :rules="rules" label-width="110px">
@@ -92,7 +94,7 @@
             <el-form-item label="材料来源" prop="materialSource">
               <el-select v-model="form.materialSource" filterable placeholder="请选择材料来源" style="width: 100%">
                 <el-option label="甲供材料" value="1"></el-option>
-                <el-option label="已供材料" value="2"></el-option>
+                <el-option label="乙供材料" value="2"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -101,23 +103,26 @@
               <el-input v-model="form.formCode" placeholder="请输入表单编号" />
             </el-form-item>
           </el-col>
-          <el-col :span="12"><el-form-item label="采购单编号" prop="docId"><el-select @change="handleSelect"
-                v-model="form.docId" filterable placeholder="请选择采购单" style="width: 100%">
-                <el-option v-for="item in purchaseDocList" :key="item.id" :label="item.docCode"
-                  :value="item.id"></el-option> </el-select></el-form-item>
+          <el-col v-if="form.materialSource == '2'" :span="12">
+            <el-form-item label="采购单编号" prop="docId">
+              <el-select @change="handleSelect" v-model="form.docId" filterable placeholder="请选择采购单" style="width: 100%">
+                <el-option v-for="item in purchaseDocList" :key="item.id" :label="item.docCode" :value="item.id"></el-option>
+              </el-select>
+            </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col v-if="form.materialSource == '2'" :span="12">
             <el-form-item label="供货单位" prop="supplierUnit">
               <el-input disabled v-model="form.supplierUnit" placeholder="请输入供货单位" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col v-if="form.materialSource == '2'" :span="12">
             <el-form-item label="订货单位" prop="orderingUnit">
               <el-input v-model="form.orderingUnit" placeholder="请输入订货单位" />
             </el-form-item>
           </el-col>
-          <el-col :span="12"><el-form-item label="工程名称" prop="projectName">
-              <el-input v-model="form.projectName" placeholder="请输入工程名称" />
+          <el-col :span="12">
+            <el-form-item label="工程名称" prop="projectName">
+              <el-input disabled v-model="form.projectName" placeholder="请输入工程名称" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -130,65 +135,79 @@
               <el-input v-model="form.defectDescription" type="textarea" placeholder="请输入内容" />
             </el-form-item>
           </el-col>
+
+          <!-- 数量验收区域（修复v-for key问题） -->
           <el-col :span="24">
             <div class="detail">
               <div class="detail-header">
                 <span>数量验收</span>
-                <!-- <el-button type="primary" link @click="addItem" icon="Plus">添加数量验收</el-button> -->
+                <el-button type="primary" v-if="form.materialSource == '1'" link @click="addItem" icon="Plus">添加数量验收</el-button>
               </div>
-              <div v-for="(item, index) in form.itemList" :key="index" class="detail-item">
+              <!-- 关键修复：v-for key改为item.id（唯一标识），而非index -->
+              <div v-for="(item, index) in form.itemList" :key="item.id" class="detail-item">
                 <el-row>
                   <el-col :span="12">
-                    <el-form-item disabled label="名称" :prop="`itemList.${index}.name`"
-                      :rules="{ required: true, message: '名称不能为空', trigger: 'blur' }">
-                      <el-input disabled v-model="item.name" placeholder="请输入名称" />
+                    <el-form-item label="名称" :prop="`itemList.${index}.name`" :rules="{ required: true, message: '名称不能为空', trigger: 'blur' }">
+                      <el-input :disabled="form.materialSource == '2'" v-model="item.name" placeholder="请输入名称" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="规格" :prop="`itemList.${index}.specification`"
-                      :rules="{ required: true, message: '规格不能为空', trigger: 'blur' }">
-                      <el-input disabled v-model="item.specification" placeholder="请输入规格" />
+                    <el-form-item
+                      label="规格"
+                      :prop="`itemList.${index}.specification`"
+                      :rules="{ required: true, message: '规格不能为空', trigger: 'blur' }"
+                    >
+                      <el-input :disabled="form.materialSource == '2'" v-model="item.specification" placeholder="请输入规格" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="单位" :prop="`itemList.${index}.unit`"
-                      :rules="{ required: true, message: '单位不能为空', trigger: 'blur' }">
-                      <el-input disabled v-model="item.unit" placeholder="请输入单位" />
+                    <el-form-item label="单位" :prop="`itemList.${index}.unit`" :rules="{ required: true, message: '单位不能为空', trigger: 'blur' }">
+                      <el-input :disabled="form.materialSource == '2'" v-model="item.unit" placeholder="请输入单位" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="数量" :prop="`itemList.${index}.quantity`"
-                      :rules="{ required: true, message: '数量不能为空', trigger: 'blur' }">
-                      <el-input disabled type="number" v-model="item.quantity" placeholder="请输入数量" />
+                    <el-form-item
+                      label="数量"
+                      :prop="`itemList.${index}.quantity`"
+                      :rules="{ required: true, message: '数量不能为空', trigger: 'blur' }"
+                    >
+                      <el-input :disabled="form.materialSource == '2'" type="number" v-model="item.quantity" placeholder="请输入数量" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="验收" :prop="`itemList.${index}.acceptedQuantity`"
-                      :rules="{ required: true, message: '验收数量不能为空', trigger: 'blur' }">
+                    <el-form-item
+                      label="验收"
+                      :prop="`itemList.${index}.acceptedQuantity`"
+                      :rules="{ required: true, message: '验收数量不能为空', trigger: 'blur' }"
+                    >
                       <el-input type="number" v-model="item.acceptedQuantity" placeholder="请输入验收" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="缺件" :prop="`itemList.${index}.shortageQuantity`"
-                      :rules="{ required: true, message: '缺件数量不能为空', trigger: 'blur' }">
+                    <el-form-item
+                      label="缺件"
+                      :prop="`itemList.${index}.shortageQuantity`"
+                      :rules="{ required: true, message: '缺件数量不能为空', trigger: 'blur' }"
+                    >
                       <el-input type="number" v-model="item.shortageQuantity" placeholder="自动计算（数量-验收数量）" readonly />
                       <span class="tips">*自动计算（数量-验收数量）</span>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="备注" prop="remark">
+                    <el-form-item label="备注" :prop="`itemList.${index}.remark`">
                       <el-input v-model="item.remark" placeholder="请输入备注" />
                     </el-form-item>
                   </el-col>
-                  <!-- <el-col :span="12" v-if="form.itemList.length > 1">
+                  <el-col :span="12" v-if="form.itemList.length > 1 && form.materialSource == '1'">
                     <div class="item-actions">
                       <el-button type="danger" link @click="removeItem(index)" icon="Delete">删除</el-button>
                     </div>
-                  </el-col> -->
+                  </el-col>
                 </el-row>
               </div>
             </div>
           </el-col>
+
           <el-col :span="12">
             <el-form-item label="合格证文件" prop="certCountFileId">
               <file-upload :isShowTip="false" v-model="form.certCountFileId" />
@@ -210,22 +229,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <span
-              style="color: #ff0000ab; margin-bottom: 10px; display: block">注意：请上传doc/xls/ppt/txt/pdf/png/jpg/jpeg/zip格式文件</span>
+            <span style="color: #ff0000ab; margin-bottom: 10px; display: block">注意：请上传doc/xls/ppt/txt/pdf/png/jpg/jpeg/zip格式文件</span>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="设备材料入库/移交" prop="storageType">
-              <el-radio-group v-model="form.storageType">
-                <el-radio v-for="dict in storage_type.slice(0, 1)" :key="dict.value" :label="dict.value">
-                  {{ dict.label }}
-                </el-radio>
-              </el-radio-group>
-              <!-- <el-checkbox-group v-model="form.storageType">
-                <el-checkbox v-for="dict in storage_type" :key="dict.value" :label="dict.value">
-                  {{ dict.label }}
-                </el-checkbox>
-              </el-checkbox-group> -->
-            </el-form-item> </el-col><el-col :span="24"><el-form-item label="备注" prop="remark">
+            <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
             </el-form-item>
           </el-col>
@@ -254,15 +261,19 @@ import { MaterialReceiveVO, MaterialReceiveQuery, MaterialReceiveForm } from '@/
 import { useUserStoreHook } from '@/store/modules/user';
 import wordllReceive from './word/index.vue';
 import { listPurchaseDoc, purchaseDocPlanList } from '@/api/materials/purchaseDoc';
-import { watch } from 'vue';
+import { watch, onMounted, onUnmounted, ref, reactive, computed, toRefs, getCurrentInstance } from 'vue';
+import type { ComponentInternalInstance, ElFormInstance, DialogOption } from 'element-plus';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { storage_type } = toRefs<any>(proxy?.useDict('storage_type'));
-// 获取用户 store
 const userStore = useUserStoreHook();
-// 从 store 中获取项目列表和当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
 const wordllReceiveRef = ref<InstanceType<typeof wordllReceive>>();
+
+// 核心修复1：存储每个验收条目的watch停止函数，避免内存泄漏
+const itemWatchStopFns = ref<Array<() => void>>([]);
+
+// 列表数据
 const materialReceiveList = ref<MaterialReceiveVO[]>([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
@@ -272,15 +283,25 @@ const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
 
+// 表单引用
 const queryFormRef = ref<ElFormInstance>();
 const materialReceiveFormRef = ref<ElFormInstance>();
-const purchaseDocList = ref([]); //物资采购单
-const purchaseMap = new Map();
+const purchaseDocList = ref([]); // 物资采购单列表
+const purchaseMap = new Map(); // 采购单映射（id -> 采购单对象）
+
+// 对话框配置
 const dialog = reactive<DialogOption>({
   visible: false,
   title: ''
 });
-const getInitFormData = () => {
+
+// 生成验收条目唯一ID（用于v-for key）
+const generateItemId = () => {
+  return Date.now() + Math.random().toString(36).substr(2, 9);
+};
+
+// 初始化表单数据（修复：给验收条目添加唯一ID）
+const getInitFormData = (): MaterialReceiveForm => {
   return {
     id: undefined,
     projectId: currentProject.value?.id,
@@ -300,12 +321,13 @@ const getInitFormData = () => {
     techDocCountFileId: undefined,
     licenseCount: undefined,
     licenseCountFileId: undefined,
-    storageType: '',
+    storageType: '1',
     remark: undefined,
     docId: undefined,
     docCode: undefined,
     itemList: [
       {
+        id: generateItemId(), // 新增：唯一ID，解决v-for渲染问题
         name: undefined,
         specification: undefined,
         unit: undefined,
@@ -317,7 +339,8 @@ const getInitFormData = () => {
     ]
   };
 };
-const initFormData: MaterialReceiveForm = {};
+
+// 响应式数据
 const data = reactive({
   form: getInitFormData(),
   queryParams: {
@@ -334,17 +357,10 @@ const data = reactive({
     params: {}
   },
   rules: {
-    // 物资采购单
-    docId: [{ required: true, message: '请选择物资采购单', trigger: 'change' }],
-    // 材料来源
     materialSource: [{ required: true, message: '请选择材料来源', trigger: 'change' }],
-    // 表单编号
     formCode: [{ required: true, message: '请输入表单编号', trigger: 'blur' }],
-    // 采购单编号
-    docCode: [{ required: true, message: '请输入采购单编号', trigger: 'blur' }],
-    // 供货单位
+    docId: [{ required: true, message: '请选择物资采购单', trigger: 'change' }],
     supplierUnit: [{ required: true, message: '请输入供货单位', trigger: 'blur' }],
-    // 订货单位
     orderingUnit: [{ required: true, message: '请输入订货单位', trigger: 'blur' }]
   }
 });
@@ -354,10 +370,13 @@ const { queryParams, form, rules } = toRefs(data);
 /** 查询物料接收单列表 */
 const getList = async () => {
   loading.value = true;
-  const res = await listMaterialReceive(queryParams.value);
-  materialReceiveList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
+  try {
+    const res = await listMaterialReceive(queryParams.value);
+    materialReceiveList.value = res.rows;
+    total.value = res.total;
+  } finally {
+    loading.value = false;
+  }
 };
 
 /** 取消按钮 */
@@ -366,10 +385,19 @@ const cancel = () => {
   dialog.visible = false;
 };
 
-/** 表单重置 */
+/** 表单重置（修复：清理验收条目监听） */
 const reset = () => {
+  // 停止所有验收条目的watch监听
+  itemWatchStopFns.value.forEach((stopFn) => stopFn());
+  itemWatchStopFns.value = [];
+
   form.value = getInitFormData();
   materialReceiveFormRef.value?.resetFields();
+
+  // 重新监听初始条目
+  if (form.value.itemList.length > 0) {
+    watchItemChanges(0);
+  }
 };
 
 /** 搜索按钮操作 */
@@ -387,7 +415,7 @@ const resetQuery = () => {
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: MaterialReceiveVO[]) => {
   ids.value = selection.map((item) => item.id);
-  single.value = selection.length != 1;
+  single.value = selection.length !== 1;
   multiple.value = !selection.length;
 };
 
@@ -396,25 +424,34 @@ const handleAdd = () => {
   reset();
   dialog.visible = true;
   dialog.title = '添加物料接收单';
-  // 为初始条目添加监听
-  if (form.value.itemList.length > 0) {
-    watchItemChanges(0);
-  }
+  form.value.projectName = currentProject.value?.name;
 };
 
-/** 修改按钮操作 */
+/** 修改按钮操作（修复：清理旧监听+添加唯一ID） */
 const handleUpdate = async (row?: MaterialReceiveVO) => {
   reset();
   const _id = row?.id || ids.value[0];
-  const res = await getMaterialReceive(_id);
-  Object.assign(form.value, res.data);
-  // 为每个条目添加监听
-  form.value.itemList.forEach((_, index) => {
-    watchItemChanges(index);
-  });
 
-  dialog.visible = true;
-  dialog.title = '修改物料接收单';
+  try {
+    const res = await getMaterialReceive(_id);
+    // 给验收条目补充唯一ID（避免后端返回无ID）
+    const formData = res.data;
+    formData.itemList = formData.itemList.map((item) => ({
+      ...item,
+      id: item.id || generateItemId()
+    }));
+    Object.assign(form.value, formData);
+
+    // 重新监听所有条目
+    form.value.itemList.forEach((_, index) => {
+      watchItemChanges(index);
+    });
+
+    dialog.visible = true;
+    dialog.title = '修改物料接收单';
+  } catch (err) {
+    proxy?.$modal.msgError('获取详情失败');
+  }
 };
 
 /** 提交按钮 */
@@ -422,14 +459,20 @@ const submitForm = () => {
   materialReceiveFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true;
-      if (form.value.id) {
-        await updateMaterialReceive({ ...form.value }).finally(() => (buttonLoading.value = false));
-      } else {
-        await addMaterialReceive({ ...form.value }).finally(() => (buttonLoading.value = false));
+      try {
+        if (form.value.id) {
+          await updateMaterialReceive({ ...form.value });
+        } else {
+          await addMaterialReceive({ ...form.value });
+        }
+        proxy?.$modal.msgSuccess('操作成功');
+        dialog.visible = false;
+        await getList();
+      } catch (err) {
+        proxy?.$modal.msgError('操作失败');
+      } finally {
+        buttonLoading.value = false;
       }
-      proxy?.$modal.msgSuccess('操作成功');
-      dialog.visible = false;
-      await getList();
     }
   });
 };
@@ -437,15 +480,24 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: MaterialReceiveVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除物料接收单编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
-  await delMaterialReceive(_ids);
-  proxy?.$modal.msgSuccess('删除成功');
-  await getList();
+  if (!_ids.length) return;
+
+  try {
+    await proxy?.$modal.confirm(`是否确认删除物料接收单编号为"${_ids}"的数据项？`);
+    await delMaterialReceive(_ids);
+    proxy?.$modal.msgSuccess('删除成功');
+    await getList();
+  } catch (err) {
+    // 取消删除时不提示
+  } finally {
+    loading.value = false;
+  }
 };
 
-// 添加数量验收条目
+/** 添加数量验收条目（修复：添加唯一ID+监听） */
 const addItem = () => {
   const newItem = {
+    id: generateItemId(), // 唯一ID
     name: undefined,
     specification: undefined,
     unit: undefined,
@@ -455,110 +507,190 @@ const addItem = () => {
     remark: undefined
   };
   form.value.itemList.push(newItem);
-  // 监听新条目数据变化
+  // 监听新条目变化
   watchItemChanges(form.value.itemList.length - 1);
 };
 
-// 监听条目数据变化，自动计算缺件数量
+/** 监听验收条目变化，自动计算缺件数量（修复：存储停止函数） */
 const watchItemChanges = (index: number) => {
-  watch(
+  // 停止该索引已有的监听（避免重复监听）
+  if (itemWatchStopFns.value[index]) {
+    itemWatchStopFns.value[index]();
+  }
+
+  // 监听数量和验收数量变化
+  const stopFn = watch(
     () => [form.value.itemList[index].quantity, form.value.itemList[index].acceptedQuantity],
     ([quantity, acceptedQuantity]) => {
-      // 确保数量和验收数量都是数字
       const qty = Number(quantity) || 0;
       const acceptedQty = Number(acceptedQuantity) || 0;
-      // 计算缺件数量（数量 - 验收数量）
       form.value.itemList[index].shortageQuantity = qty - acceptedQty;
     },
-    { immediate: true }
+    { immediate: true } // 初始时立即计算
   );
+
+  // 存储停止函数，用于后续删除时清理
+  itemWatchStopFns.value[index] = stopFn;
 };
 
-// 删除数量验收条目
+/** 删除数量验收条目（修复：清理监听+删除条目） */
 const removeItem = (index: number) => {
-  if (form.value.itemList.length > 1) {
-    form.value.itemList.splice(index, 1);
-  } else {
+  if (form.value.itemList.length <= 1) {
     proxy?.$modal.msgWarning('至少需要保留一条数量验收记录');
+    return;
   }
+
+  // 停止该条目的监听
+  if (itemWatchStopFns.value[index]) {
+    itemWatchStopFns.value[index]();
+  }
+
+  // 删除条目和对应的停止函数
+  form.value.itemList.splice(index, 1);
+  itemWatchStopFns.value.splice(index, 1);
 };
 
-const handleView = (row) => {
-  // 查看详情
+/** 查看详情 */
+const handleView = (row: MaterialReceiveVO) => {
   wordllReceiveRef.value?.openDialog(row);
 };
 
 /** 查询物资-采购联系单列表 */
 const getlistPurchase = async () => {
-  const res = await listPurchaseDoc({
-    projectId: currentProject.value?.id,
-    status: 'finish'
-  });
-
-  purchaseDocList.value = res.rows;
-  if (purchaseDocList.value && purchaseDocList.value.length > 0) {
+  try {
+    const res = await listPurchaseDoc({
+      projectId: currentProject.value?.id,
+      status: 'finish'
+    });
+    purchaseDocList.value = res.rows;
+    // 构建采购单映射
     purchaseDocList.value.forEach((item) => {
       purchaseMap.set(item.id, item);
     });
+  } catch (err) {
+    proxy?.$modal.msgError('获取采购单列表失败');
   }
 };
 
-// 通过采购单获取需求信息
+/** 通过采购单获取需求信息（修复：清理旧监听+添加新监听） */
 const getdemandInfo = async (docId: string) => {
-  let res = await purchaseDocPlanList(docId);
-  if (res.code == 200) {
-    // 需求表单赋值
-    form.value.itemList = [];
-    //  form.value.itemList 清空
-    console.log(form.value.itemList);
-    res.data.forEach((item, index) => {
-      let obj = {
-        quantity: item.demandQuantity,
-        acceptedQuantity: 0,
-        shortageQuantity: item.demandQuantity, // 初始化缺件数量为总数量
-        planId: item.id,
-        ...item
-      };
-      obj.id = null;
-      form.value.itemList.push(obj);
-      // 监听每个条目的变化
-      watchItemChanges(form.value.itemList.length - 1);
-    });
+  if (!docId) return;
+
+  try {
+    const res = await purchaseDocPlanList(docId);
+    if (res.code === 200) {
+      // 清空旧监听和条目
+      itemWatchStopFns.value.forEach((stopFn) => stopFn());
+      itemWatchStopFns.value = [];
+      form.value.itemList = [];
+
+      // 赋值需求数据并添加监听
+      res.data.forEach((item, index) => {
+        const qty = Number(item.demandQuantity) || 0;
+        const newItem = {
+          id: generateItemId(), // 唯一ID
+          name: item.name,
+          specification: item.specification,
+          unit: item.unit,
+          quantity: qty,
+          acceptedQuantity: 0,
+          shortageQuantity: qty, // 初始缺件=总数量
+          remark: item.remark,
+          planId: item.id,
+          id: null // 保留后端需要的空id字段
+        };
+        form.value.itemList.push(newItem);
+        // 监听当前条目
+        watchItemChanges(index);
+      });
+    }
+  } catch (err) {
+    proxy?.$modal.msgError('获取采购单需求信息失败');
   }
 };
 
-const handleSelect = (val) => {
-  // 选择设备
-  let obj = purchaseMap.get(val);
+/** 选择采购单触发 */
+const handleSelect = (val: string) => {
+  if (!val) return;
+
+  const obj = purchaseMap.get(val);
+  if (obj) {
+    form.value.docCode = obj.docCode || '';
+    form.value.supplierUnit = obj.supplier || '';
+    form.value.materialName = obj.name || '';
+  }
+
+  // 获取采购单对应的需求信息
   getdemandInfo(val);
-  form.value.docCode = obj?.docCode || '';
-  form.value.supplierUnit = obj?.supplier || '';
-  form.value.materialName = obj?.name || '';
 };
 
+/** 核心修复2：监听材料来源变化，重置数量验收列表 */
+watch(
+  () => form.value.materialSource,
+  (newSource, oldSource) => {
+    if (newSource === oldSource) return;
+
+    // 1. 停止所有验收条目的监听
+    itemWatchStopFns.value.forEach((stopFn) => stopFn());
+    itemWatchStopFns.value = [];
+
+    // 2. 重置数量验收列表为初始状态（1条空记录）
+    form.value.itemList = [
+      {
+        id: generateItemId(),
+        name: undefined,
+        specification: undefined,
+        unit: undefined,
+        quantity: undefined,
+        acceptedQuantity: undefined,
+        shortageQuantity: undefined,
+        remark: undefined
+      }
+    ];
+
+    // 3. 重新监听初始条目
+    watchItemChanges(0);
+
+    // 4. 切换到乙供时，清空采购单相关数据
+    if (newSource === '2') {
+      form.value.docId = undefined;
+      form.value.supplierUnit = undefined;
+      form.value.materialName = undefined;
+      form.value.docCode = undefined;
+    }
+  },
+  { immediate: true }
+);
+
+/** 页面挂载时初始化 */
 onMounted(() => {
   getList();
   getlistPurchase();
-  // 为初始条目添加监听
+  // 监听初始验收条目
   if (form.value.itemList.length > 0) {
     watchItemChanges(0);
   }
 });
 
-// 监听项目id刷新数据
+/** 监听项目变化，刷新数据 */
 const listeningProject = watch(
   () => currentProject.value?.id,
-  (nid, oid) => {
+  (nid) => {
     queryParams.value.projectId = nid;
     form.value.projectId = nid;
     getList();
+    getlistPurchase();
   }
 );
 
+/** 页面卸载时清理监听 */
 onUnmounted(() => {
   listeningProject();
+  // 清理验收条目监听
+  itemWatchStopFns.value.forEach((stopFn) => stopFn());
 });
 </script>
+
 <style scoped lang="scss">
 .detail {
   border-bottom: 1px solid #ececec;
@@ -599,4 +731,8 @@ onUnmounted(() => {
   color: #666;
   margin-left: 8px;
 }
+
+.mb8 {
+  margin-bottom: 8px;
+}
 </style>