diff --git a/src/views/erp/stock/in/StockInForm.vue b/src/views/erp/stock/in/StockInForm.vue
index 76b110b0..83becfa7 100644
--- a/src/views/erp/stock/in/StockInForm.vue
+++ b/src/views/erp/stock/in/StockInForm.vue
@@ -1,121 +1,110 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="1080">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="auto"
-      v-loading="formLoading"
-      :disabled="disabled"
-    >
-      <el-form-item prop="code">
-        <template #label>
-          <span>
-            {{ t('ErpStock.In.no') }}
-            <el-tooltip :content="t('ErpStock.In.no')" placement="top">
-              <Icon icon="ep:question-filled" />
-            </el-tooltip>
-          </span>
-        </template>
-        <el-row :gutter="10" style="width: 100%">
-          <el-col :xs="24" :sm="18" :md="16" :lg="14" :xl="12">
-            <el-input
-              :disabled="formData.isCode == true || formType === 'update'"
-              v-model="formData.no"
-              :placeholder="t('common.code')"
-            />
-          </el-col>
-          <el-col :xs="24" :sm="6" :md="4" :lg="3" :xl="2">
-            <div>
-              <el-switch
-                v-model="formData.isCode"
-                :disabled="formType === 'update'"
+  <div class="dv-repair-panel">
+    <div class="dv-repair-panel__header">
+      <div class="dv-repair-panel__title">{{ dialogTitle }}</div>
+      <el-button text @click="closeForm">
+        <Icon icon="ep:close" />
+      </el-button>
+    </div>
+    <div class="dv-repair-dialog" v-loading="formLoading">
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="formRules"
+        label-width="auto"
+        :disabled="disabled"
+      >
+        <el-form-item prop="code">
+          <template #label>
+            <span>
+              {{ t('ErpStock.In.no') }}
+              <el-tooltip :content="t('ErpStock.In.no')" placement="top">
+                <Icon icon="ep:question-filled" />
+              </el-tooltip>
+            </span>
+          </template>
+          <el-row :gutter="10" style="width: 100%">
+            <el-col :xs="24" :sm="18" :md="16" :lg="14" :xl="12">
+              <el-input
+                :disabled="formData.isCode == true || formType === 'update'"
+                v-model="formData.no"
+                :placeholder="t('common.code')"
               />
-            </div>
+            </el-col>
+            <el-col :xs="24" :sm="6" :md="4" :lg="3" :xl="2">
+              <div>
+                <el-switch
+                  v-model="formData.isCode"
+                  :disabled="formType === 'update'"
+                />
+              </div>
+            </el-col>
+          </el-row>
+        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item :label="t('ErpStock.In.inType')" prop="inType">
+              <el-select
+                v-model="formData.inType"
+                clearable
+                filterable
+                :placeholder="t('ErpStock.In.placeholderInType')"
+                class="!w-1/1"
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                  :disabled="item.disabled"
+                />
+              </el-select>
+            </el-form-item>
           </el-col>
-        </el-row>
-      </el-form-item>
-      <el-row :gutter="20">
-        <el-col :span="8">
-          <el-form-item :label="t('ErpStock.In.inType')" prop="inType">
-            <el-select
-              v-model="formData.inType"
-              clearable
-              filterable
-              :placeholder="t('ErpStock.In.placeholderInType')"
-              class="!w-1/1"
-            >
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-                :disabled="item.disabled"
+          <el-col :span="8">
+            <el-form-item :label="t('ErpStock.In.inTime')" prop="inTime">
+              <el-date-picker
+                v-model="formData.inTime"
+                type="date"
+                value-format="x"
+                :placeholder="t('ErpStock.In.placeholderInTime')"
+                class="!w-1/1"
               />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item :label="t('ErpStock.In.inTime')" prop="inTime">
-            <el-date-picker
-              v-model="formData.inTime"
-              type="date"
-              value-format="x"
-              :placeholder="t('ErpStock.In.placeholderInTime')"
-              class="!w-1/1"
-            />
-          </el-form-item>
-        </el-col>
-        <!-- <el-col :span="8">
-          <el-form-item label="供应商" prop="supplierId">
-            <el-select
-              v-model="formData.supplierId"
-              clearable
-              filterable
-              placeholder="请选择供应商"
-              class="!w-1/1"
-            >
-              <el-option
-                v-for="item in supplierList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :label="t('ErpStock.In.remark')" prop="remark">
+              <el-input
+                type="textarea"
+                v-model="formData.remark"
+                :rows="1"
+                :placeholder="t('ErpStock.In.placeholderRemark')"
               />
