From 6eb10c27a4580165ec64d9edd7e36ccbc834a776 Mon Sep 17 00:00:00 2001
From: taoge1020 <sendtao@163.com>
Date: Fri, 22 Aug 2025 23:29:16 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/contract/limitPrice/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/contract/limitPrice/index.vue b/src/views/contract/limitPrice/index.vue
index f64b797..1b69633 100644
--- a/src/views/contract/limitPrice/index.vue
+++ b/src/views/contract/limitPrice/index.vue
@@ -58,6 +58,7 @@
               :precision="2"
               :step="0.1"
               :controls="false"
+              :disabled="reviewStatus != 'draft'"
               v-if="scope.row.quantity && scope.row.quantity != 0"
             />
           </template>

From 7ea059461014f654c351e5c99e4f9344b255187f Mon Sep 17 00:00:00 2001
From: fengsen <2548667232@qq.com>
Date: Mon, 25 Aug 2025 11:10:45 +0800
Subject: [PATCH 2/6] 1

---
 src/views/contract/limitPrice/indexEdit.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/contract/limitPrice/indexEdit.vue b/src/views/contract/limitPrice/indexEdit.vue
index c4571f2..d8bbdda 100644
--- a/src/views/contract/limitPrice/indexEdit.vue
+++ b/src/views/contract/limitPrice/indexEdit.vue
@@ -38,7 +38,7 @@
               </el-row>
             </div>
           </el-form>
-          <el-table :data="tableData" style="width: 100%; margin-bottom: 20px; height: calc(100vh - 305px)" row-key="id" border>
+          <el-table :data="tableData"  style="width: 100%; margin-bottom: 20px; height: calc(100vh - 305px)" row-key="id" border>
             <el-table-column prop="num" label="编号" />
             <el-table-column prop="name" label="名称" />
             <el-table-column prop="specification" label="规格" />

From 70db0367e194e45b2d976226f08b4c5960c2df9c Mon Sep 17 00:00:00 2001
From: fengsen <2548667232@qq.com>
Date: Mon, 25 Aug 2025 19:58:42 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=9C=9F=E5=9C=B0=E6=B5=81=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=88=E5=9C=B0=E5=9D=97=E4=BF=A1=E6=81=AF=E3=80=81=E8=BF=9B?=
 =?UTF-8?q?=E5=9C=BA=E9=81=93=E8=B7=AF=EF=BC=88=E4=B8=8B=E8=BD=BD=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E3=80=81=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   2 +-
 public/enterRoad.xlsx                         | Bin 0 -> 9759 bytes
 public/landBlock.xlsx                         | Bin 0 -> 9784 bytes
 .../system/landTransfer/enterRoad/index.ts    |   9 +
 .../system/landTransfer/landBlock/index.ts    |   9 +
 src/views/contract/limitPrice/indexEdit.vue   |   8 +-
 .../BasicData/enterRoad/index.vue             |  49 +++-
 .../BasicData/landBlock/index.vue             |  50 +++-
 ....timestamp-1755827449287-2282fd4d0109d.mjs | 230 ------------------
 9 files changed, 118 insertions(+), 239 deletions(-)
 create mode 100644 public/enterRoad.xlsx
 create mode 100644 public/landBlock.xlsx
 delete mode 100644 vite.config.ts.timestamp-1755827449287-2282fd4d0109d.mjs

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/enterRoad.xlsx b/public/enterRoad.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..b7f00ac8a0517128f09ac82043e158a91c815928
GIT binary patch
literal 9759
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
D%)#9n

literal 0
HcmV?d00001

diff --git a/public/landBlock.xlsx b/public/landBlock.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..25d39e031e2dce39cd6b6407cc8f11f5fd43cf98
GIT binary patch
literal 9784
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

literal 0
HcmV?d00001

diff --git a/src/api/system/landTransfer/enterRoad/index.ts b/src/api/system/landTransfer/enterRoad/index.ts
index c3e093c..a575127 100644
--- a/src/api/system/landTransfer/enterRoad/index.ts
+++ b/src/api/system/landTransfer/enterRoad/index.ts
@@ -61,3 +61,12 @@ export const delEnterRoad = (id: string | number | Array<string | number>) => {
     method: 'delete'
   });
 };
+
+// 道路信息导入
+export const importEnterRoad = (projectId: any, data: any) => {
+  return request({
+    url: '/land/enterRoad/upload/' + projectId,
+    method: 'post',
+    data: data
+  });
+};
\ No newline at end of file
diff --git a/src/api/system/landTransfer/landBlock/index.ts b/src/api/system/landTransfer/landBlock/index.ts
index d543334..06e3aad 100644
--- a/src/api/system/landTransfer/landBlock/index.ts
+++ b/src/api/system/landTransfer/landBlock/index.ts
@@ -76,3 +76,12 @@ export const delLandBlock = (id: string | number | Array<string | number>) => {
     method: 'delete'
   });
 };
+
+// 地块信息导入
+export const importLandBlock = (projectId:any,data: any) => {
+  return request({
+    url: '/land/landBlock/upload/'+projectId,
+    method: 'post',
+    data: data
+  });
+};
diff --git a/src/views/contract/limitPrice/indexEdit.vue b/src/views/contract/limitPrice/indexEdit.vue
index d4e32da..dfd420c 100644
--- a/src/views/contract/limitPrice/indexEdit.vue
+++ b/src/views/contract/limitPrice/indexEdit.vue
@@ -76,12 +76,8 @@
         </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/project/landTransfer/BasicData/enterRoad/index.vue b/src/views/project/landTransfer/BasicData/enterRoad/index.vue
index ab1ae32..2c73084 100644
--- a/src/views/project/landTransfer/BasicData/enterRoad/index.vue
+++ b/src/views/project/landTransfer/BasicData/enterRoad/index.vue
@@ -27,6 +27,16 @@
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['land:enterRoad:add']">新增</el-button>
           </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Plus" @click="downloadTemplate" v-hasPermi="['land:enterRoad:import']">模板下载</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-upload ref="uploadRef" class="upload-demo" :http-request="handleImport" :show-file-list="false">
+                <template #trigger>
+                  <el-button plain type="primary">导入excel</el-button>
+                </template>
+              </el-upload>
+          </el-col>
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['land:enterRoad:remove']"
               >删除</el-button
@@ -92,7 +102,7 @@
 </template>
 
 <script setup name="EnterRoad" lang="ts">
-import { listEnterRoad, getEnterRoad, delEnterRoad, addEnterRoad, updateEnterRoad } from '@/api/system/landTransfer/enterRoad';
+import { listEnterRoad, getEnterRoad, delEnterRoad, addEnterRoad, updateEnterRoad ,importEnterRoad} from '@/api/system/landTransfer/enterRoad';
 import { EnterRoadVO, EnterRoadQuery, EnterRoadForm } from '@/api/system/landTransfer/enterRoad/types';
 import { listLandBlock } from '@/api/system/landTransfer/landBlock';
 import { useUserStoreHook } from '@/store/modules/user';
@@ -255,6 +265,43 @@ const listeningProject = watch(
   }
 );
 
+// 导入文件
+const handleImport = (options: any) => {
+   loading.value = true;
+  let formData = new FormData();
+  formData.append('file', options.file);
+  importEnterRoad(currentProject.value?.id,formData).then((res) => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess(res.msg || '导入成功');
+      getListLand();
+      getList();
+    }
+  }).catch((err) => {
+    proxy.$modal.msgError(err.msg || '导入失败');
+  }).finally(() => {
+    loading.value = false;
+  });
+};
+// 下载模板
+const downloadTemplate = () => {
+  // 导出模版文件
+  try {
+    // 创建a标签
+    const link = document.createElement('a');
+    // 设置PDF文件路径 - 相对于public目录
+    link.href = '/enterRoad.xlsx';
+    // 设置下载后的文件名
+    link.download = '道路信息导入模板.xlsx';
+    // 触发点击
+    document.body.appendChild(link);
+    link.click();
+    // 清理
+    document.body.removeChild(link);
+  } catch (error) {
+    alert('下载失败，请重试');
+  }
+};
+
 onUnmounted(() => {
   listeningProject();
 });
