mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-09-20 14:45:56 +08:00
Small inventory fixes [SCI-10835][SCI-10847][SCI-10844]
This commit is contained in:
parent
526f5a864f
commit
3eacee9ca0
|
@ -80,7 +80,7 @@
|
||||||
<button class="btn btn-secondary ml-auto" @click="close" aria-label="Close">
|
<button class="btn btn-secondary ml-auto" @click="close" aria-label="Close">
|
||||||
{{ i18n.t('repositories.import_records.steps.step2.cancelBtnText') }}
|
{{ i18n.t('repositories.import_records.steps.step2.cancelBtnText') }}
|
||||||
</button>
|
</button>
|
||||||
<button class="btn btn-primary" @click="importRecords">
|
<button class="btn btn-primary" :disabled="!canSubmit" @click="importRecords">
|
||||||
{{ i18n.t('repositories.import_records.steps.step2.confirmBtnText') }}
|
{{ i18n.t('repositories.import_records.steps.step2.confirmBtnText') }}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
@ -203,6 +203,9 @@ export default {
|
||||||
const importedSum = this.selectedItems.filter((i) => i.key).length;
|
const importedSum = this.selectedItems.filter((i) => i.key).length;
|
||||||
const ignoredSum = this.selectedItems.length - importedSum;
|
const ignoredSum = this.selectedItems.length - importedSum;
|
||||||
return { importedSum, ignoredSum };
|
return { importedSum, ignoredSum };
|
||||||
|
},
|
||||||
|
canSubmit() {
|
||||||
|
return this.selectedItems.filter((i) => i.key).length > 0;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
:clearable="true"
|
:clearable="true"
|
||||||
:size="'sm'"
|
:size="'sm'"
|
||||||
class="max-w-96"
|
class="max-w-96"
|
||||||
|
:searchable="true"
|
||||||
:class="{
|
:class="{
|
||||||
'outline-sn-alert-brittlebush outline-1 outline rounded': computeMatchNotFound
|
'outline-sn-alert-brittlebush outline-1 outline rounded': computeMatchNotFound
|
||||||
}"
|
}"
|
||||||
|
|
|
@ -72,7 +72,7 @@
|
||||||
{{ i18n.t('general.back') }}
|
{{ i18n.t('general.back') }}
|
||||||
</button>
|
</button>
|
||||||
<button type="button" class="btn btn-primary" @click="$emit('importRows')">
|
<button type="button" class="btn btn-primary" @click="$emit('importRows')">
|
||||||
{{ i18n.t('repositories.import_records.steps.step3.confirm') }}
|
{{ i18n.t('repositories.import_records.steps.step3.import') }}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
:placeholder="placeholderRender"
|
:placeholder="placeholderRender"
|
||||||
@keyup="fetchOptions"
|
@keyup="fetchOptions"
|
||||||
@change.stop
|
@change.stop
|
||||||
class="w-full border-0 outline-none pl-0 placeholder:text-sn-grey" />
|
class="w-full bg-transparent border-0 outline-none pl-0 placeholder:text-sn-grey" />
|
||||||
</template>
|
</template>
|
||||||
<div v-else class="flex items-center gap-1 flex-wrap">
|
<div v-else class="flex items-center gap-1 flex-wrap">
|
||||||
<div v-for="tag in tags" class="px-2 py-1 rounded-sm bg-sn-super-light-grey grid grid-cols-[auto_1fr] items-center gap-1">
|
<div v-for="tag in tags" class="px-2 py-1 rounded-sm bg-sn-super-light-grey grid grid-cols-[auto_1fr] items-center gap-1">
|
||||||
|
|
|
@ -2038,7 +2038,7 @@ en:
|
||||||
error_searching: "Error searching, please try again"
|
error_searching: "Error searching, please try again"
|
||||||
button_tooltip:
|
button_tooltip:
|
||||||
new: "Create new item"
|
new: "Create new item"
|
||||||
import: "Update inventory"
|
import: "Import items"
|
||||||
filters: "Filters"
|
filters: "Filters"
|
||||||
search: "Quick search"
|
search: "Quick search"
|
||||||
filters:
|
filters:
|
||||||
|
@ -2213,7 +2213,7 @@ en:
|
||||||
importTitle: 'Import'
|
importTitle: 'Import'
|
||||||
importBtnText: 'Import'
|
importBtnText: 'Import'
|
||||||
cancelBtnText: 'Cancel'
|
cancelBtnText: 'Cancel'
|
||||||
dragAndDropSupportingText: '.xlsx, .xls, .csv or .txt file'
|
dragAndDropSupportingText: '.csv, .xlsx, .txt or .tsv file'
|
||||||
step2:
|
step2:
|
||||||
id: 'step2'
|
id: 'step2'
|
||||||
icon: 'sn-icon-open'
|
icon: 'sn-icon-open'
|
||||||
|
@ -2250,7 +2250,7 @@ en:
|
||||||
RepositoryDateTimeValue: 'Date-time'
|
RepositoryDateTimeValue: 'Date-time'
|
||||||
RepositoryDateValue: 'Date'
|
RepositoryDateValue: 'Date'
|
||||||
RepositoryTimeValue: 'Time'
|
RepositoryTimeValue: 'Time'
|
||||||
RepositoryListValue: 'List'
|
RepositoryListValue: 'Dropdown'
|
||||||
RepositoryStatusValue: 'Status'
|
RepositoryStatusValue: 'Status'
|
||||||
RepositoryStockValue: 'Stock'
|
RepositoryStockValue: 'Stock'
|
||||||
table:
|
table:
|
||||||
|
@ -2292,7 +2292,7 @@ en:
|
||||||
name: 'Name'
|
name: 'Name'
|
||||||
status: 'Status'
|
status: 'Status'
|
||||||
cancel: 'Cancel import'
|
cancel: 'Cancel import'
|
||||||
confirm: 'Confirm'
|
import: 'Import'
|
||||||
status_message:
|
status_message:
|
||||||
created: 'new item'
|
created: 'new item'
|
||||||
updated: 'updated'
|
updated: 'updated'
|
||||||
|
@ -2325,7 +2325,7 @@ en:
|
||||||
id: 'el2'
|
id: 'el2'
|
||||||
icon: 'sn-icon-import'
|
icon: 'sn-icon-import'
|
||||||
label: 'Upload your file'
|
label: 'Upload your file'
|
||||||
subtext: 'Upload your data using .xlsx, .csv, or .txt files to import new items or update existing item data.'
|
subtext: 'Upload your data using .csv, .xlsx, .txt or .tsv files to import new items or update existing item data.'
|
||||||
element3:
|
element3:
|
||||||
id: 'el3'
|
id: 'el3'
|
||||||
icon: 'sn-icon-tables'
|
icon: 'sn-icon-tables'
|
||||||
|
|
Loading…
Reference in a new issue