From d325fb2505ac30b950a9228dde63c69e78f20048 Mon Sep 17 00:00:00 2001
From: fengsen <2548667232@qq.com>
Date: Fri, 15 Aug 2025 15:27:53 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E7=89=A9=E8=B5=84=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../usageMaterials/material/index.vue         | 25 +------------------
 .../usageMaterials/purchase/index.vue         | 23 -----------------
 .../usageMaterials/purchase/indexSon.vue      |  2 +-
 3 files changed, 2 insertions(+), 48 deletions(-)

diff --git a/src/views/materials/usageMaterials/material/index.vue b/src/views/materials/usageMaterials/material/index.vue
index 7edc372..6d899ec 100644
--- a/src/views/materials/usageMaterials/material/index.vue
+++ b/src/views/materials/usageMaterials/material/index.vue
@@ -13,7 +13,7 @@
         :header-cell-style="{ 'background-color': '#f5f7fa', 'font-weight': 'bold' }"
         style="width: 100%; margin-bottom: 20px; height: calc(100vh - 305px)"
         :row-class-name="tableRowClassName">
-        <el-table-column prop="id" label="ID" width="80" align="center"></el-table-column>
+        <el-table-column prop="id" label="ID" width="180" align="center"></el-table-column>
         <el-table-column prop="name" label="材料名称" min-width="150"></el-table-column>
         <el-table-column prop="specification" label="规格" min-width="120"></el-table-column>
         <el-table-column prop="supplier" label="供应商" min-width="150"></el-table-column>
