From 22688e3db4f4220d111a3205b330b7da02aee580 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, 22 Sep 2022 18:19:29 +0800
Subject: [PATCH] =?UTF-8?q?app2.0=20=E5=88=A4=E6=96=AD=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MeetingManagement/list.vue                | 44 ++++++++++++++-----
 .../MeetingManagement/single.vue              | 18 ++++----
 2 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue
index e50677873..fcf2f7932 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue	
@@ -41,15 +41,20 @@
               {{ displayListItem(item, "EndTime") }}
             </view>
 
-            <view class="customlist-item-field">
+           <!-- <view class="customlist-item-field">
               <text class="customlist-item-field-title">申请人：</text>
               {{ displayListItem(item, "CreateUser") }}
-            </view>
+            </view> -->
+			
+			<view class="customlist-item-field">
+			  <text class="customlist-item-field-title">会议状态：</text>
+			  {{ displayListItem(item, "CheckStatus") }}
+			</view>
 
-            <view class="customlist-item-field">
+          <!--  <view class="customlist-item-field">
               <text class="customlist-item-field-title">会议记录者：</text>
               {{ displayListItem(item, "RecordPerson") }}
-            </view>
+            </view> -->
 
          <!--   <view class="customlist-item-field">
               <text class="customlist-item-field-title">会议内容：</text>
@@ -65,9 +70,9 @@
               buttonText="会议纪要" -->
             <l-customlist-action
               @join="action('join', item.Id)"
-              showEdit
+              :showEdit="item.CheckStatus=='0'"
               @edit="action('edit', item.Id)"
-              showDelete
+              :showDelete="item.CheckStatus=='0'"
               @delete="action('delete', item.Id)"
               @view="action('view', item.Id)"
             />
@@ -153,12 +158,13 @@ export default {
       scheme: {
         MeetingTitle: { type: "text" },
         MeetingPlace: { type: "select", dataSource: "0" },
-        BeginTime: { type: "datetime", dateformat: "0" },
-        EndTime: { type: "datetime", dateformat: "0" },
+        BeginTime: { type: "datetime", dateformat: "1" },
+        EndTime: { type: "datetime", dateformat: "1" },
         RecordPerson: { type: "organize", dataType: "user" },
         Content: { type: "texteditor" },
         Files: { type: "upload" },
-        CreateUser: { type: "organize", dataType: "user" },
+        // CreateUser: { type: "organize", dataType: "user" },
+		CheckStatus:{ type: "select"},
       },
 
       // 查询条件
@@ -167,12 +173,30 @@ export default {
       queryData: {
         MeetingTitle: "",
         MeetingPlace: "",
-        CreateUser: "",
+        // CreateUser: "",
       },
 
       // 数据源
       dataSource: {
         MeetingPlace: [],
+		CheckStatus:[
+		  {
+			value:'0',
+			text:"未审核"
+		  },
+		  {
+			value:'1',
+			text:"已通过"
+		  },
+		  {
+			value:'2',
+			text:"未通过"
+		  },
+		  {
+			value:'3',
+			text:"审核中"
+		  },
+		]
       },
 
       // 页面相关参数
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/single.vue
index a971c57a2..67336586b 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/single.vue	
@@ -14,25 +14,25 @@
         :range="dataSource.MeetingManagement.MeetingPlace"
         title="会议地点"
       />
-      <l-date-picker
+      <l-datetime-picker
         @input="setValue('MeetingManagement.BeginTime', $event)"
         :value="getValue('MeetingManagement.BeginTime')"
         :disabled="!edit"
         title="开始时间"
       />
-      <l-date-picker
+      <l-datetime-picker
         @input="setValue('MeetingManagement.EndTime', $event)"
         :value="getValue('MeetingManagement.EndTime')"
         :disabled="!edit"
         title="结束时间"
       />
-      <l-organize-picker
+      <!-- <l-organize-picker
         @input="setValue('MeetingManagement.CreateUser', $event)"
         :value="getValue('MeetingManagement.CreateUser')"
         :readonly="!edit"
         type="user"
         title="申请人"
-      />
+      /> -->
 	  <l-input
 	    @input="setValue('MeetingManagement.Linkman', $event)"
 	    :value="getValue('MeetingManagement.Linkman')"
@@ -75,7 +75,7 @@
       />
     </view>
 
-    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;">
+    <view v-if="ready&&(origin.MeetingManagement.CheckStatus=='0'||edit)" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;">
       <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block>
         保存草稿
       </l-button>
@@ -136,15 +136,15 @@ export default {
         MeetingManagement: {
           MeetingTitle: { type: 'text', title: '会议主题' ,verify:"NotNull"},
           MeetingPlace: { type: 'select', title: '会议地点', dataSource: '0',verify:"NotNull" },
-          BeginTime: { type: 'datetime', title: '开始时间', dateformat: '0',verify:"NotNull"  },
-          EndTime: { type: 'datetime', title: '结束时间', dateformat: '0',verify:"NotNull"  },
+          BeginTime: { type: 'datetime', title: '开始时间', dateformat: '1',verify:"NotNull"  },
+          EndTime: { type: 'datetime', title: '结束时间', dateformat: '1',verify:"NotNull"  },
 		  InternalParticipants: { type: 'organize', title: '参会人员', dataType: 'user',verify:"NotNull" },
           RecordPerson: { type: 'organize', title: '会议记录者', dataType: 'user' },
           Content: { type: 'texteditor', title: '会议内容',verify:"NotNull" },
 		  Linkman: { type: 'text', title: '联系人',verify:"NotNull" },
 		  LinkPhone: { type: 'text', title: '联系方式',verify:"Mobile" },
           Files: { type: 'upload', title: '附件上传' },
-          CreateUser: { type: 'organize', title: '申请人', dataType: 'user',verify:"NotNull"  },
+          // CreateUser: { type: 'organize', title: '申请人', dataType: 'user',verify:"NotNull"  },
         },
 
       },
@@ -188,9 +188,11 @@ export default {
     async fetchForm() {
       if (this.mode === 'create') {
         this.origin = await this.getDefaultForm()
+		console.log(this.origin)
       } else {
         const result = await this.HTTP_GET('learun/adms/PersonnelManagement/MeetingManagement/form', this.id)
         this.origin = await this.formatFormData(result)
+		console.log(this.origin)
       }
       this.current = this.COPY(this.origin)
     },