diff --git a/src/views/formalities/formalitiesAreConsolidated/index.vue b/src/views/formalities/formalitiesAreConsolidated/index.vue
index 6e096e2..eaa3a62 100644
--- a/src/views/formalities/formalitiesAreConsolidated/index.vue
+++ b/src/views/formalities/formalitiesAreConsolidated/index.vue
@@ -90,14 +90,7 @@
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['formalities:formalitiesAreConsolidated:edit']"
                 >修改</el-button
               >
-              <el-button
-                link
-                type="primary"
-                icon="Upload"
-                @click="handleUpload(scope.row)"
-                v-hasPermi="['formalities:formalitiesAreConsolidated:edit']"
-                >上传</el-button
-              >
+              <el-button link type="primary" icon="Upload" @click="handleUpload(scope.row)">上传</el-button>
               <el-button
                 link
                 type="primary"
diff --git a/src/views/materials/appointment/index.vue b/src/views/materials/appointment/index.vue
index 45f9b8a..c142742 100644
--- a/src/views/materials/appointment/index.vue
+++ b/src/views/materials/appointment/index.vue
@@ -6,7 +6,14 @@
         <h2 class="text-2xl font-bold flex items-center"><i class="el-icon-user-circle mr-3"></i>人员配置</h2>
         <p class="text-blue-100 mt-2 opacity-90">请配置采购专员信息</p>
         <!-- ，带 <span class="text-red-300">*</span> 为必填项 -->
-        <el-button @click="isDisabled = false" class="px-8 py-2.5 transition-all duration-300 font-medium" v-if="isDisabled"> 点击编辑 </el-button>
+        <el-button
+          @click="isDisabled = false"
+          class="px-8 py-2.5 transition-all duration-300 font-medium"
+          v-if="isDisabled"
+          v-hasPermi="['cailiaoshebei:purchaseUser:addOrUpdate']"
+        >
+          点击编辑
+        </el-button>
       </div>
 
       <!-- 表单内容区域 -->
@@ -31,6 +38,7 @@
             @click="submitForm"
             icon="Check"
             class="px-8 py-2.5 transition-all duration-300 transform hover:scale-105 bg-blue-500 hover:bg-blue-600 text-white font-medium"
+            v-hasPermi="['cailiaoshebei:purchaseUser:addOrUpdate']"
           >
             确认提交
           </el-button>
diff --git a/src/views/materials/batchPlan/index.vue b/src/views/materials/batchPlan/index.vue
index 8e6fbfa..1c14d89 100644
--- a/src/views/materials/batchPlan/index.vue
+++ b/src/views/materials/batchPlan/index.vue
@@ -7,10 +7,26 @@
           <template #header>
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5" :offset="0"
-                ><el-button type="primary" size="default" @click="handleAdd" icon="FolderAdd" plain>新增</el-button></el-col
+                ><el-button
+                  type="primary"
+                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:add']"
+                  size="default"
+                  @click="handleAdd"
+                  icon="FolderAdd"
+                  plain
+                  >新增</el-button
+                ></el-col
               >
               <el-col :span="1.5" :offset="0"
-                ><el-button type="danger" size="default" @click="handleDeleteBatch" icon="FolderDelete" plain>删除</el-button></el-col
+                ><el-button
+                  type="danger"
+                  size="default"
+                  v-hasPermi="['cailiaoshebei:batchPlan:remove']"
+                  @click="handleDeleteBatch"
+                  icon="FolderDelete"
+                  plain
+                  >删除</el-button
+                ></el-col
               >
             </el-row>
           </template>
@@ -159,17 +175,7 @@
 </template>
 
 <script setup name="Cailiaoshebei" lang="ts">
-import {
-  listCailiaoshebei,
-  getCailiaoshebei,
-  delCailiaoshebei,
-  addCailiaoshebei,
-  updateCailiaoshebei,
-  listBatch,
-  getBatch,
-  delBatch,
-  listSelectCailiaoshebei
-} from '@/api/materials/batchPlan';
+import { getCailiaoshebei, updateCailiaoshebei, listBatch, getBatch, delBatch, listSelectCailiaoshebei } from '@/api/materials/batchPlan';
 import { CailiaoshebeiVO, CailiaoshebeiQuery, CailiaoshebeiForm } from '@/api/materials/batchPlan/types';
 import { useUserStoreHook } from '@/store/modules/user';
 