-            </el-select>
-          </el-form-item>
-        </el-col> -->
-        <el-col :span="8">
-          <el-form-item :label="t('ErpStock.In.remark')" prop="remark">
-            <el-input
-              type="textarea"
-              v-model="formData.remark"
-              :rows="1"
-              :placeholder="t('ErpStock.In.placeholderRemark')"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item :label="t('ErpStock.In.file')" prop="fileUrl">
-            <UploadFile :is-show-tip="false" v-model="formData.fileUrl" :limit="1" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <!-- 子表的表单 -->
-    <ContentWrap>
-      <el-tabs v-model="subTabsName" class="-mt-15px -mb-10px">
-        <el-tab-pane :label="t('ErpStock.In.list')" name="item">
-          <StockInItemForm ref="itemFormRef" :items="formData.items" :disabled="disabled" />
-        </el-tab-pane>
-      </el-tabs>
-    </ContentWrap>
-    <template #footer>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :label="t('ErpStock.In.file')" prop="fileUrl">
+              <UploadFile :is-show-tip="false" v-model="formData.fileUrl" :limit="1" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <!-- 子表的表单 -->
+      <ContentWrap>
+        <el-tabs v-model="subTabsName" class="-mt-15px -mb-10px">
+          <el-tab-pane :label="t('ErpStock.In.list')" name="item">
+            <StockInItemForm ref="itemFormRef" :items="formData.items" :disabled="disabled" />
+          </el-tab-pane>
+        </el-tabs>
+      </ContentWrap>
+    </div>
+    <div class="dv-repair-footer">
+      <el-button @click="closeForm">{{ t('common.cancel') }}</el-button>
       <el-button @click="submitForm" type="primary" :disabled="formLoading" v-if="!disabled">
         {{ t('common.ok') }}
       </el-button>
-      <el-button @click="dialogVisible = false">{{ t('common.cancel') }}</el-button>
-    </template>
-  </Dialog>
+    </div>
+  </div>
 </template>
 <script setup lang="ts">
 import { StockInApi, StockInVO } from '@/api/erp/stock/in'
@@ -128,7 +117,6 @@ defineOptions({ name: 'StockInForm' })
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
-const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改；detail - 详情
@@ -159,28 +147,27 @@ const options = [
     value: '备件入库',
     label: t('ErpStock.In.tabPart')
   },
-  // {
-  //   value: '原料入库',
-  //   label: '原料入库',
-  // },
   {
     value: '产品入库',
     label: t('ErpStock.In.tabProduct')
   },
-  // {
-  //   value: '生产入库',
-  //   label: '生产入库',
-  //   disabled: true,
-  // },
-
 ]
 /** 子表的表单 */
 const subTabsName = ref('item')
 const itemFormRef = ref()
 
