diff --git a/resources/js/Components/Elements/Buttons/Button.vue b/resources/js/Components/Elements/Buttons/Button.vue index 4a62a018f7..164a87c90f 100644 --- a/resources/js/Components/Elements/Buttons/Button.vue +++ b/resources/js/Components/Elements/Buttons/Button.vue @@ -8,7 +8,7 @@ import { trans } from 'laravel-vue-i18n' import { faSave as fadSave } from '@fad' import { library } from '@fortawesome/fontawesome-svg-core' -import {faClipboard, faDownload, faFileExport, faPlus as falPlus} from '@fal' +import {faClipboard, faDownload, faFileExport, faPlus as falPlus, faHistory} from '@fal' import { faArrowLeft, faPencil, faTrashAlt, faPersonDolly } from '@far' import { faPlus, faSave, faUpload, faTrashUndoAlt } from '@fas' import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome" @@ -19,7 +19,7 @@ import { inject } from 'vue' // const layout = useLayoutStore() const layout: any = inject('layout', {}) -library.add(faPlus, faSave, fadSave, faUpload, faDownload, falPlus, faArrowLeft, faPencil, faTrashAlt, faSpinnerThird, faTrashUndoAlt, faPersonDolly, faFileExport, faClipboard) +library.add(faPlus, faSave, fadSave, faUpload, faDownload, falPlus, faArrowLeft, faPencil, faTrashAlt, faSpinnerThird, faTrashUndoAlt, faPersonDolly, faFileExport, faClipboard, faHistory) const props = withDefaults(defineProps<{ diff --git a/resources/js/Components/Rental/Agreement.vue b/resources/js/Components/Rental/Agreement.vue index f8582958d3..a98940be5a 100644 --- a/resources/js/Components/Rental/Agreement.vue +++ b/resources/js/Components/Rental/Agreement.vue @@ -7,11 +7,10 @@ import ServicesBluprint from './Bluprint/services.js' import PhysicalGoodsBluprint from './Bluprint/physicalGoods.js' import { inject } from 'vue' import { layoutStructure } from '@/Composables/useLayoutStructure' +import { cloneDeep } from 'lodash' const layout = inject('layout', layoutStructure) - - const props = defineProps<{ form: any fieldName: string @@ -57,11 +56,12 @@ const tabs = ref([ ]) + onBeforeMount(() => { props.form[props.fieldName] = { - rentals: props.fieldData?.rentals.data, - physical_goods: props.fieldData?.physical_goods.data, - services: props.fieldData?.services.data, + rentals: cloneDeep(props.fieldData?.rentals?.data), + physical_goods: cloneDeep(props.fieldData?.physical_goods.data), + services: cloneDeep(props.fieldData?.services.data), } }) diff --git a/resources/js/Components/Rental/Table.vue b/resources/js/Components/Rental/Table.vue index 4731fe2037..a314298510 100644 --- a/resources/js/Components/Rental/Table.vue +++ b/resources/js/Components/Rental/Table.vue @@ -67,11 +67,16 @@ const onBulkDiscount = (close: Function) => { } +const resetValue=()=>{ + props.form[props.fieldName][props.bluprint.key] = props.fieldData[props.bluprint.key].data +} + +