禅道bug

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

@@ -146,6 +146,11 @@ export default {
   onUnload() { 
     this.OFF('EducationalAdministrationSYS_ReceiveMessage-list-change') 
   }, 
+  onShow() {
+  	if(this.list.length){
+  		this.refreshList(false)
+  	}
+  },
   
   methods: { 
     // 页面初始化 
@@ -174,7 +179,7 @@ export default {
         { 
           // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
           // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
-          pagination: { rows: 10, page: this.page, sidx: 'SENDTIME', sord: 'DESC' }, 
+          pagination: { rows: 10, page: this.page, sidx: 'READFLAG asc,SENDTIME desc', sord: 'DESC' }, 
           queryJson: JSON.stringify(this.searchData) 
         }, 
         '加载数据时出错'

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/list.vue

@@ -121,7 +121,7 @@ export default {
       scheme: { 
         Sender: { type: 'text' }, 
         Title: { type: 'text' }, 
-        SendTime: { type: 'datetime', dateformat: '0' }, 
+        SendTime: { type: 'datetime', dateformat: '1' }, 
         SendType: { type: 'select', itemCode: 'FileSendType', dataSource: '0' }, 
         ReadFlag: { type: 'select', dataSource: '0' }, 
         ReadTime: { type: 'datetime', dateformat: '1' }, 
@@ -165,7 +165,7 @@ export default {
   }, 
   onShow() {
 	if(this.list.length){
-		this.refreshList()
+		this.refreshList(false)
 	}
   },
   
@@ -187,7 +187,7 @@ export default {
     }, 
   
     // 拉取列表 
-    async fetchList() { 
+    async fetchList(isConcat=true) { 
       if (this.page > this.total) { return } 
 	  this.searchData.ReceiverId=this.GET_GLOBAL('loginUser').userId;
       const result = await this.HTTP_GET( 
@@ -195,7 +195,7 @@ export default {
         { 
           // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
           // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
-          pagination: { rows: 10, page: this.page, sidx: 'SendTime desc,SendStatus asc', sord: 'DESC' }, 
+          pagination: { rows: 10, page: this.page, sidx: 'SendStatus asc,SendTime desc', sord: 'DESC' }, 
           queryJson: JSON.stringify(this.searchData) 
         }, 
         '加载数据时出错'
@@ -205,19 +205,19 @@ 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} 页，共 ${result.records} 项` 
       this.loadState = result.page >= result.total ? '已加载所有项目' : '向下翻以加载更多'
     }, 
   
     // 刷新清空列表 
-    async refreshList() { 
+    async refreshList(isConcat=true) { 
       this.page = 1 
       this.total = 2 
       this.list = [] 
   
-      await this.fetchList() 
+      await this.fetchList(isConcat) 
     }, 
   
     // 列表下拉 
@@ -242,7 +242,7 @@ export default {
       Object.assign(result, mapValues(queryObj, t => (Array.isArray(t) ? t.join(',') : t))) 
   
       this.searchData = result 
-      await this.refreshList() 
+      await this.refreshList(false) 
     }, 
   
     // 点击「清空查询条件」按钮 

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

@@ -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>
@@ -159,7 +163,8 @@ export default {
       // 数据项的数据类型、结构
       scheme: {
         MeetingTitle: { type: "text" },
-        MeetingPlace: { type: "select", dataSource: "0" },
+        // MeetingPlace: { type: "select", dataSource: "0" },
+		ConferenceRoomName: { type: "text"},
         BeginTime: { type: "datetime", dateformat: "1" },
         EndTime: { type: "datetime", dateformat: "1" },
         RecordPerson: { type: "organize", dataType: "user" },
@@ -180,7 +185,7 @@ export default {
 
       // 数据源
       dataSource: {
-        MeetingPlace: [],
+        // MeetingPlace: [],
       },
 
       // 页面相关参数
@@ -220,7 +225,7 @@ export default {
     },
 
     // 拉取列表
-    async fetchList() {
+    async fetchList(isConcat=true) {
       if (this.page > this.total) {
         return;
       }
@@ -248,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
@@ -258,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);
     },
 
     // 列表下拉
@@ -287,7 +292,7 @@ export default {
       );
 
       this.searchData = result;
-      await this.refreshList();
+      await this.refreshList(false);
     },
 
     // 点击「清空查询条件」按钮
@@ -311,7 +316,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;
 

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')"
@@ -123,7 +129,8 @@ export default {
       scheme: {
         MeetingManagement: {
           MeetingTitle: { type: 'text', title: '会议主题' },
-          MeetingPlace: { type: 'select', title: '会议地点', dataSource: '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' },
@@ -137,7 +144,7 @@ export default {
       // 数据源
       dataSource: {
         MeetingManagement: {
-          MeetingPlace: [],
+          // MeetingPlace: [],
         },
 
       }