From 957429b52fcb50ce7db71993bbae7b6d2a191418 Mon Sep 17 00:00:00 2001
From: chenshuichuan <1154693969@qq.com>
Date: Fri, 9 Aug 2024 19:08:12 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=A4=87=E4=BB=B6=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/erp/product/product/index.ts          |  4 ++
 src/views/erp/component/in/StockInForm.vue    |  2 +
 .../in/components/StockInItemForm.vue         | 22 +++---
 src/views/erp/component/in/index.vue          | 68 +++++--------------
 src/views/erp/component/out/StockOutForm.vue  | 32 ++-------
 .../out/components/StockOutItemForm.vue       | 22 +++---
 src/views/erp/component/out/index.vue         | 68 ++++---------------
 .../erp/component/product/ProductForm.vue     | 58 +++-------------
 src/views/erp/component/product/index.vue     | 12 ++--
 src/views/erp/component/record/index.vue      | 65 +++---------------
 src/views/erp/component/stock/index.vue       | 44 ++----------
 src/views/erp/product/product/ProductForm.vue |  3 +-
 .../stock/in/components/StockInItemForm.vue   |  6 +-
 .../stock/out/components/StockOutItemForm.vue |  6 +-
 .../mes/bom/components/BomDetailForm.vue      |  8 ++-
 15 files changed, 107 insertions(+), 313 deletions(-)

diff --git a/src/api/erp/product/product/index.ts b/src/api/erp/product/product/index.ts
index 7a29c6bd..b2fbf6e5 100644
--- a/src/api/erp/product/product/index.ts
+++ b/src/api/erp/product/product/index.ts
@@ -41,6 +41,10 @@ export const ProductApi = {
   getMesProductSimpleList: async () => {
     return await request.get({ url: `/erp/product/simple-list-product` })
   },
+  // 查询备件精简列表
+  getComponentSimpleList: async () => {
+    return await request.get({ url: `/erp/product/simple-list-component` })
+  },
 
   // 查询产品详情
   getProduct: async (id: number) => {
diff --git a/src/views/erp/component/in/StockInForm.vue b/src/views/erp/component/in/StockInForm.vue
index 8bb35a0f..207bb34b 100644
--- a/src/views/erp/component/in/StockInForm.vue
+++ b/src/views/erp/component/in/StockInForm.vue
@@ -17,6 +17,7 @@
         <el-col :span="8">
           <el-form-item label="入库类型" prop="inType">
             <el-select
+              disabled
               v-model="formData.inType"
               clearable
               filterable
@@ -170,6 +171,7 @@ const open = async (type: string, id?: number) => {
       formLoading.value = false
     }
   }
+  formData.value.inType = "备件入库"
   // 加载供应商列表
   supplierList.value = await SupplierApi.getSupplierSimpleList()
 }
diff --git a/src/views/erp/component/in/components/StockInItemForm.vue b/src/views/erp/component/in/components/StockInItemForm.vue
index 53a2fd2d..1dbac30c 100644
--- a/src/views/erp/component/in/components/StockInItemForm.vue
+++ b/src/views/erp/component/in/components/StockInItemForm.vue
@@ -34,7 +34,7 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="产品名称" min-width="180">
+      <el-table-column label="备件名称" min-width="180">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.productId`" :rules="formRules.productId" class="mb-0px!">
             <el-select
@@ -42,7 +42,7 @@
               clearable
               filterable
               @change="onChangeProduct($event, row)"
-              placeholder="请选择产品"
+              placeholder="请选择备件"
             >
               <el-option
                 v-for="item in productList"
@@ -61,7 +61,7 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="条码" min-width="150">
+      <el-table-column label="备件编码" min-width="150">
         <template #default="{ row }">
           <el-form-item class="mb-0px!">
             <el-input disabled v-model="row.productBarCode" />
@@ -88,7 +88,7 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="产品单价" fixed="right" min-width="120">
+      <el-table-column label="备件单价" fixed="right" min-width="120">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.productPrice`" class="mb-0px!">
             <el-input-number
