From c7875d74c355f2e72289947f94b62bf789d40480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B2=A1=E9=92=B1?= <shenzehai@163.com>
Date: Fri, 7 Mar 2025 16:12:09 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=90=E5=88=B6=E4=BA=A7=E5=93=81=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E5=8F=AF=E9=80=89=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts                             |  4 ++
 .../ProductCategoryPropertiesForm.vue         | 62 ++++++++++++++-----
 .../productcategoryproperties/index.vue       | 49 ++++++++-------
 3 files changed, 77 insertions(+), 38 deletions(-)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 5194de3f1..8048645f1 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -220,6 +220,10 @@ export enum DICT_TYPE {
   ERP_FILE_ORDER_TYPE = 'erp_file_order_type', // 文件单据类型
   ERP_ORDER_PRE_STATUS = 'erp_order_pre_status', // 订单预报价单状态
   ERP_PRODUCT_PROPERTIES_CATEGORY = 'erp_product_properties_category', // 产品属性的分类
+  ERP_PRODUCT_PROPERTIES = 'erp_product_properties', // 产品配件属性
+  ERP_PRODUCT_COMMON_PROPERTIES = 'erp_product_common_properties', // 产品普通属性
+  ERP_PRODUCT_INPUT_PROPERTIES = 'erp_product_input_properties', // 产品输入属性
+
 
 
   // ========== AI - 人工智能模块  ==========
diff --git a/src/views/erp/product/category/productcategoryproperties/ProductCategoryPropertiesForm.vue b/src/views/erp/product/category/productcategoryproperties/ProductCategoryPropertiesForm.vue
index cf906b632..2fae91cb0 100644
--- a/src/views/erp/product/category/productcategoryproperties/ProductCategoryPropertiesForm.vue
+++ b/src/views/erp/product/category/productcategoryproperties/ProductCategoryPropertiesForm.vue
@@ -18,6 +18,16 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="属性分类" prop="productPropertiesCategory">
+        <el-radio-group v-model="formData.productPropertiesCategory">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.ERP_PRODUCT_PROPERTIES_CATEGORY)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-radio-group>
+      </el-form-item>
       <el-form-item label="单数属性" prop="ifSingleProperty">
         <el-radio-group v-model="formData.ifSingleProperty">
           <el-radio
@@ -30,11 +40,42 @@
        
       </el-form-item>
       <el-form-item label="属性英文" prop="productPropertiesEn">
-        <el-input v-model="formData.productPropertiesEn" placeholder="请输入设备属性英文" />
-      </el-form-item>
-      <el-form-item label="属性中文" prop="productPropertiesCn">
-        <el-input v-model="formData.productPropertiesCn" placeholder="请输入设备属性中文" />
+        <el-select
+          v-model="formData.productPropertiesEn"
+          placeholder="请选择属性英文"
+          clearable
+          class="!w-240px"
+        >
+        <div v-if="formData.productPropertiesCategory===0">
+       
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.ERP_PRODUCT_COMMON_PROPERTIES)"
+            :key="dict.value"
+            :label="dict.value+'#'+dict.label"
+            :value="dict.value"
+          />
+        </div>
+        <div v-else-if="formData.productPropertiesCategory===1">
+
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.ERP_PRODUCT_PROPERTIES)"
+            :key="dict.value"
+            :label="dict.value+'#'+dict.label"
+            :value="dict.value"
+          />
+        </div>
+          <div v-else-if="formData.productPropertiesCategory===2">
+            <el-option
+              v-for="dict in getStrDictOptions(DICT_TYPE.ERP_PRODUCT_INPUT_PROPERTIES)"
+              :key="dict.value"
+              :label="dict.value+'#'+dict.label"
+              :value="dict.value"
+            />
+          </div>
+        </el-select>
+
       </el-form-item>
+     
       <el-form-item label="必填" prop="ifRequired">
         <el-radio-group v-model="formData.ifRequired">
           <el-radio
@@ -45,16 +86,7 @@
           />
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="属性分类" prop="productPropertiesCategory">
-        <el-radio-group v-model="formData.productPropertiesCategory">
-          <el-radio
-            v-for="dict in getBoolDictOptions(DICT_TYPE.ERP_PRODUCT_PROPERTIES_CATEGORY)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-radio-group>
-      </el-form-item>
+     
       <el-form-item label="记录sn" prop="ifSn">
         <el-radio-group v-model="formData.ifSn">
           <el-radio
@@ -74,7 +106,7 @@
 </template>
 <script setup lang="ts">
 import { defineProps } from 'vue';
-import { getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
+import { getBoolDictOptions,getStrDictOptions,getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import { ProductCategoryPropertiesApi, ProductCategoryPropertiesVO } from '@/api/erp/product/category/productcategoryproperties'
 import { ProductCategoryVO } from '@/api/erp/product/category'
 
diff --git a/src/views/erp/product/category/productcategoryproperties/index.vue b/src/views/erp/product/category/productcategoryproperties/index.vue
index e322d41a7..24ce95ee2 100644
--- a/src/views/erp/product/category/productcategoryproperties/index.vue
+++ b/src/views/erp/product/category/productcategoryproperties/index.vue
@@ -24,19 +24,25 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="属性英文" prop="productPropertiesEn">
-        <el-input
-          v-model="queryParams.productPropertiesEn"
-          placeholder="请输入设备属性英文"
+      <el-form-item label="属性分类" prop="productPropertiesCategory">
+        <el-select
+          v-model="queryParams.productPropertiesCategory"
+          placeholder="请选择属性分类"
           clearable
-          @keyup.enter="handleQuery"
           class="!w-240px"
-        />
+        >
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.ERP_PRODUCT_PROPERTIES_CATEGORY)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="单数属性" prop="ifSingleProperty">
         <el-select
           v-model="queryParams.ifSingleProperty"
-          placeholder="请选择单身属性"
+          placeholder="请选择单数属性"
           clearable
           class="!w-240px"
         >
@@ -48,6 +54,16 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="属性英文" prop="productPropertiesEn">
+        <el-input
+          v-model="queryParams.productPropertiesEn"
+          placeholder="请输入设备属性英文"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+    
       <el-form-item label="属性中文" prop="productPropertiesCn">
         <el-input
           v-model="queryParams.productPropertiesCn"
@@ -56,6 +72,7 @@
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
+
       </el-form-item>
       <el-form-item label="必填" prop="ifRequired">
         <el-select
@@ -72,21 +89,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="属性分类" prop="productPropertiesCategory">
-        <el-select
-          v-model="queryParams.productPropertiesCategory"
-          placeholder="请选择属性分类"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getBoolDictOptions(DICT_TYPE.ERP_PRODUCT_PROPERTIES_CATEGORY)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+   
       <el-form-item label="记录sn" prop="ifSn">
         <el-select
           v-model="queryParams.ifSn"
@@ -210,7 +213,7 @@
 </template>
 
 <script setup lang="ts">
-import { getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
+import { getBoolDictOptions,getStrDictOptions, DICT_TYPE } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { ProductCategoryPropertiesApi, ProductCategoryPropertiesVO } from '@/api/erp/product/category/productcategoryproperties'