@@ -374,23 +380,6 @@ const handleUpdata = () => {
   dialog.title = '修改物资-需求';
 };
 
-/** 提交按钮 */
-const submitForm = async () => {
-  buttonLoading.value = true;
-  cailiaoshebeiList.value.forEach((item) => {
-    if (item.id) {
-      delete item.id;
-    }
-  });
-  await addCailiaoshebei({
-    addDataList: cailiaoshebeiList.value,
-    batchNumber: form.value.batchNumber,
-    projectId: currentProject.value?.id
-  } as any).finally(() => (buttonLoading.value = false));
-  proxy?.$modal.msgSuccess('操作成功');
-  dialog.visible = false;
-};
-
 /** 提交数据 */
 const submitTransferForm = async () => {
   const result = validateAndClean(form.value.planList);
diff --git a/src/views/materials/usageMaterials/material/indexSon.vue b/src/views/materials/usageMaterials/material/indexSon.vue
index fddd21e..2dac32d 100644
--- a/src/views/materials/usageMaterials/material/indexSon.vue
+++ b/src/views/materials/usageMaterials/material/indexSon.vue
@@ -1,120 +1,117 @@
 <template>
-    <div class="p-5">
-        <el-card class="mb-5">
-            <el-button type="primary" icon="Plus" @click="handleAdd"
-                class="transition-all duration-200 hover:shadow-md">
-                新增
-            </el-button>
-            <el-button icon="Refresh" @click="refreshData" class="transition-all duration-200 hover:shadow-md">
-                刷新
-            </el-button>
-        </el-card>
-        <div class="bg-white rounded-lg shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md">
-            <!-- 数据表格 -->
-            <el-table v-loading="loading" :data="tableData" stripe
-                :header-cell-style="{ 'background-color': '#f5f7fa', 'font-weight': 'bold' }"
-                style="width: 100%; margin-bottom: 20px; height: calc(100vh - 305px)"
-                :row-class-name="tableRowClassName">
-                <!-- 基础信息列 -->
-                <el-table-column prop="id" label="ID" width="180" align="center"></el-table-column>
-                <el-table-column prop="batch" label="批次" align="center"></el-table-column>
-                <el-table-column prop="physicalsupplyId" label="使用情况ID" width="180" align="center"></el-table-column>
-                <!-- 时间相关列 -->
-                <el-table-column prop="issuanceTime" label="联系单下达时间" min-width="160" align="center">
-                    <template #default="scope">
-                        {{ formatDate(scope.row.issuanceTime) }}
-                    </template>
-                </el-table-column>
-                <el-table-column prop="requireDelivery" label="要求到货时间" min-width="160" align="center">
-                    <template #default="scope">
-                        {{ formatDate(scope.row.requireDelivery) }}
-                    </template>
-                </el-table-column>
-                <el-table-column prop="scheduledDelivery" label="计划到货时间" min-width="160" align="center">
-                    <template #default="scope">
-                        {{ formatDate(scope.row.scheduledDelivery) }}
-                    </template>
-                </el-table-column>
-                <el-table-column prop="actualDelivery" label="实际到货时间" min-width="160" align="center">
-                    <template #default="scope">
-                        {{ formatDate(scope.row.actualDelivery) }}
-                    </template>
-                </el-table-column>
-                <el-table-column prop="acceptanceCheck" label="验收移交时间" min-width="160" align="center">
-                    <template #default="scope">
-                        {{ formatDate(scope.row.acceptanceCheck) }}
-                    </template>
-                </el-table-column>
+  <div class="p-5">
+    <el-card class="mb-5">
+      <el-button type="primary" icon="Plus" @click="handleAdd" class="transition-all duration-200 hover:shadow-md"> 新增 </el-button>
+      <el-button icon="Refresh" @click="refreshData" class="transition-all duration-200 hover:shadow-md"> 刷新 </el-button>
+    </el-card>
+    <div class="bg-white rounded-lg shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md">
+      <!-- 数据表格 -->
+      <el-table
+        v-loading="loading"
+        :data="tableData"
+        stripe
+        :header-cell-style="{ 'background-color': '#f5f7fa', 'font-weight': 'bold' }"
+        style="width: 100%; margin-bottom: 20px; height: calc(100vh - 305px)"
+        :row-class-name="tableRowClassName"
+      >
+        <!-- 基础信息列 -->
+        <el-table-column prop="id" label="ID" width="180" align="center"></el-table-column>
+        <el-table-column prop="batch" label="批次" align="center"></el-table-column>
+        <el-table-column prop="physicalsupplyId" label="使用情况ID" width="180" align="center"></el-table-column>
+        <!-- 时间相关列 -->
+        <el-table-column prop="issuanceTime" label="联系单下达时间" min-width="160" align="center">
+          <template #default="scope">
+            {{ formatDate(scope.row.issuanceTime) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="requireDelivery" label="要求到货时间" min-width="160" align="center">
+          <template #default="scope">
+            {{ formatDate(scope.row.requireDelivery) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="scheduledDelivery" label="计划到货时间" min-width="160" align="center">
+          <template #default="scope">
+            {{ formatDate(scope.row.scheduledDelivery) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="actualDelivery" label="实际到货时间" min-width="160" align="center">
+          <template #default="scope">
+            {{ formatDate(scope.row.actualDelivery) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="acceptanceCheck" label="验收移交时间" min-width="160" align="center">
+          <template #default="scope">
+            {{ formatDate(scope.row.acceptanceCheck) }}
+          </template>
+        </el-table-column>
 
-                <!-- 数量相关列 -->
-                <el-table-column prop="requiredQuantity" label="要求到货数量" min-width="120" align="right"></el-table-column>
-                <el-table-column prop="plannedQuantity" label="计划到货数量" min-width="120" align="right"></el-table-column>
-                <el-table-column prop="actualAcceptance" label="实际验收数量" min-width="120" align="right"></el-table-column>
-                <el-table-column prop="differenceQuantity" label="差异量" min-width="100" align="right">
-                    <template #default="scope">
-                        <span
-                            :class="scope.row.differenceQuantity && parseFloat(scope.row.differenceQuantity) !== 0 ? 'text-red-500' : ''">
-                            {{ scope.row.differenceQuantity || '-' }}
-                        </span>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="dhDifferenceQuantity" label="到货差异量" min-width="120"
-                    align="right"></el-table-column>
+        <!-- 数量相关列 -->
+        <el-table-column prop="requiredQuantity" label="要求到货数量" min-width="120" align="right"></el-table-column>
+        <el-table-column prop="plannedQuantity" label="计划到货数量" min-width="120" align="right"></el-table-column>
+        <el-table-column prop="actualAcceptance" label="实际验收数量" min-width="120" align="right"></el-table-column>
+        <el-table-column prop="differenceQuantity" label="差异量" min-width="100" align="right">
+          <template #default="scope">
+            <span :class="scope.row.differenceQuantity && parseFloat(scope.row.differenceQuantity) !== 0 ? 'text-red-500' : ''">
+              {{ scope.row.differenceQuantity || '-' }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="dhDifferenceQuantity" label="到货差异量" min-width="120" align="right"></el-table-column>
 
-                <!-- 金额相关列 -->
-                <el-table-column prop="cargoAmount" label="货物金额" min-width="120" align="right">
-                    <template #default="scope">
-                        {{ scope.row.cargoAmount }}
-                    </template>
-                </el-table-column>
-                <el-table-column prop="advance" label="预付款" min-width="100" align="right">
-                    <template #default="scope">
-                        {{ scope.row.advance }}
-                    </template>
-                </el-table-column>
-                <el-table-column prop="feed" label="投料款" min-width="100" align="right">
-                    <template #default="scope">
-                        {{ scope.row.feed }}
-                    </template>
-                </el-table-column>
-                <el-table-column prop="acceptancePayment" label="到货验收款" min-width="120" align="right">
-                    <template #default="scope">
-                        {{ scope.row.acceptancePayment }}
-                    </template>
-                </el-table-column>
-                <el-table-column prop="debugging" label="调试款" min-width="100" align="right">
-                    <template #default="scope">
-                        {{ scope.row.debugging }}
-                    </template>
-                </el-table-column>
-                <el-table-column prop="qualityGuarantee" label="质保金" min-width="100" align="right">
-                    <template #default="scope">
-                        {{ scope.row.qualityGuarantee }}
-                    </template>
-                </el-table-column>
-                <el-table-column prop="settlementAmount" label="结算金额" min-width="120" align="right">
-                    <template #default="scope">
-                        {{ scope.row.settlementAmount }}
-                    </template>
-                </el-table-column>
+        <!-- 金额相关列 -->
+        <el-table-column prop="cargoAmount" label="货物金额" min-width="120" align="right">
+          <template #default="scope">
+            {{ scope.row.cargoAmount }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="advance" label="预付款" min-width="100" align="right">
+          <template #default="scope">
+            {{ scope.row.advance }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="feed" label="投料款" min-width="100" align="right">
+          <template #default="scope">
+            {{ scope.row.feed }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="acceptancePayment" label="到货验收款" min-width="120" align="right">
+          <template #default="scope">
+            {{ scope.row.acceptancePayment }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="debugging" label="调试款" min-width="100" align="right">
+          <template #default="scope">
+            {{ scope.row.debugging }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="qualityGuarantee" label="质保金" min-width="100" align="right">
+          <template #default="scope">
+            {{ scope.row.qualityGuarantee }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="settlementAmount" label="结算金额" min-width="120" align="right">
+          <template #default="scope">
+            {{ scope.row.settlementAmount }}
+          </template>
+        </el-table-column>
 
-                <!-- 状态和备注列 -->
-                <el-table-column prop="expectedState" label="逾期状态" min-width="100" align="center">
-                    <template #default="scope">
-                        <!-- :type="getTagType(scope.row.expectedState)" -->
-                        <el-tag :effect="scope.row.expectedState ? 'dark' : 'plain'">
-                            {{ scope.row.expectedState || '-' }}
-                        </el-tag>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="associate" label="交接方式" min-width="120"></el-table-column>
-                <el-table-column prop="deliveryRequirements" label="到货要求" min-width="150"></el-table-column>
-                <el-table-column prop="transition" label="转换为合同" min-width="120" align="center">
-                    <!-- <template #default="scope"> -->
-                    <!-- <el-switch v-model="scope.row.transition" active-value="是" inactive-value="否"
+        <!-- 状态和备注列 -->
+        <el-table-column prop="expectedState" label="逾期状态" min-width="100" align="center">
+          <template #default="scope">
+            <!-- :type="getTagType(scope.row.expectedState)" -->
+            <el-tag :effect="scope.row.expectedState ? 'dark' : 'plain'">
+              {{ scope.row.expectedState || '-' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="associate" label="交接方式" min-width="120"></el-table-column>
+        <el-table-column prop="deliveryRequirements" label="到货要求" min-width="150"></el-table-column>
+        <el-table-column prop="transition" label="转换为合同" min-width="120" align="center">
+          <!-- <template #default="scope"> -->
+          <!-- <el-switch v-model="scope.row.transition" active-value="是" inactive-value="否"
                                             @change="handleTransitionChange(scope.row)"></el-switch> -->
-                    <!-- </template> -->
-                </el-table-column>
+          <!-- </template> -->
+        </el-table-column>
 
                 <!-- 备注信息列（可展开） -->
                 <el-table-column label="备注信息" min-width="120">
@@ -137,27 +134,28 @@
                     </template>
                 </el-table-column>
 
-                <!-- 操作列 -->
-                <el-table-column label="操作" min-width="120" align="center" fixed="right">
-                    <template #default="scope">
-                        <el-button size="small" icon="Edit" @click="handleEdit2(scope.row)"
-                            class="text-blue-600 hover:text-blue-800 transition-colors"></el-button>
-                        <el-button size="small" icon="Delete" @click="handleDelete2(scope.row)"
-                            class="text-red-600 hover:text-red-800 transition-colors"></el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <!-- 分页 -->
-            <div class="flex flex-wrap items-center justify-between p-4 border-t gap-4">
-                <div class="text-gray-500 text-sm">
-                    共 {{ total }} 条记录，当前显示第 {{ (currentPage - 1) * pageSize + 1 }} 至 {{
-                        Math.min(currentPage * pageSize, total)
-                    }} 条
-                </div>
-                <el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize"
-                    :page-sizes="[10, 20, 50, 100]" :total="total" layout="prev, pager, next, jumper, sizes"
-                    @size-change="handleSizeChange" @current-change="handleCurrentChange" small></el-pagination>
-            </div>
+        <!-- 操作列 -->
+        <el-table-column label="操作" min-width="120" align="center" fixed="right">
+          <template #default="scope">
+            <el-button
+              size="small"
+              icon="Edit"
+              @click="handleEdit2(scope.row)"
+              class="text-blue-600 hover:text-blue-800 transition-colors"
+            ></el-button>
+            <el-button
+              size="small"
+              icon="Delete"
+              @click="handleDelete2(scope.row)"
+              class="text-red-600 hover:text-red-800 transition-colors"
+            ></el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 分页 -->
+      <div class="flex flex-wrap items-center justify-between p-4 border-t gap-4">
+        <div class="text-gray-500 text-sm">
+          共 {{ total }} 条记录，当前显示第 {{ (currentPage - 1) * pageSize + 1 }} 至 {{ Math.min(currentPage * pageSize, total) }} 条
         </div>
         <el-dialog v-model="dialogVisible2" :title="dialogType2 === 'addSon' ? '新增采购信息' : '编辑采购信息'" :width="dialogWidth"
             :fullscreen="isFullscreen" :close-on-click-modal="false" :before-close="handleClose" destroy-on-close>
@@ -373,7 +371,7 @@
 </template>
 <script setup>
 import { ref, reactive, onMounted, toRaw, getCurrentInstance } from 'vue';
-import { materialsUsageDetails, materialsSonAdd, materialsSonDel, materialsSonEdit } from "@/api/materials/usageMaterials/index";
+import { materialsUsageDetails, materialsSonAdd, materialsSonDel, materialsSonEdit } from '@/api/materials/usageMaterials/index';
 import { routerRename } from '@/api/air';
 const { proxy } = getCurrentInstance();
 const dialogVisible2 = ref(false);
@@ -383,162 +381,174 @@ const currentRow2 = ref(null);
 const tableData = ref([]);
 const loading = ref(false);
 const submitLoading = ref(false);
-const routeParams = ref({})
+const routeParams = ref({});
 const currentPage = ref(1);
 const total = ref(0);
 const pageSize = ref(10);
 const formRef = ref(null);
 const deleteLoading = ref(false);
 const tableRowClassName = ({ row, rowIndex }) => {
-    return rowIndex % 2 === 0 ? 'bg-white' : 'bg-gray-50';
+  return rowIndex % 2 === 0 ? 'bg-white' : 'bg-gray-50';
 };
 const form = reactive({
-    id: '',
-    acceptanceCheck: '',
-    acceptancePayment: '',
-    actualAcceptance: '',
-    actualDelivery: '',
-    advance: '',
-    associate: '',
-    batch: '',
-    cargoAmount: '',
-    cgRemark: '',
-    createTime: '',
-    debugging: '',
-    deliveryRequirements: '',
-    dhDifferenceQuantity: '',
-    dhRemark: '',
-    differenceQuantity: '',
-    expectedState: '',
-    feed: '',
-    gysRemark: '',
-    issuanceTime: '',
-    jsRemark: '',
-    physicalsupplyId: null,
-    plannedQuantity: '',
-    qualityGuarantee: '',
-    requireDelivery: '',
-    requiredQuantity: '',
-    scheduledDelivery: '',
-    settlementAmount: '',
-    transition: '',
-    updateBy: null,
-    updateTime: ''
+  id: '',
+  acceptanceCheck: '',
+  acceptancePayment: '',
+  actualAcceptance: '',
+  actualDelivery: '',
+  advance: '',
+  associate: '',
+  batch: '',
+  cargoAmount: '',
+  cgRemark: '',
+  createTime: '',
+  debugging: '',
+  deliveryRequirements: '',
+  dhDifferenceQuantity: '',
+  dhRemark: '',
+  differenceQuantity: '',
+  expectedState: '',
+  feed: '',
+  gysRemark: '',
+  issuanceTime: '',
+  jsRemark: '',
+  physicalsupplyId: null,
+  plannedQuantity: '',
+  qualityGuarantee: '',
+  requireDelivery: '',
+  requiredQuantity: '',
+  scheduledDelivery: '',
+  settlementAmount: '',
+  transition: '',
+  updateBy: null,
+  updateTime: ''
 });
 const handleAdd = () => {
-    dialogVisible2.value = true;
-    dialogType2.value = 'addSon';
-    resetForm();
-}
+  dialogVisible2.value = true;
+  dialogType2.value = 'addSon';
+  resetForm();
+};
 const resetForm = () => {
-    if (formRef.value) {
-        formRef.value.resetFields();
-    }
+  if (formRef.value) {
+    formRef.value.resetFields();
+  }
 
-    // 重置表单数据
-    Object.keys(form).forEach(key => {
-        form[key] = '';
-    });
+  // 重置表单数据
+  Object.keys(form).forEach((key) => {
+    form[key] = '';
+  });
 
-    // 设置默认值
-    form.findType = 1;
-    form.id = '';
+  // 设置默认值
+  form.findType = 1;
+  form.id = '';
 };
 
 const handleEdit2 = (row) => {
-    dialogType2.value = 'editSon';
-    currentRow2.value = row;
-    resetForm();
+  dialogType2.value = 'editSon';
+  currentRow2.value = row;
+  resetForm();
 
-    // 填充表单数据
-    Object.keys(form).forEach(key => {
-        if (row.hasOwnProperty(key)) {
-            form[key] = row[key];
-        }
-    });
+  // 填充表单数据
+  Object.keys(form).forEach((key) => {
+    if (row.hasOwnProperty(key)) {
+      form[key] = row[key];
+    }
+  });
 
-    dialogVisible2.value = true;
+  dialogVisible2.value = true;
 };
 const handleDelete2 = (row) => {
-    currentRow2.value = row;
-    ElMessageBox.confirm(
-        '确定要删除这条记录吗？此操作不可撤销，请谨慎操作',
-        '提示',
-        {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-        }
-    ).then(() => {
-        confirmDelete();
-    }).catch(() => {
-        ElMessage({
-            type: 'info',
-            message: '已取消删除',
-        })
+  currentRow2.value = row;
+  ElMessageBox.confirm('确定要删除这条记录吗？此操作不可撤销，请谨慎操作', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning'
+  })
+    .then(() => {
+      confirmDelete();
     })
+    .catch(() => {
+      ElMessage({
+        type: 'info',
+        message: '已取消删除'
+      });
+    });
 };
 const confirmDelete = async () => {
-    if (!currentRow2.value) return;
+  if (!currentRow2.value) return;
 
-    deleteLoading.value = true;
-    try {
-        // 模拟API请求
-        const res = await materialsSonDel(currentRow2.value.id)
-        const { code } = res;
-        if (code === 200) {
-            ElMessage.success('删除成功');
-            deleteDialogVisible2.value = false;
-            materialsUsageDetails1();
-        } else {
-            ElMessage.error('删除失败');
-        }
-    } catch (error) {
-        ElMessage.error('删除失败：' + error.message);
-        console.error(error);
-    } finally {
-        deleteLoading.value = false;
+  deleteLoading.value = true;
+  try {
+    // 模拟API请求
+    const res = await materialsSonDel(currentRow2.value.id);
+    const { code } = res;
+    if (code === 200) {
+      ElMessage.success('删除成功');
+      deleteDialogVisible2.value = false;
+      materialsUsageDetails1();
+    } else {
+      ElMessage.error('删除失败');
     }
+  } catch (error) {
+    ElMessage.error('删除失败：' + error.message);
+    console.error(error);
+  } finally {
+    deleteLoading.value = false;
+  }
 };
 const handleSubmit = async () => {
-    if (!formRef.value) return;
-    // 表单验证
-    const valid = await formRef.value.validate();
-    if (!valid) return;
+  if (!formRef.value) return;
+  // 表单验证
+  const valid = await formRef.value.validate();
+  if (!valid) return;
 
-    submitLoading.value = true;
+  submitLoading.value = true;
 
-    try {
-        // 准备提交的数据
-        const submitData = { ...toRaw(form) };
+  try {
+    // 准备提交的数据
+    const submitData = { ...toRaw(form) };
 
-        // 如果是新增，清除id
-        if (dialogType2.value === 'addSon') {
-            submitData.physicalsupplyId = routeParams.value.id
-            const res = await materialsSonAdd(submitData)
-            const { code } = res;
-            if (code === 200) {
-                ElMessage.success('新增成功');
-                materialsUsageDetails1();
-            }
-        } else {
-            const res = await materialsSonEdit(submitData)
-            const { code } = res;
-            if (code === 200) {
-                ElMessage.success('保存成功');
-                materialsUsageDetails1();
-            }
-        }
-        // 重置表单
-        resetForm();
-    } catch (error) {
-        ElMessage.error(`${dialogType2 === 'addSon' ? '新增' : '保存'}失败: ${error.message}`);
-    } finally {
-        submitLoading.value = false;
-        dialogVisible2.value = false;
+    // 如果是新增，清除id
+    if (dialogType2.value === 'addSon') {
+      submitData.physicalsupplyId = routeParams.value.id;
+      const res = await materialsSonAdd(submitData);
+      const { code } = res;
+      if (code === 200) {
+        ElMessage.success('新增成功');
+        materialsUsageDetails1();
+      }
+    } else {
+      const res = await materialsSonEdit(submitData);
+      const { code } = res;
+      if (code === 200) {
+        ElMessage.success('保存成功');
+        materialsUsageDetails1();
+      }
     }
+    // 重置表单
+    resetForm();
+  } catch (error) {
+    ElMessage.error(`${dialogType2 === 'addSon' ? '新增' : '保存'}失败: ${error.message}`);
+  } finally {
+    submitLoading.value = false;
+    dialogVisible2.value = false;
+  }
 };
 const materialsUsageDetails1 = () => {
+<<<<<<< HEAD
+  loading.value = true;
+  materialsUsageDetails({ physicalsupplyId: routeParams.value.id })
+    .then((res) => {
+      tableData.value = res.rows;
+    })
+    .catch(() => {
+      loading.value = false;
+    })
+    .finally(() => {
+      loading.value = false;
+    });
+};
+=======
     loading.value = true;
     materialsUsageDetails({ physicalsupplyId: routeParams.value.id }).then(res => {
         tableData.value = res.rows
@@ -548,32 +558,34 @@ const materialsUsageDetails1 = () => {
         loading.value = false;
     })
 }
+>>>>>>> 8f9972343a005ce4424fbf2e3b2388060c854b5f
 // 格式化日期
 const formatDate = (dateString) => {
-    if (!dateString) return '-';
-    const date = new Date(dateString);
-    return date.toLocaleString('zh-CN', {
-        year: 'numeric',
-        month: '2-digit',
-        day: '2-digit',
-        hour: '2-digit',
-        minute: '2-digit',
-        second: '2-digit'
-    }).replace(',', ' ');
+  if (!dateString) return '-';
+  const date = new Date(dateString);
+  return date
+    .toLocaleString('zh-CN', {
+      year: 'numeric',
+      month: '2-digit',
+      day: '2-digit',
+      hour: '2-digit',
+      minute: '2-digit',
+      second: '2-digit'
+    })
+    .replace(',', ' ');
 };
 function handleCancel() {
-    dialogVisible2.value = false;
-    currentRow2.value = null;
+  dialogVisible2.value = false;
+  currentRow2.value = null;
 }
 const refreshData = () => {
-    materialsUsageDetails1();
-    ElMessage.success('数据已刷新');
+  materialsUsageDetails1();
+  ElMessage.success('数据已刷新');
 };
-function handleSizeChange() { }
+function handleSizeChange() {}
 onMounted(() => {
-    routeParams.value = proxy.$route.query;
-    console.log('routeParams.value', routeParams.value);
-    materialsUsageDetails1();
-})
-
-</script>
\ No newline at end of file
+  routeParams.value = proxy.$route.query;
+  console.log('routeParams.value', routeParams.value);
+  materialsUsageDetails1();
+});
+</script>