@@ -456,27 +456,4 @@ onMounted(() => {
 </script>
 
 <style scoped>
-/* 自定义表格行悬停样式 */
-::v-deep .el-table__row:hover>td {
-  background-color: #f0f7ff !important;
-}
-
-/* 表单间距优化 */
-::v-deep .el-form-item {
-  margin-bottom: 16px;
-}
-
-/* 对话框动画 */
-::v-deep .el-dialog__wrapper {
-  backdrop-filter: blur(2px);
-}
-
-/* 按钮样式优化 */
-::v-deep .el-button--primary {
-  transition: all 0.2s ease;
-}
-
-::v-deep .el-button--primary:hover {
-  transform: translateY(-2px);
-}
 </style>
\ No newline at end of file
diff --git a/src/views/materials/usageMaterials/purchase/index.vue b/src/views/materials/usageMaterials/purchase/index.vue
index d9c522f..87fd599 100644
--- a/src/views/materials/usageMaterials/purchase/index.vue
+++ b/src/views/materials/usageMaterials/purchase/index.vue
@@ -450,27 +450,4 @@ onMounted(() => {
 </script>
 
 <style scoped>
-/* 自定义表格行悬停样式 */
-::v-deep .el-table__row:hover>td {
-  background-color: #f0f7ff !important;
-}
-
-/* 表单间距优化 */
-::v-deep .el-form-item {
-  margin-bottom: 16px;
-}
-
-/* 对话框动画 */
-::v-deep .el-dialog__wrapper {
-  backdrop-filter: blur(2px);
-}
-
-/* 按钮样式优化 */
-::v-deep .el-button--primary {
-  transition: all 0.2s ease;
-}
-
-::v-deep .el-button--primary:hover {
-  transform: translateY(-2px);
-}
 </style>
diff --git a/src/views/materials/usageMaterials/purchase/indexSon.vue b/src/views/materials/usageMaterials/purchase/indexSon.vue
index 2a27c1b..6bf9c30 100644
--- a/src/views/materials/usageMaterials/purchase/indexSon.vue
+++ b/src/views/materials/usageMaterials/purchase/indexSon.vue
@@ -18,7 +18,7 @@
                 <!-- 基础信息列 -->
                 <el-table-column prop="id" label="ID" width="180" align="center"></el-table-column>
                 <el-table-column prop="batch" label="批次" align="center"></el-table-column>
-                <el-table-column prop="physicalsupplyId" label="使用情况ID"  align="center"></el-table-column>
+                <el-table-column prop="physicalsupplyId" label="使用情况ID" width="180" align="center"></el-table-column>
                 <!-- 时间相关列 -->
                 <el-table-column prop="issuanceTime" label="联系单下达时间" min-width="160" align="center">
                     <template #default="scope">

From 359c7ec47fb4d348476465ff93a4ba13ac69169f Mon Sep 17 00:00:00 2001
From: fengsen <2548667232@qq.com>
Date: Fri, 15 Aug 2025 15:46:26 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/settings.ts          | 6 +++---
 src/store/modules/app.ts | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/settings.ts b/src/settings.ts
index 4b62c75..8d08686 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -11,7 +11,7 @@ const setting: DefaultSettings = {
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light
    */
-  sideTheme: 'theme-dark',
+  sideTheme: 'theme-light',
   /**
    * 是否系统布局配置
    */
@@ -20,12 +20,12 @@ const setting: DefaultSettings = {
   /**
    * 是否显示顶部导航
    */
-  topNav: false,
+  topNav: true,
 
   /**
    * 是否显示 tagsView
    */
-  tagsView: true,
+  tagsView: false,
 
   /**
    * 是否固定头部
diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts
index 0205fab..5ccaf75 100644
--- a/src/store/modules/app.ts
+++ b/src/store/modules/app.ts
@@ -6,7 +6,7 @@ export const useAppStore = defineStore('app', () => {
   const sidebar = reactive({
     opened: sidebarStatus.value ? !!+sidebarStatus.value : true,
     withoutAnimation: false,
-    hide: false
+    hide: true
   });
   const device = ref<string>('desktop');
   const size = useStorage<'large' | 'default' | 'small'>('size', 'default');

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

---
 .env.development                              |   2 +-
 src/api/materials/purchaseDoc/index.ts        |  10 +
 src/layout/components/notice/index.vue        |   2 -
 src/utils/sse.ts                              |   1 -
 src/views/cory/template/indexEdit.vue         |   2 +-
 src/views/design/appointment/index.vue        | 177 ++++++++-----
 .../design/billofQuantities/indexEdit.vue     |   2 +-
 src/views/design/condition/indexEdit.vue      |   2 +-
 src/views/design/designChange/indexEdit.vue   |   9 +-
 src/views/design/drawing/indexEdit.vue        |   9 +-
 src/views/design/drawingreview/indexEdit.vue  |  31 +--
 src/views/design/prelimScheme/indexEdit.vue   |   2 +-
 src/views/design/scheme/indexEdit.vue         |   2 +-
 src/views/design/specialScheme/indexEdit.vue  |   2 +-
 .../design/technicalStandard/indexEdit.vue    |   2 +-
 .../materialReceive/word/index.vue            |  34 +--
 .../materials/materialsEquipment/partyA.rar   | Bin 17074 -> 0 bytes
 .../overallPlanMaterialSupply/index.vue       |   1 +
 .../overallPlanMaterialSupply/indexEdit.vue   |  41 ++-
 .../purchaseDoc/comm/logisticsDetail.vue      | 245 ++++++++++++++++++
 src/views/materials/purchaseDoc/index.vue     |  30 ++-
 src/views/out/constructionValue/indexEdit.vue |   2 +-
 src/views/out/designCompletion/indexEdit.vue  |   2 +-
 src/views/out/monthPlan/indexEdit.vue         |   2 +-
 src/views/workflows/leave/leaveEdit.vue       |  11 +-
 25 files changed, 491 insertions(+), 132 deletions(-)
 delete mode 100644 src/views/materials/materialsEquipment/partyA.rar
 create mode 100644 src/views/materials/purchaseDoc/comm/logisticsDetail.vue

diff --git a/.env.development b/.env.development
index 21892b7..1c549fa 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VITE_APP_TITLE = 新能源项目管理平台
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.180:8898'
+VITE_APP_BASE_API = 'http://192.168.110.180:8899'
 
 # 无人机接口地址
 
diff --git a/src/api/materials/purchaseDoc/index.ts b/src/api/materials/purchaseDoc/index.ts
index bcaaf4a..699f240 100644
--- a/src/api/materials/purchaseDoc/index.ts
+++ b/src/api/materials/purchaseDoc/index.ts
@@ -111,3 +111,13 @@ export const purchaseDocPlanList = (id) => {
     method: 'get'
   });
 };
+/**
+ * 通过物流单号 物流详情
+ * @param id
+ */
+export const logisticsDetial = (id) => {
+  return request({
+    url: '/cailiaoshebei/ltn/logistics/' + id,
+    method: 'get'
+  });
+};
diff --git a/src/layout/components/notice/index.vue b/src/layout/components/notice/index.vue
index 2aa716c..78ca0c8 100644
--- a/src/layout/components/notice/index.vue
+++ b/src/layout/components/notice/index.vue
@@ -54,8 +54,6 @@ const onNewsClick = (item: any) => {
   //并且写入pinia
   noticeStore.state.value.notices = newsList.value;
   //如果有formPath，就前往
-  console.log(1111111111111111);
-  console.log(newsList.value[item]);
   if (newsList.value[item].route) {
     proxy?.$tab.openPage('/' + newsList.value[item].route, '', { id: newsList.value[item].detailId, type: 'view' });
   }
diff --git a/src/utils/sse.ts b/src/utils/sse.ts
index 452ff85..464727c 100644
--- a/src/utils/sse.ts
+++ b/src/utils/sse.ts
@@ -25,7 +25,6 @@ export const initSSE = (url: any) => {
   });
 
   watch(data, () => {
-    console.log(data.value);
     let label = '';
     let route1 = '';
     let detailId = '';
diff --git a/src/views/cory/template/indexEdit.vue b/src/views/cory/template/indexEdit.vue
index 6dcdad1..91e3fe6 100644
--- a/src/views/cory/template/indexEdit.vue
+++ b/src/views/cory/template/indexEdit.vue
@@ -23,7 +23,7 @@
           <el-form
             ref="leaveFormRef"
             v-loading="loading"
-            :disabled="routeParams.type === 'view'"
+            :disabled="routeParams.type === 'view' || form.status == 'waiting'"
             :model="form"
             :rules="rules"
             label-width="100px"
diff --git a/src/views/design/appointment/index.vue b/src/views/design/appointment/index.vue
index 4f7b023..6722288 100644
--- a/src/views/design/appointment/index.vue
+++ b/src/views/design/appointment/index.vue
@@ -8,7 +8,6 @@
         <el-button @click="disabledForm = false" class="px-8 py-2.5 transition-all duration-300 font-medium" v-if="disabledForm">
           点击编辑
         </el-button>
-        <!-- ，带 <span class="text-red-300">*</span> 为必填项 -->
       </div>
       <!-- 表单内容区域 -->
       <el-form ref="leaveFormRef" :model="form" :disabled="disabledForm" :rules="rules" label-width="120px" class="p-6 space-y-6">
@@ -46,15 +45,23 @@
               class="flex-1 mr-3"
             >
               <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+                <!-- 设计人员专业选择（绑定重复校验） -->
                 <el-select
                   v-model="designer.userMajor"
                   placeholder="请选择专业"
                   class="transition-all duration-300 border-gray-300"
                   :rules="{ required: true, message: '请选择专业', trigger: 'change' }"
+                  @change="() => checkDuplicate(designer, 'designers', index)"
                 >
                   <el-option v-for="item in des_user_major" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
-                <el-select v-model="designer.userId" placeholder="请选择设计人员" class="transition-all duration-300 border-gray-300">
+                <!-- 设计人员选择（绑定重复校验） -->
+                <el-select
+                  v-model="designer.userId"
+                  placeholder="请选择设计人员"
+                  class="transition-all duration-300 border-gray-300"
+                  @change="() => checkDuplicate(designer, 'designers', index)"
+                >
                   <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
                 </el-select>
               </div>
@@ -97,15 +104,23 @@
               class="flex-1 mr-3"
             >
               <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+                <!-- 校审人员专业选择（绑定重复校验） -->
                 <el-select
                   v-model="reviewer.userMajor"
                   placeholder="请选择专业"
                   class="transition-all duration-300 border-gray-300"
                   :rules="{ required: true, message: '请选择专业', trigger: 'change' }"
+                  @change="() => checkDuplicate(reviewer, 'reviewers', index)"
                 >
                   <el-option v-for="item in des_user_major" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
-                <el-select v-model="reviewer.userId" placeholder="请选择校审人员" class="transition-all duration-300 border-gray-300">
+                <!-- 校审人员选择（绑定重复校验） -->
+                <el-select
+                  v-model="reviewer.userId"
+                  placeholder="请选择校审人员"
+                  class="transition-all duration-300 border-gray-300"
+                  @change="() => checkDuplicate(reviewer, 'reviewers', index)"
+                >
                   <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
                 </el-select>
               </div>
@@ -146,7 +161,7 @@
 </template>
 
 <script setup name="PersonnelForm" lang="ts">
-import { ref, reactive, computed, onMounted, toRefs } from 'vue';
+import { ref, reactive, computed, onMounted, toRefs, watch, WatchStopHandle } from 'vue';
 import { getCurrentInstance } from 'vue';
 import type { ComponentInternalInstance } from 'vue';
 import { useUserStoreHook } from '@/store/modules/user';
@@ -184,11 +199,11 @@ const userList = ref([]);
 // 表单引用
 const leaveFormRef = ref();
 const disabledForm = ref(false); //控制提交按钮状态
+
 /** 查询当前部门的所有用户 */
 const getDeptAllUser = async (deptId: any) => {
   try {
     const res = await systemUserList({ deptId });
-    // 实际项目中使用接口返回的数据
     userList.value = res.rows;
   } catch (error) {
     ElMessage.error('获取用户列表失败');
@@ -217,37 +232,20 @@ const designUser = async () => {
       // 处理返回的数据，进行回显
       res.rows.forEach((item: any) => {
         if (item.userType == 1) {
-          item.userType = 'designLeader';
+          form.designLeader = item.userId;
         } else if (item.userType == 2) {
-          item.userType = 'designer';
+          form.designers.push({
+            userId: item.userId,
+            userMajor: item.userMajor || null
+          });
         } else if (item.userType == 3) {
-          item.userType = 'reviewer';
-        }
-        // 根据userType区分不同类型的人员
-        switch (item.userType) {
-          case 'designLeader':
-          case 1:
-            form.designLeader = item.userId;
-            break;
-
-          case 'designer':
-          case 2:
-            form.designers.push({
-              userId: item.userId,
-              userMajor: item.userMajor || null
-            });
-            break;
-
-          case 'reviewer':
-          case 3:
-            form.reviewers.push({
-              userId: item.userId,
-              userMajor: item.userMajor || null
-            });
-            break;
+          form.reviewers.push({
+            userId: item.userId,
+            userMajor: item.userMajor || null
+          });
         }
       });
-      // 如果没有设计人员或校审人员，添加一个空项
+      // 补全默认空项
       if (form.designers.length === 0) {
         form.designers.push({ userId: null, userMajor: null });
       }
@@ -261,7 +259,6 @@ const designUser = async () => {
     }
   } catch (error) {
     ElMessage.error('获取配置数据失败');
-    // 添加默认空项
     form.designers.push({ userId: null, userMajor: null });
     form.reviewers.push({ userId: null, userMajor: null });
   } finally {
@@ -272,7 +269,7 @@ const designUser = async () => {
 /** 添加人员 */
 const addPerson = (type: 'designers' | 'reviewers') => {
   form[type].push({ userId: null, userMajor: null });
-  // 滚动到最后一个新增的元素
+  // 滚动到最后一个新增元素
   setTimeout(() => {
     const elements = document.querySelectorAll(`[data-v-${proxy?.$options.__scopeId}] .el-select`);
     if (elements.length > 0) {
@@ -290,48 +287,112 @@ const removePerson = (type: 'designers' | 'reviewers', index: number) => {
   form[type].splice(index, 1);
 };
 
-/** 提交表单 */
+// ===================== 核心修改：重复校验逻辑 =====================
+/**
+ * 校验同一角色内（设计/校审）的「专业+人员」组合唯一性
+ * @param current 当前操作的人员对象
+ * @param role 角色类型（designers/reviewers）
+ * @param currentIndex 当前操作的索引
+ */
+const checkDuplicate = (current: { userId: number | null; userMajor: string | null }, role: 'designers' | 'reviewers', currentIndex: number) => {
+  // 未选完专业/人员时不校验
+  if (!current.userId || !current.userMajor) return;
+
+  // 只获取当前角色的所有人员（设计只查设计，校审只查校审）
+  const targetList = form[role];
+  // 生成当前「专业+人员」唯一标识
+  const currentKey = `${current.userMajor}-${current.userId}`;
+
+  // 检查当前角色内是否有重复
+  const duplicateItem = targetList.find((item, index) => {
+    // 排除当前操作项本身
+    if (index === currentIndex) return false;
+    // 对比「专业+人员」组合
+    return `${item.userMajor}-${item.userId}` === currentKey;
+  });
+
+  // 存在重复时提示并清空当前选择
+  if (duplicateItem) {
+    ElMessage.warning(`当前「${getMajorLabel(current.userMajor)}+${getUserName(current.userId)}」组合已存在，请重新选择`);
+    // 清空当前项的选择
+    current.userId = null;
+    current.userMajor = null;
+  }
+};
+
+/** 辅助函数：通过专业值获取专业名称 */
+const getMajorLabel = (majorValue: string | null) => {
+  if (!majorValue || !des_user_major.value) return '';
+  const major = des_user_major.value.find((item: any) => item.value === majorValue);
+  return major ? major.label : majorValue;
+};
+
+/** 辅助函数：通过用户ID获取用户名 */
+const getUserName = (userId: number | null) => {
+  if (!userId || !userList.value.length) return '';
+  const user = userList.value.find((item: any) => item.userId === userId);
+  return user ? user.nickName : userId;
+};
+
+/** 提交表单（补充提交前重复校验） */
 const submitForm = async () => {
   if (!leaveFormRef.value) return;
   try {
-    // 表单验证
+    // 1. 先做基础表单验证
     await leaveFormRef.value.validate();
-    // 构建提交数据 - 所有人员信息放在一个数组中
+
+    // 2. 提交前二次校验：确保当前角色内无重复（防止手动修改数据绕过实时校验）
+    let hasDuplicate = false;
+    // 校验设计人员
+    const designKeys = form.designers.map((item) => `${item.userMajor}-${item.userId}`);
+    if (new Set(designKeys).size !== designKeys.length) {
+      hasDuplicate = true;
+      ElMessage.error('设计人员中存在重复的「专业+人员」组合，请检查');
+    }
+    // 校验校审人员（不校验设计与校审之间）
+    if (!hasDuplicate) {
+      const reviewKeys = form.reviewers.map((item) => `${item.userMajor}-${item.userId}`);
+      if (new Set(reviewKeys).size !== reviewKeys.length) {
+        hasDuplicate = true;
+        ElMessage.error('校审人员中存在重复的「专业+人员」组合，请检查');
+      }
+    }
+    // 有重复则终止提交
+    if (hasDuplicate) return;
+
+    // 3. 构建提交数据（原有逻辑不变）
     const submitData = {
       projectId: form.projectId,
       personnel: [
         // 设计负责人
         {
           userId: form.designLeader,
-          userType: 'designLeader', // 设计负责人类型标识
-          userMajor: null // 负责人不需要专业
+          userType: 'designLeader',
+          userMajor: null
         },
         // 设计人员
         ...form.designers.map((designer) => ({
           userId: designer.userId,
-          userType: 'designer', // 设计人员类型标识
-          userMajor: designer.userMajor // 包含专业信息
+          userType: 'designer',
+          userMajor: designer.userMajor
         })),
         // 校审人员
         ...form.reviewers.map((reviewer) => ({
           userId: reviewer.userId,
-          userType: 'reviewer', // 校审人员类型标识
-          userMajor: reviewer.userMajor // 包含专业信息
+          userType: 'reviewer',
+          userMajor: reviewer.userMajor
         }))
       ]
     };
 
-    // 数据处理
+    // 数据处理（原有逻辑不变）
     const arr = [];
     userList.value.forEach((item) => {
       submitData.personnel.forEach((item1) => {
         if (item1.userId === item.userId) {
-          let userType = 1; // 默认为设计负责人
-          if (item1.userType === 'designer') {
-            userType = 2; // 设计人员
-          } else if (item1.userType === 'reviewer') {
-            userType = 3; // 校审人员
-          }
+          let userType = 1;
+          if (item1.userType === 'designer') userType = 2;
+          else if (item1.userType === 'reviewer') userType = 3;
           arr.push({
             userName: item.nickName,
             projectId: submitData.projectId,
@@ -343,7 +404,8 @@ const submitForm = async () => {
       });
     });
 
-    // 提交到后端
+    // 4. 提交到后端（原有逻辑不变）
+    const loading = ElLoading.service({ text: '提交中...', background: 'rgba(255,255,255,0.7)' });
     const res = await designUserAdd({
       list: arr,
       projectId: currentProject.value?.id
@@ -357,7 +419,6 @@ const submitForm = async () => {
   } catch (error) {
     ElMessage.error('请完善表单信息后再提交');
   } finally {
-    // 关闭加载状态
     ElLoading.service().close();
   }
 };
@@ -371,22 +432,22 @@ const resetForm = () => {
     ElMessage.info('表单已重置');
   }
 };
-//监听项目id刷新数据
-const listeningProject = watch(
+
+// 监听项目ID刷新数据
+const listeningProject: WatchStopHandle = watch(
   () => currentProject.value?.id,
-  (nid, oid) => {
+  () => {
     getDeptAllUser(userStore.deptId).then(() => {
       designUser();
     });
   }
 );
 
+// 页面生命周期
 onUnmounted(() => {
-  listeningProject();
+  listeningProject(); // 修复原代码watchStopHandle调用问题
 });
-// 页面挂载时初始化数据
 onMounted(() => {
-  // 先获取用户列表，再加载表单数据
   getDeptAllUser(userStore.deptId).then(() => {
     designUser();
   });
diff --git a/src/views/design/billofQuantities/indexEdit.vue b/src/views/design/billofQuantities/indexEdit.vue
index c7d2d3a..905580e 100644
--- a/src/views/design/billofQuantities/indexEdit.vue
+++ b/src/views/design/billofQuantities/indexEdit.vue
@@ -22,7 +22,7 @@
           <el-form
             ref="leaveFormRef"
             v-loading="loading"
-            :disabled="routeParams.type === 'view'"
+            :disabled="routeParams.type === 'view' || form.status == 'waiting'"
             :model="form"
             :rules="rules"
             label-width="100px"
diff --git a/src/views/design/condition/indexEdit.vue b/src/views/design/condition/indexEdit.vue
index 6251496..bce10c7 100644
--- a/src/views/design/condition/indexEdit.vue
+++ b/src/views/design/condition/indexEdit.vue
@@ -22,7 +22,7 @@
           <el-form
             ref="leaveFormRef"
             v-loading="loading"
-            :disabled="routeParams.type === 'view'"
+            :disabled="routeParams.type === 'view' || form.status == 'waiting'"
             :model="form"
             :rules="rules"
             label-width="100px"
diff --git a/src/views/design/designChange/indexEdit.vue b/src/views/design/designChange/indexEdit.vue
index f27fb40..206136c 100644
--- a/src/views/design/designChange/indexEdit.vue
+++ b/src/views/design/designChange/indexEdit.vue
@@ -12,7 +12,14 @@
           <h3 class="text-lg font-semibold text-gray-800">下发变更通知信息</h3>
         </div>
         <div class="p-6">
-          <el-form ref="leaveFormRef" :disabled="routeParams.type === 'view'" :model="form" :rules="rules" label-width="100px" class="space-y-4">
+          <el-form
+            ref="leaveFormRef"
+            :disabled="routeParams.type === 'view' || form.status == 'waiting'"
+            :model="form"
+            :rules="rules"
+            label-width="100px"
+            class="space-y-4"
+          >
             <div class="grid grid-cols-1 gap-4">
               <el-row>
                 <el-col :span="12">
diff --git a/src/views/design/drawing/indexEdit.vue b/src/views/design/drawing/indexEdit.vue
index 759d562..157de01 100644
--- a/src/views/design/drawing/indexEdit.vue
+++ b/src/views/design/drawing/indexEdit.vue
@@ -19,7 +19,14 @@
           <h3 class="text-lg font-semibold text-gray-800">变更图纸信息</h3>
         </div>
         <div class="p-6">
-          <el-form ref="leaveFormRef" :disabled="routeParams.type === 'view'" :model="form" :rules="rules" label-width="100px" class="space-y-4">
+          <el-form
+            ref="leaveFormRef"
+            :disabled="routeParams.type === 'view' || form.status == 'waiting'"
+            :model="form"
+            :rules="rules"
+            label-width="100px"
+            class="space-y-4"
+          >
             <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
               <el-form-item label="图纸文件" prop="fileId" class="mb-2 md:col-span-2">
                 <file-upload :fileType="['pdf']" :fileSize="''" v-model="form.fileId" class="w-full"></file-upload>
diff --git a/src/views/design/drawingreview/indexEdit.vue b/src/views/design/drawingreview/indexEdit.vue
index 55205ee..fbf54dc 100644
--- a/src/views/design/drawingreview/indexEdit.vue
+++ b/src/views/design/drawingreview/indexEdit.vue
@@ -19,23 +19,20 @@
           <h3 class="text-lg font-semibold text-gray-800">图纸评审</h3>
         </div>
         <div class="p-6">
-          <el-form
-            ref="leaveFormRef"
-            v-loading="loading"
-            :disabled="routeParams.type === 'view'"
-            :model="form"
-            :rules="rules"
-            label-width="100px"
-            class="space-y-4"
-          >
-            <div class="grid grid-cols-1 gap-4">
-              <el-form ref="leaveFormRef" :disabled="routeParams.type === 'view'" :model="form" :rules="rules" label-width="100px" class="space-y-4">
-                <el-form-item label="图纸文件" v-for="value in form.fileVoList" :key="value.id" prop="fileId" class="mb-2 md:col-span-2">
-                  <el-input v-model="value.fileName" disabled placeholder="图纸名称" />
-                </el-form-item>
-              </el-form>
-            </div>
-          </el-form>
+          <div class="grid grid-cols-1 gap-4">
+            <el-form
+              ref="leaveFormRef"
+              :disabled="routeParams.type === 'view' || form.auditStatus == 'waiting'"
+              :model="form"
+              :rules="rules"
+              label-width="100px"
+              class="space-y-4"
+            >
+              <el-form-item label="图纸文件" v-for="value in form.fileVoList" :key="value.id" prop="fileId" class="mb-2 md:col-span-2">
+                <el-input v-model="value.fileName" disabled placeholder="图纸名称" />
+              </el-form-item>
+            </el-form>
+          </div>
         </div>
       </el-card>
       <!-- 提交组件 -->
diff --git a/src/views/design/prelimScheme/indexEdit.vue b/src/views/design/prelimScheme/indexEdit.vue
index 778c307..57fee49 100644
--- a/src/views/design/prelimScheme/indexEdit.vue
+++ b/src/views/design/prelimScheme/indexEdit.vue
@@ -23,7 +23,7 @@
           <el-form
             ref="leaveFormRef"
             v-loading="loading"
-            :disabled="routeParams.type === 'view'"
+            :disabled="routeParams.type === 'view' || form.status == 'waiting' || form.status == 'waiting'"
             :model="form"
             :rules="rules"
             label-width="120px"
diff --git a/src/views/design/scheme/indexEdit.vue b/src/views/design/scheme/indexEdit.vue
index 2a0ed6b..58aa419 100644
--- a/src/views/design/scheme/indexEdit.vue
+++ b/src/views/design/scheme/indexEdit.vue
@@ -23,7 +23,7 @@
           <el-form
             ref="leaveFormRef"
             v-loading="loading"
-            :disabled="routeParams.type === 'view'"
+            :disabled="routeParams.type === 'view' || form.status == 'waiting'"
             :model="form"
             :rules="rules"
             label-width="120px"
diff --git a/src/views/design/specialScheme/indexEdit.vue b/src/views/design/specialScheme/indexEdit.vue
index 4719ff0..ab759e6 100644
--- a/src/views/design/specialScheme/indexEdit.vue
+++ b/src/views/design/specialScheme/indexEdit.vue
@@ -23,7 +23,7 @@
           <el-form
             ref="leaveFormRef"
             v-loading="loading"
-            :disabled="routeParams.type === 'view'"
+            :disabled="routeParams.type === 'view' || form.status == 'waiting'"
             :model="form"
             :rules="rules"
             label-width="120px"
diff --git a/src/views/design/technicalStandard/indexEdit.vue b/src/views/design/technicalStandard/indexEdit.vue
index b3b2b64..365257f 100644
--- a/src/views/design/technicalStandard/indexEdit.vue
+++ b/src/views/design/technicalStandard/indexEdit.vue
@@ -22,7 +22,7 @@
           <el-form
             ref="leaveFormRef"
             v-loading="loading"
-            :disabled="routeParams.type === 'view'"
+            :disabled="routeParams.type === 'view' || form.status == 'waiting'"
             :model="form"
             :rules="rules"
             label-width="100px"
diff --git a/src/views/materials/materialsEquipment/materialReceive/word/index.vue b/src/views/materials/materialsEquipment/materialReceive/word/index.vue
index 4a4312d..fac7c7e 100644
--- a/src/views/materials/materialsEquipment/materialReceive/word/index.vue
+++ b/src/views/materials/materialsEquipment/materialReceive/word/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-model="isShowDialog" title="变更单详情" draggable width="60vw" :close-on-click-modal="false" :destroy-on-close="true">
+  <el-dialog v-model="isShowDialog" title="材料设备详情" draggable width="1200px" :close-on-click-modal="false" :destroy-on-close="true">
     <el-card :body-style="{ padding: '20px' }" style="border: none; box-shadow: none">
       <div class="dialog-footer">
         <div class="btn-item" @click="onLoad">
@@ -46,26 +46,26 @@
             </tbody>
             <thead>
               <tr>
-                <th width="150">序号</th>
-                <th width="150">名称</th>
-                <th width="150">规格</th>
-                <th width="150">单位</th>
-                <th width="150">数量</th>
-                <th width="150">验收</th>
-                <th width="150">缺件</th>
-                <th width="150">备注</th>
+                <td width="150">序号</td>
+                <td width="150">名称</td>
+                <td width="150">规格</td>
+                <td width="150">单位</td>
+                <td width="150">数量</td>
+                <td width="150">验收</td>
+                <td width="150">缺件</td>
+                <td width="150">备注</td>
               </tr>
             </thead>
             <tbody>
               <tr v-for="(item, i) of formData.itemList" :key="i">
-                <th width="150">{{ i + 1 }}</th>
-                <th width="150">{{ item.name }}</th>
-                <th width="150">{{ item.specification }}</th>
-                <th width="150">{{ item.unit }}</th>
-                <th width="150">{{ item.quantity }}</th>
-                <th width="150">{{ item.acceptedQuantity }}</th>
-                <th width="150">{{ item.shortageQuantity }}</th>
-                <th width="150">{{ item.remark }}</th>
+                <td width="150">{{ i + 1 }}</td>
+                <td width="150">{{ item.name }}</td>
+                <td width="150">{{ item.specification }}</td>
+                <td width="150">{{ item.unit }}</td>
+                <td width="150">{{ item.quantity }}</td>
+                <td width="150">{{ item.acceptedQuantity }}</td>
+                <td width="150">{{ item.shortageQuantity }}</td>
+                <td width="150">{{ item.remark }}</td>
               </tr>
             </tbody>
             <tbody>
diff --git a/src/views/materials/materialsEquipment/partyA.rar b/src/views/materials/materialsEquipment/partyA.rar
deleted file mode 100644
index 85d82761418d18ec63147456424f91439d6c2978..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17074
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

diff --git a/src/views/materials/overallPlanMaterialSupply/index.vue b/src/views/materials/overallPlanMaterialSupply/index.vue
index bd8a65c..991ce0d 100644
--- a/src/views/materials/overallPlanMaterialSupply/index.vue
+++ b/src/views/materials/overallPlanMaterialSupply/index.vue
@@ -27,6 +27,7 @@
       <el-table-column prop="num" label="编号" />
       <el-table-column prop="name" label="工程或费用名称" width="180" />
       <el-table-column prop="unit" label="单位" />
+      <el-table-column prop="specification" label="规格型号" />
       <el-table-column prop="quantity" label="数量" width="60" />
       <el-table-column prop="batchNumber" label="批次号" width="200" />
       <el-table-column prop="brand" label="品牌" />
diff --git a/src/views/materials/overallPlanMaterialSupply/indexEdit.vue b/src/views/materials/overallPlanMaterialSupply/indexEdit.vue
index f1836ce..a35f892 100644
--- a/src/views/materials/overallPlanMaterialSupply/indexEdit.vue
+++ b/src/views/materials/overallPlanMaterialSupply/indexEdit.vue
@@ -3,18 +3,23 @@
     <div class="max-w-4xl mx-auto">
       <!-- 顶部按钮区域 -->
       <el-card class="mb-4 rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md">
-        <approvalButton @submitForm="submitForm" @approvalVerifyOpen="approvalVerifyOpen"
-          @handleApprovalRecord="handleApprovalRecord" :buttonLoading="buttonLoading" :id="form.id"
-          :status="form.status" :pageType="routeParams.type" />
+        <approvalButton
+          @submitForm="submitForm"
+          @approvalVerifyOpen="approvalVerifyOpen"
+          @handleApprovalRecord="handleApprovalRecord"
+          :buttonLoading="buttonLoading"
+          :id="form.id"
+          :status="form.status"
+          :pageType="routeParams.type"
+        />
       </el-card>
       <!-- 表单区域 -->
-      <el-card
-        class="rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md overflow-hidden">
+      <el-card class="rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md overflow-hidden">
         <div class="p-4 bg-gradient-to-r from-blue-50 to-indigo-50 border-b border-gray-100">
           <h3 class="text-lg font-semibold text-gray-800">设计原则</h3>
         </div>
         <div class="p-6">
-          <!-- <el-form ref="leaveFormRef" v-loading="loading" :disabled="routeParams.type === 'view' || routeParams.type === 'update'" :model="form"
+          <!-- <el-form ref="leaveFormRef" v-loading="loading" :disabled="routeParams.type === 'view' || form.status == 'waiting' || routeParams.type === 'update'" :model="form"
             :rules="rules" label-width="100px" class="space-y-4">
             <el-row :gutter="20">
               <el-col :span="12">
@@ -67,7 +72,7 @@
               </el-col>
             </el-row>
           </el-form> -->
-          <el-table :data="tableData" v-loading="loading"  row-key="id" border>
+          <el-table :data="tableData" v-loading="loading" row-key="id" border>
             <el-table-column prop="num" label="编号" />
             <el-table-column prop="name" label="名称" />
             <el-table-column prop="specification" label="规格" />
@@ -81,8 +86,14 @@
       <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
       <approvalRecord ref="approvalRecordRef"></approvalRecord>
       <!-- 流程选择对话框 -->
-      <el-dialog draggable v-model="dialogVisible.visible" :title="dialogVisible.title" :before-close="handleClose"
-        width="500" class="rounded-lg shadow-lg">
+      <el-dialog
+        draggable
+        v-model="dialogVisible.visible"
+        :title="dialogVisible.title"
+        :before-close="handleClose"
+        width="500"
+        class="rounded-lg shadow-lg"
+      >
         <div class="p-4">
           <p class="text-gray-600 mb-4">请选择要启动的流程：</p>
           <el-select v-model="flowCode" placeholder="请选择流程" style="width: 100%">
@@ -91,10 +102,12 @@
         </div>
         <template #footer>
           <div class="dialog-footer p-4 border-t border-gray-100 flex justify-end space-x-3">
-            <el-button @click="handleClose"
-              class="px-4 py-2 border border-gray-300 rounded-md text-gray-700 hover:bg-gray-50 transition-colors">取消</el-button>
-            <el-button type="primary" @click="submitFlow()"
-              class="px-4 py-2 bg-primary text-white rounded-md hover:bg-primary/90 transition-colors">确认</el-button>
+            <el-button @click="handleClose" class="px-4 py-2 border border-gray-300 rounded-md text-gray-700 hover:bg-gray-50 transition-colors"
+              >取消</el-button
+            >
+            <el-button type="primary" @click="submitFlow()" class="px-4 py-2 bg-primary text-white rounded-md hover:bg-primary/90 transition-colors"
+              >确认</el-button
+            >
           </div>
         </template>
       </el-dialog>
@@ -112,7 +125,7 @@ import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 import { useUserStoreHook } from '@/store/modules/user';
 const { design_change_reason_type } = toRefs<any>(proxy?.useDict('design_change_reason_type'));
-import { totalsupplyplan,obtainMasterDataList } from '@/api/materials/overallPlanMaterialSupply/index';
+import { totalsupplyplan, obtainMasterDataList } from '@/api/materials/overallPlanMaterialSupply/index';
 // 获取用户 store
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
diff --git a/src/views/materials/purchaseDoc/comm/logisticsDetail.vue b/src/views/materials/purchaseDoc/comm/logisticsDetail.vue
new file mode 100644
index 0000000..95bc96a
--- /dev/null
+++ b/src/views/materials/purchaseDoc/comm/logisticsDetail.vue
@@ -0,0 +1,245 @@
+<template>
+  <el-drawer v-model="drawer" :direction="direction" size="40%" :before-close="handleBeforeClose" title-class="drawer-title">
+    <template #header>
+      <span class="font-bold text-lg text-gray-800">物流信息</span>
+    </template>
+
+    <template #default>
+      <!-- 物流头部信息 -->
+      <div class="bg-white rounded-lg shadow-md p-5 mb-6">
+        <div class="flex flex-col md:flex-row md:items-center justify-between gap-6">
+          <!-- 左侧：快递基本信息 -->
+          <div class="flex items-center gap-6">
+            <div class="w-14 h-14 rounded-md overflow-hidden border border-gray-100 flex items-center justify-center">
+              <img
+                :src="logisticsData?.result.logo"
+                alt="快递公司Logo"
+                class="w-full h-full object-contain"
+                :onerror="`this.src='https://via.placeholder.com/48x48?text=暂无Logo'`"
+              />
+            </div>
+            <div class="text-sm">
+              <p class="text-gray-500">快递单号</p>
+              <p class="font-medium text-gray-900">{{ logisticsData?.result.number }}</p>
+              <p class="text-gray-500 mt-1">{{ logisticsData?.result.expName }} | 最新更新: {{ logisticsData?.result.updateTime }}</p>
+            </div>
+            <div class="ml-auto">
+              <el-tag :type="getStatusType(logisticsData?.result.deliverystatus)" size="medium" class="px-4 py-1">
+                {{ getStatusText(logisticsData?.result.deliverystatus) }}
+              </el-tag>
+              <p class="text-gray-500 text-sm mt-2 text-right">耗时: {{ logisticsData?.result.takeTime || '暂无数据' }}</p>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <!-- 快递员信息（有数据才显示） -->
+      <div v-if="logisticsData?.result.courier" class="bg-blue-50 rounded-lg p-4 mb-6 border-l-4 border-blue-400">
+        <div class="flex items-center justify-between">
+          <p class="font-medium text-blue-800">配送信息</p>
+          <a :href="`tel:${logisticsData?.result.courierPhone}`" class="text-blue-600 hover:text-blue-800 text-sm flex items-center gap-1">
+            <el-icon class="el-icon-phone"></el-icon>
+            联系快递员
+          </a>
+        </div>
+        <div class="flex flex-wrap gap-x-8 gap-y-3 mt-3 text-gray-700">
+          <div class="flex items-center gap-2">
+            <el-icon class="el-icon-user text-gray-500"></el-icon>
+            <span>快递员: {{ logisticsData?.result.courier }}</span>
+          </div>
+          <div class="flex items-center gap-2">
+            <el-icon class="el-icon-phone-outline text-gray-500"></el-icon>
+            <span>电话: {{ logisticsData?.result.courierPhone || '暂无' }}</span>
+          </div>
+          <div class="flex items-center gap-2">
+            <el-icon class="el-icon-service text-gray-500"></el-icon>
+            <span>客服: {{ logisticsData?.result.expPhone }}</span>
+          </div>
+        </div>
+      </div>
+
+      <!-- 物流轨迹列表 -->
+      <div class="bg-white rounded-lg shadow-md p-5">
+        <p class="font-medium text-gray-800 mb-4">物流轨迹（{{ logisticsData?.result.list.length || 0 }}条）</p>
+        <div class="relative" style="border-left: 1px solid #d9d9d9; padding-left: 15px">
+          <div v-for="(item, index) in logisticsData?.result.list" :key="index" class="flex mb-8 relative">
+            <div class="flex flex-col items-center mr-6 z-10">
+              <div
+                :class="[
+                  'w-8 h-8 rounded-full flex items-center justify-center',
+                  index === 0 ? 'bg-blue-500 text-white' : 'bg-white border border-gray-300 text-gray-500'
+                ]"
+              >
+                <el-icon v-if="index === 0" class="el-icon-check text-xs"></el-icon>
+                <span v-else class="text-xs">{{ index + 1 }}</span>
+              </div>
+              <p class="text-xs text-gray-500 mt-2">{{ item.time }}</p>
+            </div>
+            <div class="flex-1 bg-gray-50 rounded-lg p-4 border border-gray-100 shadow-sm">
+              <p class="text-gray-800">{{ item.status }}</p>
+            </div>
+          </div>
+        </div>
+      </div>
+    </template>
+
+    <template #footer>
+      <div class="drawer-footer">
+        <el-button @click="close" :loading="cancelLoading" class="mr-3">关闭</el-button>
+      </div>
+    </template>
+  </el-drawer>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import type { DrawerProps } from 'element-plus';
+import { Phone, PhoneOutline, User, Service, Check } from '@element-plus/icons-vue';
+
+// 抽屉方向
+const direction = ref<DrawerProps['direction']>('ltr');
+// 加载状态
+const cancelLoading = ref(false);
+const confirmLoading = ref(false);
+// 抽屉显隐
+const drawer = ref(false);
+// 物流数据（初始化为接口返回格式）
+const logisticsData = ref({
+  status: '0',
+  msg: 'ok',
+  result: {
+    number: '',
+    type: '',
+    list: [],
+    deliverystatus: '0',
+    issign: '0',
+    expName: '',
+    expSite: '',
+    expPhone: '',
+    courier: '',
+    courierPhone: '',
+    updateTime: '',
+    takeTime: '',
+    logo: ''
+  }
+});
+
+/**
+ * 根据物流状态获取标签类型
+ * @param status 物流状态码
+ */
+const getStatusType = (status?: string) => {
+  switch (status) {
+    case '0': // 揽件
+      return 'info';
+    case '1': // 在途中
+      return 'warning';
+    case '2': // 派件中
+      return 'primary';
+    case '3': // 已签收
+      return 'success';
+    case '4': // 派送失败
+    case '5': // 疑难件
+      return 'danger';
+    case '6': // 退件签收
+      return 'error';
+    default:
+      return 'default';
+  }
+};
+
+/**
+ * 根据物流状态获取文本描述
+ * @param status 物流状态码
+ */
+const getStatusText = (status?: string) => {
+  const statusMap: Record<string, string> = {
+    '0': '快递收件(揽件)',
+    '1': '运输途中',
+    '2': '正在派件',
+    '3': '已签收',
+    '4': '派送失败',
+    '5': '疑难件',
+    '6': '退件签收'
+  };
+  return statusMap[status || '0'] || '未知状态';
+};
+
+/**
+ * 打开抽屉并加载物流数据
+ */
+const open = (data) => {
+  const mockData = {
+    result: data
+  };
+  logisticsData.value = mockData;
+  drawer.value = true;
+};
+/**
+ * 关闭抽屉
+ */
+const close = () => {
+  drawer.value = false;
+};
+
+/**
+ * 抽屉关闭前钩子（可用于拦截关闭逻辑）
+ */
+const handleBeforeClose = (done: () => void) => {
+  done(); // 直接关闭，如需确认可添加弹窗逻辑
+};
+
+// 暴露加载状态控制方法
+const setCancelLoading = (loading: boolean) => {
+  cancelLoading.value = loading;
+};
+const setConfirmLoading = (loading: boolean) => {
+  confirmLoading.value = loading;
+};
+
+// 暴露方法供父组件调用
+defineExpose({
+  open,
+  setCancelLoading,
+  setConfirmLoading
+});
+</script>
+
+<style scoped>
+.drawer-title {
+  padding-bottom: 8px;
+  border-bottom: 1px solid #f2f2f2;
+}
+
+.drawer-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 12px;
+  padding: 16px;
+  border-top: 1px solid #eee;
+}
+
+:deep(.el-drawer__body) {
+  padding: 20px;
+  overflow-y: auto;
+  max-height: calc(100vh - 160px);
+}
+
+:deep(.el-tag) {
+  border-radius: 4px;
+}
+
+@media (max-width: 768px) {
+  :deep(.el-drawer) {
+    width: 95% !important;
+  }
+
+  .drawer-footer {
+    flex-direction: column;
+  }
+
+  :deep(.drawer-footer .el-button) {
+    width: 100%;
+  }
+}
+</style>
diff --git a/src/views/materials/purchaseDoc/index.vue b/src/views/materials/purchaseDoc/index.vue
index 01a7cb4..7bbddd5 100644
--- a/src/views/materials/purchaseDoc/index.vue
+++ b/src/views/materials/purchaseDoc/index.vue
@@ -31,8 +31,8 @@
         </el-row>
       </template>
       <el-table v-loading="loading" :data="purchaseDocList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="采购单编号" align="center" prop="docCode" width="90" />
+        <el-table-column type="index" width="60" label="序号" align="center" />
+        <el-table-column label="采购单编号" align="center" prop="docCode" width="150" />
         <el-table-column label="批次号" align="center" prop="mrpBaseId">
           <template #default="scope">
             {{ batchOptions.find((item) => item.id == scope.row.mrpBaseId)?.planCode }}
@@ -220,11 +220,16 @@
       </template>
     </el-dialog>
     <!-- 查看文件列表 -->
-    <el-dialog title="文件列表" v-model="viewVisible" width="45%">
+    <el-dialog title="物流单号" v-model="viewVisible" width="45%">
       <el-table v-if="fileList.length > 0" :data="fileList" style="width: 100%" border>
         <el-table-column label="单号" align="center" prop="ltn" />
         <el-table-column label="数量" align="center" prop="num" />
         <el-table-column label="物资名称" align="center" prop="name" />
+        <el-table-column label="规格型号" align="center" prop="specification">
+          <template #default="scope">
+            <el-button link type="primary" icon="Finished" @click="getDetailList(scope.row.ltn)"> 查看物流信息</el-button></template
+          >
+        </el-table-column>
       </el-table>
       <div v-else class="empty-list text-center">暂无文件</div>
       <template #footer>
@@ -233,17 +238,19 @@
         </span>
       </template>
     </el-dialog>
+    <logisticsDetail ref="logisticsDetailRef"></logisticsDetail>
   </div>
 </template>
 
 <script setup name="PurchaseDoc" lang="ts">
 import { getBatch, listBatch } from '@/api/materials/batchPlan';
-import { listPurchaseDoc, getPurchaseDoc, listLink, addPurchaseDoc, updatePurchaseDoc } from '@/api/materials/purchaseDoc';
+import { listPurchaseDoc, getPurchaseDoc, listLink, addPurchaseDoc, updatePurchaseDoc, logisticsDetial } from '@/api/materials/purchaseDoc';
 import { PurchaseDocVO, PurchaseDocQuery, PurchaseDocForm } from '@/api/materials/purchaseDoc/types';
 import { listContractor } from '@/api/project/contractor';
 import { useUserStoreHook } from '@/store/modules/user';
 import { getToken } from '@/utils/auth';
-
+import logisticsDetail from './comm/logisticsDetail.vue';
+import type { DrawerProps } from 'element-plus';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const route = useRoute();
 const router = useRouter();
@@ -262,10 +269,11 @@ const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
 const feedbackUrl = ref('');
+// 组件
+const logisticsDetailRef = ref<InstanceType<typeof logisticsDetail>>();
 const queryFormRef = ref<ElFormInstance>();
 const purchaseDocFormRef = ref<ElFormInstance>();
 const IP = 'http://192.168.110.151:7788';
-
 const dialog = reactive<DialogOption>({
   visible: false,
   title: ''
@@ -480,8 +488,8 @@ const handleShare = async (row?: PurchaseDocVO) => {
   });
   // 获取当前域名地址
   console.log(location);
-  textarea.value = IP + '/materials/purchaseDoc/uploadCode?data=' + data;
-  // textarea.value = location.host + '/materials/purchaseDoc/uploadCode?data=' + data;
+  // textarea.value = IP + '/materials/purchaseDoc/uploadCode?data=' + data;
+  textarea.value = location.host + '/materials/purchaseDoc/uploadCode?data=' + data;
   textarea.style.position = 'fixed';
   textarea.style.opacity = '0';
   document.body.appendChild(textarea);
@@ -530,6 +538,12 @@ const handleViewDetail = async (row?: PurchaseDocVO) => {
     type: 'view'
   });
 };
+const getDetailList = async (id) => {
+  let res = await logisticsDetial(id);
+  if (res.code == 200) {
+    logisticsDetailRef.value.open(res.data);
+  }
+};
 
 onMounted(() => {
   getList();
diff --git a/src/views/out/constructionValue/indexEdit.vue b/src/views/out/constructionValue/indexEdit.vue
index 3a689c0..6baeeac 100644
--- a/src/views/out/constructionValue/indexEdit.vue
+++ b/src/views/out/constructionValue/indexEdit.vue
@@ -22,7 +22,7 @@
           <el-form
             ref="leaveFormRef"
             v-loading="loading"
-            :disabled="routeParams.type === 'view'"
+            :disabled="routeParams.type === 'view' || form.auditStatus == 'waiting'"
             :model="form"
             :rules="rules"
             label-width="120px"
diff --git a/src/views/out/designCompletion/indexEdit.vue b/src/views/out/designCompletion/indexEdit.vue
index 5a14d76..5fbc3bb 100644
--- a/src/views/out/designCompletion/indexEdit.vue
+++ b/src/views/out/designCompletion/indexEdit.vue
@@ -22,7 +22,7 @@
           <el-form
             ref="leaveFormRef"
             v-loading="loading"
-            :disabled="routeParams.type === 'view'"
+            :disabled="routeParams.type === 'view' || form.completeAuditStatus == 'waiting'"
             :model="form"
             :rules="rules"
             label-width="120px"
diff --git a/src/views/out/monthPlan/indexEdit.vue b/src/views/out/monthPlan/indexEdit.vue
index 07e84e9..dc05a7d 100644
--- a/src/views/out/monthPlan/indexEdit.vue
+++ b/src/views/out/monthPlan/indexEdit.vue
@@ -22,7 +22,7 @@
           <el-form
             ref="leaveFormRef"
             v-loading="loading"
-            :disabled="routeParams.type === 'view'"
+            :disabled="routeParams.type === 'view' || form.status == 'waiting'"
             :model="form"
             :rules="rules"
             label-width="120px"
diff --git a/src/views/workflows/leave/leaveEdit.vue b/src/views/workflows/leave/leaveEdit.vue
index ec23163..c570a92 100644
--- a/src/views/workflows/leave/leaveEdit.vue
+++ b/src/views/workflows/leave/leaveEdit.vue
@@ -12,7 +12,14 @@
       />
     </el-card>
     <el-card shadow="never" style="height: 78vh; overflow-y: auto">
-      <el-form ref="leaveFormRef" v-loading="loading" :disabled="routeParams.type === 'view'" :model="form" :rules="rules" label-width="80px">
+      <el-form
+        ref="leaveFormRef"
+        v-loading="loading"
+        :disabled="routeParams.type === 'view' || form.status == 'waiting'"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+      >
         <el-form-item label="请假类型" prop="leaveType">
           <el-select v-model="form.leaveType" placeholder="请选择请假类型" style="width: 100%">
             <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
@@ -284,7 +291,7 @@ const approvalVerifyOpen = async () => {
 
 onMounted(() => {
   console.log(proxy.$route.query);
-  
+
   nextTick(async () => {
     routeParams.value = proxy.$route.query;
     reset();

From 1b4b1c0128ccbc86349860e8710780b979a0403f Mon Sep 17 00:00:00 2001
From: taoge1020 <sendtao@163.com>
Date: Fri, 15 Aug 2025 16:54:37 +0800
Subject: [PATCH 4/8] =?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/store/modules/app.ts                                 | 2 +-
 src/views/materials/purchaseDoc/comm/logisticsDetail.vue | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts
index 5ccaf75..0205fab 100644
--- a/src/store/modules/app.ts
+++ b/src/store/modules/app.ts
@@ -6,7 +6,7 @@ export const useAppStore = defineStore('app', () => {
   const sidebar = reactive({
     opened: sidebarStatus.value ? !!+sidebarStatus.value : true,
     withoutAnimation: false,
-    hide: true
+    hide: false
   });
   const device = ref<string>('desktop');
   const size = useStorage<'large' | 'default' | 'small'>('size', 'default');
diff --git a/src/views/materials/purchaseDoc/comm/logisticsDetail.vue b/src/views/materials/purchaseDoc/comm/logisticsDetail.vue
index 95bc96a..a2b80ce 100644
--- a/src/views/materials/purchaseDoc/comm/logisticsDetail.vue
+++ b/src/views/materials/purchaseDoc/comm/logisticsDetail.vue
@@ -3,7 +3,6 @@
     <template #header>
       <span class="font-bold text-lg text-gray-800">物流信息</span>
     </template>
-
     <template #default>
       <!-- 物流头部信息 -->
       <div class="bg-white rounded-lg shadow-md p-5 mb-6">

From 000689d29de59eac72bb73e3e7da63123f4ec388 Mon Sep 17 00:00:00 2001
From: taoge1020 <sendtao@163.com>
Date: Fri, 15 Aug 2025 17:17:07 +0800
Subject: [PATCH 5/8] =?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/components/FileUpload/index.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 63cbae5..c8a53c9 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -314,6 +314,11 @@ const uploadedSuccessfully = (res: any) => {
     emit('update:modelValue', listToString(fileList.value));
     proxy?.$modal.closeLoading();
   }
+  if (props.autoUpload) {
+    fileUploadRef.value?.clearFiles();
+    fileList.value = [];
+    emit('update:modelValue', ''); // 同步到外部 v-model
+  }
   props.onUploadSuccess?.(fileList.value, res);
 };
 
@@ -356,7 +361,7 @@ const customUpload = async (options: any) => {
         data: formData,
         headers: { 'Content-Type': 'multipart/form-data', ...headers.value }
       });
-      handleUploadSuccess(res, options.file);
+      handleUploadSuccess(res.data, options.file);
     } catch (err) {
       handleUploadError();
     }

From a43f56def7f2e7798ed1640f48f7d5cf5ab0e812 Mon Sep 17 00:00:00 2001
From: fengsen <2548667232@qq.com>
Date: Fri, 15 Aug 2025 17:24:33 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.development b/.env.development
index fe20df3..21892b7 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VITE_APP_TITLE = 新能源项目管理平台
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.159:8898'
+VITE_APP_BASE_API = 'http://192.168.110.180:8898'
 
 # 无人机接口地址
 

From 094a7ba0f00d1518674dbb3a6b769e9340d47b5b Mon Sep 17 00:00:00 2001
From: fengsen <2548667232@qq.com>
Date: Fri, 15 Aug 2025 18:26:36 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E9=87=8F=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E7=9A=84=E5=B1=95=E5=BC=80=E5=92=8C=E6=8A=98=E5=8F=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                            |  2 +-
 src/views/design/billofQuantities/index.vue | 24 ++++++++++-----------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.env.development b/.env.development
index 1c549fa..fe20df3 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VITE_APP_TITLE = 新能源项目管理平台
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.180:8899'
+VITE_APP_BASE_API = 'http://192.168.110.159:8898'
 
 # 无人机接口地址
 
diff --git a/src/views/design/billofQuantities/index.vue b/src/views/design/billofQuantities/index.vue
index 2cc7bc1..a791844 100644
--- a/src/views/design/billofQuantities/index.vue
+++ b/src/views/design/billofQuantities/index.vue
@@ -70,8 +70,9 @@
           :row-class-name="state.tableData.length === 0 ? 'table-null' : ''"
           style="width: 100%; margin-bottom: 20px; height: calc(100vh - 305px)"
           row-key="id"
+          lazy
           border
-          :default-expand-all="state.isOpen"
+          :default-expand-all="true"
         >
           <el-table-column prop="num" label="编号" />
           <el-table-column prop="name" label="工程或费用名称" />
@@ -132,10 +133,6 @@ const state = reactive({
   error: null,
   // 前三个
   tableData: [],
-  // 物质设备清单
-  // tableData_sdsqd: [],
-  // 展开收起
-  isOpen: true,
   // 版本号
   versionsData: {}
 });
@@ -155,7 +152,6 @@ const handleTabChange = (tab) => {
 };
 onMounted(async () => {
   await getVersionNums();
-  openTable(true, state.work_order_type);
 });
 // 获取版本号
 async function getVersionNums(isSheet = true) {
@@ -268,18 +264,19 @@ function importExcel(options) {
       if (code == 200) {
         proxy.$modal.msgSuccess(res.msg || '导入成功');
         // 更新列表
-        getVersionNums(false);
+        if (state.work_order_type == 3) {
+          getVersionNums(false); 
+        }else{
+          getVersionNums(); 
+        }
       } else {
-        getVersionNums();
         proxy.$modal.msgError(res.msg || '导入失败');
       }
-    })
-    .finally(() => {
+    }).catch(()=>{
+      proxy.$modal.msgError(res.msg || '导入失败');
+    }).finally(() => {
       state.loading.list = false;
     })
-    .finally(() => {
-      // loading.close();
-    });
 }
 // 切换表名
 function handleChange(sheet) {
@@ -299,6 +296,7 @@ function openTable(flag, index) {
   nextTick(() => {
     // 通过索引获取当前标签页的表格实例
     const currentTable = tableRef.value[index];
+    console.log(currentTable, index);
     if (currentTable) {
       handleArr(state.tableData, flag, currentTable);
     }

From 6bfb3364dbfefc7d3804520449a43252250e7329 Mon Sep 17 00:00:00 2001
From: taoge1020 <sendtao@163.com>
Date: Fri, 15 Aug 2025 18:27:31 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/design/designChange/index.vue | 17 ++++++++++++++---
 src/views/design/prelimScheme/index.vue | 10 +++++-----
 src/views/design/subcontract/index.vue  | 12 ++++--------
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/views/design/designChange/index.vue b/src/views/design/designChange/index.vue
index 882c052..e630761 100644
--- a/src/views/design/designChange/index.vue
+++ b/src/views/design/designChange/index.vue
@@ -27,7 +27,7 @@
               <el-date-picker clearable v-model="queryParams.submitDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择提出日期" />
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button type="primary" icon="Search" @click="handleQuery" v-hasPermi="['design:designChange:list']">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-form>
@@ -89,12 +89,23 @@
               v-if="scope.row.status == 'draft' || scope.row.status == 'back'"
               >上传</el-button
             >
-            <el-button type="success" link icon="View" v-if="scope.row.status != 'draft'" @click="handleViewInfo(scope.row)">查看</el-button>
-            <el-button type="success" link icon="View" @click="handleViewDetail(scope.row)">通知单</el-button>
+            <el-button
+              type="success"
+              link
+              icon="View"
+              v-if="scope.row.status != 'draft'"
+              v-hasPermi="['design:designChange:query']"
+              @click="handleViewInfo(scope.row)"
+              >查看</el-button
+            >
+            <el-button type="success" link icon="View" v-hasPermi="['design:designChange:query']" @click="handleViewDetail(scope.row)"
+              >通知单</el-button
+            >
             <el-button
               type="warning"
               link
               icon="View"
+              v-hasPermi="['design:designChange:query']"
               v-if="scope.row.status == 'draft' || scope.row.status == 'termination'"
               @click="handleViewHistory(scope.row)"
               >查看单据</el-button
diff --git a/src/views/design/prelimScheme/index.vue b/src/views/design/prelimScheme/index.vue
index 62c2065..56ce952 100644
--- a/src/views/design/prelimScheme/index.vue
+++ b/src/views/design/prelimScheme/index.vue
@@ -8,7 +8,7 @@
               <el-input v-model="queryParams.fileName" placeholder="请输入文件名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button type="primary" icon="Search" @click="handleQuery" v-hasPermi="['design:prelimScheme:list']">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-form>
@@ -20,7 +20,7 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['design:scheme:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['design:prelimScheme:add']">新增</el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -48,7 +48,7 @@
               v-if="scope.row.status !== 'draft'"
               icon="Edit"
               @click="handleView(scope.row)"
-              v-hasPermi="['design:PrelimScheme:edit']"
+              v-hasPermi="['design:PrelimScheme:query']"
               >查看流程</el-button
             >
             <el-button
@@ -60,7 +60,7 @@
               v-hasPermi="['design:PrelimScheme:edit']"
               >修改</el-button
             >
-            <el-button
+            <!-- <el-button
               link
               type="primary"
               v-if="scope.row.status === 'draft'"
@@ -68,7 +68,7 @@
               @click="handleDelete(scope.row)"
               v-hasPermi="['design:PrelimScheme:remove']"
               >删除</el-button
-            >
+            > -->
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/design/subcontract/index.vue b/src/views/design/subcontract/index.vue
index c93480c..387b12b 100644
--- a/src/views/design/subcontract/index.vue
+++ b/src/views/design/subcontract/index.vue
@@ -22,7 +22,7 @@
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['design:subcontract:add']">新增</el-button>
           </el-col>
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['design:subcontract:edit']"
               >修改</el-button
             >
@@ -34,7 +34,7 @@
           </el-col>
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['design:subcontract:export']">导出</el-button>
-          </el-col>
+          </el-col> -->
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
@@ -45,12 +45,8 @@
         <el-table-column label="分包内容" align="center" prop="subContent" />
         <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="['design:subcontract:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['design:subcontract:remove']"></el-button>
-            </el-tooltip>
+            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['design:subcontract:edit']">修改</el-button>
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['design:subcontract:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>