diff --git a/klp-ui/src/views/wms/coil/do/packing.vue b/klp-ui/src/views/wms/coil/do/packing.vue
index 0a14fa73..8dc97806 100644
--- a/klp-ui/src/views/wms/coil/do/packing.vue
+++ b/klp-ui/src/views/wms/coil/do/packing.vue
@@ -47,7 +47,10 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="班组" prop="team">
-                  <el-input v-model="form.team" placeholder="请输入班组" />
+                  <el-select v-model="form.team" placeholder="请选择班组" style="width: 100%" :disabled="readonly">
+                    <el-option key="甲" label="甲" value="甲" />
+                    <el-option key="乙" label="乙" value="乙" />
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
diff --git a/klp-ui/src/views/wms/coil/do/search.vue b/klp-ui/src/views/wms/coil/do/search.vue
index 7b474cba..29113546 100644
--- a/klp-ui/src/views/wms/coil/do/search.vue
+++ b/klp-ui/src/views/wms/coil/do/search.vue
@@ -41,7 +41,10 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="班组" prop="team">
-                  <el-input v-model="form.team" placeholder="请输入班组" />
+                  <el-select v-model="form.team" placeholder="请选择班组" style="width: 100%" :disabled="readonly">
+                    <el-option key="甲" label="甲" value="甲" />
+                    <el-option key="乙" label="乙" value="乙" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
diff --git a/klp-ui/src/views/wms/coil/do/ship.vue b/klp-ui/src/views/wms/coil/do/ship.vue
index 8274e988..0d5ef89b 100644
--- a/klp-ui/src/views/wms/coil/do/ship.vue
+++ b/klp-ui/src/views/wms/coil/do/ship.vue
@@ -46,7 +46,10 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="班组" prop="team">
-                  <el-input v-model="form.team" placeholder="请输入班组" />
+                  <el-select v-model="form.team" placeholder="请选择班组" style="width: 100%" :disabled="readonly">
+                    <el-option key="甲" label="甲" value="甲" />
+                    <el-option key="乙" label="乙" value="乙" />
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
diff --git a/klp-ui/src/views/wms/coil/do/warehousing.vue b/klp-ui/src/views/wms/coil/do/warehousing.vue
index 83ec7979..fe67c0b1 100644
--- a/klp-ui/src/views/wms/coil/do/warehousing.vue
+++ b/klp-ui/src/views/wms/coil/do/warehousing.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="20">
-      <el-col :span="10">
+      <el-col :span="8">
         <div class="section-card">
           <!-- 入库 -->
           <div class="section-header">
@@ -24,17 +24,17 @@
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="入场钢卷号" prop="enterCoilNo">
                   <el-input v-model="form.enterCoilNo" placeholder="请输入入场钢卷号" :disabled="form.coilId" />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="当前钢卷号" prop="currentCoilNo">
                   <el-input v-model="form.currentCoilNo" placeholder="请输入当前钢卷号" />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item v-if="!form.coilId" label="厂家原料卷号" prop="supplierCoilNo">
                   <el-input v-model="form.supplierCoilNo" placeholder="请输入厂家原料卷号" />
                 </el-form-item>
@@ -42,13 +42,13 @@
             </el-row>
 
             <el-row>
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="所在库位" prop="warehouseId">
                   <warehouse-select v-model="form.warehouseId" placeholder="请选择仓库/库区/库位" style="width: 100%;"
                     clearable />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="班组" prop="team">
                   <el-select v-model="form.team" placeholder="请选择班组" style="width: 100%;" clearable>
                     <el-option key="甲" label="甲" value="甲" />
@@ -59,7 +59,7 @@
             </el-row>
 
             <el-row>
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="材料类型" prop="materialType" v-if="!form.coilId">
                   <el-select v-model="form.materialType" placeholder="请选择材料类型" @change="handleMaterialTypeChange">
                     <el-option label="成品" value="成品" />
@@ -68,7 +68,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item :label="getItemLabel" prop="itemId" v-if="!form.coilId">
                   <product-select v-if="form.itemType == 'product'" v-model="form.itemId" clearable />
                   <raw-material-select v-else-if="form.itemType == 'raw_material'" v-model="form.itemId" clearable />
@@ -78,7 +78,7 @@
             </el-row>
 
             <el-row v-if="form.materialType === '成品'">
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item v-if="form.materialType === '成品'" label="质量状态" prop="qualityStatus">
                   <el-select v-model="form.qualityStatus" placeholder="请选择质量状态" style="width: 100%"
                     :disabled="readonly">
@@ -94,7 +94,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item v-if="form.materialType === '成品'" label="切边要求" prop="trimmingRequirement">
                   <el-select v-model="form.trimmingRequirement" placeholder="请选择切边要求" style="width: 100%"
                     :disabled="readonly">
@@ -103,13 +103,13 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item v-if="form.materialType === '成品'" label="打包状态" prop="packingStatus">
                   <el-input v-model="form.packingStatus" placeholder="请输入打包状态">
                   </el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item v-if="form.materialType === '成品'" label="包装要求" prop="packagingRequirement">
                   <el-select v-model="form.packagingRequirement" placeholder="请选择包装要求" style="width: 100%"
                     :disabled="readonly">