diff --git a/src/views/project/landTransfer/BasicData/landBlock/index.vue b/src/views/project/landTransfer/BasicData/landBlock/index.vue
index 38eb414..d2643db 100644
--- a/src/views/project/landTransfer/BasicData/landBlock/index.vue
+++ b/src/views/project/landTransfer/BasicData/landBlock/index.vue
@@ -36,6 +36,16 @@
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['land:landBlock:add']">新增</el-button>
           </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Plus" @click="downloadTemplate" v-hasPermi="['land:enterRoad:import']">模板下载</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-upload ref="uploadRef" class="upload-demo" :http-request="handleImport" :show-file-list="false">
+                <template #trigger>
+                  <el-button plain type="primary">导入excel</el-button>
+                </template>
+              </el-upload>
+          </el-col>
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['land:landBlock:remove']"
               >删除</el-button
@@ -143,7 +153,7 @@
 </template>
 
 <script setup name="LandBlock" lang="ts">
-import { listLandBlock, getLandBlock, delLandBlock, LandUnit, addLandBlock, updateLandBlock, subMatrix } from '@/api/system/landTransfer/landBlock';
+import { listLandBlock, getLandBlock, delLandBlock, LandUnit, addLandBlock, updateLandBlock, subMatrix,importLandBlock } from '@/api/system/landTransfer/landBlock';
 import { LandBlockVO, LandBlockQuery, LandBlockForm } from '@/api/system/landTransfer/landBlock/types';
 import { useUserStoreHook } from '@/store/modules/user';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -388,6 +398,44 @@ const listeningProject = watch(
   }
 );
 
+// 导入文件
+const handleImport = (options:any) => {
+  loading.value = true;
+  let formData = new FormData();
+  formData.append('file', options.file);
+  importLandBlock(currentProject.value?.id,formData).then((res) => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess(res.msg || '导入成功');
+      getList();
+      getfangzhenList();
+    }
+  }).catch((err) => {
+    proxy.$modal.msgError(err.msg || '导入失败');
+  }).finally(() => {
+    loading.value = false;
+  });
+};
+
+// 下载模板
+const downloadTemplate = () => {
+  // 导出模版文件
+  try {
+    // 创建a标签
+    const link = document.createElement('a');
+    // 设置PDF文件路径 - 相对于public目录
+    link.href = '/landBlock.xlsx';
+    // 设置下载后的文件名
+    link.download = '地块信息导入模板.xlsx';
+    // 触发点击
+    document.body.appendChild(link);
+    link.click();
+    // 清理
+    document.body.removeChild(link);
+  } catch (error) {
+    alert('下载失败，请重试');
+  }
+};
+
 onUnmounted(() => {
   listeningProject();
 });
