Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@elsad3631
elsad3631 committed Mar 25, 2024
1 parent 17eca44 commit 4df6c42
Show file tree
Hide file tree
Showing 20 changed files with 205 additions and 489 deletions.
34 changes: 14 additions & 20 deletions src/components/modals/forms/AddAccessoryModal.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@
<span class="required">Tipologia accessorio</span>
</label>
<!--end::Label-->
<select class="form-select" aria-label="Select example" v-model="formData.AccessoryType">
<option value="">Seleziona la tipologia dell'accessorio...</option>
<option v-for="item in AccessoryTypes" :key="item.id" :value="item.name">{{ item.name }}</option>
<select class="form-select" aria-label="Select example" v-model="formData.AccessoryTypeId">
<option value="0">Seleziona la tipologia dell'accessorio...</option>
<option v-for="item in AccessoryTypes" :key="item.id" :value="item.id">{{ item.name }}</option>
</select>
</div>
<!--end::Input group-->
Expand All @@ -89,9 +89,9 @@
<span class="required">Fornitore</span>
</label>
<!--end::Label-->
<select class="form-select" aria-label="Select example" v-model="formData.Supplier">
<option value="">Seleziona il fornitore...</option>
<option v-for="item in Suppliers" :key="item.id" :value="item.name">{{ item.name }}</option>
<select class="form-select" aria-label="Select example" v-model="formData.SupplierId">
<option value="0">Seleziona il fornitore...</option>
<option v-for="item in Suppliers" :key="item.id" :value="item.id">{{ item.name }}</option>
</select>
</div>
<!--end::Input group-->
Expand Down Expand Up @@ -162,9 +162,9 @@
<span class="required">Tipologia consegna</span>
</label>
<!--end::Label-->
<select class="form-select" aria-label="Select example" v-model="formData.DeliveryType">
<option value="">Seleziona la modalità di consegna...</option>
<option v-for="item in DeliveryTypes" :key="item.id" :value="item.name">{{ item.name }}</option>
<select class="form-select" aria-label="Select example" v-model="formData.DeliveryTypeId">
<option value="0">Seleziona la modalità di consegna...</option>
<option v-for="item in DeliveryTypes" :key="item.id" :value="item.id">{{ item.name }}</option>
</select>
</div>
<!--end::Input group-->
Expand Down Expand Up @@ -310,14 +310,12 @@ export default defineComponent({
});
const submit = () => {
const accessoryType = AccessoryTypes.value.find(option => option.name === formData.value.AccessoryType);
const supplier = Suppliers.value.find(option => option.name === formData.value.Supplier);
const deliveryType = DeliveryTypes.value.find(option => option.name === formData.value.DeliveryType);
if (!formRef.value) {
return;
}
if(accessoryType === undefined){
if(formData.value.AccessoryTypeId === 0){
Swal.fire({
text: "Attenzione, selezionare la tipologia dell'accessorio.",
icon: "error",
Expand All @@ -330,7 +328,7 @@ export default defineComponent({
});
return;
}
if(supplier === undefined){
if(formData.value.SupplierId === 0){
Swal.fire({
text: "Attenzione, selezionare il fornitore.",
icon: "error",
Expand All @@ -343,7 +341,7 @@ export default defineComponent({
});
return;
}
if(deliveryType === undefined){
if(formData.value.DeliveryTypeId === 0){
Swal.fire({
text: "Attenzione, selezionare il metodo di pagamento.",
icon: "error",
Expand All @@ -357,14 +355,10 @@ export default defineComponent({
return;
}
formData.value.AccessoryTypeId = accessoryType.id;
formData.value.SupplierId = supplier.id;
formData.value.DeliveryTypeId = deliveryType.id;
formRef.value.validate((valid: boolean) => {
if (valid) {
loading.value = true;
console.log(formData.value)
ApiService.post(`${controller}/Create`, formData.value)
.then(() => {
loading.value = false;
Expand Down
36 changes: 15 additions & 21 deletions src/components/modals/forms/AddCustomerModal.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
<span class="required">Tipologia cliente</span>
</label>
<!--end::Label-->
<select class="form-select" aria-label="Select example" v-model="formData.CustomerType">
<option value="">Seleziona la tipologia cliente...</option>
<option v-for="item in CustomerTypes" :key="item.id" :value="item.name">{{ item.name }}</option>
<select class="form-select" aria-label="Select example" v-model="formData.CustomerTypeId">
<option value="0">Seleziona la tipologia cliente...</option>
<option v-for="item in CustomerTypes" :key="item.id" :value="item.id">{{ item.name }}</option>
</select>
</div>
<!--end::Input group-->
Expand All @@ -65,9 +65,9 @@
<span class="required">Modalità di pagamento</span>
</label>
<!--end::Label-->
<select class="form-select" aria-label="Select example" v-model="formData.PaymentType">
<option value="">Seleziona la modalità di pagamento...</option>
<option v-for="item in PaymentTypes" :key="item.id" :value="item.name">{{ item.name }}</option>
<select class="form-select" aria-label="Select example" v-model="formData.PaymentTypeId">
<option value="0">Seleziona la modalità di pagamento...</option>
<option v-for="item in PaymentTypes" :key="item.id" :value="item.id">{{ item.name }}</option>
</select>
</div>
<!--end::Input group-->
Expand All @@ -79,9 +79,9 @@
<span class="required">Modalità di consegna</span>
</label>
<!--end::Label-->
<select class="form-select" aria-label="Select example" v-model="formData.DeliveryType">
<option value="">Seleziona la modalità di consegna...</option>
<option v-for="item in DeliveryTypes" :key="item.id" :value="item.name">{{ item.name }}</option>
<select class="form-select" aria-label="Select example" v-model="formData.DeliveryTypeId">
<option value="0">Seleziona la modalità di consegna...</option>
<option v-for="item in DeliveryTypes" :key="item.id" :value="item.id">{{ item.name }}</option>
</select>
</div>
<!--end::Input group-->
Expand Down Expand Up @@ -575,14 +575,12 @@ export default defineComponent({
});
const submit = () => {
const customerType = CustomerTypes.value.find(option => option.name === formData.value.CustomerType);
const paymentType = PaymentTypes.value.find(option => option.name === formData.value.PaymentType);
const deliveryType = DeliveryTypes.value.find(option => option.name === formData.value.DeliveryType);
if (!formRef.value) {
return;
}
if (customerType === undefined) {
if (formData.value.CustomerTypeId === 0) {
Swal.fire({
text: "Attenzione, selezionare la tipologia di cliente.",
icon: "error",
Expand All @@ -595,7 +593,7 @@ export default defineComponent({
});
return;
}
if (paymentType === undefined) {
if (formData.value.PaymentTypeId === 0) {
Swal.fire({
text: "Attenzione, selezionare il metodo di pagamento.",
icon: "error",
Expand All @@ -608,7 +606,7 @@ export default defineComponent({
});
return;
}
if (deliveryType === undefined) {
if (formData.value.DeliveryTypeId === 0) {
Swal.fire({
text: "Attenzione, selezionare il modalità di consegna.",
icon: "error",
Expand All @@ -621,15 +619,11 @@ export default defineComponent({
});
return;
}
formData.value.CustomerTypeId = customerType.id;
formData.value.PaymentTypeId = paymentType.id;
formData.value.DeliveryTypeId = deliveryType.id;
formRef.value.validate((valid: boolean) => {
if (valid) {
loading.value = true;
console.log(formData.value)
ApiService.post(`${controller}/Create`, formData.value)
.then(() => {
Expand Down
31 changes: 5 additions & 26 deletions src/components/modals/forms/AddGoodReceiptModal.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
<!--begin::Input group-->
<div class="fv-row mb-7">
<!--begin::Label-->
<label class="fs-6 fw-semobold mb-2">Quantità</label>
<label class="required fs-6 fw-semobold mb-2">Quantità</label>
<!--end::Label-->
<input class="form-control" v-model="formData.Quantity" type="number" placeholder="Quantità..." />
</div>
Expand All @@ -94,7 +94,7 @@
</label>
<!--end::Label-->
<select class="form-select" aria-label="Select example" v-model="formData.SupplierId">
<option value="">Seleziona il fornitore...</option>
<option value="0">Seleziona il fornitore...</option>
<option v-for="item in Suppliers" :key="item.id" :value="item.id">{{ item.name }}</option>
</select>
</div>
Expand Down Expand Up @@ -259,26 +259,7 @@ export default defineComponent({
})
const submit = () => {
// let goodSupplierId = ref(0);
// if (formData.value.TypeId == 0) {
// const accessory = Accessories.value.find(option => option.name === formData.value.GoodName);
// formData.value.GoodId = accessory?.id || 0;
// formData.value.GoodName = accessory?.name || "";
// goodSupplierId.value = accessory?.supplierId || 0;
// } else if (formData.value.TypeId == 1) {
// const profile = Profiles.value.find(option => option.name === formData.value.GoodName);
// formData.value.GoodId = profile?.id || 0;
// formData.value.GoodName = profile?.name || "";
// goodSupplierId.value = profile?.supplierId || 0;
// } else if (formData.value.TypeId == 2) {
// const material = Materials.value.find(option => option.name === formData.value.GoodName);
// formData.value.GoodId = material?.id || 0;
// formData.value.GoodName = material?.name || "";
// goodSupplierId.value = material?.supplierId || 0;
// }
// const supplier = Suppliers.value.find(option => option.name === formData.value.Supplier);
if (!formRef.value) {
return;
}
Expand All @@ -298,13 +279,11 @@ export default defineComponent({
}
formData.value.GoodName = GoodsList.value.find(option => option.id === formData.value.GoodId)?.name || "";
// formData.value.SupplierId = supplier?.id || 0;
formRef.value.validate((valid: boolean) => {
if (valid) {
loading.value = true;
console.log(formData.value)
ApiService.post(`${controller}/Create`, formData.value)
.then(() => {
loading.value = false;
Expand Down
34 changes: 14 additions & 20 deletions src/components/modals/forms/AddMaterialModal.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@
<span class="required">Tipologia materiale</span>
</label>
<!--end::Label-->
<select class="form-select" aria-label="Select example" v-model="formData.MaterialType">
<option value="">Seleziona la tipologia dell'accessorio...</option>
<option v-for="item in MaterialTypes" :key="item.id" :value="item.name">{{ item.name }}</option>
<select class="form-select" aria-label="Select example" v-model="formData.MaterialTypeId">
<option value="0">Seleziona la tipologia dell'accessorio...</option>
<option v-for="item in MaterialTypes" :key="item.id" :value="item.id">{{ item.name }}</option>
</select>
</div>
<!--end::Input group-->
Expand All @@ -89,9 +89,9 @@
<span class="required">Fornitore</span>
</label>
<!--end::Label-->
<select class="form-select" aria-label="Select example" v-model="formData.Supplier">
<option value="">Seleziona il fornitore...</option>
<option v-for="item in Suppliers" :key="item.id" :value="item.name">{{ item.name }}</option>
<select class="form-select" aria-label="Select example" v-model="formData.SupplierId">
<option value="0">Seleziona il fornitore...</option>
<option v-for="item in Suppliers" :key="item.id" :value="item.id">{{ item.name }}</option>
</select>
</div>
<!--end::Input group-->
Expand Down Expand Up @@ -180,9 +180,9 @@
<span class="required">Tipologia consegna</span>
</label>
<!--end::Label-->
<select class="form-select" aria-label="Select example" v-model="formData.DeliveryType">
<option value="">Seleziona la modalità di consegna...</option>
<option v-for="item in DeliveryTypes" :key="item.id" :value="item.name">{{ item.name }}</option>
<select class="form-select" aria-label="Select example" v-model="formData.DeliveryTypeId">
<option value="0">Seleziona la modalità di consegna...</option>
<option v-for="item in DeliveryTypes" :key="item.id" :value="item.id">{{ item.name }}</option>
</select>
</div>
<!--end::Input group-->
Expand Down Expand Up @@ -320,14 +320,12 @@ export default defineComponent({
});
const submit = () => {
const materialType = MaterialTypes.value.find(option => option.name === formData.value.MaterialType);
const supplier = Suppliers.value.find(option => option.name === formData.value.Supplier);
const deliveryType = DeliveryTypes.value.find(option => option.name === formData.value.DeliveryType);
if (!formRef.value) {
return;
}
if(materialType === undefined){
if(formData.value.MaterialTypeId === 0){
Swal.fire({
text: "Attenzione, selezionare la tipologia del materiale.",
icon: "error",
Expand All @@ -340,7 +338,7 @@ export default defineComponent({
});
return;
}
if(supplier === undefined){
if(formData.value.SupplierId === 0){
Swal.fire({
text: "Attenzione, selezionare il fornitore.",
icon: "error",
Expand All @@ -353,7 +351,7 @@ export default defineComponent({
});
return;
}
if(deliveryType === undefined){
if(formData.value.DeliveryTypeId === 0){
Swal.fire({
text: "Attenzione, selezionare il metodo di pagamento.",
icon: "error",
Expand All @@ -366,11 +364,7 @@ export default defineComponent({
});
return;
}
formData.value.MaterialTypeId = materialType.id;
formData.value.SupplierId = supplier.id;
formData.value.DeliveryTypeId = deliveryType.id;
console.log(formData.value)
formRef.value.validate((valid: boolean) => {
if (valid) {
loading.value = true;
Expand Down
2 changes: 1 addition & 1 deletion src/components/modals/forms/AddModuleXmlModal.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ export default defineComponent({
formRef.value.validate((valid: boolean) => {
if (valid) {
loading.value = true;
console.log(formData.value)
ApiService.post(`${controller}/Create`, formData.value)
.then(() => {
loading.value = false;
Expand Down
Loading

0 comments on commit 4df6c42

Please sign in to comment.