feat: business header supports import update

Author: 1myuan

frontend/packages/lib-shared/api/modules/contract.ts

@@ -475,10 +475,10 @@ export default function useContractApi(CDR: CordysAxios) {
   }
 
   // 合同-工商抬头导入
-  function preCheckImportBusinessTitle(file: File) {
+  function preCheckImportBusinessTitle(file: File, importType?: string) {
     return CDR.uploadFile<{ data: ValidateInfo }>(
       { url: PreCheckBusinessTitleImportUrl },
-      { fileList: [file] },
+      { fileList: [file], request: {importType } },
       'file'
     );
   }
@@ -493,8 +493,8 @@ export default function useContractApi(CDR: CordysAxios) {
     );
   }
 
-  function importBusinessTitle(file: File) {
-    return CDR.uploadFile({ url: ImportBusinessTitleUrl }, { fileList: [file] }, 'file');
+  function importBusinessTitle(file: File, importType?: string) {
+    return CDR.uploadFile({ url: ImportBusinessTitleUrl }, { fileList: [file], request: {importType} }, 'file');
   }
 
   // 工商抬头列表

frontend/packages/lib-shared/models/contract.ts

@@ -147,7 +147,9 @@ export interface BusinessTitleItem {
   name: string;
   type: 'THIRD_PARTY' | 'CUSTOM';
   identificationNumber: string;
-  area: string; // 所属地区
+  province: string; // 省
+  city: string; // 市
+  remark: string;
   scale: string; // 企业规模
   industry: string; // 国标行业
   openingBank: string;
@@ -180,7 +182,9 @@ export interface SaveBusinessTitleParams {
   companySize: string; // 公司规模
   registrationNumber: string; //工商注册号
   type: string; // 来源类型
-  area: string; // 所属地区
+  province: string; // 省
+  city: string; // 市
+  remark: string;
   scale: string; // 企业规模
   industry: string; // 国标行业
 }

frontend/packages/web/src/components/business/crm-import-button/components/importModal.vue

@@ -22,6 +22,40 @@
           </div>
         </div>
       </n-alert>
+      <n-radio-group v-if="props.showImportRadio" v-model:value="importType" class="mb-[16px]" name="radiogroup">
+        <n-space class="!gap-[24px]">
+          <n-radio key="ADD" value="ADD">
+            <div class="flex items-center gap-[8px]">
+              {{ t('crmImportButton.importNew') }}
+              <n-tooltip trigger="hover" placement="right">
+                <template #trigger>
+                  <CrmIcon
+                    type="iconicon_help_circle"
+                    :size="16"
+                    class="cursor-pointer text-[var(--text-n4)] hover:text-[var(--primary-1)]"
+                  />
+                </template>
+                {{ t('crmImportButton.importNew.tooltip') }}
+              </n-tooltip>
+            </div>
+          </n-radio>
+          <n-radio key="UPDATE" value="UPDATE">
+            <div class="flex items-center gap-[8px]">
+              {{ t('crmImportButton.importUpdates') }}
+              <n-tooltip trigger="hover" placement="right">
+                <template #trigger>
+                  <CrmIcon
+                    type="iconicon_help_circle"
+                    :size="16"
+                    class="cursor-pointer text-[var(--text-n4)] hover:text-[var(--primary-1)]"
+                  />
+                </template>
+                {{ t('crmImportButton.importUpdates.tooltip') }}
+              </n-tooltip>
+            </div>
+          </n-radio>
+        </n-space>
+      </n-radio-group>
       <CrmUpload
         v-model:file-list="fileList"
         :is-all-screen="true"
@@ -38,7 +72,7 @@
 
 <script setup lang="ts">
   import { ref } from 'vue';
-  import { NAlert, useMessage } from 'naive-ui';
+  import { NAlert, NRadio, NRadioGroup, NSpace, NTooltip, useMessage } from 'naive-ui';
 
   import { useI18n } from '@lib/shared/hooks/useI18n';
   import useLocale from '@lib/shared/locale/useLocale';
@@ -58,10 +92,11 @@
     title?: string; // 标题
     descriptionTip?: string; // 描述提示内容
     downloadTemplateApi?: () => Promise<any>; // 下载模板Api
+    showImportRadio?: boolean;
   }>();
 
   const emit = defineEmits<{
-    (e: 'validate', files: CrmFileItem[]): void;
+    (e: 'validate', files: CrmFileItem[], importType?: string): void;
     (e: 'close'): void;
   }>();
 
@@ -71,10 +106,12 @@
   });
 
   const fileList = ref<CrmFileItem[]>([]);
