admin/raven-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-02-22 19:37:02 +00:00
parent 18475d6fe2
commit 98d33c010a
3 changed files with 35 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ayanova/src/api/gzform.js
View File

@@ -143,7 +143,9 @@ export default {
if (vm.formState.loading) { if (vm.formState.loading) {
return true; return true;
} }
// if (ref == "Items.PartId") {
// debugger;
// }
let ctrl = getControl(vm, ref); let ctrl = getControl(vm, ref);
if (typeof ctrl == "undefined") { if (typeof ctrl == "undefined") {
// console.log("gzform:required rule - bailing due to undefined", ref); // console.log("gzform:required rule - bailing due to undefined", ref);
@@ -169,17 +171,7 @@ export default {
}); });
return err; return err;
}, },
// ///////////////////////////////
// // REQUIRED STANDALONE
// // (used in translation form)
// requiredStandAlone(value, fieldName) {
// return (
// !!value ||
// window.$gz.translation
// .get("ErrorRequiredFieldEmpty")
// .replace(/\{0\}/g, fieldName)
// );
// },
/////////////////////////////// ///////////////////////////////
// MAXLENGTH // MAXLENGTH
// //

2
ayanova/src/components/pick-list.vue
View File

@@ -11,6 +11,7 @@
item-text="name" item-text="name"
item-value="id" item-value="id"
item-disabled="!active" item-disabled="!active"
:rules="rules"
:error-messages="errorMessages" :error-messages="errorMessages"
:loading="fetching" :loading="fetching"
:placeholder="$ay.t('Search')" :placeholder="$ay.t('Search')"
@@ -61,6 +62,7 @@ export default {
type: Number, type: Number,
default: null default: null
}, },
rules: { type: Array, default: undefined },
errorMessages: { type: Array, default: null }, errorMessages: { type: Array, default: null },
readonly: { type: Boolean, default: false }, readonly: { type: Boolean, default: false },
disabled: { type: Boolean, default: false }, disabled: { type: Boolean, default: false },

59
ayanova/src/views/inv-purchase-order.vue
View File

