From ec844873e8b25623a31a99d34b8f4d2d718dea9e Mon Sep 17 00:00:00 2001
From: "446052889@qq.com" <446052889@qq.com>
Date: Mon, 14 Nov 2022 16:09:36 +0800
Subject: [PATCH] =?UTF-8?q?pal=E5=85=B3=E8=81=94=E6=A8=A1=E5=9E=8Bdialog?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8pal=E6=B5=81=E7=A8=8B=E6=A0=91dialog=E6=9B=BF?=
 =?UTF-8?q?=E4=BB=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/PALRepositoryTree/component.vue    |  2 +-
 .../src/views/ProcesslistHome.vue             | 59 ++++++++-----------
 2 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/com.actionsoft.apps.coe.pal.processlist/src/components/common/PALRepositoryTree/component.vue b/com.actionsoft.apps.coe.pal.processlist/src/components/common/PALRepositoryTree/component.vue
index 6b5fa11..fc46cb4 100644
--- a/com.actionsoft.apps.coe.pal.processlist/src/components/common/PALRepositoryTree/component.vue
+++ b/com.actionsoft.apps.coe.pal.processlist/src/components/common/PALRepositoryTree/component.vue
@@ -140,7 +140,7 @@
           closeDlalog(type) {// 取消/确定之后的关闭
             if (type == 'save') {
               let result = [];
-              if (this.checkbox) {// 多选
+              if (this.multiple) {// 多选
                 result = this.$refs.tree.getCheckedNodes();
               } else {// 单选
                 const node = this.$refs.tree.getCurrentNode();
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 cd76571..05e3c0d 100644
--- a/com.actionsoft.apps.coe.pal.processlist/src/views/ProcesslistHome.vue
+++ b/com.actionsoft.apps.coe.pal.processlist/src/views/ProcesslistHome.vue
@@ -44,7 +44,7 @@
 <!--          </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="choiceRelationComponent('')"></awsui-input>
+            <awsui-input v-model="frameworkSearchInput" size="large" suffixIcon="&#xe6e9;" readonly placeholder="请选择流程架构" @click.native="choicePalProcessTree()"></awsui-input>
           </div>
           <div class="head-title" style="float: right;">
             <el-checkbox-group v-model="frameworkSelect" size="small">
@@ -192,21 +192,17 @@
     </awsui-sidebar>
     <iframe style="display: none" id='downloadIframe' ></iframe>
     <!-- 选择流程架构 -->
-    <pal-relation-address
-        ref="palRelationAddress"
-        :visible.sync="palRelationAddressVisible"
-        v-on:cancel="palRelationAddressVisible = false"
-        v-on:getResult="saveRelationResult"
-        :title="relation.title"
-        :selectFileId="relation.selectFileId"
-        :selectShapeId="relation.selectShapeId"
-        :relationType="relation.relationType"
-        :categorys="relation.category"
-        :methods="relation.method"
-        :wsId="relation.wsId"
-        :teamId="relation.teamId"
-        :multiple = relation.multiple
-    />
+    <PALRepositoryTree
+        ref="palRepositoryAddress"
+        :visible.sync="palRepositoryAddress.visible"
+        :wsId="palRepositoryAddress.wsId"
+        :teamId="palRepositoryAddress.teamId"
+        :categorys="palRepositoryAddress.categorys"
+        :multiple=true
+        v-on:cancel="palRepositoryAddress.visible = false"
+        v-on:getResult="savePalRepositoryAddressResult"
+        :title="palRepositoryAddress.title"
+    ></PALRepositoryTree>
     <BPMOrgAddress
         ref="palAwsOrgAddress"
         :visible.sync="bpmOrgAddress.visible"
@@ -225,6 +221,7 @@
   import awsuiAxios from "../awsuiAxios";
   import {openDesigner} from "../api/commonFun";
   import PalRelationAddress from  "@/components/common/PalRelationAddress/index.js";
+  import PALRepositoryTree from "@/components/common/PALRepositoryTree/index.js";
   import BPMOrgAddress from  "@/components/common/BPMOrgAddress/index.js";// pal平台组织架构地址簿，调用平台部门人员角色
   let levelOptions = levelSelect;
   let levelValue = defaultSelectVal;
@@ -237,7 +234,8 @@
       components: {
         draggable,
         PalRelationAddress,
-        BPMOrgAddress
+        BPMOrgAddress,
+        PALRepositoryTree
       },
       data() {
         return {
@@ -263,18 +261,13 @@
           frameworkSelect: ['L1'],
           frameworkSearchInput: 'aaa',
           issuingDeptment: 'xxxx',
-          palRelationAddressVisible: false,
-          relation: {
+          palRepositoryAddress: {// pal文件树组件
+            visible: false,
             title: '选择流程',
-            selectFileId: '',
-            selectShapeId: '',
-            relationType: 'file',
-            category: 'process',
-            method: '',
             wsId: wsId,
             teamId: teamId,
-            multiple: true,
-            isRequired: false
+            categorys: 'process',
+            type: 'batch'
           },
           bpmOrgAddress: {
             title: '选择发布部门',
@@ -532,14 +525,14 @@
           that.customTableUncheckedData = [];
           that.saveTableColumnConfig();
         },
-        choiceRelationComponent(fileIds) {// PAL模型/形状选择组件
-          this.relation.selectFileId = fileIds;// 已选中文件id
-          this.palRelationAddressVisible = true;
+        choicePalProcessTree() {// 选择流程
+          this.palRepositoryAddress.visible = true;
         },
-        // 调用关联组件保存函数
-        saveRelationResult(data) {
-          console.log(data)
-          this.palRelationAddressVisible = false;
+        savePalRepositoryAddressResult(data) {// 选择流程之后获取确定结果
+          this.palRepositoryAddress.visible = false;
+          // 移动
+          const that = this;
+          console.log(data);
         },
         choiceAwsOrgComponent() {// AWS平台部门/人员/角色组件
           this.bpmOrgAddress.visible = true;