@@ -122,12 +122,12 @@
             </el-row>
 
             <el-row>
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="毛重" prop="grossWeight">
                   <el-input v-model="form.grossWeight" placeholder="请输入毛重" />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="净重" prop="netWeight">
                   <el-input v-model="form.netWeight" placeholder="请输入净重" />
                 </el-form-item>
@@ -147,7 +147,7 @@
 
       </el-col>
 
-      <el-col :span="14">
+      <el-col :span="16">
         <div class="section-card">
           <!-- 入库记录 -->
           <div class="section-header">
@@ -170,21 +170,13 @@
           </div>
           <el-table v-else v-loading="loading" border :data="pendingActions" highlight-current-row>
             <el-table-column label="钢卷号" align="center" prop="currentCoilNo" :show-overflow-tooltip="true">
-             <template slot-scope="scope">
+              <template slot-scope="scope">
                 <CoilNo :coil-no="scope.row.currentCoilNo" :coil-id="scope.row.coilId" />
                 <!-- <el-tag type="info" size="small">{{ scope.row.currentCoilNo }}</el-tag> -->
               </template>
             </el-table-column>
 
-            <el-table-column label="优先级" align="center" prop="priority" width="90">
-              <template slot-scope="scope">
-                <el-tag v-if="scope.row.priority === 0" type="info" size="mini">普通</el-tag>
-                <el-tag v-else-if="scope.row.priority === 1" type="warning" size="mini">重要</el-tag>
-                <el-tag v-else-if="scope.row.priority === 2" type="danger" size="mini">紧急</el-tag>
-              </template>
-            </el-table-column>
-
-            <el-table-column label="新增时间" align="center" prop="createTime" width="155" :show-overflow-tooltip="true">
+            <el-table-column label="新增时间" align="center" prop="createTime" width="150" :show-overflow-tooltip="true">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
               </template>
@@ -202,6 +194,9 @@
                 <el-button size="mini" type="text" icon="el-icon-view" @click="handlePreviewLabel(scope.row)">
                   打印
                 </el-button>
+                <el-button size="mini" type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">
+                  编辑
+                </el-button>
                 <el-button v-if="scope.row.actionStatus == 0 || scope.row.actionStatus == 1" type="primary"
                   @click="openReceiptModal(scope.row)" v-loading="buttonLoading">签收</el-button>
                 <el-button v-if="scope.row.actionStatus == 0 || scope.row.actionStatus == 1" type="danger"
@@ -247,11 +242,104 @@
     <el-dialog title="标签预览" :visible.sync="labelRender.visible" append-to-body>
       <label-render :content="labelRender.data" :labelType="labelRender.type" v-loading="labelRender.loading" />
     </el-dialog>
