🚀 feat: add confirm status

config.ts

@@ -0,0 +1,15 @@
+export const AppConfig: {
+	[key:string]: {
+        ldapApiUrl: string,
+        ldapApiKey: string
+    }
+} = {
+	default:{
+		ldapApiUrl: 'https://test-api.hkchc.team',
+		ldapApiKey: 'MPCbsNa6l2RJ7D1Zo6D03qtVF1P93st3'
+	},
+	production:{
+		ldapApiUrl: 'https://test-api.hkchc.team',
+		ldapApiKey: 'MPCbsNa6l2RJ7D1Zo6D03qtVF1P93st3'
+	}
+}

src/components/bill/list.tsx

@@ -1,9 +1,9 @@
-import {Button, Checkbox, CheckboxGroup, Space, Table, Typography} from "@douyinfe/semi-ui";
+import {Button, Checkbox, CheckboxGroup, Space, Table, Tag, Typography} from "@douyinfe/semi-ui";
 import {ColumnProps} from "@douyinfe/semi-ui/lib/es/table";
 import React, {ReactNode, useMemo, useState} from "react";
 import {useTranslation} from "react-i18next";
 import dayjs from "dayjs";
-import {IconCheckCircleStroked, IconSetting} from "@douyinfe/semi-icons";
+import {IconCheckCircleStroked, IconSetting, IconTickCircle} from "@douyinfe/semi-icons";
 
 import MoneyFormat from "@/components/money-format.tsx";
 import {Card} from "@/components/card";
@@ -23,7 +23,7 @@ type BillListProps = {
 	loading?: boolean;
 	beforeTotalAmount?: React.ReactNode;
 }