@@ -108,7 +108,7 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="备注" min-width="150">
+      <el-table-column label="备注" fixed="right" min-width="150">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.remark`" class="mb-0px!">
             <el-input v-model="row.remark" placeholder="请输入备注" />
@@ -117,13 +117,15 @@
       </el-table-column>
       <el-table-column align="center" fixed="right" label="操作" width="60">
         <template #default="{ $index }">
-          <el-button @click="handleDelete($index)" link>—</el-button>
+          <el-button type="danger" @click="handleDelete($index)" link>
+            <Icon icon="ep:delete" />
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
   </el-form>
   <el-row justify="center" class="mt-3" v-if="!disabled">
-    <el-button @click="handleAdd" round>+ 添加入库产品</el-button>
+    <el-button @click="handleAdd" round>+ 添加入库备件</el-button>
   </el-row>
 </template>
 <script setup lang="ts">
@@ -146,8 +148,8 @@ const formData = ref([])
 const formRules = reactive({
   inId: [{ required: true, message: '入库编号不能为空', trigger: 'blur' }],
   warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'blur' }],
-  productId: [{ required: true, message: '产品不能为空', trigger: 'blur' }],
-  count: [{ required: true, message: '产品数量不能为空', trigger: 'blur' }]
+  productId: [{ required: true, message: '备件不能为空', trigger: 'blur' }],
+  count: [{ required: true, message: '备件数量不能为空', trigger: 'blur' }]
 })
 const formRef = ref([]) // 表单 Ref
 const productList = ref<ProductVO[]>([]) // 产品列表
@@ -256,7 +258,7 @@ defineExpose({ validate })
 
 /** 初始化 */
 onMounted(async () => {
-  productList.value = await ProductApi.getProductSimpleList()
+  productList.value = await ProductApi.getComponentSimpleList()
   warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
   defaultWarehouse.value = warehouseList.value.find((item) => item.defaultStatus)
   // 默认添加一个
diff --git a/src/views/erp/component/in/index.vue b/src/views/erp/component/in/index.vue
index b905e91d..56245c4b 100644
--- a/src/views/erp/component/in/index.vue
+++ b/src/views/erp/component/in/index.vue
@@ -9,21 +9,12 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="入库单号" prop="no">
-        <el-input
-          v-model="queryParams.no"
-          placeholder="请输入入库单号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="产品" prop="productId">
+      <el-form-item label="备件" prop="productId">
         <el-select
           v-model="queryParams.productId"
           clearable
           filterable
-          placeholder="请选择产品"
+          placeholder="请选择备件"
           class="!w-240px"
         >
           <el-option
@@ -77,32 +68,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建人" prop="creator">
-        <el-select
-          v-model="queryParams.creator"
-          clearable
-          filterable
-          placeholder="请选择创建人"
-          class="!w-240px"
-        >
-          <el-option
-            v-for="item in userList"
-            :key="item.id"
-            :label="item.nickname"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.ERP_AUDIT_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+
       <el-form-item label="备注" prop="remark">
         <el-input
           v-model="queryParams.remark"
@@ -148,10 +114,9 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
-      <el-tab-pane label="产品" name="产品入库" />
-      <el-tab-pane label="原料" name="原料入库" />
-      <el-tab-pane label="备件" name="备件入库" />
-      <el-tab-pane label="其他" name="其他入库" />
+      <el-tab-pane label="未审核" name="10" />
+      <el-tab-pane label="已审核" name="20" />
+      <el-tab-pane label="所有" name="" />
     </el-tabs>
 
     <el-table
@@ -162,9 +127,9 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column width="30" label="选择" type="selection" />
-      <el-table-column min-width="180" label="入库单号" align="center" prop="no" />
-      <el-table-column label="产品信息" align="left" sortable prop="productNames" min-width="200" />
-      <el-table-column label="供应商" align="center" prop="supplierName" />
+      <el-table-column min-width="180" label="入库单号" align="left" prop="no" />
+      <el-table-column label="备件信息" align="left" sortable prop="productNames" min-width="200" />
+      <el-table-column label="供应商" align="left" prop="supplierName" />
       <el-table-column
         label="入库时间"
         align="center"
@@ -192,7 +157,7 @@
           <dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" fixed="right" width="220">
+      <el-table-column label="操作" align="center" fixed="right" width="180">
         <template #default="scope">
           <el-button
             link
@@ -206,7 +171,7 @@
             type="primary"
             @click="openForm('update', scope.row.id)"
             v-hasPermi="['erp:stock-in:update']"
-            :disabled="scope.row.status === 20"
+            v-if="scope.row.status === 10"
           >
             编辑
           </el-button>
@@ -233,6 +198,7 @@
             type="danger"
             @click="handleDelete([scope.row.id])"
             v-hasPermi="['erp:stock-in:delete']"
+            v-if="scope.row.status === 10"
           >
             删除
           </el-button>
@@ -291,12 +257,13 @@ const exportLoading = ref(false) // 导出的加载中
 const productList = ref<ProductVO[]>([]) // 产品列表
 const warehouseList = ref<WarehouseVO[]>([]) // 仓库列表
 const supplierList = ref<SupplierVO[]>([]) // 供应商列表
-const userList = ref<UserVO[]>([]) // 用户列表
+
 
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
   try {
+    queryParams.inType = "备件入库"
     const data = await StockInApi.getStockInPage(queryParams)
     list.value = data.list
     total.value = data.total
@@ -373,19 +340,18 @@ const handleSelectionChange = (rows: StockInVO[]) => {
 
 /** 初始化 **/
 onMounted(async () => {
-  queryParams.inType = '产品入库'
+  queryParams.status = 10
   await getList()
   // 加载产品、仓库列表、供应商
   productList.value = await ProductApi.getProductSimpleList()
   warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
   supplierList.value = await SupplierApi.getSupplierSimpleList()
-  userList.value = await UserApi.getSimpleUserList()
 })
 // TODO 芋艿：可优化功能：列表界面，支持导入
 // TODO 芋艿：可优化功能：详情界面，支持打印
-let activeName = '产品入库'
+let activeName = '10'
 const handleTabClick = (tab: TabsPaneContext) => {
-  queryParams.inType = tab.paneName
+  queryParams.status = Number(tab.paneName)
   handleQuery()
 }
 </script>
diff --git a/src/views/erp/component/out/StockOutForm.vue b/src/views/erp/component/out/StockOutForm.vue
index ddea4f43..c1e66d1a 100644
--- a/src/views/erp/component/out/StockOutForm.vue
+++ b/src/views/erp/component/out/StockOutForm.vue
@@ -14,24 +14,7 @@
             <el-input disabled v-model="formData.no" placeholder="保存时自动生成" />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="客户" prop="customerId">
-            <el-select
-              v-model="formData.customerId"
-              clearable
-              filterable
-              placeholder="请选择客户"
-              class="!w-1/1"
-            >
-              <el-option
-                v-for="item in customerList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
+
         <el-col :span="8">
           <el-form-item label="出库时间" prop="outTime">
             <el-date-picker
@@ -46,6 +29,7 @@
         <el-col :span="8">
           <el-form-item label="出库类型" prop="outType">
             <el-select
+              disabled
               v-model="formData.outType"
               clearable
               filterable
@@ -74,18 +58,12 @@
             />
           </el-form-item>
         </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="附件" prop="fileUrl">
-            <UploadFile :is-show-tip="false" v-model="formData.fileUrl" :limit="1" />
-          </el-form-item>
-        </el-col>
       </el-row>
     </el-form>
     <!-- 子表的表单 -->
     <ContentWrap>
       <el-tabs v-model="subTabsName" class="-mt-15px -mb-10px">
-        <el-tab-pane label="出库产品清单" name="item">
+        <el-tab-pane label="出库备件清单" name="item">
           <StockOutItemForm ref="itemFormRef" :items="formData.items" :disabled="disabled" />
         </el-tab-pane>
       </el-tabs>
@@ -129,7 +107,6 @@ const formRules = reactive({
 })
 const disabled = computed(() => formType.value === 'detail')
 const formRef = ref() // 表单 Ref
-const customerList = ref<CustomerVO[]>([]) // 客户列表
 const options = [
   {
     value: '其他出库',
@@ -174,8 +151,7 @@ const open = async (type: string, id?: number) => {
       formLoading.value = false
     }
   }
-  // 加载客户列表
-  customerList.value = await CustomerApi.getCustomerSimpleList()
+  formData.value.outType = "备件出库"
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
diff --git a/src/views/erp/component/out/components/StockOutItemForm.vue b/src/views/erp/component/out/components/StockOutItemForm.vue
index b09a5695..c43289e0 100644
--- a/src/views/erp/component/out/components/StockOutItemForm.vue
+++ b/src/views/erp/component/out/components/StockOutItemForm.vue
@@ -34,7 +34,7 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="产品名称" min-width="180">
+      <el-table-column label="备件名称" min-width="180">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.productId`" :rules="formRules.productId" class="mb-0px!">
             <el-select