diff --git a/vite.config.ts.timestamp-1755827449287-2282fd4d0109d.mjs b/vite.config.ts.timestamp-1755827449287-2282fd4d0109d.mjs
deleted file mode 100644
index 76dd27e..0000000
--- a/vite.config.ts.timestamp-1755827449287-2282fd4d0109d.mjs
+++ /dev/null
@@ -1,230 +0,0 @@
-// vite.config.ts
-import { loadEnv, defineConfig } from "file:///D:/mk_system/node_modules/vite/dist/node/index.js";
-
-// vite/plugins/index.ts
-import vue from "file:///D:/mk_system/node_modules/@vitejs/plugin-vue/dist/index.mjs";
-
-// vite/plugins/unocss.ts
-import UnoCss from "file:///D:/mk_system/node_modules/unocss/dist/vite.mjs";
-var unocss_default = () => {
-  return UnoCss({
-    hmrTopLevelAwait: false
-    // unocss默认是true，低版本浏览器是不支持的，启动后会报错
-  });
-};
-
-// vite/plugins/auto-import.ts
-import AutoImport from "file:///D:/mk_system/node_modules/unplugin-auto-import/dist/vite.js";
-import { ElementPlusResolver } from "file:///D:/mk_system/node_modules/unplugin-vue-components/dist/resolvers.js";
-import IconsResolver from "file:///D:/mk_system/node_modules/unplugin-icons/dist/resolver.js";
-var __vite_injected_original_dirname = "D:\\mk_system\\vite\\plugins";
-var auto_import_default = (path3) => {
-  return AutoImport({
-    // 自动导入 Vue 相关函数
-    imports: ["vue", "vue-router", "@vueuse/core", "pinia"],
-    eslintrc: {
-      enabled: false,
-      filepath: "./.eslintrc-auto-import.json",
-      globalsPropValue: true
-    },
-    resolvers: [
-      // 自动导入 Element Plus 相关函数ElMessage, ElMessageBox... (带样式)
-      ElementPlusResolver(),
-      IconsResolver({
-        prefix: "Icon"
-      })
-    ],
-    vueTemplate: true,
-    // 是否在 vue 模板中自动导入
-    dts: path3.resolve(path3.resolve(__vite_injected_original_dirname, "../../src"), "types", "auto-imports.d.ts")
-  });
-};
-
-// vite/plugins/components.ts
-import Components from "file:///D:/mk_system/node_modules/unplugin-vue-components/dist/vite.js";
-import { ElementPlusResolver as ElementPlusResolver2 } from "file:///D:/mk_system/node_modules/unplugin-vue-components/dist/resolvers.js";
-import IconsResolver2 from "file:///D:/mk_system/node_modules/unplugin-icons/dist/resolver.js";
-var __vite_injected_original_dirname2 = "D:\\mk_system\\vite\\plugins";
-var components_default = (path3) => {
-  return Components({
-    resolvers: [
-      // 自动导入 Element Plus 组件
-      ElementPlusResolver2(),
-      // 自动注册图标组件
-      IconsResolver2({
-        enabledCollections: ["ep"]
-      })
-    ],
-    dts: path3.resolve(path3.resolve(__vite_injected_original_dirname2, "../../src"), "types", "components.d.ts")
-  });
-};
-
-// vite/plugins/icons.ts
-import Icons from "file:///D:/mk_system/node_modules/unplugin-icons/dist/vite.js";
-var icons_default = () => {
-  return Icons({
-    // 自动安装图标库
-    autoInstall: true
-  });
-};
-
-// vite/plugins/svg-icon.ts
-import { createSvgIconsPlugin } from "file:///D:/mk_system/node_modules/vite-plugin-svg-icons/dist/index.mjs";
-var __vite_injected_original_dirname3 = "D:\\mk_system\\vite\\plugins";
-var svg_icon_default = (path3, isBuild) => {
-  return createSvgIconsPlugin({
-    // 指定需要缓存的图标文件夹
-    iconDirs: [path3.resolve(path3.resolve(__vite_injected_original_dirname3, "../../src"), "assets/icons/svg")],
-    // 指定symbolId格式
-    symbolId: "icon-[dir]-[name]",
-    svgoOptions: isBuild
-  });
-};
-
-// vite/plugins/compression.ts
-import compression from "file:///D:/mk_system/node_modules/vite-plugin-compression/dist/index.mjs";
-var compression_default = (env) => {
-  const { VITE_BUILD_COMPRESS } = env;
-  const plugin = [];
-  if (VITE_BUILD_COMPRESS) {
-    const compressList = VITE_BUILD_COMPRESS.split(",");
-    if (compressList.includes("gzip")) {
-      plugin.push(
-        compression({
-          ext: ".gz",
-          deleteOriginFile: false
-        })
-      );
-    }
-    if (compressList.includes("brotli")) {
-      plugin.push(
-        compression({
-          ext: ".br",
-          algorithm: "brotliCompress",
-          deleteOriginFile: false
-        })
-      );
-    }
-  }
-  return plugin;
-};
-
-// vite/plugins/setup-extend.ts
-import setupExtend from "file:///D:/mk_system/node_modules/unplugin-vue-setup-extend-plus/dist/vite.js";
-var setup_extend_default = () => {
-  return setupExtend({});
-};
-
-// vite/plugins/index.ts
-import path from "path";
-var plugins_default = (viteEnv, isBuild = false) => {
-  const vitePlugins = [];
-  vitePlugins.push(vue());
-  vitePlugins.push(unocss_default());
-  vitePlugins.push(auto_import_default(path));
-  vitePlugins.push(components_default(path));
-  vitePlugins.push(compression_default(viteEnv));
-  vitePlugins.push(icons_default());
-  vitePlugins.push(svg_icon_default(path, isBuild));
-  vitePlugins.push(setup_extend_default());
-  return vitePlugins;
-};
-
-// vite.config.ts
-import path2 from "path";
-var __vite_injected_original_dirname4 = "D:\\mk_system";
-var vite_config_default = defineConfig(({ mode, command }) => {
-  const env = loadEnv(mode, process.cwd());
-  return {
-    // 部署生产环境和开发环境下的URL。
-    // 默认情况下，vite 会假设你的应用是被部署在一个域名的根路径上
-    // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-    base: env.VITE_APP_CONTEXT_PATH,
-    resolve: {
-      alias: {
-        "~": path2.resolve(__vite_injected_original_dirname4, "./"),
-        "@": path2.resolve(__vite_injected_original_dirname4, "./src")
-      },
-      extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json", ".vue", ".tif"]
-    },
-    // https://cn.vitejs.dev/config/#resolve-extensions
-    plugins: plugins_default(env, command === "build"),
-    server: {
-      host: "0.0.0.0",
-      port: Number(env.VITE_APP_PORT),
-      open: true,
-      proxy: {
-        [env.VITE_APP_BASE_API]: {
-          target: "http://localhost:8899",
-          changeOrigin: true,
-          ws: true,
-          rewrite: (path3) => path3.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
-        },
-        "/warm-flow-ui": {
-          target: env.VITE_APP_BASE_API,
-          changeOrigin: true,
-          ws: true,
-          rewrite: (path3) => path3.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
-        },
-        "/warm-flow": {
-          target: env.VITE_APP_BASE_API,
-          changeOrigin: true,
-          ws: true,
-          rewrite: (path3) => path3.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
-        },
-        "/workflow": {
-          target: env.VITE_APP_BASE_API,
-          changeOrigin: true,
-          ws: true,
-          rewrite: (path3) => path3.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
-        },
-        "/auth": {
-          target: env.VITE_APP_BASE_API,
-          changeOrigin: true,
-          ws: true,
-          rewrite: (path3) => path3.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
-        }
-      }
-    },
-    css: {
-      preprocessorOptions: {
-        scss: {
-          javascriptEnabled: true
-        }
-      },
-      postcss: {
-        plugins: [
-          {
-            postcssPlugin: "internal:charset-removal",
-            AtRule: {
-              charset: (atRule) => {
-                if (atRule.name === "charset") {
-                  atRule.remove();
-                }
-              }
-            }
-          }
-        ]
-      }
-    },
-    // 预编译
-    optimizeDeps: {
-      include: [
-        "vue",
-        "vue-router",
-        "pinia",
-        "axios",
-        "@vueuse/core",
-        "echarts",
-        "vue-i18n",
-        "@vueup/vue-quill",
-        "image-conversion",
-        "element-plus/es/components/**/css"
-      ]
-    }
-  };
-});
-export {
-  vite_config_default as default
-};
-//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.ts", "vite/plugins/index.ts", "vite/plugins/unocss.ts", "vite/plugins/auto-import.ts", "vite/plugins/components.ts", "vite/plugins/icons.ts", "vite/plugins/svg-icon.ts", "vite/plugins/compression.ts", "vite/plugins/setup-extend.ts"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"D:\\\\mk_system\";const __vite_injected_original_filename = \"D:\\\\mk_system\\\\vite.config.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/mk_system/vite.config.ts\";import { UserConfig, ConfigEnv, loadEnv, defineConfig } from 'vite';\r\n\r\nimport createPlugins from './vite/plugins';\r\n\r\nimport path from 'path';\r\nexport default defineConfig(({ mode, command }: ConfigEnv): UserConfig => {\r\n  const env = loadEnv(mode, process.cwd());\r\n  return {\r\n    // \u90E8\u7F72\u751F\u4EA7\u73AF\u5883\u548C\u5F00\u53D1\u73AF\u5883\u4E0B\u7684URL\u3002\r\n    // \u9ED8\u8BA4\u60C5\u51B5\u4E0B\uFF0Cvite \u4F1A\u5047\u8BBE\u4F60\u7684\u5E94\u7528\u662F\u88AB\u90E8\u7F72\u5728\u4E00\u4E2A\u57DF\u540D\u7684\u6839\u8DEF\u5F84\u4E0A\r\n    // \u4F8B\u5982 https://www.ruoyi.vip/\u3002\u5982\u679C\u5E94\u7528\u88AB\u90E8\u7F72\u5728\u4E00\u4E2A\u5B50\u8DEF\u5F84\u4E0A\uFF0C\u4F60\u5C31\u9700\u8981\u7528\u8FD9\u4E2A\u9009\u9879\u6307\u5B9A\u8FD9\u4E2A\u5B50\u8DEF\u5F84\u3002\u4F8B\u5982\uFF0C\u5982\u679C\u4F60\u7684\u5E94\u7528\u88AB\u90E8\u7F72\u5728 https://www.ruoyi.vip/admin/\uFF0C\u5219\u8BBE\u7F6E baseUrl \u4E3A /admin/\u3002\r\n    base: env.VITE_APP_CONTEXT_PATH,\r\n    resolve: {\r\n      alias: {\r\n        '~': path.resolve(__dirname, './'),\r\n        '@': path.resolve(__dirname, './src')\r\n      },\r\n      extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue', '.tif']\r\n    },\r\n    // https://cn.vitejs.dev/config/#resolve-extensions\r\n    plugins: createPlugins(env, command === 'build'),\r\n    server: {\r\n      host: '0.0.0.0',\r\n      port: Number(env.VITE_APP_PORT),\r\n      open: true,\r\n      proxy: {\r\n        [env.VITE_APP_BASE_API]: {\r\n          target: 'http://localhost:8899',\r\n          changeOrigin: true,\r\n          ws: true,\r\n          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')\r\n        },\r\n        '/warm-flow-ui': {\r\n          target: env.VITE_APP_BASE_API,\r\n          changeOrigin: true,\r\n          ws: true,\r\n          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')\r\n        },\r\n        '/warm-flow': {\r\n          target: env.VITE_APP_BASE_API,\r\n          changeOrigin: true,\r\n          ws: true,\r\n          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')\r\n        },\r\n        '/workflow': {\r\n          target: env.VITE_APP_BASE_API,\r\n          changeOrigin: true,\r\n          ws: true,\r\n          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')\r\n        },\r\n         '/auth': {\r\n          target: env.VITE_APP_BASE_API,\r\n          changeOrigin: true,\r\n          ws: true,\r\n          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')\r\n        }\r\n      }\r\n    },\r\n    css: {\r\n      preprocessorOptions: {\r\n        scss: {\r\n          javascriptEnabled: true\r\n        }\r\n      },\r\n      postcss: {\r\n        plugins: [\r\n          {\r\n            postcssPlugin: 'internal:charset-removal',\r\n            AtRule: {\r\n              charset: (atRule) => {\r\n                if (atRule.name === 'charset') {\r\n                  atRule.remove();\r\n                }\r\n              }\r\n            }\r\n          }\r\n        ]\r\n      }\r\n    },\r\n    // \u9884\u7F16\u8BD1\r\n    optimizeDeps: {\r\n      include: [\r\n        'vue',\r\n        'vue-router',\r\n        'pinia',\r\n        'axios',\r\n        '@vueuse/core',\r\n        'echarts',\r\n        'vue-i18n',\r\n        '@vueup/vue-quill',\r\n        'image-conversion',\r\n        'element-plus/es/components/**/css'\r\n      ]\r\n    }\r\n  };\r\n});\r\n", "const __vite_injected_original_dirname = \"D:\\\\mk_system\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\mk_system\\\\vite\\\\plugins\\\\index.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/mk_system/vite/plugins/index.ts\";import vue from '@vitejs/plugin-vue';\r\nimport createUnoCss from './unocss';\r\nimport createAutoImport from './auto-import';\r\nimport createComponents from './components';\r\nimport createIcons from './icons';\r\nimport createSvgIconsPlugin from './svg-icon';\r\nimport createCompression from './compression';\r\nimport createSetupExtend from './setup-extend';\r\nimport path from 'path';\r\n\r\nexport default (viteEnv: any, isBuild = false): [] => {\r\n  const vitePlugins: any = [];\r\n  vitePlugins.push(vue());\r\n  vitePlugins.push(createUnoCss());\r\n  vitePlugins.push(createAutoImport(path));\r\n  vitePlugins.push(createComponents(path));\r\n  vitePlugins.push(createCompression(viteEnv));\r\n  vitePlugins.push(createIcons());\r\n  vitePlugins.push(createSvgIconsPlugin(path, isBuild));\r\n  vitePlugins.push(createSetupExtend());\r\n  return vitePlugins;\r\n};\r\n", "const __vite_injected_original_dirname = \"D:\\\\mk_system\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\mk_system\\\\vite\\\\plugins\\\\unocss.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/mk_system/vite/plugins/unocss.ts\";import UnoCss from 'unocss/vite';\r\n\r\nexport default () => {\r\n  return UnoCss({\r\n    hmrTopLevelAwait: false // unocss\u9ED8\u8BA4\u662Ftrue\uFF0C\u4F4E\u7248\u672C\u6D4F\u89C8\u5668\u662F\u4E0D\u652F\u6301\u7684\uFF0C\u542F\u52A8\u540E\u4F1A\u62A5\u9519\r\n  });\r\n};\r\n", "const __vite_injected_original_dirname = \"D:\\\\mk_system\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\mk_system\\\\vite\\\\plugins\\\\auto-import.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/mk_system/vite/plugins/auto-import.ts\";import AutoImport from 'unplugin-auto-import/vite';\r\nimport { ElementPlusResolver } from 'unplugin-vue-components/resolvers';\r\nimport IconsResolver from 'unplugin-icons/resolver';\r\n\r\nexport default (path: any) => {\r\n  return AutoImport({\r\n    // \u81EA\u52A8\u5BFC\u5165 Vue \u76F8\u5173\u51FD\u6570\r\n    imports: ['vue', 'vue-router', '@vueuse/core', 'pinia'],\r\n    eslintrc: {\r\n      enabled: false,\r\n      filepath: './.eslintrc-auto-import.json',\r\n      globalsPropValue: true\r\n    },\r\n    resolvers: [\r\n      // \u81EA\u52A8\u5BFC\u5165 Element Plus \u76F8\u5173\u51FD\u6570ElMessage, ElMessageBox... (\u5E26\u6837\u5F0F)\r\n      ElementPlusResolver(),\r\n      IconsResolver({\r\n        prefix: 'Icon'\r\n      })\r\n    ],\r\n    vueTemplate: true, // \u662F\u5426\u5728 vue \u6A21\u677F\u4E2D\u81EA\u52A8\u5BFC\u5165\r\n    dts: path.resolve(path.resolve(__dirname, '../../src'), 'types', 'auto-imports.d.ts')\r\n  });\r\n};\r\n", "const __vite_injected_original_dirname = \"D:\\\\mk_system\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\mk_system\\\\vite\\\\plugins\\\\components.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/mk_system/vite/plugins/components.ts\";import Components from 'unplugin-vue-components/vite';\r\nimport { ElementPlusResolver } from 'unplugin-vue-components/resolvers';\r\nimport IconsResolver from 'unplugin-icons/resolver';\r\n\r\nexport default (path: any) => {\r\n  return Components({\r\n    resolvers: [\r\n      // \u81EA\u52A8\u5BFC\u5165 Element Plus \u7EC4\u4EF6\r\n      ElementPlusResolver(),\r\n      // \u81EA\u52A8\u6CE8\u518C\u56FE\u6807\u7EC4\u4EF6\r\n      IconsResolver({\r\n        enabledCollections: ['ep']\r\n      })\r\n    ],\r\n    dts: path.resolve(path.resolve(__dirname, '../../src'), 'types', 'components.d.ts')\r\n  });\r\n};\r\n", "const __vite_injected_original_dirname = \"D:\\\\mk_system\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\mk_system\\\\vite\\\\plugins\\\\icons.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/mk_system/vite/plugins/icons.ts\";import Icons from 'unplugin-icons/vite';\r\n\r\nexport default () => {\r\n  return Icons({\r\n    // \u81EA\u52A8\u5B89\u88C5\u56FE\u6807\u5E93\r\n    autoInstall: true\r\n  });\r\n};\r\n", "const __vite_injected_original_dirname = \"D:\\\\mk_system\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\mk_system\\\\vite\\\\plugins\\\\svg-icon.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/mk_system/vite/plugins/svg-icon.ts\";import { createSvgIconsPlugin } from 'vite-plugin-svg-icons';\r\nexport default (path: any, isBuild: boolean) => {\r\n  return createSvgIconsPlugin({\r\n    // \u6307\u5B9A\u9700\u8981\u7F13\u5B58\u7684\u56FE\u6807\u6587\u4EF6\u5939\r\n    iconDirs: [path.resolve(path.resolve(__dirname, '../../src'), 'assets/icons/svg')],\r\n    // \u6307\u5B9AsymbolId\u683C\u5F0F\r\n    symbolId: 'icon-[dir]-[name]',\r\n    svgoOptions: isBuild\r\n  });\r\n};\r\n", "const __vite_injected_original_dirname = \"D:\\\\mk_system\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\mk_system\\\\vite\\\\plugins\\\\compression.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/mk_system/vite/plugins/compression.ts\";import compression from 'vite-plugin-compression';\r\n\r\nexport default (env: any) => {\r\n  const { VITE_BUILD_COMPRESS } = env;\r\n  const plugin: any[] = [];\r\n  if (VITE_BUILD_COMPRESS) {\r\n    const compressList = VITE_BUILD_COMPRESS.split(',');\r\n    if (compressList.includes('gzip')) {\r\n      // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#\u4F7F\u7528gzip\u89E3\u538B\u7F29\u9759\u6001\u6587\u4EF6\r\n      plugin.push(\r\n        compression({\r\n          ext: '.gz',\r\n          deleteOriginFile: false\r\n        })\r\n      );\r\n    }\r\n    if (compressList.includes('brotli')) {\r\n      plugin.push(\r\n        compression({\r\n          ext: '.br',\r\n          algorithm: 'brotliCompress',\r\n          deleteOriginFile: false\r\n        })\r\n      );\r\n    }\r\n  }\r\n  return plugin;\r\n};\r\n", "const __vite_injected_original_dirname = \"D:\\\\mk_system\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\mk_system\\\\vite\\\\plugins\\\\setup-extend.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/mk_system/vite/plugins/setup-extend.ts\";import setupExtend from 'unplugin-vue-setup-extend-plus/vite';\r\n\r\nexport default () => {\r\n  return setupExtend({});\r\n};\r\n"],
  "mappings": "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",
  "names": ["path", "ElementPlusResolver", "IconsResolver", "__vite_injected_original_dirname", "path", "ElementPlusResolver", "IconsResolver", "__vite_injected_original_dirname", "__vite_injected_original_dirname", "path", "__vite_injected_original_dirname", "path", "__vite_injected_original_dirname", "path", "__vite_injected_original_dirname"]
}


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 4/6] =?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>

