From baf982891623c9989b2a792755244293c98d5cdc Mon Sep 17 00:00:00 2001
From: yxq <y1530857136@qq.com>
Date: Thu, 31 Aug 2023 09:58:56 +0800
Subject: [PATCH] =?UTF-8?q?app=20=E4=BC=9A=E8=AE=AE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MeetingManagement/singleFlow.vue          | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/singleFlow.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/singleFlow.vue
index 8b55dc705..8d447cc0a 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/singleFlow.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/singleFlow.vue	
@@ -4,57 +4,57 @@
     <l-nav v-model="tab" :items="['表单信息', '流程信息']" type="flex" class="solid-bottom" />
 	<view v-if="ready && tab == 0">
 	    <l-input
-	      :value="formData.MeetingManagement.MeetingTitle"
+	      :value="formData.MeetingTitle"
 	      disabled
 	      title="会议主题"
 	    />
 	    <l-select
-	      :value="formData.MeetingManagement.MeetingPlace"
+	      :value="formData.MeetingPlace"
 	      disabled
-	      :range="dataSource.MeetingManagement.MeetingPlace"
+	      :range="dataSource.MeetingPlace"
 	      title="会议地点"
 	    />
 	    <l-datetime-picker
-	      :value="formData.MeetingManagement.BeginTime"
+	      :value="formData.BeginTime"
 	      disabled
 	      title="开始时间"
 	    />
 	    <l-datetime-picker
-	      :value="formData.MeetingManagement.EndTime"
+	      :value="formData.EndTime"
 	      disabled
 	      title="结束时间"
 	    />
 	    <l-organize-picker
-	      :value="formData.MeetingManagement.CreateUser"
+	      :value="formData.CreateUser"
 	      readonly
 	      type="user"
 	      title="申请人"
 	    />
 	    <l-input
-	      :value="formData.MeetingManagement.Linkman"
+	      :value="formData.Linkman"
 	      readonly
 	      title="联系人"
 	    />
 	    <l-input
-	      :value="formData.MeetingManagement.LinkPhone"
+	      :value="formData.LinkPhone"
 	      readonly
 	      title="联系方式"
 	    />
 	    <l-organize-picker
-	      :value="formData.MeetingManagement.InternalParticipants"
+	      :value="formData.InternalParticipants"
 		  readonly
 	      type="user"
 	      title="参会人员"
 	    	:multiple="true"
 	    />
 	    <l-organize-picker
-	      :value="formData.MeetingManagement.RecordPerson"
+	      :value="formData.RecordPerson"
 	      readonly
 	      type="user"
 	      title="会议记录者"
 	    />
 	    <l-textarea
-	      :value="formData.MeetingManagement.Content"
+	      :value="formData.Content"
 	      readonly
 	      title="会议内容"
 	    />
@@ -63,6 +63,13 @@
 	      readonly
 	      title="附件上传"
 	    />
+		<l-workflow-action
+			    @audit="audit"
+			    @action="action"
+			    :type="type"
+			    :currentNode="currentNode"
+			    :currentTask="currentTask"
+			  />
 	</view>
 	<view v-if="ready && tab == 1" class="progress"><l-workflow-timeline :processList="processList" /></view>
     <!-- <view class="padding-sm text-grey notice-info">
@@ -147,7 +154,7 @@ export default {
 				// res.F_SourceName =  res.F_SourceName&&this.GET_GLOBAL('department')[res.F_SourceName]? this.GET_GLOBAL('department')[res.F_SourceName].name : res.F_SourceName
 				this.formData = res
 				
-				let fileList = await this.getFileListById(res.Purchase_Service.Files)
+				let fileList = await this.getFileListById(res.Files)
 				if(fileList&&fileList.length){
 					this.fileList = fileList
 				}