From d49d64789aca6c530e7a455d9da5fc7e2c8f6f71 Mon Sep 17 00:00:00 2001
From: felix <33110464+whdreamgithub@users.noreply.github.com>
Date: Fri, 25 Apr 2025 12:42:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts                     |   2 +
 src/views/crm/product/ProductForm.vue | 103 +++++++++-----------------
 src/views/crm/product/index.vue       |  43 +++++++----
 3 files changed, 65 insertions(+), 83 deletions(-)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 821149923..ba6863cca 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -212,6 +212,8 @@ export enum DICT_TYPE {
   CRM_PERMISSION_LEVEL = 'crm_permission_level', // CRM 数据权限的级别
   CRM_PRODUCT_UNIT = 'crm_product_unit', // CRM 产品单位
   CRM_FOLLOW_UP_TYPE = 'crm_follow_up_type', // CRM 跟进方式
+  CRM_PRODUCT_CATEGORY = "crm_product_category", //CRM 产品类型
+  CRM_PRODUCT_DETAIL_TYPE = "crm_product_detail_type", //CRM 产品明细类型
 
   // ========== ERP - 企业资源计划模块  ==========
   ERP_AUDIT_STATUS = 'erp_audit_status', // ERP 审批状态
diff --git a/src/views/crm/product/ProductForm.vue b/src/views/crm/product/ProductForm.vue
index 1bc5aaca5..98a7fa112 100644
--- a/src/views/crm/product/ProductForm.vue
+++ b/src/views/crm/product/ProductForm.vue
@@ -13,36 +13,33 @@
             <el-input v-model="formData.name" placeholder="请输入产品名称" />
           </el-form-item>
         </el-col>
+
         <el-col :span="12">
-          <el-form-item label="负责人" prop="ownerUserId">
-            <el-select
-              v-model="formData.ownerUserId"
-              placeholder="请选择负责人"
-              :disabled="formData.id"
-              class="w-1/1"
-            >
+          <el-form-item label="产品类型" prop="category">
+            <el-select v-model="formData.category" class="w-1/1" placeholder="请选择产品类型">
               <el-option
-                v-for="user in userList"
-                :key="user.id"
-                :label="user.nickname"
-                :value="user.id"
+                v-for="dict in getIntDictOptions(DICT_TYPE.CRM_PRODUCT_CATEGORY)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
               />
             </el-select>
           </el-form-item>
         </el-col>
+
         <el-col :span="12">
-          <el-form-item label="产品类型" prop="categoryId">
-            <el-cascader
-              v-model="formData.categoryId"
-              :options="productCategoryList"
-              :props="defaultProps"
-              class="w-1/1"
-              clearable
-              placeholder="请选择产品类型"
-              filterable
-            />
+          <el-form-item label="产品明细类型" prop="detailType">
+            <el-select v-model="formData.detailType" class="w-1/1" placeholder="请选择产品明细类型">
+              <el-option
+                v-for="dict in getIntDictOptions(DICT_TYPE.CRM_PRODUCT_DETAIL_TYPE)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
+
         <el-col :span="12">
           <el-form-item label="产品单位" prop="unit">
             <el-select v-model="formData.unit" class="w-1/1" placeholder="请选择单位">
@@ -60,23 +57,7 @@
             <el-input v-model="formData.no" placeholder="请输入产品编码" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="价格" prop="price">
-            <el-input-number
-              v-model="formData.price"
-              placeholder="请输入价格"
-              :min="0"
-              :precision="2"
-              :step="0.1"
-              class="w-full!"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="产品描述" prop="description">
-            <el-input v-model="formData.description" placeholder="请输入产品描述" />
-          </el-form-item>
-        </el-col>
+
         <el-col :span="12">
           <el-form-item label="上架状态" prop="status">
             <el-select v-model="formData.status" placeholder="请选择状态" class="w-1/1">
@@ -89,6 +70,13 @@
             </el-select>
           </el-form-item>
         </el-col>
+
+        <el-col :span="24">
+          <el-form-item label="产品描述" prop="description">
+            <el-input v-model="formData.description" placeholder="请输入产品描述"   type="textarea" :rows="3"/>
+          </el-form-item>
+        </el-col>
+
       </el-row>
     </el-form>
     <template #footer>
@@ -100,10 +88,6 @@
 <script setup lang="ts">
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import * as ProductApi from '@/api/crm/product'
-import * as ProductCategoryApi from '@/api/crm/product/category'
-import { defaultProps, handleTree } from '@/utils/tree'
-import { getSimpleUserList, UserVO } from '@/api/system/user'
-import { useUserStore } from '@/store/modules/user'
 
 defineOptions({ name: 'CrmProductForm' })
 
@@ -114,25 +98,22 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const userId = useUserStore().getUser.id // 当前登录的编号
 const formData = ref({
   id: undefined,
   name: undefined,
   no: undefined,
   unit: undefined,
-  price: Number(undefined),
   status: undefined,
-  categoryId: undefined,
-  description: undefined,
-  ownerUserId: -1
+  category:undefined,
+  detailType:undefined,
+  description: undefined
 })
 const formRules = reactive({
   name: [{ required: true, message: '产品名称不能为空', trigger: 'blur' }],
-  no: [{ required: true, message: '产品编码不能为空', trigger: 'blur' }],
   status: [{ required: true, message: '状态不能为空', trigger: 'change' }],
-  categoryId: [{ required: true, message: '产品分类ID不能为空', trigger: 'blur' }],
-  ownerUserId: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  price: [{ required: true, message: '价格不能为空', trigger: 'blur' }]
+  category: [{ required: true, message: '产品类型不能为空', trigger: 'blur' }],
+  detailType: [{ required: true, message: '产品明细类型不能为空', trigger: 'blur' }],
+  unit: [{ required: true, message: '产品单位不能为空', trigger: 'blur' }]
 })
 
 const formRef = ref() // 表单 Ref
@@ -151,8 +132,6 @@ const open = async (type: string, id?: number) => {
     } finally {
       formLoading.value = false
     }
-  } else {
-    formData.value.ownerUserId = userId
   }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@@ -190,23 +169,13 @@ const resetForm = () => {
     name: undefined,
     no: undefined,
     unit: undefined,
-    price: Number(undefined),
     status: undefined,
-    categoryId: undefined,
-    description: undefined,
-    ownerUserId: -1
+    category:undefined,
+    detailType:undefined,
+    description: undefined
   }
   formRef.value?.resetFields()
 }
 
