diff --git a/com.actionsoft.apps.coe.pal.processlist/public/index.html b/com.actionsoft.apps.coe.pal.processlist/public/index.html index d454082..a543d88 100644 --- a/com.actionsoft.apps.coe.pal.processlist/public/index.html +++ b/com.actionsoft.apps.coe.pal.processlist/public/index.html @@ -23,7 +23,7 @@ <% }%> + + diff --git a/com.actionsoft.apps.coe.pal.processlist/src/components/common/BPMOrgAddress/index.js b/com.actionsoft.apps.coe.pal.processlist/src/components/common/BPMOrgAddress/index.js new file mode 100644 index 0000000..1ef1293 --- /dev/null +++ b/com.actionsoft.apps.coe.pal.processlist/src/components/common/BPMOrgAddress/index.js @@ -0,0 +1,7 @@ +import BPMOrgAddress from './component' + +BPMOrgAddress.install = function(Vue) { + Vue.component(BPMOrgAddress.name, BPMOrgAddress); +} + +export default BPMOrgAddress; diff --git a/com.actionsoft.apps.coe.pal.processlist/src/components/common/PALRepositoryTree/README.md b/com.actionsoft.apps.coe.pal.processlist/src/components/common/PALRepositoryTree/README.md new file mode 100644 index 0000000..4182cbd --- /dev/null +++ b/com.actionsoft.apps.coe.pal.processlist/src/components/common/PALRepositoryTree/README.md @@ -0,0 +1 @@ +说明:PAL模型树组件 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 new file mode 100644 index 0000000..6b5fa11 --- /dev/null +++ b/com.actionsoft.apps.coe.pal.processlist/src/components/common/PALRepositoryTree/component.vue @@ -0,0 +1,338 @@ + + + + + diff --git a/com.actionsoft.apps.coe.pal.processlist/src/components/common/PALRepositoryTree/index.js b/com.actionsoft.apps.coe.pal.processlist/src/components/common/PALRepositoryTree/index.js new file mode 100644 index 0000000..d597a2e --- /dev/null +++ b/com.actionsoft.apps.coe.pal.processlist/src/components/common/PALRepositoryTree/index.js @@ -0,0 +1,7 @@ +import PALRepositoryTree from './component' + +PALRepositoryTree.install = function(Vue) { + Vue.component(PALRepositoryTree.name, PALRepositoryTree); +} + +export default PALRepositoryTree; diff --git a/com.actionsoft.apps.coe.pal.processlist/src/components/common/PalRelationAddress/README.md b/com.actionsoft.apps.coe.pal.processlist/src/components/common/PalRelationAddress/README.md new file mode 100644 index 0000000..7249502 --- /dev/null +++ b/com.actionsoft.apps.coe.pal.processlist/src/components/common/PalRelationAddress/README.md @@ -0,0 +1 @@ +说明:调用pal的组织、数据、控制等关联属性,包括前后置流程 diff --git a/com.actionsoft.apps.coe.pal.processlist/src/components/common/PalRelationAddress/component.vue b/com.actionsoft.apps.coe.pal.processlist/src/components/common/PalRelationAddress/component.vue new file mode 100644 index 0000000..e16431e --- /dev/null +++ b/com.actionsoft.apps.coe.pal.processlist/src/components/common/PalRelationAddress/component.vue @@ -0,0 +1,975 @@ + + + + + diff --git a/com.actionsoft.apps.coe.pal.processlist/src/components/common/PalRelationAddress/index.js b/com.actionsoft.apps.coe.pal.processlist/src/components/common/PalRelationAddress/index.js new file mode 100644 index 0000000..6cdba49 --- /dev/null +++ b/com.actionsoft.apps.coe.pal.processlist/src/components/common/PalRelationAddress/index.js @@ -0,0 +1,7 @@ +import PalRelationAddress from './component' + +PalRelationAddress.install = function(Vue) { + Vue.component(PalRelationAddress.name, PalRelationAddress); +} + +export default PalRelationAddress; 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 5b91ca5..cd76571 100644 --- a/com.actionsoft.apps.coe.pal.processlist/src/views/ProcesslistHome.vue +++ b/com.actionsoft.apps.coe.pal.processlist/src/views/ProcesslistHome.vue @@ -13,6 +13,7 @@
+
导出 @@ -23,11 +24,57 @@
+
+ 查询 +
- + +
+ + + + + + + + + + + + + +
+ +
+
+ + {{item}} + +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + @@ -151,17 +224,20 @@ import draggable from "vuedraggable"; import awsuiAxios from "../awsuiAxios"; import {openDesigner} from "../api/commonFun"; + import PalRelationAddress from "@/components/common/PalRelationAddress/index.js"; + import BPMOrgAddress from "@/components/common/BPMOrgAddress/index.js";// pal平台组织架构地址簿,调用平台部门人员角色 let levelOptions = levelSelect; let levelValue = defaultSelectVal; // 配置临时记录 let tempMoreAttrCheckedConfig = []; let tempMoreAttrUnCheckedConfig = []; let tempTableFilterObj = {}; - export default { name: "ProcesslistHome", components: { - draggable + draggable, + PalRelationAddress, + BPMOrgAddress }, data() { return { @@ -182,7 +258,31 @@ customTableCheckedData: [], customTableUncheckedData: [], dataLoaded: false, - serialNumber: 0 // 当前序号 + serialNumber: 0, // 当前序号 + frameworkOpts: ['L1','L2','L3'], + frameworkSelect: ['L1'], + frameworkSearchInput: 'aaa', + issuingDeptment: 'xxxx', + palRelationAddressVisible: false, + relation: { + title: '选择流程', + selectFileId: '', + selectShapeId: '', + relationType: 'file', + category: 'process', + method: '', + wsId: wsId, + teamId: teamId, + multiple: true, + isRequired: false + }, + bpmOrgAddress: { + title: '选择发布部门', + visible: false, + addressType: "department", + multiple: true, + isRequired: false + }, } }, methods : { @@ -431,7 +531,32 @@ that.customTableCheckedData = []; that.customTableUncheckedData = []; that.saveTableColumnConfig(); - } + }, + choiceRelationComponent(fileIds) {// PAL模型/形状选择组件 + this.relation.selectFileId = fileIds;// 已选中文件id + this.palRelationAddressVisible = true; + }, + // 调用关联组件保存函数 + saveRelationResult(data) { + console.log(data) + this.palRelationAddressVisible = false; + }, + choiceAwsOrgComponent() {// AWS平台部门/人员/角色组件 + this.bpmOrgAddress.visible = true; + }, + saveBpmOrgAddressResult(data) { + this.bpmOrgAddress.visible = false; + if (this.bpmOrgAddress.isRequired && data.length == 0) { + this.$message({message: `[${this.currPropertyLabel}]不允许为空`,type: 'warning'}); + 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}) + } + this.saveCustomPropToDb(this.currPropertyId, JSON.stringify(params)); + }, }, created() {