+  const importType = ref('ADD');
 
   function cancel() {
     showModal.value = false;
     fileList.value = [];
+    importType.value = 'ADD';
     emit('close');
   }
 
@@ -109,7 +146,7 @@
   const validateLoading = ref<boolean>(false);
 
   function validate() {
-    emit('validate', fileList.value);
+    emit('validate', fileList.value, importType.value);
   }
 </script>
 

frontend/packages/web/src/components/business/crm-import-button/index.vue

@@ -9,6 +9,7 @@
     :description-tip="props.descriptionTip"
     :confirm-loading="validateLoading"
     :download-template-api="importApiMap[props.apiType]?.download"
+    :show-import-radio="props.showImportRadio"
     @validate="validateTemplate"
   />
 
@@ -54,6 +55,7 @@
     title?: string;
     buttonText?: string;
     descriptionTip?: string; // 描述提示
+    showImportRadio?: boolean; // 导入新建和导入更新
   }>();
 
   const emit = defineEmits<{
@@ -94,11 +96,12 @@
   // 导入
   const fileList = ref<CrmFileItem[]>([]);
   const importLoading = ref<boolean>(false);
+  const importType = ref('');
 
   async function importHandler() {
     try {
       importLoading.value = true;
-      await importApiMap[props.apiType].save(fileList.value[0].file as File);
+      await importApiMap[props.apiType].save(fileList.value[0].file as File, importType.value);
       Message.success(t('common.importSuccess'));
 
       emit('importSuccess');
@@ -113,8 +116,11 @@
   }
 
   // 校验导入模板
-  async function validateTemplate(files: CrmFileItem[]) {
+  async function validateTemplate(files: CrmFileItem[], type?: string) {
     fileList.value = files;
+    if (type) {
+      importType.value = type;
+    }
     const file = fileList.value[0].file as File;
 
     // 防止修改后未上传就校验
@@ -134,7 +140,7 @@
       validateModal.value = true;
       start();
 
-      const result = await importApiMap[props.apiType].preCheck(file);
+      const result = await importApiMap[props.apiType].preCheck(file, type);
       validateInfo.value = result.data;
       finish();
     } catch (error) {

frontend/packages/web/src/components/business/crm-import-button/locale/en-US.ts

@@ -20,4 +20,10 @@ export default {
   'crmImportButton.formExcelImport': 'Import from Excel file',
   'crmImportButton.onlyAllowFileTypeTip': 'Only files in xls/xlsx format are supported',
   'crmImportButton.fileChange': 'The file has been modified. Please re-upload it',
+  'crmImportButton.importNew': 'Import new',
+  'crmImportButton.importNew.tooltip':
+    'Company name is unique. If multiple duplicate records exist, only the first one will be imported.',
+  'crmImportButton.importUpdates': 'Import updates',
+  'crmImportButton.importUpdates.tooltip':
+    'After matching by company name, columns with valid values in the Excel file will overwrite the corresponding records in the system.',
 };

frontend/packages/web/src/components/business/crm-import-button/locale/zh-CN.ts

@@ -18,5 +18,8 @@ export default {
   'crmImportButton.importErrorData': '导入失败数据',
   'crmImportButton.formExcelImport': '从 Excel 文件导入',
   'crmImportButton.onlyAllowFileTypeTip': '仅支持 xls/xlsx 格式的文件',
-  'crmImportButton.fileChange': '文件已被修改，请重新上传',
+  'crmImportButton.importNew': '导入新建',
+  'crmImportButton.importNew.tooltip': '公司名称唯一，若存在多条重复信息，仅导入第一条。',
+  'crmImportButton.importUpdates': '导入更新',
+  'crmImportButton.importUpdates.tooltip': '系统按公司名称匹配成功后，Excel 中存在有效值的列将覆盖系统对应记录。',
 };

frontend/packages/web/src/components/business/crm-import-button/utils.ts

@@ -40,8 +40,8 @@ export type ImportApiType =
   | ImportTypeExcludeFormDesignEnum.CONTRACT_BUSINESS_TITLE_IMPORT;
 
 export interface importRequestType {
-  preCheck: (file: File) => Promise<{ data: ValidateInfo }>;
-  save: (file: File) => Promise<any>;
+  preCheck: (file: File, importType?: string) => Promise<{ data: ValidateInfo }>;
+  save: (file: File, importType?: string) => Promise<any>;
   download?: () => Promise<File>;
 }
 

frontend/packages/web/src/config/contract.ts

@@ -159,8 +159,12 @@ export const businessTitleFormConfigList: {
     value: 'registrationNumber',
   },
   {
-    label: t('contract.businessTitle.area'),
-    value: 'area',
+    label: t('contract.businessTitle.province'),
+    value: 'province',
+  },
+  {
+    label: t('contract.businessTitle.city'),
+    value: 'city',
   },
   {
     label: t('contract.businessTitle.scale'),
@@ -170,6 +174,10 @@ export const businessTitleFormConfigList: {
     label: t('contract.businessTitle.industry'),
     value: 'industry',
   },
+  {
+    label: t('common.remark'),
+    value: 'remark',
+  },
 ];
 
 export const allBusinessTitleFormConfigList: {

frontend/packages/web/src/views/contract/businessTitle/components/businessTitleTable.vue

@@ -21,6 +21,7 @@
         <CrmImportButton
           v-if="hasAnyPermission(['CONTRACT_BUSINESS_TITLE:IMPORT'])"
           :api-type="ImportTypeExcludeFormDesignEnum.CONTRACT_BUSINESS_TITLE_IMPORT"
+          showImportRadio
           :title="t('module.businessTitle')"
           @import-success="() => searchData()"
         />
@@ -344,8 +345,18 @@
       width: 200,
     },
     {
-      title: t('contract.businessTitle.area'),
-      key: 'area',
+      title: t('contract.businessTitle.province'),
+      key: 'province',
+      sortOrder: false,
+      sorter: true,
+      ellipsis: {
+        tooltip: true,
+      },
+      width: 200,
+    },
+    {
+      title: t('contract.businessTitle.city'),
+      key: 'city',
       sortOrder: false,
       sorter: true,
       ellipsis: {
@@ -373,6 +384,16 @@
       },
       width: 200,
     },
+    {
+      title: t('common.remark'),
+      key: 'remark',
+      sortOrder: false,
+      sorter: true,
+      ellipsis: {
+        tooltip: true,
+      },
+      width: 200,
+    },
     {
       title: t('common.createTime'),
       key: 'createTime',
@@ -539,8 +560,13 @@
       type: FieldTypeEnum.INPUT,
     },
     {
-      title: t('contract.businessTitle.area'),
-      dataIndex: 'area',
+      title: t('contract.businessTitle.province'),
+      dataIndex: 'province',
+      type: FieldTypeEnum.INPUT,
+    },
+    {
+      title: t('contract.businessTitle.city'),
+      dataIndex: 'city',
       type: FieldTypeEnum.INPUT,
     },
     {
@@ -553,6 +579,11 @@
       dataIndex: 'industry',
       type: FieldTypeEnum.INPUT,
     },
+    {
+      title: t('common.remark'),
+      dataIndex: 'remark',
+      type: FieldTypeEnum.INPUT,
+    },
     ...baseFilterConfigList,
   ]);
 

frontend/packages/web/src/views/contract/businessTitle/config.ts

@@ -15,7 +15,9 @@ export const initBusinessTitleForm: SaveBusinessTitleParams = {
   companySize: '',
   registrationNumber: '',
   registrationAddress: '',
-  area: '',
+  province: '', // 省
+  city: '', // 市
+  remark: '',
   scale: '',
   industry: '',
 };