-/** 初始化 */
-const productCategoryList = ref<any[]>([]) // 产品分类树
-const userList = ref<UserVO[]>([]) // 系统用户
-onMounted(async () => {
-  // 产品分类树
-  const data = await ProductCategoryApi.getProductCategoryList({})
-  productCategoryList.value = handleTree(data, 'id', 'parentId')
-  // 系统用户列表
-  userList.value = await getSimpleUserList()
-})
+
 </script>
diff --git a/src/views/crm/product/index.vue b/src/views/crm/product/index.vue
index 5d656dfd1..aca06ef39 100644
--- a/src/views/crm/product/index.vue
+++ b/src/views/crm/product/index.vue
@@ -52,42 +52,46 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+
+
       <el-table-column label="产品名称" align="center" prop="name" width="160">
+        <!--
         <template #default="scope">
           <el-link :underline="false" type="primary" @click="openDetail(scope.row.id)">
             {{ scope.row.name }}
           </el-link>
         </template>
+        -->
       </el-table-column>
-      <el-table-column label="产品类型" align="center" prop="categoryName" width="160" />
+
+
+      <el-table-column label="产品类型" align="center" prop="category" width="160">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.CRM_PRODUCT_CATEGORY" :value="scope.row.category" />
+        </template>
+      </el-table-column>
+
+      <el-table-column label="产品明细类型" align="center" prop="detailType" width="160">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.CRM_PRODUCT_DETAIL_TYPE" :value="scope.row.detailType" />
+        </template>
+      </el-table-column>
+
       <el-table-column label="产品单位" align="center" prop="unit">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.CRM_PRODUCT_UNIT" :value="scope.row.unit" />
         </template>
       </el-table-column>
       <el-table-column label="产品编码" align="center" prop="no" />
-      <el-table-column
-        label="价格（元）"
-        align="center"
-        prop="price"
-        :formatter="erpPriceTableColumnFormatter"
-        width="100"
-      />
       <el-table-column label="产品描述" align="center" prop="description" width="150" />
       <el-table-column label="上架状态" align="center" prop="status" width="120">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.CRM_PRODUCT_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="负责人" align="center" prop="ownerUserName" width="120" />
-      <el-table-column
-        label="更新时间"
-        align="center"
-        prop="updateTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
+
       <el-table-column label="创建人" align="center" prop="creatorName" width="120" />
+      <el-table-column label="更新人" align="center" prop="updaterName" width="120" />
       <el-table-column
         label="创建时间"
         align="center"
@@ -95,6 +99,13 @@
         :formatter="dateFormatter"
         width="180px"
       />
+      <el-table-column
+        label="更新时间"
+        align="center"
+        prop="updateTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
       <el-table-column label="操作" align="center" fixed="right" width="160">
         <template #default="scope">
           <el-button