diff --git a/.env.development b/.env.development
index faff5a9..eb8185a 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ VITE_APP_ENV = 'development'
 
 # 开发环境
 # 李陈杰 209
-VITE_APP_BASE_API = 'http://192.168.110.210:8899'
+VITE_APP_BASE_API = 'http://192.168.110.188:8899'
 # 曾涛
 # VITE_APP_BASE_API = 'http://192.168.110.180:8899'
 # 罗成
diff --git a/src/api/design/volumeCatalog/index.ts b/src/api/design/volumeCatalog/index.ts
index c7c3a01..be533ae 100644
--- a/src/api/design/volumeCatalog/index.ts
+++ b/src/api/design/volumeCatalog/index.ts
@@ -116,6 +116,17 @@ export const getileDetail = (id) => {
     method: 'get'
   });
 };
+/**
+ * 获取专业列表
+ * @param query
+ */
+export const majorList = (params) => {
+  return request({
+    url: '/design/volumeCatalog/majorList',
+    method: 'get',
+    params: params
+  });
+};
 /**
  * 获取二维码信息
  * @param query
diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue
index f678b11..3fefa25 100644
--- a/src/components/Process/submitVerify.vue
+++ b/src/components/Process/submitVerify.vue
@@ -546,7 +546,7 @@ const handleTerminationTask = async () => {
   if (isDrawing.value) {
     isShowTermination.value = true;
     nextTick(() => {
-      detailFormTeRef.value.getInfo(props.businessId);
+      detailFormTeRef.value.getInfo(props.businessId1);
     });
     return;
   }
diff --git a/src/views/biddingManagemen/appointment/index.vue b/src/views/biddingManagemen/appointment/index.vue
index 835b495..a76ea00 100644
--- a/src/views/biddingManagemen/appointment/index.vue
+++ b/src/views/biddingManagemen/appointment/index.vue
@@ -21,7 +21,7 @@
         <div class="fonts w60% ma">
           <el-form-item label="招投标专员" prop="userId" class="mb-4">
             <el-select
-              v-model="form.userId"
+              v-model="form.userId" filterable
               placeholder="请选择招投标专员"
               class="w-full transition-all duration-300 border-gray-300 focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
             >
diff --git a/src/views/cory/template/indexEdit.vue b/src/views/cory/template/indexEdit.vue
index 91e3fe6..8c689fe 100644
--- a/src/views/cory/template/indexEdit.vue
+++ b/src/views/cory/template/indexEdit.vue
@@ -36,7 +36,7 @@
                   <el-row :gutter="20">
                     <el-col :span="12">
                       <el-form-item label="工程名称">
-                        <el-input v-model="form.projectName" />
+                        <el-input disabled v-model="form.projectName" />
                       </el-form-item>
                     </el-col>
                     <el-col :span="12">
@@ -45,12 +45,42 @@
                       </el-form-item>
                     </el-col>
                   </el-row>
+                  <!-- 卷册名称 & 附图 -->
+                  <el-row :gutter="20">
+                    <el-col :span="12">
+                      <el-form-item label="卷册号">
+                        <!-- <el-input v-model="form.volumeName" /> -->
+                        <el-select
+                          id="projectSelect"
+                          v-model="form.volumeNumber"
+                          placeholder="请选择原卷册号"
+                          clearable
+                          filterable
+                          @change="handleSelect"
+                          style="width: 150px; margin-right: 20px"
+                        >
+                          <el-option
+                            v-for="project in volumeCatalogList"
+                            :key="project.volumeNumber"
+                            :label="project.volumeNumber"
+                            :value="project.volumeNumber"
+                          />
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <!-- 卷册号 -->
+                      <el-form-item label="卷册名称">
+                        <el-input disabled v-model="form.volumeName" />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
 
                   <!-- 专业 & 提出日期 -->
                   <el-row :gutter="20">
                     <el-col :span="12">
                       <el-form-item label="专业">
-                        <el-select v-model="form.specialty" placeholder="">
+                        <el-select disabled v-model="form.specialty" placeholder="请选择专业">
                           <el-option v-for="item in des_user_major" :key="item.value" :label="item.label" :value="item.value" />
                         </el-select>
                       </el-form-item>
@@ -62,27 +92,11 @@
                     </el-col>
                   </el-row>
 
-                  <!-- 卷册名称 & 附图 -->
-                  <el-row :gutter="20">
-                    <el-col :span="12">
-                      <el-form-item label="卷册名称">
-                        <el-input v-model="form.volumeName" />
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item label="附图">
-                        <file-Upload v-model="form.attachmentsImg" :file-type="['pdf', 'png', 'jpg', 'jpeg', 'gif', 'bmp']">
-                          <el-button type="primary">上传附件</el-button>
-                        </file-Upload>
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-
-                  <!-- 卷册号 -->
-                  <el-form-item label="卷册号">
-                    <el-input v-model="form.volumeNumber" />
+                  <el-form-item label="附图">
+                    <file-Upload v-model="form.attachmentsImg" :file-type="['pdf', 'png', 'jpg', 'jpeg', 'gif', 'bmp']">
+                      <el-button type="primary">上传附件</el-button>
+                    </file-Upload>
                   </el-form-item>
-
                   <!-- 变更原因 -->
                   <el-form-item label="变更原因">
                     <el-checkbox-group v-model="form.changeReasons">
@@ -177,6 +191,7 @@ import { useUserStoreHook } from '@/store/modules/user';
 import { listByIds } from '@/api/system/oss';
 import { addContactnotice, getContactnotice, updateContactnotice } from '@/api/cory/contactnotice';
 const { des_user_major } = toRefs(proxy?.useDict('des_user_major'));
+import { catalogList } from '@/api/design/designChange';
 
 // 获取用户 store
 const userStore = useUserStoreHook();
@@ -221,7 +236,7 @@ const initFormData = {
   id: undefined,
   projectId: currentProject.value?.id,
   projectType: '',
-  projectName: '',
+  projectName: currentProject.value?.name,
   serialNumber: '',
   to: '',
   subject: '',
@@ -275,13 +290,27 @@ const handleClose = () => {
   buttonLoading.value = false;
 };
 const { form, rules } = toRefs(data);
-
+const volumeCatalogList = ref([]);
+let volumeMap = new Map();
 /** 表单重置 */
 const reset = () => {
   form.value = { ...initFormData };
   leaveFormRef.value?.resetFields();
 };
