From f2c81e2c661cbbc5c5275ef35a4e8f80df9e0d15 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Thu, 27 Oct 2022 12:10:52 +0800
Subject: [PATCH] =?UTF-8?q?app2.0=E6=88=91=E7=9A=84=E4=BC=9A=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PersonnelManagement/MeetingMy/list.vue    | 67 ++++++++++++-------
 .../PersonnelManagement/MeetingMy/single.vue  | 38 ++++++++---
 2 files changed, 69 insertions(+), 36 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/list.vue
index 1a2b42a8f..797905d16 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/list.vue	
@@ -1,4 +1,4 @@
-<template>
+<template>
   <view class="page">
     <!-- 主列表页 -->
     <view
@@ -26,10 +26,14 @@
               {{ displayListItem(item, "MeetingTitle") }}
             </view>
 
-            <view class="customlist-item-field">
+            <!-- <view class="customlist-item-field">
               <text class="customlist-item-field-title">会议地点：</text>
               {{ displayListItem(item, "MeetingPlace") }}
-            </view>
+            </view> -->
+			<view class="customlist-item-field">
+			  <text class="customlist-item-field-title">会议地点：</text>
+			  {{ displayListItem(item, "ConferenceRoomName") }}
+			</view>
 
             <view class="customlist-item-field">
               <text class="customlist-item-field-title">开始时间：</text>
@@ -56,18 +60,18 @@
               {{ displayListItem(item, "Content") }}
             </view>
 
-            <view class="customlist-item-field">
+           <!-- <view class="customlist-item-field">
               <text class="customlist-item-field-title">附件上传：</text>
               {{ displayListItem(item, "Files") }}
-            </view>
+            </view> -->
 
             <l-customlist-action
-              showButton
+              :showButton="false"
               buttonText="会议纪要"
               @join="action('join', item.Id)"
-              showEdit
+              :showEdit="false"
               @edit="action('edit', item.Id)"
-              showDelete
+              :showDelete="false"
               @delete="action('delete', item.Id)"
               @view="action('view', item.Id)"
             />
@@ -88,19 +92,26 @@
     <!-- 侧边栏，用于设置查询条件 -->
     <scroll-view :class="sideOpen ? 'show' : ''" class="sidepage" scroll-y>
       <view v-if="ready" class="padding">
+		  <l-select
+		    v-model="hasInternalParticipants"
+			@change="searchChange"
+		    :range="[{value:1,text:'我参加的会议'},{value:0,text:'我申请的会议'}]"
+		    title="会议类型"
+		    placeholder="按会议类型查询"
+		  />
         <l-input
           v-model="queryData.MeetingTitle"
           @change="searchChange"
           title="会议主题"
           placeholder="按会议主题查询"
         />
-        <l-select
+       <!-- <l-select
           v-model="queryData.MeetingPlace"
           @change="searchChange"
           :range="dataSource.MeetingPlace"
           title="会议地点"
           placeholder="按会议地点查询"
-        />
+        /> -->
         <l-organize-picker
           v-model="queryData.CreateUser"
           @change="searchChange"
@@ -118,7 +129,7 @@
       </view>
     </scroll-view>
 
-    <l-customlist-add v-if="!sideOpen" @click="action('add')" />
+    <!-- <l-customlist-add v-if="!sideOpen" @click="action('add')" /> -->
   </view>
 </template>
 
