This commit is contained in:
@@ -908,6 +908,7 @@ BUILD 8.0.0-beta.1-rc3 CHANGES OF NOTE
|
|||||||
- Seeder, minor changes to ensure future work orders don't have labor or other things that don't make sense if future date
|
- Seeder, minor changes to ensure future work orders don't have labor or other things that don't make sense if future date
|
||||||
- seeder now 10% of future wo have no scheduled users set to show off unscheduled widget
|
- seeder now 10% of future wo have no scheduled users set to show off unscheduled widget
|
||||||
- seeder no CSR generated in future
|
- seeder no CSR generated in future
|
||||||
|
- Fixed bug in data table filter controle when changing existing filter AND OR conditions radio buttons was not flagging as dirty so it could be saved
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -21,7 +21,9 @@ export default {
|
|||||||
settings: {
|
settings: {
|
||||||
customTitle: null,
|
customTitle: null,
|
||||||
wotags: [],
|
wotags: [],
|
||||||
woitemtags: []
|
wotagsany: true,
|
||||||
|
woitemtags: [],
|
||||||
|
woitemtagsany: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -49,20 +49,53 @@
|
|||||||
</v-card-title>
|
</v-card-title>
|
||||||
|
|
||||||
<v-card-text>
|
<v-card-text>
|
||||||
|
<v-text-field
|
||||||
|
v-model="localSettings.customTitle"
|
||||||
|
class="mt-4"
|
||||||
|
:label="$ay.t('Name')"
|
||||||
|
></v-text-field>
|
||||||
|
|
||||||
<gz-tag-picker
|
<gz-tag-picker
|
||||||
v-model="localSettings.wotags"
|
v-model="localSettings.wotags"
|
||||||
|
class="mt-4"
|
||||||
:label="$ay.t('Tags') + ' - ' + $ay.t('WorkOrder')"
|
:label="$ay.t('Tags') + ' - ' + $ay.t('WorkOrder')"
|
||||||
></gz-tag-picker>
|
></gz-tag-picker>
|
||||||
|
<v-radio-group
|
||||||
|
v-if="localSettings.wotags.length > 1"
|
||||||
|
v-model="localSettings.wotagsany"
|
||||||
|
row
|
||||||
|
class="mt-n3"
|
||||||
|
>
|
||||||
|
<v-radio
|
||||||
|
:label="$ay.t('GridFilterDialogAndRadioText')"
|
||||||
|
:value="false"
|
||||||
|
></v-radio>
|
||||||
|
<v-radio
|
||||||
|
:label="$ay.t('GridFilterDialogOrRadioText')"
|
||||||
|
:value="true"
|
||||||
|
></v-radio>
|
||||||
|
</v-radio-group>
|
||||||
|
|
||||||
<gz-tag-picker
|
<gz-tag-picker
|
||||||
v-model="localSettings.woitemtags"
|
v-model="localSettings.woitemtags"
|
||||||
|
class="mt-4"
|
||||||
:label="$ay.t('Tags') + ' - ' + $ay.t('WorkOrderItem')"
|
:label="$ay.t('Tags') + ' - ' + $ay.t('WorkOrderItem')"
|
||||||
></gz-tag-picker>
|
></gz-tag-picker>
|
||||||
|
<v-radio-group
|
||||||
<v-text-field
|
v-if="localSettings.woitemtags.length > 1"
|
||||||
v-model="localSettings.customTitle"
|
v-model="localSettings.woitemtagsany"
|
||||||
:label="$ay.t('Name')"
|
row
|
||||||
></v-text-field>
|
class="mt-n3"
|
||||||
|
>
|
||||||
|
<v-radio
|
||||||
|
:label="$ay.t('GridFilterDialogAndRadioText')"
|
||||||
|
:value="false"
|
||||||
|
></v-radio>
|
||||||
|
<v-radio
|
||||||
|
:label="$ay.t('GridFilterDialogOrRadioText')"
|
||||||
|
:value="true"
|
||||||
|
></v-radio>
|
||||||
|
</v-radio-group>
|
||||||
</v-card-text>
|
</v-card-text>
|
||||||
|
|
||||||
<v-divider></v-divider>
|
<v-divider></v-divider>
|
||||||
@@ -164,7 +197,9 @@ async function fetchTranslatedText() {
|
|||||||
"Name",
|
"Name",
|
||||||
"WorkOrder",
|
"WorkOrder",
|
||||||
"WorkOrderItem",
|
"WorkOrderItem",
|
||||||
"NoData"
|
"NoData",
|
||||||
|
"GridFilterDialogAndRadioText",
|
||||||
|
"GridFilterDialogOrRadioText"
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -317,7 +317,11 @@
|
|||||||
<v-list elevation="2">
|
<v-list elevation="2">
|
||||||
<v-subheader v-if="editItem.filter.items.length > 1">
|
<v-subheader v-if="editItem.filter.items.length > 1">
|
||||||
<!-- AND / OR FILTER CONDITIONS -->
|
<!-- AND / OR FILTER CONDITIONS -->
|
||||||
<v-radio-group v-model="editItem.filter.any" row>
|
<v-radio-group
|
||||||
|
v-model="editItem.filter.any"
|
||||||
|
row
|
||||||
|
@change="formState.dirty = true"
|
||||||
|
>
|
||||||
<v-radio
|
<v-radio
|
||||||
:label="$ay.t('GridFilterDialogAndRadioText')"
|
:label="$ay.t('GridFilterDialogAndRadioText')"
|
||||||
:value="false"
|
:value="false"
|
||||||
|
|||||||
Reference in New Issue
Block a user