This commit is contained in:
2022-01-24 00:09:43 +00:00
parent 74cb4207b9
commit 964970baa6
2 changed files with 22 additions and 40 deletions

View File

@@ -107,13 +107,7 @@
}}<v-icon right large>$ayiTrashRestoreAlt</v-icon></v-btn }}<v-icon right large>$ayiTrashRestoreAlt</v-icon></v-btn
> >
<v-col <v-col cols="12" sm="6" lg="4" xl="3">
v-if="form().showMe(this, 'WorkOrderItemPartPartID')"
cols="12"
sm="6"
lg="4"
xl="3"
>
<gz-pick-list <gz-pick-list
:ref=" :ref="
`Items[${activeWoItemIndex}].parts[${activeItemIndex}].partId` `Items[${activeWoItemIndex}].parts[${activeItemIndex}].partId`
@@ -579,13 +573,12 @@ export default {
headerList: function() { headerList: function() {
const headers = []; const headers = [];
if (this.form().showMe(this, "WorkOrderItemPartPartID")) { //always required
headers.push({ headers.push({
text: this.$ay.t("WorkOrderItemPartPartID"), text: this.$ay.t("WorkOrderItemPartPartID"),
align: "left", align: "left",
value: "partNameViz" value: "partNameViz"
}); });
}
if ( if (
this.pvm.useInventory && this.pvm.useInventory &&

View File

@@ -97,7 +97,7 @@
> >
<v-col <v-col
v-if="form().showMe(this, 'WorkOrderItemTaskSequence')" v-if="form().showMe(this, 'Sequence')"
cols="12" cols="12"
sm="6" sm="6"
lg="4" lg="4"
@@ -135,12 +135,7 @@
</v-col> </v-col>
<v-col <v-col
v-if=" v-if="form().showMe(this, 'Status')"
form().showMe(
this,
'WorkOrderItemTaskWorkOrderItemTaskCompletionType'
)
"
cols="12" cols="12"
sm="6" sm="6"
lg="4" lg="4"
@@ -182,7 +177,7 @@
</v-col> </v-col>
<v-col <v-col
v-if="form().showMe(this, 'WorkOrderItemTaskUser')" v-if="form().showMe(this, 'CompletedByUserId')"
cols="12" cols="12"
sm="6" sm="6"
lg="4" lg="4"
@@ -221,7 +216,7 @@
</v-col> </v-col>
<v-col <v-col
v-if="form().showMe(this, 'WorkOrderItemTaskCompletedDate')" v-if="form().showMe(this, 'CompletedDate')"
cols="12" cols="12"
sm="6" sm="6"
lg="4" lg="4"
@@ -253,7 +248,7 @@
></gz-date-time-picker> ></gz-date-time-picker>
</v-col> </v-col>
<v-col v-if="form().showMe(this, 'WorkOrderItemTaskTaskID')" cols="12"> <v-col cols="12">
<v-textarea <v-textarea
:ref="`Items[${activeWoItemIndex}].tasks[${activeItemIndex}].task`" :ref="`Items[${activeWoItemIndex}].tasks[${activeItemIndex}].task`"
v-model="value.items[activeWoItemIndex].tasks[activeItemIndex].task" v-model="value.items[activeWoItemIndex].tasks[activeItemIndex].task"
@@ -371,7 +366,7 @@ export default {
headerList: function() { headerList: function() {
const headers = []; const headers = [];
if (this.form().showMe(this, "WorkOrderItemTaskSequence")) { if (this.form().showMe(this, "Sequence")) {
headers.push({ headers.push({
text: this.$ay.t("Sequence"), text: this.$ay.t("Sequence"),
align: "left", align: "left",
@@ -379,15 +374,14 @@ export default {
}); });
} }
if (this.form().showMe(this, "WorkOrderItemTaskTaskID")) { //always required
headers.push({ headers.push({
text: this.$ay.t("WorkOrderItemTaskTaskID"), text: this.$ay.t("WorkOrderItemTaskTaskID"),
align: "start", align: "start",
value: "task" value: "task"
}); });
}
if (this.form().showMe(this, "WorkOrderItemTaskUser")) { if (this.form().showMe(this, "CompletedByUserId")) {
headers.push({ headers.push({
text: this.$ay.t("WorkOrderItemTaskUser"), text: this.$ay.t("WorkOrderItemTaskUser"),
align: "start", align: "start",
@@ -395,12 +389,7 @@ export default {
}); });
} }
if ( if (this.form().showMe(this, "Status")) {
this.form().showMe(
this,
"WorkOrderItemTaskWorkOrderItemTaskCompletionType"
)
) {
headers.push({ headers.push({
text: this.$ay.t("WorkOrderItemTaskWorkOrderItemTaskCompletionType"), text: this.$ay.t("WorkOrderItemTaskWorkOrderItemTaskCompletionType"),
align: "start", align: "start",
@@ -408,7 +397,7 @@ export default {
}); });
} }
if (this.form().showMe(this, "WorkOrderItemTaskCompletedDate")) { if (this.form().showMe(this, "CompletedDate")) {
headers.push({ headers.push({
text: this.$ay.t("WorkOrderItemTaskCompletedDate"), text: this.$ay.t("WorkOrderItemTaskCompletedDate"),
align: "right", align: "right",