-
-
- {{ item.USER_DATA }}
-
-
+
{{ props.row.START_DATE }}
@@ -87,6 +83,7 @@ import ButtonFleft from "../components/home/ButtonFleft.vue";
import ModalNewRequest from "./ModalNewRequest.vue";
import AdvancedFilter from "../components/search/AdvancedFilter";
import TaskCell from "../components/vuetable/TaskCell.vue";
+import CurrentUserCell from "../components/vuetable/CurrentUserCell.vue";
import ModalComments from "./modal/ModalComments.vue";
import api from "./../api/index";
import utils from "./../utils/utils";
@@ -98,6 +95,7 @@ export default {
ButtonFleft,
ModalNewRequest,
TaskCell,
+ CurrentUserCell,
ModalComments
},
props: ["id", "name", "filters"],
@@ -231,7 +229,7 @@ export default {
CASE_TITLE: v.DEL_TITLE,
PROCESS_NAME: v.PRO_TITLE,
TASK: this.formatTasks(v.THREAD_TASKS),
- USER: this.formatUser(v.THREAD_USERS),
+ USER_DATA: this.formatUser(v.THREAD_USERS),
START_DATE: v.APP_CREATE_DATE_LABEL,
FINISH_DATE: v.APP_FINISH_DATE_LABEL,
DURATION: v.DURATION,
@@ -263,12 +261,17 @@ export default {
dataFormat = [];
for (i = 0; i < data.length; i += 1) {
dataFormat.push({
- USER_DATA: utils.userNameDisplayFormat({
+ USERNAME_DISPLAY_FORMAT: utils.userNameDisplayFormat({
userName: data[i].usr_firstname,
firstName: data[i].usr_lastname,
lastName: data[i].usr_username,
format: window.config.FORMATS.format || null
}),
+ EMAIL: data[i].usr_email,
+ POSITION: data[i].usr_position,
+ AVATAR: window.config.SYS_SERVER +
+ window.config.SYS_URI +
+ `users/users_ViewPhotoGrid?pUID=${data[i].user_id}`
});
}
return dataFormat;
diff --git a/resources/assets/js/home/CaseDetail.vue b/resources/assets/js/home/CaseDetail.vue
index b8a7e933c..78247ba24 100644
--- a/resources/assets/js/home/CaseDetail.vue
+++ b/resources/assets/js/home/CaseDetail.vue
@@ -201,6 +201,7 @@ export default {
this.getInputDocuments();
this.getOutputDocuments();
this.getCasesNotes();
+ this.requestOpenSummary();
},
methods: {
postComment(comment, send, files) {
@@ -280,7 +281,7 @@ export default {
action = _.find(response.data, function(o) { return o.id == "ACTIONS"; });
if(action){
option = _.find(action.options, function(o) { return o.fn == "cancelCase"; });
- if(!option.hide){
+ if(option && !option.hide){
that.dataCaseSummary.onClick = () => {
that.$refs["modal-cancel-case"].show();
};
@@ -504,7 +505,24 @@ export default {
ACTION: "todo",
});
this.$emit("onUpdatePage", "XCase");
- }
+ },
+ /**
+ * Verify if the case has the permission Summary Form
+ * to add dynUid in dataCase
+ */
+ requestOpenSummary() {
+ Api.cases
+ .openSummary(this.dataCase)
+ .then((response) => {
+ var data = response.data;
+ if (data.dynUid !== "") {
+ this.dataCase.DYN_UID = data.dynUid;
+ }
+ })
+ .catch((e) => {
+ console.error(e);
+ });
+ },
},
};
diff --git a/resources/assets/js/home/Draft.vue b/resources/assets/js/home/Draft.vue
index 2d5108aaa..816da1484 100644
--- a/resources/assets/js/home/Draft.vue
+++ b/resources/assets/js/home/Draft.vue
@@ -49,6 +49,7 @@ import ModalNewRequest from "./ModalNewRequest.vue";
import CasesFilter from "../components/search/CasesFilter";
import TaskCell from "../components/vuetable/TaskCell.vue";
import api from "./../api/index";
+import utils from "./../utils/utils";
export default {
name: "Draft",
@@ -59,7 +60,7 @@ export default {
TaskCell,
CasesFilter,
},
- props: {},
+ props: ["defaultOption"],
data() {
return {
newCase: {
@@ -106,7 +107,9 @@ export default {
singleClickTimer: null
};
},
- mounted() {},
+ mounted() {
+ this.openDefaultCase();
+ },
watch: {},
computed: {
/**
@@ -119,6 +122,21 @@ export default {
updated() {},
beforeCreate() {},
methods: {
+ /**
+ * Open a case when the component was mounted
+ */
+ openDefaultCase() {
+ let params;
+ if(this.defaultOption) {
+ params = utils.getAllUrlParams(this.defaultOption);
+ if (params && params.app_uid && params.del_index) {
+ this.openCase({
+ APP_UID: params.app_uid,
+ DEL_INDEX: params.del_index
+ });
+ }
+ }
+ },
/**
* On row click event handler
* @param {object} event
diff --git a/resources/assets/js/home/Home.vue b/resources/assets/js/home/Home.vue
index 6bd690521..6ef3c84fa 100644
--- a/resources/assets/js/home/Home.vue
+++ b/resources/assets/js/home/Home.vue
@@ -24,6 +24,7 @@
:id="pageId"
:pageUri="pageUri"
:name="pageName"
+ :defaultOption="defaultOption"
@onSubmitFilter="onSubmitFilter"
@onRemoveFilter="onRemoveFilter"
@onUpdatePage="onUpdatePage"
@@ -78,7 +79,7 @@ export default {
collapsed: false,
selectedTheme: "",
isOnMobile: false,
- sidebarWidth: "310px",
+ sidebarWidth: "260px",
pageId: null,
pageName: null,
pageUri: null,
@@ -93,7 +94,8 @@ export default {
CONSOLIDATED_CASES: "batch-routing",
CASES_TO_REASSIGN: "task-reassignments",
CASES_FOLDERS: "my-documents"
- }
+ },
+ defaultOption: window.config.defaultOption || ''
};
},
mounted() {
@@ -311,7 +313,7 @@ export default {