From 239c989a268c3ac2aa27bbf6e75139ea6c260043 Mon Sep 17 00:00:00 2001
From: Teo <2642673902@qq.com>
Date: Mon, 25 Aug 2025 20:02:38 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=90=88=E8=A7=84=E6=80=A7=E6=89=8B?=
 =?UTF-8?q?=E7=BB=AD=E6=96=B0=E5=A2=9E,=E8=BF=9B=E5=BA=A6=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB=E6=A8=A1=E6=9D=BF=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../formalitiesAreConsolidated/index.ts       |  15 ++
 .../progressCategoryTemplate/index.ts         |  13 +-
 src/components/FileUpload/index.vue           |  68 +++++---
 src/views/design/Professional/index.vue       |   2 +-
 src/views/design/received/index.vue           |  98 +++++++----
 .../formalitiesAreConsolidated/index.vue      |  65 +++++++-
 src/views/materials/batchPlan/index.vue       | 155 ++++++++++++------
 src/views/materials/purchaseDoc/index.vue     |   3 +-
 src/views/progress/progressCategory/index.vue |  21 +--
 .../progressCategorySystemTemplate/index.vue  | 115 +++++++------
 10 files changed, 377 insertions(+), 178 deletions(-)

diff --git a/src/api/formalities/formalitiesAreConsolidated/index.ts b/src/api/formalities/formalitiesAreConsolidated/index.ts
index 218187c..f6db0c1 100644
--- a/src/api/formalities/formalitiesAreConsolidated/index.ts
+++ b/src/api/formalities/formalitiesAreConsolidated/index.ts
@@ -5,6 +5,7 @@ import {
   FormalitiesAreConsolidatedForm,
   FormalitiesAreConsolidatedQuery
 } from '@/api/formalities/formalitiesAreConsolidated/types';
