diff --git a/src/views/erp/component/in/StockInForm.vue b/src/views/erp/component/in/StockInForm.vue
new file mode 100644
index 00000000..8bb35a0f
--- /dev/null
+++ b/src/views/erp/component/in/StockInForm.vue
@@ -0,0 +1,215 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="1080">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+      :disabled="disabled"
+    >
+      <el-row :gutter="20">
+        <el-col :span="8">
+          <el-form-item label="入库单号" prop="no">
+            <el-input disabled v-model="formData.no" placeholder="保存时自动生成" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="入库类型" prop="inType">
+            <el-select
+              v-model="formData.inType"
+              clearable
+              filterable
+              placeholder="请选择入库类型"
+              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-col :span="8">
+          <el-form-item label="入库时间" prop="inTime">
+            <el-date-picker
+              v-model="formData.inTime"
+              type="date"
+              value-format="x"
+              placeholder="选择入库时间"
+              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-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              type="textarea"
+              v-model="formData.remark"
+              :rows="1"
+              placeholder="请输入备注"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="附件" 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="入库产品清单" name="item">
+          <StockInItemForm ref="itemFormRef" :items="formData.items" :disabled="disabled" />
+        </el-tab-pane>
+      </el-tabs>
+    </ContentWrap>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading" v-if="!disabled">
+        确 定
+      </el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { StockInApi, StockInVO } from '@/api/erp/stock/in'
+import StockInItemForm from './components/StockInItemForm.vue'
+import { SupplierApi, SupplierVO } from '@/api/erp/purchase/supplier'
+
+/** ERP 其它入库单 表单 */
+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 - 详情
+const formData = ref({
+  id: undefined,
+  supplierId: undefined,
+  inTime: undefined,
+  inType: undefined,
+  remark: undefined,
+  fileUrl: '',
+  items: []
+})
+const formRules = reactive({
+  inTime: [{ required: true, message: '入库时间不能为空', trigger: 'blur' }],
+  inType: [{ required: true, message: '入库类型不能为空', trigger: 'blur' }]
+})
+const disabled = computed(() => formType.value === 'detail')
+const formRef = ref() // 表单 Ref
+const supplierList = ref<SupplierVO[]>([]) // 供应商列表
+const options = [
+  {
+    value: '其他入库',
+    label: '其他入库',
+  },
+  {
+    value: '备件入库',
+    label: '备件入库',
+
+  },
+  {
+    value: '原料入库',
+    label: '原料入库',
+  },
+  {
+    value: '产品入库',
+    label: '产品入库',
+  },
+  {
+    value: '生产入库',
+    label: '生产入库',
+    disabled: true,
+  },
+
+]
+/** 子表的表单 */
+const subTabsName = ref('item')
+const itemFormRef = ref()
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await StockInApi.getStockIn(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+  // 加载供应商列表
+  supplierList.value = await SupplierApi.getSupplierSimpleList()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  await itemFormRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as StockInVO
+    if (formType.value === 'create') {
+      await StockInApi.createStockIn(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await StockInApi.updateStockIn(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    supplierId: undefined,
+    inTime: undefined,
+    remark: undefined,
+    fileUrl: undefined,
+    items: []
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/erp/component/in/components/StockInItemForm.vue b/src/views/erp/component/in/components/StockInItemForm.vue
new file mode 100644
index 00000000..53a2fd2d
--- /dev/null
+++ b/src/views/erp/component/in/components/StockInItemForm.vue
@@ -0,0 +1,267 @@
+<template>
+  <el-form
+    ref="formRef"
+    :model="formData"
+    :rules="formRules"
+    v-loading="formLoading"
+    label-width="0px"
+    :inline-message="true"
+    :disabled="disabled"
+  >
+    <el-table :data="formData" show-summary :summary-method="getSummaries" class="-mt-10px">
+      <el-table-column label="序号" type="index" align="center" width="60" />
+      <el-table-column label="仓库名称" min-width="125">
+        <template #default="{ row, $index }">
+          <el-form-item
+            :prop="`${$index}.warehouseId`"
+            :rules="formRules.warehouseId"
+            class="mb-0px!"
+          >
+            <el-select
+              v-model="row.warehouseId"
+              clearable
+              filterable
+              placeholder="请选择仓库"
+              @change="onChangeWarehouse($event, row)"
+            >
+              <el-option
+                v-for="item in warehouseList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="产品名称" min-width="180">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.productId`" :rules="formRules.productId" class="mb-0px!">
+            <el-select
+              v-model="row.productId"
+              clearable
+              filterable
+              @change="onChangeProduct($event, row)"
+              placeholder="请选择产品"
+            >
+              <el-option
+                v-for="item in productList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="库存" min-width="100">
+        <template #default="{ row }">
+          <el-form-item class="mb-0px!">
+            <el-input disabled v-model="row.stockCount" :formatter="erpCountInputFormatter" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="条码" min-width="150">
+        <template #default="{ row }">
+          <el-form-item class="mb-0px!">
+            <el-input disabled v-model="row.productBarCode" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="单位" min-width="80">
+        <template #default="{ row }">
+          <el-form-item class="mb-0px!">
+            <el-input disabled v-model="row.productUnitName" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="数量" prop="count" fixed="right" min-width="140">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.count`" :rules="formRules.count" class="mb-0px!">
+            <el-input-number
+              v-model="row.count"
+              controls-position="right"
+              :min="0.001"
+              :precision="3"
+              class="!w-100%"
+            />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="产品单价" fixed="right" min-width="120">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.productPrice`" class="mb-0px!">
+            <el-input-number
+              v-model="row.productPrice"
+              controls-position="right"
+              :min="0.01"
+              :precision="2"
+              class="!w-100%"
+            />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="合计金额" prop="totalPrice" fixed="right" min-width="100">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.totalPrice`" class="mb-0px!">
+            <el-input disabled v-model="row.totalPrice" :formatter="erpPriceInputFormatter" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.remark`" class="mb-0px!">
+            <el-input v-model="row.remark" placeholder="请输入备注" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" fixed="right" label="操作" width="60">
+        <template #default="{ $index }">
+          <el-button @click="handleDelete($index)" link>—</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </el-form>
+  <el-row justify="center" class="mt-3" v-if="!disabled">
+    <el-button @click="handleAdd" round>+ 添加入库产品</el-button>
+  </el-row>
+</template>
+<script setup lang="ts">
+import { ProductApi, ProductVO } from '@/api/erp/product/product'
+import { WarehouseApi, WarehouseVO } from '@/api/erp/stock/warehouse'
+import { StockApi } from '@/api/erp/stock/stock'
+import {
+  erpCountInputFormatter,
+  erpPriceInputFormatter,
+  erpPriceMultiply,
+  getSumValue
+} from '@/utils'
+
+const props = defineProps<{
+  items: undefined
+  disabled: false
+}>()
+const formLoading = ref(false) // 表单的加载中
+const formData = ref([])
+const formRules = reactive({
+  inId: [{ required: true, message: '入库编号不能为空', trigger: 'blur' }],
+  warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'blur' }],
+  productId: [{ required: true, message: '产品不能为空', trigger: 'blur' }],
+  count: [{ required: true, message: '产品数量不能为空', trigger: 'blur' }]
+})
+const formRef = ref([]) // 表单 Ref
+const productList = ref<ProductVO[]>([]) // 产品列表
+const warehouseList = ref<WarehouseVO[]>([]) // 仓库列表
+const defaultWarehouse = ref<WarehouseVO>(undefined) // 默认仓库
+
+/** 初始化设置入库项 */
+watch(
+  () => props.items,
+  async (val) => {
+    formData.value = val
+  },
+  { immediate: true }
+)
+
+/** 监听合同产品变化，计算合同产品总价 */
+watch(
+  () => formData.value,
+  (val) => {
+    if (!val || val.length === 0) {
+      return
+    }
+    // 循环处理
+    val.forEach((item) => {
+      item.totalPrice = erpPriceMultiply(item.productPrice, item.count)
+    })
+  },
+  { deep: true }
+)
+
+/** 合计 */
+const getSummaries = (param: SummaryMethodProps) => {
+  const { columns, data } = param
+  const sums: string[] = []
+  columns.forEach((column, index) => {
+    if (index === 0) {
+      sums[index] = '合计'
+      return
+    }
+    if (['count', 'totalPrice'].includes(column.property)) {
+      const sum = getSumValue(data.map((item) => Number(item[column.property])))
+      sums[index] =
+        column.property === 'count' ? erpCountInputFormatter(sum) : erpPriceInputFormatter(sum)
+    } else {
+      sums[index] = ''
+    }
+  })
+
+  return sums
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  const row = {
+    id: undefined,
+    warehouseId: defaultWarehouse.value?.id,
+    productId: undefined,
+    productUnitName: undefined, // 产品单位
+    productBarCode: undefined, // 产品条码
+    productPrice: undefined,
+    stockCount: undefined,
+    count: 1,
+    totalPrice: undefined,
+    remark: undefined
+  }
+  formData.value.push(row)
+}
+
+/** 删除按钮操作 */
+const handleDelete = (index) => {
+  formData.value.splice(index, 1)
+}
+
+/** 处理仓库变更 */
+const onChangeWarehouse = (warehouseId, row) => {
+  // 加载库存
+  setStockCount(row)
+}
+
+/** 处理产品变更 */
+const onChangeProduct = (productId, row) => {
+  const product = productList.value.find((item) => item.id === productId)
+  if (product) {
+    row.productUnitName = product.unitName
+    row.productBarCode = product.barCode
+    row.productPrice = product.minPrice
+  }
+  // 加载库存
+  setStockCount(row)
+}
+
+/** 加载库存 */
+const setStockCount = async (row) => {
+  if (!row.productId || !row.warehouseId) {
+    return
+  }
+  const stock = await StockApi.getStock2(row.productId, row.warehouseId)
+  row.stockCount = stock ? stock.count : 0
+}
+
+/** 表单校验 */
+const validate = () => {
+  return formRef.value.validate()
+}
+defineExpose({ validate })
+
+/** 初始化 */
+onMounted(async () => {
+  productList.value = await ProductApi.getProductSimpleList()
+  warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
+  defaultWarehouse.value = warehouseList.value.find((item) => item.defaultStatus)
+  // 默认添加一个
+  if (formData.value.length === 0) {
+    handleAdd()
+  }
+})
+</script>
diff --git a/src/views/erp/component/in/index.vue b/src/views/erp/component/in/index.vue
new file mode 100644
index 00000000..b905e91d
--- /dev/null
+++ b/src/views/erp/component/in/index.vue
@@ -0,0 +1,391 @@
+<template>
+
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="入库单号" prop="no">
+        <el-input
+          v-model="queryParams.no"
+          placeholder="请输入入库单号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="产品" prop="productId">
+        <el-select
+          v-model="queryParams.productId"
+          clearable
+          filterable
+          placeholder="请选择产品"
+          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="入库时间" prop="inTime">
+        <el-date-picker
+          v-model="queryParams.inTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :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"
+        >
+          <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="仓库" prop="warehouseId">
+        <el-select
+          v-model="queryParams.warehouseId"
+          clearable
+          filterable
+          placeholder="请选择仓库"
+          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="创建人" prop="creator">
+        <el-select
+          v-model="queryParams.creator"
+          clearable
+          filterable
+          placeholder="请选择创建人"
+          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="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" 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="备注" prop="remark">
+        <el-input
+          v-model="queryParams.remark"
+          placeholder="请输入备注"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['erp:stock-in:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['erp:stock-in:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </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" /> 删除
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-tabs v-model="activeName" @tab-click="handleTabClick">
+      <el-tab-pane label="产品" name="产品入库" />
+      <el-tab-pane label="原料" name="原料入库" />
+      <el-tab-pane label="备件" name="备件入库" />
+      <el-tab-pane label="其他" name="其他入库" />
+    </el-tabs>
+
+    <el-table
+      v-loading="loading"
+      :data="list"
+      :stripe="true"
+      :show-overflow-tooltip="true"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column width="30" label="选择" type="selection" />
+      <el-table-column min-width="180" label="入库单号" align="center" prop="no" />
+      <el-table-column label="产品信息" align="left" sortable prop="productNames" min-width="200" />
+      <el-table-column label="供应商" align="center" prop="supplierName" />
+      <el-table-column
+        label="入库时间"
+        align="center"
+        prop="inTime"
+        :formatter="dateFormatter2"
+        width="120px"
+      />
+      <el-table-column label="创建人" align="center" prop="creatorName" />
+      <el-table-column
+        label="数量"
+        align="right"
+        sortable
+        prop="totalCount"
+        :formatter="erpCountTableColumnFormatter"
+      />
+      <el-table-column
+        label="金额"
+        align="right"
+        sortable
+        prop="totalPrice"
+        :formatter="erpPriceTableColumnFormatter"
+      />
+      <el-table-column label="状态" align="center" fixed="right" width="90" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" fixed="right" width="220">
+        <template #default="scope">
+          <el-button
+            link
+            @click="openForm('detail', scope.row.id)"
+            v-hasPermi="['erp:stock-in:query']"
+          >
+            详情
+          </el-button>
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['erp:stock-in:update']"
+            :disabled="scope.row.status === 20"
+          >
+            编辑
+          </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"
+          >
+            审批
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleUpdateStatus(scope.row.id, 10)"
+            v-hasPermi="['erp:stock-in:update-status']"
+            v-else
+          >
+            反审批
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete([scope.row.id])"
+            v-hasPermi="['erp:stock-in:delete']"
+          >
+            删除
+          </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" />
+</template>
+
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter2 } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { StockInApi, StockInVO } from '@/api/erp/stock/in'
+import StockInForm from './StockInForm.vue'
+import { ProductApi, ProductVO } from '@/api/erp/product/product'
+import { WarehouseApi, WarehouseVO } from '@/api/erp/stock/warehouse'
+import { SupplierApi, SupplierVO } from '@/api/erp/purchase/supplier'
+import { UserVO } from '@/api/system/user'
+import * as UserApi from '@/api/system/user'
+import { erpCountTableColumnFormatter, erpPriceTableColumnFormatter } from '@/utils'
+
+/** ERP 其它入库单列表 */
+defineOptions({ name: 'ErpStockIn' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<StockInVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  no: undefined,
+  productId: undefined,
+  supplierId: undefined,
+  inTime: [],
+  status: undefined,
+  remark: undefined,
+  inType: undefined,
+  creator: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+const productList = ref<ProductVO[]>([]) // 产品列表
+const warehouseList = ref<WarehouseVO[]>([]) // 仓库列表
+const supplierList = ref<SupplierVO[]>([]) // 供应商列表
+const userList = ref<UserVO[]>([]) // 用户列表
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await StockInApi.getStockInPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (ids: number[]) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await StockInApi.deleteStockIn(ids)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+    selectionList.value = selectionList.value.filter((item) => !ids.includes(item.id))
+  } catch {}
+}
+
+/** 审批/反审批操作 */
+const handleUpdateStatus = async (id: number, status: number) => {
+  try {
+    // 审批的二次确认
+    await message.confirm(`确定${status === 20 ? '审批' : '反审批'}该入库单吗？`)
+    // 发起审批
+    await StockInApi.updateStockInStatus(id, status)
+    message.success(`${status === 20 ? '审批' : '反审批'}成功`)
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await StockInApi.exportStockIn(queryParams)
+    download.excel(data, '其它入库单.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 选中操作 */
+const selectionList = ref<StockInVO[]>([])
+const handleSelectionChange = (rows: StockInVO[]) => {
+  selectionList.value = rows
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  queryParams.inType = '产品入库'
+  await getList()
+  // 加载产品、仓库列表、供应商
+  productList.value = await ProductApi.getProductSimpleList()
+  warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
+  supplierList.value = await SupplierApi.getSupplierSimpleList()
+  userList.value = await UserApi.getSimpleUserList()
+})
+// TODO 芋艿：可优化功能：列表界面，支持导入
+// TODO 芋艿：可优化功能：详情界面，支持打印
+let activeName = '产品入库'
+const handleTabClick = (tab: TabsPaneContext) => {
+  queryParams.inType = tab.paneName
+  handleQuery()
+}
+</script>
diff --git a/src/views/erp/component/out/StockOutForm.vue b/src/views/erp/component/out/StockOutForm.vue
new file mode 100644
index 00000000..ddea4f43
--- /dev/null
+++ b/src/views/erp/component/out/StockOutForm.vue
@@ -0,0 +1,219 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="1080">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+      :disabled="disabled"
+    >
+      <el-row :gutter="20">
+        <el-col :span="8">
+          <el-form-item label="出库单号" prop="no">
+            <el-input disabled v-model="formData.no" placeholder="保存时自动生成" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="客户" prop="customerId">
+            <el-select
+              v-model="formData.customerId"
+              clearable
+              filterable
+              placeholder="请选择客户"
+              class="!w-1/1"
+            >
+              <el-option
+                v-for="item in customerList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="出库时间" prop="outTime">
+            <el-date-picker
+              v-model="formData.outTime"
+              type="date"
+              value-format="x"
+              placeholder="选择出库时间"
+              class="!w-1/1"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="出库类型" prop="outType">
+            <el-select
+              v-model="formData.outType"
+              clearable
+              filterable
+              placeholder="请选择出库类型"
+              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-col :span="8">
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              type="textarea"
+              v-model="formData.remark"
+              :rows="1"
+              placeholder="请输入备注"
+            />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="附件" 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="出库产品清单" name="item">
+          <StockOutItemForm ref="itemFormRef" :items="formData.items" :disabled="disabled" />
+        </el-tab-pane>
+      </el-tabs>
+    </ContentWrap>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading" v-if="!disabled">
+        确 定
+      </el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { StockOutApi, StockOutVO } from '@/api/erp/stock/out'
+import StockOutItemForm from './components/StockOutItemForm.vue'
+import { CustomerApi, CustomerVO } from '@/api/erp/sale/customer'
+import {DICT_TYPE, getBoolDictOptions, getStrDictOptions} from "@/utils/dict";
+
+/** ERP 其它出库单表单 */
+defineOptions({ name: 'StockOutForm' })
+
+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 - 详情
+const formData = ref({
+  id: undefined,
+  customerId: undefined,
+  outTime: undefined,
+  remark: undefined,
+  outType: undefined,
+  fileUrl: '',
+  items: []
+})
+const formRules = reactive({
+  outTime: [{ required: true, message: '出库时间不能为空', trigger: 'blur' }],
+  outType: [{ required: true, message: '出库类型不能为空', trigger: 'blur' }]
+})
+const disabled = computed(() => formType.value === 'detail')
+const formRef = ref() // 表单 Ref
+const customerList = ref<CustomerVO[]>([]) // 客户列表
+const options = [
+  {
+    value: '其他出库',
+    label: '其他出库',
+  },
+  {
+    value: '备件出库',
+    label: '备件出库',
+
+  },
+  {
+    value: '原料出库',
+    label: '原料出库',
+  },
+  {
+    value: '产品出库',
+    label: '产品出库',
+  },
+  {
+    value: '领料出库',
+    label: '领料出库',
+    disabled: true,
+  },
+
+]
+/** 子表的表单 */
+const subTabsName = ref('item')
+const itemFormRef = ref()
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await StockOutApi.getStockOut(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+  // 加载客户列表
+  customerList.value = await CustomerApi.getCustomerSimpleList()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  await itemFormRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as StockOutVO
+    if (formType.value === 'create') {
+      await StockOutApi.createStockOut(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await StockOutApi.updateStockOut(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    customerId: undefined,
+    outTime: undefined,
+    remark: undefined,
+    fileUrl: undefined,
+    items: []
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/erp/component/out/components/StockOutItemForm.vue b/src/views/erp/component/out/components/StockOutItemForm.vue
new file mode 100644
index 00000000..b09a5695
--- /dev/null
+++ b/src/views/erp/component/out/components/StockOutItemForm.vue
@@ -0,0 +1,267 @@
+<template>
+  <el-form
+    ref="formRef"
+    :model="formData"
+    :rules="formRules"
+    v-loading="formLoading"
+    label-width="0px"
+    :inline-message="true"
+    :disabled="disabled"
+  >
+    <el-table :data="formData" show-summary :summary-method="getSummaries" class="-mt-10px">
+      <el-table-column label="序号" type="index" align="center" width="60" />
+      <el-table-column label="仓库名称" min-width="125">
+        <template #default="{ row, $index }">
+          <el-form-item
+            :prop="`${$index}.warehouseId`"
+            :rules="formRules.warehouseId"
+            class="mb-0px!"
+          >
+            <el-select
+              v-model="row.warehouseId"
+              clearable
+              filterable
+              placeholder="请选择仓库"
+              @change="onChangeWarehouse($event, row)"
+            >
+              <el-option
+                v-for="item in warehouseList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="产品名称" min-width="180">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.productId`" :rules="formRules.productId" class="mb-0px!">
+            <el-select
+              v-model="row.productId"
+              clearable
+              filterable
+              @change="onChangeProduct($event, row)"
+              placeholder="请选择产品"
+            >
+              <el-option
+                v-for="item in productList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="库存" min-width="100">
+        <template #default="{ row }">
+          <el-form-item class="mb-0px!">
+            <el-input disabled v-model="row.stockCount" :formatter="erpCountInputFormatter" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="条码" min-width="150">
+        <template #default="{ row }">
+          <el-form-item class="mb-0px!">
+            <el-input disabled v-model="row.productBarCode" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="单位" min-width="80">
+        <template #default="{ row }">
+          <el-form-item class="mb-0px!">
+            <el-input disabled v-model="row.productUnitName" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="数量" prop="count" fixed="right" min-width="140">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.count`" :rules="formRules.count" class="mb-0px!">
+            <el-input-number
+              v-model="row.count"
+              controls-position="right"
+              :min="0.001"
+              :precision="3"
+              class="!w-100%"
+            />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="产品单价" fixed="right" min-width="120">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.productPrice`" class="mb-0px!">
+            <el-input-number
+              v-model="row.productPrice"
+              controls-position="right"
+              :min="0.01"
+              :precision="2"
+              class="!w-100%"
+            />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="合计金额" prop="totalPrice" fixed="right" min-width="100">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.totalPrice`" class="mb-0px!">
+            <el-input disabled v-model="row.totalPrice" :formatter="erpPriceInputFormatter" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.remark`" class="mb-0px!">
+            <el-input v-model="row.remark" placeholder="请输入备注" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" fixed="right" label="操作" width="60">
+        <template #default="{ $index }">
+          <el-button @click="handleDelete($index)" link>—</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </el-form>
+  <el-row justify="center" class="mt-3" v-if="!disabled">
+    <el-button @click="handleAdd" round>+ 添加出库产品</el-button>
+  </el-row>
+</template>
+<script setup lang="ts">
+import { ProductApi, ProductVO } from '@/api/erp/product/product'
+import { WarehouseApi, WarehouseVO } from '@/api/erp/stock/warehouse'
+import { StockApi } from '@/api/erp/stock/stock'
+import {
+  erpCountInputFormatter,
+  erpPriceInputFormatter,
+  erpPriceMultiply,
+  getSumValue
+} from '@/utils'
+
+const props = defineProps<{
+  items: undefined
+  disabled: false
+}>()
+const formLoading = ref(false) // 表单的加载中
+const formData = ref([])
+const formRules = reactive({
+  inId: [{ required: true, message: '出库编号不能为空', trigger: 'blur' }],
+  warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'blur' }],
+  productId: [{ required: true, message: '产品不能为空', trigger: 'blur' }],
+  count: [{ required: true, message: '产品数量不能为空', trigger: 'blur' }]
+})
+const formRef = ref([]) // 表单 Ref
+const productList = ref<ProductVO[]>([]) // 产品列表
+const warehouseList = ref<WarehouseVO[]>([]) // 仓库列表
+const defaultWarehouse = ref<WarehouseVO>(undefined) // 默认仓库
+
+/** 初始化设置出库项 */
+watch(
+  () => props.items,
+  async (val) => {
+    formData.value = val
+  },
+  { immediate: true }
+)
+
+/** 监听合同产品变化，计算合同产品总价 */
+watch(
+  () => formData.value,
+  (val) => {
+    if (!val || val.length === 0) {
+      return
+    }
+    // 循环处理
+    val.forEach((item) => {
+      item.totalPrice = erpPriceMultiply(item.productPrice, item.count)
+    })
+  },
+  { deep: true }
+)
+
+/** 合计 */
+const getSummaries = (param: SummaryMethodProps) => {
+  const { columns, data } = param
+  const sums: string[] = []
+  columns.forEach((column, index) => {
+    if (index === 0) {
+      sums[index] = '合计'
+      return
+    }
+    if (['count', 'totalPrice'].includes(column.property)) {
+      const sum = getSumValue(data.map((item) => Number(item[column.property])))
+      sums[index] =
+        column.property === 'count' ? erpCountInputFormatter(sum) : erpPriceInputFormatter(sum)
+    } else {
+      sums[index] = ''
+    }
+  })
+
+  return sums
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  const row = {
+    id: undefined,
+    warehouseId: defaultWarehouse.value?.id,
+    productId: undefined,
+    productUnitName: undefined, // 产品单位
+    productBarCode: undefined, // 产品条码
+    productPrice: undefined,
+    stockCount: undefined,
+    count: 1,
+    totalPrice: undefined,
+    remark: undefined
+  }
+  formData.value.push(row)
+}
+
+/** 删除按钮操作 */
+const handleDelete = (index) => {
+  formData.value.splice(index, 1)
+}
+
+/** 处理仓库变更 */
+const onChangeWarehouse = (warehouseId, row) => {
+  // 加载库存
+  setStockCount(row)
+}
+
+/** 处理产品变更 */
+const onChangeProduct = (productId, row) => {
+  const product = productList.value.find((item) => item.id === productId)
+  if (product) {
+    row.productUnitName = product.unitName
+    row.productBarCode = product.barCode
+    row.productPrice = product.minPrice
+  }
+  // 加载库存
+  setStockCount(row)
+}
+
+/** 加载库存 */
+const setStockCount = async (row) => {
+  if (!row.productId || !row.warehouseId) {
+    return
+  }
+  const stock = await StockApi.getStock2(row.productId, row.warehouseId)
+  row.stockCount = stock ? stock.count : 0
+}
+
+/** 表单校验 */
+const validate = () => {
+  return formRef.value.validate()
+}
+defineExpose({ validate })
+
+/** 初始化 */
+onMounted(async () => {
+  productList.value = await ProductApi.getProductSimpleList()
+  warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
+  defaultWarehouse.value = warehouseList.value.find((item) => item.defaultStatus)
+  // 默认添加一个
+  if (formData.value.length === 0) {
+    handleAdd()
+  }
+})
+</script>
diff --git a/src/views/erp/component/out/index.vue b/src/views/erp/component/out/index.vue
new file mode 100644
index 00000000..f6307c8c
--- /dev/null
+++ b/src/views/erp/component/out/index.vue
@@ -0,0 +1,395 @@
+<template>
+
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="出库单号" prop="no">
+        <el-input
+          v-model="queryParams.no"
+          placeholder="请输入出库单号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="产品" prop="productId">
+        <el-select
+          v-model="queryParams.productId"
+          clearable
+          filterable
+          placeholder="请选择产品"
+          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="出库时间" prop="outTime">
+        <el-date-picker
+          v-model="queryParams.outTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="客户" prop="customerId">
+        <el-select
+          v-model="queryParams.customerId"
+          clearable
+          filterable
+          placeholder="请选择供客户"
+          class="!w-240px"
+        >
+          <el-option
+            v-for="item in customerList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="仓库" prop="warehouseId">
+        <el-select
+          v-model="queryParams.warehouseId"
+          clearable
+          filterable
+          placeholder="请选择仓库"
+          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="创建人" prop="creator">
+        <el-select
+          v-model="queryParams.creator"
+          clearable
+          filterable
+          placeholder="请选择创建人"
+          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="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" 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="备注" prop="remark">
+        <el-input
+          v-model="queryParams.remark"
+          placeholder="请输入备注"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['erp:stock-out:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['erp:stock-out:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+        <el-button
+          type="danger"
+          plain
+          @click="handleDelete(selectionList.map((item) => item.id))"
+          v-hasPermi="['erp:stock-out:delete']"
+          :disabled="selectionList.length === 0"
+        >
+          <Icon icon="ep:delete" class="mr-5px" /> 删除
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-tabs v-model="activeName" @tab-click="handleTabClick">
+      <el-tab-pane label="产品" name="产品出库" />
+      <el-tab-pane label="原料" name="原料出库" />
+      <el-tab-pane label="备件" name="备件出库" />
+      <el-tab-pane label="其他" name="其他出库" />
+    </el-tabs>
+
+    <el-table
+      v-loading="loading"
+      :data="list"
+      :stripe="true"
+      :show-overflow-tooltip="true"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column width="30" label="选择" type="selection" />
+      <el-table-column min-width="180" label="出库单号" align="center" prop="no" />
+      <el-table-column label="产品信息" align="left" sortable prop="productNames" min-width="210" />
+      <el-table-column label="客户" align="center" prop="customerName" />
+      <el-table-column
+        label="出库时间"
+        align="center"
+        sortable
+        prop="outTime"
+        :formatter="dateFormatter2"
+        width="120px"
+      />
+      <el-table-column label="创建人" align="center" prop="creatorName" />
+      <el-table-column
+        label="数量"
+        align="right"
+        sortable
+        prop="totalCount"
+        :formatter="erpCountTableColumnFormatter"
+      />
+      <el-table-column
+        label="金额"
+        align="right"
+        sortable
+        prop="totalPrice"
+        :formatter="erpPriceTableColumnFormatter"
+      />
+      <el-table-column label="状态" align="center" fixed="right" width="90" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" fixed="right" width="220">
+        <template #default="scope">
+          <el-button
+            link
+            @click="openForm('detail', scope.row.id)"
+            v-hasPermi="['erp:stock-out:query']"
+          >
+            详情
+          </el-button>
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['erp:stock-out:update']"
+            :disabled="scope.row.status === 20"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="primary"
+            @click="handleUpdateStatus(scope.row.id, 20)"
+            v-hasPermi="['erp:stock-out:update-status']"
+            v-if="scope.row.status === 10"
+          >
+            审批
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleUpdateStatus(scope.row.id, 10)"
+            v-hasPermi="['erp:stock-out:update-status']"
+            v-else
+          >
+            反审批
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete([scope.row.id])"
+            v-hasPermi="['erp:stock-out:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <StockOutForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter2 } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { StockOutApi, StockOutVO } from '@/api/erp/stock/out'
+import StockOutForm from './StockOutForm.vue'
+import { ProductApi, ProductVO } from '@/api/erp/product/product'
+import { WarehouseApi, WarehouseVO } from '@/api/erp/stock/warehouse'
+import { SupplierApi, SupplierVO } from '@/api/erp/purchase/supplier'
+import { UserVO } from '@/api/system/user'
+import * as UserApi from '@/api/system/user'
+import { erpCountTableColumnFormatter, erpPriceTableColumnFormatter } from '@/utils'
+import { CustomerApi, CustomerVO } from '@/api/erp/sale/customer'
+
+/** ERP 其它出库单列表 */
+defineOptions({ name: 'ErpStockOut' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<StockOutVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  no: undefined,
+  productId: undefined,
+  customerId: undefined,
+  outType: undefined,
+  warehouseId: undefined,
+  outTime: [],
+  status: undefined,
+  remark: undefined,
+  creator: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+const productList = ref<ProductVO[]>([]) // 产品列表
+const warehouseList = ref<WarehouseVO[]>([]) // 仓库列表
+const customerList = ref<CustomerVO[]>([]) // 客户列表
+const userList = ref<UserVO[]>([]) // 用户列表
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await StockOutApi.getStockOutPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (ids: number[]) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await StockOutApi.deleteStockOut(ids)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+    selectionList.value = selectionList.value.filter((item) => !ids.includes(item.id))
+  } catch {}
+}
+
+/** 审批/反审批操作 */
+const handleUpdateStatus = async (id: number, status: number) => {
+  try {
+    // 审批的二次确认
+    await message.confirm(`确定${status === 20 ? '审批' : '反审批'}该出库单吗？`)
+    // 发起审批
+    await StockOutApi.updateStockOutStatus(id, status)
+    message.success(`${status === 20 ? '审批' : '反审批'}成功`)
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await StockOutApi.exportStockOut(queryParams)
+    download.excel(data, '其它出库单.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 选中操作 */
+const selectionList = ref<StockOutVO[]>([])
+const handleSelectionChange = (rows: StockOutVO[]) => {
+  selectionList.value = rows
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  queryParams.outType ='产品出库'
+  await getList()
+  // 加载产品、仓库列表、客户
+  productList.value = await ProductApi.getProductSimpleList()
+  warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
+  customerList.value = await CustomerApi.getCustomerSimpleList()
+  userList.value = await UserApi.getSimpleUserList()
+})
+// TODO 芋艿：可优化功能：列表界面，支持导入
+// TODO 芋艿：可优化功能：详情界面，支持打印
+/** tab 切换 */
+let activeName = '产品出库'
+const handleTabClick = (tab: TabsPaneContext) => {
+  queryParams.outType = tab.paneName
+  handleQuery()
+}
+</script>
diff --git a/src/views/erp/component/product/ProductForm.vue b/src/views/erp/component/product/ProductForm.vue
new file mode 100644
index 00000000..e013f828
--- /dev/null
+++ b/src/views/erp/component/product/ProductForm.vue
@@ -0,0 +1,242 @@
+<!-- ERP 产品的新增/修改 -->
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="名称" prop="name">
+            <el-input v-model="formData.name" placeholder="请输入名称" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="条码" prop="barCode">
+            <el-input v-model="formData.barCode" placeholder="请输入条码" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="分类" prop="categoryId">
+            <el-tree-select
+              v-model="formData.categoryId"
+              :data="categoryList"
+              :props="defaultProps"
+              check-strictly
+              default-expand-all
+              placeholder="请选择分类"
+              class="w-1/1"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="单位" prop="unitId">
+            <el-select v-model="formData.unitId" clearable placeholder="请选择单位" class="w-1/1">
+              <el-option
+                v-for="unit in unitList"
+                :key="unit.id"
+                :label="unit.name"
+                :value="unit.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="状态" prop="status">
+            <el-radio-group v-model="formData.status">
+              <el-radio
+                v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+                :key="dict.value"
+                :label="dict.value"
+              >
+                {{ dict.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="规格" prop="standard">
+            <el-input v-model="formData.standard" placeholder="请输入规格" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="保质期天数" prop="expiryDay">
+            <el-input-number
+              v-model="formData.expiryDay"
+              placeholder="请输入保质期天数"
+              :min="0"
+              :precision="0"
+              class="!w-1/1"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="重量（g）" prop="weight">
+            <el-input-number
+              v-model="formData.weight"
+              placeholder="请输入重量（g）"
+              :min="0"
+              class="!w-1/1"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采购价格" prop="purchasePrice">
+            <el-input-number
+              v-model="formData.purchasePrice"
+              placeholder="请输入采购价格，单位：元"
+              :min="0"
+              :precision="2"
+              class="!w-1/1"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="销售价格" prop="salePrice">
+            <el-input-number
+              v-model="formData.salePrice"
+              placeholder="请输入销售价格，单位：元"
+              :min="0"
+              :precision="2"
+              class="!w-1/1"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最低价格" prop="minPrice">
+            <el-input-number
+              v-model="formData.minPrice"
+              placeholder="请输入最低价格，单位：元"
+              :min="0"
+              :precision="2"
+              class="!w-1/1"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remark">
+            <el-input type="textarea" v-model="formData.remark" placeholder="请输入备注" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { ProductApi, ProductVO } from '@/api/erp/product/product'
+import { ProductCategoryApi, ProductCategoryVO } from '@/api/erp/product/category'
+import { ProductUnitApi, ProductUnitVO } from '@/api/erp/product/unit'
+import { CommonStatusEnum } from '@/utils/constants'
+import { defaultProps, handleTree } from '@/utils/tree'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+
+/** ERP 产品 表单 */
+defineOptions({ name: 'ProductForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  name: undefined,
+  barCode: undefined,
+  categoryId: undefined,
+  unitId: undefined,
+  status: undefined,
+  standard: undefined,
+  remark: undefined,
+  expiryDay: undefined,
+  weight: undefined,
+  purchasePrice: undefined,
+  salePrice: undefined,
+  minPrice: undefined
+})
+const formRules = reactive({
+  name: [{ required: true, message: '产品名称不能为空', trigger: 'blur' }],
+  barCode: [{ required: true, message: '产品条码不能为空', trigger: 'blur' }],
+  categoryId: [{ required: true, message: '产品分类编号不能为空', trigger: 'blur' }],
+  unitId: [{ required: true, message: '单位编号不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '产品状态不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+const categoryList = ref<ProductCategoryVO[]>([]) // 产品分类列表
+const unitList = ref<ProductUnitVO[]>([]) // 产品单位列表
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await ProductApi.getProduct(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+  // 产品分类
+  const categoryData = await ProductCategoryApi.getProductCategorySimpleList()
+  categoryList.value = handleTree(categoryData, 'id', 'parentId')
+  // 产品单位
+  unitList.value = await ProductUnitApi.getProductUnitSimpleList()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as ProductVO
+    if (formType.value === 'create') {
+      await ProductApi.createProduct(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductApi.updateProduct(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: undefined,
+    barCode: undefined,
+    categoryId: undefined,
+    unitId: undefined,
+    status: CommonStatusEnum.ENABLE,
+    standard: undefined,
+    remark: undefined,
+    expiryDay: undefined,
+    weight: undefined,
+    purchasePrice: undefined,
+    salePrice: undefined,
+    minPrice: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/erp/component/product/index.vue b/src/views/erp/component/product/index.vue
new file mode 100644
index 00000000..aa8ade0a
--- /dev/null
+++ b/src/views/erp/component/product/index.vue
@@ -0,0 +1,200 @@
+<!-- ERP 产品列表 -->
+<template>
+
+
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="备件名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['erp:product:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['erp:product:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="备件编码" align="center" prop="barCode" />
+      <el-table-column label="备件名称" align="left" prop="name"  width="220px"/>
+      <el-table-column label="规格" align="center" prop="standard" />
+      <el-table-column label="分类" align="center" prop="categoryName" />
+      <el-table-column label="单位" align="center" prop="unitName" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center" width="150px">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['erp:product:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['erp:product:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ProductForm ref="formRef" @success="getList" />
+
+
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { ProductApi, ProductVO } from '@/api/erp/product/product'
+import { ProductCategoryApi, ProductCategoryVO } from '@/api/erp/product/category'
+import ProductForm from './ProductForm.vue'
+import { DICT_TYPE } from '@/utils/dict'
+import { defaultProps, handleTree } from '@/utils/tree'
+import { erpPriceTableColumnFormatter } from '@/utils'
+import BomForm from "@/views/mes/bom/BomForm.vue";
+
+/** ERP 产品列表 */
+defineOptions({ name: 'ErpProduct' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<ProductVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: undefined,
+  categoryId: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+const categoryList = ref<ProductCategoryVO[]>([]) // 产品分类列表
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    queryParams.categoryId = 5
+    const data = await ProductApi.getProductPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ProductApi.deleteProduct(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductApi.exportProduct(queryParams)
+    download.excel(data, '产品.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  queryParams.categoryId = 2
+  await getList()
+  // 产品分类
+  const categoryData = await ProductCategoryApi.getProductCategorySimpleList()
+  categoryList.value = handleTree(categoryData, 'id', 'parentId')
+})
+</script>
diff --git a/src/views/erp/component/record/index.vue b/src/views/erp/component/record/index.vue
new file mode 100644
index 00000000..7814859c
--- /dev/null
+++ b/src/views/erp/component/record/index.vue
@@ -0,0 +1,278 @@
+<!-- ERP 产品库存明细列表 -->
+<template>
+
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="产品" prop="productId">
+        <el-select
+          v-model="queryParams.productId"
+          clearable
+          filterable
+          placeholder="请选择产品"
+          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="仓库" prop="warehouseId">
+        <el-select
+          v-model="queryParams.warehouseId"
+          clearable
+          filterable
+          placeholder="请选择仓库"
+          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="类型" prop="bizType">
+        <el-select
+          v-model="queryParams.bizType"
+          placeholder="请选择类型"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.ERP_STOCK_RECORD_BIZ_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="业务单号" prop="bizNo">
+        <el-input
+          v-model="queryParams.bizNo"
+          placeholder="请输入业务单号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-220px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['erp:stock-record:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['erp:stock-record:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-tabs v-model="activeName" @tab-click="handleTabClick">
+      <el-tab-pane label="产品" name="2" />
+      <el-tab-pane label="原料" name="1" />
+      <el-tab-pane label="备件" name="5" />
+      <el-tab-pane label="工具" name="3" />
+      <el-tab-pane label="耗材" name="4" />
+      <el-tab-pane label="其他" name="0" />
+    </el-tabs>
+
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="产品名称" align="left" sortable prop="productName" width="210px"/>
+      <el-table-column label="产品分类" align="center" prop="categoryName" />
+      <el-table-column label="产品单位" align="center" prop="unitName" />
+      <el-table-column label="仓库编号" align="center" prop="warehouseName" />
+      <el-table-column label="类型" align="center" prop="bizType" min-width="100">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ERP_STOCK_RECORD_BIZ_TYPE" :value="scope.row.bizType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="出入库单号" align="center" prop="bizNo" width="200" />
+      <el-table-column
+        label="出入库数量"
+        align="right"
+        sortable
+        prop="count"
+        width="120px"
+        :formatter="erpCountTableColumnFormatter"
+      />
+      <el-table-column
+        label="库存量"
+        align="right"
+        sortable
+        prop="totalCount"
+        width="120px"
+        :formatter="erpCountTableColumnFormatter"
+      />
+      <el-table-column
+        label="出入库日期"
+        align="center"
+        sortable
+        prop="recordTime"
+        :formatter="dateFormatter2"
+        width="120px"
+      />
+      <el-table-column
+        label="创建日期"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作人" align="center" prop="creatorName" />
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+</template>
+
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import {dateFormatter, dateFormatter2} from '@/utils/formatTime'
+import download from '@/utils/download'
+import { StockRecordApi, StockRecordVO } from '@/api/erp/stock/record'
+import { ProductApi, ProductVO } from '@/api/erp/product/product'
+import { WarehouseApi, WarehouseVO } from '@/api/erp/stock/warehouse'
+import { erpCountTableColumnFormatter } from '@/utils'
+
+/** ERP 产品库存明细列表 */
+defineOptions({ name: 'ErpStockRecord' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<StockRecordVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  productId: undefined,
+  categoryId: undefined,
+  warehouseId: undefined,
+  bizType: undefined,
+  bizNo: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+const productList = ref<ProductVO[]>([]) // 产品列表
+const warehouseList = ref<WarehouseVO[]>([]) // 仓库列表
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await StockRecordApi.getStockRecordPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await StockRecordApi.deleteStockRecord(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await StockRecordApi.exportStockRecord(queryParams)
+    download.excel(data, '产品库存明细.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onActivated(() => {
+  getList()
+})
+
+onMounted(async () => {
+  await getList()
+  // 加载产品、仓库列表
+  productList.value = await ProductApi.getProductSimpleList()
+  warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
+})
+
+/** tab 切换 */
+let activeName = '2'
+const handleTabClick = (tab: TabsPaneContext) => {
+  queryParams.categoryId = tab.paneName
+  handleQuery()
+}
+</script>
diff --git a/src/views/erp/component/stock/index.vue b/src/views/erp/component/stock/index.vue
new file mode 100644
index 00000000..81f164f8
--- /dev/null
+++ b/src/views/erp/component/stock/index.vue
@@ -0,0 +1,208 @@
+<!-- ERP 产品库存列表 -->
+<template>
+
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="产品" prop="productId">
+        <el-select
+          v-model="queryParams.productId"
+          clearable
+          filterable
+          placeholder="请选择产品"
+          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="仓库" prop="warehouseId">
+        <el-select
+          v-model="queryParams.warehouseId"
+          clearable
+          filterable
+          placeholder="请选择仓库"
+          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>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['erp:stock:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['erp:stock:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-tabs v-model="activeName" @tab-click="handleTabClick">
+      <el-tab-pane label="产品" name="2" />
+      <el-tab-pane label="原料" name="1" />
+      <el-tab-pane label="备件" name="5" />
+      <el-tab-pane label="工具" name="3" />
+      <el-tab-pane label="耗材" name="4" />
+      <el-tab-pane label="其他" name="0" />
+    </el-tabs>
+
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="产品" align="left" sortable prop="productName" />
+      <el-table-column label="分类" align="center" prop="categoryName" />
+      <el-table-column
+        label="库存量"
+        align="right"
+        sortable
+        prop="count"
+        :formatter="erpCountTableColumnFormatter"
+      />
+      <el-table-column label="单位" align="center" prop="unitName" />
+      <el-table-column label="仓库" align="center" prop="warehouseName" />
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { StockApi, StockVO } from '@/api/erp/stock/stock'
+import { ProductApi, ProductVO } from '@/api/erp/product/product'
+import { WarehouseApi, WarehouseVO } from '@/api/erp/stock/warehouse'
+import { erpCountTableColumnFormatter } from '@/utils'
+import { ProductCategoryApi, ProductCategoryVO } from '@/api/erp/product/category'
+
+/** ERP 产品库存列表 */
+defineOptions({ name: 'ErpStock' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<StockVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  productId: undefined,
+  warehouseId: undefined,
+  categoryId: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+const productList = ref<ProductVO[]>([]) // 产品列表
+const warehouseList = ref<WarehouseVO[]>([]) // 仓库列表
+const categoryList = ref<ProductCategoryVO[]>([]) // 仓库列表
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await StockApi.getStockPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await StockApi.deleteStock(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await StockApi.exportStock(queryParams)
+    download.excel(data, '产品库存.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  queryParams.categoryId = 2
+  await getList()
+  // 加载产品、仓库列表
+  productList.value = await ProductApi.getProductSimpleList()
+  warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
+  categoryList.value = await ProductCategoryApi.getProductCategorySimpleList()
+})
+
+/** tab 切换 */
+let activeName = '2'
+const handleTabClick = (tab: TabsPaneContext) => {
+  queryParams.categoryId = tab.paneName
+  handleQuery()
+}
+</script>
diff --git a/src/views/erp/product/product/index.vue b/src/views/erp/product/product/index.vue
index 00558567..87c2ba7c 100644
--- a/src/views/erp/product/product/index.vue
+++ b/src/views/erp/product/product/index.vue
@@ -49,7 +49,7 @@
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
       <el-tab-pane label="产品" name="2" />
       <el-tab-pane label="原料" name="1" />
-      <el-tab-pane label="关键件" name="5" />
+      <el-tab-pane label="备件" name="5" />
       <el-tab-pane label="工具" name="3" />
       <el-tab-pane label="耗材" name="4" />
       <el-tab-pane label="办公室用品" name="6" />
diff --git a/src/views/erp/stock/in/StockInForm.vue b/src/views/erp/stock/in/StockInForm.vue
index 4b934ec6..8bb35a0f 100644
--- a/src/views/erp/stock/in/StockInForm.vue
+++ b/src/views/erp/stock/in/StockInForm.vue
@@ -132,8 +132,8 @@ const options = [
     label: '其他入库',
   },
   {
-    value: '关键件入库',
-    label: '关键件入库',
+    value: '备件入库',
+    label: '备件入库',
 
   },
   {
diff --git a/src/views/erp/stock/in/index.vue b/src/views/erp/stock/in/index.vue
index eb18e449..b905e91d 100644
--- a/src/views/erp/stock/in/index.vue
+++ b/src/views/erp/stock/in/index.vue
@@ -150,7 +150,7 @@
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
       <el-tab-pane label="产品" name="产品入库" />
       <el-tab-pane label="原料" name="原料入库" />
-      <el-tab-pane label="关键件" name="关键件入库" />
+      <el-tab-pane label="备件" name="备件入库" />
       <el-tab-pane label="其他" name="其他入库" />
     </el-tabs>
 
diff --git a/src/views/erp/stock/out/StockOutForm.vue b/src/views/erp/stock/out/StockOutForm.vue
index 25ac3689..ddea4f43 100644
--- a/src/views/erp/stock/out/StockOutForm.vue
+++ b/src/views/erp/stock/out/StockOutForm.vue
@@ -136,8 +136,8 @@ const options = [
     label: '其他出库',
   },
   {
-    value: '关键件出库',
-    label: '关键件出库',
+    value: '备件出库',
+    label: '备件出库',
 
   },
   {
diff --git a/src/views/erp/stock/out/index.vue b/src/views/erp/stock/out/index.vue
index fb268707..f6307c8c 100644
--- a/src/views/erp/stock/out/index.vue
+++ b/src/views/erp/stock/out/index.vue
@@ -150,7 +150,7 @@
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
       <el-tab-pane label="产品" name="产品出库" />
       <el-tab-pane label="原料" name="原料出库" />
-      <el-tab-pane label="关键件" name="关键件出库" />
+      <el-tab-pane label="备件" name="备件出库" />
       <el-tab-pane label="其他" name="其他出库" />
     </el-tabs>
 
diff --git a/src/views/erp/stock/record/index.vue b/src/views/erp/stock/record/index.vue
index b7ebfc98..7814859c 100644
--- a/src/views/erp/stock/record/index.vue
+++ b/src/views/erp/stock/record/index.vue
@@ -106,7 +106,7 @@
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
       <el-tab-pane label="产品" name="2" />
       <el-tab-pane label="原料" name="1" />
-      <el-tab-pane label="关键件" name="5" />
+      <el-tab-pane label="备件" name="5" />
       <el-tab-pane label="工具" name="3" />
       <el-tab-pane label="耗材" name="4" />
       <el-tab-pane label="其他" name="0" />
diff --git a/src/views/erp/stock/stock/index.vue b/src/views/erp/stock/stock/index.vue
index b57d314c..81f164f8 100644
--- a/src/views/erp/stock/stock/index.vue
+++ b/src/views/erp/stock/stock/index.vue
@@ -72,7 +72,7 @@
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
       <el-tab-pane label="产品" name="2" />
       <el-tab-pane label="原料" name="1" />
-      <el-tab-pane label="关键件" name="5" />
+      <el-tab-pane label="备件" name="5" />
       <el-tab-pane label="工具" name="3" />
       <el-tab-pane label="耗材" name="4" />
       <el-tab-pane label="其他" name="0" />
diff --git a/src/views/mes/machine/MachineComponentForm.vue b/src/views/mes/machine/MachineComponentForm.vue
index 2d1d68e0..bf33c1de 100644
--- a/src/views/mes/machine/MachineComponentForm.vue
+++ b/src/views/mes/machine/MachineComponentForm.vue
@@ -11,7 +11,7 @@
         <el-collapse-item title="基本信息" name="1">
           <el-row>
             <el-col :span="8">
-              <el-form-item label="父级装备" prop="parentId">
+              <el-form-item label="父级设备" prop="parentId">
                 <el-tree-select
                   v-model="formData.parentId"
                   :data="machineComponentTree"
@@ -23,7 +23,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="组织类型" prop="componentType">
+              <el-form-item label="设备类型" prop="componentType">
                 <el-radio-group v-model="formData.componentType">
                   <el-radio
                     v-for="dict in getIntDictOptions(DICT_TYPE.MES_MACHINE_TYPE)"
@@ -48,8 +48,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="装备名称" prop="name">
-                <el-input v-model="formData.name" placeholder="请输入装备名称" />
+              <el-form-item label="设备名称" prop="name">
+                <el-input v-model="formData.name" placeholder="请输入设备名称" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -104,47 +104,42 @@
           </el-row>
         </el-collapse-item>
         <el-collapse-item title="模具维保" name="3">
+<!--          <el-row>-->
+<!--            <el-col :span="8">-->
+<!--              <el-form-item label="建议维保类型" prop="maintainType">-->
+<!--                <el-radio-group v-model="formData.status">-->
+<!--                  <el-radio-->
+<!--                    v-for="dict in getStrDictOptions(DICT_TYPE.MES_MAINTAIN_TYPE)"-->
+<!--                    :key="dict.value"-->
+<!--                    :label="dict.value"-->
+<!--                  >-->
+<!--                    {{ dict.label }}-->
+<!--                  </el-radio>-->
+<!--                </el-radio-group>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="8">-->
+<!--              <el-form-item label="建议维保时间" prop="maintainTime">-->
+<!--                <el-input v-model="formData.maintainTime" placeholder="请输入建议维保时间" />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="8">-->
+<!--              <el-form-item label="建议时间单位" prop="maintainTimeUnit">-->
+<!--                <el-radio-group v-model="formData.status">-->
+<!--                  <el-radio-->
+<!--                    v-for="dict in getStrDictOptions(DICT_TYPE.MES_MAINTAIN_TIME_UNIT)"-->
+<!--                    :key="dict.value"-->
+<!--                    :label="dict.value"-->
+<!--                  >-->
+<!--                    {{ dict.label }}-->
+<!--                  </el-radio>-->
+<!--                </el-radio-group>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--          </el-row>-->
           <el-row>
             <el-col :span="8">
-              <el-form-item label="建议维保类型" prop="maintainType">
-                <el-radio-group v-model="formData.status">
-                  <el-radio
-                    v-for="dict in getStrDictOptions(DICT_TYPE.MES_MAINTAIN_TYPE)"
-                    :key="dict.value"
-                    :label="dict.value"
-                  >
-                    {{ dict.label }}
-                  </el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="建议维保时间" prop="maintainTime">
-                <el-date-picker
-                  v-model="formData.maintainTime"
-                  type="date"
-                  value-format="x"
-                  placeholder="选择建议维保时间"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="建议时间单位" prop="maintainTimeUnit">
-                <el-radio-group v-model="formData.status">
-                  <el-radio
-                    v-for="dict in getStrDictOptions(DICT_TYPE.MES_MAINTAIN_TIME_UNIT)"
-                    :key="dict.value"
-                    :label="dict.value"
-                  >
-                    {{ dict.label }}
-                  </el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="实际维保类型" prop="trueMaintainTimeType">
+              <el-form-item label="维保类型" prop="trueMaintainTimeType">
                 <el-radio-group v-model="formData.trueMaintainTimeType">
                   <el-radio
                     v-for="dict in getStrDictOptions(DICT_TYPE.MES_MAINTAIN_TYPE)"
@@ -157,17 +152,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="实际维保时间" prop="trueMaintainTime">
-                <el-date-picker
-                  v-model="formData.trueMaintainTime"
-                  type="date"
-                  value-format="x"
-                  placeholder="选择实际维保时间"
-                />
+              <el-form-item label="维保时间" prop="trueMaintainTime">
+                <el-input v-model="formData.trueMaintainTime" placeholder="请输入维保时间" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="实际时间单位" prop="trueMaintainTimeUnit">
+              <el-form-item label="时间单位" prop="trueMaintainTimeUnit">
                 <el-radio-group v-model="formData.trueMaintainTimeUnit">
                   <el-radio
                     v-for="dict in getStrDictOptions(DICT_TYPE.MES_MAINTAIN_TIME_UNIT)"
diff --git a/src/views/mes/machine/index.vue b/src/views/mes/machine/index.vue
index 8a4c6c9b..96293cbd 100644
--- a/src/views/mes/machine/index.vue
+++ b/src/views/mes/machine/index.vue
@@ -159,7 +159,7 @@
           <dict-tag :type="DICT_TYPE.MES_MACHINE_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" fixed="right"  min-width="150px" >
+      <el-table-column label="操作" align="center" fixed="right"  min-width="250px" >
         <template #default="scope">
           <el-button
             link
@@ -177,6 +177,22 @@
           >
             换模
           </el-button>
+          <el-button
+            link
+            type="success"
+            @click="openRecordForm('create', scope.row.id)"
+            v-hasPermi="['mes:machine-component:update']"
+          >
+            维修
+          </el-button>
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['mes:machine-component:update']"
+          >
+            维保
+          </el-button>
           <el-button
             link
             type="danger"