diff --git a/.env.development b/.env.development
index faff5a9..9ab76bb 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.180: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/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/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/volumeCatalog/index.vue b/src/views/design/volumeCatalog/index.vue
index fa340e5..e3dcf79 100644
--- a/src/views/design/volumeCatalog/index.vue
+++ b/src/views/design/volumeCatalog/index.vue
@@ -99,17 +99,17 @@
     </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>
@@ -253,7 +253,7 @@ import {
   delVolumeCatalog,
   addVolumeCatalog,
   updateVolumeCatalog,
-  uploadVolumeFile,
+  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/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`, () => { });
   }
 };