+import { ListOfFormalitiesQuery, ListOfFormalitiesVO } from '../listOfFormalities/types';
 
 /**
  * 查询合规性手续合账列表
@@ -101,3 +102,17 @@ export const delFormalitiesAnnex = (id: string | number | Array<string | number>
     method: 'delete'
   });
 };
+
+/**
+ * 查询手续办理清单模板属性列表
+ * @param query
+ * @returns {*}
+ */
+
+export const getTemplateTreeList = (query?: any): AxiosPromise<ListOfFormalitiesVO[]> => {
+  return request({
+    url: '/formalities/formalitiesAreConsolidated/getTree',
+    method: 'get',
+    params: query
+  });
+};
diff --git a/src/api/progress/progressCategoryTemplate/index.ts b/src/api/progress/progressCategoryTemplate/index.ts
index 3e80694..5743b83 100644
--- a/src/api/progress/progressCategoryTemplate/index.ts
+++ b/src/api/progress/progressCategoryTemplate/index.ts
@@ -1,6 +1,10 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { ProgressCategoryTemplateVO, ProgressCategoryTemplateForm, ProgressCategoryTemplateQuery } from '@/api/progress/progressCategoryTemplate/types';
+import {
+  ProgressCategoryTemplateVO,
+  ProgressCategoryTemplateForm,
+  ProgressCategoryTemplateQuery
+} from '@/api/progress/progressCategoryTemplate/types';
 
 /**
  * 查询进度类别模版列表
@@ -61,3 +65,10 @@ export const delProgressCategoryTemplate = (id: string | number | Array<string |
     method: 'delete'
   });
 };
+
+export const getTabList = () => {
+  return request({
+    url: '/progress/progressCategoryTemplate/listSystemTop',
+    method: 'get'
+  });
+};
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 5011b9d..b2580ea 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -48,7 +48,13 @@
             tag="ul"
             @click.stop
           >
-            <li style="margin-top: 10px" v-for="(file, index) in fileList" :key="file.uid" class="el-upload-list__item ele-upload-list__item-content">
+            <li
+              style="margin-top: 10px"
+              v-for="(file, index) in fileList"
+              :key="file.uid"
+              class="el-upload-list__item ele-upload-list__item-content"
+              v-if="autoUpload"
+            >
               <el-link :href="`${file.url}`" :underline="false" target="_blank">
                 <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
               </el-link>
@@ -213,31 +219,27 @@ watch(
 );
 // 上传前校检格式和大小
 const handleBeforeUpload = (file: any) => {
-  // 校检文件类型
-  if (props.fileType.length) {
-    const fileName = file.name.split('.');
-    const fileExt = fileName[fileName.length - 1];
-    const isTypeOk = props.fileType.indexOf(fileExt) >= 0;
-    if (!isTypeOk) {
-      proxy?.$modal.msgError(`文件格式不正确, 请上传${props.fileType.join('/')}格式文件!`);
-      return false;
-    }
+  if (!validateFile(file)) return false;
+  proxy?.$modal.loading('正在上传文件，请稍候...');
+  number.value++;
+  return true;
+};
+
+//校检格式和大小
+const validateFile = (file: File) => {
+  const ext = file.name.split('.').pop()?.toLowerCase();
+  if (props.fileType.length && !props.fileType.includes(ext!)) {
+    proxy?.$modal.msgError(`文件格式不正确，请上传 ${props.fileType.join('/')} 格式文件!`);
+    return false;
   }
-  // 校检文件名是否包含特殊字符
   if (file.name.includes(',')) {
     proxy?.$modal.msgError('文件名不正确，不能包含英文逗号!');
     return false;
   }
-  // 校检文件大小
-  if (props.fileSize) {
-    const isLt = file.size / 1024 / 1024 < props.fileSize;
-    if (!isLt) {
-      proxy?.$modal.msgError(`上传文件大小不能超过 ${props.fileSize} MB!`);
-      return false;
-    }
+  if (props.fileSize && file.size / 1024 / 1024 > props.fileSize) {
+    proxy?.$modal.msgError(`上传文件大小不能超过 ${props.fileSize} MB!`);
+    return false;
   }
-  proxy?.$modal.loading('正在上传文件，请稍候...');
-  number.value++;
   return true;
 };
 
@@ -278,13 +280,25 @@ const handleUploadSuccess = (res: any, file: UploadFileWithOssId) => {
   uploadedSuccessfully(res);
 };
 
-const handleChange = (file: any, fileList: any) => {
+const handleChange = (file: any, filelist: any) => {
+  if (!props.autoUpload) {
+    // 手动上传模式：在选中文件时拦截非法文件
+    const isValid = validateFile(file.raw || file);
+    if (!isValid) {
+      fileUploadRef.value?.handleRemove(file); // 直接移除非法文件
+      console.log(file, filelist, fileList.value);
+      fileList.value = [...fileList.value]; // 触发列表更新
+      return;
+    }
+  }
   // 记录 status = 'ready' 的文件
   if (file.status === 'ready') {
     pendingFiles.value.push(file);
+    fileList.value = pendingFiles.value;
   }
+  console.log(fileList.value);
 
-  emit('handleChange', file, fileList);
+  emit('handleChange', file, filelist);
 };
 
 // 删除文件
@@ -332,11 +346,6 @@ const uploadedSuccessfully = (res: any) => {
     emit('update:modelValue', listToString(fileList.value));
     proxy?.$modal.closeLoading();
   }
-  // if (props.autoUpload && props.limit === fileList.value.length) {
-  //   fileUploadRef.value?.clearFiles();
-  //   fileList.value = [];
-  //   emit('update:modelValue', ''); // 同步到外部 v-model
-  // }
   props.onUploadSuccess?.(fileList.value, res);
 };
 
@@ -400,6 +409,11 @@ const submitUpload = async () => {
   if (!pendingFiles.value.length) {
     return 'noFile';
   }
+  const validFiles = pendingFiles.value.filter((f: any) => validateFile(f.raw || f));
+  if (!validFiles.length) {
+    proxy?.$modal.msgError('没有符合条件的文件可上传');
+    return;
+  }
   try {
     proxy?.$modal.loading('正在上传文件，请稍候...');
     const formData = new FormData();
diff --git a/src/views/design/Professional/index.vue b/src/views/design/Professional/index.vue
index bb795fe..6726936 100644
--- a/src/views/design/Professional/index.vue
+++ b/src/views/design/Professional/index.vue
@@ -187,7 +187,7 @@ const handleDownload = (row) => {
     {
       id: row.id
     },
-    `互提资料.zip`
+    `互提资料.docx`
   );
 };
 const handleViewFile = (row) => {
diff --git a/src/views/design/received/index.vue b/src/views/design/received/index.vue
index 9d21ddd..ae349b7 100644
--- a/src/views/design/received/index.vue
+++ b/src/views/design/received/index.vue
@@ -1,7 +1,6 @@
 <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="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>
@@ -16,15 +15,23 @@
 
           <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">
+              <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="请选择专业"
+              <el-select
+                :disabled="disabledAll"
+                v-model="form.user_major"
+                placeholder="请选择专业"
                 class="transition-all duration-300 border-gray-300"
-                :rules="{ required: true, message: '请选择专业', trigger: 'change' }">
+                :rules="{ required: true, message: '请选择专业', trigger: 'change' }"
+              >
                 <el-option v-for="item in des_user_major" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -42,25 +49,32 @@
         <div class="mb-6">
           <div class="flex items-center justify-between mb-4">
             <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>
+            <el-button type="primary" size="small" @click="addDocumentItem" v-if="!disabledAll" icon="Plus"> 添加资料 </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 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-button
+                  type="text"
+                  size="small"
+                  text-color="#ff4d4f"
+                  @click="removeDocumentItem(index)"
+                  icon="el-icon-delete"
+                  v-if="form.documents.length > 1 && !disabledAll"
+                >
                   删除
                 </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" />
+                <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" />
                 </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" />
@@ -71,16 +85,39 @@
         </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>
+          <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>
       </el-form>
     </div>
@@ -90,7 +127,7 @@
 <script setup name="DataCollectionForm" lang="ts">
 import { ref, reactive, computed, onMounted } from 'vue';
 import { useUserStoreHook } from '@/store/modules/user';
-import { ElMessage, ElLoading } from 'element-plus';
+import { ElMessage, ElLoading, FormRules } from 'element-plus';
 import { systemUserList } from '@/api/design/appointment';
 import { collectBatch, byProjectId, exportWord } from '@/api/design/received';
 import { getUser } from '@/api/system/user';
@@ -131,7 +168,7 @@ const form = reactive({
 });
 
 // 主表单验证规则
-const mainRules = reactive({
+const mainRules = reactive<FormRules>({
   userId: [{ required: true, message: '请输入收资人', trigger: 'blur' }],
   user_major: [{ required: true, message: '请选择专业', trigger: 'change' }],
   phone: [
@@ -207,8 +244,6 @@ const byProjectIdAll = async () => {
         }
       ];
       console.log(form.documents);
-
-
     }
   }
 };
@@ -313,7 +348,6 @@ onMounted(() => {
   getDeptAllUser(userStore.deptId).then(() => {
     byProjectIdAll();
   });
-
 });
 const onLoad = async () => {
   // 导出接口
@@ -322,7 +356,7 @@ const onLoad = async () => {
     {
       id: form.id
     },
-    `收资清单.zip`
+    `收资清单.docx`
   );
 };
 //监听项目id刷新数据
diff --git a/src/views/formalities/formalitiesAreConsolidated/index.vue b/src/views/formalities/formalitiesAreConsolidated/index.vue
index ebeda55..f4918d9 100644
--- a/src/views/formalities/formalitiesAreConsolidated/index.vue
+++ b/src/views/formalities/formalitiesAreConsolidated/index.vue
@@ -46,6 +46,9 @@
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['formalities:listOfFormalities:add']">新增</el-button>
+          </el-col>
           <el-col :span="1.5">
             <el-button
               type="success"
@@ -213,6 +216,28 @@
         </span>
       </template>
     </el-dialog>
+    <el-dialog title="新增合规性手续合账" v-model="templateVisbile" width="450">
+      <el-form-item label="合规性手续模板">
+        <el-cascader
+          v-model="tempValue"
+          :options="tempTreeList"
+          :props="{
+            multiple: true,
+            value: 'id',
+            label: 'name',
+            disabled: (node: any) => {
+              return (node.pid == 0 && !node.children.length) || node.status == 1; // 有 parent 的是二级，没有 parent 的是一级，禁用一级
+            }
+          }"
+        />
+      </el-form-item>
+      <template #footer>
+        <span>
+          <el-button @click="templateVisbile = false">取消</el-button>
+          <el-button type="primary" @click="setTemp">确定</el-button>
+        </span>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -225,7 +250,8 @@ import {
   updateFormalitiesAreConsolidated,
   listFormalitiesAnnex,
   delFormalitiesAnnex,
-  editStatus
+  editStatus,
+  getTemplateTreeList
 } from '@/api/formalities/formalitiesAreConsolidated';
 import {
   FormalitiesAreConsolidatedVO,
@@ -272,6 +298,8 @@ const statusForm = ref({
   projectId: currentProject.value?.id,
   processingStatus: undefined
 });
+const templateVisbile = ref(false);
+const tempTreeList = ref([]);
 
 const initFormData: FormalitiesAreConsolidatedForm = {
   id: undefined,
@@ -307,6 +335,8 @@ const data = reactive<PageData<FormalitiesAreConsolidatedForm, FormalitiesAreCon
 
 const { queryParams, form, rules } = toRefs(data);
 
+const tempValue = ref(null);
+
 /** 查询合规性手续合账列表 */
 const getList = async () => {
   loading.value = true;
@@ -367,6 +397,39 @@ const handleUpdate = async (row?: FormalitiesAreConsolidatedVO) => {
   dialog.title = '修改合规性手续合账';
 };
 
+//新增
+const handleAdd = async () => {
+  tempValue.value = null;
+  const res = await getTemplateTreeList({ projectId: currentProject.value.id });
+  tempTreeList.value = res.data;
+  templateVisbile.value = true;
+};
+
+// 选择模板
+const setTemp = async () => {
+  // form.value.formalitiesPid = tempValue.value[tempValue.value.length - 1];
+  if (!tempValue.value || !tempValue.value.length) {
+    proxy?.$modal.msgWarning('请选择模板');
+    return;
+  }
+  let addBusFormalitiesAreConsolidatedBos = tempValue.value.map((item) => {
+    return {
+      formalitiesId: item[1],
+      formalitiesPid: item[0]
+    };
+  });
+  const data = {
+    addBusFormalitiesAreConsolidatedBos,
+    projectId: currentProject.value.id
+  };
+  const res = await addFormalitiesAreConsolidated(data);
+  if (res.code == 200) {
+    proxy?.$modal.msgSuccess('操作成功');
+    templateVisbile.value = false;
+    getList();
+  }
+};
+
 /** 上传按钮操作 */
 const handleUpload = (row) => {
   form.value.id = row.id;
diff --git a/src/views/materials/batchPlan/index.vue b/src/views/materials/batchPlan/index.vue
index bac3df0..8d8bdb1 100644
--- a/src/views/materials/batchPlan/index.vue
+++ b/src/views/materials/batchPlan/index.vue
@@ -6,20 +6,44 @@
         <el-card shadow="hover">
           <template #header>
             <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5" :offset="0"><el-button type="primary"
-                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:add']" size="default" @click="handleAdd"
-                  icon="FolderAdd" plain>新增</el-button></el-col>
-              <el-col :span="1.5" :offset="0"><el-button type="danger" size="default"
-                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:remove']" @click="handleDeleteBatch"
-                  icon="FolderDelete" plain>删除</el-button></el-col>
+              <el-col :span="1.5" :offset="0"
+                ><el-button
+                  type="primary"
+                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:add']"
+                  size="default"
+                  @click="handleAdd"
+                  icon="FolderAdd"
+                  plain
+                  >新增</el-button
+                ></el-col
+              >
+              <el-col :span="1.5" :offset="0"
+                ><el-button
+                  type="danger"
+                  size="default"
+                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:remove']"
+                  @click="handleDeleteBatch"
+                  :disabled="form.mrpBaseBo.status != 'draft'"
+                  icon="FolderDelete"
+                  plain
+                  >删除</el-button
+                ></el-col
+              >
             </el-row>
           </template>
 
-          <el-input v-model="batchNumber" placeholder="请输入批次号" @input="searchBatchList" prefix-icon="Search"
-            clearable />
-          <el-tree ref="batchTreeRef" class="mt-2" node-key="id" :data="batchOptions"
-            :props="{ label: 'planCode', children: 'children' }" :expand-on-click-node="false" highlight-current
-            default-expand-all @node-click="handleNodeClick">
+          <el-input v-model="batchNumber" placeholder="请输入批次号" @input="searchBatchList" prefix-icon="Search" clearable />
+          <el-tree
+            ref="batchTreeRef"
+            class="mt-2"
+            node-key="id"
+            :data="batchOptions"
+            :props="{ label: 'planCode', children: 'children' }"
+            :expand-on-click-node="false"
+            highlight-current
+            default-expand-all
+            @node-click="handleNodeClick"
+          >
             <template #default="{ node, data }">
               <div class="custom-tree-node">
                 {{ node.label }}
@@ -27,8 +51,14 @@
               </div>
             </template>
           </el-tree>
-          <pagination v-show="total > 0" :total="total" v-model:page="queryParams.batchData.pageNum"
-            v-model:limit="queryParams.batchData.pageSize" @pagination="getList" layout="prev, pager, next,jumper" />
+          <pagination
+            v-show="total > 0"
+            :total="total"
+            v-model:page="queryParams.batchData.pageNum"
+            v-model:limit="queryParams.batchData.pageSize"
+            @pagination="getList"
+            layout="prev, pager, next,jumper"
+          />
         </el-card>
       </el-col>
       <el-col :span="19">
@@ -36,12 +66,14 @@
           <template #header>
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5" v-if="form.mrpBaseBo.status == 'draft'">
-                <el-button type="primary" plain icon="Edit" @click="handleUpdata"
-                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:edit']">修改</el-button>
+                <el-button type="primary" plain icon="Edit" @click="handleUpdata" v-hasPermi="['cailiaoshebei:materialbatchdemandplan:edit']"
+                  >修改</el-button
+                >
               </el-col>
               <el-col :span="1.5">
-                <el-button plain type="warning" icon="Finished" @click="handleAudit()"
-                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:query']">审核</el-button>
+                <el-button plain type="warning" icon="Finished" @click="handleAudit()" v-hasPermi="['cailiaoshebei:materialbatchdemandplan:query']"
+                  >审核</el-button
+                >
               </el-col>
 
               <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
@@ -59,8 +91,13 @@
             <el-table-column label="需求到货时间" align="center" prop="arrivalTime" width="250" />
             <el-table-column label="备注" align="center" prop="remark" />
           </el-table>
-          <pagination v-show="mainTotal > 0" :total="mainTotal" v-model:page="queryParams.mainData.pageNum"
-            v-model:limit="queryParams.mainData.pageSize" @pagination="getMainList" />
+          <pagination
+            v-show="mainTotal > 0"
+            :total="mainTotal"
+            v-model:page="queryParams.mainData.pageNum"
+            v-model:limit="queryParams.mainData.pageSize"
+            @pagination="getMainList"
+          />
         </el-card>
       </el-col>
     </el-row>
@@ -77,8 +114,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"
-                placeholder="请选择编制日期" />
+              <el-date-picker v-model="form.mrpBaseBo.preparedDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择编制日期" />
             </el-form-item>
           </el-col>
           <el-col :span="8" :offset="0">
@@ -91,20 +127,20 @@
         <el-divider>主要信息</el-divider>
         <el-table :data="form.planList">
           <el-table-column prop="name" align="center" label="版本号 " width="150">
-
             <template #default="scope">
-              <el-select v-model="scope.row.versions" placeholder="请选择"
-                @change="(val) => selectNameVersion(val, scope.row)">
-
-                <el-option v-for="item in versionList" :key="item.versions" :label="item.versions"
-                  :value="item.versions" />
+              <el-select v-model="scope.row.versions" placeholder="请选择" @change="(val) => selectNameVersion(val, scope.row)">
+                <el-option v-for="item in versionList" :key="item.versions" :label="item.versions" :value="item.versions" />
               </el-select>
             </template>
           </el-table-column>
           <el-table-column prop="name" align="center" label="物资名称">
             <template #default="scope">
-              <el-select :disabled="!scope.row.versions" v-model="scope.row.suppliespriceId" placeholder="请选择"
-                @change="(val) => selectName(val, scope.row)">
+              <el-select
+                :disabled="!scope.row.versions"
+                v-model="scope.row.suppliespriceId"
+                placeholder="请选择"
+                @change="(val) => selectName(val, scope.row)"
+              >
                 <el-option v-for="item in nameList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </template>
@@ -125,14 +161,16 @@
             </template>
           </el-table-column>
           <el-table-column prop="qs" align="center" label="质量标准" width="150">
+            <template #header> <span class="text-red">*</span> 质量标准 </template>
             <template #default="scope">
               <el-input v-model="scope.row.qs" placeholder="请输入质量标准" />
             </template>
           </el-table-column>
           <el-table-column prop="arrivalTime" align="center" label="需求到货时间">
+            <template #header> <span class="text-red">*</span> 需求到货时间 </template>
+
             <template #default="scope">
-              <el-date-picker v-model="scope.row.arrivalTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择"
-                style="width: 140px" />
+              <el-date-picker v-model="scope.row.arrivalTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择" style="width: 140px" />
             </template>
           </el-table-column>
           <el-table-column prop="remark" align="center" label="备注" width="150">
@@ -165,8 +203,10 @@ import {
   listBatch,
   getBatch,
   delBatch,
-  listSelectCailiaoshebei, obtainTheVersion,
-  getDictList, coryEngineeringList
+  listSelectCailiaoshebei,
+  obtainTheVersion,
+  getDictList,
+  coryEngineeringList
 } from '@/api/materials/batchPlan';
 import { CailiaoshebeiVO, CailiaoshebeiQuery, CailiaoshebeiForm } from '@/api/materials/batchPlan/types';
 import { useUserStoreHook } from '@/store/modules/user';
@@ -392,11 +432,11 @@ const handleUpdata = () => {
 /** 提交数据 */
 const submitTransferForm = async () => {
   const result = validateAndClean(form.value.planList);
-  console.log('🚀 ~ submitTransferForm ~ form.value.planList:', form.value.planList);
   if (!result.valid) {
-    proxy?.$modal.msgError('验证失败,主要信息存在部分字段缺失的数据项');
+    proxy?.$modal.msgError(result.message);
     return;
   }
+
   cailiaoshebeiFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true;
@@ -408,7 +448,6 @@ const submitTransferForm = async () => {
     }
   });
 };
-
 /** 删除批次 */
 const handleDeleteBatch = async () => {
   const _ids = batchTreeRef.value.getCurrentNode()?.id;
@@ -419,29 +458,49 @@ const handleDeleteBatch = async () => {
   await getList();
 };
 
-//检测主要信息填写状况
-function validateAndClean(arr) {
+interface ValidateResult {
+  valid: boolean;
+  data: any[];
+  errors: { index: number; field: string; message: string }[];
+}
+
+function validateAndClean(arr: any[]) {
   // 过滤掉全空的数据项
   const cleanedArr = arr.filter((item) => !Object.values(item).every((v) => v === '' || v == null));
-  let hasFullItem = false; // 是否有一条全填数据
 
-  for (const item of cleanedArr) {
+  let hasFullItem = false; // 是否有至少一条全填数据
+
+  for (let idx = 0; idx < cleanedArr.length; idx++) {
+    const item = cleanedArr[idx];
     const keys = Object.keys(item).filter((k) => k !== 'remark' && k !== 'id');
+
     const allFilled = keys.every((k) => item[k] !== '' && item[k] != null);
-    if (allFilled) {
-      hasFullItem = true; // 有一条全填
-    }
     const allEmpty = Object.values(item).every((v) => v === '' || v == null);
-    // 如果不是全填，也不是全空（部分填） → 直接返回失败
+
+    // 单独检查 qs 和 arrivalTime
+    if (!item.qs) {
+      return { valid: false, message: `第${idx + 1}行：质量标准不能为空`, data: cleanedArr };
+    }
+    if (!item.arrivalTime) {
+      return { valid: false, message: `第${idx + 1}行：需求到货时间不能为空`, data: cleanedArr };
+    }
+
+    // 检查其他字段是否部分填
     if (!allFilled && !allEmpty) {
-      return { valid: false, data: cleanedArr };
+      return { valid: false, message: `第${idx + 1}行：主要信息存在部分字段缺失的数据项`, data: cleanedArr };
+    }
+
+    if (allFilled) {
+      hasFullItem = true;
     }
   }
-  // 如果没有至少一条全填，返回失败
+
+  // 检查是否至少有一条完整的数据
   if (!hasFullItem) {
-    return { valid: false, data: cleanedArr };
+    return { valid: false, message: '至少需要一条完整的数据', data: cleanedArr };
   }
-  return { valid: true, data: cleanedArr };
+
+  return { valid: true, message: '', data: cleanedArr };
 }
 
 /** 审核按钮操作 */
diff --git a/src/views/materials/purchaseDoc/index.vue b/src/views/materials/purchaseDoc/index.vue
index bf61f0e..cb88092 100644
--- a/src/views/materials/purchaseDoc/index.vue
+++ b/src/views/materials/purchaseDoc/index.vue
@@ -268,6 +268,7 @@ import { listContractor } from '@/api/project/contractor';
 import { useUserStoreHook } from '@/store/modules/user';
 import { getToken } from '@/utils/auth';
 import logisticsDetail from './comm/logisticsDetail.vue';
+import { FormRules } from 'element-plus';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const route = useRoute();
 const router = useRouter();
@@ -349,7 +350,7 @@ const data = reactive({
     status: undefined,
     params: {}
   },
-  rules: {
+  rules: <FormRules>{
     id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
     docCode: [{ required: true, message: '采购单编号不能为空', trigger: 'blur' }],
     planId: [{ required: true, message: '需求计划不能为空', trigger: 'blur' }],
diff --git a/src/views/progress/progressCategory/index.vue b/src/views/progress/progressCategory/index.vue
index 224b281..11177c0 100644
--- a/src/views/progress/progressCategory/index.vue
+++ b/src/views/progress/progressCategory/index.vue
@@ -123,27 +123,27 @@
             check-strictly
           />
         </el-form-item>
-        <el-form-item label="计量方式" prop="unitType" v-if="!form.id">
+        <el-form-item label="计量方式" prop="unitType" v-if="!form.workType">
           <el-select v-model="form.unitType" placeholder="请选择关联数据">
             <el-option v-for="dict in progress_unit_type" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="类别名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入类别名称" :disabled="form.id != null" />
+          <el-input v-model="form.name" placeholder="请输入类别名称" />
         </el-form-item>
-        <el-form-item label="计量单位" prop="unit">
+        <el-form-item label="计量单位" prop="unit" v-if="form.unitType != '0'">
           <el-input v-model="form.unit" placeholder="请输入计量单位" />
         </el-form-item>
-        <el-form-item label="综合单价(业主)" prop="ownerPrice">
+        <el-form-item label="综合单价(业主)" prop="ownerPrice" v-if="form.unitType != '0'">
           <el-input v-model="form.ownerPrice" placeholder="请输入综合单价(业主)" />
         </el-form-item>
-        <el-form-item label="综合单价(分包)" prop="constructionPrice">
+        <el-form-item label="综合单价(分包)" prop="constructionPrice" v-if="form.unitType != '0'">
           <el-input v-model="form.constructionPrice" placeholder="请输入综合单价(分包)" />
         </el-form-item>
-        <el-form-item label="数量" prop="total" v-if="isDisabled">
+        <el-form-item label="数量" prop="total" v-if="!form.workType && form.unitType != '0'">
           <el-input v-model="form.total" placeholder="请输入数量" />
         </el-form-item>
-        <el-form-item label="关联数据" prop="workType" v-if="!form.id">
+        <el-form-item label="关联数据" prop="workType" v-if="!form.id && form.unitType != '0'">
           <el-select v-model="form.workType" placeholder="请选择关联数据">
             <el-option v-for="dict in progress_work_type" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
@@ -328,10 +328,7 @@ const cancel = () => {
 const reset = () => {
   const projectId = form.value.projectId;
   const matrixId = form.value.matrixId;
-
   form.value = { ...initFormData, projectId, matrixId };
-
-  isDisabled.value = false;
   progressCategoryFormRef.value?.resetFields();
 };
 /** 级联选择器改变事件 */
@@ -381,12 +378,8 @@ const toggleExpandAll = (data: ProgressCategoryVO[], status: boolean) => {
 };
 
 /** 修改按钮操作 */
-const isDisabled = ref<boolean>(false);
 const handleUpdate = async (row: ProgressCategoryVO) => {
   reset();
-  if (!row.unitType) {
-    isDisabled.value = true;
-  }
   await getTreeselect();
   if (row != null) {
     form.value.parentId = row.parentId;
diff --git a/src/views/progress/progressCategorySystemTemplate/index.vue b/src/views/progress/progressCategorySystemTemplate/index.vue
index 12900fa..12bcd3b 100644
--- a/src/views/progress/progressCategorySystemTemplate/index.vue
+++ b/src/views/progress/progressCategorySystemTemplate/index.vue
@@ -20,60 +20,65 @@
         </el-card>
       </div>
     </transition>
+    <el-tabs type="border-card">
+      <el-tab-pane label="User"></el-tab-pane>
+      <el-tab-pane label="Config"></el-tab-pane>
+      <el-card shadow="never">
+        <template #header>
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+              <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['progress:progressCategoryTemplate:add']">新增</el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
+            </el-col>
+            <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          </el-row>
+        </template>
+
+        <el-table
+          ref="progressCategoryTemplateTableRef"
+          v-loading="loading"
+          :data="progressCategoryTemplateList"
+          row-key="id"
+          :default-expand-all="isExpandAll"
+          :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+        >
+          <el-table-column label="类别名称" prop="name" />
+          <el-table-column label="计量方式" align="center" prop="unitType" width="100">
+            <template #default="{ row }">
+              <dict-tag :options="progress_unit_type" :value="row.unitType" />
+            </template>
+          </el-table-column>
+          <el-table-column label="关联数据" align="center" prop="workType">
+            <template #default="{ row }">
+              <dict-tag :options="progress_work_type" :value="row.workType" />
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center" prop="remark" />
+          <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="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['progress:progressCategoryTemplate:edit']" />
+              </el-tooltip>
+              <el-tooltip content="新增" placement="top">
+                <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['progress:progressCategoryTemplate:add']" />
+              </el-tooltip>
+              <el-tooltip content="删除" placement="top">
+                <el-button
+                  link
+                  type="primary"
+                  icon="Delete"
+                  @click="handleDelete(scope.row)"
+                  v-hasPermi="['progress:progressCategoryTemplate:remove']"
+                />
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+    </el-tabs>
 
-    <el-card shadow="never">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['progress:progressCategoryTemplate:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
-          </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-      </template>
-      <el-table
-        ref="progressCategoryTemplateTableRef"
-        v-loading="loading"
-        :data="progressCategoryTemplateList"
-        row-key="id"
-        :default-expand-all="isExpandAll"
-        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-      >
-        <el-table-column label="类别名称" prop="name" />
-        <el-table-column label="计量方式" align="center" prop="unitType" width="100">
-          <template #default="{ row }">
-            <dict-tag :options="progress_unit_type" :value="row.unitType" />
-          </template>
-        </el-table-column>
-        <el-table-column label="关联数据" align="center" prop="workType">
-          <template #default="{ row }">
-            <dict-tag :options="progress_work_type" :value="row.workType" />
-          </template>
-        </el-table-column>
-        <el-table-column label="备注" align="center" prop="remark" />
-        <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="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['progress:progressCategoryTemplate:edit']" />
-            </el-tooltip>
-            <el-tooltip content="新增" placement="top">
-              <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['progress:progressCategoryTemplate:add']" />
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button
-                link
-                type="primary"
-                icon="Delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['progress:progressCategoryTemplate:remove']"
-              />
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
     <!-- 添加或修改进度类别模版对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="progressCategoryTemplateFormRef" :model="form" :rules="rules" label-width="80px">
@@ -124,6 +129,7 @@ import {
   addProgressCategoryTemplate,
   delProgressCategoryTemplate,
   getProgressCategoryTemplate,
+  getTabList,
   listProgressCategoryTemplate,
   updateProgressCategoryTemplate
 } from '@/api/progress/progressCategoryTemplate';
@@ -306,5 +312,8 @@ const handleDelete = async (row: ProgressCategoryTemplateVO) => {
 
 onMounted(() => {
   getList();
+  getTabList().then((res) => {
+    console.log('tabList', res.data);
+  });
 });
 </script>

From 589d21d6222bc205d43843af5a627ce2a8776291 Mon Sep 17 00:00:00 2001
From: taoge1020 <sendtao@163.com>
Date: Mon, 25 Aug 2025 20:21:21 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                        | 2 +-
 src/views/contract/limitPrice/index.vue | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.env.development b/.env.development
index 42d7ec2..0181823 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ VITE_APP_ENV = 'development'
 
 # 开发环境
 # 李陈杰 209
-VITE_APP_BASE_API = 'http://192.168.110.180:8899'
+VITE_APP_BASE_API = 'http://192.168.110.149:8899'
 # 曾涛
 # VITE_APP_BASE_API = 'http://192.168.110.180:8899'
 # 罗成
diff --git a/src/views/contract/limitPrice/index.vue b/src/views/contract/limitPrice/index.vue
index 4b62959..0be8047 100644
--- a/src/views/contract/limitPrice/index.vue
+++ b/src/views/contract/limitPrice/index.vue
@@ -75,7 +75,6 @@
               :precision="2"
               :step="0.1"
               :controls="false"
-              :disabled="reviewStatus != 'draft'"
               v-if="scope.row.quantity && scope.row.quantity != 0"
             />
           </template>