diff --git a/resources/assets/js/api/Cases.js b/resources/assets/js/api/Cases.js
index 3b0e11d1d..ba41f5f07 100644
--- a/resources/assets/js/api/Cases.js
+++ b/resources/assets/js/api/Cases.js
@@ -12,36 +12,28 @@ export let cases = {
todo(data) {
return Api.get({
service: "TODO_LIST",
- params: {
- paged: data.paged
- },
+ params: data,
keys: {}
});
},
draft(data) {
return Api.get({
service: "DRAFT_LIST",
- params: {
- paged: data.paged
- },
+ params: data,
keys: {}
});
},
paused(data) {
return Api.get({
service: "PAUSED_LIST",
- params: {
- paged: data.paged
- },
+ params: data,
keys: {}
});
},
unassigned(data) {
return Api.get({
service: "UNASSIGNED_LIST",
- params: {
- paged: data.paged
- },
+ params: data,
keys: {}
});
},
@@ -95,15 +87,15 @@ export let cases = {
window.config.SYS_URI +
`appProxy/getNotesList`, params);
},
- pendingtask(data){
+ pendingtask(data) {
return axios.get(window.config.SYS_SERVER +
'/api/1.0/' +
window.config.SYS_WORKSPACE +
'/home/' + data.APP_NUMBER + '/pending-tasks', {
- headers: {
- 'Authorization': 'Bearer ' + window.config.SYS_CREDENTIALS.accessToken
- }
- });
+ headers: {
+ 'Authorization': 'Bearer ' + window.config.SYS_CREDENTIALS.accessToken
+ }
+ });
},
start(dt) {
var params = new URLSearchParams();
@@ -179,7 +171,7 @@ export let casesHeader = {
'/home/counters', {
headers: {
'Authorization': 'Bearer ' + window.config.SYS_CREDENTIALS.accessToken
- }
+ }
});
}
};
diff --git a/resources/assets/js/components/search/CasesFilter.vue b/resources/assets/js/components/search/CasesFilter.vue
new file mode 100644
index 000000000..f75be921b
--- /dev/null
+++ b/resources/assets/js/components/search/CasesFilter.vue
@@ -0,0 +1,314 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/assets/js/components/search/popovers/SearchPopover.vue b/resources/assets/js/components/search/popovers/SearchPopover.vue
index 28975b0d7..f4ccab5ac 100644
--- a/resources/assets/js/components/search/popovers/SearchPopover.vue
+++ b/resources/assets/js/components/search/popovers/SearchPopover.vue
@@ -20,9 +20,11 @@
-
- {{$t('ID_CANCEL')}}
- {{$t('ID_SAVE')}}
+
@@ -56,4 +58,8 @@ export default {
max-width: 650px !important;
min-width: 400px !important;
}
+
+.v-popover-footer{
+ display: flow-root;
+}
\ No newline at end of file
diff --git a/resources/assets/js/home/Draft.vue b/resources/assets/js/home/Draft.vue
index 282178123..00440fffa 100644
--- a/resources/assets/js/home/Draft.vue
+++ b/resources/assets/js/home/Draft.vue
@@ -2,7 +2,11 @@
-
+
{
api.cases
- .draft({
- paged: paged
- })
+ .draft(filters)
.then((response) => {
dt = that.formatDataResponse(response.data.data);
resolutionFunc({
@@ -225,11 +240,20 @@ export default {
DEL_INDEX: item.DEL_INDEX,
PRO_UID: item.PRO_UID,
TAS_UID: item.TAS_UID,
- APP_NUMBER: item.CASE_NUMBER
+ APP_NUMBER: item.CASE_NUMBER,
});
that.$emit("onUpdatePage", "case-detail");
});
},
+ onRemoveFilter(data) {},
+ onUpdateFilters(data) {
+ this.filters = data.params;
+ if (data.refresh) {
+ this.$nextTick(() => {
+ this.$refs["vueTable"].getData();
+ });
+ }
+ },
},
};
diff --git a/resources/assets/js/home/Paused.vue b/resources/assets/js/home/Paused.vue
index 7436d0ada..57831f411 100644
--- a/resources/assets/js/home/Paused.vue
+++ b/resources/assets/js/home/Paused.vue
@@ -2,7 +2,11 @@
-
+
{
api.cases
- .paused({
- paged: paged
- })
+ .paused(filters)
.then((response) => {
dt = that.formatDataResponse(response.data.data);
resolutionFunc({
@@ -239,7 +254,7 @@ export default {
DEL_INDEX: item.DEL_INDEX,
PRO_UID: item.PRO_UID,
TAS_UID: item.TAS_UID,
- APP_NUMBER: item.CASE_NUMBER
+ APP_NUMBER: item.CASE_NUMBER,
});
that.$emit("onUpdatePage", "case-detail");
});
@@ -248,6 +263,15 @@ export default {
this.$refs["modal-unpause-case"].data = item;
this.$refs["modal-unpause-case"].show();
},
+ onRemoveFilter(data) {},
+ onUpdateFilters(data) {
+ this.filters = data.params;
+ if (data.refresh) {
+ this.$nextTick(() => {
+ this.$refs["vueTable"].getData();
+ });
+ }
+ },
},
};
diff --git a/resources/assets/js/home/Todo.vue b/resources/assets/js/home/Todo.vue
index baab86c3b..ded52892a 100644
--- a/resources/assets/js/home/Todo.vue
+++ b/resources/assets/js/home/Todo.vue
@@ -2,7 +2,11 @@
-
+
{
api.cases
- .todo({
- paged: paged
- })
+ .todo(filters)
.then((response) => {
dt = that.formatDataResponse(response.data.data);
resolutionFunc({
@@ -247,11 +261,20 @@ export default {
DEL_INDEX: item.DEL_INDEX,
PRO_UID: item.PRO_UID,
TAS_UID: item.TAS_UID,
- APP_NUMBER: item.CASE_NUMBER
+ APP_NUMBER: item.CASE_NUMBER,
});
that.$emit("onUpdatePage", "case-detail");
});
},
+ onRemoveFilter(data) {},
+ onUpdateFilters(data) {
+ this.filters = data.params;
+ if (data.refresh) {
+ this.$nextTick(() => {
+ this.$refs["vueTable"].getData();
+ });
+ }
+ },
},
};
@@ -262,4 +285,7 @@ export default {
padding-left: 50px;
padding-right: 50px;
}
+.VueTables__limit {
+ display: none;
+}
\ No newline at end of file
diff --git a/resources/assets/js/home/Unassigned.vue b/resources/assets/js/home/Unassigned.vue
index 4d095d46f..f1383794e 100644
--- a/resources/assets/js/home/Unassigned.vue
+++ b/resources/assets/js/home/Unassigned.vue
@@ -2,7 +2,11 @@
-
+
{
api.cases
- .unassigned({
- paged: paged
- })
+ .unassigned(filters)
.then((response) => {
dt = that.formatDataResponse(response.data.data);
resolutionFunc({
@@ -252,11 +267,20 @@ export default {
DEL_INDEX: item.DEL_INDEX,
PRO_UID: item.PRO_UID,
TAS_UID: item.TAS_UID,
- APP_NUMBER: item.CASE_NUMBER
+ APP_NUMBER: item.CASE_NUMBER,
});
that.$emit("onUpdatePage", "case-detail");
});
},
+ onRemoveFilter(data) {},
+ onUpdateFilters(data) {
+ this.filters = data.params;
+ if (data.refresh) {
+ this.$nextTick(() => {
+ this.$refs["vueTable"].getData();
+ });
+ }
+ },
},
};