This commit is contained in:
2020-02-21 16:34:54 +00:00
parent 29c07bf140
commit 3874962fc7
2 changed files with 77 additions and 7 deletions

View File

@@ -212,7 +212,31 @@
<!-- INTEGER BUILDER --> <!-- INTEGER BUILDER -->
<div v-if="item.uiFieldDataType === 5"> <div v-if="item.uiFieldDataType === 5">
INTEGER BUILDER <v-select
v-model="item.tempFilterOperator"
:items="pickLists.integerFilterOperators"
item-text="name"
item-value="id"
:label="lt('Filter')"
prepend-icon="fa-filter"
></v-select>
<v-text-field
v-if="
item.tempFilterOperator != null &&
item.tempFilterOperator != '*NOVALUE*' &&
item.tempFilterOperator != '*HASVALUE*'
"
v-model="item.tempFilterValue"
clearable
type="number"
></v-text-field>
<v-btn
large
block
v-if="item.tempFilterOperator != null"
@click="addFilterCondition(item)"
><v-icon large>fa-plus</v-icon></v-btn
>
</div> </div>
<!-- BOOL BUILDER --> <!-- BOOL BUILDER -->
<div v-if="item.uiFieldDataType === 6"> <div v-if="item.uiFieldDataType === 6">
@@ -221,11 +245,57 @@
<!-- DECIMAL BUILDER --> <!-- DECIMAL BUILDER -->
<div v-if="item.uiFieldDataType === 7"> <div v-if="item.uiFieldDataType === 7">
DECIMAL BUILDER <v-select
v-model="item.tempFilterOperator"
:items="pickLists.integerFilterOperators"
item-text="name"
item-value="id"
:label="lt('Filter')"
prepend-icon="fa-filter"
></v-select>
<gz-decimal
v-if="
item.tempFilterOperator != null &&
item.tempFilterOperator != '*NOVALUE*' &&
item.tempFilterOperator != '*HASVALUE*'
"
v-model="item.tempFilterValue"
clearable
></gz-decimal>
<v-btn
large
block
v-if="item.tempFilterOperator != null"
@click="addFilterCondition(item)"
><v-icon large>fa-plus</v-icon></v-btn
>
</div> </div>
<!-- CURRENCY BUILDER --> <!-- CURRENCY BUILDER -->
<div v-if="item.uiFieldDataType === 8"> <div v-if="item.uiFieldDataType === 8">
CURRENCY BUILDER <v-select
v-model="item.tempFilterOperator"
:items="pickLists.integerFilterOperators"
item-text="name"
item-value="id"
:label="lt('Filter')"
prepend-icon="fa-filter"
></v-select>
<gz-currency
v-if="
item.tempFilterOperator != null &&
item.tempFilterOperator != '*NOVALUE*' &&
item.tempFilterOperator != '*HASVALUE*'
"
v-model="item.tempFilterValue"
clearable
></gz-currency>
<v-btn
large
block
v-if="item.tempFilterOperator != null"
@click="addFilterCondition(item)"
><v-icon large>fa-plus</v-icon></v-btn
>
</div> </div>
<!-- TAG BUILDER --> <!-- TAG BUILDER -->
<div v-if="item.uiFieldDataType === 9">TAG BUILDER</div> <div v-if="item.uiFieldDataType === 9">TAG BUILDER</div>

View File

@@ -82,7 +82,7 @@
lg="4" lg="4"
xl="3" xl="3"
> >
<!-- <gz-currency <gz-currency
v-model="obj.dollarAmount" v-model="obj.dollarAmount"
:readonly="this.formState.readOnly" :readonly="this.formState.readOnly"
:label="lt('WidgetDollarAmount')" :label="lt('WidgetDollarAmount')"
@@ -93,9 +93,9 @@
]" ]"
:error-messages="form().serverErrors(this, 'dollarAmount')" :error-messages="form().serverErrors(this, 'dollarAmount')"
@input="onChange('dollarAmount')" @input="onChange('dollarAmount')"
></gz-currency> --> ></gz-currency>
<gz-decimal <!-- <gz-decimal
v-model="obj.dollarAmount" v-model="obj.dollarAmount"
:readonly="this.formState.readOnly" :readonly="this.formState.readOnly"
:label="lt('WidgetDollarAmount')" :label="lt('WidgetDollarAmount')"
@@ -106,7 +106,7 @@
]" ]"
:error-messages="form().serverErrors(this, 'dollarAmount')" :error-messages="form().serverErrors(this, 'dollarAmount')"
@input="onChange('dollarAmount')" @input="onChange('dollarAmount')"
></gz-decimal> ></gz-decimal> -->
</v-col> </v-col>
<v-col cols="12" sm="6" lg="4" xl="3"> <v-col cols="12" sm="6" lg="4" xl="3">