+
+    <el-dialog v-loading="editCoil.loading" title="入库钢卷信息编辑" :visible.sync="editCoil.dialogVisible" width="30%">
+      <el-form ref="form" :model="editCoil.form" :rules="rules" label-width="100px">
+        <el-form-item label="入场钢卷号" prop="enterCoilNo">
+          <el-input v-model="editCoil.form.enterCoilNo" placeholder="请输入入场钢卷号" />
+        </el-form-item>
+        <el-form-item label="当前钢卷号" prop="currentCoilNo">
+          <el-input v-model="editCoil.form.currentCoilNo" placeholder="请输入当前钢卷号" />
+        </el-form-item>
+        <el-form-item label="厂家原料卷号" prop="supplierCoilNo">
+          <el-input v-model="editCoil.form.supplierCoilNo" placeholder="请输入厂家原料卷号" />
+        </el-form-item>
+        <el-form-item label="所在库位" prop="warehouseId">
+          <warehouse-select v-model="form.warehouseId" placeholder="请选择仓库/库区/库位" style="width: 100%;" clearable />
+        </el-form-item>
+        <el-form-item label="实际库区" prop="actualWarehouseId">
+          <actual-warehouse-select v-model="editCoil.form.actualWarehouseId" placeholder="请选择实际库区" style="width: 100%;"
+            clearable />
+        </el-form-item>
+        <el-form-item label="班组" prop="team">
+          <el-select v-model="editCoil.form.team" placeholder="请选择班组" style="width: 100%">
+            <el-option key="甲" label="甲" value="甲" />
+            <el-option key="乙" label="乙" value="乙" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="材料类型" prop="materialType" v-if="!editCoil.form.coilId">
+          <el-select v-model="editCoil.form.materialType" placeholder="请选择材料类型" @change="handleMaterialTypeChange">
+            <el-option label="成品" value="成品" />
+            <el-option label="原料" value="原料" />
+            <el-option label="废品" value="废品" />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="getItemLabel" prop="itemId">
+          <product-select v-if="editCoil.form.itemType == 'product'" v-model="editCoil.form.itemId" placeholder="请选择成品"
+            style="width: 100%;" clearable />
+          <raw-material-select v-else-if="editCoil.form.itemType == 'raw_material'" v-model="editCoil.form.itemId"
+            placeholder="请选择原料" style="width: 100%;" clearable />
+          <div v-else>请先选择材料类型</div>
+        </el-form-item>
+        <el-form-item v-if="editCoil.form.materialType === '成品'" label="质量状态" prop="qualityStatus">
+          <el-select v-model="editCoil.form.qualityStatus" placeholder="请选择质量状态" style="width: 100%"
+            :disabled="readonly">
+            <el-option label="A+" value="A+" />
+            <el-option label="A" value="A" />
+            <el-option label="A-" value="A-" />
+            <el-option label="B+" value="B+" />
+            <el-option label="B" value="B" />
+            <el-option label="B-" value="B-" />
+            <el-option label="C+" value="C+" />
+            <el-option label="C" value="C" />
+            <el-option label="C-" value="C-" />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item v-if="editCoil.form.materialType === '成品'" label="切边要求" prop="trimmingRequirement">
+          <el-select v-model="editCoil.form.trimmingRequirement" placeholder="请选择切边要求" style="width: 100%"
+            :disabled="readonly">
+            <el-option label="净边料" value="净边料" />
+            <el-option label="毛边料" value="毛边料" />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item v-if="editCoil.form.materialType === '成品'" label="打包状态" prop="packingStatus">
+          <el-input v-model="editCoil.form.packingStatus" placeholder="请输入打包状态" :disabled="readonly">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item v-if="editCoil.form.materialType === '成品'" label="包装要求" prop="packagingRequirement">
+          <el-select v-model="editCoil.form.packagingRequirement" placeholder="请选择包装要求" style="width: 100%"
+            :disabled="readonly">
+            <el-option label="裸包" value="裸包" />
+            <el-option label="普包" value="普包" />
+            <el-option label="简包" value="简包" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="毛重" prop="grossWeight">
+          <el-input v-model="editCoil.form.grossWeight" placeholder="请输入毛重" />
+        </el-form-item>
+        <el-form-item label="净重" prop="netWeight">
+          <el-input v-model="editCoil.form.netWeight" placeholder="请输入净重" />
+        </el-form-item>
+        <el-form-item label="长度" prop="length">
+          <el-input v-model="editCoil.form.length" placeholder="请输入长度" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="editCoil.form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitEdit">确 定</el-button>
+        <el-button @click="cancelEdit">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { getMaterialCoil, listMaterialCoil } from '@/api/wms/coil'
+import { getMaterialCoil, listMaterialCoil, updateMaterialCoilSimple } from '@/api/wms/coil'
 import { listPendingAction, delPendingAction, updatePendingAction } from '@/api/wms/pendingAction'
 import MaterialSelect from "@/components/KLPService/MaterialSelect";
 import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect";
@@ -351,6 +439,13 @@ export default {
       },
       coilInfo: {},
       todayPlanId: null,
+      editCoil: {
+        form: {
+
+        },
+        dialogVisible: false,
+        loading: false,
+      }
     }
   },
   mounted() {
@@ -400,6 +495,34 @@ export default {
         }
       })
     },
+    handleEdit(row) {
+      // 编辑操作
+      this.editCoil.loading = true
+      // 打开编辑弹窗
+      this.editCoil.dialogVisible = true
+      getMaterialCoil(row.coilId).then(res => {
+        this.editCoil.form = res.data
+        this.editCoil.loading = false
+      })
+    },
+    submitEdit() {
+      // 编辑操作
+      this.editCoil.loading = true
+      this.buttonLoading = true
+      updateMaterialCoilSimple(this.editCoil.form).then(res => {
+        this.$modal.msgSuccess("编辑成功");
+        this.getList()
+        this.editCoil.dialogVisible = false
+      }).finally(() => {
+        this.buttonLoading = false
+        this.editCoil.loading = false
+      })
+    },
+    cancelEdit() {
+      // 关闭编辑弹窗
+      this.editCoil.dialogVisible = false
+      this.editCoil.loading = false
+    },
     getList() {
       // 获取入库历史
       this.loading = true
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index a21348cf..f5dce04f 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -63,7 +63,7 @@
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExportAll">导出</el-button>
       </el-col>
-      <el-col :span="2">
+      <el-col :span="2" v-if="canExportAll">
         <el-button type="info" plain icon="el-icon-printer" size="mini" :disabled="multiple"
           @click="handleBatchPrintLabel">批量打印标签</el-button>
       </el-col>
@@ -169,7 +169,10 @@
             clearable />
         </el-form-item>
         <el-form-item label="班组" prop="team">
-          <el-input v-model="form.team" placeholder="请输入班组" />
+          <el-select v-model="form.team" placeholder="请选择班组" style="width: 100%" :disabled="readonly">
+            <el-option key="甲" label="甲" value="甲" />
+            <el-option key="乙" label="乙" value="乙" />
+          </el-select>
         </el-form-item>
         <el-form-item label="材料类型" prop="materialType" v-if="!form.coilId">
           <el-select v-model="form.materialType" placeholder="请选择材料类型" @change="handleMaterialTypeChange">
@@ -358,6 +361,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    canExportAll: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {