Skip to content

Commit

Permalink
Merge pull request #324 from Jzow/master
Browse files Browse the repository at this point in the history
Fix invalid english labels
  • Loading branch information
Jzow authored Apr 8, 2024
2 parents ff56212 + 4bc4b32 commit 08dc15f
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ Some functional modules are being developed and improved, please refer to our [t

## Quick Start
```shell
docker pull wansenai/eairp:2.1.0
docker pull wansenai/eairp:2.1.1

docker pull wansenai/eairp-web:2.1.0
docker pull wansenai/eairp-web:2.1.1
```
## Run Server
You can customize and modify port 8080, please ensure that the service ports monitored by your front-end are consistent.
Expand All @@ -56,9 +56,9 @@ If you want to deploy to your domain name, the local host needs to be modified t
We will use the Docker Compose method for integration and deployment next it is coming soon :)

```shell
docker run --name eairp -d -p 8080:8088 wansenai/eairp:2.1.0
docker run --name eairp -d -p 8080:8088 wansenai/eairp:2.1.1

docker run --name eairp-web -d -p 3000:80 -e API_BASE_URL=http://localhost:8080/erp-api wansenai/eairp-web:2.1.0
docker run --name eairp-web -d -p 3000:80 -e API_BASE_URL=http://localhost:8080/erp-api wansenai/eairp-web:2.1.1
```

## System screenshot (only part)
Expand Down
2 changes: 1 addition & 1 deletion web/src/views/financial/advance-charge/advance.data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export const searchFormSchema: FormSchema[] = [
},
},
{
label: t('financial.advance.paymentMember.paymentMember'),
label: t('financial.advance.header.paymentMember'),
field: 'paymentMember',
component: 'Input',
colProps: {
Expand Down
2 changes: 1 addition & 1 deletion web/src/views/product/info/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ export default defineComponent({
}
function handleImport() {
const templateUrl = 'https://wansen-1317413588.cos.ap-shanghai.myqcloud.com/%E5%95%86%E5%93%81%E4%BF%A1%E6%81%AF%E6%A8%A1%E6%9D%BF%28Product%20Info%20Templete%29.xlsx'
const templateUrl = 'https://wansen-1317413588.cos.ap-shanghai.myqcloud.com/Commodity%20information%20template%28%E5%95%86%E5%93%81%E4%BF%A1%E6%81%AF%E6%A8%A1%E6%9D%BF%29.xlsx'
const templateName = t('product.info.importInfo.templateName')
importModalRef.value.initModal(templateUrl, templateName);
importModalRef.value.title = t('product.info.importInfo.title')
Expand Down
2 changes: 1 addition & 1 deletion web/src/views/warehouse/disassemble/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<template #toolbar>
<a-button type="primary" @click="handleCreate" v-text="t('warehouse.disassemble.add')" />
<a-button type="primary" @click="handleBatchDelete" v-text="t('warehouse.disassemble.batchDelete')" />
<a-button type="primary" @click="handleExport" v-text="t('warehouse.export.name')" />
<a-button type="primary" @click="handleExport" v-text="t('warehouse.disassemble.export.name')" />
<a-button type="primary" @click="handleOnStatus(1)" v-text="t('sys.table.approve')" />
<a-button type="primary" @click="handleOnStatus(0)" v-text="t('sys.table.reject')" />
</template>
Expand Down
2 changes: 1 addition & 1 deletion web/src/views/warehouse/storage/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ export default defineComponent({
async function handleExport() {
dataSum.value = getDataSource().length;
if (dataSum.value === 0) {
createMessage.warn(t('warehouse.export.name'));
createMessage.warn(t('warehouse.otherStorage.export.noData'));
return;
}
openExportData.value = true;
Expand Down

0 comments on commit 08dc15f

Please sign in to comment.