@@ -221,12 +221,8 @@
></v-textarea> ></v-textarea>
</v-col> </v-col>
<!-- ################################ PURCHASE ORDER ITEMS LIST ############################### -->
<v-col cols="12"> <v-col cols="12">
<!-- <span class="title">{{ $ay.t("PurchaseOrderItemList") }}</span>
<v-btn @click="getBackupStatus" class="mb-6">
<v-icon>$ayiSync</v-icon>
</v-btn> -->
<v-data-table <v-data-table
:headers="headerList" :headers="headerList"
:items="itemList" :items="itemList"
@@ -305,6 +301,7 @@
:size="60" :size="60"
></v-progress-circular> ></v-progress-circular>
</template> </template>
<!-- ########################## PURCHASE ORDER ITEM EDIT FORM ###############################-->
<template v-if="obj.items.length"> <template v-if="obj.items.length">
<v-row justify="center"> <v-row justify="center">
<v-dialog v-model="editPoItemDialog" persistent> <v-dialog v-model="editPoItemDialog" persistent>
@@ -319,12 +316,14 @@
<v-col cols="12" sm="6" lg="4" xl="3"> <v-col cols="12" sm="6" lg="4" xl="3">
<gz-pick-list <gz-pick-list
:aya-type="ayaTypes().Part" :aya-type="ayaTypes().Part"
:allow-no-selection="false"
:show-edit-icon="true" :show-edit-icon="true"
v-model="obj.items[editPoItemIndex].partId" v-model="obj.items[editPoItemIndex].partId"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:label="$ay.t('Part')" :label="$ay.t('Part')"
ref="partId" ref="Items.PartId"
data-cy="partId" data-cy="Items.PartId"
:rules="[form().required(this, 'Items.PartId')]"
></gz-pick-list> ></gz-pick-list>
</v-col> </v-col>
<v-col cols="12" sm="6" lg="4" xl="3"> <v-col cols="12" sm="6" lg="4" xl="3">
@@ -335,8 +334,8 @@
v-model="obj.items[editPoItemIndex].partWarehouseId" v-model="obj.items[editPoItemIndex].partWarehouseId"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:label="$ay.t('PartWarehouse')" :label="$ay.t('PartWarehouse')"
ref="partWarehouseId" ref="Items.PartWarehouseId"
data-cy="partWarehouseId" data-cy="Items.PartWarehouseId"
></gz-pick-list> ></gz-pick-list>
</v-col> </v-col>
<v-col cols="12" sm="6" lg="4" xl="3"> <v-col cols="12" sm="6" lg="4" xl="3">
@@ -344,11 +343,11 @@
v-model="obj.items[editPoItemIndex].quantityOrdered" v-model="obj.items[editPoItemIndex].quantityOrdered"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:label="$ay.t('PurchaseOrderItemQuantityOrdered')" :label="$ay.t('PurchaseOrderItemQuantityOrdered')"
ref="quantityOrdered" ref="Items.QuantityOrdered"
data-cy="quantityOrdered" data-cy="Items.QuantityOrdered"
:rules="[ :rules="[
form().decimalValid(this, 'quantityOrdered'), form().decimalValid(this, 'Items.QuantityOrdered'),
form().required(this, 'quantityOrdered') form().required(this, 'Items.QuantityOrdered')
]" ]"
></gz-decimal> ></gz-decimal>
</v-col> </v-col>
@@ -358,11 +357,11 @@
v-model="obj.items[editPoItemIndex].quantityReceived" v-model="obj.items[editPoItemIndex].quantityReceived"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:label="$ay.t('PurchaseOrderItemQuantityReceived')" :label="$ay.t('PurchaseOrderItemQuantityReceived')"
ref="quantityReceived" ref="Items.QuantityReceived"
data-cy="quantityReceived" data-cy="Items.QuantityReceived"
:rules="[ :rules="[
form().decimalValid(this, 'quantityReceived'), form().decimalValid(this, 'Items.QuantityReceived'),
form().required(this, 'quantityReceived') form().required(this, 'Items.QuantityReceived')
]" ]"
></gz-decimal> ></gz-decimal>
</v-col> </v-col>
@@ -378,7 +377,7 @@
:label="$ay.t('PurchaseOrderReceiptReceivedDate')" :label="$ay.t('PurchaseOrderReceiptReceivedDate')"
v-model="obj.items[editPoItemIndex].receivedDate" v-model="obj.items[editPoItemIndex].receivedDate"
:readonly="formState.readOnly" :readonly="formState.readOnly"
ref="receivedDate" ref="Items.ReceivedDate"
:error-messages=" :error-messages="
form().serverErrors(this, 'Items.ReceivedDate') form().serverErrors(this, 'Items.ReceivedDate')
" "
@@ -391,11 +390,11 @@
v-model="obj.items[editPoItemIndex].purchaseOrderCost" v-model="obj.items[editPoItemIndex].purchaseOrderCost"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:label="$ay.t('PurchaseOrderItemPurchaseOrderCost')" :label="$ay.t('PurchaseOrderItemPurchaseOrderCost')"
ref="purchaseOrderCost" ref="Items.PurchaseOrderCost"
data-cy="purchaseOrderCost" data-cy="Items.PurchaseOrderCost"
:rules="[ :rules="[
form().decimalValid(this, 'purchaseOrderCost'), form().decimalValid(this, 'Items.PurchaseOrderCost'),
form().required(this, 'purchaseOrderCost') form().required(this, 'Items.PurchaseOrderCost')
]" ]"
></gz-currency> ></gz-currency>
</v-col> </v-col>
@@ -405,8 +404,8 @@
v-model="obj.items[editPoItemIndex].receivedCost" v-model="obj.items[editPoItemIndex].receivedCost"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:label="$ay.t('PurchaseOrderReceiptItemReceiptCost')" :label="$ay.t('PurchaseOrderReceiptItemReceiptCost')"
ref="receivedCost" ref="Items.ReceivedCost"
data-cy="receivedCost" data-cy="Items.ReceivedCost"
:rules="[ :rules="[
form().decimalValid(this, 'Items.ReceivedCost'), form().decimalValid(this, 'Items.ReceivedCost'),
form().required(this, 'Items.ReceivedCost') form().required(this, 'Items.ReceivedCost')
@@ -422,8 +421,8 @@
v-model="obj.items[editPoItemIndex].purchaseTaxCodeId" v-model="obj.items[editPoItemIndex].purchaseTaxCodeId"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:label="$ay.t('TaxCode')" :label="$ay.t('TaxCode')"
ref="purchaseTaxCodeId" ref="Items.PurchaseTaxCodeId"
data-cy="purchaseTaxCodeId" data-cy="Items.PurchaseTaxCodeId"
:error-messages=" :error-messages="
form().serverErrors(this, 'Items.PurchaseTaxCodeId') form().serverErrors(this, 'Items.PurchaseTaxCodeId')
" "
@@ -442,10 +441,10 @@
v-model="obj.items[editPoItemIndex].vendorPartNumber" v-model="obj.items[editPoItemIndex].vendorPartNumber"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:clearable="!formState.readOnly" :clearable="!formState.readOnly"
@click:clear="fieldValueChanged('vendorPartNumber')" @click:clear="fieldValueChanged('Items.VendorPartNumber')"
:label="$ay.t('PurchaseOrderItemVendorPartNumber')" :label="$ay.t('PurchaseOrderItemVendorPartNumber')"
ref="vendorPartNumber" ref="Items.VendorPartNumber"
data-cy="vendorPartNumber" data-cy="Items.VendorPartNumber"
:error-messages=" :error-messages="
form().serverErrors(this, 'Items.VendorPartNumber') form().serverErrors(this, 'Items.VendorPartNumber')
" "
@@ -453,7 +452,7 @@
></v-text-field> ></v-text-field>
</v-col> </v-col>
</v-row> </v-row>
{{ obj.items[editPoItemIndex] }} <!-- {{ obj.items[editPoItemIndex] }} -->
</v-card-text> </v-card-text>
<v-card-actions> <v-card-actions>
<v-spacer></v-spacer> <v-spacer></v-spacer>