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
2022-02-11 18:47:14 +00:00
parent 2c6f045ccf
commit f79d3c0c74
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ayanova/src/components/pm-item-tasks.vue
View File

@@ -145,7 +145,9 @@
:items="pvm.selectLists.woItemTaskCompletionTypes" :items="pvm.selectLists.woItemTaskCompletionTypes"
item-text="name" item-text="name"
item-value="id" item-value="id"
:readonly="formState.readOnly || isDeleted" :readonly="
formState.readOnly || isDeleted || isNotRestrictedUsersRecord
"
:disabled="isDeleted" :disabled="isDeleted"
:label="$ay.t('WorkOrderItemTaskWorkOrderItemTaskCompletionType')" :label="$ay.t('WorkOrderItemTaskWorkOrderItemTaskCompletionType')"
data-cy="usertype" data-cy="usertype"
@@ -225,7 +227,7 @@
.completedDate .completedDate
" "
:label="$ay.t('WorkOrderItemTaskCompletedDate')" :label="$ay.t('WorkOrderItemTaskCompletedDate')"
:readonly="formState.readOnly" :readonly="formState.readOnly || isNotRestrictedUsersRecord"
:disabled="isDeleted" :disabled="isDeleted"
data-cy="travelCompletedDate" data-cy="travelCompletedDate"
:error-messages=" :error-messages="
@@ -449,6 +451,15 @@ export default {
}, },
canDeleteAll: function() { canDeleteAll: function() {
return this.pvm.rights.change && !this.value.userIsRestrictedType; return this.pvm.rights.change && !this.value.userIsRestrictedType;
},
isNotRestrictedUsersRecord: function() {
if (this.value.userIsRestrictedType) {
return (
this.value.items[this.activeWoItemIndex].tasks[this.activeItemIndex]
.completedByUserId != this.$store.state.userId
);
}
return false;
} }
}, },
watch: { watch: {

15
ayanova/src/components/quote-item-tasks.vue
View File

@@ -145,7 +145,9 @@
:items="pvm.selectLists.woItemTaskCompletionTypes" :items="pvm.selectLists.woItemTaskCompletionTypes"
item-text="name" item-text="name"
item-value="id" item-value="id"
:readonly="formState.readOnly || isDeleted" :readonly="
formState.readOnly || isDeleted || isNotRestrictedUsersRecord
"
:disabled="isDeleted" :disabled="isDeleted"
:label="$ay.t('WorkOrderItemTaskWorkOrderItemTaskCompletionType')" :label="$ay.t('WorkOrderItemTaskWorkOrderItemTaskCompletionType')"
data-cy="usertype" data-cy="usertype"
@@ -225,7 +227,7 @@
.completedDate .completedDate
" "
:label="$ay.t('WorkOrderItemTaskCompletedDate')" :label="$ay.t('WorkOrderItemTaskCompletedDate')"
:readonly="formState.readOnly" :readonly="formState.readOnly || isNotRestrictedUsersRecord"
:disabled="isDeleted" :disabled="isDeleted"
data-cy="travelCompletedDate" data-cy="travelCompletedDate"
:error-messages=" :error-messages="
@@ -447,6 +449,15 @@ export default {
}, },
canDeleteAll: function() { canDeleteAll: function() {
return this.pvm.rights.change && !this.value.userIsRestrictedType; return this.pvm.rights.change && !this.value.userIsRestrictedType;
},
isNotRestrictedUsersRecord: function() {
if (this.value.userIsRestrictedType) {
return (
this.value.items[this.activeWoItemIndex].tasks[this.activeItemIndex]
.completedByUserId != this.$store.state.userId
);
}
return false;
} }
}, },
watch: { watch: {