From d43f233b4f4fa017bde4f03528650afac7cc4554 Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Sun, 27 Sep 2020 16:19:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BAapp=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Learun.Application.WebApi/XmlConfig/system.config        | 4 ++--
 Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js       | 2 +-
 .../LearunApp-2.2.0/pages/nworkflow/releasetask/single.vue   | 5 +----
 .../LearunApp-2.2.0/pages/nworkflow/workflow.js              | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config
index c5d6754f8..c3ff40839 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config	
@@ -94,8 +94,8 @@
 <!--统一身份认证加密公钥-->
   <add key="SSOPublicSecret" value="bjquanjiang" />
   <!-- 深信服ACIp -->
-  <add key="ACIp" value="192.168.90.2"/>
-  <add key="ACIp2" value="192.168.200.252"/>
+  <add key="ACIp" value=""/>
+  <add key="ACIp2" value=""/>
   <!-- 是否强制验证强密码 -->
   <add key="verifypwd" value="false"/>
   <!--疫情防控组角色Id-->
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js
index 1d194df27..e4f9c373f 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js	
@@ -10,7 +10,7 @@ export default {
     "https://wx.qjkjedu.com/learun/adms"
   ],
   // "apiHost": [
-  //   "http://192.168.2.94:31173/learun/adms"
+  //   "http://192.168.2.202:31173/learun/adms"
   // ],
   // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示
   "devAccount": [
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/releasetask/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/releasetask/single.vue
index f648e3e29..8dccf21ae 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/releasetask/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/releasetask/single.vue	
@@ -110,20 +110,18 @@ export default {
 
       this.needTitle = this.type !== 'again' && Number(currentNode.isTitle) === 1
       const formData = await this.fetchFormData(currentNode, processId)
-
       const schemeData = await this.fetchSchemeData(currentNode)
       const { formValue, scheme, rel } = await this.getCustomForm({
         schemeData,
         processId,
         formData,
-        currentNode: this.currentNode,
+        currentNode: currentNode,
         code: this.type === 'again' ? null : code,
         useDefault: true
       })
       this.rel = rel
       this.scheme = scheme
       this.formValue = formValue
-
       this.code = code
       this.processId = processId
 
@@ -140,7 +138,6 @@ export default {
       this.LOADING('正在提交…')
       const formValue = this.$refs.form.getFormValue()
       const postData = await this.getPostData(formValue, this.scheme)
-
       this.HTTP_POST('/newwf/draft', postData, '提交草稿时发生失败，未能成功保存').then(success => {
         this.HIDE_LOADING()
         if (!success) {
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/workflow.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/workflow.js
index 1ae517ca7..ec87bec2d 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/workflow.js	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/workflow.js	
@@ -84,7 +84,7 @@ export default {
         if (formData && !formData[schemeItem.F_SchemeInfoId]) {
           continue
         }
-
+		
         // 设置 formreq 的内容,非新建模式下需要设置 keyValue
         const { formId, field } = get(currentNode, `wfForms.${schemeIndex}`, {})
         const formreqObj = { schemeInfoId: formId, processIdName: field, formData: {} }