project/chuhai-payment-frontend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update bill query field

Browse Source
This commit is contained in:
LittleBoy 2024-08-12 21:02:35 +08:00
parent 9dafc7dd5d
commit bfa104a634
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compose.yaml
View File

@ -17,11 +17,12 @@ services:
container_name: hkchc-payment-frontend container_name: hkchc-payment-frontend
environment: environment:
APP_API_URL: "10.10.0.152:50000" # payment backend service APP_API_URL: "10.10.0.152:50000" # payment backend service
volumes:
- ./nginx.conf:/etc/nginx/conf.d/default.conf
working_dir: /etc/nginx/conf.d/ working_dir: /etc/nginx/conf.d/
ports: ports:
- "50001:80" - "50001:80"
command: [ command: [
"sed -i \"s~<!--app_url-->~<script>const APP_SITE_URL='${APP_SITE_URL}';</script>~\" /app/index.html && envsubst '$APP_API_URL' < default.conf.template > default.conf && cat default.conf",
"nginx -g daemon off;" "nginx -g daemon off;"
] ]
<<: *common <<: *common

2
nginx.conf
View File

@ -26,7 +26,7 @@ server {
} }
location ^~/api { location ^~/api {
proxy_pass http://payment_backend; proxy_pass https://test-payment-be.hkchc.team;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

9
src/components/bill/search-form.tsx
View File

@ -138,11 +138,11 @@ const SearchForm: React.FC<SearchFormProps> = (props) => {
<Form.Select.Option value="student_number asc">{t('base.student_number')} {t('bill.sort_asc')}</Form.Select.Option> <Form.Select.Option value="student_number asc">{t('base.student_number')} {t('bill.sort_asc')}</Form.Select.Option>
<Form.Select.Option value="application_number desc">{t('base.bill_number')} {t('bill.sort_desc')}</Form.Select.Option> <Form.Select.Option value="application_number desc">{t('base.bill_number')} {t('bill.sort_desc')}</Form.Select.Option>
<Form.Select.Option value="application_number asc">{t('base.bill_number')} {t('bill.sort_asc')}</Form.Select.Option> <Form.Select.Option value="application_number asc">{t('base.bill_number')} {t('bill.sort_asc')}</Form.Select.Option>
<Form.Select.Option value="paid_at desc">{t('bill.title_paid_at')} {t('bill.sort_desc')}</Form.Select.Option> <Form.Select.Option value="initiated_paid_at desc">{t('bill.title_initiated_paid_at')} {t('bill.sort_desc')}</Form.Select.Option>
<Form.Select.Option value="paid_at asc">{t('bill.title_paid_at')} {t('bill.sort_asc')}</Form.Select.Option> <Form.Select.Option value="initiated_paid_at asc">{t('bill.title_initiated_paid_at')} {t('bill.sort_asc')}</Form.Select.Option>
<Form.Select.Option value="create_at desc">{t('bill.title_create_at')} {t('bill.sort_desc')}</Form.Select.Option> <Form.Select.Option value="delivered_at desc">{t('bill.title_delivered_at')} {t('bill.sort_desc')}</Form.Select.Option>
<Form.Select.Option value="create_at asc">{t('bill.title_create_at')} {t('bill.sort_asc')}</Form.Select.Option> <Form.Select.Option value="delivered_at asc">{t('bill.title_delivered_at')} {t('bill.sort_asc')}</Form.Select.Option>
</Form.Select> </Form.Select>
</Col> </Col>
<Col xxl={4} xl={6} md={8}> <Col xxl={4} xl={6} md={8}>
@ -155,6 +155,7 @@ const SearchForm: React.FC<SearchFormProps> = (props) => {
</Col> </Col>
<Col xxl={4} xl={6} md={8}> <Col xxl={4} xl={6} md={8}>
<Form.Select <Form.Select
showClear
field="confirm_bill_type" style={{width: '100%'}} field="confirm_bill_type" style={{width: '100%'}}
label={t('manual.bill_type')} label={t('manual.bill_type')}
placeholder={t('manual.bill_type')} placeholder={t('manual.bill_type')}

3
src/pages/bill/query.tsx
View File

@ -14,6 +14,7 @@ import {BillTypeConfirmModal} from "@/pages/bill/components/bill_type_confirm.ts
import {saveAs} from "file-saver"; import {saveAs} from "file-saver";
// import {AddBillModal} from "@/pages/bill/components/add_bill_modal.tsx"; // import {AddBillModal} from "@/pages/bill/components/add_bill_modal.tsx";
import {BillTypeConfirmBatch} from "@/pages/bill/components/bill_type_confirm_batch.tsx"; import {BillTypeConfirmBatch} from "@/pages/bill/components/bill_type_confirm_batch.tsx";
import {AddBillModal} from "@/pages/bill/components/add_bill_modal.tsx";
const DownloadButton = ({bill, text}: { bill: BillModel; text: string }) => { const DownloadButton = ({bill, text}: { bill: BillModel; text: string }) => {
@ -125,7 +126,7 @@ const BillQuery = () => {
operationRender={operation} operationRenderWidth={180} operationRender={operation} operationRenderWidth={180}
beforeTotalAmount={<Space> beforeTotalAmount={<Space>
<BillTypeConfirmBatch data={data} selectKeys={selectKeys} onConfirm={refresh}/> <BillTypeConfirmBatch data={data} selectKeys={selectKeys} onConfirm={refresh}/>
{/*<AddBillModal onConfirm={refresh}/>*/} <AddBillModal onConfirm={refresh}/>
<ButtonGroup style={{marginRight: 20}} theme={'solid'}> <ButtonGroup style={{marginRight: 20}} theme={'solid'}>
<Button onClick={onImportExcel}>{t('bill.import_excel')}</Button> <Button onClick={onImportExcel}>{t('bill.import_excel')}</Button>
<Button loading={state.exporting} onClick={onExportExcel}>{t('bill.export_excel')}</Button> <Button loading={state.exporting} onClick={onExportExcel}>{t('bill.export_excel')}</Button>