Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

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();
 	  

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