@@ -152,12 +163,13 @@ export default {
       // 数据项的数据类型、结构
       scheme: {
         MeetingTitle: { type: "text" },
-        MeetingPlace: { type: "select", dataSource: "0" },
-        BeginTime: { type: "datetime", dateformat: "0" },
-        EndTime: { type: "datetime", dateformat: "0" },
+        // MeetingPlace: { type: "select", dataSource: "0" },
+		ConferenceRoomName: { type: "text"},
+        BeginTime: { type: "datetime", dateformat: "1" },
+        EndTime: { type: "datetime", dateformat: "1" },
         RecordPerson: { type: "organize", dataType: "user" },
         Content: { type: "texteditor" },
-        Files: { type: "upload" },
+        // Files: { type: "upload" },
         CreateUser: { type: "organize", dataType: "user" },
       },
 
@@ -166,13 +178,14 @@ export default {
       defaultQueryData: {},
       queryData: {
         MeetingTitle: "",
-        MeetingPlace: "",
-        CreateUser: "",
+        // MeetingPlace: "",
+        // CreateUser: "",
       },
+	  hasInternalParticipants:1,
 
       // 数据源
       dataSource: {
-        MeetingPlace: [],
+        // MeetingPlace: [],
       },
 
       // 页面相关参数
@@ -212,13 +225,17 @@ export default {
     },
 
     // 拉取列表
-    async fetchList() {
+    async fetchList(isConcat=true) {
       if (this.page > this.total) {
         return;
       }
 
       var userInfo = this.GET_GLOBAL("loginUser");
-      this.searchData.CreateUser = userInfo.userId;
+	  if(this.hasInternalParticipants) {
+		  this.searchData.InternalParticipants = userInfo.userId
+	  }else{
+		  this.searchData.CreateUser = userInfo.userId;
+	  }
       const result = await this.HTTP_GET(
         "learun/adms/PersonnelManagement/MeetingManagement/pagelist",
         {
@@ -236,7 +253,7 @@ export default {
 
       this.total = result.total;
       this.page = result.page + 1;
-      this.list = this.list.concat(result.rows);
+      this.list = isConcat?this.list.concat(result.rows):result.rows;
 
       this.tips = `已加载 ${Math.min(result.page, result.total)} / ${
         result.total
@@ -246,12 +263,12 @@ export default {
     },
 
     // 刷新清空列表
-    async refreshList() {
+    async refreshList(isConcat=true) {
       this.page = 1;
       this.total = 2;
       this.list = [];
 
-      await this.fetchList();
+      await this.fetchList(isConcat);
     },
 
     // 列表下拉
@@ -275,11 +292,12 @@ export default {
       );
 
       this.searchData = result;
-      await this.refreshList();
+      await this.refreshList(false);
     },
 
     // 点击「清空查询条件」按钮
     reset() {
+		this.hasInternalParticipants = 1
       this.queryData = this.COPY(this.defaultQueryData);
       this.searchChange();
     },
@@ -299,7 +317,6 @@ export default {
           this.NAV_TO(`./single?type=edit&id=${id}`);
           return;
         case "join":
-          console.log(123);
           this.NAV_TO(`/pages/PersonnelManagement/MeetingMinutes/list?meetId=${id}`);
           return;
 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/single.vue
index 0c57ac63f..469240bcd 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/single.vue	
@@ -7,13 +7,19 @@
         :disabled="!edit"
         title="会议主题"
       />
-      <l-select
+     <!-- <l-select
         @input="setValue('MeetingManagement.MeetingPlace', $event)"
         :value="getValue('MeetingManagement.MeetingPlace')"
         :disabled="!edit"
         :range="dataSource.MeetingManagement.MeetingPlace"
         title="会议地点"
-      />
+      /> -->
+	  <l-input
+	    @input="setValue('MeetingManagement.ConferenceRoomName', $event)"
+	    :value="getValue('MeetingManagement.ConferenceRoomName')"
+	    :disabled="!edit"
+	    title="会议地点"
+	  />
       <l-date-picker
         @input="setValue('MeetingManagement.BeginTime', $event)"
         :value="getValue('MeetingManagement.BeginTime')"
@@ -39,13 +45,20 @@
         :readonly="!edit"
         title="会议内容"
       />
-      <l-upload-file
+   <!--   <l-upload-file
         @input="setValue('MeetingManagement.Files', $event)"
         :value="getValue('MeetingManagement.Files')"
         :readonly="!edit"
         :number="9"
         title="附件上传"
-      />
+      /> -->
+	  <!-- <l-upload-file
+	    v-if="ready"
+	    :value="fileList"
+	    :readonly="!edit"
+	    :number="9"
+	    title="附件上传"
+	  /> -->
       <l-organize-picker
         @input="setValue('MeetingManagement.CreateUser', $event)"
         :value="getValue('MeetingManagement.CreateUser')"
@@ -55,7 +68,7 @@
       />
     </view>
 
-    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;">
+    <!-- <view v-if="ready" 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>
@@ -68,7 +81,7 @@
       <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block>
         删除
       </l-button>
-    </view>
+    </view> -->
   </view>
 </template>
 
@@ -110,17 +123,19 @@ export default {
       // 表单数据
       current: {},
       origin: {},
+	  fileList:[],
 
       // 表单项数据结构
       scheme: {
         MeetingManagement: {
           MeetingTitle: { type: 'text', title: '会议主题' },
-          MeetingPlace: { type: 'select', title: '会议地点', dataSource: '0' },
-          BeginTime: { type: 'datetime', title: '开始时间', dateformat: '0' },
-          EndTime: { type: 'datetime', title: '结束时间', dateformat: '0' },
+          // MeetingPlace: { type: 'select', title: '会议地点', dataSource: '0' },
+		  ConferenceRoomName: { type: "text"},
+          BeginTime: { type: 'datetime', title: '开始时间', dateformat: '1' },
+          EndTime: { type: 'datetime', title: '结束时间', dateformat: '1' },
           RecordPerson: { type: 'organize', title: '会议记录者', dataType: 'user' },
           Content: { type: 'texteditor', title: '会议内容' },
-          Files: { type: 'upload', title: '附件上传' },
+          // Files: { type: 'upload', title: '附件上传' },
           CreateUser: { type: 'organize', title: '申请人', dataType: 'user' },
         },
 
@@ -129,7 +144,7 @@ export default {
       // 数据源
       dataSource: {
         MeetingManagement: {
-          MeetingPlace: [],
+          // MeetingPlace: [],
         },
 
       }
@@ -167,6 +182,7 @@ export default {
         this.origin = await this.getDefaultForm()
       } else {
         const result = await this.HTTP_GET('learun/adms/PersonnelManagement/MeetingManagement/form', this.id)
+		// this.fileList = await this.getFileListById(result.MeetingManagement.FilePath)
         this.origin = await this.formatFormData(result)
       }
       this.current = this.COPY(this.origin)