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

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/single.vue

@@ -109,7 +109,7 @@ export default {
           SENDER: { type: 'text', title: '发件人' }, 
           TITLE: { type: 'text', title: '主题' }, 
           // READFLAG: { type: 'select', title: '状态', dataSource: '0' }, 
-          SENDTIME: { type: 'datetime', title: '收件时间', dateformat: '0' }, 
+          SENDTIME: { type: 'datetime', title: '收件时间', dateformat: '1' }, 
           URL: { type: 'upload', title: '附件上传' }, 
           CONTENTS: { type: 'textarea', title: '邮件内容' }, 
         }, 

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/list.vue

@@ -101,8 +101,8 @@ export default {
         // Date: { type: 'datetime', dateformat: '0' }, 
         // Person: { type: 'text' }, 
         Remark: { type: 'textarea' }, 
-		StartTime: { type: 'datetime', dateformat: '0' },
-		EndTime: { type: 'datetime', dateformat: '0' },
+		StartTime: { type: 'datetime', dateformat: '1' },
+		EndTime: { type: 'datetime', dateformat: '1' },
 		F_RealName: { type: 'text' }, 
       }, 
   

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/single.vue

@@ -1,13 +1,13 @@
 <template> 
   <view class="page"> 
     <view v-if="ready"> 
-      <l-date-picker 
+      <l-datetime-picker 
         @input="setValue('DutySchedule.StartTime', $event)"
         :value="getValue('DutySchedule.StartTime')"
         :disabled="!edit"
         title="开始时间"
       /> 
-	  <l-date-picker
+	  <l-datetime-picker
 	    @input="setValue('DutySchedule.EndTime', $event)"
 	    :value="getValue('DutySchedule.EndTime')"
 	    :disabled="!edit"
@@ -94,9 +94,9 @@ export default {
       scheme: { 
         DutySchedule: { 
           // Date: { type: 'datetime', title: '时间', dateformat: '0' }, 
-		  StartTime: { type: 'datetime', dateformat: '0' },
-		  EndTime: { type: 'datetime', dateformat: '0' },
-          Person: { type: 'text', title: '值班人' }, 
+		  StartTime: { type: 'datetime', dateformat: '1' },
+		  EndTime: { type: 'datetime', dateformat: '1' },
+          Person: { type: 'text', title: '值班人',verify: 'NotNull' }, 
           Remark: { type: 'textarea', title: '备注' }, 
         }, 
   

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/list.vue

@@ -56,18 +56,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 +88,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:0,text:'我申请的会议'},{value:1,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 +125,7 @@
       </view>
     </scroll-view>
 
-    <l-customlist-add v-if="!sideOpen" @click="action('add')" />
+    <!-- <l-customlist-add v-if="!sideOpen" @click="action('add')" /> -->
   </view>
 </template>
 
@@ -153,11 +160,11 @@ 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" },
+        // Files: { type: "upload" },
         CreateUser: { type: "organize", dataType: "user" },
       },
 
@@ -166,9 +173,10 @@ export default {
       defaultQueryData: {},
       queryData: {
         MeetingTitle: "",
-        MeetingPlace: "",
-        CreateUser: "",
+        // MeetingPlace: "",
+        // CreateUser: "",
       },
+	  hasInternalParticipants:0,
 
       // 数据源
       dataSource: {
@@ -218,7 +226,11 @@ export default {
       }
 
       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",
         {

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/single.vue

@@ -39,13 +39,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 +62,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 +75,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 +117,18 @@ 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' },
+          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' },
         },
 
@@ -167,6 +175,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)