This commit is contained in:
2021-05-20 19:12:02 +00:00
parent 246b2b1f01
commit 20ab7cbc4f
4 changed files with 21 additions and 7 deletions

View File

@@ -14,8 +14,15 @@
></gz-pick-list> ></gz-pick-list>
</template> </template>
<template v-else> <template v-else>
<v-btn @click="picking = true">edit</v-btn> <div class="mb-n2 ml-10">
{{ display }} <span class="text-caption">{{ label }}</span>
</div>
<div class="mb-6 mb-sm-0">
<v-btn icon class="ml-n1 mr-2" @click="picking = true">
<v-icon>$ayiEdit</v-icon>
</v-btn>
<span @click="picking = true">{{ display }}</span>
</div>
</template> </template>
</div> </div>
</template> </template>
@@ -23,7 +30,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////////////
/* XXXeslint-disable */ /* XXXeslint-disable */
//////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////
//Note: not perfect detection of lost focus
export default { export default {
data() { data() {
return { return {
@@ -63,6 +70,11 @@ export default {
canClear: { type: Boolean, default: true }, canClear: { type: Boolean, default: true },
label: { type: String, default: "" } label: { type: String, default: "" }
}, },
watch: {
display() {
this.picking = false; //this is to attempt to make the picker go away when the record changes to another, otherwise it seems to stick
}
},
methods: { methods: {
emitInput(e) { emitInput(e) {

View File

@@ -8,7 +8,7 @@
<v-btn icon class="ml-n1 mr-2" @click="openDialog = true"> <v-btn icon class="ml-n1 mr-2" @click="openDialog = true">
<v-icon>$ayiEdit</v-icon> <v-icon>$ayiEdit</v-icon>
</v-btn> </v-btn>
<span>{{ displayServiceAddress }}</span> <span @click="openDialog = true">{{ displayServiceAddress }}</span>
</div> </div>
</template> </template>
<v-row justify="center"> <v-row justify="center">

View File

@@ -344,7 +344,7 @@
></gz-tax-picker> ></gz-tax-picker>
</v-col> </v-col>
<v-col <!-- <v-col
v-if="form().showMe(this, 'WorkOrderItemLaborTaxRateSaleID')" v-if="form().showMe(this, 'WorkOrderItemLaborTaxRateSaleID')"
cols="12" cols="12"
sm="6" sm="6"
@@ -378,7 +378,7 @@
" "
@update:name="taxCodeChange" @update:name="taxCodeChange"
></gz-pick-list> ></gz-pick-list>
</v-col> </v-col> -->
<v-col <v-col
v-if="form().showMe(this, 'LaborPrice')" v-if="form().showMe(this, 'LaborPrice')"

View File

@@ -10,7 +10,9 @@
<v-icon>{{ openIcon() }}</v-icon> <v-icon>{{ openIcon() }}</v-icon>
</v-btn> </v-btn>
<span class="text-h6">{{ pvm.currentState.name }}</span> <span class="text-h6" @click="openDialog = true">{{
pvm.currentState.name
}}</span>
<v-icon :color="pvm.currentState.color" class="ml-4">$ayiFlag</v-icon> <v-icon :color="pvm.currentState.color" class="ml-4">$ayiFlag</v-icon>
<v-icon color="primary" v-if="pvm.currentState.locked" class="ml-4" <v-icon color="primary" v-if="pvm.currentState.locked" class="ml-4"
>$ayiLock</v-icon >$ayiLock</v-icon