From a470995efec9de268c88cc0178ee65852a807249 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E7=90=AA?= <y1530857136@163.com>
Date: Thu, 25 Aug 2022 12:01:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A=20?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LearunApp-2.2.0/config.js                 |  4 +-
 .../pages/LR_OAModule/noticeExamine.vue       |  8 ++-
 .../pages/nworkflow/myflow/single.vue         | 53 +++++++++++++++----
 3 files changed, 51 insertions(+), 14 deletions(-)

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 b0a6167c7..62011147b 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js	
@@ -24,11 +24,11 @@ export default {
     // "http://localhost:31173/"
 	"http://192.168.10.58:8012/"
   ],
-  "webHost":"http://192.168.10.58:20472/",
+  "webHost":"http://192.168.10.58:8009/",
   // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示
   "devAccount": [
 	  // 20201130230 21364200000400266 老师 420528196310072253 学生 420528200606205026      420528200507261428
-    { username: "system", password: "www.qj.com" }
+    { username: "42052819780120143x", password: "www.qj.com" }
   ],
   //是否分布式部署 指WebApi与Web不在一台服务器
   "isDistributed":true,
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue
index 397fcc0df..cdfc9ef60 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue	
@@ -22,6 +22,9 @@
 	  <l-input title="公告内容" disabled style="border-bottom: none;"></l-input>
 	  <view class="padding text-lg" style="background-color: #fff;">
 		  <u-parse v-if="ready" :imageProp="{ domain: apiRoot }" :content="content"></u-parse>
+		  <view v-if="ready" v-html="''">
+		  	
+		  </view>
 	  </view>
 	  <l-workflow-action
 	    @audit="audit"
@@ -41,8 +44,10 @@
 
 <script>
 import moment from 'moment'
+import workflowFormMixins from '@/pages/nworkflow/workflow.js'
 
 export default {
+  mixins: [workflowFormMixins],
   data() {
     return {
 	  tab:0,
@@ -77,7 +82,8 @@ export default {
 	  this.processInfo = noticeItem.processInfo
 	  this.taskId = this.currentTask.F_TaskId
 	  this.processId = this.currentTask.F_Id
-	  this.LOADING('加载数据中…')
+	  this.formValue = noticeItem.formValue
+	  this.scheme = noticeItem.scheme
 	  await this.getFormData(this.processList[0].F_ProcessId)
 	  this.HIDE_LOADING();
 	  
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/single.vue
index 01ebc7b77..0a42f97a7 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/single.vue	
@@ -105,17 +105,18 @@ export default {
 	  const fetchFolderkeyData=await this.fetchFolderkeyData(this.currentNode , this.processId);
 	  uni.setStorageSync('guids',JSON.stringify(fetchFolderkeyData));
 
-      // 处理移动端本地表单（也就是系统表单）的情况，直接跳转过去
-      const appSysPage = wfForms.find(t => t.appurl)
-      if (this.type !== 'child' && appSysPage) {
-        this.sysFormJump(appSysPage.appurl, {
-          currentNode: this.currentNode,
-          currentTask: this.currentTask,
-          logList: this.processList,
-		  processInfo:this.processInfo
-        })
-        return
-      }
+    //   // 处理移动端本地表单（也就是系统表单）的情况，直接跳转过去
+    //   const appSysPage = wfForms.find(t => t.appurl)
+    //   if (this.type !== 'child' && appSysPage) {
+    //     this.sysFormJump(appSysPage.appurl, {
+    //       currentNode: this.currentNode,
+    //       currentTask: this.currentTask,
+    //       logList: this.processList,
+		  // processInfo:this.processInfo
+    //     })
+    //     return
+    //   }
+	  
       if (this.type === 'child') {
         // 发起子流程的场合
         // 获取子流程的流程信息，提取出时间线和表单模板 code
@@ -146,6 +147,21 @@ export default {
           code: this.code,
           useDefault: true
         })
+		
+		// 处理移动端本地表单（也就是系统表单）的情况，直接跳转过去
+		const appSysPage = wfForms.find(t => t.appurl)
+		if (this.type !== 'child' && appSysPage) {
+		  this.sysFormJump(appSysPage.appurl, {
+		    currentNode: this.currentNode,
+		    currentTask: this.currentTask,
+		    logList: this.processList,
+			processInfo:this.processInfo,
+			formValue,
+			scheme,
+		  })
+		  return
+		}
+		
         this.scheme = scheme
         this.formValue = formValue
         this.rel = rel
@@ -160,6 +176,21 @@ export default {
           processId: this.processId,
           code: null
         })
+		
+		// 处理移动端本地表单（也就是系统表单）的情况，直接跳转过去
+		const appSysPage = wfForms.find(t => t.appurl)
+		if (this.type !== 'child' && appSysPage) {
+		  this.sysFormJump(appSysPage.appurl, {
+		    currentNode: this.currentNode,
+		    currentTask: this.currentTask,
+		    logList: this.processList,
+			processInfo:this.processInfo,
+			formValue,
+			scheme,
+		  })
+		  return
+		}
+		
         this.scheme = scheme
         this.formValue = formValue
         this.rel = rel