From 6a72e9e44dc7278e18d55ccd5637b81a1cb2f047 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期一, 04 三月 2024 18:16:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://highdatas.com:9000/r/foundation/designer.approve.2 into dev
---
src/views/common/process/nodes/ApprovalNode.vue | 25 ++++++-------------------
1 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/src/views/common/process/nodes/ApprovalNode.vue b/src/views/common/process/nodes/ApprovalNode.vue
index eb94ceb..8714681 100644
--- a/src/views/common/process/nodes/ApprovalNode.vue
+++ b/src/views/common/process/nodes/ApprovalNode.vue
@@ -34,26 +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(',', '銆�')
-
},
- // flowText(){
- // const config = this.config
- // console.log("flowText-config",config);
- //
- // // return config.approvalArr.filter(ite=>ite.node_id===config.id)[0].approval_time;
- // if(config.approvalArr!==undefined){
- // return "鍙戣捣鏃堕棿:"+config.approvalArr.filter(ite=>ite.node_id===config.id)[0].approval_time;
- // }
- //
- // return ''
- // }
+
},
created() {
- console.log("鍔犺浇ApprovalNode.vue")
},
methods: {
getFormItemById(id){
@@ -105,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){
--
Gitblit v1.8.0