-const CheckNumberCorrect = ({origin, confirmed}: { origin: string, confirmed?: string|null }) => {
+const CheckNumberCorrect = ({origin, confirmed}: { origin: string, confirmed?: string | null }) => {
 	if (origin == confirmed && origin) {
 		return (<Space style={{marginTop: 2, color: 'green'}}><span>{origin}</span><IconCheckCircleStroked/></Space>)
 	}
@@ -42,7 +42,7 @@ export const BillList: React.FC<BillListProps> = (props) => {
 		showCols: string[]
 	}>({
 		showCols: [
-			"id", "merchant_ref", "student_number", "application_number", "initiated_paid_at", "delivered_at", "paid_at", "student_english_name", "student_email", "programme_english_name",
+			"id", "merchant_ref", "student_number", "application_number", 'confirm_status', "initiated_paid_at", "delivered_at", "paid_at", "student_english_name", "student_email", "programme_english_name",
 			"intake_year", "detail", "detail_confirms", "amount", "pay_amount", "actual_payment_amount", "pay_method", "status", "apply_status"
 		]
 	})
@@ -90,7 +90,7 @@ export const BillList: React.FC<BillListProps> = (props) => {
 				title: t('base.student_number'),
 				dataIndex: 'student_number',
 				width: 150,
-				render: (value:string) => (value|| 'N/A')
+				render: (value: string) => (value || 'N/A')
 			},
 			{
 				title: t('base.bill_number'),
@@ -99,13 +99,16 @@ export const BillList: React.FC<BillListProps> = (props) => {
 				render: (value, record) => (
 					<CheckNumberCorrect origin={value} confirmed={record.confirm_application_number}/>)
 			},
-			// {
-			// 	title: t('bill.title_application_number_confirmed'),
-			// 	dataIndex: 'application_number',
-			// 	width: 150,
-			// 	render: (value, record) => (
-			// 		<CheckNumberCorrect origin={value} confirmed={value || record.application_number_confirm}/>)
-			// },
+			{
+				title: t('bill.title_bill_confirm_status'),
+				dataIndex: 'confirm_status',
+				width: 160,
+				render: (value) => (
+					<Tag
+						shape='circle' prefixIcon={value == 'CONFIRMED' ? <IconTickCircle/> : null}
+						color={value == 'CONFIRMED' ? 'green' : 'grey'}>{value}</Tag>
+				)
+			},
 			{
 				title: <div className="table-header-title">{t('bill.title_initiated_paid_at')}
 					<div className="tips">(PPS Input Date)</div>
@@ -300,9 +303,10 @@ export const BillList: React.FC<BillListProps> = (props) => {
 	return <Card
 		title={<Space>
 			<span>{t('bill.title_bill_list')}</span>
-			<span className={'cursor-pointer'} onClick={() => setState({showColumnsConfig: true})}>
-                <IconSetting size={'small'}/>
-            </span>
+			<span
+				className={'cursor-pointer'} style={{color:'pink'}}
+				onClick={() => setState({showColumnsConfig: !state.showColumnsConfig})}
+			><IconSetting /></span>
 		</Space>}
 		headerRight={<Space spacing={20}>
 			{props.beforeTotalAmount}
@@ -335,7 +339,7 @@ export const BillList: React.FC<BillListProps> = (props) => {
             </div>
             <div className="table-column-action" style={{marginTop: 20}}>
                 <Space>
-                    <Button onClick={()=>setState({showColumnsConfig:false})}>{t('base.close')}</Button>
+                    <Button onClick={() => setState({showColumnsConfig: false})}>{t('base.close')}</Button>
                 </Space>
             </div>
 

src/hooks/useRemoteUserList.ts

@@ -0,0 +1,35 @@
+import {useEffect, useState} from "react";
+
+function getRemoteUserNameList() {
+	return new Promise<string[][]>((resolve, reject) => {
+		fetch(`${AppConfig.ldapApiUrl}/api/v1/hkchc/user/ldap/get_staff_list`, {
+			method: 'GET',
+			headers: {
+				Apikey: AppConfig.ldapApiKey
+			},
+			redirect: 'follow'
+		})
+			.then(response => response.json())
+			.then(ret => {
+				const result = ret as APIResponse<string[][]>;
+				if (result.code === 0) {
+					resolve(result.data!)
+				} else {
+					reject(result.message)
+				}
+			})
+			.catch(reject);
+	})
+}
+
+export function useRemoteUserList() {
+
+	const [usernameList, setUserList] = useState<string[]>([])
+
+	useEffect(()=>{
+		getRemoteUserNameList().then(data=>{
+            setUserList(data.flat())
+        })
+	},[])
+	return usernameList
+}

src/i18n/translations/en.json

@@ -60,6 +60,7 @@
     "status_unconfirmed": "UNCONFIRMED",
     "title_actual_payment_amount": "Actually Paid",
     "title_amount": "Amount",
+    "title_bill_confirm_status": "Confirm Status",
     "title_bill_detail": "Bill Detail",
     "title_bill_list": "Bill List",
     "title_bill_status": "Bill Status",

src/i18n/translations/sc.json

@@ -60,6 +60,7 @@
     "status_unconfirmed": "未确认",
     "title_actual_payment_amount": "实付金额",
     "title_amount": "账单金额",
+    "title_bill_confirm_status": "确认状态",
     "title_bill_detail": "账单详情",
     "title_bill_list": "账单列表",
     "title_bill_status": "账单状态",

src/i18n/translations/tc.json

@@ -60,6 +60,7 @@
     "status_unconfirmed": "未確認",
     "title_actual_payment_amount": "實付金額",
     "title_amount": "帳單金額",
+    "title_bill_confirm_status": "確認狀態",
     "title_bill_detail": "帳單詳情",
     "title_bill_list": "帳單清單",
     "title_bill_status": "帳單狀態",

src/pages/auth/permission.tsx

@@ -1,86 +1,96 @@
 import {Card} from "@/components/card";
 import {useSetState} from "ahooks";
-import {Button, Space, TagInput, Toast} from "@douyinfe/semi-ui";
+import {Button, Select, Space, Toast} from "@douyinfe/semi-ui";
 import {useTranslation} from "react-i18next";
-import {useEffect} from "react";
+import {useEffect, useMemo} from "react";
 import {getPermissionList, savePermissionList} from "@/service/api/user.ts";
+import {useRemoteUserList} from "@/hooks/useRemoteUserList.ts";
 
 const DEFAULT_ROLES = [
-	'root','ro','fo'
+	'root', 'ro', 'fo'
 ]
 
-const Permission = ()=>{
+const Permission = () => {
 	const {t} = useTranslation()
-	const [state,setState] = useSetState<{
-		list:PermissionUserList[];
-		loading?:boolean;
+	const usernameList = useRemoteUserList();
+	const [state, setState] = useSetState<{
+		list: PermissionUserList[];
+		loading?: boolean;
 	}>({
-		list:[]
+		list: []
 	})
-	const onUsernameChange = (role_name:string,username_list: string[])=>{
-		const index = state.list.findIndex(it=>it.role_name == role_name)
-		if(index != -1){
+	const onUsernameChange = (role_name: string, username_list: string[]) => {
+		const index = state.list.findIndex(it => it.role_name == role_name)
+		if (index != -1) {
 			state.list[index] = {
-				role_name,username_list
+				role_name, username_list
 			};
 			setState({
-				list:state.list
+				list: state.list
 			})
 		}
 	}
-	const saveRoles = ()=>{
+	const saveRoles = () => {
 		setState({
-			loading:true
+			loading: true
 		})
-		savePermissionList(state.list).then(()=>{
-			Toast.success({content:`Save Success`,duration: 3,})
-		}).catch(e=>{
+		savePermissionList(state.list).then(() => {
+			Toast.success({content: `Save Success`, duration: 3,})
+		}).catch(e => {
 			Toast.error({
-				content:`Save Error:${e.message}`,
+				content: `Save Error:${e.message}`,
 				duration: 3,
 			})
-		}).finally(()=>{
-			setState({loading:false})
+		}).finally(() => {
+			setState({loading: false})
 		})
 	}
-	const loadAllPermission = ()=>{
+	const loadAllPermission = () => {
 		setState({
-			loading:true
+			loading: true
 		})
-		getPermissionList().then(list=>{
-			const roles:{
-				[key:string]:string[]
+		getPermissionList().then(list => {
+			const roles: {
+				[key: string]: string[]
 			} = {}
 			// array to object
-			list.forEach(it=>{
+			list.forEach(it => {
 				roles[it.role_name] = it.username_list
 			})
-			const permissionList:PermissionUserList[] = [];
-			DEFAULT_ROLES.forEach(role_name=>{
+			const permissionList: PermissionUserList[] = [];
+			DEFAULT_ROLES.forEach(role_name => {
 				permissionList.push({
-					role_name,username_list: roles[role_name]
+					role_name, username_list: roles[role_name]
 				})
 			})
-			setState({list:permissionList})
-		}).finally(()=>{
-			setState({loading:false})
+			setState({list: permissionList})
+		}).finally(() => {
+			setState({loading: false})
 		})
 	}
-	useEffect(loadAllPermission,[])
+	useEffect(loadAllPermission, [])
+	const optionList = useMemo(() => (usernameList.map(name => ({label: name, value: name}))), [usernameList])
 
 	return (<Card style={{marginBottom: 20}}>
-		{state.list.map(it=>(<div key={it.role_name} style={{marginBottom:20}}>
-			<div className="permission-title" style={{marginBottom:5}}>{it.role_name.toUpperCase()}</div>
-			<TagInput
-				defaultValue={it.username_list}
+		{state.list.map(it => (<div key={it.role_name} style={{marginBottom: 20}}>
+			<div className="permission-title" style={{marginBottom: 5}}>{it.role_name.toUpperCase()}</div>
+			<Select
+				style={{width: '100%', backgroundColor: 'var(--semi-color-fill-0)'}}
+				filter
+				multiple
 				size={'large'}
-				addOnBlur={true} allowDuplicates={false}
-				placeholder={t('base.please_enter')}
-				onChange={users => onUsernameChange(it.role_name,users)}
+				defaultValue={it.username_list}
+				optionList={optionList}
+				defaultActiveFirstOption
+				allowCreate={true}
+				placeholder={t('base.please_select')}
+				onChange={(users) => onUsernameChange(it.role_name, users as string[])}
 			/>
 		</div>))}
 		<Space>
-			<Button loading={state.loading} onClick={saveRoles} theme={'solid'}>{state.loading ? 'Loading' :t('base.save')}</Button>
+			<Button
+				loading={state.loading} onClick={saveRoles}
+				theme={'solid'}>{state.loading ? 'Loading' : t('base.save')}</Button>
 			{/*<div>{state.message||''}</div>*/}
 		</Space>
 	</Card>)

src/vite-env.d.ts

@@ -18,8 +18,11 @@ declare const AppConfig: {
     SSO_AUTH_CLIENT_KEY: string;
     // 登录凭证 token key
     AUTH_TOKEN_KEY: string;
+    ldapApiUrl:string;
+    ldapApiKey: string;
 };
 declare const AppMode: 'test' | 'production' | 'development';
+declare const AppMode: 'test' | 'production' | 'development';
 
 declare type BasicComponentProps = {
     children?: React.ReactNode;

tsconfig.node.json

@@ -8,6 +8,7 @@
     "strict": true
   },
   "include": [
-    "vite.config.ts"
+    "config.ts",
+    "vite.config.ts",
   ]
 }

vite.config.ts

@@ -1,10 +1,14 @@
 import {defineConfig} from 'vite'
 import react from '@vitejs/plugin-react'
 import {resolve} from "path";
+import {AppConfig} from './config'
 
 // https://vitejs.dev/config/
 export default defineConfig(({mode}) => {
-
+    let configs = AppConfig['default'];
+    if(AppConfig[mode]){
+        configs = {...configs,...AppConfig[mode]}
+    }
     return {
         plugins: [react()],
         base: mode == 'for-wm' ? './' : '/',
@@ -16,6 +20,7 @@ export default defineConfig(({mode}) => {
                 SSO_AUTH_URL: process.env.SSO_AUTH_URL || 'https://portal.chuhai.edu.hk',
                 SSO_AUTH_CLIENT_KEY: process.env.AUTH_CLIENT_KEY || 'payment',
                 AUTH_TOKEN_KEY: process.env.AUTH_TOKEN_KEY || 'payment-auth-token',
+                ...configs
             }),
             AppMode: JSON.stringify(mode)
         },