diff --git a/hw-ui/src/views/board/fifthFloor/index.vue b/hw-ui/src/views/board/fifthFloor/index.vue
index 72675ee..1b82f70 100644
--- a/hw-ui/src/views/board/fifthFloor/index.vue
+++ b/hw-ui/src/views/board/fifthFloor/index.vue
@@ -25,8 +25,8 @@
             </el-form-item>
           </el-form>
           <div style="text-align: center">
-            <el-button type="primary" @click="getMaterials">领料</el-button>
-            <el-button :disabled="form.planDetailStatus === '已完成'" type="primary" @click="finish">完成</el-button>
+            <el-button type="primary" @click="getMaterials" :disabled="!form.planCode">领料</el-button>
+            <el-button :disabled="form.planDetailStatus === '已完成' || !form.planDetailStatus" type="primary" @click="finish">完成</el-button>
             <el-popover
               v-if="($route.query && $route.query.id) === '2'"
               v-model="assignModel"
@@ -230,7 +230,7 @@
       </el-form>
       <el-table
         :cell-style="{textAlign:'center'}"
-        :data="form.wmsRawOutstockDetailList"
+        :data="form1.wmsRawOutstockDetailList"
         :header-cell-style="{textAlign:'center'}"
         max-height="19.13vw"
         style="width: 100%"
@@ -984,9 +984,9 @@ export default {
       this.dialogVisible = true
       this.form1 = {
         warehouseId: '',
-        planId: this.form.row.planId,
-        planCode: this.form.row.planCode,
-        planDetailCode: this.form.row.planDetailCode,
+        planId: this.form?.planId,
+        planCode: this.form?.planCode,
+        planDetailCode: this.form?.planDetailCode,
         applyReason: '',
         taskType: '1',
         wmsRawOutstockDetailList: []
@@ -1006,7 +1006,7 @@ export default {
         warehouseId: this.form1.warehouseId,
         materialName: val
       }).then(e => {
-        this.form1.wmsRawOutstockDetailList = e.data.map(r => {
+        this.$set(this.form1,'wmsRawOutstockDetailList',e.data.map(r => {
           return {
             materialId: r.materialId,
             materialCode: r.materialCode,
@@ -1015,7 +1015,8 @@ export default {
             unavailableAmount: r.occupyAmount + r.frozenAmount,
             planAmount: r.planAmount
           }
-        })
+        }))
+        console.log(this.form1)
       })
     },
 
@@ -1023,7 +1024,7 @@ export default {
     warehouseChange(warehouseId) {
       this.form.wmsRawOutstockDetailList = [];
       this.form.warehouseId = warehouseId;
-      this.getStockTotal();
+      this.searchMaterial('');
     },
 
     receiveMaterial() {