fix: 将所有相关字段和注释中的“渠道商”更改为“经销商”，以统一术语

apps/web-ele/src/views/examine-manage/examine-coupon/order-coupon-form.vue

@@ -61,7 +61,7 @@ async function fetchCouponDetail(coupon2sid: string) {
     const detailData = await getCoupon2AuditDetailApi({ coupon2sid });
     couponDetailData.value = detailData;
 
-    // 获取渠道商详情
+    // 获取经销商详情
     if (detailData && detailData.coupon2merchantid) {
       try {
         const merchantData = await getCustomerDetailApi({
@@ -69,7 +69,7 @@ async function fetchCouponDetail(coupon2sid: string) {
         });
         merchantDetailData.value = merchantData;
       } catch (error) {
-        console.error('获取渠道商详情失败:', error);
+        console.error('获取经销商详情失败:', error);
         merchantDetailData.value = null;
       }
     }

apps/web-ele/src/views/examine-manage/examine-subsidy/form.vue

@@ -37,19 +37,19 @@ const [BaseForm, baseFormApi] = useVbenForm({
   },
   wrapperClass: 'grid-cols-1 lg:grid-cols-2',
   schema: [
-    // { title: '渠道商ID', field: 'subsidyapplicationsmerchantid' },
+    // { title: '经销商ID', field: 'subsidyapplicationsmerchantid' },
     // { title: '补贴金额', field: 'subsidyapplicationssubsidyamount' },
     // { title: '审批状态', field: 'subsidyapplicationsapprovalstatus' },
     // { title: '申请日期', field: 'subsidyapplicationsapplydate' },
     {
       component: 'Input',
       fieldName: 'subsidyapplicationsmerchantid',
-      label: '渠道商ID',
+      label: '经销商ID',
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         allowClear: true,
       },
-      rules: z.string().min(1, { message: '请输入渠道商ID' }),
+      rules: z.string().min(1, { message: '请输入经销商ID' }),
     },
     {
       component: 'Input',

apps/web-ele/src/views/examine-manage/examine-subsidy/index.vue

@@ -23,7 +23,7 @@ const formOptions: VbenFormProps = {
     {
       component: 'Input',
       fieldName: 'subsidyapplicationsmerchantid',
-      label: '渠道商ID',
+      label: '经销商ID',
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         allowClear: true,
@@ -68,7 +68,7 @@ const gridOptions: VxeGridProps<any> = {
   columns: [
     { title: '补贴申请ID', field: 'subsidyapplicationsid', sortable: true },
     {
-      title: '渠道商ID',
+      title: '经销商ID',
       field: 'subsidyapplicationsmerchantid',
       sortable: true,
     },

apps/web-ele/src/views/product-manage/form.vue

@@ -30,7 +30,7 @@ const scqyOptions = ref<{ label: string; value: string }[]>([]);
 const jjlxOptions = ref<{ label: string; value: string }[]>([]);
 const cplbOptions = ref<{ label: string; value: string }[]>([]);
 
-// 获取渠道商列表
+// 获取经销商列表
 const fetchChannelOptions = async () => {
   try {
     // 确保清空之前的选项
@@ -45,12 +45,12 @@ const fetchChannelOptions = async () => {
     // 从response.Data中获取数据
     if (response && response.Data && Array.isArray(response.Data)) {
       channelOptions.value = response.Data.map((item: any) => ({
-        label: item.usersname || '未命名渠道商',
+        label: item.usersname || '未命名经销商',
         value: item.usersid || '',
       })).filter((item: any) => item.value);
     }
   } catch (error) {
-    console.error('获取渠道商列表失败', error);
+    console.error('获取经销商列表失败', error);
   }
 };
 
@@ -105,7 +105,7 @@ const titleMap = {
 
 const getTitle = computed(() => titleMap[formType.value]);
 
-// 判断是否有默认的渠道商ID
+// 判断是否有默认的经销商ID
 const hasDefaultMerchantId = computed(() => {
   return (
     props.defaultMerchantId &&
@@ -216,20 +216,20 @@ const [BaseForm, baseFormApi] = useVbenForm({
     {
       component: 'Select',
       fieldName: 'productsmerchantid',
-      label: '关联渠道商',
+      label: '关联经销商',
       componentProps: {
-        placeholder: '请选择关联渠道商',
+        placeholder: '请选择关联经销商',
         options: channelOptions,
         multiple: true,
         collapseTags: true,
         collapseTagsTooltip: true,
         clearable: true,
         filterable: true,
-        noDataText: '暂无渠道商数据',
+        noDataText: '暂无经销商数据',
         loading: false,
         style: { width: '100%' },
       },
-      rules: z.array(z.string()).min(1, { message: '请选择关联渠道商' }),
+      rules: z.array(z.string()).min(1, { message: '请选择关联经销商' }),
       // 使用dependencies控制字段显示
       dependencies: {
         triggerFields: ['productsname'], // 依赖产品名称字段来触发重新计算
@@ -367,14 +367,14 @@ const [Modal, modalApi] = useVbenModal({
         commonConfig: { disabled: formType.value === 'detail' },
       });
 
-      // 获取渠道商列表和生产企业列表
+      // 获取经销商列表和生产企业列表
       await Promise.all([
         fetchChannelOptions(),
         fetchScqyOptions(),
         fetchDictOptions(),
       ]);
 
-      // 如果有默认的渠道商ID，设置默认值
+      // 如果有默认的经销商ID，设置默认值
       if (hasDefaultMerchantId.value && data.value.formType === 'create') {
         // 设置默认值
         baseFormApi.setValues({

apps/web-ele/src/views/product-manage/index.vue

@@ -305,7 +305,7 @@ function handleAddLinkFinish() {
   <Page auto-content-height>
     <Grid table-title="产品列表">
       <template #toolbar-tools>
-        <!--区别： 新增- 新增产品， 新增关联-新增产品和渠道商关联 -->
+        <!--区别： 新增- 新增产品， 新增关联-新增产品和经销商关联 -->
         <el-button
           type="primary"
           @click="handleCreate"

apps/web-ele/src/views/subsidy-manage/form.vue

@@ -37,19 +37,19 @@ const [BaseForm, baseFormApi] = useVbenForm({
   },
   wrapperClass: 'grid-cols-1 lg:grid-cols-2',
   schema: [
-    // { title: '渠道商ID', field: 'subsidyapplicationsmerchantid' },
+    // { title: '经销商ID', field: 'subsidyapplicationsmerchantid' },
     // { title: '补贴金额', field: 'subsidyapplicationssubsidyamount' },
     // { title: '审批状态', field: 'subsidyapplicationsapprovalstatus' },
     // { title: '申请日期', field: 'subsidyapplicationsapplydate' },
     {
       component: 'Input',
       fieldName: 'subsidyapplicationsmerchantid',
-      label: '渠道商ID',
+      label: '经销商ID',
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         allowClear: true,
       },
-      rules: z.string().min(1, { message: '请输入渠道商ID' }),
+      rules: z.string().min(1, { message: '请输入经销商ID' }),
     },
     {
       component: 'Input',

apps/web-ele/src/views/subsidy-manage/index.vue

@@ -23,7 +23,7 @@ const formOptions: VbenFormProps = {
     {
       component: 'Input',
       fieldName: 'subsidyapplicationsmerchantid',
-      label: '渠道商ID',
+      label: '经销商ID',
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         allowClear: true,
@@ -68,7 +68,7 @@ const gridOptions: VxeGridProps<any> = {
   columns: [
     { title: '补贴申请ID', field: 'subsidyapplicationsid', sortable: true },
     {
-      title: '渠道商ID',
+      title: '经销商ID',
       field: 'subsidyapplicationsmerchantid',
       sortable: true,
     },

packages/types/src/product.ts

@@ -6,7 +6,7 @@
 //   `productsprice` decimal(10,2) DEFAULT NULL COMMENT '产品原价',
 //   `productsmodel` varchar(50) DEFAULT NULL COMMENT '产品型号',
 //   `productssn` varchar(50) DEFAULT NULL COMMENT '产品sn号',
-//   `productsmerchantid` varchar(50) DEFAULT NULL COMMENT '关联渠道商ID',
+//   `productsmerchantid` varchar(50) DEFAULT NULL COMMENT '关联经销商ID',
 //   `productsdate` datetime DEFAULT NULL COMMENT '创建时间',
 //   `productsscqyid` varchar(50) DEFAULT NULL COMMENT '关联生产企业id',
 //   `productsfl1` varchar(50) DEFAULT NULL COMMENT '产品一级分类',
@@ -35,7 +35,7 @@ interface ProductEntity {
   productsmodel: string;
   /** 产品sn号 */
   productssn: string;
-  /** 关联渠道商ID */
+  /** 关联经销商ID */
   productsmerchantid: string;
   /** 创建时间 */
   productsdate: string;

packages/types/src/subsidyapplications.ts

@@ -1,8 +1,8 @@
 /** 补贴申请表*/
 // CREATE TABLE `subsidyapplications` (
 //   `subsidyapplicationsid` varchar(50) NOT NULL COMMENT '补贴申请唯一标识符（主键）',
-//   `subsidyapplicationsmerchantid` varchar(50) DEFAULT NULL COMMENT '渠道商ID',
-//   `subsidyapplicationstotalsales` decimal(10,2) DEFAULT NULL COMMENT '渠道商累计销售金额',
+//   `subsidyapplicationsmerchantid` varchar(50) DEFAULT NULL COMMENT '经销商ID',
+//   `subsidyapplicationstotalsales` decimal(10,2) DEFAULT NULL COMMENT '经销商累计销售金额',
 //   `subsidyapplicationssubsidyamount` decimal(10,2) DEFAULT NULL COMMENT '补贴金额',
 //   `subsidyapplicationsapprovalstatus` tinyint(2) DEFAULT NULL COMMENT '审批状态（0：待审核，1：已通过，2：已拒绝）',
 //   `subsidyapplicationsapplydate` datetime DEFAULT NULL COMMENT '申请日期',
@@ -14,9 +14,9 @@
 interface SubsidyApplicationsEntity {
   /** 补贴申请唯一标识符（主键） */
   subsidyapplicationsid: string;
-  /** 渠道商ID */
+  /** 经销商ID */
   subsidyapplicationsmerchantid: string;
-  /** 渠道商累计销售金额 */
+  /** 经销商累计销售金额 */
   subsidyapplicationstotalsales: number;
   /** 补贴金额 */
   subsidyapplicationssubsidyamount: number;