@@ -42,7 +42,7 @@
               clearable
               filterable
               @change="onChangeProduct($event, row)"
-              placeholder="请选择产品"
+              placeholder="请选择备件"
             >
               <el-option
                 v-for="item in productList"
@@ -61,7 +61,7 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="条码" min-width="150">
+      <el-table-column label="备件编码" min-width="150">
         <template #default="{ row }">
           <el-form-item class="mb-0px!">
             <el-input disabled v-model="row.productBarCode" />
@@ -88,7 +88,7 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="产品单价" fixed="right" min-width="120">
+      <el-table-column label="单价" fixed="right" min-width="120">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.productPrice`" class="mb-0px!">
             <el-input-number
@@ -108,7 +108,7 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="备注" min-width="150">
+      <el-table-column label="备注" fixed="right" min-width="150">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.remark`" class="mb-0px!">
             <el-input v-model="row.remark" placeholder="请输入备注" />
@@ -117,13 +117,15 @@
       </el-table-column>
       <el-table-column align="center" fixed="right" label="操作" width="60">
         <template #default="{ $index }">
-          <el-button @click="handleDelete($index)" link>—</el-button>
+          <el-button type="danger" @click="handleDelete($index)" link>
+            <Icon icon="ep:delete" />
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
   </el-form>
   <el-row justify="center" class="mt-3" v-if="!disabled">
