avatic/lcc_tool
avatic/lcc_tool
1
0
Fork 0
Code Issues 31 Pull requests 5 Projects Releases Packages Wiki Activity Actions

Fix for Bulk Edit HS Code #62, D2D Routing #56, D2D Route #55, Eur-Werte mit 2 Nachkommastellen anzeigen #54

Browse source
This commit is contained in:
Jan 2025-12-08 11:41:39 +01:00
parent b1a392b5e0
commit aa6b2db962
2 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/frontend/src/components/layout/bulkedit/BulkEditRow.vue
View file

@ -25,15 +25,18 @@
</div> </div>
<div class="bulk-edit-row__status"> <div class="bulk-edit-row__status">
<transition name="badge-transition" mode="out-in"> <transition name="badge-transition" mode="out-in">
<circle-badge v-if="materialCheck && showMaterialCheck" :key="'check-' + id" variant="primary" icon="check" class="badge--check"></circle-badge> <circle-badge v-if="materialCheck && showMaterialCheck" :key="'check-' + id" variant="primary" icon="check"
<circle-badge v-else-if="!materialCheck" :key="'error-' + id" variant="exception" icon="exclamation-mark"></circle-badge> class="badge--check"></circle-badge>
<circle-badge v-else-if="!materialCheck" :key="'error-' + id" variant="exception"
icon="exclamation-mark"></circle-badge>
</transition> </transition>
</div> </div>
</div> </div>
</div> </div>
<div class="bulk-edit-row__cell-container"> <div class="bulk-edit-row__cell-container">
<div class="bulk-edit-row__cell bulk-edit-row__cell--status bulk-edit-row__cell--clickable edit-calculation-list-header-cell--copyable" <div
class="bulk-edit-row__cell bulk-edit-row__cell--status bulk-edit-row__cell--clickable edit-calculation-list-header-cell--copyable"
@click="action($event,'price')"> @click="action($event,'price')">
<div class="bulk-edit-row__data"> <div class="bulk-edit-row__data">
<div class="bulk-edit-row__line bulk-edit-row__line--sub"> <div class="bulk-edit-row__line bulk-edit-row__line--sub">
@ -52,14 +55,16 @@
<transition name="badge-transition" mode="out-in"> <transition name="badge-transition" mode="out-in">
<circle-badge v-if="priceCheck && showPriceCheck" :key="'check-price-' + id" variant="primary" <circle-badge v-if="priceCheck && showPriceCheck" :key="'check-price-' + id" variant="primary"
icon="check" class="badge--check"></circle-badge> icon="check" class="badge--check"></circle-badge>
<circle-badge v-else-if="!priceCheck" :key="'error-price-' + id" variant="exception" icon="exclamation-mark"></circle-badge> <circle-badge v-else-if="!priceCheck" :key="'error-price-' + id" variant="exception"
icon="exclamation-mark"></circle-badge>
</transition> </transition>
</div> </div>
</div> </div>
</div> </div>
<div class="bulk-edit-row__cell-container"> <div class="bulk-edit-row__cell-container">
<div class="bulk-edit-row__cell bulk-edit-row__cell--status bulk-edit-row__cell--clickable edit-calculation-list-header-cell--copyable" <div
class="bulk-edit-row__cell bulk-edit-row__cell--status bulk-edit-row__cell--clickable edit-calculation-list-header-cell--copyable"
@click="action($event,'packaging')"> @click="action($event,'packaging')">
<div class="bulk-edit-row__data"> <div class="bulk-edit-row__data">
<div class="bulk-edit-row__line bulk-edit-row__line--sub"> <div class="bulk-edit-row__line bulk-edit-row__line--sub">
@ -147,7 +152,8 @@
<transition name="badge-transition" mode="out-in"> <transition name="badge-transition" mode="out-in">
<circle-badge v-if="destinationCheck && showDestinationCheck" :key="'check-dest-' + id" variant="primary" <circle-badge v-if="destinationCheck && showDestinationCheck" :key="'check-dest-' + id" variant="primary"
icon="check" class="badge--check"></circle-badge> icon="check" class="badge--check"></circle-badge>
<circle-badge v-else-if="!destinationCheck" :key="'error-dest-' + id" variant="exception" icon="exclamation-mark"></circle-badge> <circle-badge v-else-if="!destinationCheck" :key="'error-dest-' + id" variant="exception"
icon="exclamation-mark"></circle-badge>
</transition> </transition>
</div> </div>
</div> </div>
@ -195,7 +201,8 @@
<transition name="badge-transition" mode="out-in"> <transition name="badge-transition" mode="out-in">
<circle-badge v-if="routeCheck && showRouteCheck" :key="'check-route-' + id" variant="primary" <circle-badge v-if="routeCheck && showRouteCheck" :key="'check-route-' + id" variant="primary"
icon="check" class="badge--check"></circle-badge> icon="check" class="badge--check"></circle-badge>
<circle-badge v-else-if="!routeCheck" :key="'error-route-' + id" variant="exception" icon="exclamation-mark"></circle-badge> <circle-badge v-else-if="!routeCheck" :key="'error-route-' + id" variant="exception"
icon="exclamation-mark"></circle-badge>
</transition> </transition>
</div> </div>
</div> </div>
@ -275,7 +282,7 @@ export default {
}, },
computed: { computed: {
materialCheck() { materialCheck() {
return (this.premise?.material.part_number != null && this.premise?.hs_code != null && this.premise?.tariff_rate != null) return (this.premise?.material.part_number != null && this.premise?.tariff_rate != null)
}, },
priceCheck() { priceCheck() {
return (this.premise?.material_cost != null && this.premise?.oversea_share != null); return (this.premise?.material_cost != null && this.premise?.oversea_share != null);
@ -295,7 +302,7 @@ export default {
if (((this.destinations ?? null) === null) || this.destinations.length === 0) if (((this.destinations ?? null) === null) || this.destinations.length === 0)
return true; return true;
return !this.destinations?.some(d => d.annual_amount == null); return !this.destinations?.some(d => !d.annual_amount);
}, },
routeCheck() { routeCheck() {
@ -303,7 +310,7 @@ export default {
if (((this.destinations ?? null) === null) || this.destinations.length === 0) if (((this.destinations ?? null) === null) || this.destinations.length === 0)
return true; return true;
return this.destinations?.every(d => d.routes?.some((route) => route.is_selected)); return this.destinations?.every(d => (d.is_d2d && d.rate_d2d && d.lead_time_d2d) || (!d.is_d2d && d.routes?.some((route) => route.is_selected)));
}, },
isSelected() { isSelected() {
return this.premiseEditStore.isChecked(this.id); return this.premiseEditStore.isChecked(this.id);

4
src/frontend/src/components/layout/edit/destination/DestinationEditRoutes.vue
View file

@ -164,7 +164,7 @@ export default {
}, },
rateD2d: { rateD2d: {
get() { get() {
return this.destination.rate_d2d?.toFixed(2) ?? '0.00'; return this.destination.rate_d2d?.toFixed(2) ?? null;
}, },
set(value) { set(value) {
this.destination && (this.destination.rate_d2d = value); this.destination && (this.destination.rate_d2d = value);
@ -172,7 +172,7 @@ export default {
}, },
leadtimeD2d: { leadtimeD2d: {
get() { get() {
return this.destination.lead_time_d2d?.toFixed() ?? '0'; return this.destination.lead_time_d2d === 0 ? null : (this.destination.lead_time_d2d?.toFixed() ?? null);
}, },
set(value) { set(value) {
this.destination && (this.destination.lead_time_d2d = value); this.destination && (this.destination.lead_time_d2d = value);