feat：产品物料分类-添加产品/物料类型

src/api/erp/product/category/index.ts

@@ -8,13 +8,14 @@ export interface ProductCategoryVO {
   code: string // 分类编码
   sort: number // 分类排序
   status: number // 开启状态
+  type: number // 类型
 }
 
 // ERP 产品分类 API
 export const ProductCategoryApi = {
   // 查询产品分类列表
-  getProductCategoryList: async () => {
-    return await request.get({ url: `/erp/product-category/list` })
+  getProductCategoryList: async (type?: number) => {
+    return await request.get({ url: `/erp/product-category/list`, params: { type } })
   },
 
   // 查询产品分类精简列表

src/locales/en.ts

@@ -1990,17 +1990,19 @@ export default {
       dialogCodePlaceholder: 'Please enter code',
       dialogNameLabel: 'Name',
       dialogNamePlaceholder: 'Please enter name',
+      dialogTypeLabel: 'Type',
       dialogSortLabel: 'Sort',
       dialogSortPlaceholder: 'Please enter sort',
       dialogStatusLabel: 'Status',
       dialogCancelButton: 'Cancel',
       dialogSubmitButton: 'Confirm',
-      treeRootName: 'Top Product Category',
+      treeRootName: 'Top Category',
       validatorParentRequired: 'Parent category can not be empty',
       validatorNameRequired: 'Name can not be empty',
       validatorCodeRequired: 'Code can not be empty',
       validatorSortRequired: 'Sort can not be empty',
-      validatorStatusRequired: 'Status can not be empty'
+      validatorStatusRequired: 'Status can not be empty',
+      validatorTypeRequired: 'Type can not be empty'
     },
     ProductInformation: {
       moduleName: 'Product Material Information',

src/locales/zh-CN.ts

@@ -2855,17 +2855,19 @@ export default {
       dialogCodePlaceholder: '请输入编码',
       dialogNameLabel: '名称',
       dialogNamePlaceholder: '请输入名称',
+      dialogTypeLabel: '类型',
       dialogSortLabel: '排序',
       dialogSortPlaceholder: '请输入排序',
       dialogStatusLabel: '状态',
       dialogCancelButton: '取 消',
       dialogSubmitButton: '确 定',
-      treeRootName: '顶级产品分类',
+      treeRootName: '顶级分类',
       validatorParentRequired: '上级编号不能为空',
       validatorNameRequired: '名称不能为空',
       validatorCodeRequired: '编码不能为空',
       validatorSortRequired: '排序不能为空',
-      validatorStatusRequired: '状态不能为空'
+      validatorStatusRequired: '状态不能为空',
+      validatorTypeRequired: '类型不能为空'
     },
     ProductInformation: {
       moduleName: '产品物料信息',

src/utils/dict.ts

@@ -234,6 +234,7 @@ export enum DICT_TYPE {
   ERP_AUTOCODE_PADDING_TYPE = "erp_autocode_padding_type",
   ERP_AUTOCODE_CYCLEMETHOD = "erp_autocode_cyclemethod",
   ERP_AUTOCODE_PARTTYPE = "erp_autocode_parttype",
+  MATERIAL_CLASSIFICATION_TYPE = 'material_classification_type',
 
 
 // ========== MES - 生产管理模块  ==========

src/views/erp/product/category/ProductCategoryForm.vue

@@ -7,6 +7,17 @@
       label-width="120px"
       v-loading="formLoading"
     >
+      <el-form-item :label="t('FactoryModeling.ProductCategory.dialogTypeLabel')" prop="type">
+        <el-radio-group v-model="formData.type" @change="handleTypeChange">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.MATERIAL_CLASSIFICATION_TYPE)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
       <el-form-item :label="t('FactoryModeling.ProductCategory.dialogParentLabel')" prop="parentId">
         <el-tree-select
           v-model="formData.parentId"
@@ -22,7 +33,7 @@
       </el-form-item>
       <el-form-item :label="t('FactoryModeling.ProductCategory.dialogNameLabel')" prop="name">
         <el-input v-model="formData.name" :placeholder="t('FactoryModeling.ProductCategory.dialogNamePlaceholder')" />
-      </el-form-item> 
+      </el-form-item>
       <el-form-item :label="t('FactoryModeling.ProductCategory.dialogSortLabel')" prop="sort">
         <el-input-number v-model="formData.sort" :placeholder="t('FactoryModeling.ProductCategory.dialogSortPlaceholder')" class="!w-full" :min="0"/>
       </el-form-item>
@@ -66,14 +77,16 @@ const formData = ref({
   name: undefined,
   code: undefined,
   sort: undefined,
-  status: CommonStatusEnum.ENABLE
+  status: CommonStatusEnum.ENABLE,
+  type: undefined
 })
 const formRules = reactive({
   parentId: [{ required: true, message: t('FactoryModeling.ProductCategory.validatorParentRequired'), trigger: 'blur' }],
   name: [{ required: true, message: t('FactoryModeling.ProductCategory.validatorNameRequired'), trigger: 'blur' }],
   code: [{ required: true, message: t('FactoryModeling.ProductCategory.validatorCodeRequired'), trigger: 'blur' }],
   sort: [{ required: true, message: t('FactoryModeling.ProductCategory.validatorSortRequired'), trigger: 'blur' }],
-  status: [{ required: true, message: t('FactoryModeling.ProductCategory.validatorStatusRequired'), trigger: 'blur' }]
+  status: [{ required: true, message: t('FactoryModeling.ProductCategory.validatorStatusRequired'), trigger: 'blur' }],
+  type: [{ required: true, message: t('FactoryModeling.ProductCategory.validatorTypeRequired'), trigger: 'change' }]
 })
 const formRef = ref() // 表单 Ref
 const productCategoryTree = ref() // 树形结构
@@ -84,6 +97,12 @@ const open = async (type: string, id?: number) => {
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+  if (!id) {
+    const typeOptions = getIntDictOptions(DICT_TYPE.MATERIAL_CLASSIFICATION_TYPE)
+    if (typeOptions.length > 0) {
+      formData.value.type = typeOptions[0].value
+    }
+  }
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
@@ -129,7 +148,8 @@ const resetForm = () => {
     name: undefined,
     code: undefined,
     sort: undefined,
-    status: CommonStatusEnum.ENABLE
+    status: CommonStatusEnum.ENABLE,
+    type: undefined
   }
   formRef.value?.resetFields()
 }
@@ -137,9 +157,15 @@ const resetForm = () => {
 /** 获得产品分类树 */
 const getProductCategoryTree = async () => {
   productCategoryTree.value = []
-  const data = await ProductCategoryApi.getProductCategoryList()
+  const data = await ProductCategoryApi.getProductCategoryList(formData.value.type)
   const root: Tree = { id: 0, name: t('FactoryModeling.ProductCategory.treeRootName'), children: [] }
   root.children = handleTree(data, 'id', 'parentId')
   productCategoryTree.value.push(root)
 }
+
+/** 类型变更时刷新上级编号树 */
+const handleTypeChange = async () => {
+  formData.value.parentId = undefined
+  await getProductCategoryTree()
+}
 </script>

src/views/erp/product/category/index.vue

@@ -61,6 +61,14 @@
 
   <!-- 列表 -->
   <ContentWrap>
+    <el-tabs v-model="activeTab" @tab-change="handleTabChange">
+      <el-tab-pane
+        v-for="dict in getIntDictOptions(DICT_TYPE.MATERIAL_CLASSIFICATION_TYPE)"
+        :key="dict.value"
+        :label="dict.label"
+        :name="String(dict.value)"
+      />
+    </el-tabs>
     <el-table
       v-loading="loading"
       :data="list"
@@ -136,9 +144,11 @@ const { t } = useI18n() // 国际化
 
 const loading = ref(true) // 列表的加载中
 const list = ref<ProductCategoryVO[]>([]) // 列表的数据
+const activeTab = ref('') // 激活的 tab
 const queryParams = reactive({
   name: undefined,
-  status: undefined
+  status: undefined,
+  type: undefined
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
@@ -147,7 +157,7 @@ const exportLoading = ref(false) // 导出的加载中
 const getList = async () => {
   loading.value = true
   try {
-    const data = await ProductCategoryApi.getProductCategoryList(queryParams)
+    const data = await ProductCategoryApi.getProductCategoryList(queryParams.type)
     list.value = handleTree(data, 'id', 'parentId')
   } finally {
     loading.value = false
@@ -160,6 +170,12 @@ const handleQuery = () => {
   getList()
 }
 
+/** Tab 切换操作 */
+const handleTabChange = (name: string) => {
+  queryParams.type = name ? Number(name) : undefined
+  getList()
+}
+
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value.resetFields()
@@ -212,6 +228,11 @@ const toggleExpandAll = async () => {
 
 /** 初始化 **/
 onMounted(() => {
+  const typeOptions = getIntDictOptions(DICT_TYPE.MATERIAL_CLASSIFICATION_TYPE)
+  if (typeOptions.length > 0) {
+    activeTab.value = String(typeOptions[0].value)
+    queryParams.type = typeOptions[0].value
+  }
   getList()
 })
 </script>