diff --git a/.env.development b/.env.development
index faff5a9..beee2bd 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.209:8899'
 # 曾涛
 # VITE_APP_BASE_API = 'http://192.168.110.180:8899'
 # 罗成
diff --git a/src/views/materials/overallPlanMaterialSupply/index.vue b/src/views/materials/overallPlanMaterialSupply/index.vue
index f0920b1..4106dc8 100644
--- a/src/views/materials/overallPlanMaterialSupply/index.vue
+++ b/src/views/materials/overallPlanMaterialSupply/index.vue
@@ -11,9 +11,6 @@
             <el-form-item v-if="state.masterData.status == 'waiting' || state.masterData.status == 'finish'">
               <el-button icon="view" @click="lookApprovalFlow()" type="warning">查看流程</el-button>
             </el-form-item>
-            <el-form-item>
-              <el-button icon="Finished" @click="editApprovalSheet()" type="success">保存</el-button>
-            </el-form-item>
             <el-form-item>
               <file-upload
                 upload-url="/design/totalsupplyplan/import"
@@ -22,11 +19,16 @@
                 :file-type="['xls', 'xlsx']"
                 :on-upload-success="handleSuccess"
               >
-                <el-button type="primary" plain icon="Compass">导入</el-button>
+                <el-button :disabled="state.masterData.status == 'finish'" type="primary" plain icon="upload">导入</el-button>
               </file-upload>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" plain icon="Filter" @click="handleExport">导出</el-button>
+              <el-button type="primary" plain icon="Download" @click="handleExport">导出</el-button>
+            </el-form-item>
+            <el-form-item>
+              <el-button icon="Finished" @click="editApprovalSheet()" type="success" :disabled="state.masterData.status == 'finish'"
+                >一键全部保存</el-button
+              >
             </el-form-item>
           </el-form>
           <right-toolbar @queryTable="getMasterDataList"></right-toolbar>
@@ -42,40 +44,77 @@
       border
       :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
     >
-      <el-table-column prop="num" label="编号" />
+      <el-table-column align="center" prop="num" label="编号" />
       <el-table-column prop="name" label="工程或费用名称" width="180" />
       <el-table-column prop="unit" label="单位" />
-      <el-table-column prop="specification" label="规格型号" />
-      <el-table-column prop="quantity" label="数量" width="60" />
+      <el-table-column prop="specification" label="规格型号" width="80" />
+      <el-table-column prop="quantity" label="数量" width="100" />
       <el-table-column prop="batchNumber" label="批次号" width="200" />
       <el-table-column prop="brand" label="品牌">
         <template #default="{ row }">
-          <el-input v-model="row.brand" placeholder="" clearable />
+          <el-input
+            v-model="row.brand"
+            :disabled="state.masterData.status != 'draft'"
+            v-if="!(row.children && row.children.length > 0)"
+            placeholder=""
+            clearable
+          />
         </template>
       </el-table-column>
       <el-table-column prop="texture" label="材质">
         <template #default="{ row }">
-          <el-input v-model="row.texture" placeholder="" clearable />
+          <el-input
+            v-model="row.texture"
+            :disabled="state.masterData.status != 'draft'"
+            v-if="!(row.children && row.children.length > 0)"
+            placeholder=""
+            clearable
+          />
         </template>
       </el-table-column>
       <el-table-column prop="qualityStandard" label="质量标准">
         <template #default="{ row }">
-          <el-input v-model="row.qualityStandard" placeholder="" clearable />
+          <el-input
+            :disabled="state.masterData.status != 'draft'"
+            v-model="row.qualityStandard"
+            v-if="!(row.children && row.children.length > 0)"
+            placeholder=""
+            clearable
+          />
         </template>
       </el-table-column>
       <el-table-column prop="partUsed" label="使用部位">
         <template #default="{ row }">
-          <el-input v-model="row.partUsed" placeholder="" clearable />
+          <el-input
+            :disabled="state.masterData.status != 'draft'"
+            v-model="row.partUsed"
+            v-if="!(row.children && row.children.length > 0)"
+            placeholder=""
+            clearable
+          />
         </template>
       </el-table-column>
       <el-table-column prop="deliveryPoints" label="交货地点">
         <template #default="{ row }">
-          <el-input v-model="row.deliveryPoints" placeholder="" clearable />
+          <el-input
+            :disabled="state.masterData.status != 'draft'"
+            v-model="row.deliveryPoints"
+            v-if="!(row.children && row.children.length > 0)"
+            placeholder=""
+            clearable
+          />
         </template>
       </el-table-column>
-      <el-table-column label="预计使用日期">
+      <el-table-column label="预计使用日期" width="150">
         <template #default="{ row }">
-          <el-date-picker v-model="row.dateService" type="date" value-format="YYYY-MM-DD" placeholder="" />
+          <el-date-picker
+            v-model="row.dateService"
+            v-if="!(row.children && row.children.length > 0)"
+            type="date"
+            value-format="YYYY-MM-DD"
+            :disabled="state.masterData.status != 'draft'"
+            placeholder="请选择日期"
+          />
         </template>
       </el-table-column>
       <el-table-column prop="remark" label="备注" />
diff --git a/src/views/materials/usageMaterials/purchase/index.vue b/src/views/materials/usageMaterials/purchase/index.vue
index e2778d1..8377948 100644
--- a/src/views/materials/usageMaterials/purchase/index.vue
+++ b/src/views/materials/usageMaterials/purchase/index.vue
@@ -1,25 +1,13 @@
 <template>
   <div style="padding: 20px">
-    <el-card class="mb-5">
-      <el-button
-        type="primary"
-        v-hasPermi="['cailiaoshebei:physicalsupply:add']"
-        icon="Plus"
-        @click="handleAdd"
-        class="transition-all duration-200 hover:shadow-md"
-      >
-        新增
-      </el-button>
-      <el-button
-        v-hasPermi="['cailiaoshebei:physicalsupply:list']"
-        icon="Refresh"
-        @click="refreshData"
-        class="transition-all duration-200 hover:shadow-md"
-      >
-        刷新
-      </el-button>
+    <el-card class="mb-5" shadow="never">
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+        </el-col>
+        <right-toolbar @queryTable="refreshData"></right-toolbar>
+      </el-row>
     </el-card>
-
     <!-- 数据表格 -->
     <div class="bg-white rounded-lg shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md">
       <el-table
@@ -258,7 +246,6 @@ const formRules = reactive({
 const queryParams = reactive({
   pageSize: 10,
   pageNum: 1,
-  findType: 1,
   projectId: currentProject.value?.id
 });