Merge branch 'master' into hotfix_filter_autoUpdate
gitea/salix-front/pipeline/pr-master There was a failure building this commit
Details
gitea/salix-front/pipeline/pr-master There was a failure building this commit
Details
This commit is contained in:
commit
b27e9d70f5
|
@ -290,7 +290,7 @@ async function getZone(options) {
|
|||
</template>
|
||||
</VnSelect>
|
||||
<VnSelect
|
||||
:label="t('ticketList.warehouse')"
|
||||
:label="t('basicData.warehouse')"
|
||||
v-model="warehouseId"
|
||||
option-value="id"
|
||||
option-label="name"
|
||||
|
@ -298,7 +298,7 @@ async function getZone(options) {
|
|||
hide-selected
|
||||
map-options
|
||||
:required="true"
|
||||
:rules="validate('ticketList.warehouse')"
|
||||
:rules="validate('basicData.warehouse')"
|
||||
/>
|
||||
</VnRow>
|
||||
<VnRow class="row q-gutter-md q-mb-md no-wrap">
|
||||
|
|
|
@ -120,6 +120,7 @@ basicData:
|
|||
difference: Difference
|
||||
total: Total
|
||||
price: Price
|
||||
warehouse: Warehouse
|
||||
newPrice: New price
|
||||
chargeDifference: Charge difference to
|
||||
withoutNegatives: Create without negatives
|
||||
|
|
|
@ -47,6 +47,7 @@ basicData:
|
|||
difference: Diferencia
|
||||
total: Total
|
||||
price: Precio
|
||||
warehouse: Almacén
|
||||
newPrice: Nuevo precio
|
||||
chargeDifference: Cargar diferencia a
|
||||
withoutNegatives: Crear sin negativos
|
||||
|
|
Loading…
Reference in New Issue