diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index 21f7710..355fd99 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -17,7 +17,7 @@
       <template v-if="item.meta" #title>
         <svg-icon :icon-class="item.meta ? item.meta.icon : ''" />
         <span class="menu-title" :title="hasTitle(item.meta?.title)">{{ item.meta?.title }}</span>
-        <span class="bage" v-if="item.meta?.title == '我的任务' && total > 0">{{ total }}</span>
+        <span class="bage" v-if="item.meta?.title == '我的任务' && total + totalChao > 0">{{ total + totalChao }}</span>
       </template>
 
       <sidebar-item
@@ -61,6 +61,7 @@ const totalChao = ref(0);
 onMounted(() => {
   if (onlyOneChild.value.meta?.title == '我的待办' || props.item.meta?.title == '我的任务') {
     getWaitingList();
+    getChaoList();
   }
   if (onlyOneChild.value.meta?.title == '我的抄送') {
     getChaoList();
diff --git a/src/views/materials/overallPlanMaterialSupply/index.vue b/src/views/materials/overallPlanMaterialSupply/index.vue
index 317b908..930bbd8 100644
--- a/src/views/materials/overallPlanMaterialSupply/index.vue
+++ b/src/views/materials/overallPlanMaterialSupply/index.vue
@@ -1,40 +1,39 @@
 <template>
-  <div class="p-2">
-    <!-- 搜索区域 -->
-    <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="supplierType" label-width="140px">
-              <el-select v-model="queryParams.supplierType" placeholder="请选择类型" clearable>
-                <el-option label="劳务" value="劳务"></el-option>
-                <el-option label="技术服务" value="技术服务"></el-option>
-                <el-option label="物资设备" value="物资设备"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="企业名称" prop="supplierName">
-              <el-input v-model="queryParams.supplierName" placeholder="请输入企业名称" clearable style="width: 200px" />
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </el-form>
-        </el-card>
-      </div>
-    </transition>
-
-    <!-- 列表及操作区域 -->
-    <el-card shadow="never">
+  <div class="overall-plan-material-supply">
+    <el-card shadow="always">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['supplierInput:supplierInput:add']">新增</el-button>
-          </el-col>
-          <!-- <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['supplierInput:supplierInput:export']">导出</el-button>
-          </el-col> -->
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          <el-form :inline="true">
+            <el-form-item v-if="state.masterData.status == 'draft'">
+              <el-button type="primary" icon="edit" @click="clickApprovalSheet1()">审批</el-button>
+            </el-form-item>
+            <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>
+              <file-upload
+                upload-url="/design/totalsupplyplan/import"
+                v-model="file"
+                :limit="1"
+                :file-type="['xls', 'xlsx']"
+                :on-upload-success="handleSuccess"
+              >
+                <el-button :disabled="state.masterData.status == 'finish'" type="primary" plain icon="Download">导入</el-button>
+              </file-upload>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" plain icon="upload" @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-item>
+              <el-button type="primary" @click="toggleExpandAll">{{ isExpandAll ? '一键收起' : '一键展开' }}</el-button>
+            </el-form-item> -->
+          </el-form>
+          <right-toolbar @queryTable="getMasterDataList"></right-toolbar>
         </el-row>
       </template>
     </el-card>
@@ -95,648 +94,458 @@
       <el-form ref="formRef" :model="formData" :rules="formRules" label-width="120px" class="space-y-4">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="开户行账号" prop="bankAccount">
-              <el-input v-model="form.bankAccount" placeholder="请输入开户行账号" clearable />
+            <el-form-item label="批次号" prop="batchNumber">
+              <el-input disabled v-model="formData.batchNumber" placeholder="请输入批次号" clearable />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="经营范围" prop="scope">
-              <el-input v-model="form.scope" placeholder="请输入经营范围" clearable />
+            <el-form-item label="品牌" prop="brand">
+              <el-input v-model="formData.brand" placeholder="请输入品牌" clearable />
             </el-form-item>
           </el-col>
         </el-row>
-
-        <!-- 第七行：企业资质 -->
-        <el-row :gutter="20" class="mb-4">
+        <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="企业资质等级" prop="supplierLivel">
-              <el-input v-model="form.supplierLivel" placeholder="请输入资质等级" clearable />
+            <el-form-item label="材质" prop="texture">
+              <el-input v-model="formData.texture" placeholder="请输入材质" clearable />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="发证日期" prop="issueDate">
-              <el-date-picker v-model="form.issueDate" type="date" placeholder="请选择发证日期" value-format="YYYY-MM-DD" />
+            <el-form-item label="质量标准" prop="qualityStandard">
+              <el-input v-model="formData.qualityStandard" placeholder="请输入质量标准" clearable />
             </el-form-item>
           </el-col>
         </el-row>
-
-        <!-- 第八行：证书有效期与营业额 -->
-        <el-row :gutter="20" class="mb-4">
+        <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="证书有效期" prop="certificateValidity">
-              <el-date-picker v-model="form.certificateValidity" type="date" placeholder="请选择证书有效期" value-format="YYYY-MM-DD" />
+            <el-form-item label="使用部位" prop="partUsed">
+              <el-input v-model="formData.partUsed" placeholder="请输入使用部位" clearable />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="近三年营业额" prop="pastThreeYears">
-              <el-input v-model="form.pastThreeYears" placeholder="请输入近三年营业额" clearable />
+            <el-form-item label="交货地点" prop="deliveryPoints">
+              <el-input v-model="formData.deliveryPoints" placeholder="请输入交货地点" clearable />
             </el-form-item>
           </el-col>
         </el-row>
-
-        <!-- 第九行：安全生产许可证（仅劳务类型显示） -->
-        <el-row :gutter="20" class="mb-4" v-if="form.supplierType === '劳务'">
+        <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="安全生产许可证编号" prop="safeCode">
-              <el-input v-model="form.safeCode" placeholder="请输入许可证编号" clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="安全生产许可证发证日期" prop="safeCodeData">
-              <el-date-picker v-model="form.safeCodeData" type="date" placeholder="请选择发证日期" />
+            <el-form-item label="预计使用日期" prop="dateService">
+              <el-date-picker v-model="formData.dateService" type="date" placeholder="选择预计使用日期" format="YYYY-MM-DD" />
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- 第十行：安全生产许可证有效期（仅劳务类型显示） -->
-        <el-row :gutter="20" class="mb-4" v-if="form.supplierType === '劳务'">
-          <el-col :span="12">
-            <el-form-item label="安全生产许可证发证日期" prop="safeCertificateValidity">
-              <el-date-picker v-model="form.safeCertificateValidity" type="date" placeholder="请选择发证日期" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <!-- 空列占位 -->
-          </el-col>
-        </el-row>
-        <!-- 第十一行：注册人员数量（仅劳务类型显示） -->
-        <el-row :gutter="20" class="mb-4" v-if="form.supplierType === '劳务'">
-          <el-col :span="12">
-            <el-form-item label="一建建造师" prop="firstBuildingNumber">
-              <el-input v-model="form.firstBuildingNumber" placeholder="请输入一建建造师数量" clearable />
-            </el-form-item>
-            <el-form-item label="二建建造师" prop="secondBuildingNumber">
-              <el-input v-model="form.secondBuildingNumber" placeholder="请输入二建建造师数量" clearable />
-            </el-form-item>
-            <el-form-item label="注册造价工程师" prop="registeredEngineerNumber">
-              <el-input v-model="form.registeredEngineerNumber" placeholder="请输入注册造价工程师数量" clearable />
-            </el-form-item>
-            <el-form-item label="其他（分别写）" prop="otherBuildingNumber">
-              <el-input v-model="form.otherBuildingNumber" placeholder="请输入其他人员数量" clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <!-- 空列占位 -->
-          </el-col>
-        </el-row>
-        <!-- 第十二行：职称人员数量（仅劳务类型显示） -->
-        <el-row :gutter="20" class="mb-4" v-if="form.supplierType === '劳务'">
-          <el-col :span="12">
-            <el-form-item label="高级工程师人数" prop="seniorEngineerNumber">
-              <el-input v-model="form.seniorEngineerNumber" placeholder="请输高级工程师数量" clearable />
-            </el-form-item>
-            <el-form-item label="工程师数量" prop="engineerNumber">
-              <el-input v-model="form.engineerNumber" placeholder="请输入工程师数量" clearable />
-            </el-form-item>
-            <el-form-item label="助理工程师数量" prop="assistantEngineerNumber">
-              <el-input v-model="form.assistantEngineerNumber" placeholder="请输入助理工程师数量" clearable />
-            </el-form-item>
-            <el-form-item label="其他人员数量" prop="otherPersonnelNumber">
-              <el-input v-model="form.otherPersonnelNumber" placeholder="请输入其他人员数量" clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <!-- 空列占位 -->
-          </el-col>
-        </el-row>
-        <!-- 第十四行：入库资料上传 -->
-        <el-row class="mb-4">
+        <el-row>
           <el-col :span="24">
-            <el-form-item label="入库资料" prop="inputFile">
-              <template #label> <span class="text-red">*</span> 入库资料 </template>
-              <file-upload
-                v-model="form.fileId"
-                :fileType="['doc', 'docx', 'pdf']"
-                :autoUpload="false"
-                ref="fileUploadRef"
-                :method="form.id ? 'put' : 'post'"
-                :data="form"
-                uploadUrl="/supplierInput/supplierInput"
-                :limit="1"
-                @handleChange="handleFileChange"
-                @handleRemove="handleFileRemove"
-                showFileList
-              >
-                <div><el-button type="primary">上传文件</el-button><br /></div>
-              </file-upload>
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="formData.remark" placeholder="请输入备注信息" type="textarea" rows="3" />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <!-- 对话框底部按钮 -->
       <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
+        <el-button @click="handleClose">取消</el-button>
+        <el-button type="primary" @click="handleSubmit">确定</el-button>
       </template>
     </el-dialog>
   </div>
 </template>
 
-<script setup name="SupplierInput" lang="ts">
-import { ComponentInternalInstance, getCurrentInstance, onMounted, ref, reactive, toRefs, computed } from 'vue';
-import { ElFormInstance } from 'element-plus';
-import { listSupplierInput, getSupplierInput, delSupplierInput, updateSupplierInput } from '@/api/supplierInput/supplierInput/index';
-import { SupplierInputVO, SupplierInputQuery, SupplierInputForm, PageData, DialogOption } from '@/api/supplierInput/supplierInput/types';
-import Pagination from '@/components/Pagination/index.vue';
-import RightToolbar from '@/components/RightToolbar/index.vue';
-import FileUpload from '@/components/FileUpload/index.vue';
+<script setup name="billofQuantities">
+import { ref, reactive, onMounted, computed, getCurrentInstance, watch, onUnmounted } from 'vue';
+import { ElMessage, ElLoading } from 'element-plus';
+import {
+  obtainMasterDataList,
+  totalsupplyplan,
+  totalSupplyplanDetails,
+  materialChangeSupplyplan,
+  totalSupplyplanBatchEdit
+} from '@/api/materials/overallPlanMaterialSupply/index';
 import { useUserStoreHook } from '@/store/modules/user';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
-// 组件引用
-const fileUploadRef = ref<InstanceType<typeof FileUpload> | null>(null);
-const queryFormRef = ref<ElFormInstance>();
-const supplierInputFormRef = ref<ElFormInstance>();
-// 获取用户 store
+
+// 全局状态与实例获取
 const userStore = useUserStoreHook();
 const currentProject = computed(() => userStore.selectedProject);
-// 基础数据
-const supplierInputList = ref<SupplierInputVO[]>([]);
-const buttonLoading = ref(false);
-const loading = ref(true);
-const showSearch = ref(true);
-const ids = ref<Array<string | number>>([]);
-const single = ref(true);
-const multiple = ref(true);
-const total = ref(0);
-const fileUrl = ref('');
+const { proxy } = getCurrentInstance();
 
-// 对话框配置
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
+// 基础状态管理
+const visible = ref(false);
+const formRef = ref(null);
+const tableRef = ref(null);
+const file = ref(null);
+const isExpandAll = ref(false);
+const expandRowKeys = ref([]);
+const editDataMap = ref(new Map()); // 用Map存储修改的数据，提高查询效率
+const loadingInstance = ref(null);
+const fullTreeData = ref([]); // 存储完整树形数据，用于本地懒加载
 
-// 初始化表单数据：新增build1-build4、personnelNumber1-personnelNumber4字段（用于拆分拼接字符串）
-const initFormData: any = {
-  id: undefined,
-  supplierType: undefined,
-  supplierName: undefined,
-  supplierPerson: undefined,
-  supplierCode: undefined,
-  supplierAddres: undefined,
-  personName: undefined,
-  personPhone: undefined,
-  bankPersonName: undefined,
-  bankName: undefined,
-  bankAccount: undefined,
-  taxScale: undefined,
-  scope: undefined,
-  supplierLivel: undefined,
-  issueDate: undefined,
-  certificateValidity: undefined,
-  pastThreeYears: undefined,
-  safeCode: undefined,
-  safeCodeData: undefined,
-  safeCertificateValidity: undefined,
-  registeredNumber: undefined, // 后端返回的拼接字符串（如“1,2,3,4”）
-  personnelNumber: undefined, // 后端返回的拼接字符串（如“5,6,7,8”）
-  fileId: undefined,
-  inputFile: undefined,
-  // state: '0', // 新增默认待审核
-  // 新增：用于表单输入的单独字段
-  firstBuildingNumber: undefined, // 一建建造师
-  secondBuildingNumber: undefined, // 二建建造师
-  registeredEngineerNumber: undefined, // 注册造价工程师
-  otherBuildingNumber: undefined, // 其他注册人员
-  seniorEngineerNumber: undefined, // 高级工程师
-  engineerNumber: undefined, // 工程师
-  assistantEngineerNumber: undefined, // 助理工程师
-  otherPersonnelNumber: undefined // 其他职称人员
-};
-// 核心数据（表单+查询参数）
-const data = reactive<PageData<SupplierInputForm, SupplierInputQuery>>({
-  form: { ...initFormData },
-  queryParams: {
+// 页面核心状态
+const state = reactive({
+  tableData: [], // 初始只存放根节点
+  queryForm: {
     projectId: currentProject.value?.id,
-    pageNum: 1,
-    pageSize: 10,
-    supplierType: undefined,
-    supplierName: undefined,
-    state: undefined,
-    inputFile: undefined,
-    registeredNumber: undefined,
-    personnelNumber: undefined,
-    params: {}
-  }
+    versions: '',
+    sheet: '',
+    pageSize: 20,
+    pageNum: 1
+  },
+  loading: {
+    versions: false,
+    sheets: false,
+    list: false
+  },
+  masterData: {}
 });
 
-// 解构响应式数据
-const { queryParams, form } = toRefs(data);
-
-// 动态验证规则：仅劳务类型需要校验【安全生产许可证+人员数量】字段
-const rules = computed(() => {
-  const baseRules = {
-    supplierType: [{ required: true, message: '请选择企业登记注册类型', trigger: 'change' }],
-    supplierName: [{ required: true, message: '请输入企业名称', trigger: 'blur' }],
-    supplierPerson: [{ required: true, message: '请输入法定代表人', trigger: 'blur' }],
-    supplierCode: [{ required: true, message: '请输入统一社会信用代码', trigger: 'blur' }],
-    personName: [{ required: true, message: '请输入负责人姓名', trigger: 'blur' }],
-    personPhone: [
-      { required: true, message: '请输入负责人联系电话', trigger: 'blur' },
-      { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号格式', trigger: 'blur' }
-    ],
-    id: [{ required: true, message: 'ID不能为空', trigger: 'blur' }],
-    firstBuildingNumber: [{ required: true, message: '请输入一建建造师数量', trigger: 'change' }],
-    secondBuildingNumber: [{ required: true, message: '请输入二建建造师数量', trigger: 'change' }],
-    registeredEngineerNumber: [{ required: true, message: '请输入注册造价工程师数量', trigger: 'change' }],
-    otherBuildingNumber: [{ required: true, message: '请输入其他数量', trigger: 'change' }],
-    seniorEngineerNumber: [{ required: true, message: '请输入高级工程师数量', trigger: 'change' }],
-    engineerNumber: [{ required: true, message: '请输入工程师数量', trigger: 'change' }],
-    assistantEngineerNumber: [{ required: true, message: '请输入助理工程师数量', trigger: 'change' }],
-    otherPersonnelNumber: [{ required: true, message: '请输入其他数量', trigger: 'change' }]
-  };
-
-  // 仅当类型为"劳务"时，添加安全生产许可证+人员数量校验
-  if (form.value.supplierType === '劳务') {
-    return {
-      ...baseRules,
-      // 安全生产许可证相关校验
-      safeCode: [{ required: true, message: '请输入安全生产许可证编号', trigger: 'blur' }],
-      safeCodeData: [{ required: true, message: '请选择安全生产许可证发证日期', trigger: 'change' }],
-      safeCertificateValidity: [{ required: true, message: '请选择安全生产许可证有效期', trigger: 'change' }],
-      // 注册人员数量校验
-      firstBuildingNumber: [{ required: true, message: '请输入一建建造师数量', trigger: 'blur' }],
-      secondBuildingNumber: [{ required: true, message: '请输入二建建造师数量', trigger: 'blur' }],
-      registeredEngineerNumber: [{ required: true, message: '请输入注册造价工程师数量', trigger: 'blur' }],
-      otherBuildingNumber: [{ required: true, message: '请输入其他注册人员数量', trigger: 'blur' }],
-      // 职称人员数量校验
-      seniorEngineerNumber: [{ required: true, message: '请输入高级工程师数量', trigger: 'blur' }],
-      engineerNumber: [{ required: true, message: '请输入工程师数量', trigger: 'blur' }],
-      assistantEngineerNumber: [{ required: true, message: '请输入助理工程师数量', trigger: 'blur' }],
-      otherPersonnelNumber: [{ required: true, message: '请输入其他职称人员数量', trigger: 'blur' }]
-    };
-  }
-
-  return baseRules;
+// 表单数据
+const formData = reactive({
+  batchNumber: '',
+  brand: '',
+  compileDate: '',
+  dateService: '',
+  deliveryPoints: '',
+  id: undefined,
+  name: '',
+  num: '',
+  partUsed: '',
+  planNumber: '',
+  projectId: undefined,
+  qualityStandard: '',
+  quantity: 0,
+  remark: '',
+  specification: '',
+  status: '',
+  texture: '',
+  unit: ''
 });
 
-/** 企业类型变更时的处理：清空隐藏字段数据+重置校验 */
-const handleTypeChange = () => {
-  // 非劳务类型：清空安全生产许可证+人员数量字段
-  if (form.value.supplierType !== '劳务') {
-    form.value.safeCode = undefined;
-    form.value.safeCodeData = undefined;
-    form.value.safeCertificateValidity = undefined;
-    form.value.registeredNumber = undefined;
-    form.value.personnelNumber = undefined;
-    // 清空表单单独字段
-    form.value.firstBuildingNumber =
-      form.value.secondBuildingNumber =
-      form.value.registeredEngineerNumber =
-      form.value.otherBuildingNumber =
-        undefined;
-    form.value.seniorEngineerNumber = form.value.engineerNumber = form.value.assistantEngineerNumber = form.value.otherPersonnelNumber = undefined;
-  }
-  // 重置隐藏字段的校验状态，避免错误提示残留
-  supplierInputFormRef.value?.clearValidate([
-    'safeCode',
-    'safeCodeData',
-    'safeCertificateValidity',
-    'firstBuildingNumber',
-    'secondBuildingNumber',
-    'registeredEngineerNumber',
-    'otherBuildingNumber',
-    'seniorEngineerNumber',
-    'engineerNumber',
-    'assistantEngineerNumber',
-    'otherPersonnelNumber'
-  ]);
-};
+// 表单验证规则
+const formRules = reactive({
+  name: [
+    { required: true, message: '请输入名称', trigger: 'blur' },
+    { max: 100, message: '名称长度不能超过100个字符', trigger: 'blur' }
+  ],
+  num: [
+    { required: true, message: '请输入编号', trigger: 'blur' },
+    { max: 50, message: '编号长度不能超过50个字符', trigger: 'blur' }
+  ],
+  quantity: [
+    { required: true, message: '请输入数量', trigger: 'blur' },
+    { type: 'number', min: 0, message: '数量不能为负数', trigger: 'blur' }
+  ],
+  compileDate: [{ required: true, message: '请选择编制日期', trigger: 'change' }]
+});
+
+/**
+ * 本地数据懒加载实现：从完整数据中筛选子节点
+ */
+const loadLocalChildNodes = (row, treeNode, resolve) => {
+  // 避免重复加载
+  if (row.children && row.children.length > 0) {
+    resolve(row.children);
+    return;
+  }
+
+  // 显示加载状态
+  loadingInstance.value = ElLoading.service({
+    target: tableRef.value.$el,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.8)'
+  });
 
-/** 查询供应商入库列表 */
-const getList = async () => {
-  loading.value = true;
   try {
-    const res = await listSupplierInput(queryParams.value);
-    supplierInputList.value = res.rows;
-    total.value = res.total;
+    // 从完整数据中筛选当前行的子节点（假设父ID对应子节点的pid）
+    const childNodes = fullTreeData.value.filter((node) => node.pid === row.sid);
+
+    // 标记子节点是否有子节点
+    const formattedChildren = childNodes.map((node) => ({
+      ...node,
+      hasChildren: fullTreeData.value.some((child) => child.pid === node.sid)
+    }));
+
+    // 缓存子节点到当前行
+    row.children = formattedChildren;
+    resolve(formattedChildren);
   } catch (error) {
-    proxy?.$modal.msgError('查询失败，请重试');
+    resolve([]);
   } finally {
-    loading.value = false;
+    loadingInstance.value?.close();
   }
 };
 
-/** 取消操作 */
-const cancel = () => {
-  reset();
-  dialog.visible = false;
-};
-
-/** 表单重置：清空所有字段 */
-const reset = () => {
-  form.value = { ...initFormData, projectId: currentProject.value?.id };
-  fileUrl.value = '';
-  form.value.inputFile = '';
-  supplierInputFormRef.value?.resetFields();
-};
-
-/** 搜索操作 */
-const handleQuery = () => {
-  queryParams.value.pageNum = 1;
-  getList();
-};
-
-/** 重置搜索 */
-const resetQuery = () => {
-  queryFormRef.value?.resetFields();
-  handleQuery();
-};
-
-const splitBackEndStrToForm = (resData: any) => {
-  if (resData.registeredNumber) {
-    const registeredArr = resData.registeredNumber.split(',');
-    form.value.firstBuildingNumber = registeredArr[0] || undefined; // 一建建造师
-    form.value.secondBuildingNumber = registeredArr[1] || undefined; // 二建建造师
-    form.value.registeredEngineerNumber = registeredArr[2] || undefined; // 注册造价工程师
-    form.value.otherBuildingNumber = registeredArr[3] || undefined; // 其他注册人员
-  }
-
-  if (resData.personnelNumber) {
-    const personnelArr = resData.personnelNumber.split(',');
-    form.value.seniorEngineerNumber = personnelArr[0] || undefined; // 高级工程师
-    form.value.engineerNumber = personnelArr[1] || undefined; // 工程师
-    form.value.assistantEngineerNumber = personnelArr[2] || undefined; // 助理工程师
-    form.value.otherPersonnelNumber = personnelArr[3] || undefined; // 其他职称人员
-  }
-};
-/** 审核过程按钮操作 */
-const handleAudit = async (row) => {
-  proxy.$tab.closePage(proxy.$route);
-  proxy.$router.push({
-    path: `/approval/supplierInput/indexEdit`,
-    query: {
-      id: row.id,
-      type: 'update'
+/**
+ * 处理展开状态变化
+ */
+const handleExpandChange = (row, expanded) => {
+  if (expanded) {
+    if (!expandRowKeys.value.includes(row.id)) {
+      expandRowKeys.value.push(row.id);
     }
-  });
-};
-/** 查看按钮操作 */
-const handleAuditView = async (row) => {
-  proxy.$tab.closePage(proxy.$route);
-  proxy.$router.push({
-    path: `/approval/supplierInput/indexEdit`,
-    query: {
-      id: row.id,
-      type: 'view'
-    }
-  });
-};
-/** 文件选择变更 */
-const change = () => {
-  fileUrl.value = '';
-};
-
-/** 表格多选回调 */
-const handleSelectionChange = (selection: SupplierInputVO[]) => {
-  ids.value = selection.map((item) => item.id);
-  single.value = selection.length !== 1;
-  multiple.value = selection.length === 0;
-};
-
-/** 新增操作 */
-const handleAdd = () => {
-  reset();
-  dialog.visible = true;
-  dialog.title = '添加供应商入库';
-};
-
-const editFileId = ref('');
-const handleUpdate = async (row?: SupplierInputVO) => {
-  reset();
-  const _id = row?.id || ids.value[0];
-  if (!_id) return proxy?.$modal.msgWarning('请选择需要修改的数据');
-
-  try {
-    const res = await getSupplierInput(_id);
-    const resData: any = res.data || {};
-    editFileId.value = resData.fileId;
-    // 1. 基础字段回显
-    form.value = { ...form.value, ...resData, inputFile: '' };
-    // 2. 核心修复：拆分后端拼接字符串到表单单独字段
-    splitBackEndStrToForm(resData);
-    // 3. 文件地址回显
-    fileUrl.value = resData.inputFile || '';
-    // 4. 打开对话框
-    dialog.visible = true;
-    dialog.title = '修改供应商入库';
-  } catch (error) {
-    proxy?.$modal.msgError('获取数据失败，请重试');
-  }
-};
-
-const fileStatus = ref(false);
-const updateFileStatus = ref(true);
-const isUpdateFile = ref(false); //记录是否在修改页面时是否有新上传的文件
-const handleFileChange = (file, fileList) => {
-  if (form.value.id) {
-    updateFileStatus.value = true;
-    isUpdateFile.value = true; //记录是否在修改页面时是否有新上传的文件
-  }
-  fileStatus.value = true;
-};
-
-const handleFileRemove = (file, fileList) => {
-  if (form.value.id) {
-    updateFileStatus.value = false;
-    isUpdateFile.value = false; //记录是否在修改页面时是否有新上传的文件
-  }
-
-  fileStatus.value = false;
-};
-/** 提交表单 */
-const submitForm = () => {
-  supplierInputFormRef.value?.validate(async (valid: boolean) => {
-    if (!valid) return;
-    if (form.value.supplierType === '劳务') {
-      form.value.registeredNumber = [
-        form.value.firstBuildingNumber,
-        form.value.secondBuildingNumber,
-        form.value.registeredEngineerNumber,
-        form.value.otherBuildingNumber
-      ].join(',');
-      form.value.personnelNumber = [
-        form.value.seniorEngineerNumber,
-        form.value.engineerNumber,
-        form.value.assistantEngineerNumber,
-        form.value.otherPersonnelNumber
-      ].join(',');
-    }
-    buttonLoading.value = true;
-    try {
-      if (fileUploadRef.value) {
-        if (form.value.fileId === editFileId.value && !isUpdateFile.value) {
-          console.log(1111111111);
-
-          editFormData();
-        } else {
-          fileUploadRef.value.submitUpload().then((res) => {
-            if (res == 'noFile') {
-              proxy?.$modal.msgError('请上传文件');
-              return;
-            }
-            proxy?.$modal.msgSuccess('操作成功');
-            dialog.visible = false;
-            getList();
-          });
-        }
-      }
-    } catch (error) {
-      proxy?.$modal.msgError('提交失败，请重试');
-    } finally {
-      buttonLoading.value = false;
-    }
-  });
-};
-const editFormData = async () => {
-  const res = await updateSupplierInput(form.value);
-  if ((res.code = 200)) {
-    proxy?.$modal.msgSuccess('操作成功');
-    dialog.visible = false;
-    getList();
-  }
-};
-/** 删除操作 */
-const handleDelete = async (row?: SupplierInputVO) => {
-  const _ids = row?.id || ids.value;
-  if (!_ids || (Array.isArray(_ids) && _ids.length === 0)) {
-    return proxy?.$modal.msgWarning('请选择需要删除的数据');
-  }
-
-  try {
-    await proxy?.$modal.confirm(`是否确认删除供应商入库编号为"${_ids}"的数据项？`);
-    await delSupplierInput(_ids);
-    proxy?.$modal.msgSuccess('删除成功');
-    getList();
-  } catch (error) {
-    proxy?.$modal.msgError('删除失败，请重试');
-  }
-};
-
-/** 导出操作 */
-const handleExport = () => {
-  proxy?.download('supplierInput/supplierInput/export', { ...queryParams.value }, `supplierInput_${new Date().getTime()}.xlsx`);
-};
-//调用projectId并获取列表
-onMounted(() => {
-  // 若需要依赖项目ID，可先判断项目是否已选中，再调用接口
-  if (currentProject.value?.id) {
-    queryParams.value.projectId = currentProject.value.id;
-    form.value.projectId = currentProject.value.id;
-    getList(); // 首次进入自动调取listSupplierInput接口
   } else {
-    // 若项目未选中，可提示或后续监听项目变化时再加载（已有监听逻辑）
-    getList();
+    expandRowKeys.value = expandRowKeys.value.filter((id) => id !== row.id);
   }
-});
-// 监听项目id刷新数据
+};
+
+/**
+ * 一键展开/收起
+ */
+const toggleExpandAll = async () => {
+  isExpandAll.value = !isExpandAll.value;
+
+  if (isExpandAll.value) {
+    loadingInstance.value = ElLoading.service({
+      target: tableRef.value.$el,
+      text: '正在加载...',
+      background: 'rgba(255, 255, 255, 0.8)'
+    });
+
+    try {
+      // 递归加载所有层级子节点
+      const loadAllChildren = (nodes) => {
+        nodes.forEach((node) => {
+          const children = fullTreeData.value.filter((child) => child.pid === node.sid);
+          const formattedChildren = children.map((child) => ({
+            ...child,
+            hasChildren: fullTreeData.value.some((c) => c.pid === child.sid)
+          }));
+          node.children = formattedChildren;
+          if (formattedChildren.length > 0) {
+            loadAllChildren(formattedChildren);
+          }
+        });
+      };
+
+      loadAllChildren(state.tableData);
+      // 展开所有节点
+      state.tableData.forEach((row) => {
+        tableRef.value.toggleRowExpansion(row, true);
+      });
+      ElMessage.success('所有节点已展开');
+    } catch (error) {
+      ElMessage.error(`一键展开失败：${error.message}`);
+    } finally {
+      loadingInstance.value?.close();
+    }
+  } else {
+    // 收起所有节点
+    state.tableData.forEach((row) => {
+      tableRef.value.toggleRowExpansion(row, false);
+    });
+    expandRowKeys.value = [];
+  }
+};
+
+/**
+ * 处理输入框变化（优化性能）
+ */
+const handleInputChange = (row, field) => {
+  // 只记录修改过的数据，避免全量对比
+  if (!editDataMap.value.has(row.id)) {
+    editDataMap.value.set(row.id, { ...row });
+  }
+  const storedData = editDataMap.value.get(row.id);
+  storedData[field] = row[field];
+  editDataMap.value.set(row.id, storedData);
+};
+/**
+ * 获取主数据列表（核心优化：拆分根节点和完整数据）
+ */
+async function getMasterDataList() {
+  try {
+    state.loading.list = true;
+    // 获取主数据
+    const masterDataRes = await obtainMasterDataList({
+      projectId: currentProject.value?.id
+    });
+    const { data: masterData } = masterDataRes;
+
+    if (!masterData[0]?.id) {
+      state.tableData = [];
+      fullTreeData.value = [];
+      return;
+    }
+    state.masterData = masterData[0];
+    // 获取完整供应计划数据
+    const supplyPlanRes = await totalsupplyplan({ id: masterData[0].id, projectId: currentProject.value?.id });
+    const allData = supplyPlanRes.rows || [];
+    // 存储完整数据到本地
+    fullTreeData.value = [...allData];
+    // 初始只加载根节点（pid为空或0的节点）
+    const rootNodes = allData.filter((item) => !item.pid || item.pid == 0);
+    // 标记根节点是否有子节点
+    state.tableData = rootNodes.map((node) => ({
+      ...node,
+      hasChildren: allData.some((child) => child.pid === node.sid)
+    }));
+    // 初始化可编辑数据映射
+    editDataMap.value.clear();
+    allData.forEach((item) => {
+      if (!item.hasChildren) {
+        // 只关注叶子节点
+        editDataMap.value.set(item.id, { ...item });
+      }
+    });
+  } catch (error) {
+    state.tableData = [];
+    fullTreeData.value = [];
+  } finally {
+    state.loading.list = false;
+  }
+}
+
+/**
+ * 获取详情
+ */
+async function totalSupplyplanDetail(id) {
+  try {
+    const result = await totalSupplyplanDetails(id);
+    if (result?.code === 200) {
+      const detailData = result.data || {};
+
+      // 清空表单并赋值
+      Object.keys(formData).forEach((key) => {
+        formData[key] = undefined;
+      });
+
+      // 处理日期格式
+      const formatDate = (date) => {
+        if (!date) return '';
+        const d = typeof date === 'string' ? new Date(date) : date;
+        return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
+      };
+
+      Object.assign(formData, {
+        ...detailData,
+        compileDate: formatDate(detailData.compileDate),
+        dateService: formatDate(detailData.dateService)
+      });
+    } else {
+      ElMessage.error(`获取详情失败: ${result?.msg || '未知错误'}`);
+    }
+  } catch (err) {
+    ElMessage.error(`接口请求失败: ${err.message}`);
+    console.error('详情接口错误:', err);
+  } finally {
+    state.loading.list = false;
+  }
+}
+
+/**
+ * 一键保存修改
+ */
+const editApprovalSheet = async () => {
+  state.loading.list = true;
+  try {
+    // 只提交修改过的数据（从Map中获取）
+    const modifiedData = Array.from(editDataMap.value.values());
+    if (modifiedData.length === 0) {
+      ElMessage.info('没有数据需要修改');
+      return;
+    }
+
+    await totalSupplyplanBatchEdit(modifiedData);
+    ElMessage.success('修改成功');
+    getMasterDataList(); // 重新加载数据
+  } catch (error) {
+    ElMessage.error(`保存失败：${error.message}`);
+  } finally {
+    state.loading.list = false;
+  }
+};
+
+/**
+ * 提交表单
+ */
+const handleSubmit = async () => {
+  try {
+    await formRef.value.validate();
+    await materialChangeSupplyplan(formData);
+    ElMessage.success('修改成功');
+    handleClose();
+    getMasterDataList();
+  } catch (error) {
+    console.error('表单验证失败:', error);
+  }
+};
+
+/**
+ * 导出数据
+ */
+const handleExport = async () => {
+  proxy?.download('/design/totalsupplyplan/export', { projectId: currentProject.value?.id }, `物资供应总计划.xlsx`, true);
+};
+
+/**
+ * 关闭弹窗
+ */
+const handleClose = () => {
+  visible.value = false;
+  formRef.value?.resetFields();
+  Object.keys(formData).forEach((key) => {
+    formData[key] = undefined;
+  });
+};
+
+/**
+ * 审批
+ */
+function clickApprovalSheet1() {
+  proxy.$tab.closePage(proxy.$route);
+  proxy.$router.push({
+    path: `/approval/overallPlanMaterialSupply/indexEdit`,
+    query: { id: state.masterData.id, type: 'update' }
+  });
+}
+
+/**
+ * 查看流程
+ */
+function lookApprovalFlow() {
+  proxy.$router.push({
+    path: `/approval/overallPlanMaterialSupply/indexEdit`,
+    query: { id: state.masterData.id, type: 'view' }
+  });
+}
+
+/**
+ * 监听项目变化
+ */
 const listeningProject = watch(
   () => currentProject.value?.id,
-  (nid, oid) => {
-    queryParams.value.projectId = nid;
-    form.value.projectId = nid;
-    getList();
+  (nid) => {
+    if (nid) getMasterDataList();
   }
 );
+
+// 导入成功处理
+const handleSuccess = () => {
+  ElMessage.success('导入成功');
+  getMasterDataList();
+};
+
+// 生命周期
+onMounted(() => {
+  if (currentProject.value?.id) {
+    getMasterDataList();
+  }
+});
+
 onUnmounted(() => {
   listeningProject();
+  loadingInstance.value?.close();
 });
 </script>
 
-<style scoped lang="scss">
-/* 文件上传样式 */
-.upload-file-list {
-  margin: 0;
-  .el-upload-list__item {
-    border: 1px solid #e4e7ed;
-    line-height: 2;
-    margin-bottom: 0;
-    position: relative;
-  }
+<style>
+.overall-plan-material-supply {
+  padding: 20px;
 }
 
-.upload-file-list .ele-upload-list__item-content {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  color: inherit;
-}
-
-/* PDF预览样式（若有） */
-.pdf {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-direction: column;
-  border-radius: 6px;
-  position: relative;
-  width: 100%;
-  img {
-    width: 40%;
-  }
-  &:hover {
-    .Shadow {
-      opacity: 1;
-    }
-  }
-  > span {
-    width: 100%;
-  }
-}
-
-.Shadow {
-  align-items: center;
-  background-color: rgba(0, 0, 0, 0.5);
-  color: #fff;
-  cursor: default;
-  display: inline-flex;
-  font-size: 20px;
-  height: 100%;
-  justify-content: center;
-  left: 0;
-  opacity: 0;
-  position: absolute;
-  top: 0;
-  transition: opacity 0.3s;
-  width: 100%;
-  z-index: 1;
-}
-
-/* 头像上传样式（备用） */
-.el-icon.avatar-uploader-icon {
-  border: 1px dashed #cdd0d6;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-  transition: 0.3s;
-  font-size: 28px;
-  color: #8c939d;
-  width: 200px;
-  height: 178px;
-  text-align: center;
-  &:hover {
-    border-color: #409eff;
-  }
-}
-
-/* 表格操作列样式 */
-.small-padding {
-  padding: 0 5px;
-}
-
-.fixed-width {
-  width: 120px;
-}
-
-/* 行间距调整 */
-.mb8 {
-  margin-bottom: 8px;
-}
-
-.mb-4 {
+.space-y-4 > .el-row {
   margin-bottom: 16px;
 }
+
+.space-y-4 > .el-row:last-child {
+  margin-bottom: 0;
+}
 </style>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 1b39f0c..f32c534 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -27,6 +27,9 @@
                 <el-form-item label="用户名称" prop="userName">
                   <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
                 </el-form-item>
+                <el-form-item label="用户昵称" prop="nickName">
+                  <el-input v-model="queryParams.nickName" placeholder="请输入用户昵称" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
                 <el-form-item label="手机号码" prop="phonenumber">
                   <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
                 </el-form-item>