diff --git a/.env.local b/.env.local
index 2eb3a785..5d330e83 100644
--- a/.env.local
+++ b/.env.local
@@ -8,8 +8,8 @@ VITE_DEV=true
 # 线上环境
 # VITE_BASE_URL='https://besure.ngsk.tech:7001' 
 # 本地联调
-VITE_BASE_URL='http://192.168.5.160:48081' 
-# VITE_BASE_URL='http://192.168.43.233:48081' 
+# VITE_BASE_URL='http://192.168.5.142:48081' 
+VITE_BASE_URL='http://192.168.43.233:48081' 
 # VITE_BASE_URL='http://192.168.5.5:48081' 
 
 
diff --git a/src/api/erp/stock/out/index.ts b/src/api/erp/stock/out/index.ts
index 79d2d74b..cc54ea20 100644
--- a/src/api/erp/stock/out/index.ts
+++ b/src/api/erp/stock/out/index.ts
@@ -7,12 +7,27 @@ export interface StockOutVO {
   customerId: number // 客户编号
   outTime: Date // 出库时间
   outType: string //出库类型
+  stockUserId?: string
   totalCount: number // 合计数量
   totalPrice: number // 合计金额，单位：元
   status: number // 状态
   remark: string // 备注
 }
 
+export interface StockOutApproveRecordVO {
+  id: number
+  stockOutId: number
+  actionType: string
+  fromStatus: number
+  toStatus: number
+  targetUserId: number
+  targetUserName: string
+  remark: string
+  creator: string
+  creatorName: string
+  createTime: string
+}
+
 // ERP 其它出库单 API
 export const StockOutApi = {
   // 查询其它出库单分页
@@ -46,6 +61,18 @@ export const StockOutApi = {
     })
   },
 
