流程清单筛选

com.actionsoft.apps.coe.pal.processlist/AWSDevParams.js

@@ -1,6 +1,6 @@
 module.exports = {
 	AWSPortalUrl: "http://localhost:8088/portal/",//aws平台启动地址，用于开发时获取平台静态资源，请求数据等（注意最后的/,不要删）
-	AWSReleasePath: "/Users/sunlh/idea_workspace_aws6/release/", /*C:/work/workspace/release/*/  //aws的平台路径，暂时写绝对路径，用于build生成的主文件位置（注意最后的/,不要删）
+	AWSReleasePath: "/Users/sunlh/Documents/ideaData/actionsoft/aws6.4.1.1008.yili6/release/", /*C:/work/workspace/release/*/  //aws的平台路径，暂时写绝对路径，用于build生成的主文件位置（注意最后的/,不要删）
 	moduleTemplateInAWS: "apps/install/com.actionsoft.apps.coe.pal.processlist/template/page/main.htm", /*apps/install/_bpm.platform/template/page/console.m.dw.design.vue.htm*/ //build后生成到平台的模板位置及名称
 	outputDir: "apps/install/com.actionsoft.apps.coe.pal.processlist/web/com.actionsoft.apps.coe.pal.processlist/main", /*webserver/webapps/portal/apps/_bpm.platform/dw/designer/main*/ //build后js或css生成到平台的位置
 	publicPath: "../apps/com.actionsoft.apps.coe.pal.processlist/main", /*../apps/_bpm.platform/dw/designer/main*/ //build到平台后生成到模板中，引入js文件的相对平台的位置

com.actionsoft.apps.coe.pal.processlist/src/components/common/PALRepositoryTree/component.vue

@@ -42,6 +42,7 @@
                 @node-expand="expandNode"
                 @node-collapse="closeNode"
                 :show-checkbox=multiple
+                :check-strictly="checkStrictly"
                 node-key="id"
                 lazy
                 :load="loadNode">
@@ -93,6 +94,10 @@
           type: Boolean,
           default: false
         },