-    <el-button @click="handleAdd" round>+ 添加出库产品</el-button>
+    <el-button @click="handleAdd" round>+ 添加出库备件</el-button>
   </el-row>
 </template>
 <script setup lang="ts">
@@ -146,8 +148,8 @@ const formData = ref([])
 const formRules = reactive({
   inId: [{ required: true, message: '出库编号不能为空', trigger: 'blur' }],
   warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'blur' }],
-  productId: [{ required: true, message: '产品不能为空', trigger: 'blur' }],
-  count: [{ required: true, message: '产品数量不能为空', trigger: 'blur' }]
+  productId: [{ required: true, message: '备件不能为空', trigger: 'blur' }],
+  count: [{ required: true, message: '备件数量不能为空', trigger: 'blur' }]
 })
 const formRef = ref([]) // 表单 Ref
 const productList = ref<ProductVO[]>([]) // 产品列表
@@ -256,7 +258,7 @@ defineExpose({ validate })
 
 /** 初始化 */
 onMounted(async () => {
-  productList.value = await ProductApi.getProductSimpleList()
+  productList.value = await ProductApi.getComponentSimpleList()
   warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
   defaultWarehouse.value = warehouseList.value.find((item) => item.defaultStatus)
   // 默认添加一个
diff --git a/src/views/erp/component/out/index.vue b/src/views/erp/component/out/index.vue
index f6307c8c..eb4ba774 100644
--- a/src/views/erp/component/out/index.vue
+++ b/src/views/erp/component/out/index.vue
@@ -18,12 +18,12 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="产品" prop="productId">
+      <el-form-item label="备件" prop="productId">
         <el-select
           v-model="queryParams.productId"
           clearable
           filterable
-          placeholder="请选择产品"
+          placeholder="请选择备件"
           class="!w-240px"
         >
           <el-option
@@ -45,22 +45,6 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="客户" prop="customerId">
-        <el-select
-          v-model="queryParams.customerId"
-          clearable
-          filterable
-          placeholder="请选择供客户"
-          class="!w-240px"
-        >
-          <el-option
-            v-for="item in customerList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
       <el-form-item label="仓库" prop="warehouseId">
         <el-select
           v-model="queryParams.warehouseId"
@@ -77,32 +61,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建人" prop="creator">
-        <el-select
-          v-model="queryParams.creator"
-          clearable
-          filterable
-          placeholder="请选择创建人"
-          class="!w-240px"
-        >
-          <el-option
-            v-for="item in userList"
-            :key="item.id"
-            :label="item.nickname"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.ERP_AUDIT_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
       <el-form-item label="备注" prop="remark">
         <el-input
           v-model="queryParams.remark"
@@ -148,10 +106,9 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
-      <el-tab-pane label="产品" name="产品出库" />
-      <el-tab-pane label="原料" name="原料出库" />
-      <el-tab-pane label="备件" name="备件出库" />
-      <el-tab-pane label="其他" name="其他出库" />
+      <el-tab-pane label="未审核" name="10" />
+      <el-tab-pane label="已审核" name="20" />
+      <el-tab-pane label="所有" name="" />
     </el-tabs>
 
     <el-table
@@ -293,8 +250,7 @@ const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 const productList = ref<ProductVO[]>([]) // 产品列表
 const warehouseList = ref<WarehouseVO[]>([]) // 仓库列表
-const customerList = ref<CustomerVO[]>([]) // 客户列表
-const userList = ref<UserVO[]>([]) // 用户列表
+
 
 /** 查询列表 */
 const getList = async () => {
@@ -376,20 +332,20 @@ const handleSelectionChange = (rows: StockOutVO[]) => {
 
 /** 初始化 **/
 onMounted(async () => {
-  queryParams.outType ='产品出库'
+  queryParams.outType ='备件出库'
+  queryParams.status = 10
   await getList()
   // 加载产品、仓库列表、客户
-  productList.value = await ProductApi.getProductSimpleList()
+  productList.value = await ProductApi.getComponentSimpleList()
   warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
-  customerList.value = await CustomerApi.getCustomerSimpleList()
-  userList.value = await UserApi.getSimpleUserList()
+
 })
 // TODO 芋艿：可优化功能：列表界面，支持导入
 // TODO 芋艿：可优化功能：详情界面，支持打印
 /** tab 切换 */
-let activeName = '产品出库'
+let activeName = '10'
 const handleTabClick = (tab: TabsPaneContext) => {
-  queryParams.outType = tab.paneName
+  queryParams.status = tab.paneName
   handleQuery()
 }
 </script>
diff --git a/src/views/erp/component/product/ProductForm.vue b/src/views/erp/component/product/ProductForm.vue
index e013f828..610d5876 100644
--- a/src/views/erp/component/product/ProductForm.vue
+++ b/src/views/erp/component/product/ProductForm.vue
@@ -10,28 +10,16 @@
     >
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="名称" prop="name">
+          <el-form-item label="备件名称" prop="name">
             <el-input v-model="formData.name" placeholder="请输入名称" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="条码" prop="barCode">
-            <el-input v-model="formData.barCode" placeholder="请输入条码" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="分类" prop="categoryId">
-            <el-tree-select
-              v-model="formData.categoryId"
-              :data="categoryList"
-              :props="defaultProps"
-              check-strictly
-              default-expand-all
-              placeholder="请选择分类"
-              class="w-1/1"
-            />
+          <el-form-item label="备件编码" prop="barCode">
+            <el-input v-model="formData.barCode" placeholder="请输入编码" />
           </el-form-item>
         </el-col>
+
         <el-col :span="12">
           <el-form-item label="单位" prop="unitId">
             <el-select v-model="formData.unitId" clearable placeholder="请选择单位" class="w-1/1">
@@ -73,16 +61,6 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="重量（g）" prop="weight">
-            <el-input-number
-              v-model="formData.weight"
-              placeholder="请输入重量（g）"
-              :min="0"
-              class="!w-1/1"
-            />
-          </el-form-item>
-        </el-col>
         <el-col :span="12">
           <el-form-item label="采购价格" prop="purchasePrice">
             <el-input-number
@@ -95,21 +73,10 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="销售价格" prop="salePrice">
-            <el-input-number
-              v-model="formData.salePrice"
-              placeholder="请输入销售价格，单位：元"
-              :min="0"
-              :precision="2"
-              class="!w-1/1"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="最低价格" prop="minPrice">
+          <el-form-item label="预警库存" prop="safetyNumber">
             <el-input-number
-              v-model="formData.minPrice"
-              placeholder="请输入最低价格，单位：元"
+              v-model="formData.safetyNumber"
+              placeholder="请输入预警库存数量"
               :min="0"
               :precision="2"
               class="!w-1/1"
@@ -131,7 +98,6 @@
 </template>
 <script setup lang="ts">
 import { ProductApi, ProductVO } from '@/api/erp/product/product'
-import { ProductCategoryApi, ProductCategoryVO } from '@/api/erp/product/category'
 import { ProductUnitApi, ProductUnitVO } from '@/api/erp/product/unit'
 import { CommonStatusEnum } from '@/utils/constants'
 import { defaultProps, handleTree } from '@/utils/tree'
@@ -160,7 +126,8 @@ const formData = ref({
   weight: undefined,
   purchasePrice: undefined,
   salePrice: undefined,
-  minPrice: undefined
+  minPrice: undefined,
+  safetyNumber: undefined
 })
 const formRules = reactive({
   name: [{ required: true, message: '产品名称不能为空', trigger: 'blur' }],
@@ -170,7 +137,6 @@ const formRules = reactive({
   status: [{ required: true, message: '产品状态不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
-const categoryList = ref<ProductCategoryVO[]>([]) // 产品分类列表
 const unitList = ref<ProductUnitVO[]>([]) // 产品单位列表
 
 /** 打开弹窗 */
@@ -188,9 +154,6 @@ const open = async (type: string, id?: number) => {
       formLoading.value = false
     }
   }
-  // 产品分类
-  const categoryData = await ProductCategoryApi.getProductCategorySimpleList()
-  categoryList.value = handleTree(categoryData, 'id', 'parentId')
   // 产品单位
   unitList.value = await ProductUnitApi.getProductUnitSimpleList()
 }
@@ -205,7 +168,8 @@ const submitForm = async () => {
   formLoading.value = true
   try {
     const data = formData.value as unknown as ProductVO
-    if (formType.value === 'create') {
+    if (formType.value === 'create'){
+      formData.value.categoryId = 5
       await ProductApi.createProduct(data)
       message.success(t('common.createSuccess'))
     } else {
diff --git a/src/views/erp/component/product/index.vue b/src/views/erp/component/product/index.vue
index aa8ade0a..d11099f6 100644
--- a/src/views/erp/component/product/index.vue
+++ b/src/views/erp/component/product/index.vue
@@ -49,9 +49,10 @@
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="备件编码" align="center" prop="barCode" />
       <el-table-column label="备件名称" align="left" prop="name"  width="220px"/>
-      <el-table-column label="规格" align="center" prop="standard" />
+      <el-table-column v-if="checkPermi(['erp:component:standard'])" label="规格" align="center" prop="standard" />
       <el-table-column label="分类" align="center" prop="categoryName" />
       <el-table-column label="单位" align="center" prop="unitName" />
+      <el-table-column label="预警库存" align="center" prop="safetyNumber" />
       <el-table-column label="状态" align="center" prop="status">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
@@ -96,8 +97,6 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <ProductForm ref="formRef" @success="getList" />
-
-
 </template>
 
 <script setup lang="ts">
@@ -110,6 +109,7 @@ import { DICT_TYPE } from '@/utils/dict'
 import { defaultProps, handleTree } from '@/utils/tree'
 import { erpPriceTableColumnFormatter } from '@/utils'
 import BomForm from "@/views/mes/bom/BomForm.vue";
+import {checkPermi} from "@/utils/permission";
 
 /** ERP 产品列表 */
 defineOptions({ name: 'ErpProduct' })
@@ -128,7 +128,6 @@ const queryParams = reactive({
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
-const categoryList = ref<ProductCategoryVO[]>([]) // 产品分类列表
 
 /** 查询列表 */
 const getList = async () => {
@@ -182,7 +181,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductApi.exportProduct(queryParams)
-    download.excel(data, '产品.xls')
+    download.excel(data, '备件信息.xls')
   } catch {
   } finally {
     exportLoading.value = false
@@ -193,8 +192,5 @@ const handleExport = async () => {
 onMounted(async () => {
   queryParams.categoryId = 2
   await getList()
-  // 产品分类
-  const categoryData = await ProductCategoryApi.getProductCategorySimpleList()
-  categoryList.value = handleTree(categoryData, 'id', 'parentId')
 })
 </script>
diff --git a/src/views/erp/component/record/index.vue b/src/views/erp/component/record/index.vue
index 7814859c..d52ac691 100644
--- a/src/views/erp/component/record/index.vue
+++ b/src/views/erp/component/record/index.vue
@@ -10,12 +10,12 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="产品" prop="productId">
+      <el-form-item label="备件" prop="productId">
         <el-select
           v-model="queryParams.productId"
           clearable
           filterable
-          placeholder="请选择产品"
+          placeholder="请选择备件"
           class="!w-240px"
         >
           <el-option
@@ -42,21 +42,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="类型" prop="bizType">
-        <el-select
-          v-model="queryParams.bizType"
-          placeholder="请选择类型"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.ERP_STOCK_RECORD_BIZ_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+
       <el-form-item label="业务单号" prop="bizNo">
         <el-input
           v-model="queryParams.bizNo"
@@ -103,20 +89,11 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-tabs v-model="activeName" @tab-click="handleTabClick">
-      <el-tab-pane label="产品" name="2" />
-      <el-tab-pane label="原料" name="1" />
-      <el-tab-pane label="备件" name="5" />
-      <el-tab-pane label="工具" name="3" />
-      <el-tab-pane label="耗材" name="4" />
-      <el-tab-pane label="其他" name="0" />
-    </el-tabs>
 
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="产品名称" align="left" sortable prop="productName" width="210px"/>
-      <el-table-column label="产品分类" align="center" prop="categoryName" />
-      <el-table-column label="产品单位" align="center" prop="unitName" />
-      <el-table-column label="仓库编号" align="center" prop="warehouseName" />
+      <el-table-column label="备件名称" align="left" sortable prop="productName" width="210px"/>
+      <el-table-column label="单位" align="center" prop="unitName" />
+      <el-table-column label="仓库" align="center" prop="warehouseName" />
       <el-table-column label="类型" align="center" prop="bizType" min-width="100">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.ERP_STOCK_RECORD_BIZ_TYPE" :value="scope.row.bizType" />
@@ -203,6 +180,7 @@ const warehouseList = ref<WarehouseVO[]>([]) // 仓库列表
 const getList = async () => {
   loading.value = true
   try {
+    queryParams.categoryId = 5
     const data = await StockRecordApi.getStockRecordPage(queryParams)
     list.value = data.list
     total.value = data.total
@@ -223,24 +201,6 @@ const resetQuery = () => {
   handleQuery()
 }
 
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await StockRecordApi.deleteStockRecord(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
 
 /** 导出按钮操作 */
 const handleExport = async () => {
@@ -250,7 +210,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await StockRecordApi.exportStockRecord(queryParams)
-    download.excel(data, '产品库存明细.xls')
+    download.excel(data, '备件库存明细.xls')
   } catch {
   } finally {
     exportLoading.value = false
@@ -265,14 +225,7 @@ onActivated(() => {
 onMounted(async () => {
   await getList()
   // 加载产品、仓库列表
-  productList.value = await ProductApi.getProductSimpleList()
+  productList.value = await ProductApi.getComponentSimpleList()
   warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
 })
-
-/** tab 切换 */
-let activeName = '2'
-const handleTabClick = (tab: TabsPaneContext) => {
-  queryParams.categoryId = tab.paneName
-  handleQuery()
-}
 </script>
diff --git a/src/views/erp/component/stock/index.vue b/src/views/erp/component/stock/index.vue
index 81f164f8..409cb60d 100644
--- a/src/views/erp/component/stock/index.vue
+++ b/src/views/erp/component/stock/index.vue
@@ -10,12 +10,12 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="产品" prop="productId">
+      <el-form-item label="备件" prop="productId">
         <el-select
           v-model="queryParams.productId"
           clearable
           filterable
-          placeholder="请选择产品"
+          placeholder="请选择备件"
           class="!w-240px"
         >
           <el-option
@@ -69,17 +69,8 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-tabs v-model="activeName" @tab-click="handleTabClick">
-      <el-tab-pane label="产品" name="2" />
-      <el-tab-pane label="原料" name="1" />
-      <el-tab-pane label="备件" name="5" />
-      <el-tab-pane label="工具" name="3" />
-      <el-tab-pane label="耗材" name="4" />
-      <el-tab-pane label="其他" name="0" />
-    </el-tabs>
-
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="产品" align="left" sortable prop="productName" />
+      <el-table-column label="备件" align="left" sortable prop="productName" />
       <el-table-column label="分类" align="center" prop="categoryName" />
       <el-table-column
         label="库存量"
@@ -129,12 +120,12 @@ const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 const productList = ref<ProductVO[]>([]) // 产品列表
 const warehouseList = ref<WarehouseVO[]>([]) // 仓库列表
-const categoryList = ref<ProductCategoryVO[]>([]) // 仓库列表
 
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
   try {
+    queryParams.categoryId = 5
     const data = await StockApi.getStockPage(queryParams)
     list.value = data.list
     total.value = data.total
@@ -155,24 +146,6 @@ const resetQuery = () => {
   handleQuery()
 }
 
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await StockApi.deleteStock(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
 
 /** 导出按钮操作 */
 const handleExport = async () => {
@@ -194,15 +167,8 @@ onMounted(async () => {
   queryParams.categoryId = 2
   await getList()
   // 加载产品、仓库列表
-  productList.value = await ProductApi.getProductSimpleList()
+  productList.value = await ProductApi.getComponentSimpleList()
   warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
-  categoryList.value = await ProductCategoryApi.getProductCategorySimpleList()
 })
 
-/** tab 切换 */
-let activeName = '2'
-const handleTabClick = (tab: TabsPaneContext) => {
-  queryParams.categoryId = tab.paneName
-  handleQuery()
-}
 </script>
diff --git a/src/views/erp/product/product/ProductForm.vue b/src/views/erp/product/product/ProductForm.vue
index e013f828..4b2b569d 100644
--- a/src/views/erp/product/product/ProductForm.vue
+++ b/src/views/erp/product/product/ProductForm.vue
@@ -160,7 +160,8 @@ const formData = ref({
   weight: undefined,
   purchasePrice: undefined,
   salePrice: undefined,
-  minPrice: undefined
+  minPrice: undefined,
+  safetyNumber: undefined
 })
 const formRules = reactive({
   name: [{ required: true, message: '产品名称不能为空', trigger: 'blur' }],
diff --git a/src/views/erp/stock/in/components/StockInItemForm.vue b/src/views/erp/stock/in/components/StockInItemForm.vue
index 53a2fd2d..b7543dc3 100644
--- a/src/views/erp/stock/in/components/StockInItemForm.vue
+++ b/src/views/erp/stock/in/components/StockInItemForm.vue
@@ -108,7 +108,7 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="备注" min-width="150">
+      <el-table-column label="备注" fixed="right" min-width="150">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.remark`" class="mb-0px!">
             <el-input v-model="row.remark" placeholder="请输入备注" />
@@ -117,7 +117,9 @@
       </el-table-column>
       <el-table-column align="center" fixed="right" label="操作" width="60">
         <template #default="{ $index }">
-          <el-button @click="handleDelete($index)" link>—</el-button>
+          <el-button type="danger" @click="handleDelete($index)" link>
+            <Icon icon="ep:delete" />
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/erp/stock/out/components/StockOutItemForm.vue b/src/views/erp/stock/out/components/StockOutItemForm.vue
index b09a5695..eb6e1c57 100644
--- a/src/views/erp/stock/out/components/StockOutItemForm.vue
+++ b/src/views/erp/stock/out/components/StockOutItemForm.vue
@@ -108,7 +108,7 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="备注" min-width="150">
+      <el-table-column label="备注" fixed="right" min-width="150">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.remark`" class="mb-0px!">
             <el-input v-model="row.remark" placeholder="请输入备注" />
@@ -117,7 +117,9 @@
       </el-table-column>
       <el-table-column align="center" fixed="right" label="操作" width="60">
         <template #default="{ $index }">
-          <el-button @click="handleDelete($index)" link>—</el-button>
+          <el-button type="danger" @click="handleDelete($index)" link>
+            <Icon icon="ep:delete" />
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/mes/bom/components/BomDetailForm.vue b/src/views/mes/bom/components/BomDetailForm.vue
index 0d54824c..26b7c57a 100644
--- a/src/views/mes/bom/components/BomDetailForm.vue
+++ b/src/views/mes/bom/components/BomDetailForm.vue
@@ -72,9 +72,11 @@
         </template>
       </el-table-column>
       <el-table-column align="center" fixed="right" label="操作" width="60">
-        <el-button type="danger" @click="handleDelete($index)" link>
-          <Icon icon="ep:delete" />
-        </el-button>
+        <template #default="{ $index }">
+          <el-button type="danger" @click="handleDelete($index)" link>
+            <Icon icon="ep:delete" />
+          </el-button>
+        </template>
       </el-table-column>
     </el-table>
   </el-form>