+  submitStockOut: async (data: { id: string; auditUserId: string; remark?: string }) => {
+    return await request.put({ url: `/erp/stock-out/submit`, data })
+  },
+
+  auditStockOut: async (data: { id: string; status: string; remark?: string }) => {
+    return await request.put({ url: `/erp/stock-out/audit`, data })
+  },
+
+  getApproveRecordList: async (id: number) => {
+    return await request.get({ url: `/erp/stock-out/approve-record-list`, params: { id } })
+  },
+
   // 删除其它出库单
   deleteStockOut: async (ids: number[]) => {
     return await request.delete({
diff --git a/src/locales/en.ts b/src/locales/en.ts
index aa4bc5f9..d047ed49 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -371,6 +371,17 @@ export default {
       totalPrice: 'Total Price',
       inType: 'Inbound Type',
       file: 'Attachment',
+      stockUser: 'Handler',
+      auditUser: 'Auditor',
+      submitAudit: 'Submit Audit',
+      auditApprove: 'Audit Approved',
+      auditReject: 'Audit Rejected',
+      auditRecord: 'Audit Record',
+      index: 'Index',
+      operator: 'Operator',
+      operateTime: 'Operation Time',
+      operateAction: 'Action',
+      operateDesc: 'Description',
       tabProduct: 'Product Inbound',
       tabMaterial: 'Material Inbound',
       tabPart: 'Part Inbound',
@@ -385,12 +396,22 @@ export default {
       placeholderSupplier: 'Please select supplier',
       placeholderInTime: 'Select inbound time',
       placeholderInType: 'Please select inbound type',
+      placeholderStockUser: 'Please select handler',
+      placeholderAuditUser: 'Please select auditor',
+      placeholderSubmitRemark: 'Please enter submit remark',
+      placeholderAuditApproveRemark: 'Please enter approval remark',
+      placeholderAuditRejectRemark: 'Please enter rejection remark',
       validatorInTimeRequired: 'Inbound time is required',
       validatorInTypeRequired: 'Inbound type is required',
+      validatorStockUserRequired: 'Please select handler',
+      validatorAuditUserRequired: 'Please select auditor',
       confirmApprove: 'Are you sure to approve this inbound order?',
       confirmReverseApprove: 'Are you sure to reverse approve this inbound order?',
       approveSuccess: 'Approve success',
       reverseApproveSuccess: 'Reverse approve success',
+      submitSuccess: 'Submit success',
+      auditApproveSuccess: 'Audit approve success',
+      auditRejectSuccess: 'Audit reject success',
       exportName: 'Other Inbound Order.xls',
       list: 'Inbound Product List',
       addItem: 'Add Inbound Product'
@@ -398,12 +419,30 @@ export default {
     Out: {
       no: 'Outbound No',
       customer: 'Customer',
+      product: 'Product',
       outTime: 'Outbound Time',
       outType: 'Outbound Type',
       warehouse: 'Warehouse',
+      creator: 'Creator',
+      status: 'Status',
       remark: 'Remark',
       file: 'Attachment',
       list: 'Outbound Product List',
+      productInfo: 'Product Info',
+      materialInfo: 'Material Info',
+      sparePartInfo: 'Spare Part Info',
+      count: 'Quantity',
+      auditUser: 'Auditor',
+      stockUser: 'Handler',
+      submitAudit: 'Submit Audit',
+      auditApprove: 'Audit Approved',
+      auditReject: 'Audit Rejected',
+      auditRecord: 'Audit Record',
+      index: 'Index',
+      operator: 'Operator',
+      operateTime: 'Operation Time',
+      operateAction: 'Action',
+      operateDesc: 'Description',
       tabOther: 'Other Outbound',
       tabPart: 'Part Outbound',
       tabMaterial: 'Material Outbound',
@@ -411,34 +450,64 @@ export default {
       tabPick: 'Pick Outbound',
       placeholderNo: 'Auto-generated on save',
       placeholderCustomer: 'Please select customer',
+      placeholderProduct: 'Please select product',
+      placeholderWarehouse: 'Please select warehouse',
+      placeholderCreator: 'Please select creator',
+      placeholderStatus: 'Please select status',
       placeholderOutTime: 'Select outbound time',
       placeholderOutType: 'Please select outbound type',
       placeholderRemark: 'Please enter remark',
+      placeholderAuditUser: 'Please select auditor',
+      placeholderStockUser: 'Please select handler',
+      placeholderSubmitRemark: 'Please enter submit remark',
+      placeholderAuditApproveRemark: 'Please enter approval remark',
+      placeholderAuditRejectRemark: 'Please enter rejection remark',
       validatorOutTimeRequired: 'Outbound time is required',
       validatorOutTypeRequired: 'Outbound type is required',
+      validatorStockUserRequired: 'Please select handler',
+      validatorAuditUserRequired: 'Please select auditor',
       confirmApprove: 'Are you sure to approve this outbound order?',
       confirmReverseApprove: 'Are you sure to reverse approve this outbound order?',
       approveSuccess: 'Approve success',
       reverseApproveSuccess: 'Reverse approve success',
+      submitSuccess: 'Submit success',
+      auditApproveSuccess: 'Audit approve success',
+      auditRejectSuccess: 'Audit reject success',
       exportName: 'Other Outbound Order.xls',
       addItem: 'Add Outbound Product'
     },
     Item: {
       index: 'Index',
       warehouse: 'Warehouse Name',
+      area: 'Area',
       product: 'Product Name',
       stock: 'Stock',
       barcode: 'Barcode',
       unit: 'Unit',
+      inventoryUnit: 'Inventory Unit',
+      purchaseUnit: 'Purchase Unit',
+      purchaseUnitConvertQuantity: 'Purchase Convert Qty',
+      inputUnitType: 'Unit Input Type',
+      inputCount: 'Input Count',
       count: 'Quantity',
       price: 'Price',
       totalPrice: 'Total Price',
       remark: 'Remark',
       action: 'Action',
+      selectCode: 'Select Code',
+      code: 'Code',
+      name: 'Name',
+      spec: 'Specification',
+      category: 'Category',
       placeholderWarehouse: 'Please select warehouse',
+      placeholderArea: 'Please select area',
       placeholderProduct: 'Please select product',
       placeholderBarcode: 'Please select barcode',
+      placeholderInputUnitType: 'Please select',
+      placeholderCode: 'Please enter code',
+      placeholderName: 'Please enter name',
       validatorWarehouseRequired: 'Warehouse is required',
+      validatorAreaRequired: 'Please select area',
       validatorProductRequired: 'Product is required',
       validatorCountRequired: 'Quantity is required'
     },
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 20a2cf6d..47b9738c 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -371,6 +371,17 @@ export default {
       totalPrice: '合计金额',
       inType: '入库类型',
       file: '附件',
+      stockUser: '经办人',
+      auditUser: '审核人',
+      submitAudit: '提交审核',
+      auditApprove: '审核通过',
+      auditReject: '审核驳回',
+      auditRecord: '审核记录',
+      index: '序号',
+      operator: '操作人',
+      operateTime: '操作时间',
+      operateAction: '操作动作',
+      operateDesc: '操作说明',
       tabProduct: '产品入库',
       tabMaterial: '原料入库',
       tabPart: '备件入库',
@@ -385,12 +396,22 @@ export default {
       placeholderSupplier: '请选择供应商',
       placeholderInTime: '选择入库时间',
       placeholderInType: '请选择入库类型',
+      placeholderStockUser: '请选择经办人',
+      placeholderAuditUser: '请选择审核人',
+      placeholderSubmitRemark: '请输入提交备注',
+      placeholderAuditApproveRemark: '请输入审核通过备注',
+      placeholderAuditRejectRemark: '请输入驳回备注',
       validatorInTimeRequired: '入库时间不能为空',
       validatorInTypeRequired: '入库类型不能为空',
+      validatorStockUserRequired: '请选择经办人',
+      validatorAuditUserRequired: '请选择审核人',
       confirmApprove: '确定审批该入库单吗？',
       confirmReverseApprove: '确定反审批该入库单吗？',
       approveSuccess: '审批成功',
       reverseApproveSuccess: '反审批成功',
+      submitSuccess: '提交成功',
+      auditApproveSuccess: '审核通过成功',
+      auditRejectSuccess: '驳回成功',
       exportName: '其它入库单.xls',
       list: '入库产品清单',
       addItem: '添加入库产品'
@@ -398,12 +419,30 @@ export default {
     Out: {
       no: '出库单号',
       customer: '客户',
+      product: '产品',
       outTime: '出库时间',
       outType: '出库类型',
       warehouse: '仓库',
+      creator: '创建人',
+      status: '状态',
       remark: '备注',
       file: '附件',
       list: '出库产品清单',
+      productInfo: '产品信息',
+      materialInfo: '物料信息',
+      sparePartInfo: '备件信息',
+      count: '数量',
+      auditUser: '审核人',
+      stockUser: '经办人',
+      submitAudit: '提交审核',
+      auditApprove: '审核通过',
+      auditReject: '审核驳回',
+      auditRecord: '审核记录',
+      index: '序号',
+      operator: '操作人',
+      operateTime: '操作时间',
+      operateAction: '操作动作',
+      operateDesc: '操作说明',
       tabOther: '其他出库',
       tabPart: '备件出库',
       tabMaterial: '原料出库',
@@ -411,34 +450,64 @@ export default {
       tabPick: '领料出库',
       placeholderNo: '保存时自动生成',
       placeholderCustomer: '请选择客户',
+      placeholderProduct: '请选择产品',
+      placeholderWarehouse: '请选择仓库',
+      placeholderCreator: '请选择创建人',
+      placeholderStatus: '请选择状态',
       placeholderOutTime: '选择出库时间',
       placeholderOutType: '请选择出库类型',
       placeholderRemark: '请输入备注',
+      placeholderAuditUser: '请选择审核人',
+      placeholderStockUser: '请选择经办人',
+      placeholderSubmitRemark: '请输入提交备注',
+      placeholderAuditApproveRemark: '请输入审核通过备注',
+      placeholderAuditRejectRemark: '请输入驳回备注',
       validatorOutTimeRequired: '出库时间不能为空',
       validatorOutTypeRequired: '出库类型不能为空',
+      validatorStockUserRequired: '请选择经办人',
+      validatorAuditUserRequired: '请选择审核人',
       confirmApprove: '确定审批该出库单吗？',
       confirmReverseApprove: '确定反审批该出库单吗？',
       approveSuccess: '审批成功',
       reverseApproveSuccess: '反审批成功',
+      submitSuccess: '提交成功',
+      auditApproveSuccess: '审核通过成功',
+      auditRejectSuccess: '驳回成功',
       exportName: '其它出库单.xls',
       addItem: '添加出库产品'
     },
     Item: {
       index: '序号',
       warehouse: '仓库名称',
+      area: '库区',
       product: '名称',
       stock: '库存',
       barcode: '编码',
       unit: '单位',
+      inventoryUnit: '库存单位',
+      purchaseUnit: '采购单位',
+      purchaseUnitConvertQuantity: '采购换算数量',
+      inputUnitType: '单位输入方式',
+      inputCount: '录入数量',
       count: '数量',
       price: '产品单价',
       totalPrice: '合计金额',
       remark: '备注',
       action: '操作',
+      selectCode: '选择编码',
+      code: '编码',
+      name: '名称',
+      spec: '规格型号',
+      category: '分类',
       placeholderWarehouse: '请选择仓库',
+      placeholderArea: '请选择库区',
       placeholderProduct: '请选择产品',
       placeholderBarcode: '请选择编码',
+      placeholderInputUnitType: '请选择',
+      placeholderCode: '请输入编码',
+      placeholderName: '请输入名称',
       validatorWarehouseRequired: '仓库不能为空',
+      validatorAreaRequired: '请选择库区',
       validatorProductRequired: '产品不能为空',
       validatorCountRequired: '产品数量不能为空'
     },
diff --git a/src/views/erp/stock/in/StockInForm.vue b/src/views/erp/stock/in/StockInForm.vue
index 4c857e09..88fc5db2 100644
--- a/src/views/erp/stock/in/StockInForm.vue
+++ b/src/views/erp/stock/in/StockInForm.vue
@@ -82,12 +82,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="经办人" prop="stockUserId">
+            <el-form-item :label="t('ErpStock.In.stockUser')" prop="stockUserId">
               <el-select
                 v-model="formData.stockUserId"
                 clearable
                 filterable
-                placeholder="请选择经办人"
+                :placeholder="t('ErpStock.In.placeholderStockUser')"
                 class="!w-1/1"
               >
                 <el-option
@@ -127,22 +127,22 @@
               :disabled="disabled"
             />
           </el-tab-pane>
-          <el-tab-pane v-if="showAuditRecordTab" label="审核记录" name="auditRecord">
+          <el-tab-pane v-if="showAuditRecordTab" :label="t('ErpStock.In.auditRecord')" name="auditRecord">
             <el-table
               v-loading="auditRecordLoading"
               :data="auditRecordList"
               :stripe="true"
               :show-overflow-tooltip="true"
             >
-              <el-table-column type="index" label="序号" align="center" width="80" />
-              <el-table-column label="操作人" align="center" prop="creatorName" min-width="120" />
-              <el-table-column label="操作时间" align="center" prop="createTime" :formatter="dateFormatter" min-width="180" />
-              <el-table-column label="操作动作" align="center" min-width="120">
+              <el-table-column type="index" :label="t('ErpStock.In.index')" align="center" width="80" />
+              <el-table-column :label="t('ErpStock.In.operator')" align="center" prop="creatorName" min-width="120" />
+              <el-table-column :label="t('ErpStock.In.operateTime')" align="center" prop="createTime" :formatter="dateFormatter" min-width="180" />
+              <el-table-column :label="t('ErpStock.In.operateAction')" align="center" min-width="120">
                 <template #default="{ row }">
                   {{ formatAuditAction(row) }}
                 </template>
               </el-table-column>
-              <el-table-column label="操作说明" align="center" prop="remark" min-width="180" />
+              <el-table-column :label="t('ErpStock.In.operateDesc')" align="center" prop="remark" min-width="180" />
             </el-table>
           </el-tab-pane>
         </el-tabs>
@@ -189,7 +189,7 @@ const formData = ref({
 const formRules = reactive({
   inTime: [{ required: true, message: t('ErpStock.In.validatorInTimeRequired'), trigger: 'blur' }],
   inType: [{ required: true, message: t('ErpStock.In.validatorInTypeRequired'), trigger: 'blur' }],
-  stockUserId: [{ required: true, message: '请选择经办人', trigger: 'change' }]
+  stockUserId: [{ required: true, message: t('ErpStock.In.validatorStockUserRequired'), trigger: 'change' }]
 })
 const disabled = computed(() => formType.value === 'detail')
 const formRef = ref() // 表单 Ref
@@ -258,11 +258,11 @@ const getAuditRecordList = async (id: number) => {
 }
 
 const formatAuditAction = (row: StockInApproveRecordVO) => {
-  if (row.toStatus === 10) return '提交'
-  if (row.toStatus === 20) return '审核通过'
-  if (row.toStatus === 1) return '驳回'
-  if (row.actionType === 'SUBMIT') return '提交'
-  if (row.actionType === 'AUDIT') return '审核'
+  if (row.toStatus === 10) return t('ErpStock.In.submitAudit')
+  if (row.toStatus === 20) return t('ErpStock.In.auditApprove')
+  if (row.toStatus === 1) return t('ErpStock.In.auditReject')
+  if (row.actionType === 'SUBMIT') return t('ErpStock.In.submitAudit')
+  if (row.actionType === 'AUDIT') return t('ErpStock.In.auditApprove')
   return row.actionType || '-'
 }
 
diff --git a/src/views/erp/stock/in/components/StockInItemForm.vue b/src/views/erp/stock/in/components/StockInItemForm.vue
index cb6154ef..661ef9c3 100644
--- a/src/views/erp/stock/in/components/StockInItemForm.vue
+++ b/src/views/erp/stock/in/components/StockInItemForm.vue
@@ -13,10 +13,10 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column v-if="isProductMaterialStockIn" label="库区" min-width="140">
+      <el-table-column v-if="isProductMaterialStockIn" :label="t('ErpStock.Item.area')" min-width="140">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.areaId`" :rules="formRules.areaId" class="mb-0px!">
-            <el-select v-model="row.areaId" clearable filterable placeholder="请选择库区" :disabled="!row.warehouseId">
+            <el-select v-model="row.areaId" clearable filterable :placeholder="t('ErpStock.Item.placeholderArea')" :disabled="!row.warehouseId">
               <el-option v-for="item in getAreaOptions(row.warehouseId)" :key="item.id" :label="getAreaLabel(item)"
                 :value="item.id" />
             </el-select>
@@ -60,14 +60,14 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="库存单位" min-width="80">
+      <el-table-column :label="t('ErpStock.Item.inventoryUnit')" 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 v-if="isPurchaseUnitStockIn" label="采购单位" min-width="100">
+      <el-table-column v-if="isPurchaseUnitStockIn" :label="t('ErpStock.Item.purchaseUnit')" min-width="100">
         <template #default="{ row }">
           <el-form-item class="mb-0px!">
             <el-input disabled v-model="row.purchaseUnitName" />
@@ -76,7 +76,7 @@
       </el-table-column>
       <el-table-column v-if="isPurchaseUnitStockIn" min-width="120">
         <template #header>
-          采购换算数量
+          {{ t('ErpStock.Item.purchaseUnitConvertQuantity') }}
           <el-tooltip effect="dark" placement="top">
             <template #content>
               {{ purchaseUnitConvertTipText }}
@@ -90,16 +90,16 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column v-if="isProductStockIn" label="单位输入方式" min-width="120">
+      <el-table-column v-if="isProductStockIn" :label="t('ErpStock.Item.inputUnitType')" min-width="120">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.inputUnitType`" class="mb-0px!">
-            <el-select v-model="row.inputUnitType" clearable placeholder="请选择">
+            <el-select v-model="row.inputUnitType" clearable :placeholder="t('common.selectText')">
               <el-option v-for="item in inputUnitTypeOptions" :key="item" :label="item" :value="item" />
             </el-select>
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column v-if="isProductMaterialStockIn" label="录入数量" prop="inputCount" min-width="140">
+      <el-table-column v-if="isProductMaterialStockIn" :label="t('ErpStock.Item.inputCount')" prop="inputCount" min-width="140">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.inputCount`" class="mb-0px!">
             <el-input-number v-model="row.inputCount" controls-position="right" :min="0.001" :precision="3"
@@ -154,19 +154,19 @@
     <el-button @click="handleAdd" round>+ {{ t('ErpStock.In.addItem') }}</el-button>
   </el-row>
 
-  <Dialog title="选择编码" v-model="productDialogVisible" width="900px">
+  <Dialog :title="t('ErpStock.Item.selectCode')" v-model="productDialogVisible" width="900px">
     <el-form :model="productQueryParams" :inline="true" class="-mb-15px">
-      <el-form-item label="编码">
-        <el-input v-model="productQueryParams.barCode" clearable placeholder="请输入编码"
+      <el-form-item :label="t('ErpStock.Item.code')">
+        <el-input v-model="productQueryParams.barCode" clearable :placeholder="t('ErpStock.Item.placeholderCode')"
           @keyup.enter="handleProductDialogQuery" />
       </el-form-item>
-      <el-form-item label="名称">
-        <el-input v-model="productQueryParams.name" clearable placeholder="请输入名称"
+      <el-form-item :label="t('ErpStock.Item.name')">
+        <el-input v-model="productQueryParams.name" clearable :placeholder="t('ErpStock.Item.placeholderName')"
           @keyup.enter="handleProductDialogQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="handleProductDialogQuery">
-          <Icon icon="ep:search" class="mr-5px" /> 查询
+          <Icon icon="ep:search" class="mr-5px" /> {{ t('common.query') }}
         </el-button>
       </el-form-item>
     </el-form>
@@ -177,21 +177,21 @@
           <el-radio v-model="selectedProductId" :label="row.id">&nbsp;</el-radio>
         </template>
       </el-table-column>
-      <el-table-column label="编码" prop="barCode" min-width="160" />
-      <el-table-column label="名称" prop="name" min-width="160" />
-      <el-table-column label="规格型号" prop="standard" min-width="120" />
-      <el-table-column label="分类" prop="subCategoryName" min-width="120" />
-      <el-table-column label="单位" prop="unitName" min-width="80" />
-      <el-table-column v-if="isPurchaseUnitStockIn" label="采购单位" prop="purchaseUnitName" min-width="100" />
-      <el-table-column v-if="isPurchaseUnitStockIn" label="采购换算数量" prop="purchaseUnitConvertQuantity" min-width="120" />
+      <el-table-column :label="t('ErpStock.Item.code')" prop="barCode" min-width="160" />
+      <el-table-column :label="t('ErpStock.Item.name')" prop="name" min-width="160" />
+      <el-table-column :label="t('ErpStock.Item.spec')" prop="standard" min-width="120" />
+      <el-table-column :label="t('ErpStock.Item.category')" prop="subCategoryName" min-width="120" />
+      <el-table-column :label="t('ErpStock.Item.unit')" prop="unitName" min-width="80" />
+      <el-table-column v-if="isPurchaseUnitStockIn" :label="t('ErpStock.Item.purchaseUnit')" prop="purchaseUnitName" min-width="100" />
+      <el-table-column v-if="isPurchaseUnitStockIn" :label="t('ErpStock.Item.purchaseUnitConvertQuantity')" prop="purchaseUnitConvertQuantity" min-width="120" />
     </el-table>
     <div class="product-dialog-pagination">
       <Pagination :total="productDialogTotal" v-model:page="productQueryParams.pageNo"
         v-model:limit="productQueryParams.pageSize" @pagination="getProductDialogList" />
     </div>
     <template #footer>
-      <el-button type="primary" @click="confirmProductSelect">确定</el-button>
-      <el-button @click="productDialogVisible = false">取消</el-button>
+      <el-button type="primary" @click="confirmProductSelect">{{ t('common.ok') }}</el-button>
+      <el-button @click="productDialogVisible = false">{{ t('common.cancel') }}</el-button>
     </template>
   </Dialog>
 </template>
@@ -218,7 +218,7 @@ const formData = ref([])
 const { t } = useI18n()
 const formRules = reactive({
   warehouseId: [{ required: true, message: t('ErpStock.Item.validatorWarehouseRequired'), trigger: 'blur' }],
-  areaId: [{ required: true, message: '请选择库区', trigger: 'change' }],
+  areaId: [{ required: true, message: t('ErpStock.Item.placeholderArea'), trigger: 'change' }],
   productId: [{ required: true, message: t('ErpStock.Item.validatorProductRequired'), trigger: 'blur' }],
   count: [{ required: true, message: t('ErpStock.Item.validatorCountRequired'), trigger: 'blur' }]
 })
@@ -332,7 +332,7 @@ const getSummaries = (param: SummaryMethodProps) => {
   const sums: string[] = []
   columns.forEach((column, index) => {
     if (index === 0) {
-      sums[index] = '合计'
+      sums[index] = t('common.total')
       return
     }
     if (['count', 'totalPrice'].includes(column.property)) {
diff --git a/src/views/erp/stock/in/index.vue b/src/views/erp/stock/in/index.vue
index f0a89833..bb62fa8d 100644
--- a/src/views/erp/stock/in/index.vue
+++ b/src/views/erp/stock/in/index.vue
@@ -168,7 +168,7 @@
             prop="no"
            sortable />
           <el-table-column
-            :label="t('ErpStock.In.productInfo')"
+            :label="t(`ErpStock.In.${inTypeToInfoKey(queryParams.inType)}`)"
             align="left"
             sortable
             prop="productNames"
@@ -201,7 +201,7 @@
             </template>
           </el-table-column>
            <el-table-column
-            label="审核人"
+            :label="t('ErpStock.In.auditUser')"
             align="right"
             sortable
             prop="auditUserName"
@@ -231,7 +231,7 @@
                 @click="openSubmitDialog(scope.row)"
                 v-hasPermi="['erp:stock-in:update-status']"
               >
-                提交
+                {{ t('ErpStock.In.submitAudit') }}
               </el-button>
               <el-button
                 v-if="Number(scope.row.status) === 10"
@@ -240,7 +240,7 @@
                 @click="openAuditDialog(scope.row, 20)"
                 v-hasPermi="['erp:stock-in:update-status']"
               >
-                通过
+                {{ t('ErpStock.In.auditApprove') }}
               </el-button>
               <el-button
                 v-if="Number(scope.row.status) === 10"
@@ -249,7 +249,7 @@
                 @click="openAuditDialog(scope.row, 1)"
                 v-hasPermi="['erp:stock-in:update-status']"
               >
-                驳回
+                {{ t('ErpStock.In.auditReject') }}
               </el-button>
               <el-button
                 link
@@ -275,14 +275,14 @@
     <!-- 表单面板：添加/修改 -->
     <StockInForm v-else ref="formRef" @success="getList" @closed="formVisible = false" />
 
-    <Dialog title="提交审核" v-model="submitDialogVisible" width="520px">
+    <Dialog :title="t('ErpStock.In.submitAudit')" v-model="submitDialogVisible" width="520px">
       <el-form ref="submitFormRef" :model="submitFormData" :rules="submitFormRules" label-width="90px">
-        <el-form-item label="审核人" prop="auditUserId">
+        <el-form-item :label="t('ErpStock.In.auditUser')" prop="auditUserId">
           <el-select
             v-model="submitFormData.auditUserId"
             clearable
             filterable
-            placeholder="请选择审核人"
+            :placeholder="t('ErpStock.In.placeholderAuditUser')"
             class="!w-1/1"
           >
             <el-option
@@ -293,24 +293,24 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
+        <el-form-item :label="t('ErpStock.In.remark')" prop="remark">
           <el-input
             v-model="submitFormData.remark"
             type="textarea"
             :rows="3"
-            placeholder="请输入提交备注"
+            :placeholder="t('ErpStock.In.placeholderSubmitRemark')"
           />
         </el-form-item>
       </el-form>
       <template #footer>
-        <el-button @click="submitDialogVisible = false">取消</el-button>
-        <el-button type="primary" :loading="actionLoading" @click="handleSubmitStockIn">确定</el-button>
+        <el-button @click="submitDialogVisible = false">{{ t('common.cancel') }}</el-button>
+        <el-button type="primary" :loading="actionLoading" @click="handleSubmitStockIn">{{ t('common.ok') }}</el-button>
       </template>
     </Dialog>
 
     <Dialog :title="auditDialogTitle" v-model="auditDialogVisible" width="520px">
       <el-form ref="auditFormRef" :model="auditFormData" label-width="90px">
-        <el-form-item label="备注" prop="remark">
+        <el-form-item :label="t('ErpStock.In.remark')" prop="remark">
           <el-input
             v-model="auditFormData.remark"
             type="textarea"
@@ -320,8 +320,8 @@
         </el-form-item>
       </el-form>
       <template #footer>
-        <el-button @click="auditDialogVisible = false">取消</el-button>
-        <el-button type="primary" :loading="actionLoading" @click="handleAuditStockIn">确定</el-button>
+        <el-button @click="auditDialogVisible = false">{{ t('common.cancel') }}</el-button>
+        <el-button type="primary" :loading="actionLoading" @click="handleAuditStockIn">{{ t('common.ok') }}</el-button>
       </template>
     </Dialog>
   </div>
@@ -362,6 +362,14 @@ const queryParams = reactive({
 })
 const WAREHOUSE_DOCUMENT_TYPES = 'warehouse_document_types'
 const stockInTypeOptions = computed(() => getStrDictOptions(WAREHOUSE_DOCUMENT_TYPES))
+const inTypeToInfoKey = (inType: string) => {
+  const map: Record<string, string> = {
+    '产品入库': 'productInfo',
+    '物料入库': 'materialInfo',
+    '备件入库': 'sparePartInfo'
+  }
+  return map[inType] || 'productInfo'
+}
 const activeName = ref('')
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
@@ -385,7 +393,7 @@ const submitFormData = reactive({
   remark: ''
 })
 const submitFormRules = reactive({
-  auditUserId: [{ required: true, message: '请选择审核人', trigger: 'change' }]
+  auditUserId: [{ required: true, message: t('ErpStock.In.validatorAuditUserRequired'), trigger: 'change' }]
 })
 const auditDialogVisible = ref(false)
 const auditFormRef = ref()
@@ -394,8 +402,8 @@ const auditFormData = reactive({
   status: '',
   remark: ''
 })
-const auditDialogTitle = computed(() => auditFormData.status === '20' ? '审核通过' : '审核驳回')
-const auditRemarkPlaceholder = computed(() => auditFormData.status === '20' ? '请输入审核通过备注' : '请输入驳回备注')
+const auditDialogTitle = computed(() => auditFormData.status === '20' ? t('ErpStock.In.auditApprove') : t('ErpStock.In.auditReject'))
+const auditRemarkPlaceholder = computed(() => auditFormData.status === '20' ? t('ErpStock.In.placeholderAuditApproveRemark') : t('ErpStock.In.placeholderAuditRejectRemark'))
 
 /** 查询列表 */
 const getList = async () => {
@@ -462,7 +470,7 @@ const handleSubmitStockIn = async () => {
       auditUserId: submitFormData.auditUserId,
       remark: submitFormData.remark
     })
-    message.success('提交成功')
+    message.success(t('ErpStock.In.submitSuccess'))
     submitDialogVisible.value = false
     await getList()
   } finally {
@@ -473,7 +481,7 @@ const handleSubmitStockIn = async () => {
 const openAuditDialog = (row: StockInVO, status: 20 | 1) => {
   auditFormData.id = String(row.id)
   auditFormData.status = String(status)
-  auditFormData.remark = status === 20 ? '审核通过' : ''
+  auditFormData.remark = status === 20 ? t('ErpStock.In.auditApprove') : ''
   auditDialogVisible.value = true
 }
 
@@ -485,7 +493,7 @@ const handleAuditStockIn = async () => {
       status: auditFormData.status,
       remark: auditFormData.remark
     })
-    message.success(auditFormData.status === '20' ? '审核通过成功' : '驳回成功')
+    message.success(auditFormData.status === '20' ? t('ErpStock.In.auditApproveSuccess') : t('ErpStock.In.auditRejectSuccess'))
     auditDialogVisible.value = false
     await getList()
   } finally {
diff --git a/src/views/erp/stock/out/StockOutForm.vue b/src/views/erp/stock/out/StockOutForm.vue
index d95fd506..f9867207 100644
--- a/src/views/erp/stock/out/StockOutForm.vue
+++ b/src/views/erp/stock/out/StockOutForm.vue
@@ -1,39 +1,71 @@
 <template>
-  <div class="stock-out-panel">
-    <div class="stock-out-panel__header">
-      <div class="stock-out-panel__title">{{ dialogTitle }}</div>
+  <div class="dv-repair-panel">
+    <div class="dv-repair-panel__header">
+      <div class="dv-repair-panel__title">
+        <span>{{ dialogTitle }}</span>
+        <dict-tag
+          v-if="formType === 'detail' && formData.status !== undefined"
+          class="ml-8px"
+          :type="DICT_TYPE.ERP_AUDIT_STATUS"
+          :value="formData.status"
+        />
+      </div>
       <el-button text @click="closeForm">
         <Icon icon="ep:close" />
       </el-button>
     </div>
-    <div class="stock-out-dialog" v-loading="formLoading">
+    <div class="dv-repair-dialog" v-loading="formLoading">
       <el-form
         ref="formRef"
         :model="formData"
         :rules="formRules"
-        label-width="100px"
+        label-width="auto"
         :disabled="disabled"
       >
+        <el-form-item prop="code">
+          <template #label>
+            <span>
+              {{ t('ErpStock.Out.no') }}
+              <el-tooltip :content="t('ErpStock.Out.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>
+            </el-col>
+          </el-row>
+        </el-form-item>
         <el-row :gutter="20">
           <el-col :span="8">
-            <el-form-item :label="t('ErpStock.Out.no')" prop="no">
-              <el-input disabled v-model="formData.no" :placeholder="t('ErpStock.Out.placeholderNo')" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item :label="t('ErpStock.Out.customer')" prop="customerId">
+            <el-form-item :label="t('ErpStock.Out.outType')" prop="outType">
               <el-select
-                v-model="formData.customerId"
+                v-model="formData.outType"
                 clearable
                 filterable
-                :placeholder="t('ErpStock.Out.placeholderCustomer')"
+                :placeholder="t('ErpStock.Out.placeholderOutType')"
                 class="!w-1/1"
+                @change="handleOutTypeChange"
               >
                 <el-option
-                  v-for="item in customerList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                  :disabled="item.disabled"
                 />
               </el-select>
             </el-form-item>
@@ -50,26 +82,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item :label="t('ErpStock.Out.outType')" prop="outType">
+            <el-form-item :label="t('ErpStock.Out.stockUser')" prop="stockUserId">
               <el-select
-                v-model="formData.outType"
+                v-model="formData.stockUserId"
                 clearable
                 filterable
-                :placeholder="t('ErpStock.Out.placeholderOutType')"
+                :placeholder="t('ErpStock.Out.placeholderStockUser')"
                 class="!w-1/1"
               >
                 <el-option
-                  v-for="item in options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                  :disabled="item.disabled"
+                  v-for="item in userList"
+                  :key="String(item.id)"
+                  :label="item.nickname"
+                  :value="String(item.id)"
                 />
               </el-select>
             </el-form-item>
           </el-col>
-
-
           <el-col :span="8">
             <el-form-item :label="t('ErpStock.Out.remark')" prop="remark">
               <el-input
@@ -80,7 +109,6 @@
               />
             </el-form-item>
           </el-col>
-
           <el-col :span="8">
             <el-form-item :label="t('ErpStock.Out.file')" prop="fileUrl">
               <UploadFile :is-show-tip="false" v-model="formData.fileUrl" :limit="1" />
@@ -92,26 +120,50 @@
       <ContentWrap>
         <el-tabs v-model="subTabsName" class="-mt-15px -mb-10px">
           <el-tab-pane :label="t('ErpStock.Out.list')" name="item">
-            <StockOutItemForm ref="itemFormRef" :items="formData.items" :disabled="disabled" />
+            <StockOutItemForm
+              ref="itemFormRef"
+              :items="formData.items"
+              :out-type="formData.outType"
+              :disabled="disabled"
+            />
+          </el-tab-pane>
+          <el-tab-pane v-if="showAuditRecordTab" :label="t('ErpStock.Out.auditRecord')" name="auditRecord">
+            <el-table
+              v-loading="auditRecordLoading"
+              :data="auditRecordList"
+              :stripe="true"
+              :show-overflow-tooltip="true"
+            >
+              <el-table-column type="index" :label="t('ErpStock.Out.index')" align="center" width="80" />
+              <el-table-column :label="t('ErpStock.Out.operator')" align="center" prop="creatorName" min-width="120" />
+              <el-table-column :label="t('ErpStock.Out.operateTime')" align="center" prop="createTime" :formatter="dateFormatter" min-width="180" />
+              <el-table-column :label="t('ErpStock.Out.operateAction')" align="center" min-width="120">
+                <template #default="{ row }">
+                  {{ formatAuditAction(row) }}
+                </template>
+              </el-table-column>
+              <el-table-column :label="t('ErpStock.Out.operateDesc')" align="center" prop="remark" min-width="180" />
+            </el-table>
           </el-tab-pane>
         </el-tabs>
       </ContentWrap>
     </div>
-
-    <div class="stock-out-footer">
+    <div class="dv-repair-footer">
       <el-button @click="closeForm">{{ t('common.cancel') }}</el-button>
-      <el-button v-if="!disabled" @click="submitForm" type="primary" :disabled="formLoading">
+      <el-button @click="submitForm" type="primary" :disabled="formLoading" v-if="!disabled">
         {{ t('common.ok') }}
       </el-button>
     </div>
   </div>
 </template>
 <script setup lang="ts">
-import { StockOutApi, StockOutVO } from '@/api/erp/stock/out'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { dateFormatter, getNowDateTime } from '@/utils/formatTime'
+import { StockOutApi, StockOutApproveRecordVO, StockOutVO } from '@/api/erp/stock/out'
 import StockOutItemForm from './components/StockOutItemForm.vue'
-import { CustomerApi, CustomerVO } from '@/api/erp/sale/customer'
+import { getSimpleUserList, type UserVO } from '@/api/system/user'
 
-/** ERP 其它出库单表单 */
+/** ERP 其它入库单 表单 */
 defineOptions({ name: 'StockOutForm' })
 
 const { t } = useI18n() // 国际化
@@ -122,72 +174,104 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 const formType = ref('') // 表单的类型：create - 新增；update - 修改；detail - 详情
 const formData = ref({
   id: undefined,
-  customerId: undefined,
   outTime: undefined,
-  remark: undefined,
   outType: undefined,
+  remark: undefined,
   fileUrl: '',
-  items: []
+  items: [],
+  isCode: undefined,
+  no: undefined,
+  stockUserId: undefined,
+  status: undefined
 })
 const formRules = reactive({
   outTime: [{ required: true, message: t('ErpStock.Out.validatorOutTimeRequired'), trigger: 'blur' }],
-  outType: [{ required: true, message: t('ErpStock.Out.validatorOutTypeRequired'), trigger: 'blur' }]
+  outType: [{ required: true, message: t('ErpStock.Out.validatorOutTypeRequired'), trigger: 'blur' }],
+  stockUserId: [{ required: true, message: t('ErpStock.Out.validatorStockUserRequired'), trigger: 'change' }]
 })
 const disabled = computed(() => formType.value === 'detail')
 const formRef = ref() // 表单 Ref
-const customerList = ref<CustomerVO[]>([]) // 客户列表
-const options = [
-  {
-    value: '其他出库',
-    label: t('ErpStock.Out.tabOther')
-  },
-  {
-    value: '备件出库',
-    label: t('ErpStock.Out.tabPart')
-  },
-  // {
-  //   value: '原料出库',
-  //   label: '原料出库',
-  // },
-  // {
-  //   value: '产品出库',
-  //   label: '产品出库',
-  // },
-  {
-    value: '领料出库',
-    label: t('ErpStock.Out.tabPick'),
-    disabled: true
+const userList = ref<UserVO[]>([]) // 经办人列表
+const WAREHOUSE_DOCUMENT_TYPES = 'warehouse_document_types'
+const options = computed(() => getStrDictOptions(WAREHOUSE_DOCUMENT_TYPES))
+watch(options, (items) => {
+  if (formType.value === 'create' && !formData.value.outType && items.length) {
+    formData.value.outType = items[0].value
   }
-]
+})
 /** 子表的表单 */
 const subTabsName = ref('item')
 const itemFormRef = ref()
+const auditRecordLoading = ref(false)
+const auditRecordList = ref<StockOutApproveRecordVO[]>([])
+const showAuditRecordTab = computed(() => formType.value === 'detail' && Number(formData.value.status) !== 0)
+
+// 用于取消未完成的异步操作
+const openRequestId = ref(0)
+
+/** 关闭表单 */
+const closeForm = () => {
+  openRequestId.value++
+  emit('closed')
+}
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
+  const currentRequestId = ++openRequestId.value
   dialogTitle.value = t('action.' + type)
   formType.value = type
+  subTabsName.value = 'item'
   resetForm()
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
     try {
       formData.value = await StockOutApi.getStockOut(id)
+      formData.value.stockUserId = normalizeUserId(formData.value.stockUserId)
+      if (type === 'detail' && Number(formData.value.status) !== 0) {
+        await getAuditRecordList(id)
+      }
+      if (currentRequestId !== openRequestId.value) return
     } finally {
       formLoading.value = false
     }
   }
-  // 加载客户列表
-  customerList.value = await CustomerApi.getCustomerSimpleList()
+  userList.value = await getSimpleUserList()
+}
+
+const getAuditRecordList = async (id: number) => {
+  auditRecordLoading.value = true
+  try {
+    auditRecordList.value = await StockOutApi.getApproveRecordList(id)
+  } finally {
+    auditRecordLoading.value = false
+  }
+}
+
+const formatAuditAction = (row: StockOutApproveRecordVO) => {
+  if (row.toStatus === 10) return t('ErpStock.Out.submitAudit')
+  if (row.toStatus === 20) return t('ErpStock.Out.auditApprove')
+  if (row.toStatus === 1) return t('ErpStock.Out.auditReject')
+  if (row.actionType === 'SUBMIT') return t('ErpStock.Out.submitAudit')
+  if (row.actionType === 'AUDIT') return t('ErpStock.Out.auditApprove')
+  return row.actionType || '-'
+}
+
+const normalizeUserId = (value: any) => {
+  if (value === undefined || value === null || value === '') return undefined
+  return String(value)
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
-const closeForm = () => {
-  emit('closed')
+const handleOutTypeChange = () => {
+  formData.value.items = []
+  nextTick(() => {
+    itemFormRef.value?.resetItems?.()
+  })
 }
 
 /** 提交表单 */
-const emit = defineEmits(['success', 'closed']) // 定义 success 和 closed 事件
+const emit = defineEmits(['success', 'closed']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
   // 校验表单
   await formRef.value.validate()
@@ -203,7 +287,6 @@ const submitForm = async () => {
       await StockOutApi.updateStockOut(data)
       message.success(t('common.updateSuccess'))
     }
-    // 发送操作成功的事件
     emit('success')
     closeForm()
   } finally {
@@ -215,24 +298,32 @@ const submitForm = async () => {
 const resetForm = () => {
   formData.value = {
     id: undefined,
-    customerId: undefined,
-    outTime: undefined,
+    outTime: getNowDateTime().valueOf(),
+    outType: options.value[0]?.value,
     remark: undefined,
     fileUrl: undefined,
-    items: []
+    items: [],
+    isCode: true,
+    no: undefined,
+    stockUserId: undefined,
+    status: undefined
   }
+  auditRecordList.value = []
   formRef.value?.resetFields()
 }
-</script>
 
-<style lang="scss" scoped>
-.stock-out-panel {
+onBeforeUnmount(() => {
+  openRequestId.value++
+})
+</script>
+<style scoped lang="scss">
+.dv-repair-panel {
   background: #fff;
   border-radius: 12px;
   box-shadow: var(--el-box-shadow-light);
 }
 
-.stock-out-panel__header {
+.dv-repair-panel__header {
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -240,20 +331,20 @@ const resetForm = () => {
   border-bottom: 1px solid #ebeef5;
 }
 
-.stock-out-panel__title {
+.dv-repair-panel__title {
   color: #1f2937;
   font-size: 18px;
   font-weight: 600;
 }
 
-.stock-out-dialog {
+.dv-repair-dialog {
   max-height: calc(100vh - 220px);
   padding: 20px 20px 0;
   padding-right: 16px;
   overflow-y: auto;
 }
 
-.stock-out-footer {
+.dv-repair-footer {
   display: flex;
   justify-content: flex-end;
   gap: 12px;
@@ -262,18 +353,25 @@ const resetForm = () => {
   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) {
-  .stock-out-panel__header {
+  .dv-repair-panel__header {
     padding: 14px 16px;
   }
 
-  .stock-out-dialog {
+  .dv-repair-dialog {
     max-height: none;
     padding: 16px 16px 0;
     overflow-y: visible;
   }
 
-  .stock-out-footer {
+  .dv-repair-footer {
     padding: 16px;
   }
 }
diff --git a/src/views/erp/stock/out/components/StockOutItemForm.vue b/src/views/erp/stock/out/components/StockOutItemForm.vue
index 80fea698..06110b78 100644
--- a/src/views/erp/stock/out/components/StockOutItemForm.vue
+++ b/src/views/erp/stock/out/components/StockOutItemForm.vue
@@ -1,73 +1,60 @@
 <template>
   <el-form
-    ref="formRef"
-    :model="formData"
-    :rules="formRules"
-    v-loading="formLoading"
-    label-width="0px"
-    :inline-message="true"
-    :disabled="disabled"
-  >
+ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="0px"
+    :inline-message="true" :disabled="disabled">
     <el-table :data="formData" size="small" show-summary :summary-method="getSummaries" class="-mt-10px">
       <el-table-column :label="t('common.index')" type="index" align="center" width="60" />
       <el-table-column :label="t('ErpStock.Item.warehouse')" min-width="125">
         <template #default="{ row, $index }">
-          <el-form-item
-            :prop="`${$index}.warehouseId`"
-            :rules="formRules.warehouseId"
-            class="mb-0px!"
-          >
+          <el-form-item :prop="`${$index}.warehouseId`" :rules="formRules.warehouseId" class="mb-0px!">
             <el-select
-              v-model="row.warehouseId"
-              clearable
-              filterable
-              :placeholder="t('ErpStock.Item.placeholderWarehouse')"
-              @change="onChangeWarehouse($event, row)"
-            >
-              <el-option
-                v-for="item in warehouseList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
+v-model="row.warehouseId" clearable filterable
+              :placeholder="t('ErpStock.Item.placeholderWarehouse')" @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="t('ErpStock.Item.barcode')" min-width="160">
+      <el-table-column v-if="isProductMaterialStockOut" :label="t('ErpStock.Item.area')" min-width="140">
         <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.productBarCode`"  class="mb-0px!">
-            <el-select
-              v-model="row.productBarCode"
-              clearable
-              filterable
-              @change="onChangeProductCode($event, row)"
-              :placeholder="t('ErpStock.Item.placeholderBarcode')"
-            >
+          <el-form-item :prop="`${$index}.areaId`" :rules="formRules.areaId" class="mb-0px!">
+            <el-select v-model="row.areaId" clearable filterable :placeholder="t('ErpStock.Item.placeholderArea')" :disabled="!row.warehouseId">
               <el-option
-                v-for="item in productList"
-                :key="item.barCode"
-                :label="item.barCode"
-                :value="item.barCode"
-              />
+v-for="item in getAreaOptions(row.warehouseId)" :key="item.id" :label="getAreaLabel(item)"
+                :value="item.id" />
             </el-select>
           </el-form-item>
         </template>
       </el-table-column>
+      <el-table-column :label="t('ErpStock.Item.barcode')" min-width="160">
+        <!--        <template #default="{ row }">
+                  <el-form-item class="mb-0px!">
+                    <el-input disabled v-model="row.productBarCode" />
+                  </el-form-item>
+                </template>-->
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.productBarCode`" class="mb-0px!">
+            <div class="product-code-select">
+              <el-input
+v-model="row.productBarCode" readonly clearable
+                :placeholder="t('ErpStock.Item.placeholderBarcode')" @click="openProductSelectDialog(row)"
+                @clear="handleProductClear(row)" />
+            </div>
+          </el-form-item>
+        </template>
+      </el-table-column>
       <el-table-column :label="t('ErpStock.Item.product')" min-width="180">
         <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.productId`" :rules="formRules.productId" class="mb-0px!">
+          <el-form-item
+v-if="isProductMaterialStockOut" :prop="`${$index}.productId`" :rules="formRules.productId"
+            class="mb-0px!">
+            <el-input v-model="row.productName" disabled :placeholder="t('ErpStock.Item.placeholderProduct')" />
+          </el-form-item>
+          <el-form-item v-else :prop="`${$index}.productId`" :rules="formRules.productId" class="mb-0px!">
             <el-cascader
-              v-model="row.productId"
-              :options="productCascaderOptions"
-              :props="productCascaderProps"
-              :show-all-levels="false"
-              clearable
-              filterable
-              @change="onChangeProduct($event, row)"
-              :placeholder="t('ErpStock.Item.placeholderProduct')"
-              class="!w-100%"
-            />
+v-model="row.productId" :options="productCascaderOptions" :props="productCascaderProps"
+              :show-all-levels="false" clearable filterable @change="onChangeProduct($event, row)"
+              :placeholder="t('ErpStock.Item.placeholderProduct')" class="!w-100%" />
           </el-form-item>
         </template>
       </el-table-column>
@@ -78,34 +65,63 @@
           </el-form-item>
         </template>
       </el-table-column>
-<!--      <el-table-column :label="t('ErpStock.Item.barcode')" min-width="150">
+
+      <el-table-column :label="t('ErpStock.Item.inventoryUnit')" 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 v-if="isPurchaseUnitStockOut" :label="t('ErpStock.Item.purchaseUnit')" min-width="100">
         <template #default="{ row }">
           <el-form-item class="mb-0px!">
-            <el-input disabled v-model="row.productBarCode" />
+            <el-input disabled v-model="row.purchaseUnitName" />
           </el-form-item>
         </template>
-      </el-table-column>-->
-      <el-table-column :label="t('ErpStock.Item.unit')" min-width="80">
+      </el-table-column>
+      <el-table-column v-if="isPurchaseUnitStockOut" min-width="120">
+        <template #header>
+          {{ t('ErpStock.Item.purchaseUnitConvertQuantity') }}
+          <el-tooltip effect="dark" placement="top">
+            <template #content>
+              {{ purchaseUnitConvertTipText }}
+            </template>
+            <Icon icon="ep:question-filled" class="ml-4px" style="vertical-align: middle; color: #909399; cursor: pointer;" />
+          </el-tooltip>
+        </template>
         <template #default="{ row }">
           <el-form-item class="mb-0px!">
-            <el-input disabled v-model="row.productUnitName" />
+            <el-input disabled v-model="row.purchaseUnitConvertQuantity" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="isProductStockOut" :label="t('ErpStock.Item.inputUnitType')" min-width="120">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.inputUnitType`" class="mb-0px!">
+            <el-select v-model="row.inputUnitType" clearable :placeholder="t('ErpStock.Item.placeholderInputUnitType')">
+              <el-option v-for="item in inputUnitTypeOptions" :key="item" :label="item" :value="item" />
+            </el-select>
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="isProductMaterialStockOut" :label="t('ErpStock.Item.inputCount')" prop="inputCount" min-width="140">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.inputCount`" class="mb-0px!">
+            <el-input-number
+v-model="row.inputCount" controls-position="right" :min="0.001" :precision="3"
+              class="!w-100%" />
           </el-form-item>
         </template>
       </el-table-column>
       <el-table-column :label="t('ErpStock.Item.count')" 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-input disabled v-model="row.count" :formatter="erpCountInputFormatter" />
           </el-form-item>
         </template>
       </el-table-column>
-<!--      <el-table-column :label="t('ErpStock.Item.price')" fixed="right" min-width="120">
+      <!--      <el-table-column :label="t('ErpStock.Item.price')" fixed="right" min-width="120">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.productPrice`" class="mb-0px!">
             <el-input-number
@@ -144,10 +160,57 @@
   <el-row justify="center" class="mt-3" v-if="!disabled">
     <el-button @click="handleAdd" round>+ {{ t('ErpStock.Out.addItem') }}</el-button>
   </el-row>
+
+  <Dialog :title="t('ErpStock.Item.selectCode')" v-model="productDialogVisible" width="900px">
+    <el-form :model="productQueryParams" :inline="true" class="-mb-15px">
+      <el-form-item :label="t('ErpStock.Item.code')">
+        <el-input
+v-model="productQueryParams.barCode" clearable :placeholder="t('ErpStock.Item.placeholderCode')"
+          @keyup.enter="handleProductDialogQuery" />
+      </el-form-item>
+      <el-form-item :label="t('ErpStock.Item.name')">
+        <el-input
+v-model="productQueryParams.name" clearable :placeholder="t('ErpStock.Item.placeholderName')"
+          @keyup.enter="handleProductDialogQuery" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="handleProductDialogQuery">
+          <Icon icon="ep:search" class="mr-5px" /> {{ t('common.query') }}
+        </el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+v-loading="productDialogLoading" :data="productDialogList" row-key="id" :stripe="true"
+      :show-overflow-tooltip="true" @row-click="handleProductDialogRowClick">
+      <el-table-column width="55" align="center">
+        <template #default="{ row }">
+          <el-radio v-model="selectedProductId" :label="row.id">&nbsp;</el-radio>
+        </template>
+      </el-table-column>
+      <el-table-column :label="t('ErpStock.Item.code')" prop="barCode" min-width="160" />
+      <el-table-column :label="t('ErpStock.Item.name')" prop="name" min-width="160" />
+      <el-table-column :label="t('ErpStock.Item.spec')" prop="standard" min-width="120" />
+      <el-table-column :label="t('ErpStock.Item.category')" prop="subCategoryName" min-width="120" />
+      <el-table-column :label="t('ErpStock.Item.unit')" prop="unitName" min-width="80" />
+      <el-table-column v-if="isPurchaseUnitStockOut" :label="t('ErpStock.Item.purchaseUnit')" prop="purchaseUnitName" min-width="100" />
+      <el-table-column v-if="isPurchaseUnitStockOut" :label="t('ErpStock.Item.purchaseUnitConvertQuantity')" prop="purchaseUnitConvertQuantity" min-width="120" />
+    </el-table>
+    <div class="product-dialog-pagination">
+      <Pagination
+:total="productDialogTotal" v-model:page="productQueryParams.pageNo"
+        v-model:limit="productQueryParams.pageSize" @pagination="getProductDialogList" />
+    </div>
+    <template #footer>
+      <el-button type="primary" @click="confirmProductSelect">{{ t('common.ok') }}</el-button>
+      <el-button @click="productDialogVisible = false">{{ t('common.cancel') }}</el-button>
+    </template>
+  </Dialog>
 </template>
 <script setup lang="ts">
+import { Icon } from '@/components/Icon'
 import { ProductApi, ProductVO } from '@/api/erp/product/product'
 import { WarehouseApi, WarehouseVO } from '@/api/erp/stock/warehouse'
+import { WarehouseAreaApi, WarehouseAreaVO } from '@/api/erp/stock/warehousearea'
 import { StockApi } from '@/api/erp/stock/stock'
 import {
   erpCountInputFormatter,
@@ -157,14 +220,16 @@ import {
 } from '@/utils'
 
 const props = defineProps<{
-  items: undefined
-  disabled: false
+  items: any[] | undefined
+  outType?: string
+  disabled: boolean
 }>()
 const formLoading = ref(false) // 表单的加载中
 const formData = ref([])
 const { t } = useI18n()
 const formRules = reactive({
   warehouseId: [{ required: true, message: t('ErpStock.Item.validatorWarehouseRequired'), trigger: 'blur' }],
+  areaId: [{ required: true, message: t('ErpStock.Item.validatorAreaRequired'), trigger: 'change' }],
   productId: [{ required: true, message: t('ErpStock.Item.validatorProductRequired'), trigger: 'blur' }],
   count: [{ required: true, message: t('ErpStock.Item.validatorCountRequired'), trigger: 'blur' }]
 })
@@ -172,6 +237,33 @@ const formRef = ref([]) // 表单 Ref
 const productList = ref<ProductVO[]>([]) // 产品列表
 const warehouseList = ref<WarehouseVO[]>([]) // 仓库列表
 const defaultWarehouse = ref<WarehouseVO>(undefined) // 默认仓库
+const warehouseAreaMap = ref<Record<number, WarehouseAreaVO[]>>({})
+const inputUnitTypeOptions = ['个', '包', '托']
+const resolveStockOutCategoryType = (outType?: string) => {
+  if (!outType) return undefined
+  if (outType.includes('产品')) return 1
+  if (outType.includes('物料') || outType.includes('原料') || outType.includes('领料')) return 2
+  if (outType.includes('备件')) return 3
+  return undefined
+}
+const activeCategoryType = computed(() => resolveStockOutCategoryType(props.outType))
+const isProductMaterialStockOut = computed(() => Boolean(activeCategoryType.value))
+const isProductStockOut = computed(() => activeCategoryType.value === 1)
+const isPurchaseUnitStockOut = computed(() => activeCategoryType.value === 2 || activeCategoryType.value === 3)
+const purchaseUnitConvertTipText = computed(() => t('FactoryModeling.ProductInformation.dialogPurchaseUnitConvertTip'))
+const productDialogVisible = ref(false)
+const productDialogLoading = ref(false)
+const productDialogList = ref<any[]>([])
+const productDialogTotal = ref(0)
+const productQueryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  categoryType: 1,
+  barCode: undefined,
+  name: undefined
+})
+const currentSelectRow = ref<any>()
+const selectedProductId = ref<number>()
 
 const productCascaderProps = {
   emitPath: false,
@@ -203,15 +295,35 @@ const productCascaderOptions = computed(() => {
   return Array.from(map.values())
 })
 
-/** 初始化设置出库项 */
+/** 初始化设置入库项 */
 watch(
   () => props.items,
   async (val) => {
-    formData.value = val
+    formData.value = val || []
+    fillProductNames(formData.value)
+    if (isProductMaterialStockOut.value) {
+      await loadRowsWarehouseAreas(formData.value)
+    }
   },
   { immediate: true }
 )
 
+watch(
+  () => props.outType,
+  async () => {
+    if (isProductMaterialStockOut.value) {
+      formData.value.forEach((row) => {
+        row.inputCount = row.inputCount ?? row.count ?? 1
+        if (isProductStockOut.value) {
+          row.inputUnitType = row.inputUnitType || '个'
+        }
+        syncCountByInputCount(row)
+      })
+      await loadRowsWarehouseAreas(formData.value)
+    }
+  }
+)
+
 /** 监听合同产品变化，计算合同产品总价 */
 watch(
   () => formData.value,
@@ -253,16 +365,27 @@ const handleAdd = () => {
   const row = {
     id: undefined,
     warehouseId: defaultWarehouse.value?.id,
+    areaId: undefined,
     productId: undefined,
+    productName: undefined,
     productUnitName: undefined, // 产品单位
     productBarCode: undefined, // 产品条码
     productPrice: undefined,
+    purchaseUnitId: undefined,
+    purchaseUnitName: undefined,
+    purchaseUnitConvertQuantity: undefined,
+    inputUnitType: isProductStockOut.value ? '个' : undefined,
+    inputCount: isProductMaterialStockOut.value ? 1 : undefined,
     stockCount: undefined,
-    count: 1,
+    count: isProductMaterialStockOut.value ? undefined : 1,
     totalPrice: undefined,
     remark: undefined
   }
+  syncCountByInputCount(row)
   formData.value.push(row)
+  if (row.warehouseId && isProductMaterialStockOut.value) {
+    loadWarehouseAreas(row.warehouseId)
+  }
 }
 
 /** 删除按钮操作 */
@@ -273,18 +396,17 @@ const handleDelete = (index) => {
 /** 处理产品变更 */
 const onChangeProductCode = (productBarCode, row) => {
   const product = productList.value.find((item) => item.barCode === productBarCode)
-  if (product) {
-    row.productUnitName = product.unitName
-    row.productBarCode = product.barCode
-    row.productPrice = product.minPrice
-    row.productId = product.id
-  }
+  product ? fillRowByProduct(row, product) : clearProduct(row)
   // 加载库存
   setStockCount(row)
 }
 
 /** 处理仓库变更 */
 const onChangeWarehouse = (warehouseId, row) => {
+  row.areaId = undefined
+  if (warehouseId && isProductMaterialStockOut.value) {
+    loadWarehouseAreas(warehouseId)
+  }
   // 加载库存
   setStockCount(row)
 }
@@ -292,15 +414,149 @@ const onChangeWarehouse = (warehouseId, 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
-  }
+  product ? fillRowByProduct(row, product) : clearProduct(row)
   // 加载库存
   setStockCount(row)
 }
 
+const fillRowByProduct = (row: any, product: any) => {
+  row.productUnitName = product.unitName
+  row.productBarCode = product.barCode
+  row.productPrice = product.minPrice
+  row.productId = product.id
+  row.productName = product.name
+  row.purchaseUnitId = product.purchaseUnitId
+  row.purchaseUnitName = product.purchaseUnitName
+  row.purchaseUnitConvertQuantity = product.purchaseUnitConvertQuantity
+  syncCountByInputCount(row)
+}
+
+const clearProduct = (row: any) => {
+  row.productUnitName = undefined
+  row.productBarCode = undefined
+  row.productPrice = undefined
+  row.productId = undefined
+  row.productName = undefined
+  row.purchaseUnitId = undefined
+  row.purchaseUnitName = undefined
+  row.purchaseUnitConvertQuantity = undefined
+  row.inputCount = isProductMaterialStockOut.value ? undefined : row.inputCount
+  row.count = isProductMaterialStockOut.value ? undefined : row.count
+}
+
+const handleProductClear = (row: any) => {
+  clearProduct(row)
+  setStockCount(row)
+}
+
+const openProductSelectDialog = async (row: any) => {
+  if (!activeCategoryType.value) return
+  currentSelectRow.value = row
+  selectedProductId.value = row.productId
+  productQueryParams.pageNo = 1
+  productQueryParams.categoryType = activeCategoryType.value
+  productQueryParams.barCode = undefined
+  productQueryParams.name = undefined
+  productDialogVisible.value = true
+  await getProductDialogList()
+}
+
+const getProductDialogList = async () => {
+  productDialogLoading.value = true
+  try {
+    productQueryParams.categoryType = activeCategoryType.value || 1
+    const data = await ProductApi.getProductPage(productQueryParams)
+    productDialogList.value = data?.list || []
+    productDialogTotal.value = data?.total || 0
+  } finally {
+    productDialogLoading.value = false
+  }
+}
+
+const handleProductDialogQuery = () => {
+  productQueryParams.pageNo = 1
+  getProductDialogList()
+}
+
+const handleProductDialogRowClick = (row: any) => {
+  selectedProductId.value = row.id
+}
+
+const confirmProductSelect = () => {
+  const product = productDialogList.value.find((item) => item.id === selectedProductId.value)
+  if (!product || !currentSelectRow.value) return
+  fillRowByProduct(currentSelectRow.value, product)
+  setStockCount(currentSelectRow.value)
+  productDialogVisible.value = false
+}
+
+watch(
+  () => formData.value.map((row) => [row.inputCount, row.purchaseUnitConvertQuantity]),
+  () => {
+    if (!isProductMaterialStockOut.value) return
+    formData.value.forEach(syncCountByInputCount)
+  },
+  { deep: true }
+)
+
+const syncCountByInputCount = (row: any) => {
+  if (!isProductMaterialStockOut.value) return
+  const inputCount = Number(row.inputCount)
+  const convertQuantity = Number(row.purchaseUnitConvertQuantity)
+  if (!Number.isFinite(inputCount)) {
+    row.count = undefined
+    return
+  }
+  if (!row.purchaseUnitId && !row.purchaseUnitName) {
+    row.count = inputCount
+    return
+  }
+  row.count = Number.isFinite(convertQuantity) ? inputCount * convertQuantity : inputCount
+}
+
+const loadWarehouseAreas = async (warehouseId: number) => {
+  if (!warehouseId || warehouseAreaMap.value[warehouseId]) return
+  const data = await WarehouseAreaApi.getWarehouseAreaPage({
+    pageNo: 1,
+    pageSize: 100,
+    warehouseId
+  })
+  warehouseAreaMap.value = {
+    ...warehouseAreaMap.value,
+    [warehouseId]: data?.list || []
+  }
+}
+
+const loadRowsWarehouseAreas = async (rows: any[]) => {
+  const warehouseIds = Array.from(new Set((rows || []).map((row) => row.warehouseId).filter(Boolean)))
+  await Promise.all(warehouseIds.map((warehouseId) => loadWarehouseAreas(warehouseId)))
+}
+
+const getAreaOptions = (warehouseId: number) => {
+  return warehouseId ? warehouseAreaMap.value[warehouseId] || [] : []
+}
+
+const getAreaLabel = (item: WarehouseAreaVO) => {
+  return item.areaCode ? `${item.areaCode} - ${item.areaName}` : item.areaName
+}
+
+const fillProductNames = (rows: any[]) => {
+  if (!productList.value.length) return
+  rows.forEach((row) => {
+    const product = productList.value.find((item) => item.id === row.productId || item.barCode === row.productBarCode)
+    if (!product) return
+    row.productId = row.productId || product.id
+    row.productBarCode = row.productBarCode || product.barCode
+    row.productName = row.productName || product.name
+    row.productUnitName = row.productUnitName || product.unitName
+    row.productPrice = row.productPrice ?? product.minPrice
+    row.purchaseUnitId = row.purchaseUnitId ?? (product as any).purchaseUnitId
+    row.purchaseUnitName = row.purchaseUnitName ?? (product as any).purchaseUnitName
+    row.purchaseUnitConvertQuantity = row.purchaseUnitConvertQuantity ?? (product as any).purchaseUnitConvertQuantity
+    syncCountByInputCount(row)
+  })
+}
+
 /** 加载库存 */
 const setStockCount = async (row) => {
   if (!row.productId || !row.warehouseId) {
@@ -314,16 +570,46 @@ const setStockCount = async (row) => {
 const validate = () => {
   return formRef.value.validate()
 }
-defineExpose({ validate })
+
+const resetItems = () => {
+  formData.value.splice(0, formData.value.length)
+  if (!props.disabled) {
+    handleAdd()
+  }
+}
+
+defineExpose({ validate, resetItems })
+
 
 /** 初始化 */
 onMounted(async () => {
   productList.value = await ProductApi.getProductSimpleList()
   warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
   defaultWarehouse.value = warehouseList.value.find((item) => item.defaultStatus)
+  fillProductNames(formData.value)
+  if (isProductMaterialStockOut.value) {
+    await loadRowsWarehouseAreas(formData.value)
+  }
   // 默认添加一个
   if (formData.value.length === 0) {
     handleAdd()
   }
 })
+
+
 </script>
+<style scoped lang="scss">
+.product-code-select {
+  width: 100%;
+
+  :deep(.el-input__wrapper) {
+    cursor: pointer;
+  }
+}
+
+.product-dialog-pagination {
+  display: flex;
+  justify-content: flex-end;
+  padding: 12px 0 0;
+}
+</style>
diff --git a/src/views/erp/stock/out/index.vue b/src/views/erp/stock/out/index.vue
index 98fe6a75..6c8426f8 100644
--- a/src/views/erp/stock/out/index.vue
+++ b/src/views/erp/stock/out/index.vue
@@ -1,343 +1,410 @@
 <template>
-  <div class="stock-out-page">
+  <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-form-item :label="t('ErpStock.Out.no')" prop="no">
-        <el-input
-          v-model="queryParams.no"
-          :placeholder="t('ErpStock.Out.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.Out.outTime')" prop="outTime">
-        <el-date-picker
-          v-model="queryParams.outTime"
-          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-240px"
-        />
-      </el-form-item>
-      <!-- <el-form-item label="客户" prop="customerId">
-        <el-select
-          v-model="queryParams.customerId"
-          clearable
-          filterable
-          placeholder="请选择客户"
-          class="!w-240px"
+        <!-- 鎼滅储宸ヤ綔鏍?-->
+        <el-form
+          class="-mb-15px"
+          :model="queryParams"
+          ref="queryFormRef"
+          :inline="true"
+          label-width="auto"
         >
-          <el-option
-            v-for="item in customerList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
+          <el-form-item :label="t('ErpStock.Out.no')" prop="no">
+            <el-input
+              v-model="queryParams.no"
+              :placeholder="t('ErpStock.Out.placeholderNo')"
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-240px"
+            />
+          </el-form-item>
+          <el-form-item :label="t('ErpStock.Out.product')" prop="productId">
+            <el-select
+              v-model="queryParams.productId"
+              clearable
+              filterable
+              :placeholder="t('ErpStock.Out.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.Out.outTime')" prop="outTime">
+            <el-date-picker
+              v-model="queryParams.outTime"
+              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.Out.warehouse')" prop="warehouseId" v-show="showAllFilters">
+            <el-select
+              v-model="queryParams.warehouseId"
+              clearable
+              filterable
+              :placeholder="t('ErpStock.Out.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.Out.creator')" prop="creator" v-show="showAllFilters">
+            <el-select
+              v-model="queryParams.creator"
+              clearable
+              filterable
+              :placeholder="t('ErpStock.Out.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.Out.status')" prop="status" v-show="showAllFilters">
+            <el-select
+              v-model="queryParams.status"
+              :placeholder="t('ErpStock.Out.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.Out.remark')" prop="remark" v-show="showAllFilters">
+            <el-input
+              v-model="queryParams.remark"
+              :placeholder="t('ErpStock.Out.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-out: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-out: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-out: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
+            v-for="dict in stockOutTypeOptions"
+            :key="dict.value"
+            :label="dict.label"
+            :name="dict.value"
           />
-        </el-select>
-      </el-form-item> -->
-      <el-form-item :label="t('ErpStock.Out.warehouse')" prop="warehouseId" v-show="showAllFilters">
-        <el-select
-          v-model="queryParams.warehouseId"
-          clearable
-          filterable
-          :placeholder="t('ErpStock.In.placeholderWarehouse')"
-          class="!w-240px"
+        </el-tabs>
+
+        <el-table
+          v-loading="loading"
+          :data="list"
+          :stripe="true"
+          :show-overflow-tooltip="true"
+          @selection-change="handleSelectionChange"
         >
-          <el-option
-            v-for="item in warehouseList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
+          <el-table-column width="30" :label="t('common.select')" type="selection" />
+          <el-table-column
+            min-width="180"
+            :label="t('ErpStock.Out.no')"
+            align="center"
+            prop="no"
+           sortable />
+          <el-table-column
+            :label="t(`ErpStock.Out.${outTypeToInfoKey(queryParams.outType)}`)"
+            align="left"
+            sortable
+            prop="productNames"
+            min-width="200"
           />
-        </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-table-column
+            :label="t('ErpStock.Out.outTime')"
+            align="center"
+            prop="outTime"
+            :formatter="dateFormatter2"
+            width="120px"
+           sortable />
+          <el-table-column :label="t('ErpStock.Out.creator')" align="center" prop="creatorName"  sortable />
+          <el-table-column
+            :label="t('ErpStock.Out.count')"
+            align="right"
+            sortable
+            prop="totalCount"
+            :formatter="erpCountTableColumnFormatter"
           />
-        </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.Out.status')"
+            align="center"
+            fixed="right"
+            width="100"
+            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('ErpStock.Out.auditUser')"
+            align="right"
+            sortable
+            prop="auditUserName"
           />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="t('ErpStock.Out.remark')" prop="remark" v-show="showAllFilters">
-        <el-input
-          v-model="queryParams.remark"
-          :placeholder="t('ErpStock.Out.placeholderRemark')"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
+          <el-table-column :label="t('common.operate')" align="center" fixed="right" width="300">
+            <template #default="scope">
+              <el-button
+                link
+                @click="openForm('detail', scope.row.id)"
+                v-hasPermi="['erp:stock-out:query']"
+              >
+                {{ t('action.detail') }}
+              </el-button>
+              <el-button
+                link
+                type="primary"
+                @click="openForm('update', scope.row.id)"
+                v-hasPermi="['erp:stock-out:update']"
+                :disabled="scope.row.status === 20"
+              >
+                {{ t('action.edit') }}
+              </el-button>
+              <el-button
+                v-if="[0, 1].includes(Number(scope.row.status))"
+                link
+                type="primary"
+                @click="openSubmitDialog(scope.row)"
+                v-hasPermi="['erp:stock-out:update-status']"
+              >
+                {{ t('ErpStock.Out.submitAudit') }}
+              </el-button>
+              <el-button
+                v-if="Number(scope.row.status) === 10"
+                link
+                type="primary"
+                @click="openAuditDialog(scope.row, 20)"
+                v-hasPermi="['erp:stock-out:update-status']"
+              >
+                {{ t('ErpStock.Out.auditApprove') }}
+              </el-button>
+              <el-button
+                v-if="Number(scope.row.status) === 10"
+                link
+                type="danger"
+                @click="openAuditDialog(scope.row, 1)"
+                v-hasPermi="['erp:stock-out:update-status']"
+              >
+                {{ t('ErpStock.Out.auditReject') }}
+              </el-button>
+              <el-button
+                link
+                type="danger"
+                @click="handleDelete([scope.row.id])"
+                v-hasPermi="['erp:stock-out: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-out: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-out: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-out:delete']"
-          :disabled="selectionList.length === 0"
-        >
-          <Icon icon="ep:delete" class="mr-5px" /> {{ t('action.del') }}
-        </el-button>
-      </el-form-item>
-    </el-form>
-  </ContentWrap>
+      </ContentWrap>
+    </template>
 
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-tabs v-model="activeName" @tab-click="handleTabClick">
-      <el-tab-pane :label="t('ErpStock.Out.tabPick')" name="领料出库" />
-      <!-- <el-tab-pane :label="t('ErpStock.Out.tabProduct')" name="产品出库" /> -->
-      <!-- <el-tab-pane :label="t('ErpStock.Out.tabMaterial')" name="原料出库" /> -->
-      <el-tab-pane :label="t('ErpStock.Out.tabPart')" name="备件出库" />
-      <el-tab-pane :label="t('ErpStock.Out.tabOther')" name="其他出库" />
-    </el-tabs>
+    <!-- 琛ㄥ崟闈㈡澘锛氭坊鍔?淇敼 -->
+    <StockOutForm v-else ref="formRef" @success="getList" @closed="formVisible = false" />
 
-    <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.Out.no')"
-        align="center"
-        prop="no"
-       sortable />
-      <el-table-column
-        :label="t('ErpStock.In.productInfo')"
-        align="left"
-        sortable
-        prop="productNames"
-        min-width="180"
-      />
-      <el-table-column label="生产计划编码" align="center" prop="planCode" min-width="160" sortable>
-        <template #default="scope">
-          <span>{{ scope.row.planCode ? scope.row.planCode : '-' }}</span>
-        </template>
-      </el-table-column>
-      <!-- <el-table-column label="客户" align="center" prop="customerName"  sortable /> -->
-      <el-table-column
-        :label="t('ErpStock.Out.outTime')"
-        align="center"
-        sortable
-        prop="outTime"
-        :formatter="dateFormatter2"
-        width="120px"
-      />
-      <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-out:query']"
-          >
-            {{ t('action.detail') }}
-          </el-button>
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['erp:stock-out: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-out: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-out:update-status']"
-            v-else
+    <Dialog :title="t('ErpStock.Out.submitAudit')" v-model="submitDialogVisible" width="520px">
+      <el-form ref="submitFormRef" :model="submitFormData" :rules="submitFormRules" label-width="90px">
+        <el-form-item :label="t('ErpStock.Out.auditUser')" prop="auditUserId">
+          <el-select
+            v-model="submitFormData.auditUserId"
+            clearable
+            filterable
+            :placeholder="t('ErpStock.Out.placeholderAuditUser')"
+            class="!w-1/1"
           >
-            {{ t('action.unapprove') }}
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete([scope.row.id])"
-            v-hasPermi="['erp:stock-out: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>
-    </template>
+            <el-option
+              v-for="item in userList"
+              :key="String(item.id)"
+              :label="item.nickname"
+              :value="String(item.id)"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="t('ErpStock.Out.remark')" prop="remark">
+          <el-input
+            v-model="submitFormData.remark"
+            type="textarea"
+            :rows="3"
+            :placeholder="t('ErpStock.Out.placeholderSubmitRemark')"
+          />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button @click="submitDialogVisible = false">{{ t('common.cancel') }}</el-button>
+        <el-button type="primary" :loading="actionLoading" @click="handleSubmitStockOut">{{ t('common.ok') }}</el-button>
+      </template>
+    </Dialog>
 
-    <StockOutForm v-else ref="formRef" @success="getList" @closed="formVisible = false" />
+    <Dialog :title="auditDialogTitle" v-model="auditDialogVisible" width="520px">
+      <el-form ref="auditFormRef" :model="auditFormData" label-width="90px">
+        <el-form-item :label="t('ErpStock.Out.remark')" prop="remark">
+          <el-input
+            v-model="auditFormData.remark"
+            type="textarea"
+            :rows="3"
+            :placeholder="auditRemarkPlaceholder"
+          />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button @click="auditDialogVisible = false">{{ t('common.cancel') }}</el-button>
+        <el-button type="primary" :loading="actionLoading" @click="handleAuditStockOut">{{ t('common.ok') }}</el-button>
+      </template>
+    </Dialog>
   </div>
 </template>
 
 <script setup lang="ts">
-import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { getIntDictOptions, getStrDictOptions, 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 其它出库单列表 */
+/** ERP 鍏跺畠鍏ュ簱鍗曞垪琛?*/
 defineOptions({ name: 'ErpStockOut' })
 
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
+const message = useMessage() // 娑堟伅寮圭獥
+const { t } = useI18n() // 鍥介檯鍖?
 
-const loading = ref(true) // 列表的加载中
-const list = ref<StockOutVO[]>([]) // 列表的数据
-const total = ref(0) // 列表的总页数
+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: [],
   remark: undefined,
+  outType: undefined,
   creator: undefined
 })
-const queryFormRef = ref() // 搜索的表单
-const exportLoading = ref(false) // 导出的加载中
+const WAREHOUSE_DOCUMENT_TYPES = 'warehouse_document_types'
+const stockOutTypeOptions = computed(() => getStrDictOptions(WAREHOUSE_DOCUMENT_TYPES))
+const outTypeToInfoKey = (outType: string) => {
+  const map: Record<string, string> = {
+    '产品出库': 'productInfo',
+    '物料出库': 'materialInfo',
+    '原料出库': 'materialInfo',
+    '领料出库': 'materialInfo',
+    '备件出库': 'sparePartInfo'
+  }
+  return map[outType] || 'productInfo'
+}
+const activeName = ref('')
+const queryFormRef = ref() // 鎼滅储鐨勮〃鍗?
+const exportLoading = ref(false) // 瀵煎嚭鐨勫姞杞戒腑
 const showAllFilters = ref(false)
 const filterCount = 7
 const toggleFilters = () => {
   showAllFilters.value = !showAllFilters.value
 }
-const productList = ref<ProductVO[]>([]) // 产品列表
-const warehouseList = ref<WarehouseVO[]>([]) // 仓库列表
-const customerList = ref<CustomerVO[]>([]) // 客户列表
-const userList = ref<UserVO[]>([]) // 用户列表
+const productList = ref<ProductVO[]>([]) // 浜у搧鍒楄〃
+const warehouseList = ref<WarehouseVO[]>([]) // 浠撳簱鍒楄〃
+const userList = ref<UserVO[]>([]) // 鐢ㄦ埛鍒楄〃
 
-/** 查询列表 */
+const formVisible = ref(false) // 琛ㄥ崟鏄惁鍙
+const actionLoading = ref(false)
+const submitDialogVisible = ref(false)
+const submitFormRef = ref()
+const submitFormData = reactive({
+  id: '',
+  auditUserId: '',
+  remark: ''
+})
+const submitFormRules = reactive({
+  auditUserId: [{ required: true, message: t('ErpStock.Out.validatorAuditUserRequired'), trigger: 'change' }]
+})
+const auditDialogVisible = ref(false)
+const auditFormRef = ref()
+const auditFormData = reactive({
+  id: '',
+  status: '',
+  remark: ''
+})
+const auditDialogTitle = computed(() => auditFormData.status === '20' ? t('ErpStock.Out.auditApprove') : t('ErpStock.Out.auditReject'))
+const auditRemarkPlaceholder = computed(() => auditFormData.status === '20' ? t('ErpStock.Out.placeholderAuditApproveRemark') : t('ErpStock.Out.placeholderAuditRejectRemark'))
+
+/** 鏌ヨ鍒楄〃 */
 const getList = async () => {
   loading.value = true
   try {
@@ -349,63 +416,96 @@ const getList = async () => {
   }
 }
 
-/** 搜索按钮操作 */
+/** 鎼滅储鎸夐挳鎿嶄綔 */
 const handleQuery = () => {
   queryParams.pageNo = 1
   getList()
 }
 
-/** 重置按钮操作 */
+/** 閲嶇疆鎸夐挳鎿嶄綔 */
 const resetQuery = () => {
   queryFormRef.value.resetFields()
+  queryParams.outType = activeName.value || stockOutTypeOptions.value[0]?.value
   handleQuery()
 }
 
-/** 添加/修改操作 */
+/** 娣诲姞/淇敼鎿嶄綔 */
 const formRef = ref()
-const formVisible = ref(false)
-
-const openForm = async (type: string, id?: number) => {
+const openForm = (type: string, id?: number) => {
   formVisible.value = true
-  await nextTick()
-  formRef.value?.open(type, id)
+  nextTick(() => {
+    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) => {
+const openSubmitDialog = (row: StockOutVO) => {
+  submitFormData.id = String(row.id)
+  submitFormData.auditUserId = ''
+  submitFormData.remark = ''
+  submitDialogVisible.value = true
+  nextTick(() => submitFormRef.value?.clearValidate?.())
+}
+
+const handleSubmitStockOut = async () => {
+  await submitFormRef.value.validate()
+  actionLoading.value = true
   try {
-    // 审批的二次确认
-    const confirmText = status === 20 ? t('ErpStock.Out.confirmApprove') : t('ErpStock.Out.confirmReverseApprove')
-    await message.confirm(confirmText)
-    // 发起审批
-    await StockOutApi.updateStockOutStatus(id, status)
-    const successText = status === 20 ? t('ErpStock.Out.approveSuccess') : t('ErpStock.Out.reverseApproveSuccess')
-    message.success(successText)
-    // 刷新列表
+    await StockOutApi.submitStockOut({
+      id: submitFormData.id,
+      auditUserId: submitFormData.auditUserId,
+      remark: submitFormData.remark
+    })
+    message.success(t('ErpStock.Out.submitSuccess'))
+    submitDialogVisible.value = false
     await getList()
-  } catch {}
+  } finally {
+    actionLoading.value = false
+  }
+}
+
+const openAuditDialog = (row: StockOutVO, status: 20 | 1) => {
+  auditFormData.id = String(row.id)
+  auditFormData.status = String(status)
+  auditFormData.remark = status === 20 ? t('ErpStock.Out.auditApprove') : ''
+  auditDialogVisible.value = true
 }
 
-/** 导出按钮操作 */
+const handleAuditStockOut = async () => {
+  actionLoading.value = true
+  try {
+    await StockOutApi.auditStockOut({
+      id: auditFormData.id,
+      status: auditFormData.status,
+      remark: auditFormData.remark
+    })
+    message.success(auditFormData.status === '20' ? t('ErpStock.Out.auditApproveSuccess') : t('ErpStock.Out.auditRejectSuccess'))
+    auditDialogVisible.value = false
+    await getList()
+  } finally {
+    actionLoading.value = false
+  }
+}
+
+/** 瀵煎嚭鎸夐挳鎿嶄綔 */
 const handleExport = async () => {
   try {
-    // 导出的二次确认
+    // 瀵煎嚭鐨勪簩娆＄‘璁?
     await message.exportConfirm()
-    // 发起导出
+    // 鍙戣捣瀵煎嚭
     exportLoading.value = true
     const ids = selectionList.value.map((item) => item.id).filter((v) => v != null)
     const params = {
@@ -420,28 +520,43 @@ const handleExport = async () => {
   }
 }
 
-/** 选中操作 */
+/** 閫変腑鎿嶄綔 */
 const selectionList = ref<StockOutVO[]>([])
 const handleSelectionChange = (rows: StockOutVO[]) => {
   selectionList.value = rows
 }
 
-/** 初始化 **/
+const syncDefaultOutType = () => {
+  if (queryParams.outType) {
+    activeName.value = queryParams.outType
+    return
+  }
+  const defaultOutType = stockOutTypeOptions.value[0]?.value
+  if (defaultOutType) {
+    queryParams.outType = defaultOutType
+    activeName.value = defaultOutType
+  }
+}
+
+watch(stockOutTypeOptions, (options) => {
+  if (!queryParams.outType && options.length) {
+    syncDefaultOutType()
+    handleQuery()
+  }
+})
+
+/** 鍒濆鍖?**/
 onMounted(async () => {
-  queryParams.outType ='产品出库'
+  syncDefaultOutType()
   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
+  queryParams.outType = String(tab.paneName || '')
+  activeName.value = queryParams.outType
   handleQuery()
 }
 </script>