-
+// 获取卷册号列表
+const getJuance = async () => {
+  const res = await catalogList(currentProject.value?.id);
+  volumeCatalogList.value = res.data;
+  volumeCatalogList.value.forEach((e) => {
+    volumeMap.set(e.volumeNumber, e);
+  });
+};
+const handleSelect = (val) => {
+  let obj = volumeMap.get(val);
+  console.log(obj);
+  form.value.volumeName = obj.documentName;
+  form.value.specialty = obj.specialty;
+};
 /** 获取详情 */
 const getInfo = () => {
   loading.value = true;
@@ -402,6 +431,7 @@ onMounted(() => {
     routeParams.value = proxy.$route.query;
     thumbnailUrl.value = proxy.$route.query.thumbnailUrl;
     reset();
+    getJuance();
     loading.value = false;
     if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
       getInfo();
diff --git a/src/views/design/appointment/index.vue b/src/views/design/appointment/index.vue
index 54d4f92..58cc90f 100644
--- a/src/views/design/appointment/index.vue
+++ b/src/views/design/appointment/index.vue
@@ -76,7 +76,7 @@
                     label-width="60px"
                     label="专业"
                   >
-                    <el-select
+                    <el-select filterable
                       v-model="form.designers[configIndex].userMajor"
                       placeholder="请选择专业"
                       class="w-full transition-all duration-300 border-gray-300"
@@ -109,7 +109,7 @@
                           label="设计"
                           label-width="50px"
                         >
-                          <el-select
+                          <el-select filterable
                             v-model="person.userId"
                             placeholder="选择人员"
                             class="w-full transition-all duration-300 border-gray-300"
@@ -165,7 +165,7 @@
                           label="校审"
                           label-width="50px"
                         >
-                          <el-select
+                          <el-select filterable
                             v-model="person.userId"
                             placeholder="选择人员"
                             class="w-full transition-all duration-300 border-gray-300"
@@ -221,7 +221,7 @@
                           label="审定"
                           label-width="50px"
                         >
-                          <el-select
+                          <el-select filterable
                             v-model="person.userId"
                             placeholder="选择人员"
                             class="w-full transition-all duration-300 border-gray-300"
@@ -277,7 +277,7 @@
                           label="审核"
                           label-width="50px"
                         >
-                          <el-select
+                          <el-select filterable
                             v-model="person.userId"
                             placeholder="选择人员"
                             class="w-full transition-all duration-300 border-gray-300"
diff --git a/src/views/design/designChange/indexEdit.vue b/src/views/design/designChange/indexEdit.vue
index 428be39..90718bc 100644
--- a/src/views/design/designChange/indexEdit.vue
+++ b/src/views/design/designChange/indexEdit.vue
@@ -381,8 +381,11 @@ const submitForm = (status1: string) => {
       if (valid) {
         buttonLoading.value = true;
         var res;
+        delete form.value.id;
         res = await addDesignChange({ ...form.value, changeReason, saveFile }).finally(() => (buttonLoading.value = false));
         if (res.code == 200) {
+          routeParams.value.type = 'update';
+          form.value = res.data;
           if (form.value.costEstimation == '0') {
             ElMessage.success('通知成功');
             goBack();
diff --git a/src/views/design/volumeCatalog/index.vue b/src/views/design/volumeCatalog/index.vue
index fa340e5..f7d77df 100644
--- a/src/views/design/volumeCatalog/index.vue
+++ b/src/views/design/volumeCatalog/index.vue
@@ -99,17 +99,22 @@
     </el-card>
     <!-- 添加或修改卷册目录对话框 -->
     <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="volumeCatalogFormRef" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="volumeCatalogFormRef" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="子项" prop="designSubitem">
           <el-input v-model="form.designSubitem" placeholder="请输入设计子项" />
         </el-form-item>
         <el-form-item label="专业" prop="specialty">
-          <el-select v-model="form.specialty" placeholder="请选择专业">
-            <el-option :value="item.value" v-for="item in des_user_major" :key="item.value" :label="item.label" />
+          <el-select v-model="form.specialty" placeholder="请选择专业" @change="changeSpecialty">
+            <el-option :value="item.userMajor" v-for="item in des_user_major" :key="item.userMajor" :label="item.userMajorName" />
           </el-select>
         </el-form-item>
         <el-form-item label="设计人员" prop="principal">
-          <el-select v-model="form.principal" placeholder="请选择设计人员" class="transition-all duration-300 border-gray-300">
+          <el-select
+            :disabled="!form.specialty"
+            v-model="form.principal"
+            placeholder="请选择设计人员"
+            class="transition-all duration-300 border-gray-300"
+          >
             <el-option v-for="item in userAppList" :key="item.userId" :label="item.userName" :value="item.userId.toString()" />
           </el-select>
         </el-form-item>
@@ -146,13 +151,7 @@
           /></el-select>
         </el-form-item>
         <el-form-item v-if="uploadForm.type == '3'" label="蓝图" prop="fileIds">
-          <file-upload
-            :fileType="['pdf']"
-            :isShowTip="false"
-            :fileSize="100"
-            v-hasPermi="['system:oss:upload']"
-            v-model="uploadForm.fileIds"
-          ></file-upload>
+          <file-upload :fileType="['pdf']" :isShowTip="false" :fileSize="100" v-model="uploadForm.fileIds"></file-upload>
         </el-form-item>
         <el-form-item v-if="uploadForm.type == '1'" label="过程图纸" prop="cancellationIds">
           <file-upload :fileType="['pdf']" :isShowTip="false" :fileSize="100" v-model="uploadForm.cancellationIds"></file-upload>
@@ -254,6 +253,7 @@ import {
   addVolumeCatalog,
   updateVolumeCatalog,
   uploadVolumeFile,
+  majorList,
   getVolumeCatafileList,
   volumeFileList
 } from '@/api/design/volumeCatalog';
@@ -264,9 +264,10 @@ import TableContent from './comm/tableContent.vue';
 const fileList = ref([]);
 import { designUserList } from '@/api/design/appointment';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { design_state, wf_business_status, des_user_major } = toRefs(proxy?.useDict('design_state', 'wf_business_status', 'des_user_major'));
+const { design_state, wf_business_status } = toRefs(proxy?.useDict('design_state', 'wf_business_status'));
 import { drawingreviewReceiptsDetail, drawingreviewReceiptsList } from '@/api/design/drawingreview';
 const volumeCatalogList = ref<VolumeCatalogVO[]>([]);
+const des_user_major = ref([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
@@ -356,13 +357,28 @@ const data = reactive({
   rules: {
     design: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
     projectId: [{ required: true, message: '项目ID不能为空', trigger: 'blur' }],
+    designSubitem: [{ required: true, message: '子项不能为空', trigger: 'blur' }],
     volumeNumber: [{ required: true, message: '卷册号不能为空', trigger: 'blur' }],
-    documentName: [{ required: true, message: '资料名称不能为空', trigger: 'blur' }]
+    documentName: [{ required: true, message: '资料名称不能为空', trigger: 'blur' }],
+    plannedCompletion: [{ required: true, message: '计划出图事件不能为空', trigger: 'blur' }],
+    principal: [{ required: true, message: '设计人员不能为空', trigger: 'blur' }],
+    specialty: [{ required: true, message: '专业不能为空', trigger: 'blur' }]
   }
 });
 
 const { queryParams, form, rules } = toRefs(data);
-
+const changeSpecialty = (val) => {
+  form.value.principal = ''; //清空
+  getUserAppList(val);
+};
+// 获取专业列表
+const getSpecialtyList = async () => {
+  const res = await majorList({ projectId: currentProject.value?.id, userType: 2 });
+  console.log(res);
+  if (res.code === 200) {
+    des_user_major.value = res.data;
+  }
+};
 /** 查询卷册目录列表 */
 const getList = async () => {
   loading.value = true;
@@ -374,17 +390,10 @@ const getList = async () => {
     loading.value = false;
   }
 };
-const getUserAppList = async () => {
-  const res = await designUserList({ projectId: currentProject.value?.id });
+const getUserAppList = async (userMajor) => {
+  const res = await designUserList({ projectId: currentProject.value?.id, userType: 2, userMajor });
   if (res.code === 200) {
-    console.log(res.rows);
-
-    res.rows.forEach((item: any) => {
-      if (item.userType == 2) {
-        //设计人员
-        userAppList.value.push(item);
-      }
-    });
+    userAppList.value = res.rows;
   }
 };
 const handleViewHistory = async (row) => {
@@ -647,7 +656,7 @@ const handleAuditInfo = (row) => {
   // 审核图纸
 };
 onMounted(() => {
-  getUserAppList();
+  getSpecialtyList();
   getList();
 });
 
@@ -657,7 +666,7 @@ const listeningProject = watch(
   (nid, oid) => {
     queryParams.value.projectId = nid;
     form.value.projectId = nid;
-    getUserAppList();
+    getSpecialtyList();
     getList();
   }
 );
diff --git a/src/views/materials/batchPlan/index.vue b/src/views/materials/batchPlan/index.vue
index f0efdf6..f73db21 100644
--- a/src/views/materials/batchPlan/index.vue
+++ b/src/views/materials/batchPlan/index.vue
@@ -125,7 +125,7 @@
               </el-select>
             </template>
           </el-table-column>
-          <!-- 物资名称列 -->
+          <!-- 物资名称列（核心修改：动态过滤已选选项） -->
           <el-table-column prop="name" align="center" label="物资名称" width="160">
             <template #default="scope">
               <el-input v-model="scope.row.name" v-if="scope.row.mrpBaseId" placeholder="请输入物资名称" disabled />
@@ -136,7 +136,13 @@
                 placeholder="请选择"
                 @change="(val) => selectName(val, scope.row, scope.$index)"
               >
-                <el-option v-for="item in nameList" :key="item.id" :label="item.name" :value="item.id" />
+                <!-- 动态过滤：排除当前行外已选中的物资ID -->
+                <el-option 
+                  v-for="item in getAvailableNameList(scope.$index)" 
+                  :key="item.id" 
+                  :label="item.name" 
+                  :value="item.id" 
+                />
               </el-select>
             </template>
           </el-table-column>
@@ -144,24 +150,21 @@
           <el-table-column align="center" label="剩余量" width="80">
             <template #default="scope">
               <span>{{ scope.row.Remaining }}</span>
-              <!-- <el-input disabled v-model="scope.row.Remaining" placeholder="剩余量" /> -->
             </template>
           </el-table-column>
           <!-- 规格型号列 -->
           <el-table-column prop="specification" align="center" label="规格型号" width="100">
             <template #default="scope">
               <span>{{ scope.row.specification }}</span>
-              <!-- <el-input v-model="scope.row.specification" placeholder="请输入规格型号" disabled /> -->
             </template>
           </el-table-column>
           <!-- 单位列 -->
           <el-table-column prop="unit" align="center" label="单位" width="80">
             <template #default="scope">
               <span>{{ scope.row.unit }}</span>
-              <!-- <el-input v-model="scope.row.unit" placeholder="请输入单位" disabled /> -->
             </template>
           </el-table-column>
-          <!-- 数量列（新增错误提示展示） -->
+          <!-- 数量列 -->
           <el-table-column prop="demandQuantity" align="center" label="数量" width="140">
             <template #default="scope">
               <el-input
@@ -173,7 +176,7 @@
                 type="number"
                 min="0"
               />
-              <!-- 数量错误提示（红色小字体） -->
+              <!-- 数量错误提示 -->
               <div v-if="scope.row.quantityError" class="text-red-500 text-xs mt-1">{{ scope.row.quantityError }}</div>
             </template>
           </el-table-column>
@@ -231,7 +234,7 @@ import {
 } from '@/api/materials/batchPlan';
 import { CailiaoshebeiVO, CailiaoshebeiQuery, CailiaoshebeiForm } from '@/api/materials/batchPlan/types';
 import { useUserStoreHook } from '@/store/modules/user';
-import { getCurrentInstance, ComponentInternalInstance, watch, onMounted, onUnmounted } from 'vue';
+import { getCurrentInstance, ComponentInternalInstance, watch, onMounted, onUnmounted, computed } from 'vue';
 import type { ElFormInstance } from 'element-plus';
 
 // 类型定义补充
@@ -294,7 +297,7 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 
-// 初始化表单数据（补充版本号、重复错误提示字段）
+// 初始化表单数据
 const initFormData: FormData = {
   mrpBaseBo: {
     id: undefined,
@@ -315,10 +318,10 @@ const initFormData: FormData = {
       qs: undefined,
       arrivalTime: undefined,
       remark: undefined,
-      Remaining: 0, // 初始化剩余量
-      quantityError: '', // 初始化数量错误提示
-      batchNumber: undefined, // 初始化版本号
-      duplicateError: '', // 初始化重复错误提示
+      Remaining: 0,
+      quantityError: '',
+      batchNumber: undefined,
+      duplicateError: '',
       mrpBaseId: undefined
     }
   ]
@@ -382,7 +385,7 @@ const validateDemandQuantity = (row: PlanListItem, index: number) => {
   // 1. 清除之前的错误信息
   row.quantityError = '';
 
-  // 2. 处理空值（若需必填可补充：row.quantityError = '数量不能为空'）
+  // 2. 处理空值
   if (row.demandQuantity === null || row.demandQuantity === undefined || row.demandQuantity === '') {
     return;
   }
@@ -418,42 +421,20 @@ const getMrpBaseRemaining = async (suppliespriceId: number, row: PlanListItem) =
   }
 };
 
-/** 校验重复数据：版本号+物资名称不能重复 */
-const checkDuplicate = () => {
-  const planList = form.value.planList;
-  let hasDuplicate = false;
+/** 获取可用物资列表（过滤已选选项） */
+const getAvailableNameList = (currentIndex: number) => {
+  // 收集除当前行外已选中的物资ID
+  const selectedIds = form.value.planList
+    .filter((_, index) => index !== currentIndex)
+    .map(item => item.suppliespriceId)
+    .filter(id => id !== undefined && id !== null);
 
-  // 1. 清除所有重复错误提示
-  planList.forEach((item) => {
-    item.duplicateError = '';
-  });
-
-  // 2. 遍历校验重复（只校验版本号和物资名称都存在的行）
-  for (let i = 0; i < planList.length; i++) {
-    const current = planList[i];
-    // 跳过版本号或物资名称为空的行
-    if (!current.batchNumber || !current.suppliespriceId) continue;
-
-    for (let j = i + 1; j < planList.length; j++) {
-      const compare = planList[j];
-      if (!compare.batchNumber || !compare.suppliespriceId) continue;
-
-      // 版本号和物资ID都相同则判定为重复
-      if (current.batchNumber === compare.batchNumber && current.suppliespriceId === compare.suppliespriceId) {
-        current.duplicateError = `与第${j + 1}行重复（同版本+同物资）`;
-        compare.duplicateError = `与第${i + 1}行重复（同版本+同物资）`;
-        hasDuplicate = true;
-      }
-    }
-  }
-
-  return hasDuplicate;
+  // 过滤掉已选中的物资
+  return nameList.value.filter(item => !selectedIds.includes(item.id));
 };
 
-/** 选择物资名称触发（新增索引参数，用于触发重复校验） */
+/** 选择物资名称触发 */
 const selectName = (val: number, row: PlanListItem, index: number) => {
-  console.log(row);
-
   // 1. 获取剩余量并更新基础信息
   getMrpBaseRemaining(val, row).then(() => {
     const selected = nameList.value.find((item: any) => item.id === val);
@@ -465,9 +446,6 @@ const selectName = (val: number, row: PlanListItem, index: number) => {
       row.remark = selected.remark || '';
       row.arrivalTime = selected.arrivalTime || '';
     }
-
-    // 2. 触发重复校验
-    checkDuplicate();
   });
 };
 
@@ -506,8 +484,6 @@ const delRow = (index: number) => {
     return proxy?.$modal.msgWarning('请至少保留一项物资数据');
   }
   form.value.planList.splice(index, 1);
-  // 删除后重新校验重复（避免删除重复行后错误提示残留）
-  checkDuplicate();
 };
 
 /** 新增表格行 */
@@ -569,15 +545,15 @@ const handleUpdata = () => {
   if (!queryParams.value.mainData.mrpBaseId) {
     return proxy?.$modal.msgError('请先选择批次');
   }
-  // 1. 获取对应版本的物资列表
+  // 获取对应版本的物资列表
   reset();
   loading.value = true;
   getCailiaoshebei(queryParams.value.mainData.mrpBaseId)
     .then((res: any) => {
-      // 1. 更新基础信息
+      // 更新基础信息
       form.value.mrpBaseBo = res.data.mrpBaseBo || initFormData.mrpBaseBo;
 
-      // 2. 更新表格数据（补充缺失字段）
+      // 更新表格数据（补充缺失字段）
       form.value.planList = (res.data.planList || []).map((item: any) => ({
         id: item.id,
         name: item.name,
@@ -589,13 +565,12 @@ const handleUpdata = () => {
         arrivalTime: item.arrivalTime,
         remark: item.remark,
         Remaining: Number(item.remaining) || 0,
-        // remaining:
         quantityError: '',
         batchNumber: item.batchNumber,
         duplicateError: '',
         mrpBaseId: item.mrpBaseId
       }));
-      // 3. 打开对话框
+      // 打开对话框
       dialog.visible = true;
       dialog.title = '修改物资-需求';
     })
@@ -609,38 +584,32 @@ const handleUpdata = () => {
 
 /** 提交数据（整合所有校验） */
 const submitTransferForm = async () => {
-  // 1. 先校验重复数据
-  const hasDuplicate = checkDuplicate();
-  if (hasDuplicate) {
-    return proxy?.$modal.msgError('存在重复的版本号+物资组合，请修正后提交');
-  }
-
-  // 2. 校验数量合法性（检查是否有数量错误）
+  // 1. 校验数量合法性（检查是否有数量错误）
   const hasQuantityError = form.value.planList.some((row) => row.quantityError);
   if (hasQuantityError) {
     return proxy?.$modal.msgError('存在非法数量，请修正后提交');
   }
 
-  // 3. 执行表单基础验证
+  // 2. 执行表单基础验证
   const result = validateAndClean(form.value.planList);
   if (!result.valid) {
     return proxy?.$modal.msgError(result.message);
   }
 
-  // 4. 表单组件验证
+  // 3. 表单组件验证
   cailiaoshebeiFormRef.value?.validate(async (valid: boolean) => {
     if (!valid) return;
 
     buttonLoading.value = true;
     try {
-      // 5. 提交数据
+      // 4. 提交数据
       await updateCailiaoshebei({
         ...form.value,
         planList: result.data // 使用清洗后的数据
       });
       proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
-      // 6. 刷新列表
+      // 5. 刷新列表
       await getList();
     } catch (error) {
       proxy?.$modal.msgError('操作失败，请重试');
@@ -765,7 +734,7 @@ const getVersion = () => {
     });
 };
 
-/** 选择版本号触发（新增索引参数，用于触发重复校验） */
+/** 选择版本号触发 */
 const selectNameVersion = (val: string, row: PlanListItem, index: number) => {
   row.batchNumber = val;
   row.suppliespriceId = undefined; // 切换版本号时清空物资选择
@@ -780,11 +749,8 @@ const selectNameVersion = (val: string, row: PlanListItem, index: number) => {
   row.duplicateError = '';
   row.mrpBaseId = '';
 
-  // 1. 获取对应版本的物资列表
+  // 获取对应版本的物资列表
   getNameList(val);
-
-  // 2. 触发重复校验（清空物资后可能消除重复）
-  checkDuplicate();
 };
 
 /** 页面挂载时初始化 */
diff --git a/src/views/materials/materialsEquipment/materialIssue/index.vue b/src/views/materials/materialsEquipment/materialIssue/index.vue
index 1a0e899..37efac6 100644
--- a/src/views/materials/materialsEquipment/materialIssue/index.vue
+++ b/src/views/materials/materialsEquipment/materialIssue/index.vue
@@ -7,9 +7,6 @@
             <el-form-item label="表单编号" prop="formCode">
               <el-input v-model="queryParams.formCode" placeholder="请输入表单编号" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="工程名称" prop="projectName">
-              <el-input v-model="queryParams.projectName" placeholder="请输入工程名称" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
             <el-form-item label="材料名称" prop="materialName">
               <el-input v-model="queryParams.materialName" placeholder="请输入设备材料名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
@@ -45,7 +42,6 @@
       <el-table v-loading="loading" :data="materialIssueList" @selection-change="handleSelectionChange">
         <el-table-column type="index" width="60" label="序号" align="center" />
         <el-table-column label="表单编号" align="center" prop="formCode" />
-        <el-table-column label="工程名称" align="center" prop="projectName" />
         <el-table-column label="设备材料名称" align="center" prop="materialName" />
         <el-table-column label="订货单位" align="center" prop="orderingUnit" />
         <el-table-column label="供货单位" align="center" prop="supplierUnit" />
@@ -82,7 +78,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="工程名称" prop="projectName">
-              <el-input v-model="form.projectName" placeholder="请输入工程名称" />
+              <el-input v-model="form.projectName" disabled placeholder="请输入工程名称" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -295,7 +291,7 @@ const getInitFormData = () => {
     projectId: currentProject.value?.id,
     materialSource: '1',
     formCode: undefined,
-    projectName: undefined,
+    projectName: currentProject.value?.name,
     materialName: '', // 初始化为空字符串
     orderingUnit: undefined,
     supplierUnit: undefined,
diff --git a/src/views/materials/materialsEquipment/materialReceive/index.vue b/src/views/materials/materialsEquipment/materialReceive/index.vue
index 78d9741..3f1d4c0 100644
--- a/src/views/materials/materialsEquipment/materialReceive/index.vue
+++ b/src/views/materials/materialsEquipment/materialReceive/index.vue
@@ -1,20 +1,23 @@
 <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">
             <el-form-item label="表单编号" prop="formCode">
               <el-input v-model="queryParams.formCode" placeholder="请输入表单编号" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="工程名称" prop="projectName">
-              <el-input v-model="queryParams.projectName" placeholder="请输入工程名称" clearable @keyup.enter="handleQuery" />
+             <el-form-item label="材料来源" prop="materialSource">
+              <el-select v-model="queryParams.materialSource" filterable placeholder="请选择材料来源">
+                <el-option label="全部" value="0"></el-option>
+                <el-option label="甲供材料" value="1"></el-option>
+                <el-option label="乙供材料" value="2"></el-option>
+              </el-select>
             </el-form-item>
             <el-form-item label="材料名称" prop="materialName">
-              <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" />
+              <el-input v-model="queryParams.materialName" placeholder="请输入设备材料名称" clearable
+                @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="订货单位" prop="orderingUnit">
               <el-input v-model="queryParams.orderingUnit" placeholder="请输入订货单位" clearable @keyup.enter="handleQuery" />
@@ -35,7 +38,8 @@
       <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>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -44,11 +48,24 @@
       <el-table v-loading="loading" :data="materialReceiveList" @selection-change="handleSelectionChange">
         <el-table-column type="index" width="60" label="序号" align="center" />
         <el-table-column label="表单编号" align="center" prop="formCode" />
-        <el-table-column label="工程名称" align="center" prop="projectName" />
+        <el-table-column label="材料来源" align="center" prop="projectName">
+          <template #default="scope">
+            <el-tag :type="scope.row.materialSource == '1' ? 'success' : 'warning'">{{ scope.row.materialSource == '1' ?
+              '甲供材料' : '乙供材料' }}</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="设备材料名称" align="center" prop="materialName" />
         <el-table-column label="合同名称" align="center" prop="contractName" />
-        <el-table-column label="订货单位" align="center" prop="orderingUnit" />
-        <el-table-column label="供货单位" align="center" prop="supplierUnit" />
+        <el-table-column label="订货单位" align="center" prop="orderingUnit">
+          <template #default="scope">
+            <span>{{ scope.row.orderingUnit || '-' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="供货单位" align="center" prop="supplierUnit">
+          <template #default="scope">
+            <span>{{ scope.row.supplierUnit || '-' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="设备材料入库/移交" align="center" prop="storageType">
           <template #default="scope">
             <dict-tag :options="storage_type" :value="scope.row.storageType" />
@@ -60,28 +77,20 @@
             <!-- <el-button link type="primary" icon="edit" @click="handleUpdate(scope.row)" v-hasPermi="['materials:materialReceive:edit']"
               >修改</el-button
             > -->
-            <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['materials:materialReceive:query']"
-              >查看</el-button
-            >
-            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['materials:materialReceive:remove']"
-              >删除</el-button
-            >
+            <el-button link type="primary" icon="View" @click="handleView(scope.row)"
+              v-hasPermi="['materials:materialReceive:query']">查看</el-button>
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['materials:materialReceive:remove']">删除</el-button>
           </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
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      draggable
-      :title="dialog.title"
-      v-model="dialog.visible"
-      width="800px"
-      append-to-body
-    >
+    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" draggable :title="dialog.title"
+      v-model="dialog.visible" width="800px" append-to-body>
       <el-form ref="materialReceiveFormRef" :model="form" :rules="rules" label-width="110px">
         <el-row>
           <el-col :span="12">
@@ -99,8 +108,10 @@
           </el-col>
           <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 @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>
@@ -119,15 +130,11 @@
               <el-input disabled v-model="form.projectName" placeholder="请输入工程名称" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="12" v-if="form.materialSource == '2'">
             <el-form-item label="合同编号" prop="contractName">
               <el-select v-model="form.contractName" filterable placeholder="请选择合同" style="width: 100%">
-                <el-option
-                  v-for="item in contractNameList"
-                  :key="item.contractCode"
-                  :label="item.contractCode"
-                  :value="item.contractCode"
-                ></el-option>
+                <el-option v-for="item in contractNameList" :key="item.contractCode" :label="item.contractCode"
+                  :value="item.contractCode"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -142,59 +149,48 @@
             <div class="detail">
               <div class="detail-header">
                 <span>数量验收</span>
-                <el-button type="primary" v-if="form.materialSource == '1'" 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="item.id" class="detail-item">
                 <el-row>
                   <el-col :span="12">
-                    <el-form-item label="名称" :prop="`itemList.${index}.name`" :rules="{ required: true, message: '名称不能为空', trigger: 'blur' }">
+                    <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="form.materialSource == '2'" 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-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="rules.quantityRule" ref="quantityFormItemRefs[index]">
-                      <el-input
-                        :disabled="form.materialSource == '2'"
-                        type="number"
-                        v-model.number="item.quantity"
-                        placeholder="请输入数量"
-                        min="0"
-                        @input="handleQuantityInput(index)"
-                        @blur="handleQuantityBlur(index)"
-                      />
+                    <el-form-item label="数量" :prop="`itemList.${index}.quantity`" :rules="rules.quantityRule"
+                      ref="quantityFormItemRefs[index]">
+                      <el-input :disabled="form.materialSource == '2'" type="number" v-model.number="item.quantity"
+                        placeholder="请输入数量" min="0" @input="handleQuantityInput(index)"
+                        @blur="handleQuantityBlur(index)" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="验收" :prop="`itemList.${index}.acceptedQuantity`" :rules="rules.acceptedQuantityRule">
-                      <el-input
-                        type="number"
-                        v-model.number="item.acceptedQuantity"
-                        placeholder="请输入验收"
-                        min="0"
-                        @input="handleAcceptedInput(index)"
-                      />
+                    <el-form-item label="验收" :prop="`itemList.${index}.acceptedQuantity`"
+                      :rules="rules.acceptedQuantityRule">
+                      <el-input type="number" v-model.number="item.acceptedQuantity" placeholder="请输入验收" min="0"
+                        @input="handleAcceptedInput(index)" />
                     </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" min="0" v-model="item.shortageQuantity" placeholder="自动计算" readonly />
                       <span class="tips">*自动计算（数量-验收数量）</span>
                     </el-form-item>
@@ -216,22 +212,26 @@
 
           <el-col :span="12">
             <el-form-item label="合格证文件" prop="certCountFileId">
-              <file-upload :isShowTip="false" :fileType="['pdf', 'png', 'jpg', 'jpeg']" v-model="form.certCountFileId" />
+              <file-upload :isShowTip="false" :fileType="['pdf', 'png', 'jpg', 'jpeg']"
+                v-model="form.certCountFileId" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="出厂报告文件" prop="reportCountFileId">
-              <file-upload :isShowTip="false" :fileType="['pdf', 'png', 'jpg', 'jpeg']" v-model="form.reportCountFileId" />
+              <file-upload :isShowTip="false" :fileType="['pdf', 'png', 'jpg', 'jpeg']"
+                v-model="form.reportCountFileId" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="技术资料文件" prop="techDocCountFileId">
-              <file-upload :isShowTip="false" :fileType="['pdf', 'png', 'jpg', 'jpeg']" v-model="form.techDocCountFileId" />
+              <file-upload :isShowTip="false" :fileType="['pdf', 'png', 'jpg', 'jpeg']"
+                v-model="form.techDocCountFileId" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="厂家资质文件" prop="licenseCountFileId">
-              <file-upload :isShowTip="false" :fileType="['pdf', 'png', 'jpg', 'jpeg']" v-model="form.licenseCountFileId" />
+              <file-upload :isShowTip="false" :fileType="['pdf', 'png', 'jpg', 'jpeg']"
+                v-model="form.licenseCountFileId" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -357,7 +357,7 @@ const data = reactive({
     pageNum: 1,
     pageSize: 10,
     projectId: currentProject.value?.id,
-    materialSource: '1',
+    materialSource: '0',
     formCode: undefined,
     projectName: undefined,
     materialName: undefined,
@@ -412,6 +412,9 @@ const { queryParams, form, rules } = toRefs(data);
 const getList = async () => {
   loading.value = true;
   try {
+    if(queryParams.value.materialSource=='0'){
+      delete queryParams.value.materialSource;
+    }
     const res = await listMaterialReceive(queryParams.value);
     materialReceiveList.value = res.rows;
     total.value = res.total;
@@ -503,9 +506,9 @@ const handleUpdate = async (row?: MaterialReceiveVO) => {
       watchItemChanges(index);
       // 手动触发当前条目的数量、验收数量、缺件数量验证
       if (materialReceiveFormRef.value) {
-        materialReceiveFormRef.value.validateField(`itemList.${index}.quantity`, () => {});
-        materialReceiveFormRef.value.validateField(`itemList.${index}.acceptedQuantity`, () => {});
-        materialReceiveFormRef.value.validateField(`itemList.${index}.shortageQuantity`, () => {});
+        materialReceiveFormRef.value.validateField(`itemList.${index}.quantity`, () => { });
+        materialReceiveFormRef.value.validateField(`itemList.${index}.acceptedQuantity`, () => { });
+        materialReceiveFormRef.value.validateField(`itemList.${index}.shortageQuantity`, () => { });
       }
     });
 
@@ -616,9 +619,9 @@ const handleAcceptedInput = (index: number) => {
 // 手动验证数量和验收数量字段
 const validateQuantityField = (index: number) => {
   if (materialReceiveFormRef.value) {
-    materialReceiveFormRef.value.validateField(`itemList.${index}.quantity`, () => {});
-    materialReceiveFormRef.value.validateField(`itemList.${index}.acceptedQuantity`, () => {});
-    materialReceiveFormRef.value.validateField(`itemList.${index}.shortageQuantity`, () => {});
+    materialReceiveFormRef.value.validateField(`itemList.${index}.quantity`, () => { });
+    materialReceiveFormRef.value.validateField(`itemList.${index}.acceptedQuantity`, () => { });
+    materialReceiveFormRef.value.validateField(`itemList.${index}.shortageQuantity`, () => { });
   }
 };
 
diff --git a/src/views/materials/overallPlanMaterialSupply/index.vue b/src/views/materials/overallPlanMaterialSupply/index.vue
index f0920b1..4106dc8 100644
--- a/src/views/materials/overallPlanMaterialSupply/index.vue
+++ b/src/views/materials/overallPlanMaterialSupply/index.vue
@@ -11,9 +11,6 @@
             <el-form-item v-if="state.masterData.status == 'waiting' || state.masterData.status == 'finish'">
               <el-button icon="view" @click="lookApprovalFlow()" type="warning">查看流程</el-button>
             </el-form-item>
-            <el-form-item>
-              <el-button icon="Finished" @click="editApprovalSheet()" type="success">保存</el-button>
-            </el-form-item>
             <el-form-item>
               <file-upload
                 upload-url="/design/totalsupplyplan/import"
@@ -22,11 +19,16 @@
                 :file-type="['xls', 'xlsx']"
                 :on-upload-success="handleSuccess"
               >
-                <el-button type="primary" plain icon="Compass">导入</el-button>
+                <el-button :disabled="state.masterData.status == 'finish'" type="primary" plain icon="upload">导入</el-button>
               </file-upload>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" plain icon="Filter" @click="handleExport">导出</el-button>
+              <el-button type="primary" plain icon="Download" @click="handleExport">导出</el-button>
+            </el-form-item>
+            <el-form-item>
+              <el-button icon="Finished" @click="editApprovalSheet()" type="success" :disabled="state.masterData.status == 'finish'"
+                >一键全部保存</el-button
+              >
             </el-form-item>
           </el-form>
           <right-toolbar @queryTable="getMasterDataList"></right-toolbar>
@@ -42,40 +44,77 @@
       border
       :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
     >
-      <el-table-column prop="num" label="编号" />
+      <el-table-column align="center" 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="specification" label="规格型号" width="80" />
+      <el-table-column prop="quantity" label="数量" width="100" />
       <el-table-column prop="batchNumber" label="批次号" width="200" />
       <el-table-column prop="brand" label="品牌">
         <template #default="{ row }">
-          <el-input v-model="row.brand" placeholder="" clearable />
+          <el-input
+            v-model="row.brand"
+            :disabled="state.masterData.status != 'draft'"
+            v-if="!(row.children && row.children.length > 0)"
+            placeholder=""
+            clearable
+          />
         </template>
       </el-table-column>
       <el-table-column prop="texture" label="材质">
         <template #default="{ row }">
-          <el-input v-model="row.texture" placeholder="" clearable />
+          <el-input
+            v-model="row.texture"
+            :disabled="state.masterData.status != 'draft'"
+            v-if="!(row.children && row.children.length > 0)"
+            placeholder=""
+            clearable
+          />
         </template>
       </el-table-column>
       <el-table-column prop="qualityStandard" label="质量标准">
         <template #default="{ row }">
-          <el-input v-model="row.qualityStandard" placeholder="" clearable />
+          <el-input
+            :disabled="state.masterData.status != 'draft'"
+            v-model="row.qualityStandard"
+            v-if="!(row.children && row.children.length > 0)"
+            placeholder=""
+            clearable
+          />
         </template>
       </el-table-column>
       <el-table-column prop="partUsed" label="使用部位">
         <template #default="{ row }">
-          <el-input v-model="row.partUsed" placeholder="" clearable />
+          <el-input
+            :disabled="state.masterData.status != 'draft'"
+            v-model="row.partUsed"
+            v-if="!(row.children && row.children.length > 0)"
+            placeholder=""
+            clearable
+          />
         </template>
       </el-table-column>
       <el-table-column prop="deliveryPoints" label="交货地点">
         <template #default="{ row }">
-          <el-input v-model="row.deliveryPoints" placeholder="" clearable />
+          <el-input
+            :disabled="state.masterData.status != 'draft'"
+            v-model="row.deliveryPoints"
+            v-if="!(row.children && row.children.length > 0)"
+            placeholder=""
+            clearable
+          />
         </template>
       </el-table-column>
-      <el-table-column label="预计使用日期">
+      <el-table-column label="预计使用日期" width="150">
         <template #default="{ row }">
-          <el-date-picker v-model="row.dateService" type="date" value-format="YYYY-MM-DD" placeholder="" />
+          <el-date-picker
+            v-model="row.dateService"
+            v-if="!(row.children && row.children.length > 0)"
+            type="date"
+            value-format="YYYY-MM-DD"
+            :disabled="state.masterData.status != 'draft'"
+            placeholder="请选择日期"
+          />
         </template>
       </el-table-column>
       <el-table-column prop="remark" label="备注" />
diff --git a/src/views/materials/overallPlanMaterialSupply/indexEdit.vue b/src/views/materials/overallPlanMaterialSupply/indexEdit.vue
index a35f892..56c849b 100644
--- a/src/views/materials/overallPlanMaterialSupply/indexEdit.vue
+++ b/src/views/materials/overallPlanMaterialSupply/indexEdit.vue
@@ -16,7 +16,7 @@
       <!-- 表单区域 -->
       <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>
+          <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' || form.status == 'waiting' || routeParams.type === 'update'" :model="form"
@@ -148,7 +148,7 @@ const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
 const flowCodeOptions = [
   {
     value: currentProject.value?.id + '_totalsupplyplan',
-    label: '物资总计划审核'
+    label: '物质供应总计划审核'
   }
 ];
 
@@ -214,7 +214,7 @@ const getInfo = () => {
     console.log('res.data', masterDataRes);
     Object.assign(form.value, masterDataRes?.data[0]);
     // console.log('form', form.value);
-    tableData.value = res.rows;
+    tableData.value = res.rows.reverse();//翻转
     loading.value = false;
     buttonLoading.value = false;
   });
diff --git a/src/views/materials/purchaseDoc/index.vue b/src/views/materials/purchaseDoc/index.vue
index 000ec2d..1ece2ac 100644
--- a/src/views/materials/purchaseDoc/index.vue
+++ b/src/views/materials/purchaseDoc/index.vue
@@ -10,9 +10,9 @@
             <el-form-item label="设备统称" prop="name">
               <el-input v-model="queryParams.name" placeholder="请输入设备统称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="到货日期" prop="arrivalDate">
+            <!-- <el-form-item label="到货日期" prop="arrivalDate">
               <el-date-picker clearable v-model="queryParams.arrivalDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择到货日期" />
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item>
               <el-button type="primary" v-hasPermi="['cailiaoshebei:purchaseDoc:list']" icon="Search" @click="handleQuery">搜索</el-button>
 
diff --git a/src/views/materials/usageMaterials/purchase/index.vue b/src/views/materials/usageMaterials/purchase/index.vue
index e2778d1..4078def 100644
--- a/src/views/materials/usageMaterials/purchase/index.vue
+++ b/src/views/materials/usageMaterials/purchase/index.vue
@@ -1,23 +1,12 @@
 <template>
   <div style="padding: 20px">
-    <el-card class="mb-5">
-      <el-button
-        type="primary"
-        v-hasPermi="['cailiaoshebei:physicalsupply:add']"
-        icon="Plus"
-        @click="handleAdd"
-        class="transition-all duration-200 hover:shadow-md"
-      >
-        新增
-      </el-button>
-      <el-button
-        v-hasPermi="['cailiaoshebei:physicalsupply:list']"
-        icon="Refresh"
-        @click="refreshData"
-        class="transition-all duration-200 hover:shadow-md"
-      >
-        刷新
-      </el-button>
+    <el-card class="mb-5" shadow="never">
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+        </el-col>
+        <right-toolbar @queryTable="refreshData"></right-toolbar>
+      </el-row>
     </el-card>
 
     <!-- 数据表格 -->
@@ -258,7 +247,6 @@ const formRules = reactive({
 const queryParams = reactive({
   pageSize: 10,
   pageNum: 1,
-  findType: 1,
   projectId: currentProject.value?.id
 });
 
diff --git a/src/views/out/purchase/comm/purchPage.vue b/src/views/out/purchase/comm/purchPage.vue
index dd854d3..2a882fd 100644
--- a/src/views/out/purchase/comm/purchPage.vue
+++ b/src/views/out/purchase/comm/purchPage.vue
@@ -24,8 +24,8 @@
     <!-- 添加或修改月度产值计划对话框 -->
     <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="monthPlanFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="金额" prop="unitPrice">
-          <el-input v-model="form.unitPrice" placeholder="请输入金额" type="number" />
+        <el-form-item label="接收数量" prop="acceptedQuantity">
+          <el-input v-model="form.acceptedQuantity" placeholder="请输入接收数量" type="number" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -76,7 +76,8 @@ const initFormData = {
   valueType: undefined,
   planAuditStatus: undefined,
   completeAuditStatus: undefined,
-  unitPrice: undefined
+  unitPrice: undefined,
+  acceptedQuantity: undefined
 };
 const data = reactive({
   form: { ...initFormData },