From 88063d681ca4d692c31a162ef5bf8b9bd41e5d11 Mon Sep 17 00:00:00 2001
From: zhiyong.zhou <zhiyong.zhou@highdatas.com>
Date: 星期一, 04 三月 2024 18:00:18 +0800
Subject: [PATCH] 删除多余文件
---
src/views/common/process/viewNodes/InclusiveNode.vue | 1
src/views/admin/layout/ProcessDesign.vue | 2
src/views/workspace/process/ProcessInstanceTabs.vue | 31 ----
src/views/admin/layout/process/ProcessTree.vue | 22 +-
src/views/common/process/config/ConditionGroupItemConfig.vue | 3
src/views/common/process/nodes/SubprocessNode.vue | 1
src/views/common/process/viewNodes/ApprovalNode.vue | 2
src/views/admin/layout/process/ProcessTreeViewer.vue | 2
src/views/common/process/config/ApprovalNodeConfig.vue | 9 -
src/views/common/process/config/InclusiveNodeConfig.vue | 1
src/views/admin/LayoutHeader.vue | 1
src/views/common/process/config/InclusiveGroupItemConfig.vue | 2
src/views/admin/FormsPanel.vue | 4
src/views/common/process/config/TaskNodeConfig.vue | 1
src/views/common/process/nodes/InclusiveNode.vue | 1
/dev/null | 193 ---------------------------
src/views/common/process/viewNodes/SubprocessNode.vue | 1
src/views/admin/FormProcessDesign.vue | 21 +--
src/views/common/process/config/RootNodeConfig.vue | 1
src/views/admin/layout/ProcessDiagramViewer.vue | 3
src/views/common/InsertButton.vue | 64 ++++----
src/views/common/process/viewNodes/ConditionNode.vue | 5
src/views/common/process/nodes/ApprovalNode.vue | 15 -
src/views/common/process/config/NodeConfig.vue | 11 -
src/views/common/process/nodes/ConditionNode.vue | 3
src/views/common/process/config/ConditionNodeConfig.vue | 2
26 files changed, 60 insertions(+), 342 deletions(-)
diff --git a/src/assets/flowDesign.scss b/src/assets/flowDesign.scss
deleted file mode 100644
index 6f0b1d0..0000000
--- a/src/assets/flowDesign.scss
+++ /dev/null
@@ -1,193 +0,0 @@
-.root{
- &:before{
- display: none !important;
- }
-}
-.node-error-state{
- &.node-body{
- box-shadow: 0px 0px 5px 0px #F56C6C !important;
- }
-}
-.node{
- display: flex;
- align-items:center;
- width: auto;
- position: relative;
- &:before{
- content: '';
- top: 50%;
- left: 100%;
- display: block;
- width: 0;
- height: 0;
-
- border-style: solid;
- border-color: #CACACA transparent transparent;
- background: #F5F5F7;
- border-top: 5px solid transparent;
- border-bottom: 5px solid transparent;
- border-left: 10px solid #CACACA; /* 宸﹁竟鐣� */
-
- }
- .node-body{
- width: 220px;
- cursor: pointer;
- max-height: 120px;
- position: relative;
- border-radius: 5px;
- background-color: white;
- box-shadow: 0px 0px 5px 0px #d8d8d8;
- &:hover{
- box-shadow: 0px 0px 3px 0px #1890FF;
- .node-body-header {
- .el-icon-close {
- display: inline;
- font-size: medium;
- }
- }
- }
- .node-body-header{
- border-top-left-radius: 5px;
- border-top-right-radius: 5px;
- padding: 5px 15px;
- color: white;
- font-size: xx-small;
- .el-icon-close{
- display: none;
- }
- .name{
- height: 14px;
- width: 150px;
- display: inline-block
- }
- }
- .node-body-content{
- padding: 18px;
- color: #656363;
- font-size: 14px;
- i{
- position: absolute;
- top: 55%;
- right: 5px;
- font-size: medium;
- }
- .placeholder{
- color: #8c8c8c;
- }
- }
- .node-error{
- position: absolute;
- right: -40px;
- top: 20px;
- font-size: 25px;
- color: #F56C6C;
- }
- }
-
- .node-footer{
- position: relative;
- .btn{
- width: 150px;
- display: flex;
- // padding: 20px 0 32px;
- justify-content: center;
- }
- /deep/ .el-button{
- height: 32px;
- }
- &::before{
- content: "";
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- z-index: -1;
- margin: auto;
- width: 100%;
- height: 2px;
- background-color: #CACACA;
- }
- }
-}
-._root{
- display: flex;
- align-items:center;
- margin: 0 auto;
-}
-.process-end{
- width: 60px;
- margin: 0 auto;
- // margin-bottom: 20px;
- border-radius: 15px;
- padding: 5px 10px;
- font-size: small;
- color: #747474;
- background-color: #f2f2f2;
- box-shadow: 0 0 10px 0 #bcbcbc;
-}
-.primary-node{
- display: flex;
- align-items: center;
-}
-.branch-node{
- display: flex;
- justify-content: center;
-}
-.branch-node-item{
- position: relative;
- display: flex;
- background: #f5f6f6;
- flex-direction: column;
- align-items: center;
- border-top: 2px solid #cccccc;
- border-bottom: 2px solid #cccccc;
- &:before{
- content: "";
- position: absolute;
- top: 0;
- left: calc(50% - 1px);
- margin: auto;
- width: 2px;
- height: 100%;
- background-color: #CACACA;
- }
- .line-top-left, .line-top-right, .line-bot-left, .line-bot-right{
- position: absolute;
- width: 50%;
- height: 4px;
- background-color: #f5f6f6;
- }
- .line-top-left{
- top: -2px;
- left: -1px;
- }
- .line-top-right{
- top: -2px;
- right: -1px;
- }
- .line-bot-left{
- bottom: -2px;
- left: -1px;
- }
- .line-bot-right{
- bottom: -2px;
- right: -1px;
- }
-}
-.add-branch-btn{
- position: absolute;
- width: 80px;
- .add-branch-btn-el{
- z-index: 999;
- position: absolute;
- top: -15px;
- }
-}
-
-.empty-node{
- display: flex;
- justify-content: center;
- flex-direction: column;
- align-items: center;
-}
\ No newline at end of file
diff --git a/src/assets/flowDesignVertical.scss b/src/assets/flowDesignVertical.scss
deleted file mode 100644
index 0b16c98..0000000
--- a/src/assets/flowDesignVertical.scss
+++ /dev/null
@@ -1,193 +0,0 @@
-
-.root{
- &:before{
- display: none !important;
- }
-}
-.node-error-state{
- .node-body{
- box-shadow: 0px 0px 5px 0px #F56C6C !important;
- }
-}
-.node{
- padding: 0 50px;
- width: 220px;
- position: relative;
- &:before{
- content: '';
- position: absolute;
- top: -12px;
- left: 50%;
- -webkit-transform: translateX(-50%);
- transform: translateX(-50%);
- width: 0;
- border-style: solid;
- border-width: 8px 6px 4px;
- border-color: #CACACA transparent transparent;
- background: #F5F5F7;
- }
- .node-body{
- cursor: pointer;
- max-height: 120px;
- position: relative;
- border-radius: 5px;
- background-color: white;
- box-shadow: 0px 0px 5px 0px #d8d8d8;
- &:hover{
- box-shadow: 0px 0px 3px 0px #1890FF;
- .node-body-header {
- .el-icon-close {
- display: inline;
- font-size: medium;
- }
- }
- }
- .node-body-header{
- border-top-left-radius: 5px;
- border-top-right-radius: 5px;
- padding: 5px 15px;
- color: white;
- font-size: xx-small;
- .el-icon-close{
- display: none;
- }
- .name{
- height: 14px;
- width: 150px;
- display: inline-block
- }
- }
- .node-body-content{
- padding: 18px;
- color: #656363;
- font-size: 14px;
- i{
- position: absolute;
- top: 55%;
- right: 5px;
- font-size: medium;
- }
- .placeholder{
- color: #8c8c8c;
- }
- }
- .node-error{
- position: absolute;
- right: -40px;
- top: 20px;
- font-size: 25px;
- color: #F56C6C;
- }
- }
-
- .node-footer{
- position: relative;
- .btn{
- width: 100%;
- display: flex;
- padding: 20px 0 32px;
- justify-content: center;
- }
- /deep/ .el-button{
- height: 32px;
- }
- &::before{
- content: "";
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- z-index: -1;
- margin: auto;
- width: 2px;
- height: 100%;
- background-color: #CACACA;
- }
- }
-}
-
-._root{
- margin: 0 auto;
-}
-
-.process-end{
- width: 60px;
- margin: 0 auto;
- margin-bottom: 20px;
- border-radius: 15px;
- padding: 5px 10px;
- font-size: small;
- color: #747474;
- background-color: #f2f2f2;
- box-shadow: 0 0 10px 0 #bcbcbc;
-}
-.primary-node{
- display: flex;
- align-items: center;
- flex-direction: column;
-}
-
-.branch-node{
- display: flex;
- justify-content: center;
- /*border-top: 2px solid #cccccc;
- border-bottom: 2px solid #cccccc;*/
-}
-.branch-node-item{
- position: relative;
- display: flex;
- background: #f5f6f6;
- flex-direction: column;
- align-items: center;
- border-top: 2px solid #cccccc;
- border-bottom: 2px solid #cccccc;
- &:before{
- content: "";
- position: absolute;
- top: 0;
- left: calc(50% - 1px);
- margin: auto;
- width: 2px;
- height: 100%;
- background-color: #CACACA;
- }
- .line-top-left, .line-top-right, .line-bot-left, .line-bot-right{
- position: absolute;
- width: 50%;
- height: 4px;
- background-color: #f5f6f6;
- }
- .line-top-left{
- top: -2px;
- left: -1px;
- }
- .line-top-right{
- top: -2px;
- right: -1px;
- }
- .line-bot-left{
- bottom: -2px;
- left: -1px;
- }
- .line-bot-right{
- bottom: -2px;
- right: -1px;
- }
-}
-.add-branch-btn{
- position: absolute;
- width: 80px;
- .add-branch-btn-el{
- z-index: 999;
- position: absolute;
- top: -15px;
- }
-}
-
-.empty-node{
- display: flex;
- justify-content: center;
- flex-direction: column;
- align-items: center;
-}
\ No newline at end of file
diff --git a/src/views/admin/FormProcessDesign.vue b/src/views/admin/FormProcessDesign.vue
index 924864a..538567f 100644
--- a/src/views/admin/FormProcessDesign.vue
+++ b/src/views/admin/FormProcessDesign.vue
@@ -35,6 +35,7 @@
<script>
import LayoutHeader from './LayoutHeader'
import {createFlow, getFlowDetail} from '@/api/design'
+
import ProcessDesign from '@/views/admin/layout/ProcessDesign'
export default {
@@ -109,13 +110,13 @@
const tempJson = data.find(f =>
f.index_no === index
)
- console.log("tempJson",tempJson);
//瑙ｆ瀽瀛愬鎵硅妭鐐�
parent.children = {
"id": tempJson.id,
"parentId": parentId,
"name": "瀹℃壒浜�",
"type": "APPROVAL",
+ "children":{},//蹇呴』瑕� 涓嶇劧閫変腑鐨勫�兼棤娉曚紶閫�
"props":
{
"assignedType": "ASSIGN_USER",
@@ -145,7 +146,6 @@
//鑾峰彇娴佺▼璇︽儏
getFlowDetail(param).then(rsp => {
let form = rsp.data.data;
- console.log("getFlowDetail-form", form)
form.logo = ""
form.formItems = []
form.process =this.convertToTreeData(form.steps, {
@@ -162,7 +162,7 @@
form.templateName = form.name
form.groupId = null;
- console.log("杈撳嚭杞崲鍚庣殑form,",form)
+
this.$store.commit('loadForm', form)
}).catch(err => {
this.$message.error(err)
@@ -203,7 +203,6 @@
})
},
validateDesign() {
- console.log('000')
this.validVisible = true
this.validStep = 0
this.showValiding()
@@ -287,10 +286,9 @@
},
//瀹℃壒娴佹爲褰㈢粨鏋勮浆鎹负json
dataTree(data, index, parentId) {
- let result = [];
- let names = [];
- let ruleCode = [];
- console.log("data銆嬨�嬨��",data)
+ let result = [];//瀛樻斁缁撴灉
+ let names = [];//瀛樻斁瀹℃壒浜�
+ let ruleCode = [];//鏋舵瀯缁�
data.props.assignedUser.forEach(org => names.push(org.name));
let ids = []
data.props.assignedUser.forEach(org => ids.push(org.id));
@@ -317,7 +315,6 @@
rule_code: ruleCode.length > 0 ? String(ruleCode).replaceAll(',', '銆�') : null
}
) // 鍙彇褰撳墠鑺傜偣鐨勪俊鎭紝涓嶅寘鎷� children
- console.log("result>>>",result)
//濡傛灉涓嬮潰杩樻湁瀛愰」 缁х画寰�涓嬭鏁版嵁
if (data.children!==undefined&&Object.keys(data.children).length !== 0) {
let getChildren = this.dataTree(data.children, index + 1, parentId)
@@ -326,7 +323,6 @@
return result
},
-
doPublish() {
this.$confirm('纭鍙戝竷鍚庢祦绋嬬珛鍗崇敓鏁堬紝鏄惁缁х画?', '鎻愮ず', {
confirmButtonText: '鍙戝竷',
@@ -334,17 +330,14 @@
type: 'warning'
}).then(() => {
let processNew = JSON.parse(JSON.stringify(this.setup.process));
- console.log("processNew", processNew)
//鍒ゆ柇鏉′欢鍒嗘敮
- this.conditionRecursion(processNew);
let data = {};
data.name = this.form.name;
data.id = processNew.id||''
- var i = 1;
+ let i = 1;
//杞暟鎹粨鏋�
data.steps = this.dataTree(processNew.children, i, processNew.id);
let template = {data}
- console.log("鏂版暟缁勭粨鏋�-template", template);
createFlow(template).then(rsp => {
this.$message.success("鍒涘缓娴佺▼鎴愬姛")
this.$router.push("/formsPanel")
diff --git a/src/views/admin/FormsPanel.vue b/src/views/admin/FormsPanel.vue
index 9e9e0c9..c131947 100644
--- a/src/views/admin/FormsPanel.vue
+++ b/src/views/admin/FormsPanel.vue
@@ -62,9 +62,7 @@
getGroups() {
let template = {"dataname": "sys_state_approve"}
getEntitySet(template).then(rsp => {
- console.log("getEntitySet", rsp.data.data)
this.groups = rsp.data.data.entityset
- console.log("this.groups", this.groups)
}).catch(err => this.$message.error('鑾峰彇瀹℃壒娴佺▼寮傚父'))
},
newProcess(groupId) {
@@ -78,7 +76,6 @@
viewGroup(item, group) {
- console.log("viewGroup",item)
this.$router.push(
{
path: "/workspace/process/instance/tabs",
@@ -92,7 +89,6 @@
editFrom(item, group) {
- console.log("item",item)
this.$router.push("/admin/design?code=" + item.id);
},
diff --git a/src/views/admin/LayoutHeader.vue b/src/views/admin/LayoutHeader.vue
index 2fac42c..f8c63ec 100644
--- a/src/views/admin/LayoutHeader.vue
+++ b/src/views/admin/LayoutHeader.vue
@@ -80,7 +80,6 @@
this.$emit('input', path)
},
handleSelect(key, keyPath) {
- console.log(key, keyPath);
},
listener() {
window.onunload = this.closeBefore()
diff --git a/src/views/admin/layout/ProcessDesign.vue b/src/views/admin/layout/ProcessDesign.vue
index b1a3eaf..2a2bf73 100644
--- a/src/views/admin/layout/ProcessDesign.vue
+++ b/src/views/admin/layout/ProcessDesign.vue
@@ -45,7 +45,6 @@
},
computed:{
selectedNode(){
- console.log("ProcessDesign-selectedNode")
return this.$store.state.selectedNode
}
},
@@ -58,7 +57,6 @@
return this.$refs["process-tree"].validateProcess()
},
nodeSelected(node){
- console.log('閰嶇疆鑺傜偣aaa', node)
this.showConfig = true
}
},
diff --git a/src/views/admin/layout/ProcessDiagramViewer.vue b/src/views/admin/layout/ProcessDiagramViewer.vue
index ed4e025..8fbf78b 100644
--- a/src/views/admin/layout/ProcessDiagramViewer.vue
+++ b/src/views/admin/layout/ProcessDiagramViewer.vue
@@ -44,7 +44,6 @@
},
computed:{
selectedNode(){
- console.log("ProcessDiagramViewer-selectedNode",this.$store.state)
return this.$store.state.selectedNode
}
},
@@ -56,13 +55,11 @@
},
methods: {
test(){
- console.log("test")
},
validate(){
return this.$refs["process-tree"].validateProcess()
},
nodeSelected(node){
- console.log('閰嶇疆鑺傜偣bbb', node)
this.showConfig = true
}
},
diff --git a/src/views/admin/layout/process/ProcessTree.vue b/src/views/admin/layout/process/ProcessTree.vue
index cbd0cf5..d3ee177 100644
--- a/src/views/admin/layout/process/ProcessTree.vue
+++ b/src/views/admin/layout/process/ProcessTree.vue
@@ -14,7 +14,6 @@
import Subprocess from '@/views/common/process/nodes/SubprocessNode.vue'
import DefaultProps from "./DefaultNodeProps"
-
export default {
name: "ProcessTree",
components: {Node, Root, Approval, Task, Cc, Trigger, Concurrent, Condition, Inclusive, Delay, Empty, Subprocess},
@@ -40,6 +39,7 @@
]))
return h('div', {class:{'_root': true}, ref:'_root'}, processTrees)
},
+
methods: {
getDomTree(h, node) {
this.toMapping(node);
@@ -88,6 +88,7 @@
//瑙ｇ爜娓叉煋鐨勬椂鍊欐彃鍏om鍒板悓绾�
decodeAppendDom(h, node, dom, props = {}){
props.config = node
+ console.log("decodeAppendDom",props)
dom.unshift(h(node.type.toLowerCase(), {
props: props,
ref: node.id,
@@ -106,7 +107,6 @@
//id鏄犲皠鍒癿ap锛岀敤鏉ュ悜涓婇亶鍘�
toMapping(node){
if (node && node.id){
- //console.log("node=> " + node.id + " name:" + node.name + " type:" + node.type)
this.nodeMap.set(node.id, node)
}
},
@@ -170,23 +170,22 @@
return node.type === 'CONCURRENTS'
},
getRandomId(){
- console.log("tree鐢熸垚鑺傜偣id")
return ' ';
//return `HighDatas_${new Date().getTime().toString().substring(5)}${Math.round(Math.random()*9000+1000)}`
},
//閫変腑涓�涓妭鐐�
selectNode(node){
- this.$store.commit('selectedNode', node)
+ this.$store.commit('selectedNode', node);
this.$emit('selectedNode', node)
},
//澶勭悊鑺傜偣鎻掑叆閫昏緫
insertNode(type, parentNode){
- console.log("insertNode-parentNode",parentNode)
+
this.$refs['_root'].click()
let afterNode = parentNode.children
- console.log("afterNode",afterNode)
//鎻掑叆鏂拌妭鐐�
parentNode.children = {
+
id: this.getRandomId(),
parentId: parentNode.id,
props: {},
@@ -194,6 +193,7 @@
}
switch (type){
+
case 'APPROVAL': this.insertApprovalNode(parentNode, afterNode); break;
case 'SUBPROCESS' : this.insertApprovalNode(parentNode, afterNode); break;
case 'TASK': this.insertTaskNode(parentNode); break;
@@ -216,15 +216,16 @@
afterNode.parentId = parentNode.children.id
}
this.$set(parentNode.children, 'children', Object)
- console.log("parentNode.children",parentNode.children)
+
}
this.$forceUpdate()
},
insertApprovalNode(parentNode){
this.$set(parentNode.children, "name", "瀹℃壒浜�")
- console.log("tree-DefaultProps.APPROVAL_PROPS)",DefaultProps.APPROVAL_PROPS)
+
this.$set(parentNode.children, "props", this.$deepCopy(DefaultProps.APPROVAL_PROPS))
- console.log("parentNode.children",parentNode.children)
+
+
},
insertTaskNode(parentNode){
this.$set(parentNode.children, "name", "鍔炵悊浜�")
@@ -258,6 +259,7 @@
name: "鏉′欢1",
children:{}
},{
+
id: this.getRandomId(),
parentId: parentNode.children.id,
type: "CONDITION",
@@ -339,7 +341,7 @@
},
//鍒犻櫎褰撳墠鑺傜偣
delNode(node){
- console.log("ProcessTree鍒犻櫎鑺傜偣", node)
+
//鑾峰彇璇ヨ妭鐐圭殑鐖惰妭鐐�
let parentNode = this.nodeMap.get(node.parentId)
if (parentNode){
diff --git a/src/views/admin/layout/process/ProcessTreeViewer.vue b/src/views/admin/layout/process/ProcessTreeViewer.vue
index b5c1c35..cf178d3 100644
--- a/src/views/admin/layout/process/ProcessTreeViewer.vue
+++ b/src/views/admin/layout/process/ProcessTreeViewer.vue
@@ -188,7 +188,6 @@
},
//閫変腑涓�涓妭鐐�
selectNode(node){
- console.log("ProcessTreeViewer-emit-selectNode")
this.$store.commit('selectedNode', node)
this.$emit('selectedNode', node)
},
@@ -348,7 +347,6 @@
},
//鍒犻櫎褰撳墠鑺傜偣
delNode(node){
- console.log("鍒犻櫎鑺傜偣", node)
//鑾峰彇璇ヨ妭鐐圭殑鐖惰妭鐐�
let parentNode = this.nodeMap.get(node.parentId)
if (parentNode){
diff --git a/src/views/common/InsertButton.vue b/src/views/common/InsertButton.vue
index 6f1ca67..bae2a9c 100644
--- a/src/views/common/InsertButton.vue
+++ b/src/views/common/InsertButton.vue
@@ -5,38 +5,38 @@
<i class="el-icon-s-check" style="color:rgb(255, 148, 62);"></i>
<span>瀹℃壒浜�</span>
</div>
- <div @click="addTaskNode">
- <i class="el-icon-s-check" style="color:rgb(230, 176, 57);"></i>
- <span>鍔炵悊浜�</span>
- </div>
- <div @click="addCcNode">
- <i class="el-icon-s-promotion" style="color:rgb(50, 150, 250);"></i>
- <span>鎶勯�佷汉</span>
- </div>
- <div @click="addConditionsNode">
- <i class="el-icon-share" style="color:rgb(21, 188, 131);"></i>
- <span>鏉′欢鍒嗘敮</span>
- </div>
- <div @click="addConcurrentsNode">
- <i class="el-icon-s-operation" style="color:#718dff;"></i>
- <span>骞惰鍒嗘敮</span>
- </div>
- <div @click="addInclusivesNode">
- <i class="el-icon-s-operation" style="color:#718dff;"></i>
- <span>鍖呭鍒嗘敮</span>
- </div>
- <div @click="addDelayNode">
- <i class="el-icon-time" style="color:#f25643;"></i>
- <span>寤惰繜绛夊緟</span>
- </div>
- <div @click="addTriggerNode">
- <i class="el-icon-set-up" style="color:#15BC83;"></i>
- <span>瑙﹀彂鍣�</span>
- </div>
- <div @click="addSubprocessNode">
- <i class="el-icon-set-up" style="color:#15BC93;"></i>
- <span>瀛愭祦绋�</span>
- </div>
+<!-- <div @click="addTaskNode">-->
+<!-- <i class="el-icon-s-check" style="color:rgb(230, 176, 57);"></i>-->
+<!-- <span>鍔炵悊浜�</span>-->
+<!-- </div>-->
+<!-- <div @click="addCcNode">-->
+<!-- <i class="el-icon-s-promotion" style="color:rgb(50, 150, 250);"></i>-->
+<!-- <span>鎶勯�佷汉</span>-->
+<!-- </div>-->
+<!-- <div @click="addConditionsNode">-->
+<!-- <i class="el-icon-share" style="color:rgb(21, 188, 131);"></i>-->
+<!-- <span>鏉′欢鍒嗘敮</span>-->
+<!-- </div>-->
+<!-- <div @click="addConcurrentsNode">-->
+<!-- <i class="el-icon-s-operation" style="color:#718dff;"></i>-->
+<!-- <span>骞惰鍒嗘敮</span>-->
+<!-- </div>-->
+<!-- <div @click="addInclusivesNode">-->
+<!-- <i class="el-icon-s-operation" style="color:#718dff;"></i>-->
+<!-- <span>鍖呭鍒嗘敮</span>-->
+<!-- </div>-->
+<!-- <div @click="addDelayNode">-->
+<!-- <i class="el-icon-time" style="color:#f25643;"></i>-->
+<!-- <span>寤惰繜绛夊緟</span>-->
+<!-- </div>-->
+<!-- <div @click="addTriggerNode">-->
+<!-- <i class="el-icon-set-up" style="color:#15BC83;"></i>-->
+<!-- <span>瑙﹀彂鍣�</span>-->
+<!-- </div>-->
+<!-- <div @click="addSubprocessNode">-->
+<!-- <i class="el-icon-set-up" style="color:#15BC93;"></i>-->
+<!-- <span>瀛愭祦绋�</span>-->
+<!-- </div>-->
</div>
<el-button icon="el-icon-plus" slot="reference" type="primary" size="small" circle></el-button>
</el-popover>
diff --git a/src/views/common/process/config/ApprovalNodeConfig.vue b/src/views/common/process/config/ApprovalNodeConfig.vue
index bdbae80..2017e57 100644
--- a/src/views/common/process/config/ApprovalNodeConfig.vue
+++ b/src/views/common/process/config/ApprovalNodeConfig.vue
@@ -118,11 +118,9 @@
return this.$store.state.selectedNode
},
nodeProps() {
- console.log("this.$store.state.selectedNode.props",this.$store.state.selectedNode.props)
return this.$store.state.selectedNode.props
},
select() {
- console.log("this.config--select", this.config)
return this.config.assignedUser
},
@@ -160,13 +158,10 @@
this.selectedNode.props.groups.splice(index, 1)
},
addConditionGroup() {
- console.log("this.config", this.config)
this.config.groups.push({
})
},
selected(select, type) {
- debugger
- console.log("this.config.props",this.config)
this.nodeProps.assignedUser = []
if (type === 'group') {
this.nodeProps.staffGroup = {}
@@ -185,9 +180,7 @@
}
)
}
- console.log("杈撳嚭閫変腑select", this.nodeProps)
- this.orgPickerSelected.length = 0
- this.$forceUpdate()
+
},
removeOrgItem(index) {
this.select.splice(index, 1)
diff --git a/src/views/common/process/config/ConditionGroupItemConfig.vue b/src/views/common/process/config/ConditionGroupItemConfig.vue
index 50053ad..fc78294 100644
--- a/src/views/common/process/config/ConditionGroupItemConfig.vue
+++ b/src/views/common/process/config/ConditionGroupItemConfig.vue
@@ -234,7 +234,6 @@
}
},
selected(select) {
- console.log(select)
this.users.length = 0
select.forEach(u => this.users.push(u))
},
@@ -246,8 +245,6 @@
group.conditions.splice(index, 1)
},
conditionChange(index, group) {
- console.log("index",index);
- console.log("group",group);
//鍒ゆ柇鏂板鐨�
group.cids.forEach(cid => {
if (0 > group.conditions.findIndex(cd => cd.id === cid)){
diff --git a/src/views/common/process/config/ConditionNodeConfig.vue b/src/views/common/process/config/ConditionNodeConfig.vue
index 0c1fed8..93bc13a 100644
--- a/src/views/common/process/config/ConditionNodeConfig.vue
+++ b/src/views/common/process/config/ConditionNodeConfig.vue
@@ -62,7 +62,6 @@
//鏉′欢鑺傜偣
prioritySortList() {
let node = this.$store.state.nodeMap.get(this.selectedNode.parentId)
- console.log(this.selectedNode.id, node)
if (node) {
return node.branchs || []
}
@@ -91,7 +90,6 @@
this.showOrgSelect = true
},
selected(select) {
- console.log(select)
this.showOrgSelect = false
select.forEach(val => this.select.push(val))
},
diff --git a/src/views/common/process/config/InclusiveGroupItemConfig.vue b/src/views/common/process/config/InclusiveGroupItemConfig.vue
index fa57050..65c0d26 100644
--- a/src/views/common/process/config/InclusiveGroupItemConfig.vue
+++ b/src/views/common/process/config/InclusiveGroupItemConfig.vue
@@ -179,7 +179,6 @@
}
},
selected(select) {
- console.log(select)
this.users.length = 0
select.forEach(u => this.users.push(u))
},
@@ -196,7 +195,6 @@
if (0 > group.conditions.findIndex(cd => cd.id === cid)){
//鏂板鏉′欢
let condition = {...this.conditionList[index]}
- console.log(condition, this.conditionList, index)
condition.compare = '';
condition.value = []
group.conditions.push(condition)
diff --git a/src/views/common/process/config/InclusiveNodeConfig.vue b/src/views/common/process/config/InclusiveNodeConfig.vue
index b91a97c..98f8978 100644
--- a/src/views/common/process/config/InclusiveNodeConfig.vue
+++ b/src/views/common/process/config/InclusiveNodeConfig.vue
@@ -62,7 +62,6 @@
//鏉′欢鑺傜偣
prioritySortList() {
let node = this.$store.state.nodeMap.get(this.selectedNode.parentId)
- console.log(this.selectedNode.id, node)
if (node) {
return node.branchs || []
}
diff --git a/src/views/common/process/config/NodeConfig.vue b/src/views/common/process/config/NodeConfig.vue
index 494cc90..7c6deec 100644
--- a/src/views/common/process/config/NodeConfig.vue
+++ b/src/views/common/process/config/NodeConfig.vue
@@ -1,14 +1,6 @@
<template>
<div>
- <el-tabs v-model="active" v-if="name && formConfig.length > 0">
- <el-tab-pane :label="name" name="properties">
- <component :is="(selectNode.type||'').toLowerCase()" :config="selectNode.props"/>
- </el-tab-pane>
- <el-tab-pane label="琛ㄥ崟鏉冮檺璁剧疆" name="permissions">
- <form-authority-config/>
- </el-tab-pane>
- </el-tabs>
- <component :is="(selectNode.type||'').toLowerCase()" v-else :config="selectNode.props"/>
+ <component :is="(selectNode.type||'').toLowerCase()" :config="selectNode.props"/>
</div>
</template>
@@ -45,7 +37,6 @@
},
computed: {
selectNode() {
- console.log("selectNode",this.$store.state)
return this.$store.state.selectedNode
},
formConfig() {
diff --git a/src/views/common/process/config/RootNodeConfig.vue b/src/views/common/process/config/RootNodeConfig.vue
index 097c19c..c69f095 100644
--- a/src/views/common/process/config/RootNodeConfig.vue
+++ b/src/views/common/process/config/RootNodeConfig.vue
@@ -29,7 +29,6 @@
},
computed:{
select(){
- console.log("this.config.assignedUser-select",this.config.assignedUser)
return this.config.assignedUser
}
},
diff --git a/src/views/common/process/config/TaskNodeConfig.vue b/src/views/common/process/config/TaskNodeConfig.vue
index 474c03f..ce6d9d4 100644
--- a/src/views/common/process/config/TaskNodeConfig.vue
+++ b/src/views/common/process/config/TaskNodeConfig.vue
@@ -242,7 +242,6 @@
this.$refs.orgPicker.show()
},
selected(select) {
- console.log(select)
this.orgPickerSelected.length = 0
select.forEach(val => this.orgPickerSelected.push(val))
},
diff --git a/src/views/common/process/nodes/ApprovalNode.vue b/src/views/common/process/nodes/ApprovalNode.vue
index bddb176..8714681 100644
--- a/src/views/common/process/nodes/ApprovalNode.vue
+++ b/src/views/common/process/nodes/ApprovalNode.vue
@@ -34,16 +34,13 @@
},
content(){
const config = this.config.props
- console.log("content:config.assignedUser",config)
let texts = []
config.assignedUser.forEach(org => texts.push(org.name))
- return String(texts).replaceAll(',', '銆�')||"aaa"
+ return String(texts).replaceAll(',', '銆�')
},
},
created() {
- console.log("鍔犺浇ApprovalNode.vue")
- this.content
},
methods: {
getFormItemById(id){
@@ -95,11 +92,11 @@
return true;
},
validate_FORM_USER(err){
- if (this.config.props.formUser === ''){
- this.errorInfo = '璇锋寚瀹氳〃鍗曚腑鐨勪汉鍛樼粍浠�'
- err.push(`${this.config.name} 瀹℃壒浜轰负琛ㄥ崟涓汉鍛橈紝浣嗘湭鎸囧畾`)
- return false
- }
+ if (this.config.props.formUser === ''){
+ this.errorInfo = '璇锋寚瀹氳〃鍗曚腑鐨勪汉鍛樼粍浠�'
+ err.push(`${this.config.name} 瀹℃壒浜轰负琛ㄥ崟涓汉鍛橈紝浣嗘湭鎸囧畾`)
+ return false
+ }
return true;
},
validate_REFUSE(err){
diff --git a/src/views/common/process/nodes/ConditionNode.vue b/src/views/common/process/nodes/ConditionNode.vue
index 5a7f160..82d63f6 100644
--- a/src/views/common/process/nodes/ConditionNode.vue
+++ b/src/views/common/process/nodes/ConditionNode.vue
@@ -137,9 +137,6 @@
},
//鏍￠獙鏁版嵁閰嶇疆鐨勫悎娉曟��
validate(err) {
- console.log('condition children', this.config.children)
- console.log('this.level', this.level)
- console.log('this.size', this.size)
if (!(this.level == this.size && this.size != 0) && !this.config.children?.id) {
this.showError = true
this.errorInfo = '鏉′欢鍒嗘敮鍚庝笉鑳戒负绌�'
diff --git a/src/views/common/process/nodes/InclusiveNode.vue b/src/views/common/process/nodes/InclusiveNode.vue
index 4e48edf..82b715b 100644
--- a/src/views/common/process/nodes/InclusiveNode.vue
+++ b/src/views/common/process/nodes/InclusiveNode.vue
@@ -132,7 +132,6 @@
},
//鏍￠獙鏁版嵁閰嶇疆鐨勫悎娉曟��
validate(err) {
- console.log('inclusive children', this.config.children)
if (!(this.level == this.size && this.size != 0) && !this.config.children?.id) {
this.showError = true
this.errorInfo = '鏉′欢鍒嗘敮鍚庝笉鑳戒负绌�'
diff --git a/src/views/common/process/nodes/SubprocessNode.vue b/src/views/common/process/nodes/SubprocessNode.vue
index ac198de..4440378 100644
--- a/src/views/common/process/nodes/SubprocessNode.vue
+++ b/src/views/common/process/nodes/SubprocessNode.vue
@@ -33,7 +33,6 @@
},
content(){
const config = this.config.props
- console.log("role,config.assignedUser",config.assignedUser)
switch (config.assignedType){
case "ASSIGN_USER":
if (config.assignedUser.length > 0){
diff --git a/src/views/common/process/viewNodes/ApprovalNode.vue b/src/views/common/process/viewNodes/ApprovalNode.vue
index 23e0ac8..de8dbdc 100644
--- a/src/views/common/process/viewNodes/ApprovalNode.vue
+++ b/src/views/common/process/viewNodes/ApprovalNode.vue
@@ -34,7 +34,6 @@
},
content(){
const config = this.config.props
- console.log("content:config.assignedUser",config)
let texts = []
config.assignedUser.forEach(org => texts.push(org.name))
return String(texts).replaceAll(',', '銆�')
@@ -53,7 +52,6 @@
// }
},
created() {
- console.log("鍔犺浇ApprovalNode.vue")
},
methods: {
getFormItemById(id){
diff --git a/src/views/common/process/viewNodes/ConditionNode.vue b/src/views/common/process/viewNodes/ConditionNode.vue
index 5a7f160..b34d6a9 100644
--- a/src/views/common/process/viewNodes/ConditionNode.vue
+++ b/src/views/common/process/viewNodes/ConditionNode.vue
@@ -117,7 +117,6 @@
let items = subCondition.value.map(function (item) {
return item.label
})
- console.log("subCondition",String(items))
return `${subCondition.title}涓篬${String(items).replaceAll(',', '銆�')}]涓箣涓�`
case 'B':
return `${subCondition.value[0]} < ${subCondition.title} < ${subCondition.value[1]}`
@@ -137,9 +136,7 @@
},
//鏍￠獙鏁版嵁閰嶇疆鐨勫悎娉曟��
validate(err) {
- console.log('condition children', this.config.children)
- console.log('this.level', this.level)
- console.log('this.size', this.size)
+
if (!(this.level == this.size && this.size != 0) && !this.config.children?.id) {
this.showError = true
this.errorInfo = '鏉′欢鍒嗘敮鍚庝笉鑳戒负绌�'
diff --git a/src/views/common/process/viewNodes/InclusiveNode.vue b/src/views/common/process/viewNodes/InclusiveNode.vue
index 4e48edf..82b715b 100644
--- a/src/views/common/process/viewNodes/InclusiveNode.vue
+++ b/src/views/common/process/viewNodes/InclusiveNode.vue
@@ -132,7 +132,6 @@
},
//鏍￠獙鏁版嵁閰嶇疆鐨勫悎娉曟��
validate(err) {
- console.log('inclusive children', this.config.children)
if (!(this.level == this.size && this.size != 0) && !this.config.children?.id) {
this.showError = true
this.errorInfo = '鏉′欢鍒嗘敮鍚庝笉鑳戒负绌�'
diff --git a/src/views/common/process/viewNodes/SubprocessNode.vue b/src/views/common/process/viewNodes/SubprocessNode.vue
index 286e00b..2055a75 100644
--- a/src/views/common/process/viewNodes/SubprocessNode.vue
+++ b/src/views/common/process/viewNodes/SubprocessNode.vue
@@ -33,7 +33,6 @@
},
content(){
const config = this.config.props
- console.log("role,config.assignedUser",config.assignedUser)
switch (config.assignedType){
case "ASSIGN_USER":
if (config.assignedUser.length > 0){
diff --git a/src/views/workspace/process/ProcessInstanceTabs.vue b/src/views/workspace/process/ProcessInstanceTabs.vue
index 7a37b1b..ab8158f 100644
--- a/src/views/workspace/process/ProcessInstanceTabs.vue
+++ b/src/views/workspace/process/ProcessInstanceTabs.vue
@@ -27,7 +27,6 @@
const tempJson = data.find(f =>
f.index_no === index
)
- console.log("tempJson",tempJson);
this.$store.state.noTakeList .push(tempJson.id)
parent.children = {
"id": tempJson.id,
@@ -62,7 +61,6 @@
let param = {"id": this.processInstanceId}
getWorkSetpsByBusinessId(param).then(rsp => {
let workSetps=rsp.data.data
- console.log("workSetps", workSetps)
if(workSetps.length>0){
let index=-1;
let resultProcess;
@@ -73,23 +71,18 @@
}else{
//鍚﹀垯灏卞彇閬嶅巻鏌ヨ 瀹℃壒鑺傜偣涓嶄负绌� index_no鏈�澶х殑
workSetps.forEach(item => {
- console.log("indexno",item.index_no)
if (item.index_no > index && item.end_time!==null) {
index = item.index_no;
resultProcess = item;
}
})
}
-
- console.log("resultProcess", resultProcess)
this.$store.state.runningList .push(resultProcess.approve_step_id)
param.id=resultProcess.approve_id
this.getFlowDetail(param)
}else{
this.$message.error("鏈煡璇㈠埌瀹℃壒娴佹暟鎹�!")
}
-
- console.log("workSetps", workSetps)
}).catch(err => {
this.$message.error(err)
})
@@ -98,23 +91,7 @@
},
getFlowDetail(param){
getFlowDetail(param).then(rsp => {
-
let form = rsp.data.data;
- console.log("getFlowDetail-form", form)
- form.logo = ""
- form.settings = {
- "commiter": [],
- "admin": [],
- "sign": false,
- "notify": {
- "types": [
- "APP"
- ],
- " title": "娑堟伅閫氱煡鏍囬"
- }
- }
- form.formItems = []
-
form.process =this.convertToTreeData(form.steps, {
"id": form.id, "parentId": null,
"type": "ROOT",
@@ -127,15 +104,7 @@
form.name=this.$Utils.decode(form.name);
form.templateName = form.name
- form.groupId = null;
- form.icon = "{\"icon\":\"el-icon-eleme\",\"background\":\"#1e90ff\"}";
- form.notify = "";
- form.remark = "澶囨敞璇存槑";
- form.isStop = false
- form.processDefinitionId = null
this.$store.state.design = form;
- console.log("this.$store.state.design",this.$store.state.design)
- console.log("杈撳嚭杞崲鍚庣殑form,",form)
this.$store.commit('loadForm', form)
}).catch(err => {
this.$message.error(err)
--
Gitblit v1.8.0