+// 用于取消未完成的异步操作
+const openRequestId = ref(0)
+
+/** 关闭表单 */
+const closeForm = () => {
+  openRequestId.value++
+  emit('closed')
+}
+
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
-  dialogVisible.value = true
+  const currentRequestId = ++openRequestId.value
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
@@ -189,6 +176,7 @@ const open = async (type: string, id?: number) => {
     formLoading.value = true
     try {
       formData.value = await StockInApi.getStockIn(id)
+      if (currentRequestId !== openRequestId.value) return
     } finally {
       formLoading.value = false
     }
@@ -199,7 +187,7 @@ const open = async (type: string, id?: number) => {
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 /** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const emit = defineEmits(['success', 'closed']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
   // 校验表单
   await formRef.value.validate()
@@ -215,9 +203,8 @@ const submitForm = async () => {
       await StockInApi.updateStockIn(data)
       message.success(t('common.updateSuccess'))
     }
-    dialogVisible.value = false
-    // 发送操作成功的事件
     emit('success')
+    closeForm()
   } finally {
     formLoading.value = false
   }
@@ -237,4 +224,68 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
+
+onBeforeUnmount(() => {
+  openRequestId.value++
+})
 </script>
+<style scoped lang="scss">
+.dv-repair-panel {
+  background: #fff;
+  border-radius: 12px;
+  box-shadow: var(--el-box-shadow-light);
+}
+
+.dv-repair-panel__header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 16px 20px;
+  border-bottom: 1px solid #ebeef5;
+}
+
+.dv-repair-panel__title {
+  color: #1f2937;
+  font-size: 18px;
+  font-weight: 600;
+}
+
+.dv-repair-dialog {
+  max-height: calc(100vh - 220px);
+  padding: 20px 20px 0;
+  padding-right: 16px;
+  overflow-y: auto;
+}
+
+.dv-repair-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 12px;
+  width: 100%;
+  padding: 16px 20px 20px;
+  border-top: 1px solid #ebeef5;
+}
+
+@media (max-width: 1200px) {
+  .dv-repair-dialog :deep(.el-col) {
+    max-width: 100%;
+    flex: 0 100%;
+  }
+}
+
+@media (max-width: 768px) {
+  .dv-repair-panel__header {
+    padding: 14px 16px;
+  }
+
+  .dv-repair-dialog {
+    max-height: none;
+    padding: 16px 16px 0;
+    overflow-y: visible;
+  }
+
+  .dv-repair-footer {
+    padding: 16px;
+  }
+}
+</style>
diff --git a/src/views/erp/stock/in/index.vue b/src/views/erp/stock/in/index.vue
index ed58dbb8..75e143d7 100644
--- a/src/views/erp/stock/in/index.vue
+++ b/src/views/erp/stock/in/index.vue
@@ -1,283 +1,262 @@
 <template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="auto"
-    >
-      <el-form-item :label="t('ErpStock.In.no')" prop="no">
-        <el-input
-          v-model="queryParams.no"
-          :placeholder="t('ErpStock.In.placeholderNo')"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item :label="t('ErpStock.In.product')" prop="productId">
-        <el-select
-          v-model="queryParams.productId"
-          clearable
-          filterable
-          :placeholder="t('ErpStock.In.placeholderProduct')"
-          class="!w-240px"
-        >
-          <el-option
-            v-for="item in productList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="t('ErpStock.In.inTime')" prop="inTime">
-        <el-date-picker
-          v-model="queryParams.inTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          :start-placeholder="t('common.startTimeText')"
-          :end-placeholder="t('common.endTimeText')"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-220px"
-        />
-      </el-form-item>
-      <!-- <el-form-item label="供应商" prop="supplierId">
-        <el-select
-          v-model="queryParams.supplierId"
-          clearable
-          filterable
-          placeholder="请选择供应商"
-          class="!w-240px"
+  <div class="dv-repair-page">
+    <template v-if="!formVisible">
+      <ContentWrap>
+        <!-- 搜索工作栏 -->
+        <el-form
+          class="-mb-15px"
+          :model="queryParams"
+          ref="queryFormRef"
+          :inline="true"
+          label-width="auto"
         >
-          <el-option
-            v-for="item in supplierList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item> -->
-      <el-form-item :label="t('ErpStock.In.warehouse')" prop="warehouseId" v-show="showAllFilters">
-        <el-select
-          v-model="queryParams.warehouseId"
-          clearable
-          filterable
-          :placeholder="t('ErpStock.In.placeholderWarehouse')"
-          class="!w-240px"
-        >
-          <el-option
-            v-for="item in warehouseList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="t('ErpStock.In.creator')" prop="creator" v-show="showAllFilters">
-        <el-select
-          v-model="queryParams.creator"
-          clearable
-          filterable
-          :placeholder="t('ErpStock.In.placeholderCreator')"
-          class="!w-240px"
+          <el-form-item :label="t('ErpStock.In.no')" prop="no">
+            <el-input
+              v-model="queryParams.no"
+              :placeholder="t('ErpStock.In.placeholderNo')"
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-240px"
+            />
+          </el-form-item>
+          <el-form-item :label="t('ErpStock.In.product')" prop="productId">
+            <el-select
+              v-model="queryParams.productId"
+              clearable
+              filterable
+              :placeholder="t('ErpStock.In.placeholderProduct')"
+              class="!w-240px"
+            >
+              <el-option
+                v-for="item in productList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="t('ErpStock.In.inTime')" prop="inTime">
+            <el-date-picker
+              v-model="queryParams.inTime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              type="daterange"
+              :start-placeholder="t('common.startTimeText')"
+              :end-placeholder="t('common.endTimeText')"
+              :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+              class="!w-220px"
+            />
+          </el-form-item>
+          <el-form-item :label="t('ErpStock.In.warehouse')" prop="warehouseId" v-show="showAllFilters">
+            <el-select
+              v-model="queryParams.warehouseId"
+              clearable
+              filterable
+              :placeholder="t('ErpStock.In.placeholderWarehouse')"
+              class="!w-240px"
+            >
+              <el-option
+                v-for="item in warehouseList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="t('ErpStock.In.creator')" prop="creator" v-show="showAllFilters">
+            <el-select
+              v-model="queryParams.creator"
+              clearable
+              filterable
+              :placeholder="t('ErpStock.In.placeholderCreator')"
+              class="!w-240px"
+            >
+              <el-option
+                v-for="item in userList"
+                :key="item.id"
+                :label="item.nickname"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="t('ErpStock.In.status')" prop="status" v-show="showAllFilters">
+            <el-select
+              v-model="queryParams.status"
+              :placeholder="t('ErpStock.In.placeholderStatus')"
+              clearable
+              class="!w-240px"
+            >
+              <el-option
+                v-for="dict in getIntDictOptions(DICT_TYPE.ERP_AUDIT_STATUS)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="t('ErpStock.In.remark')" prop="remark" v-show="showAllFilters">
+            <el-input
+              v-model="queryParams.remark"
+              :placeholder="t('ErpStock.In.placeholderRemark')"
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-240px"
+            />
+          </el-form-item>
+          <el-form-item v-if="filterCount > 3">
+            <el-button type="text" class="text-primary" @click="toggleFilters">
+              <Icon :icon="showAllFilters ? 'ep:arrow-up' : 'ep:arrow-down'" class="mr-5px" />
+              {{ showAllFilters ? t('FactoryModeling.FactoryStructure.collapseText') :
+                t('FactoryModeling.FactoryStructure.expandText') }}
+            </el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> {{ t('common.query') }}</el-button>
+            <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> {{ t('common.reset') }}</el-button>
+            <el-button
+              type="primary"
+              plain
+              @click="openForm('create')"
+              v-hasPermi="['erp:stock-in:create']"
+            >
+              <Icon icon="ep:plus" class="mr-5px" /> {{ t('action.add') }}
+            </el-button>
+            <el-button
+              type="success"
+              plain
+              @click="handleExport"
+              :loading="exportLoading"
+              v-hasPermi="['erp:stock-in:export']"
+            >
+              <Icon icon="ep:download" class="mr-5px" /> {{ t('action.export') }}
+            </el-button>
+            <el-button
+              type="danger"
+              plain
+              @click="handleDelete(selectionList.map((item) => item.id))"
+              v-hasPermi="['erp:stock-in:delete']"
+              :disabled="selectionList.length === 0"
+            >
+              <Icon icon="ep:delete" class="mr-5px" /> {{ t('action.del') }}
+            </el-button>
+          </el-form-item>
+        </el-form>
+      </ContentWrap>
+
+      <!-- 列表 -->
+      <ContentWrap>
+        <el-tabs v-model="activeName" @tab-click="handleTabClick">
+          <el-tab-pane :label="t('ErpStock.In.tabProduct')" name="产品入库" />
+          <el-tab-pane :label="t('ErpStock.In.tabPart')" name="备件入库" />
+          <el-tab-pane :label="t('ErpStock.In.tabOther')" name="其他入库" />
+        </el-tabs>
+
+        <el-table
+          v-loading="loading"
+          :data="list"
+          :stripe="true"
+          :show-overflow-tooltip="true"
+          @selection-change="handleSelectionChange"
         >
-          <el-option
-            v-for="item in userList"
-            :key="item.id"
-            :label="item.nickname"
-            :value="item.id"
+          <el-table-column width="30" :label="t('common.select')" type="selection" />
+          <el-table-column
+            min-width="180"
+            :label="t('ErpStock.In.no')"
+            align="center"
+            prop="no"
+           sortable />
+          <el-table-column
+            :label="t('ErpStock.In.productInfo')"
+            align="left"
+            sortable
+            prop="productNames"
+            min-width="200"
           />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="t('ErpStock.In.status')" prop="status" v-show="showAllFilters">
-        <el-select
-          v-model="queryParams.status"
-          :placeholder="t('ErpStock.In.placeholderStatus')"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.ERP_AUDIT_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
+          <el-table-column
+            :label="t('ErpStock.In.inTime')"
+            align="center"
+            prop="inTime"
+            :formatter="dateFormatter2"
+            width="120px"
+           sortable />
+          <el-table-column :label="t('ErpStock.In.creator')" align="center" prop="creatorName"  sortable />
+          <el-table-column
+            :label="t('ErpStock.In.count')"
+            align="right"
+            sortable
+            prop="totalCount"
+            :formatter="erpCountTableColumnFormatter"
           />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="t('ErpStock.In.remark')" prop="remark" v-show="showAllFilters">
-        <el-input
-          v-model="queryParams.remark"
-          :placeholder="t('ErpStock.In.placeholderRemark')"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
+          <el-table-column
+            :label="t('ErpStock.In.status')"
+            align="center"
+            fixed="right"
+            width="90"
+            prop="status"
+           sortable>
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.status" />
+            </template>
+          </el-table-column>
+          <el-table-column :label="t('common.operate')" align="center" fixed="right" width="220">
+            <template #default="scope">
+              <el-button
+                link
+                @click="openForm('detail', scope.row.id)"
+                v-hasPermi="['erp:stock-in:query']"
+              >
+                {{ t('action.detail') }}
+              </el-button>
+              <el-button
+                link
+                type="primary"
+                @click="openForm('update', scope.row.id)"
+                v-hasPermi="['erp:stock-in:update']"
+                :disabled="scope.row.status === 20"
+              >
+                {{ t('action.edit') }}
+              </el-button>
+              <el-button
+                link
+                type="primary"
+                @click="handleUpdateStatus(scope.row.id, 20)"
+                v-hasPermi="['erp:stock-in:update-status']"
+                v-if="scope.row.status === 10"
+              >
+                {{ t('action.approve') }}
+              </el-button>
+              <el-button
+                link
+                type="danger"
+                @click="handleUpdateStatus(scope.row.id, 10)"
+                v-hasPermi="['erp:stock-in:update-status']"
+                v-else
+              >
+                {{ t('action.unapprove') }}
+              </el-button>
+              <el-button
+                link
+                type="danger"
+                @click="handleDelete([scope.row.id])"
+                v-hasPermi="['erp:stock-in:delete']"
+              >
+                {{ t('action.del') }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <!-- 分页 -->
+        <Pagination
+          :total="total"
+          v-model:page="queryParams.pageNo"
+          v-model:limit="queryParams.pageSize"
+          @pagination="getList"
         />
-      </el-form-item>
-      <el-form-item v-if="filterCount > 3">
-        <el-button type="text" class="text-primary" @click="toggleFilters">
-          <Icon :icon="showAllFilters ? 'ep:arrow-up' : 'ep:arrow-down'" class="mr-5px" />
-          {{ showAllFilters ? t('FactoryModeling.FactoryStructure.collapseText') :
-            t('FactoryModeling.FactoryStructure.expandText') }}
-        </el-button>
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> {{ t('common.query') }}</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> {{ t('common.reset') }}</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['erp:stock-in:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> {{ t('action.add') }}
-        </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['erp:stock-in:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> {{ t('action.export') }}
-        </el-button>
-        <el-button
-          type="danger"
-          plain
-          @click="handleDelete(selectionList.map((item) => item.id))"
-          v-hasPermi="['erp:stock-in:delete']"
-          :disabled="selectionList.length === 0"
-        >
-          <Icon icon="ep:delete" class="mr-5px" /> {{ t('action.del') }}
-        </el-button>
-      </el-form-item>
-    </el-form>
-  </ContentWrap>
-
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-tabs v-model="activeName" @tab-click="handleTabClick">
-      <el-tab-pane :label="t('ErpStock.In.tabProduct')" name="产品入库" />
-      <!-- <el-tab-pane :label="t('ErpStock.In.tabMaterial')" name="原料入库" /> -->
-      <el-tab-pane :label="t('ErpStock.In.tabPart')" name="备件入库" />
-      <el-tab-pane :label="t('ErpStock.In.tabOther')" name="其他入库" />
-    </el-tabs>
+      </ContentWrap>
+    </template>
 
-    <el-table
-      v-loading="loading"
-      :data="list"
-      :stripe="true"
-      :show-overflow-tooltip="true"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column width="30" :label="t('common.select')" type="selection" />
-      <el-table-column
-        min-width="180"
-        :label="t('ErpStock.In.no')"
-        align="center"
-        prop="no"
-       sortable />
-      <el-table-column
-        :label="t('ErpStock.In.productInfo')"
-        align="left"
-        sortable
-        prop="productNames"
-        min-width="200"
-      />
-      <!-- <el-table-column label="供应商" align="center" prop="supplierName"  sortable /> -->
-      <el-table-column
-        :label="t('ErpStock.In.inTime')"
-        align="center"
-        prop="inTime"
-        :formatter="dateFormatter2"
-        width="120px"
-       sortable />
-      <el-table-column :label="t('ErpStock.In.creator')" align="center" prop="creatorName"  sortable />
-      <el-table-column
-        :label="t('ErpStock.In.count')"
-        align="right"
-        sortable
-        prop="totalCount"
-        :formatter="erpCountTableColumnFormatter"
-      />
-      <!-- <el-table-column
-        label="金额"
-        align="right"
-        sortable
-        prop="totalPrice"
-        :formatter="erpPriceTableColumnFormatter"
-      /> -->
-      <el-table-column
-        :label="t('ErpStock.In.status')"
-        align="center"
-        fixed="right"
-        width="90"
-        prop="status"
-       sortable>
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.status" />
-        </template>
-      </el-table-column>
-      <el-table-column :label="t('common.operate')" align="center" fixed="right" width="220">
-        <template #default="scope">
-          <el-button
-            link
-            @click="openForm('detail', scope.row.id)"
-            v-hasPermi="['erp:stock-in:query']"
-          >
-            {{ t('action.detail') }}
-          </el-button>
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['erp:stock-in:update']"
-            :disabled="scope.row.status === 20"
-          >
-            {{ t('action.edit') }}
-          </el-button>
-          <el-button
-            link
-            type="primary"
-            @click="handleUpdateStatus(scope.row.id, 20)"
-            v-hasPermi="['erp:stock-in:update-status']"
-            v-if="scope.row.status === 10"
-          >
-            {{ t('action.approve') }}
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleUpdateStatus(scope.row.id, 10)"
-            v-hasPermi="['erp:stock-in:update-status']"
-            v-else
-          >
-            {{ t('action.unapprove') }}
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete([scope.row.id])"
-            v-hasPermi="['erp:stock-in:delete']"
-          >
-            {{ t('action.del') }}
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </ContentWrap>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <StockInForm ref="formRef" @success="getList" />
+    <!-- 表单面板：添加/修改 -->
+    <StockInForm v-else ref="formRef" @success="getList" @closed="formVisible = false" />
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -325,6 +304,8 @@ const warehouseList = ref<WarehouseVO[]>([]) // 仓库列表
 const supplierList = ref<SupplierVO[]>([]) // 供应商列表
 const userList = ref<UserVO[]>([]) // 用户列表
 
+const formVisible = ref(false) // 表单是否可见
+
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
@@ -352,7 +333,10 @@ const resetQuery = () => {
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
+  formVisible.value = true
+  nextTick(() => {
+    formRef.value.open(type, id)
+  })
 }
 
 /** 删除按钮操作 */
@@ -420,8 +404,6 @@ onMounted(async () => {
   supplierList.value = await SupplierApi.getSupplierSimpleList()
   userList.value = await UserApi.getSimpleUserList()
 })
-// TODO 芋艿：可优化功能：列表界面，支持导入
-// TODO 芋艿：可优化功能：详情界面，支持打印
 let activeName = '产品入库'
 const handleTabClick = (tab: TabsPaneContext) => {
   queryParams.inType = tab.paneName