Merge branch 'WarehouseShippingNote/fix-addr-editing' into 'master'
fixed address changing See merge request fronk/thetool!1358
This commit is contained in:
@@ -7,6 +7,7 @@ Vue.component('warehouse-shipping-note-modal', {
|
|||||||
return {
|
return {
|
||||||
window: window,
|
window: window,
|
||||||
loading: false,
|
loading: false,
|
||||||
|
addressEditMode: false,
|
||||||
billAddrAutoCompleteUrl: window.TT_CONFIG['BASE_PATH'] + '/Address/Api?do=findAddress&fibu_primary_account=1',
|
billAddrAutoCompleteUrl: window.TT_CONFIG['BASE_PATH'] + '/Address/Api?do=findAddress&fibu_primary_account=1',
|
||||||
geoAutocompleteUrl: window.TT_CONFIG['BASE_PATH'] + '/WarehouseShippingNote/geoAutocomplete',
|
geoAutocompleteUrl: window.TT_CONFIG['BASE_PATH'] + '/WarehouseShippingNote/geoAutocomplete',
|
||||||
shippingNote: {
|
shippingNote: {
|
||||||
@@ -35,8 +36,7 @@ Vue.component('warehouse-shipping-note-modal', {
|
|||||||
customOrdering: 'article',
|
customOrdering: 'article',
|
||||||
fields: {
|
fields: {
|
||||||
article: {
|
article: {
|
||||||
style: 'display: grid; grid-template-columns: 4fr 1fr; grid-gap: 10px;',
|
type: 'input-article',
|
||||||
type: 'autocomplete',
|
|
||||||
label: 'Artikel',
|
label: 'Artikel',
|
||||||
apiUrl: '/WarehouseArticle/autoComplete',
|
apiUrl: '/WarehouseArticle/autoComplete',
|
||||||
customFieldReference: 'WarehouseArticle',
|
customFieldReference: 'WarehouseArticle',
|
||||||
@@ -111,7 +111,50 @@ Vue.component('warehouse-shipping-note-modal', {
|
|||||||
|
|
||||||
<tt-input v-model="shippingNote.deliveryAddressName" label="Name" sm row/>
|
<tt-input v-model="shippingNote.deliveryAddressName" label="Name" sm row/>
|
||||||
<tt-input v-model="shippingNote.deliveryAddressEMail" label="E-Mail" sm row/>
|
<tt-input v-model="shippingNote.deliveryAddressEMail" label="E-Mail" sm row/>
|
||||||
<div class="mb-1" v-if="shippingNote.deliveryAddressLine">{{ shippingNote.deliveryAddressLine }}<br>{{ shippingNote.deliveryAddressPLZ }} {{ shippingNote.deliveryAddressCity }}</div>
|
<div v-if="!addressEditMode" class="d-flex align-items-start">
|
||||||
|
<div class="mb-1">
|
||||||
|
<div v-if="shippingNote.deliveryAddressLine">
|
||||||
|
{{ shippingNote.deliveryAddressLine }}<br>
|
||||||
|
{{ shippingNote.deliveryAddressPLZ }} {{ shippingNote.deliveryAddressCity }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<button @click="addressEditMode = true" class="btn btn-sm btn-link ml-2">
|
||||||
|
<i class="fas fa-edit"></i>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Edit form -->
|
||||||
|
<div v-if="addressEditMode" class="address-edit-form mt-2">
|
||||||
|
<div style="display:grid; grid-template-columns: 3fr 1.5fr 1.5fr 1fr; gap: 10px">
|
||||||
|
<tt-input
|
||||||
|
label="Adresse"
|
||||||
|
type="text"
|
||||||
|
placeholder="Adresse"
|
||||||
|
v-model="shippingNote.deliveryAddressLine"
|
||||||
|
sm
|
||||||
|
></tt-input>
|
||||||
|
|
||||||
|
<tt-input
|
||||||
|
label="PLZ"
|
||||||
|
type="text"
|
||||||
|
placeholder="PLZ"
|
||||||
|
v-model="shippingNote.deliveryAddressPLZ"
|
||||||
|
sm
|
||||||
|
no-form-group
|
||||||
|
></tt-input>
|
||||||
|
<tt-input
|
||||||
|
label="Stadt"
|
||||||
|
type="text"
|
||||||
|
placeholder="Stadt"
|
||||||
|
v-model="shippingNote.deliveryAddressCity"
|
||||||
|
sm
|
||||||
|
no-form-group
|
||||||
|
></tt-input>
|
||||||
|
<button @click="addressEditMode = false" class="btn btn-sm btn-link">
|
||||||
|
<i class="fas fa-times"></i>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
<template v-if="window.TT_CONFIG['WAREHOUSE_ADMIN'] == true">
|
<template v-if="window.TT_CONFIG['WAREHOUSE_ADMIN'] == true">
|
||||||
<hr>
|
<hr>
|
||||||
@@ -134,13 +177,7 @@ Vue.component('warehouse-shipping-note-modal', {
|
|||||||
|
|
||||||
<hr>
|
<hr>
|
||||||
<h4 class="text-center">Positionen</h4>
|
<h4 class="text-center">Positionen</h4>
|
||||||
<tt-positions-manager :config="positionsConfig" v-model="shippingNote.positions" sm row ref="positionsManager">
|
<tt-positions-manager :config="positionsConfig" v-model="shippingNote.positions" sm row ref="positionsManager"/>
|
||||||
<template #article-prepend>
|
|
||||||
<tt-button
|
|
||||||
style="max-width: 32px" sm
|
|
||||||
text="" @click="$emit('open-article-modal')" additional-class="btn-outline-primary" icon="fa fa-search"/>
|
|
||||||
</template>
|
|
||||||
</tt-positions-manager>
|
|
||||||
</template>
|
</template>
|
||||||
<div v-else class="text-danger text-center font-weight-bolder font-16">Bitte Lieferadresse eingeben oder nach Kunden suchen</div>
|
<div v-else class="text-danger text-center font-weight-bolder font-16">Bitte Lieferadresse eingeben oder nach Kunden suchen</div>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user