+        checkStrictly: {// 在显示复选框的情况下，是否严格的遵循父子不互相关联的做法
+          type: Boolean,
+          default: false
+        },
         title: {// 标题
           type: String,
           default: '请选择'

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

@@ -1,7 +1,7 @@
 <template>
   <awsui-layout>
     <awsui-header :height=headerHeight id="header" style="margin-top: 10px;">
-      <el-row :style="{'line-height': headerHeight}">
+      <el-row :style="{'line-height': '30px'}">
         <el-col :span="24">
           <div class="head-title" style="float:left;width: 150px;">
             <div style="padding-left:20px;text-align: left;vertical-align: middle;display: table-cell;width: 100%;height: 36px;">
@@ -13,68 +13,60 @@
           <div class="head-title" style="float:left;width:200px;">
             <awsui-select id="levelSelect" v-model="levelValue" collapse-tags placeholder="请选择流程层级" :options="levelOptions" multiple @change="searchProcessList(false)"></awsui-select>
           </div>
-
+          <div class="head-title" style="float:right;width: 260px;position: relative;bottom: 5px;">
-          <div class="head-title" style="float:right;width: 240px;">
             <awsui-button class="button-general-color button_fixed_width" type="primary" @click="exportProcessList">导出</awsui-button>
             <el-tooltip class="item" effect="dark" content="重置筛选条件" placement="bottom-end" :hide-after="1000">
               <awsui-button class="button_fixed_width" @click="resetCondition">重置</awsui-button>
             </el-tooltip>
+            <!-- 更多搜索 -->
+            <template v-if="!showMoreSearch">
+              <el-tooltip class="item" effect="dark" content="更多搜索" placement="bottom-end" :hide-after="1000">
+                <i class="awsui-iconfont custom_table_dlg_icon" style="margin-right: 10px;" @click="searchMore(true)">&#xe62b;</i>
+              </el-tooltip>
+            </template>
+            <template v-if="showMoreSearch">
+              <el-tooltip class="item" effect="dark" content="关闭更多搜索" placement="bottom-end" :hide-after="1000">
+                <i class="awsui-iconfont custom_table_dlg_icon" style="margin-right: 10px;" @click="searchMore(false)">&#xe62a;</i>
+              </el-tooltip>
+            </template>
             <!-- 小组模式不支持自定义表项 -->
             <el-tooltip v-if="teamId == ''" class="item" effect="dark" content="自定义表项" placement="bottom-end" :hide-after="1000">
               <i class="el-icon-circle-plus custom_table_dlg_icon" @click="customTableDlg = true"></i>
             </el-tooltip>
           </div>
-          <div class="head-title" style="float:right;width: 80px;">
-            <awsui-button class="button-general-color button_fixed_width" type="primary" @click="searchProcessList(false)">查询</awsui-button>
-          </div>
-          <div class="head-title" style="float:right;width:220px;padding-right: 20px;">
-            <awsui-input v-model="searchInput" size="large" suffixIcon="&#xe6e9;" placeholder="请输入流程名称进行搜索" clearable @input="searchProcessList(false)"></awsui-input>
-          </div>
-<!--          &lt;!&ndash; 流程架构3 &ndash;&gt;-->
-<!--          <div class="head-title" style="float: right;width: 200px;padding-right: 20px;">-->
-<!--            <awsui-input v-model="searchInput" size="large" prefixIcon="&#xe6e9;" placeholder="流程架构3" clearable @input="searchProcessList(false)"></awsui-input>-->
-<!--          </div>-->
-<!--          &lt;!&ndash; 流程架构2 &ndash;&gt;-->
-<!--          <div class="head-title" style="float: right;width: 200px;padding-right: 20px;">-->
-<!--            <awsui-input v-model="searchInput" size="large" prefixIcon="&#xe6e9;" placeholder="流程架构2" clearable @input="searchProcessList(false)"></awsui-input>-->
-<!--          </div>-->
-<!--          &lt;!&ndash; 流程架构1 &ndash;&gt;-->
-<!--          <div class="head-title" style="float: right;width: 200px;padding-right: 20px;">-->
-<!--            <awsui-input v-model="searchInput" size="large" prefixIcon="&#xe6e9;" placeholder="流程架构1" clearable @input="searchProcessList(false)"></awsui-input>-->
-<!--          </div>-->
-          <!-- 流程架构 -->
           <div class="head-title" style="float:right;width:200px;padding-right: 20px;">
-            <awsui-input v-model="frameworkSearchInput" size="large" suffixIcon="&#xe6e9;" readonly placeholder="请选择流程架构" @click.native="choicePalProcessTree()"></awsui-input>
+            <awsui-input v-model="searchInput" size="mini" suffixIcon="&#xe6e9;" placeholder="请输入流程名称进行搜索" clearable @input="searchProcessList(false)"></awsui-input>
-          </div>
-          <div class="head-title" style="float: right;">
-            <el-checkbox-group v-model="frameworkSelect" size="small">
-              <el-checkbox-button v-for="item in frameworkOpts" :label="item" :key="item">{{item}}</el-checkbox-button>
-            </el-checkbox-group>
-          </div>
-          <!-- 发布部门 -->
-          <div class="head-title" style="float: right;width: 200px;padding-right: 20px;">
-            <awsui-input v-model="issuingDeptment" size="large" suffixIcon="&#xe6e9;" readonly placeholder="请选择发布部门" @click.native="choiceAwsOrgComponent()"></awsui-input>
           </div>
         </el-col>
       </el-row>
-<!--      <el-row>-->
+      <el-row v-if="showMoreSearch" :style="{'line-height': '30px'}">
-<!--        &lt;!&ndash; 流程架构 &ndash;&gt;-->
+        <!-- 发布部门 -->
-<!--        <div class="head-title" style="float: right;width: 200px;padding-right: 20px;">-->
+        <div class="head-title" style="float: left;width: 250px;padding-left: 20px;">
-<!--          <awsui-input v-model="frameworkSearchInput" size="large" suffixIcon="&#xe6e9;" readonly placeholder="请选择流程架构" @click.native="choiceRelationComponent('')"></awsui-input>-->
+          <span style="padding-right: 10px;">发布部门</span>
-<!--        </div>-->
+          <div style="display: inline-block;width: 180px;">
-<!--        <div class="head-title" style="float: right;">-->
+            <awsui-input v-model="issuingDepartment" size="mini" suffixIcon="&#xe6e9;" readonly placeholder="请选择发布部门" @click.native="choiceAwsOrgComponent()"></awsui-input>
-<!--          <el-checkbox-group v-model="frameworkSelect" size="small">-->
+          </div>
-<!--            <el-checkbox-button v-for="item in frameworkOpts" :label="item" :key="item">{{item}}</el-checkbox-button>-->
+        </div>
-<!--          </el-checkbox-group>-->
+        <div class="head-title" style="float: left;width: 248px;padding-left: 25px;">
-<!--        </div>-->
+          <span style="padding-right: 10px;">流程架构</span>
-<!--        &lt;!&ndash; 发布部门 &ndash;&gt;-->
+          <div style="display: inline-block;width: 180px;">
-<!--        <div class="head-title" style="float: right;width: 200px;padding-right: 20px;">-->
+            <awsui-input v-model="frameworkSearchInput1" size="mini" suffixIcon="&#xe6e9;" readonly placeholder="请选择流程架构L1" @click.native="choicePalProcessTree('L1')"></awsui-input>
-<!--          <awsui-input v-model="issuingDeptment" size="large" suffixIcon="&#xe6e9;" readonly placeholder="请选择发布部门" @click.native="choiceAwsOrgComponent()"></awsui-input>-->
+          </div>
-<!--        </div>-->
+        </div>
-<!--        <div class="head-title" style="float:right;width: 80px;">-->
+        <div class="head-title" style="float: left;width: 180px;padding-left: 20px;">
-<!--          <awsui-button class="button-general-color button_fixed_width" type="primary" @click="searchProcessList(false)">查询</awsui-button>-->
+          <div style="display: inline-block;width: 180px;">
-<!--        </div>-->
+            <awsui-input v-model="frameworkSearchInput2" size="mini" suffixIcon="&#xe6e9;" readonly placeholder="请选择流程架构L2" @click.native="choicePalProcessTree('L2')"></awsui-input>
-<!--      </el-row>-->
+          </div>
+        </div>
+        <div class="head-title" style="float: left;width: 180px;padding-left: 20px;">
+          <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: 80px;margin-left: 50px;">
+          <awsui-button class="button-general-color-reverse button_fixed_width" @click="searchProcessList(false)">查询</awsui-button>
+        </div>
+      </el-row>
     </awsui-header>
     <awsui-main style="padding-right: 0;padding-bottom: 0;" id="processlistMain">
       <el-table
@@ -195,6 +187,7 @@
     <PALRepositoryTree
         ref="palRepositoryAddress"
         :visible.sync="palRepositoryAddress.visible"
+        :checkStrictly="palRepositoryAddress.checkStrictly"
         :wsId="palRepositoryAddress.wsId"
         :teamId="palRepositoryAddress.teamId"
         :categorys="palRepositoryAddress.categorys"
@@ -257,17 +250,23 @@
           customTableUncheckedData: [],
           dataLoaded: false,
           serialNumber: 0, // 当前序号
-          frameworkOpts: ['L1','L2','L3'],
+          frameworkSearchInput1: '',
-          frameworkSelect: ['L1'],
+          frameworkSearchInput1Arr: [],
-          frameworkSearchInput: 'aaa',
+          frameworkSearchInput2: '',
-          issuingDeptment: 'xxxx',
+          frameworkSearchInput2Arr: [],
+          frameworkSearchInput3: '',
+          frameworkSearchInput3Arr: [],
+          issuingDepartment: '',
+          issuingDepartmentArr: [],
           palRepositoryAddress: {// pal文件树组件
             visible: false,
+            checkStrictly: true,
             title: '选择流程',
             wsId: wsId,
             teamId: teamId,
             categorys: 'process',
-            type: 'batch'
+            type: 'batch',
+            level: ''
           },
           bpmOrgAddress: {
             title: '选择发布部门',
@@ -276,6 +275,7 @@
             multiple: true,
             isRequired: false
           },
+          showMoreSearch: false,
         }
       },
       methods : {
@@ -322,6 +322,12 @@
           params.data.searchInput = this.searchInput;
           params.data.levelValue = this.levelValue.join(',');
           params.data.tableFilter = JSON.stringify(tempTableFilterObj);
+          params.data.customFilter = JSON.stringify({
+            frameworkSearchInput1Arr: this.frameworkSearchInput1Arr,
+            frameworkSearchInput2Arr: this.frameworkSearchInput2Arr,
+            frameworkSearchInput3Arr: this.frameworkSearchInput3Arr,
+            issuingDepartmentArr: this.issuingDepartmentArr,
+          });
           return params;
         },
         initPageCount(updateTableColumn) {// 初始化页面总条数，页码等
@@ -525,31 +531,77 @@
           that.customTableUncheckedData = [];
           that.saveTableColumnConfig();
         },
