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>
|
</template>
|
||||||
</VnSelect>
|
</VnSelect>
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('ticketList.warehouse')"
|
:label="t('basicData.warehouse')"
|
||||||
v-model="warehouseId"
|
v-model="warehouseId"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
option-label="name"
|
option-label="name"
|
||||||
|
@ -298,7 +298,7 @@ async function getZone(options) {
|
||||||
hide-selected
|
hide-selected
|
||||||
map-options
|
map-options
|
||||||
:required="true"
|
:required="true"
|
||||||
:rules="validate('ticketList.warehouse')"
|
:rules="validate('basicData.warehouse')"
|
||||||
/>
|
/>
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md no-wrap">
|
<VnRow class="row q-gutter-md q-mb-md no-wrap">
|
||||||
|
|
|
@ -120,6 +120,7 @@ basicData:
|
||||||
difference: Difference
|
difference: Difference
|
||||||
total: Total
|
total: Total
|
||||||
price: Price
|
price: Price
|
||||||
|
warehouse: Warehouse
|
||||||
newPrice: New price
|
newPrice: New price
|
||||||
chargeDifference: Charge difference to
|
chargeDifference: Charge difference to
|
||||||
withoutNegatives: Create without negatives
|
withoutNegatives: Create without negatives
|
||||||
|
|
|
@ -47,6 +47,7 @@ basicData:
|
||||||
difference: Diferencia
|
difference: Diferencia
|
||||||
total: Total
|
total: Total
|
||||||
price: Precio
|
price: Precio
|
||||||
|
warehouse: Almacén
|
||||||
newPrice: Nuevo precio
|
newPrice: Nuevo precio
|
||||||
chargeDifference: Cargar diferencia a
|
chargeDifference: Cargar diferencia a
|
||||||
withoutNegatives: Crear sin negativos
|
withoutNegatives: Crear sin negativos
|
||||||
|
|
Loading…
Reference in New Issue