From 89eca80eaf4a75b512b0074c0fecc194162c3530 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 12 九月 2025 17:35:39 +0800
Subject: [PATCH] Merge branch 'master' into dev-v1.1

---
 src/views/EnterpriseManage/EnterpriseManageList.vue |  145 ++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 120 insertions(+), 25 deletions(-)

diff --git a/src/views/EnterpriseManage/EnterpriseManageList.vue b/src/views/EnterpriseManage/EnterpriseManageList.vue
index 6fbeabb..3ea8079 100644
--- a/src/views/EnterpriseManage/EnterpriseManageList.vue
+++ b/src/views/EnterpriseManage/EnterpriseManageList.vue
@@ -52,12 +52,15 @@
   useTable,
   useFormDialog,
   FieldRadio,
+  UploadUserFile,
 } from '@bole-core/components';
 import { useAccess, useGlobalEventContext } from '@/hooks';
 import { EnterpriseConfigureType, IsConfiguredText } from '@/constants';
 import ConfigureDialog from './components/ConfigureDialog.vue';
 import { Message } from '@bole-core/core';
 import * as enterpriseServices from '@/services/api/enterprise';
+import * as enterpriseWalletServices from '@/services/api/enterpriseWallet';
+import { convertWalletApiToFiles, convertWalletFilesToApi } from '@/utils';
 
 defineOptions({
   name: 'EnterpriseManageList',
@@ -91,10 +94,34 @@
 
 const state = reactive({ ...BaseState });
 
+const { invalidateQueries } = useEnabledElectronSignSettings();
+
 onMounted(async () => {
   await getList();
   state.loading = false;
 });
+
+onMounted(() => {
+  if (typeof window !== 'undefined' && window.addEventListener) {
+    console.log('onMounted');
+    window.addEventListener('visibilitychange', handleFocus);
+    // window.addEventListener('focus', handleFocus2);
+  }
+});
+
+onUnmounted(() => {
+  console.log('onUnmounted');
+  window.removeEventListener('visibilitychange', handleFocus);
+  // window.removeEventListener('focus', handleFocus2);
+});
+
+function handleFocus() {
+  console.log('handleFocus1');
+}
+
+function handleFocus2() {
+  console.log('handleFocus2');
+}
 
 const {
   getDataSource: getList,
@@ -138,43 +165,81 @@
 );
 
 async function getEnterpriseElectronSignSetting(id: string) {
-  try {
-    return await enterpriseServices.getEnterpriseElectronSignSetting({ id: id });
-  } catch (error) {}
+  return await enterpriseServices.getEnterpriseElectronSignSetting({ id: id });
 }
 
 async function getEnterpriseSmsSetting(id: string) {
-  try {
-    return await enterpriseServices.getEnterpriseSmsSetting({ id: id });
-  } catch (error) {}
+  return await enterpriseServices.getEnterpriseSmsSetting({ id: id });
 }
 
+const EnumElectronSignAccessList = computed(() =>
+  Object.values(EnumElectronSignAccess)
+    .filter(Number)
+    .map((x) => Number(x))
+);
+
 async function openDialog(row?: API.GetEnterprisesQueryResultItem) {
-  if (row) {
-    let electronSignSetting = await getEnterpriseElectronSignSetting(row.id);
-    let smsSetting = await getEnterpriseSmsSetting(row.id);
-    handleEdit({
-      id: row.id,
-      enterpriseConfigureType: EnterpriseConfigureType.Electronic,
-      electronSignAccesses: electronSignSetting.electronSignAccesses,
-      smsAccess: smsSetting.smsAccess,
-      smsCost: smsSetting.smsCost,
-    });
-  } else {
-    handleAdd({
-      enterpriseConfigureType: EnterpriseConfigureType.Electronic,
-    });
-  }
+  try {
+    if (row) {
+      let electronSignSetting = await getEnterpriseElectronSignSetting(row.id);
+      let smsSetting = await getEnterpriseSmsSetting(row.id);
+      let alipayWallet = await enterpriseWalletServices.getEnterpriseWallet({
+        enterpriseId: row.id,
+        access: EnumEnterpriseWalletAccess.Alipay,
+      });
+      handleEdit({
+        id: row.id,
+        enterpriseConfigureType: EnterpriseConfigureType.AliPay,
+        electronSignAccesses: EnumElectronSignAccessList.value.map((value) =>
+          electronSignSetting.electronSignAccesses.includes(value) ? value : null
+        ),
+        smsAccess: smsSetting.smsAccess,
+        smsCost: smsSetting.smsCost,
+        alipayAccount: alipayWallet.identity,
+        alipayMerchantId: alipayWallet.code,
+        signStatus: alipayWallet.signStatus,
+        expandindirectOrderStatus: alipayWallet.expandindirectOrderStatus,
+
+        name: alipayWallet.name,
+        scene: alipayWallet.scene || EnumEnterpriseWalletExpandindirectOrderScene.YONGJIN_BAOCHOU,
+        sceneDirections: alipayWallet.sceneDirections,
+        sceneFiles: convertWalletApiToFiles(
+          alipayWallet.files,
+          EnumEnterpriseWalletExpandindirectOrderFileType.Scene
+        ),
+        sceneQualificationFiles: convertWalletApiToFiles(
+          alipayWallet.files,
+          EnumEnterpriseWalletExpandindirectOrderFileType.SceneQualification
+        ),
+      });
+    } else {
+      handleAdd({
+        enterpriseConfigureType: EnterpriseConfigureType.AliPay,
+      });
+    }
+  } catch (error) {}
 }
 
 const { dialogProps, handleAdd, handleEdit, editForm, dialogState } = useFormDialog({
   onConfirm: handleAddOrEdit,
   defaultFormParams: {
     id: '',
-    enterpriseConfigureType: EnterpriseConfigureType.Electronic,
-    electronSignAccesses: [] as any as EnumElectronSignAccess[],
+    enterpriseConfigureType: EnterpriseConfigureType.AliPay,
+    electronSignAccesses: [] as EnumElectronSignAccess[],
     smsAccess: '' as any as EnumSmsAccess,
     smsCost: 0,
+    alipayAccount: '',
+    alipayMerchantId: '',
+    signStatus: '' as any as EnumEnterpriseWalletSignStatus,
+    expandindirectOrderStatus: '' as any as EnumEnterpriseWalletExpandindirectOrderStatus,
+
+    name: '',
+    scene: '' as any as EnumEnterpriseWalletExpandindirectOrderScene,
+    sceneDirections: '',
+    /**杞处鍦烘櫙鎴浘 */
+    sceneFiles: [] as UploadUserFile[],
+    /**鍟嗘埛琛屼笟璧勮川鍥剧墖鎴栧崗璁枃鏈� */
+    sceneQualificationFiles: [] as UploadUserFile[],
   },
 });
 
@@ -190,11 +255,38 @@
     if (editForm.enterpriseConfigureType === EnterpriseConfigureType.ShortMessage) {
       res = await createOrEditFlexEnterpriseMessageSetting();
     }
+    if (editForm.enterpriseConfigureType === EnterpriseConfigureType.AliPay) {
+      res = await enterpriseWalletExpandindirectCreate();
+    }
     if (res) {
       Message.successMessage('鎿嶄綔鎴愬姛');
       getList(paginationState.pageIndex);
       dialogState.dialogVisible = false;
     }
+  } catch (error) {}
+}
+
+async function enterpriseWalletExpandindirectCreate() {
+  try {
+    let params: API.EnterpriseWalletExpandindirectCreateCommand = {
+      enterpriseId: editForm.id,
+      identity: editForm.alipayAccount,
+      name: editForm.name,
+      scene: editForm.scene,
+      sceneDirections: editForm.sceneDirections,
+      sitesInfo: null,
+      files: [
+        ...convertWalletFilesToApi(
+          editForm.sceneFiles,
+          EnumEnterpriseWalletExpandindirectOrderFileType.Scene
+        ),
+        ...convertWalletFilesToApi(
+          editForm.sceneQualificationFiles,
+          EnumEnterpriseWalletExpandindirectOrderFileType.SceneQualification
+        ),
+      ],
+    };
+    return await enterpriseWalletServices.enterpriseWalletExpandindirectCreate(params);
   } catch (error) {}
 }
 
@@ -211,13 +303,16 @@
 //     return await flexEnterpriseServices.createOrEditFlexEnterpriseBankSetting(params);
 //   } catch (error) {}
 // }
+
 async function createOrEditFlexEnterpriseSignSetting() {
   try {
     let params: API.SetEnterpriseElectronSignSettingCommand = {
       id: editForm.id,
-      electronSignAccesses: editForm.electronSignAccesses,
+      electronSignAccesses: editForm.electronSignAccesses.filter(Boolean),
     };
-    return await enterpriseServices.setEnterpriseElectronSignSetting(params);
+    let res = await enterpriseServices.setEnterpriseElectronSignSetting(params);
+    invalidateQueries();
+    return res;
   } catch (error) {}
 }
 async function createOrEditFlexEnterpriseMessageSetting() {

--
Gitblit v1.9.1