-        choicePalProcessTree() {// 选择流程
+        choicePalProcessTree(level) {// 选择流程
+          this.palRepositoryAddress.level = level;
           this.palRepositoryAddress.visible = true;
         },
         savePalRepositoryAddressResult(data) {// 选择流程之后获取确定结果
           this.palRepositoryAddress.visible = false;
           // 移动
           const that = this;
-          console.log(data);
+          const result = [];
+          let resultStr = [];
+          for (let i = 0; i < data.length; i++) {
+            result.push({
+              id: data[i].id,
+              name: data[i].name,
+              versionId: data[i].versionId,
+              currId: data[i].currId
+            });
+            resultStr.push(data[i].name);
+          }
+          if (that.palRepositoryAddress.level == 'L1') {
+            that.frameworkSearchInput1Arr = result;
+            that.frameworkSearchInput1 = resultStr.join(',')
+          } else if (that.palRepositoryAddress.level == 'L2') {
+            that.frameworkSearchInput2Arr = result;
+            that.frameworkSearchInput2 = resultStr.join(',')
+          } else if (that.palRepositoryAddress.level == 'L3') {
+            that.frameworkSearchInput3Arr = result;
+            that.frameworkSearchInput3 = resultStr.join(',')
+          }
         },
         choiceAwsOrgComponent() {// AWS平台部门/人员/角色组件
           this.bpmOrgAddress.visible = true;
         },
         saveBpmOrgAddressResult(data) {
+          const that = this;
           this.bpmOrgAddress.visible = false;
-          if (this.bpmOrgAddress.isRequired && data.length == 0) {
+          const result = [];
-            this.$message({message: `[${this.currPropertyLabel}]不允许为空`,type: 'warning'});
+          let resultStr = [];
-            return false;
-          }
-          // 保存
-          const params = [];
           for (let i = 0; i < data.length; i++) {
-            params.push({name: data[i].name, id: data[i].id, type: data[i].type})
+            result.push({
+              id: data[i].id,
+              name: data[i].name,
+              type: data[i].type
+            });
+            resultStr.push(data[i].name);
           }
-          this.saveCustomPropToDb(this.currPropertyId, JSON.stringify(params));
+          that.issuingDepartmentArr = result;
+          that.issuingDepartment = resultStr.join(',')
         },
+        searchMore(visible) {// 查询更多
+          if (visible) {
+            this.headerHeight = '60px';
+            this.tableHeight = (document.documentElement.clientHeight - 66 - 20) - 30 + 'px';
+          } else {
+            this.headerHeight = '30px';
+            this.tableHeight = (document.documentElement.clientHeight - 66 - 20) + 'px';
+            this.clearSearchMore();
+          }
+          this.showMoreSearch = visible;
+          this.searchProcessList(false);
+        },
+        clearSearchMore() {
+          this.frameworkSearchInput1 = '';
+          this.frameworkSearchInput1Arr = [];
+          this.frameworkSearchInput2 = '';
+          this.frameworkSearchInput2Arr = [];
+          this.frameworkSearchInput3 = '';
+          this.frameworkSearchInput3Arr = [];
+          this.issuingDepartment = '';
+          this.issuingDepartmentArr = [];
+        }
       },
       created() {