From a104fed2992cc603e1a66f854873655c8d7c285c Mon Sep 17 00:00:00 2001 From: yuandongqiang Date: Fri, 19 Sep 2025 16:51:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=B5=81=E7=A8=8B=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../public/index.html | 27 ++++++ .../src/views/ProcesslistHome.vue | 91 +++++++++++++++++-- 2 files changed, 109 insertions(+), 9 deletions(-) diff --git a/com.actionsoft.apps.coe.pal.processlist/public/index.html b/com.actionsoft.apps.coe.pal.processlist/public/index.html index a543d88..476dc10 100644 --- a/com.actionsoft.apps.coe.pal.processlist/public/index.html +++ b/com.actionsoft.apps.coe.pal.processlist/public/index.html @@ -41,12 +41,39 @@ value: 5, label: '五级流程' }]; + var statusSelect =[{ + value: 1, + label: '设计中' + }, { + value: 2, + label: '已发布' + }, { + value: 3, + label: '已停用' + }]; + var useStatusSelect =[{ + value: 1, + label: '使用中' + }, { + value: 2, + label: '非使用中' + }]; + var categorySelect =[{ + value: 1, + label: '自由模型' + }, { + value: 2, + label: 'EPC' + }]; var defaultSelectVal = [1,2,3]; var wHref = "http://localhost:8088/portal/r/w"; <%}else {%> var wsId = "<#wsId>"; var teamId = "<#teamId>"; var levelSelect = <#levelSelect>; + var statusSelect = <#statusSelect>; + var useStatusSelect = <#useStatusSelect>; + var categorySelect = <#categorySelect>; var defaultSelectVal = <#defaultSelectVal>; var wHref = "./w"; <%}%> diff --git a/com.actionsoft.apps.coe.pal.processlist/src/views/ProcesslistHome.vue b/com.actionsoft.apps.coe.pal.processlist/src/views/ProcesslistHome.vue index 388cafd..02d079d 100644 --- a/com.actionsoft.apps.coe.pal.processlist/src/views/ProcesslistHome.vue +++ b/com.actionsoft.apps.coe.pal.processlist/src/views/ProcesslistHome.vue @@ -42,15 +42,35 @@ - + -
+
发布部门
+
+
+ 文件状态 +
+ +
+ 使用状态 +
+ +
+
+
+ 生效日期 +
+ +
+
+ + +
流程架构
@@ -65,11 +85,30 @@
+
+
+ 流程分类 +
+ +
查询
+ +
+ 导出数据： +
+ +
+
+
+
+ +
+
+ { if (resizeTimer) clearTimeout(resizeTimer); resizeTimer = setTimeout(function(){ - that.tableHeight = (document.documentElement.clientHeight - 66 - 20) + 'px'; + that.tableHeight = (document.documentElement.clientHeight - 66 - 20)-60 + 'px'; that.searchProcessList(false); that.initDlgBodyHeight(); } , 400); @@ -332,11 +383,27 @@ params.data.searchInput = this.searchInput; params.data.levelValue = this.levelValue.join(','); params.data.tableFilter = JSON.stringify(tempTableFilterObj); + + // 生效日期格式化 + let effectiveDateArr = []; + if (this.effectiveDate && this.effectiveDate.length === 2) { + effectiveDateArr = [ + this.effectiveDate[0] ? new Date(this.effectiveDate[0]).toISOString().slice(0, 10) : '', + this.effectiveDate[1] ? new Date(this.effectiveDate[1]).toISOString().slice(0, 10) : '' + ]; + } + params.data.customFilter = JSON.stringify({ frameworkSearchInput1Arr: this.frameworkSearchInput1Arr, frameworkSearchInput2Arr: this.frameworkSearchInput2Arr, frameworkSearchInput3Arr: this.frameworkSearchInput3Arr, issuingDepartmentArr: this.issuingDepartmentArr, + statusFilter: this.statusFilter, + useStatusFilter: this.useStatusFilter, + effectiveDate: effectiveDateArr, + categoryFilter: this.categoryFilter, + treeVisible: this.treeVisible, + idVisible: this.idVisible }); return params; }, @@ -494,6 +561,10 @@ resetCondition() {// 重置搜索条件 this.levelValue = defaultSelectVal; this.searchInput = ''; + this.statusFilter = []; + this.useStatusFilter = []; + this.effectiveDate = []; + this.categoryFilter = []; this.$refs.table.clearFilter(); tempTableFilterObj = {}; this.searchProcessList(false); @@ -508,6 +579,8 @@ params.data.wsId = wsId; params.data.teamId = teamId; params.data.cmd = 'com.actionsoft.apps.coe.pal.processlist_data_export'; + params.data.treeVisible = this.treeVisible; + params.data.idVisible = this.idVisible; params = this.getSearchCondition(params); awsuiAxios.post(params).then(function (ro) {// 查询数据总条数 if (ro.result == 'ok') { @@ -596,8 +669,8 @@ }, searchMore(visible) {// 查询更多 if (visible) { - this.headerHeight = '60px'; - this.tableHeight = (document.documentElement.clientHeight - 66 - 20) - 30 + 'px'; + this.headerHeight = '120px'; + this.tableHeight = (document.documentElement.clientHeight - 66 - 20) - 90 + 'px'; } else { this.headerHeight = '30px'; this.tableHeight = (document.documentElement.clientHeight - 66 - 20) + 'px';