上传流程清单相关内容

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";
           <%}%>

com.actionsoft.apps.coe.pal.processlist/src/views/ProcesslistHome.vue

@@ -42,15 +42,35 @@
           </div>
         </el-col>
       </el-row>
-      <el-row v-if="showMoreSearch" :style="{'line-height': '30px'}">
+      <el-row v-if="showMoreSearch" :style="{'line-height': '36px'}">
         <!-- 发布部门 -->
-        <div class="head-title" style="float: left;width: 250px;padding-left: 20px;">
+        <div class="head-title" style="float: left;width: 250px;padding-left: 15px;">
           <span style="padding-right: 10px;">发布部门</span>
           <div style="display: inline-block;width: 180px;">
             <awsui-input v-model="issuingDepartment" size="mini" suffixIcon="&#xe6e9;" readonly placeholder="请选择发布部门" @click.native="choiceAwsOrgComponent()"></awsui-input>
           </div>
+        </div>
+         <div class="head-title" style="float: left;width: 250px;padding-left: 20px;">
+          <span style="padding-right: 10px;">文件状态</span>
+          <div style="display: inline-block;width: 180px;">
+            <awsui-select id="statusSelect" v-model="statusFilter" collapse-tags placeholder="请选择状态" :options="statusOptions" multiple></awsui-select>
+          </div>
         </div>
         <div class="head-title" style="float: left;width: 248px;padding-left: 25px;">
+          <span style="padding-right: 10px;">使用状态</span>
+          <div style="display: inline-block;width: 180px;">
+            <awsui-select id="useStatusSelect" v-model="useStatusFilter" collapse-tags placeholder="请选择状态" :options="useStatusOptions" multiple></awsui-select>
+          </div>
+        </div>
+        <div class="head-title" style="float: left;width: 250px;padding-left: 20px;">
+          <span style="padding-right: 10px;">生效日期</span>
+          <div style="display: inline-block;width: 180px;">
+            <el-date-picker v-model="effectiveDate" type="daterange" range-separator="至" start-placeholder="起始日期" end-placeholder="结束日期" size="mini" style="width: 200px;"></el-date-picker>
+          </div>
+        </div>
+      </el-row>
+      <el-row v-if="showMoreSearch" :style="{'line-height': '36px'}">
+        <div class="head-title" style="float: left;width: 248px;padding-left: 15px;">
           <span style="padding-right: 10px;">流程架构</span>
           <div style="display: inline-block;width: 180px;">
             <awsui-input v-model="frameworkSearchInput1" size="mini" suffixIcon="&#xe6e9;" readonly placeholder="请选择流程架构L1" @click.native="choicePalProcessTree('L1')"></awsui-input>
@@ -65,11 +85,30 @@
           <div style="display: inline-block;width: 180px;">
             <awsui-input v-model="frameworkSearchInput3" size="mini" suffixIcon="&#xe6e9;" readonly placeholder="请选择流程架构L3" @click.native="choicePalProcessTree('L3')"></awsui-input>
           </div>
+        </div>
+         <div class="head-title" style="float: left;width: 248px;padding-left: 25px;">
+          <span style="padding-right: 10px;">流程分类</span>
+          <div style="display: inline-block;width: 180px;">
+            <awsui-select id="categorySelect" v-model="categoryFilter" collapse-tags placeholder="请选择状态" :options="categoryOptions" multiple></awsui-select>
+          </div>
         </div>
         <div class="head-title" style="float:left;width: 80px;margin-left: 50px;">
           <awsui-button class="button-general-color-reverse button_fixed_width" @click="searchProcessList(false)">查询</awsui-button>
         </div>
       </el-row>
+      <el-row v-if="showMoreSearch" :style="{'line-height': '36px'}">
+         <div class="head-title" style="float: left;width: 80px;padding-left: 15px;">
+          <span style="padding-right: 10px;">导出数据：</span>
+          <div style="display: inline-block;width: 0px;">
+            <awsui-switch v-model="treeVisible" :width="90" inner activeText="显示树结构" inactiveText="隐藏树结构"></awsui-switch>
+          </div>
+        </div>
+        <div class="head-title" style="float: left;width: 130px;padding-left: 25px;">
+          <div style="display: inline-block;width: 0px;">
+            <awsui-switch v-model="idVisible" :width="90" inner activeText="导出ID" inactiveText="不导出ID"></awsui-switch>
+          </div>
+        </div>
+      </el-row>
     </awsui-header>
     <awsui-main style="padding-right: 0;padding-bottom: 0;" id="processlistMain">
       <el-table
@@ -223,6 +262,9 @@
   import BPMOrgAddress from  "@/components/common/BPMOrgAddress/index.js";// pal平台组织架构地址簿，调用平台部门人员角色
   let levelOptions = levelSelect;
   let levelValue = defaultSelectVal;
+  let statusOptions = statusSelect;
+  let useStatusOptions = useStatusSelect;
+  let categoryOptions = categorySelect;
   // 配置临时记录
   let tempMoreAttrCheckedConfig = [];
   let tempMoreAttrUnCheckedConfig = [];
@@ -240,8 +282,8 @@
         return {
           teamId: teamId,
           customTableDlg : false,
-          headerHeight : '30px',
+          headerHeight : '120px',
-          tableHeight : (document.documentElement.clientHeight - 66 - 20) + 'px',
+          tableHeight : (document.documentElement.clientHeight - 66 - 20)-90 + 'px',
           tableHeaderData : [],
           searchInput : '',
           levelOptions: levelOptions,
@@ -281,11 +323,20 @@
             multiple: true,
             isRequired: false
           },
-          showMoreSearch: false,
+          showMoreSearch: true,
           exportLog: {
             wsId: wsId,
             visible: false,
-          }
+          },
+          statusFilter: [],
+          statusOptions: statusOptions,
+          useStatusFilter: [],
+          useStatusOptions: useStatusOptions,
+          effectiveDate: [],
+          categoryFilter: [],
+          categoryOptions: categoryOptions,
+          treeVisible: false,
+          idVisible: false,
         }
       },
       methods : {
@@ -301,7 +352,7 @@
             return (() => {
               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.headerHeight = '120px';
-            this.tableHeight = (document.documentElement.clientHeight - 66 - 20) - 30 + 'px';
+            this.tableHeight = (document.documentElement.clientHeight - 66 - 20) - 90 + 'px';
           } else {
             this.headerHeight = '30px';
             this.tableHeight = (document.documentElement.clientHeight - 66 - 20) + 'px';